diff options
-rw-r--r-- | basctl/source/basicide/basdoc.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/basdoc.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 2 | ||||
-rw-r--r-- | starmath/inc/document.hxx | 2 | ||||
-rw-r--r-- | starmath/source/document.cxx | 2 | ||||
-rw-r--r-- | sw/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/globdoc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/wdocsh.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/app/docsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/app/docsh2.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/dochdl/swdtflvr.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/globdoc/globdoc.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/uibase/web/wdocsh.cxx | 4 |
20 files changed, 28 insertions, 27 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index d682f4e92216..61c0904c2503 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -70,7 +70,7 @@ void DocShell::SetPrinter( SfxPrinter* pPr ) pPrinter.reset(pPr); } -void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*, OUString*, sal_Int32, sal_Bool bTemplate) const +void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*, OUString*, sal_Int32, bool bTemplate) const { (void)bTemplate; DBG_ASSERT( !bTemplate, "No template for Basic" ); diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index e4715458dc83..0606e7ff2ed0 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -45,7 +45,7 @@ protected: OUString * pFullTypeName, OUString * pShortTypeName, sal_Int32 nVersion, - sal_Bool bTemplate = false ) const; + bool bTemplate = false ) const; public: TYPEINFO(); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 167706698640..10cd1f7e5780 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -532,7 +532,7 @@ public: */ void SetupStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - sal_Int32 nVersion, sal_Bool bTemplate, bool bChart = false ) const; + sal_Int32 nVersion, bool bTemplate, bool bChart = false ) const; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage(); @@ -583,7 +583,7 @@ public: OUString * pFullTypeName, OUString * pShortTypeName, sal_Int32 nVersion, - sal_Bool bTemplate = sal_False) const = 0; + bool bTemplate = false) const = 0; // change recording and respective passwword protection for Writer and Calc // slots available for Writer: FN_REDLINE_ON, FN_REDLINE_ON diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 9d4267157b5b..031387d90677 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -189,7 +189,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, - sal_Bool bTemplate /* = sal_False */) const + bool bTemplate /* = false */) const { if ( nFileFormat == SOFFICE_FILEFORMAT_60 ) { diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 5227a755a42b..900ed6f499e9 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -199,7 +199,7 @@ public: OUString * pFullTypeName, OUString * pShortTypeName, sal_Int32 nFileFormat, - sal_Bool bTemplate = sal_False ) const; + bool bTemplate = false ) const; virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); virtual sal_Bool Load( SfxMedium& rMedium ); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 9913f2c5499f..24ba06bb54a2 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -610,7 +610,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject ::comphelper::OStorageHelper::GetStorageFromURL( aTempFile.GetURL(), embed::ElementModes::READWRITE ); // write document storage - pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False ); + pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false ); // mba: no relative ULRs for clipboard! SfxMedium aMedium( xWorkStore, OUString() ); bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index e1a9eea0a242..27f2198a205c 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1134,7 +1134,7 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, - sal_Bool bTemplate /* = sal_False */) const + bool bTemplate /* = false */) const { if (nFileFormat == SOFFICE_FILEFORMAT_60) { diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index c899ea24a5dd..055392ad8ec8 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -95,7 +95,7 @@ public: virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); virtual SfxStyleSheetBasePool* GetStyleSheetPool(); virtual Size GetFirstPageSize(); - virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; + virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const; virtual void SetModified( sal_Bool = sal_True ); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, const SfxItemSet &rSet ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 3d7fb6ff6806..6638b19d228c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -338,7 +338,7 @@ sal_uInt32 GetChartVersion( sal_Int32 nVersion, bool bTemplate ) void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage, - sal_Int32 nVersion, sal_Bool bTemplate, bool bChart ) const + sal_Int32 nVersion, bool bTemplate, bool bChart ) const { uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY ); @@ -455,7 +455,7 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage return sal_False; } - SetupStorage( xStorage, SOFFICE_FILEFORMAT_CURRENT, sal_False, false ); + SetupStorage( xStorage, SOFFICE_FILEFORMAT_CURRENT, false, false ); } } catch ( uno::Exception& ) @@ -1917,7 +1917,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit ) if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { SAL_WARN( "sfx.doc", "The mediatype must be set already!" ); - SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false ); + SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, false, false ); } pImp->bIsSaving = sal_False; @@ -3090,7 +3090,8 @@ sal_Bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium ) sal_Int32 nVersion = rMedium.GetFilter()->GetVersion(); // OASIS templates have own mediatypes ( SO7 also actually, but it is to late to use them here ) - sal_Bool bTemplate = ( rMedium.GetFilter()->IsOwnTemplateFormat() && nVersion > SOFFICE_FILEFORMAT_60 ); + const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat() + && nVersion > SOFFICE_FILEFORMAT_60; const SfxFilter* pFilter = rMedium.GetFilter(); bool bChart = false; @@ -3123,7 +3124,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage() pImp->m_xDocStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); OSL_ENSURE( pImp->m_xDocStorage.is(), "The method must either return storage or throw an exception!" ); - SetupStorage( pImp->m_xDocStorage, SOFFICE_FILEFORMAT_CURRENT, sal_False, false ); + SetupStorage( pImp->m_xDocStorage, SOFFICE_FILEFORMAT_CURRENT, false, false ); pImp->m_bCreateTempStor = sal_False; SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_STORAGECHANGED, GlobalEventConfig::GetEventName(STR_EVENT_STORAGECHANGED), this ) ); } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index ac4e6c239fd3..94e6683d01d5 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3803,7 +3803,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& { // TODO/LATER: if the provided storage has some data inside the storing might fail, probably the storage must be truncated // TODO/LATER: is it possible to have a template here? - m_pData->m_pObjectShell->SetupStorage( xStorage, nVersion, sal_False, false ); + m_pData->m_pObjectShell->SetupStorage( xStorage, nVersion, false, false ); // BaseURL is part of the ItemSet SfxMedium aMedium( xStorage, OUString(), &aSet ); diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 4452922ffd6c..22cda9ccd64e 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -128,7 +128,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, - sal_Bool bTemplate = sal_False ) const; + bool bTemplate = false ) const; virtual sal_Bool SetData( const OUString& rData ); virtual sal_uLong GetMiscStatus() const; diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 5c4da925ff85..4ba13b05cebb 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -1393,7 +1393,7 @@ void SmDocShell::FillClass(SvGlobalName* pClassName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, - sal_Bool bTemplate /* = sal_False */) const + bool bTemplate /* = false */) const { SAL_INFO( "starmath", "SmDocShell::FillClass" ); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 6a2541832742..61d354678e26 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -229,7 +229,7 @@ public: OUString * pLongUserName, OUString * pUserName, sal_Int32 nFileFormat, - sal_Bool bTemplate = sal_False ) const; + bool bTemplate = false ) const; virtual void LoadStyles( SfxObjectShell& rSource ); diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx index 16102211d342..7832e2444a48 100644 --- a/sw/inc/globdoc.hxx +++ b/sw/inc/globdoc.hxx @@ -38,7 +38,7 @@ public: OUString * pLongUserName, OUString * pUserName, sal_Int32 nFileFormat, - sal_Bool bTemplate = sal_False ) const; + bool bTemplate = false ) const; }; #endif diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index 13600a4ffecc..32f833a69539 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -44,7 +44,7 @@ public: OUString * pLongUserName, OUString * pUserName, sal_Int32 nFileFormat, - sal_Bool bTemplate = sal_False ) const; + bool bTemplate = false ) const; sal_uInt16 GetSourcePara()const {return nSourcePara;} void SetSourcePara(sal_uInt16 nSet) {nSourcePara = nSet;} diff --git a/sw/source/core/uibase/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx index 875e91cc965b..d5062ff42584 100644 --- a/sw/source/core/uibase/app/docsh.cxx +++ b/sw/source/core/uibase/app/docsh.cxx @@ -451,7 +451,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) SfxObjectShellLock xDocSh = new SwGlobalDocShell( SFX_CREATE_MODE_INTERNAL ); // the global document can not be a template - xDocSh->SetupStorage( xStor, SotStorage::GetVersion( xStor ), sal_False ); + xDocSh->SetupStorage( xStor, SotStorage::GetVersion( xStor ), false ); xDocSh->DoClose(); } diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx index 58702264923b..f8ced7043098 100644 --- a/sw/source/core/uibase/app/docsh2.cxx +++ b/sw/source/core/uibase/app/docsh2.cxx @@ -1195,7 +1195,7 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, OUString * pLongUserName, OUString * pUserName, sal_Int32 nVersion, - sal_Bool bTemplate /* = sal_False */) const + bool bTemplate /* = false */) const { if (nVersion == SOFFICE_FILEFORMAT_60) { diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx index 9d4acca9e51c..f0819415a513 100644 --- a/sw/source/core/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx @@ -658,7 +658,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, ::comphelper::OStorageHelper::GetStorageFromURL( aTempFile.GetURL(), embed::ElementModes::READWRITE ); // write document storage - pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False ); + pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false ); // mba: no BaseURL for clipboard SfxMedium aMedium( xWorkStore, OUString() ); bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False ); diff --git a/sw/source/core/uibase/globdoc/globdoc.cxx b/sw/source/core/uibase/globdoc/globdoc.cxx index 1d72d5c16e0e..3a6df5093c80 100644 --- a/sw/source/core/uibase/globdoc/globdoc.cxx +++ b/sw/source/core/uibase/globdoc/globdoc.cxx @@ -49,10 +49,10 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName, OUString * pLongUserName, OUString * pUserName, sal_Int32 nVersion, - sal_Bool bTemplate /* = sal_False */) const + bool bTemplate /* = false */) const { (void)bTemplate; - OSL_ENSURE( bTemplate == sal_False, "No template for Writer Global" ); + OSL_ENSURE( !bTemplate, "No template for Writer Global" ); if (nVersion == SOFFICE_FILEFORMAT_60) { diff --git a/sw/source/core/uibase/web/wdocsh.cxx b/sw/source/core/uibase/web/wdocsh.cxx index ac44c7d16c4a..12b47059b199 100644 --- a/sw/source/core/uibase/web/wdocsh.cxx +++ b/sw/source/core/uibase/web/wdocsh.cxx @@ -63,10 +63,10 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName, OUString * pLongUserName, OUString * pUserName, sal_Int32 nVersion, - sal_Bool bTemplate /* = sal_False */) const + bool bTemplate /* = false */) const { (void)bTemplate; - OSL_ENSURE( bTemplate == sal_False, "No template for Writer Web" ); + OSL_ENSURE( !bTemplate, "No template for Writer Web" ); if (nVersion == SOFFICE_FILEFORMAT_60) { |