summaryrefslogtreecommitdiff
path: root/sfx2/source/doc
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r--sfx2/source/doc/docfac.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx82
-rw-r--r--sfx2/source/doc/docinsert.cxx4
-rw-r--r--sfx2/source/doc/docmacromode.cxx42
-rw-r--r--sfx2/source/doc/doctempl.cxx134
-rw-r--r--sfx2/source/doc/new.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx30
-rw-r--r--sfx2/source/doc/objserv.cxx6
-rw-r--r--sfx2/source/doc/objstor.cxx30
-rw-r--r--sfx2/source/doc/objxtor.cxx4
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx6
11 files changed, 171 insertions, 171 deletions
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index d88990951097..6a275ddd8d30 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -88,7 +88,7 @@ struct SfxObjectFactory_Impl
-SfxFilterContainer* SfxObjectFactory::GetFilterContainer( sal_Bool /*bForceLoad*/ ) const
+SfxFilterContainer* SfxObjectFactory::GetFilterContainer( bool /*bForceLoad*/ ) const
{
return pImpl->pFilterContainer;
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 786ed55b6b70..fc4e07ebb8a1 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -424,13 +424,13 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate )
}
-sal_Bool SfxMedium::DocNeedsFileDateCheck()
+bool SfxMedium::DocNeedsFileDateCheck()
{
return ( !IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
}
-util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue )
+util::DateTime SfxMedium::GetInitFileDate( bool bIgnoreOldValue )
{
if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && !pImp->m_aLogicName.isEmpty() )
{
@@ -631,13 +631,13 @@ SvStream* SfxMedium::GetOutStream()
}
-sal_Bool SfxMedium::CloseOutStream()
+bool SfxMedium::CloseOutStream()
{
CloseOutStream_Impl();
return true;
}
-sal_Bool SfxMedium::CloseOutStream_Impl()
+bool SfxMedium::CloseOutStream_Impl()
{
if ( pImp->m_pOutStream )
{
@@ -691,7 +691,7 @@ void SfxMedium::CreateFileStream()
}
-sal_Bool SfxMedium::Commit()
+bool SfxMedium::Commit()
{
if( pImp->xStorage.is() )
StorageCommit_Impl();
@@ -717,7 +717,7 @@ sal_Bool SfxMedium::Commit()
}
-sal_Bool SfxMedium::IsStorage()
+bool SfxMedium::IsStorage()
{
if ( pImp->xStorage.is() )
return true;
@@ -747,7 +747,7 @@ sal_Bool SfxMedium::IsStorage()
}
-sal_Bool SfxMedium::IsPreview_Impl()
+bool SfxMedium::IsPreview_Impl()
{
bool bPreview = false;
SFX_ITEMSET_ARG( GetItemSet(), pPreview, SfxBoolItem, SID_PREVIEW, false);
@@ -867,7 +867,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
// not for some URL scheme belongs in UCB, not here.
-sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock )
+sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, bool bIsLoading, bool bOwnLock )
{
sal_Int8 nResult = LOCK_UI_NOLOCK;
@@ -993,7 +993,7 @@ namespace
// sets SID_DOC_READONLY if the document cannot be opened for editing
// if user cancel the loading the ERROR_ABORT is set
-void SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
+void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
{
#if !HAVE_FEATURE_MULTIUSER_ENVIRONMENT
(void) bLoading;
@@ -1237,7 +1237,7 @@ void SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
}
-uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIfNo )
+uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo )
{
if ( pImp->xStorage.is() || pImp->m_bTriedStorage )
return pImp->xStorage;
@@ -1404,7 +1404,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
}
-uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool bReadOnly )
+uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( bool bReadOnly )
{
if ( !GetError() && !pImp->m_xZipStorage.is() )
{
@@ -1473,12 +1473,12 @@ void SfxMedium::CloseStorage()
pImp->bIsStorage = false;
}
-void SfxMedium::CanDisposeStorage_Impl( sal_Bool bDisposeStorage )
+void SfxMedium::CanDisposeStorage_Impl( bool bDisposeStorage )
{
pImp->bDisposeStorage = bDisposeStorage;
}
-sal_Bool SfxMedium::WillDisposeStorageOnClose_Impl()
+bool SfxMedium::WillDisposeStorageOnClose_Impl()
{
return pImp->bDisposeStorage;
}
@@ -1489,7 +1489,7 @@ StreamMode SfxMedium::GetOpenMode() const
}
void SfxMedium::SetOpenMode( StreamMode nStorOpen,
- sal_Bool bDontClose )
+ bool bDontClose )
{
if ( pImp->m_nStorOpenMode != nStorOpen )
{
@@ -1506,7 +1506,7 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen,
}
-sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent,
+bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent,
const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv )
{
try
@@ -1530,7 +1530,7 @@ sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalCont
}
-sal_Bool SfxMedium::StorageCommit_Impl()
+bool SfxMedium::StorageCommit_Impl()
{
bool bResult = false;
Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv;
@@ -1589,7 +1589,7 @@ sal_Bool SfxMedium::StorageCommit_Impl()
}
-sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
+bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
const INetURLObject& aDest,
const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv )
{
@@ -1715,7 +1715,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
}
-sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet )
+bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet )
{
if ( GetError() )
return false;
@@ -2410,20 +2410,20 @@ void SfxMedium::GetMedium_Impl()
}
-sal_Bool SfxMedium::IsRemote()
+bool SfxMedium::IsRemote()
{
return pImp->m_bRemote;
}
-void SfxMedium::SetUpdatePickList(sal_Bool bVal)
+void SfxMedium::SetUpdatePickList(bool bVal)
{
pImp->bUpdatePickList = bVal;
}
-sal_Bool SfxMedium::IsUpdatePickList() const
+bool SfxMedium::IsUpdatePickList() const
{
return pImp->bUpdatePickList;
}
@@ -2544,7 +2544,7 @@ SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl(this))
-void SfxMedium::UseInteractionHandler( sal_Bool bUse )
+void SfxMedium::UseInteractionHandler( bool bUse )
{
pImp->bAllowDefaultIntHdl = bUse;
}
@@ -2584,7 +2584,7 @@ SfxMedium::GetInteractionHandler()
-void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool /*bResetOrig*/ )
+void SfxMedium::SetFilter( const SfxFilter* pFilterP, bool /*bResetOrig*/ )
{
pImp->m_pFilter = pFilterP;
}
@@ -2596,14 +2596,14 @@ const SfxFilter* SfxMedium::GetFilter() const
-const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const
+const SfxFilter* SfxMedium::GetOrigFilter( bool bNotCurrent ) const
{
return ( pImp->pOrigFilter || bNotCurrent ) ? pImp->pOrigFilter : pImp->m_pFilter;
}
-sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter )
+sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter )
{
sal_uInt32 nHash = 0;
@@ -2649,7 +2649,7 @@ void SfxMedium::CloseAndRelease()
UnlockFile( true );
}
-void SfxMedium::UnlockFile( sal_Bool bReleaseLockStream )
+void SfxMedium::UnlockFile( bool bReleaseLockStream )
{
#if !HAVE_FEATURE_MULTIUSER_ENVIRONMENT
(void) bReleaseLockStream;
@@ -2764,7 +2764,7 @@ void SfxMedium::SetIsRemote_Impl()
-void SfxMedium::SetName( const OUString& aNameP, sal_Bool bSetOrigURL )
+void SfxMedium::SetName( const OUString& aNameP, bool bSetOrigURL )
{
if (pImp->aOrigURL.isEmpty())
pImp->aOrigURL = pImp->m_aLogicName;
@@ -3028,13 +3028,13 @@ void SfxMedium::SetExpired_Impl( const DateTime& rDateTime )
}
-sal_Bool SfxMedium::IsExpired() const
+bool SfxMedium::IsExpired() const
{
return pImp->aExpireTime.IsValidAndGregorian() && pImp->aExpireTime < DateTime( DateTime::SYSTEM );
}
-void SfxMedium::ForceSynchronStream_Impl( sal_Bool bForce )
+void SfxMedium::ForceSynchronStream_Impl( bool bForce )
{
if( pImp->m_pInStream )
{
@@ -3050,7 +3050,7 @@ SfxFrame* SfxMedium::GetLoadTargetFrame() const
return pImp->wLoadTargetFrame;
}
-void SfxMedium::setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,sal_Bool bIsReadOnly )
+void SfxMedium::setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, bool bIsReadOnly )
{
pImp->m_xInputStreamToLoadFrom = xInputStream;
pImp->m_bInputStreamIsReadOnly = bIsReadOnly;
@@ -3180,7 +3180,7 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
return 0;
}
-sal_Bool SfxMedium::RemoveVersion_Impl( const OUString& rName )
+bool SfxMedium::RemoveVersion_Impl( const OUString& rName )
{
if ( !pImp->aVersions.getLength() )
return false;
@@ -3200,7 +3200,7 @@ sal_Bool SfxMedium::RemoveVersion_Impl( const OUString& rName )
return false;
}
-sal_Bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium )
+bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium )
{
if ( rMedium.pImp->aVersions.getLength() )
{
@@ -3211,7 +3211,7 @@ sal_Bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium )
return false;
}
-sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ )
+bool SfxMedium::SaveVersionList_Impl( bool /*bUseXML*/ )
{
if ( GetStorage().is() )
{
@@ -3234,7 +3234,7 @@ sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ )
}
-sal_Bool SfxMedium::IsReadOnly()
+bool SfxMedium::IsReadOnly()
{
// a) ReadOnly filter cant produce read/write contents!
bool bReadOnly = (
@@ -3263,7 +3263,7 @@ bool SfxMedium::IsOriginallyReadOnly() const
}
-sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL )
+bool SfxMedium::SetWritableForUserOnly( const OUString& aURL )
{
// UCB does not allow to allow write access only for the user,
// use osl API
@@ -3293,7 +3293,7 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL )
}
-void SfxMedium::CreateTempFile( sal_Bool bReplace )
+void SfxMedium::CreateTempFile( bool bReplace )
{
if ( pImp->pTempFile )
{
@@ -3416,7 +3416,7 @@ void SfxMedium::CreateTempFileNoCopy()
CloseStorage();
}
-sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature )
+bool SfxMedium::SignContents_Impl( bool bScriptingContent, const OUString& aODFVersion, bool bHasValidDocumentSignature )
{
bool bChanges = false;
@@ -3537,12 +3537,12 @@ void SfxMedium::SetCachedSignatureState_Impl( sal_uInt16 nState )
pImp->m_nSignatureState = nState;
}
-sal_Bool SfxMedium::HasStorage_Impl() const
+bool SfxMedium::HasStorage_Impl() const
{
return pImp->xStorage.is();
}
-sal_Bool SfxMedium::IsOpen() const
+bool SfxMedium::IsOpen() const
{
return pImp->m_pInStream || pImp->m_pOutStream || pImp->xStorage.is();
}
@@ -3589,7 +3589,7 @@ OUString SfxMedium::CreateTempCopyWithExt( const OUString& aURL )
return aResult;
}
-sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteractionHandler >& xHandler, uno::Any aRequest, sal_Bool bAllowAbort )
+bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteractionHandler >& xHandler, uno::Any aRequest, bool bAllowAbort )
{
bool bResult = false;
@@ -3694,7 +3694,7 @@ OUString SfxMedium::SwitchDocumentToTempFile()
return aResult;
}
-sal_Bool SfxMedium::SwitchDocumentToFile( const OUString& aURL )
+bool SfxMedium::SwitchDocumentToFile( const OUString& aURL )
{
// the method is only for storage based documents
bool bResult = false;
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 0b226d33ac56..6c57bd3882f0 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -90,7 +90,7 @@ SfxMedium* DocumentInserter::CreateMedium()
pMedium = new SfxMedium(
sURL, SFX_STREAM_READONLY,
SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
- pMedium->UseInteractionHandler( sal_True );
+ pMedium->UseInteractionHandler( true );
SfxFilterMatcher* pMatcher = NULL;
if ( !m_sDocFactory.isEmpty() )
pMatcher = new SfxFilterMatcher( m_sDocFactory );
@@ -124,7 +124,7 @@ SfxMediumList* DocumentInserter::CreateMediumList()
*i, SFX_STREAM_READONLY,
SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
- pMedium->UseInteractionHandler( sal_True );
+ pMedium->UseInteractionHandler( true );
SfxFilterMatcher aMatcher( m_sDocFactory );
const SfxFilter* pFilter = NULL;
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 5752b6cb1d0a..01044c276ff9 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -98,7 +98,7 @@ namespace sfx2
ErrorCodeRequest aErrorCodeRequest;
aErrorCodeRequest.ErrCode = nSfxErrorCode;
- SfxMedium::CallApproveHandler( rxHandler, makeAny( aErrorCodeRequest ), sal_False );
+ SfxMedium::CallApproveHandler( rxHandler, makeAny( aErrorCodeRequest ), false );
rbAlreadyShown = sal_True;
}
@@ -124,7 +124,7 @@ namespace sfx2
{
DocumentMacroConfirmationRequest aRequest;
aRequest.DocumentURL = rDocumentLocation;
- return SfxMedium::CallApproveHandler( rxHandler, makeAny( aRequest ), sal_True );
+ return SfxMedium::CallApproveHandler( rxHandler, makeAny( aRequest ), true );
}
}
@@ -143,21 +143,21 @@ namespace sfx2
}
- sal_Bool DocumentMacroMode::allowMacroExecution()
+ bool DocumentMacroMode::allowMacroExecution()
{
m_pData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
- return sal_True;
+ return true;
}
- sal_Bool DocumentMacroMode::disallowMacroExecution()
+ bool DocumentMacroMode::disallowMacroExecution()
{
m_pData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::NEVER_EXECUTE );
- return sal_False;
+ return false;
}
- sal_Bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction )
+ bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction )
{
sal_uInt16 nMacroExecutionMode = m_pData->m_rDocumentAccess.getCurrentMacroExecMode();
@@ -209,10 +209,10 @@ namespace sfx2
}
if ( nMacroExecutionMode == MacroExecMode::NEVER_EXECUTE )
- return sal_False;
+ return false;
if ( nMacroExecutionMode == MacroExecMode::ALWAYS_EXECUTE_NO_WARN )
- return sal_True;
+ return true;
try
{
@@ -309,15 +309,15 @@ namespace sfx2
}
- sal_Bool DocumentMacroMode::isMacroExecutionDisallowed() const
+ bool DocumentMacroMode::isMacroExecutionDisallowed() const
{
return m_pData->m_rDocumentAccess.getCurrentMacroExecMode() == MacroExecMode::NEVER_EXECUTE;
}
- sal_Bool DocumentMacroMode::containerHasBasicMacros( const Reference< XLibraryContainer >& xContainer )
+ bool DocumentMacroMode::containerHasBasicMacros( const Reference< XLibraryContainer >& xContainer )
{
- sal_Bool bHasMacroLib = sal_False;
+ bool bHasMacroLib = false;
try
{
if ( xContainer.is() )
@@ -327,7 +327,7 @@ namespace sfx2
// if there are libraries except the "Standard" library
// we assume that they are not empty (because they have been created by the user)
if ( !xContainer->hasElements() )
- bHasMacroLib = sal_False;
+ bHasMacroLib = false;
else
{
OUString aStdLibName( "Standard" );
@@ -345,10 +345,10 @@ namespace sfx2
Any aAny = xContainer->getByName( aStdLibName );
aAny >>= xLib;
if ( xLib.is() && xLib->hasElements() )
- return sal_True;
+ return true;
}
else
- return sal_True;
+ return true;
}
}
}
@@ -362,9 +362,9 @@ namespace sfx2
}
- sal_Bool DocumentMacroMode::hasMacroLibrary() const
+ bool DocumentMacroMode::hasMacroLibrary() const
{
- sal_Bool bHasMacroLib = sal_False;
+ bool bHasMacroLib = false;
#ifndef DISABLE_SCRIPTING
try
{
@@ -384,9 +384,9 @@ namespace sfx2
}
- sal_Bool DocumentMacroMode::storageHasMacros( const Reference< XStorage >& rxStorage )
+ bool DocumentMacroMode::storageHasMacros( const Reference< XStorage >& rxStorage )
{
- sal_Bool bHasMacros = sal_False;
+ bool bHasMacros = false;
if ( rxStorage.is() )
{
try
@@ -411,9 +411,9 @@ namespace sfx2
}
- sal_Bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& rxInteraction )
+ bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& rxInteraction )
{
- sal_Bool bAllow = sal_False;
+ bool bAllow = false;
if ( SvtSecurityOptions().IsMacroDisabled() )
{
// no macro should be executed at all
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 2ad4321e7432..832faee8dd6d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -538,13 +538,13 @@ OUString SfxDocumentTemplates::ConvertResourceString (
-sal_Bool SfxDocumentTemplates::CopyOrMove
+bool SfxDocumentTemplates::CopyOrMove
(
sal_uInt16 nTargetRegion, // Target Region Index
sal_uInt16 nTargetIdx, // Target position Index
sal_uInt16 nSourceRegion, // Source Region Index
sal_uInt16 nSourceIdx, /* Index to be copied / to moved template */
- sal_Bool bMove // Copy / Move
+ bool bMove // Copy / Move
)
/* [Description]
@@ -575,29 +575,29 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
DocTemplLocker_Impl aLocker( *pImp );
if ( !pImp->Construct() )
- return sal_False;
+ return false;
// Don't copy or move any folders
if( nSourceIdx == USHRT_MAX )
- return sal_False ;
+ return false ;
if ( nSourceRegion == nTargetRegion )
{
SAL_WARN( "sfx.doc", "Don't know, what to do!" );
- return sal_False;
+ return false;
}
RegionData_Impl *pSourceRgn = pImp->GetRegion( nSourceRegion );
if ( !pSourceRgn )
- return sal_False;
+ return false;
DocTempl_EntryData_Impl *pSource = pSourceRgn->GetEntry( nSourceIdx );
if ( !pSource )
- return sal_False;
+ return false;
RegionData_Impl *pTargetRgn = pImp->GetRegion( nTargetRegion );
if ( !pTargetRgn )
- return sal_False;
+ return false;
OUString aTitle = pSource->GetTitle();
@@ -609,7 +609,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
{
OUString aNewTargetURL = GetTemplateTargetURLFromComponent( pTargetRgn->GetTitle(), aTitle );
if ( aNewTargetURL.isEmpty() )
- return sal_False;
+ return false;
if ( bMove )
{
@@ -621,7 +621,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
else
{
if ( xTemplates->removeTemplate( pTargetRgn->GetTitle(), aTitle ) )
- return sal_False; // will trigger tetry with copy instead of move
+ return false; // will trigger tetry with copy instead of move
// if it is not possible to remove just created template ( must be possible! )
// it is better to report success here, since at least the copy has succeeded
@@ -633,18 +633,18 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
size_t temp_nTargetIdx = nTargetIdx;
pTargetRgn->AddEntry( aTitle, aNewTargetURL, &temp_nTargetIdx );
- return sal_True;
+ return true;
}
// --**-- if the current file is opened,
// it must be re-opened afterwards.
- return sal_False;
+ return false;
}
-sal_Bool SfxDocumentTemplates::Move
+bool SfxDocumentTemplates::Move
(
sal_uInt16 nTargetRegion, // Target Region Index
sal_uInt16 nTargetIdx, // Target position Index
@@ -669,12 +669,12 @@ sal_Bool SfxDocumentTemplates::Move
DocTemplLocker_Impl aLocker( *pImp );
return CopyOrMove( nTargetRegion, nTargetIdx,
- nSourceRegion, nSourceIdx, sal_True );
+ nSourceRegion, nSourceIdx, true );
}
-sal_Bool SfxDocumentTemplates::Copy
+bool SfxDocumentTemplates::Copy
(
sal_uInt16 nTargetRegion, // Target Region Index
sal_uInt16 nTargetIdx, // Target position Index
@@ -700,12 +700,12 @@ sal_Bool SfxDocumentTemplates::Copy
DocTemplLocker_Impl aLocker( *pImp );
return CopyOrMove( nTargetRegion, nTargetIdx,
- nSourceRegion, nSourceIdx, sal_False );
+ nSourceRegion, nSourceIdx, false );
}
-sal_Bool SfxDocumentTemplates::CopyTo
+bool SfxDocumentTemplates::CopyTo
(
sal_uInt16 nRegion, // Region of the template to be exported
sal_uInt16 nIdx, // Index of the template to be exported
@@ -731,15 +731,15 @@ sal_Bool SfxDocumentTemplates::CopyTo
DocTemplLocker_Impl aLocker( *pImp );
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
RegionData_Impl *pSourceRgn = pImp->GetRegion( nRegion );
if ( !pSourceRgn )
- return sal_False;
+ return false;
DocTempl_EntryData_Impl *pSource = pSourceRgn->GetEntry( nIdx );
if ( !pSource )
- return sal_False;
+ return false;
INetURLObject aTargetURL( rName );
@@ -768,16 +768,16 @@ sal_Bool SfxDocumentTemplates::CopyTo
aTarget.executeCommand( aCmd, aArg );
}
catch ( ContentCreationException& )
- { return sal_False; }
+ { return false; }
catch ( Exception& )
- { return sal_False; }
+ { return false; }
- return sal_True;
+ return true;
}
-sal_Bool SfxDocumentTemplates::CopyFrom
+bool SfxDocumentTemplates::CopyFrom
(
sal_uInt16 nRegion, /* Region in which the template is to be
imported */
@@ -806,19 +806,19 @@ sal_Bool SfxDocumentTemplates::CopyFrom
DocTemplLocker_Impl aLocker( *pImp );
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
RegionData_Impl *pTargetRgn = pImp->GetRegion( nRegion );
if ( !pTargetRgn )
- return sal_False;
+ return false;
uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates();
if ( !xTemplates.is() )
- return sal_False;
+ return false;
OUString aTitle;
- sal_Bool bTemplateAdded = sal_False;
+ bool bTemplateAdded = false;
if( pImp->GetTitleFromURL( rName, aTitle ) )
{
@@ -904,7 +904,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
size_t temp_nIdx = nIdx;
pTargetRgn->AddEntry( aTitle, aTemplName, &temp_nIdx );
rName = aTitle;
- return sal_True;
+ return true;
}
else
{
@@ -917,12 +917,12 @@ sal_Bool SfxDocumentTemplates::CopyFrom
}
}
- return sal_False;
+ return false;
}
-sal_Bool SfxDocumentTemplates::Delete
+bool SfxDocumentTemplates::Delete
(
sal_uInt16 nRegion, // Region Index
sal_uInt16 nIdx /* Index of the entry or USHRT_MAX,
@@ -952,12 +952,12 @@ sal_Bool SfxDocumentTemplates::Delete
Then remove the data from the lists
*/
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
RegionData_Impl *pRegion = pImp->GetRegion( nRegion );
if ( !pRegion )
- return sal_False;
+ return false;
sal_Bool bRet;
uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates();
@@ -973,7 +973,7 @@ sal_Bool SfxDocumentTemplates::Delete
DocTempl_EntryData_Impl *pEntry = pRegion->GetEntry( nIdx );
if ( !pEntry )
- return sal_False;
+ return false;
bRet = xTemplates->removeTemplate( pRegion->GetTitle(),
pEntry->GetTitle() );
@@ -986,7 +986,7 @@ sal_Bool SfxDocumentTemplates::Delete
-sal_Bool SfxDocumentTemplates::InsertDir
+bool SfxDocumentTemplates::InsertDir
(
const OUString& rText, // the logical name of the new Region
sal_uInt16 nRegion // Region Index
@@ -1009,12 +1009,12 @@ sal_Bool SfxDocumentTemplates::InsertDir
DocTemplLocker_Impl aLocker( *pImp );
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
RegionData_Impl *pRegion = pImp->GetRegion( rText );
if ( pRegion )
- return sal_False;
+ return false;
uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates();
@@ -1025,44 +1025,44 @@ sal_Bool SfxDocumentTemplates::InsertDir
if ( ! pImp->InsertRegion( pNewRegion, nRegion ) )
{
delete pNewRegion;
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool SfxDocumentTemplates::InsertTemplate(sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const OUString &rName, const OUString &rPath)
+bool SfxDocumentTemplates::InsertTemplate(sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const OUString &rName, const OUString &rPath)
{
DocTemplLocker_Impl aLocker( *pImp );
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
RegionData_Impl *pRegion = pImp->GetRegion( nSourceRegion );
if ( !pRegion )
- return sal_False;
+ return false;
size_t pos = nIdx;
pRegion->AddEntry( rName, rPath, &pos );
- return sal_True;
+ return true;
}
-sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, sal_uInt16 nIdx )
+bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, sal_uInt16 nIdx )
{
DocTemplLocker_Impl aLocker( *pImp );
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
RegionData_Impl *pRegion = pImp->GetRegion( nRegion );
if ( !pRegion )
- return sal_False;
+ return false;
uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates();
OUString aEmpty;
@@ -1070,7 +1070,7 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegio
if ( nIdx == USHRT_MAX )
{
if ( pRegion->GetTitle() == rName )
- return sal_True;
+ return true;
// we have to rename a region
if ( xTemplates->renameGroup( pRegion->GetTitle(), rName ) )
@@ -1078,7 +1078,7 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegio
pRegion->SetTitle( rName );
pRegion->SetTargetURL( aEmpty );
pRegion->SetHierarchyURL( aEmpty );
- return sal_True;
+ return true;
}
}
else
@@ -1086,10 +1086,10 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegio
DocTempl_EntryData_Impl *pEntry = pRegion->GetEntry( nIdx );
if ( !pEntry )
- return sal_False;
+ return false;
if ( pEntry->GetTitle() == rName )
- return sal_True;
+ return true;
if ( xTemplates->renameTemplate( pRegion->GetTitle(),
pEntry->GetTitle(),
@@ -1098,16 +1098,16 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegio
pEntry->SetTitle( rName );
pEntry->SetTargetURL( aEmpty );
pEntry->SetHierarchyURL( aEmpty );
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
-sal_Bool SfxDocumentTemplates::GetFull
+bool SfxDocumentTemplates::GetFull
(
const OUString &rRegion, // Region Name
const OUString &rName, // Template Name
@@ -1133,10 +1133,10 @@ sal_Bool SfxDocumentTemplates::GetFull
// We don't search for empty names!
if ( rName.isEmpty() )
- return sal_False;
+ return false;
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
DocTempl_EntryData_Impl* pEntry = NULL;
const sal_uInt16 nCount = GetRegionCount();
@@ -1163,7 +1163,7 @@ sal_Bool SfxDocumentTemplates::GetFull
-sal_Bool SfxDocumentTemplates::GetLogicNames
+bool SfxDocumentTemplates::GetLogicNames
(
const OUString &rPath, // Full Path to the template
OUString &rRegion, // Out: Region name
@@ -1188,7 +1188,7 @@ sal_Bool SfxDocumentTemplates::GetLogicNames
DocTemplLocker_Impl aLocker( *pImp );
if ( ! pImp->Construct() )
- return sal_False;
+ return false;
INetURLObject aFullPath;
@@ -1267,7 +1267,7 @@ SfxDocumentTemplates::~SfxDocumentTemplates()
pImp = NULL;
}
-void SfxDocumentTemplates::Update( sal_Bool _bSmart )
+void SfxDocumentTemplates::Update( bool _bSmart )
{
if ( !_bSmart // don't be smart
|| ::svt::TemplateFolderCache( sal_True ).needsUpdate() // update is really necessary
@@ -1678,7 +1678,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( )
::osl::MutexGuard aGuard( maMutex );
if ( mbConstructed )
- return sal_True;
+ return true;
uno::Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
@@ -1695,7 +1695,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( )
uno::Reference < XCommandEnvironment > aCmdEnv;
if ( ! aRootContent.is() )
- return sal_False;
+ return false;
mbConstructed = sal_True;
maRootURL = aRootContent->getIdentifier()->getContentIdentifier();
@@ -1708,7 +1708,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( )
Content aTemplRoot( aRootContent, aCmdEnv, xContext );
CreateFromHierarchy( aTemplRoot );
- return sal_True;
+ return true;
}
@@ -1733,7 +1733,7 @@ sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos )
// return false (not inserted) if the entry already exists
for ( size_t i = 0, n = maRegions.size(); i < n; ++i )
if ( maRegions[ i ]->Compare( pNew ) == 0 )
- return sal_False;
+ return false;
size_t newPos = nPos;
if ( pNew->GetTitle() == maStandardGroup )
@@ -1748,7 +1748,7 @@ sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos )
else
maRegions.push_back( pNew );
- return sal_True;
+ return true;
}
@@ -1790,7 +1790,7 @@ sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL,
catch ( Exception& )
{
// the document is not a StarOffice document
- return sal_False;
+ return false;
}
@@ -1817,7 +1817,7 @@ sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL,
INetURLObject::DECODE_WITH_CHARSET );
}
- return sal_True;
+ return true;
}
@@ -1848,7 +1848,7 @@ sal_Bool getTextProperty_Impl( Content& rContent,
// check, whether or not the property exists
if ( !aPropInfo.is() || !aPropInfo->hasPropertyByName( rPropName ) )
{
- return sal_False;
+ return false;
}
// now get the property
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index ae62b8f82d75..c97caebc8087 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -421,7 +421,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
// update the template configuration if necessary
{
WaitObject aWaitCursor( pAntiImplP->GetParent() );
- aTemplates.Update( sal_True /* be smart */ );
+ aTemplates.Update( true /* be smart */ );
}
// fill the list boxes
const sal_uInt16 nCount = aTemplates.GetRegionCount();
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index f520802c1e8b..025f13873937 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -430,14 +430,14 @@ void SfxObjectShell::SetReadOnly()
{
sal_Bool bWasROUI = IsReadOnly();
- pMedium->UnlockFile( sal_False );
+ pMedium->UnlockFile( false );
// the storage-based mediums are already based on the temporary file
// so UnlockFile has already closed the locking stream
if ( !pMedium->HasStorage_Impl() && IsLoadingFinished() )
pMedium->CloseInStream();
- pMedium->SetOpenMode( SFX_STREAM_READONLY, sal_True );
+ pMedium->SetOpenMode( SFX_STREAM_READONLY, true );
pMedium->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) );
if ( !bWasROUI )
@@ -1105,7 +1105,7 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract
::com::sun::star::task::ErrorCodeRequest aErrorCode;
aErrorCode.ErrCode = ERRCODE_SFX_INCOMPLETE_ENCRYPTION;
- SfxMedium::CallApproveHandler( xHandler, uno::makeAny( aErrorCode ), sal_False );
+ SfxMedium::CallApproveHandler( xHandler, uno::makeAny( aErrorCode ), false );
pImp->m_bIncomplEncrWarnShown = sal_True;
}
@@ -1308,7 +1308,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
}
// set medium to noname
- pTmpMedium->SetName( OUString(), sal_True );
+ pTmpMedium->SetName( OUString(), true );
pTmpMedium->Init_Impl();
// drop resource
@@ -1325,7 +1325,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
// the medium should disconnect from the original location
// the storage should not be disposed since the document is still
// based on it, but in DoSaveCompleted it will be disposed
- pTmpMedium->CanDisposeStorage_Impl( sal_False );
+ pTmpMedium->CanDisposeStorage_Impl( false );
pTmpMedium->Close();
// setting the new storage the medium will be based on
@@ -1346,7 +1346,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
}
// the medium should not dispose the storage, DoSaveCompleted() has let it to do so
- pTmpMedium->CanDisposeStorage_Impl( sal_False );
+ pTmpMedium->CanDisposeStorage_Impl( false );
}
else
{
@@ -1357,12 +1357,12 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
{
// some further initializations for templates
SetTemplate_Impl( aName, aTemplateName, this );
- pTmpMedium->CreateTempFile( sal_True );
+ pTmpMedium->CreateTempFile( true );
}
// templates are never readonly
pTmpMedium->GetItemSet()->ClearItem( SID_DOC_READONLY );
- pTmpMedium->SetOpenMode( SFX_STREAM_READWRITE, sal_True );
+ pTmpMedium->SetOpenMode( SFX_STREAM_READWRITE, true );
// notifications about possible changes in readonly state and document info
Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
@@ -1872,17 +1872,17 @@ sal_Int16 SfxObjectShell_Impl::getCurrentMacroExecMode() const
return nImposedExecMode;
}
-sal_Bool SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
+bool SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
{
const SfxMedium* pMedium( rDocShell.GetMedium() );
OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getCurrentMacroExecMode: no medium!" );
if ( pMedium )
{
pMedium->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, nMacroMode ) );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
OUString SfxObjectShell_Impl::getDocumentLocation() const
@@ -1915,7 +1915,7 @@ uno::Reference< embed::XStorage > SfxObjectShell_Impl::getZipStorageToSign()
return xStore;
}
-sal_Bool SfxObjectShell_Impl::documentStorageHasMacros() const
+bool SfxObjectShell_Impl::documentStorageHasMacros() const
{
return ::sfx2::DocumentMacroMode::storageHasMacros( m_xDocStorage );
}
@@ -1938,9 +1938,9 @@ sal_Int16 SfxObjectShell_Impl::getScriptingSignatureState()
return nSignatureState;
}
-sal_Bool SfxObjectShell_Impl::hasTrustedScriptingSignature( sal_Bool bAllowUIToAddAuthor )
+bool SfxObjectShell_Impl::hasTrustedScriptingSignature( bool bAllowUIToAddAuthor )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
try
{
@@ -1989,7 +1989,7 @@ sal_Bool SfxObjectShell_Impl::hasTrustedScriptingSignature( sal_Bool bAllowUIToA
aRequest.DocumentSignatureInformation = aInfo;
aRequest.DocumentVersion = aVersion;
aRequest.Classification = task::InteractionClassification_QUERY;
- bResult = SfxMedium::CallApproveHandler( xInteraction, uno::makeAny( aRequest ), sal_True );
+ bResult = SfxMedium::CallApproveHandler( xInteraction, uno::makeAny( aRequest ), true );
}
}
}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 8ab06d0ad4c9..99795f63dd91 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -512,7 +512,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
IsUseUserData() );
if ( !GetSlotState( SID_DOCTEMPLATE ) )
// templates not supported
- aDocInfoItem.SetTemplate(sal_False);
+ aDocInfoItem.SetTemplate(false);
SfxItemSet aSet(GetPool(), SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY,
SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL,
@@ -706,7 +706,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
// the StoreAsURL/StoreToURL method have called this method with false
// so it has to be restored to true here since it is a call from GUI
- GetMedium()->SetUpdatePickList( sal_True );
+ GetMedium()->SetUpdatePickList( true );
// TODO: in future it must be done in followind way
// if document is opened from GUI it is immediatelly appears in the picklist
@@ -912,7 +912,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
// Prevent entry in the Pick-lists
if ( rReq.IsAPI() )
- GetMedium()->SetUpdatePickList( sal_False );
+ GetMedium()->SetUpdatePickList( false );
else if ( rReq.GetArgs() )
{
SFX_ITEMSET_GET( *rReq.GetArgs(), pPicklistItem, SfxBoolItem, SID_PICKLIST, false );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e64e1ec2a3d1..3d7fb6ff6806 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -516,7 +516,7 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
pMedium = new SfxMedium;
}
- pMedium->CanDisposeStorage_Impl( sal_True );
+ pMedium->CanDisposeStorage_Impl( true );
if ( InitNew( pMed ? pMed->GetStorage() : uno::Reference < embed::XStorage >() ) )
{
@@ -576,7 +576,7 @@ sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl(
SfxAllItemSet aSet( SFX_APP()->GetPool() );
TransformParameters( SID_OPENDOC, rMediaDescr, aSet );
pMedium->GetItemSet()->Put( aSet );
- pMedium->CanDisposeStorage_Impl( sal_False );
+ pMedium->CanDisposeStorage_Impl( false );
uno::Reference<text::XTextRange> xInsertTextRange;
for (sal_Int32 i = 0; i < rMediaDescr.getLength(); ++i)
{
@@ -626,7 +626,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
ModifyBlocker_Impl aBlock( this );
pMedium = pMed;
- pMedium->CanDisposeStorage_Impl( sal_True );
+ pMedium->CanDisposeStorage_Impl( true );
sal_Bool bOk = sal_False;
const SfxFilter* pFilter = pMed->GetFilter();
@@ -678,7 +678,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
EnableSetModified( sal_False );
- pMedium->LockOrigFileOnDemand( sal_True, sal_False );
+ pMedium->LockOrigFileOnDemand( true, false );
if ( GetError() == ERRCODE_NONE && bOwnStorageFormat && ( !pFilter || !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) )
{
uno::Reference< embed::XStorage > xStorage;
@@ -1211,7 +1211,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
AddLog( OUString( OSL_LOG_PREFIX "Save" ) );
if ( pMedium->DocNeedsFileDateCheck() )
- rMedium.CheckFileDate( pMedium->GetInitFileDate( sal_False ) );
+ rMedium.CheckFileDate( pMedium->GetInitFileDate( false ) );
if ( bCopyTo && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
{
@@ -1338,7 +1338,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
AddLog( OUString( OSL_LOG_PREFIX "Locking" ) );
- rMedium.LockOrigFileOnDemand( sal_False, sal_False );
+ rMedium.LockOrigFileOnDemand( false, false );
if ( bStorageBasedTarget )
{
@@ -1538,13 +1538,13 @@ sal_Bool SfxObjectShell::SaveTo_Impl
// add new version information into the versionlist and save the versionlist
// the version list must have been transferred from the "old" medium before
rMedium.AddVersion_Impl( aInfo );
- rMedium.SaveVersionList_Impl( sal_True );
+ rMedium.SaveVersionList_Impl( true );
bOk = PutURLContentsToVersionStream_Impl( aTmpVersionURL, xMedStorage, aInfo.Identifier );
}
}
else if ( bOk && ( pImp->bIsSaving || pImp->bPreserveVersions ) )
{
- rMedium.SaveVersionList_Impl( sal_True );
+ rMedium.SaveVersionList_Impl( true );
}
}
@@ -1620,7 +1620,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
OUString( "META-INF" ),
embed::ElementModes::READ );
- uno::Reference< embed::XStorage > xTarget = rMedium.GetZipStorageToSign_Impl( sal_False );
+ uno::Reference< embed::XStorage > xTarget = rMedium.GetZipStorageToSign_Impl( false );
if ( !xTarget.is() )
throw uno::RuntimeException();
uno::Reference< embed::XStorage > xTargetMetaInf = xTarget->openStorageElement(
@@ -1787,7 +1787,7 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu
// in this case the optimization is not possible, connect storage to a temporary file
rTargetMedium.ResetError();
xOptStorage->writeAndAttachToStream( uno::Reference< io::XStream >() );
- rSrcMedium.CanDisposeStorage_Impl( sal_False );
+ rSrcMedium.CanDisposeStorage_Impl( false );
rSrcMedium.Close();
// now try to create the backup
@@ -1801,7 +1801,7 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu
xOptStorage->attachToURL( aBackupURL, sal_True );
// the storage is successfully attached to backup, thus it it owned by the document not by the medium
- rSrcMedium.CanDisposeStorage_Impl( sal_False );
+ rSrcMedium.CanDisposeStorage_Impl( false );
bResult = sal_True;
}
}
@@ -1840,7 +1840,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
// the storage is successfully disconnected from the original sources, thus the medium must not dispose it
if ( pMediumArg )
- pMediumArg->CanDisposeStorage_Impl( sal_False );
+ pMediumArg->CanDisposeStorage_Impl( false );
bResult = sal_True;
}
@@ -1974,7 +1974,7 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
if ( bMedChanged )
{
pMedium = pNewMed;
- pMedium->CanDisposeStorage_Impl( sal_True );
+ pMedium->CanDisposeStorage_Impl( true );
}
const SfxFilter *pFilter = pMedium ? pMedium->GetFilter() : 0;
@@ -2097,12 +2097,12 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
// between medium commit and this step (attributes change and so on)
// so get the file date again
if ( pNewMed->DocNeedsFileDateCheck() )
- pNewMed->GetInitFileDate( sal_True );
+ pNewMed->GetInitFileDate( true );
}
}
pMedium->ClearBackup_Impl();
- pMedium->LockOrigFileOnDemand( sal_True, sal_False );
+ pMedium->LockOrigFileOnDemand( true, false );
AddToRecentlyUsedList();
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 4b2a7ad765d9..ed1f93a47587 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -373,8 +373,8 @@ SfxObjectShell::~SfxObjectShell()
pImp->pBaseModel.set( NULL );
// don't call GetStorage() here, in case of Load Failure it's possible that a storage was never assigned!
- if ( pMedium && pMedium->HasStorage_Impl() && pMedium->GetStorage( sal_False ) == pImp->m_xDocStorage )
- pMedium->CanDisposeStorage_Impl( sal_False );
+ if ( pMedium && pMedium->HasStorage_Impl() && pMedium->GetStorage( false ) == pImp->m_xDocStorage )
+ pMedium->CanDisposeStorage_Impl( false );
if ( pImp->mpObjectContainer )
{
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 26dc24dae2c6..dd8da00f4e4d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3100,7 +3100,7 @@ void SfxBaseModel::impl_store( const OUString& sURL
task::ErrorCodeRequest aErrorCode;
aErrorCode.ErrCode = nErrCode;
- SfxMedium::CallApproveHandler( xHandler, makeAny( aErrorCode ), sal_False );
+ SfxMedium::CallApproveHandler( xHandler, makeAny( aErrorCode ), false );
}
}
@@ -3747,7 +3747,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >&
pMedium->GetItemSet()->Put( aSet );
// allow to use an interactionhandler (if there is one)
- pMedium->UseInteractionHandler( sal_True );
+ pMedium->UseInteractionHandler( true );
SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, false);
sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
@@ -3807,7 +3807,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >&
// BaseURL is part of the ItemSet
SfxMedium aMedium( xStorage, OUString(), &aSet );
- aMedium.CanDisposeStorage_Impl( sal_False );
+ aMedium.CanDisposeStorage_Impl( false );
if ( aMedium.GetFilter() )
{
// storing without a valid filter will often crash
generated by cgit (git 2.34.1) at 2025-01-04 05:01:26 +0000