diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-10 22:48:41 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-16 09:39:12 +0100 |
| commit | 684baef50641a184e138c6e0a73b1a3b51c47ccb (patch) | |
| tree | 2d13e4ff9935cd48d22eb8c4a985d2dc8baadba5 /sfx2 | |
| parent | 58f0208479c05988c80c19e5af69ce3aa9426dbb (diff) | |
sal_Bool to bool
Change-Id: Ib19ecab287396dc6d6cf4a77dcf7072c5c4c84f8
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 11 | ||||
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 2 |
2 files changed, 7 insertions, 6 deletions
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 ); |