From d16b13c8ca3b08dabca318c9caaaaca3fad21ffe Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 5 Oct 2010 08:26:36 -0500 Subject: [PATCH] tweak patches to take into account the removal of FASTBOOL in mainline --- patches/dev300/ooo4kids-allpatches.diff | 2 +- patches/dev300/svx-ppt-bullet-offset-fix.diff | 4 ++-- patches/dev300/vosremoval-mutex.diff | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/dev300/ooo4kids-allpatches.diff b/patches/dev300/ooo4kids-allpatches.diff index cf8ed78..5cb9fa0 100644 --- a/patches/dev300/ooo4kids-allpatches.diff +++ b/patches/dev300/ooo4kids-allpatches.diff @@ -26628,7 +26628,7 @@ index 5e2bb23..e521a95 100644 @@ -1496,6 +1588,61 @@ void SfxWorkWindow::UpdateObjectBars_Impl() // wird in diesem Kontext eine ToolBox gefordert? - FASTBOOL bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode ); + bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode ); + +#ifdef OOo4Kids + short int nUserLevel = getUserLevel(); diff --git a/patches/dev300/svx-ppt-bullet-offset-fix.diff b/patches/dev300/svx-ppt-bullet-offset-fix.diff index 7d1fc1e..39f563d 100644 --- a/patches/dev300/svx-ppt-bullet-offset-fix.diff +++ b/patches/dev300/svx-ppt-bullet-offset-fix.diff @@ -7,7 +7,7 @@ diff --git filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msdffimp.c index ca3a353..ff1ce87 100644 --- filter/source/msfilter/msdffimp.cxx +++ filter/source/msfilter/msdffimp.cxx -@@ -4161,18 +4161,25 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const +@@ -4161,18 +4161,25 @@ bool SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const UINT16 nLen = (UINT16)aHd.nRecLen; if(nLen) { @@ -36,7 +36,7 @@ index ca3a353..ff1ce87 100644 { rSt >> nVal3; nLen -= 2; -@@ -4180,7 +4187,7 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const +@@ -4180,7 +4187,7 @@ bool SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const } // Weitere, frei gesetzte TABs diff --git a/patches/dev300/vosremoval-mutex.diff b/patches/dev300/vosremoval-mutex.diff index d6888c7..a16a49c 100644 --- a/patches/dev300/vosremoval-mutex.diff +++ b/patches/dev300/vosremoval-mutex.diff @@ -24309,7 +24309,7 @@ index 047ba95..5f4455f 100644 if ( !bDetermineFunction ) { bDetermineFunction = true; -@@ -343,7 +343,7 @@ FASTBOOL SfxApplication::Initialize_Impl() +@@ -343,7 +343,7 @@ bool SfxApplication::Initialize_Impl() Registrations_Impl(); @@ -24318,7 +24318,7 @@ index 047ba95..5f4455f 100644 // TODO/LATER: exchange confusing defines; CREATEDOC -> NEWDOC, DOCCREATED -> CREATEDOC SfxEventConfiguration::RegisterEvent(SFX_EVENT_STARTAPP, String(SfxResId(STR_EVENT_STARTAPP)), SfxObjectShell::GetEventNames_Impl()[0] ); -@@ -400,7 +400,7 @@ FASTBOOL SfxApplication::Initialize_Impl() +@@ -400,7 +400,7 @@ bool SfxApplication::Initialize_Impl() pAppData->aLateInitTimer.Start(); { -- 1.7.1