summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-17 11:39:18 +0200
committerNoel Grandin <noel@peralex.com>2014-04-22 09:53:13 +0200
commit584e8c8c3c81c4e475905c687b377676334b393b (patch)
tree3ac0dee881c06adafa632715d9ea22fb811a425f /embeddedobj
parentc7d6d3d241473d43fb8f7486805c0cfda2d66257 (diff)
embeddedobj: sal_Bool->bool
Change-Id: Ie3465a34963c768945b1ee7f5939ea1f233d3528
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/embedobj.cxx18
-rw-r--r--embeddedobj/source/commonembedding/inplaceobj.cxx2
-rw-r--r--embeddedobj/source/commonembedding/miscobj.cxx50
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx68
-rw-r--r--embeddedobj/source/commonembedding/visobj.cxx14
-rw-r--r--embeddedobj/source/general/docholder.cxx102
-rw-r--r--embeddedobj/source/general/dummyobject.cxx8
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx22
-rw-r--r--embeddedobj/source/inc/docholder.hxx30
-rw-r--r--embeddedobj/source/inc/dummyobject.hxx12
-rw-r--r--embeddedobj/source/inc/oleembobj.hxx52
-rw-r--r--embeddedobj/source/msole/oleembed.cxx16
-rw-r--r--embeddedobj/source/msole/olemisc.cxx54
-rw-r--r--embeddedobj/source/msole/olepersist.cxx78
-rw-r--r--embeddedobj/source/msole/olevisual.cxx4
-rw-r--r--embeddedobj/source/msole/ownview.cxx64
-rw-r--r--embeddedobj/source/msole/ownview.hxx12
-rw-r--r--embeddedobj/source/msole/xolefactory.cxx6
18 files changed, 306 insertions, 306 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 83d634efc958..09926e2c599d 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -113,7 +113,7 @@ void OCommonEmbeddedObject::Deactivate()
}
-void OCommonEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ,::osl::ResettableMutexGuard& rGuard )
+void OCommonEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ,::osl::ResettableMutexGuard& rGuard )
{
if ( m_pInterfaceContainer )
{
@@ -161,7 +161,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
if ( nNextState == embed::EmbedStates::RUNNING )
{
// after the object reaches the running state the cloned size is not necessary any more
- m_bHasClonedSize = sal_False;
+ m_bHasClonedSize = false;
if ( m_bIsLink )
{
@@ -216,7 +216,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
m_bHasClonedSize = m_pDocHolder->GetExtent( embed::Aspects::MSOLE_CONTENT, &m_aClonedSize );
// actually frame should not exist at this point
- m_pDocHolder->CloseDocument( sal_False, sal_False );
+ m_pDocHolder->CloseDocument( false, false );
m_nObjectState = nNextState;
}
@@ -252,7 +252,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
// dispatch provider may not be provided
uno::Reference< frame::XDispatchProvider > xContainerDP = xInplaceClient->getInplaceDispatchProvider();
- sal_Bool bOk = m_pDocHolder->ShowInplace( xClientWindowPeer, aRectangleToShow, xContainerDP );
+ bool bOk = m_pDocHolder->ShowInplace( xClientWindowPeer, aRectangleToShow, xContainerDP );
m_nObjectState = nNextState;
if ( !bOk )
{
@@ -326,7 +326,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
// the container. Locking the LM will prevent flicker.
xContainerLM->lock();
xInplaceClient->activatingUI();
- sal_Bool bOk = m_pDocHolder->ShowUI( xContainerLM, xContainerDP, aModuleName );
+ bool bOk = m_pDocHolder->ShowUI( xContainerLM, xContainerDP, aModuleName );
xContainerLM->unlock();
if ( bOk )
@@ -371,7 +371,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
uno::Reference< ::com::sun::star::frame::XLayoutManager > xContainerLM =
xInplaceClient->getLayoutManager();
- sal_Bool bOk = sal_False;
+ bool bOk = false;
if ( xContainerLM.is() )
bOk = m_pDocHolder->HideUI( xContainerLM );
@@ -463,7 +463,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
uno::Sequence< sal_Int32 > aIntermediateStates = GetIntermediateStatesSequence_Impl( nNewState );
// notify listeners that the object is going to change the state
- StateChangeNotification_Impl( sal_True, nOldState, nNewState,aGuard );
+ StateChangeNotification_Impl( true, nOldState, nNewState,aGuard );
try {
for ( sal_Int32 nInd = 0; nInd < aIntermediateStates.getLength(); nInd++ )
@@ -475,14 +475,14 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
{
if ( nOldState != m_nObjectState )
// notify listeners that the object has changed the state
- StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState, aGuard );
+ StateChangeNotification_Impl( false, nOldState, m_nObjectState, aGuard );
throw;
}
}
// notify listeners that the object has changed the state
- StateChangeNotification_Impl( sal_False, nOldState, nNewState, aGuard );
+ StateChangeNotification_Impl( false, nOldState, nNewState, aGuard );
// let the object window be shown
if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE )
diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index 08f976ba8875..594b97ee00c2 100644
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
awt::Rectangle GetRectangleInterception( const awt::Rectangle& aRect1, const awt::Rectangle& aRect2 );
-sal_Bool RectanglesEqual( const awt::Rectangle& aRect1, const awt::Rectangle& aRect2 )
+bool RectanglesEqual( const awt::Rectangle& aRect1, const awt::Rectangle& aRect2 )
{
return ( aRect1.X == aRect2.X
&& aRect1.Y == aRect2.Y
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index eb26eabf8362..eda750f7c991 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -38,27 +38,27 @@ using namespace ::com::sun::star;
uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< beans::PropertyValue >& aMedDescr,
- sal_Bool bCanUseDocumentBaseURL );
+ bool bCanUseDocumentBaseURL );
OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Sequence< beans::NamedValue >& aObjProps )
: m_pDocHolder( NULL )
, m_pInterfaceContainer( NULL )
-, m_bReadOnly( sal_False )
-, m_bDisposed( sal_False )
-, m_bClosed( sal_False )
+, m_bReadOnly( false )
+, m_bDisposed( false )
+, m_bClosed( false )
, m_nObjectState( -1 )
, m_nTargetState( -1 )
, m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE )
, m_xContext( rxContext )
, m_nMiscStatus( 0 )
-, m_bEmbeddedScriptSupport( sal_True )
-, m_bDocumentRecoverySupport( sal_True )
-, m_bWaitSaveCompleted( sal_False )
-, m_bIsLink( sal_False )
-, m_bLinkHasPassword( sal_False )
-, m_bHasClonedSize( sal_False )
+, m_bEmbeddedScriptSupport( true )
+, m_bDocumentRecoverySupport( true )
+, m_bWaitSaveCompleted( false )
+, m_bIsLink( false )
+, m_bLinkHasPassword( false )
+, m_bHasClonedSize( false )
, m_nClonedMapUnit( 0 )
{
CommonInit_Impl( aObjProps );
@@ -72,20 +72,20 @@ OCommonEmbeddedObject::OCommonEmbeddedObject(
const uno::Sequence< beans::PropertyValue >& aObjectDescr )
: m_pDocHolder( NULL )
, m_pInterfaceContainer( NULL )
-, m_bReadOnly( sal_False )
-, m_bDisposed( sal_False )
-, m_bClosed( sal_False )
+, m_bReadOnly( false )
+, m_bDisposed( false )
+, m_bClosed( false )
, m_nObjectState( embed::EmbedStates::LOADED )
, m_nTargetState( -1 )
, m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE )
, m_xContext( rxContext )
, m_nMiscStatus( 0 )
-, m_bEmbeddedScriptSupport( sal_True )
-, m_bDocumentRecoverySupport( sal_True )
-, m_bWaitSaveCompleted( sal_False )
-, m_bIsLink( sal_True )
-, m_bLinkHasPassword( sal_False )
-, m_bHasClonedSize( sal_False )
+, m_bEmbeddedScriptSupport( true )
+, m_bDocumentRecoverySupport( true )
+, m_bWaitSaveCompleted( false )
+, m_bIsLink( true )
+, m_bLinkHasPassword( false )
+, m_bHasClonedSize( false )
, m_nClonedMapUnit( 0 )
{
// linked object has no own persistence so it is in loaded state starting from creation
@@ -231,7 +231,7 @@ void OCommonEmbeddedObject::LinkInit_Impl(
OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
- m_bReadOnly = sal_True;
+ m_bReadOnly = true;
if ( m_aLinkFilterName.getLength() )
{
::comphelper::MimeConfigurationHelper aHelper( m_xContext );
@@ -239,7 +239,7 @@ void OCommonEmbeddedObject::LinkInit_Impl(
m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) );
}
- m_aDocMediaDescriptor = GetValuableArgs_Impl( aMediaDescr, sal_False );
+ m_aDocMediaDescriptor = GetValuableArgs_Impl( aMediaDescr, false );
uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
for ( sal_Int32 nObjInd = 0; nObjInd < aObjectDescr.getLength(); nObjInd++ )
@@ -282,7 +282,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject()
{
m_pDocHolder->CloseFrame();
try {
- m_pDocHolder->CloseDocument( sal_True, sal_True );
+ m_pDocHolder->CloseDocument( true, true );
} catch ( const uno::Exception& ) {}
m_pDocHolder->FreeOffice();
@@ -577,7 +577,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
m_pInterfaceContainer->disposeAndClear( aSource );
}
- m_bDisposed = sal_True; // the object is disposed now for outside
+ m_bDisposed = true; // the object is disposed now for outside
// it is possible that the document can not be closed, in this case if the argument is false
// the exception will be thrown otherwise in addition to exception the object must register itself
@@ -596,7 +596,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
{
m_pDocHolder->release();
m_pDocHolder = NULL;
- m_bClosed = sal_True;
+ m_bClosed = true;
}
throw;
@@ -626,7 +626,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
m_xRecoveryStorage.clear();
}
- m_bClosed = sal_True; // the closing succeeded
+ m_bClosed = true; // the closing succeeded
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index b5c5e588ac04..ec6ff17cd619 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< beans::PropertyValue >& aMedDescr,
- sal_Bool bCanUseDocumentBaseURL )
+ bool bCanUseDocumentBaseURL )
{
uno::Sequence< beans::PropertyValue > aResult;
sal_Int32 nResLen = 0;
@@ -87,7 +87,7 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence<
uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans::PropertyValue >& aOrig )
{
- sal_Bool bAsTemplateSet = sal_False;
+ bool bAsTemplateSet = false;
sal_Int32 nLength = aOrig.getLength();
uno::Sequence< beans::PropertyValue > aResult( nLength );
@@ -97,7 +97,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
if ( aResult[nInd].Name == "AsTemplate" )
{
aResult[nInd].Value <<= sal_True;
- bAsTemplateSet = sal_True;
+ bAsTemplateSet = true;
}
else
aResult[nInd].Value = aOrig[nInd].Value;
@@ -191,9 +191,9 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference<
const OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport )
{
::comphelper::NamedValueCollection aArguments;
- aArguments.put( "EmbeddedObject", (sal_Bool)sal_True );
- aArguments.put( "EmbeddedScriptSupport", (sal_Bool)_bEmbeddedScriptSupport );
- aArguments.put( "DocumentRecoverySupport", (sal_Bool)i_bDocumentRecoverySupport );
+ aArguments.put( "EmbeddedObject", true );
+ aArguments.put( "EmbeddedScriptSupport", _bEmbeddedScriptSupport );
+ aArguments.put( "DocumentRecoverySupport", i_bDocumentRecoverySupport );
uno::Reference< uno::XInterface > xDocument;
try
@@ -411,7 +411,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl()
for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ )
if ( aProps[nInd].Name == "Password" && ( aProps[nInd].Value >>= m_aLinkPassword ) )
{
- m_bLinkHasPassword = sal_True;
+ m_bLinkHasPassword = true;
break;
}
}
@@ -728,7 +728,7 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
sal_Int32 nStorageFormat,
const OUString& aBaseURL,
const OUString& aHierarchName,
- sal_Bool bAttachToTheStorage )
+ bool bAttachToTheStorage )
{
SAL_WARN_IF( !xStorage.is(), "embeddedobj.common", "No storage is provided for storing!" );
@@ -949,7 +949,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
// if a completely different entry is provided, switch first back to the old persistence in saveCompleted
// and then switch to the target persistence
- sal_Bool bSwitchFurther = ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+ bool bSwitchFurther = ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
saveCompleted( sal_False );
if ( !bSwitchFurther )
return;
@@ -974,12 +974,12 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
throw uno::RuntimeException(); //TODO
// detect entry existence
- sal_Bool bElExists = xNameAccess->hasByName( sEntName );
+ bool bElExists = xNameAccess->hasByName( sEntName );
m_aDocMediaDescriptor = GetValuableArgs_Impl( lArguments,
nEntryConnectionMode != embed::EntryInitModes::MEDIA_DESCRIPTOR_INIT );
- m_bReadOnly = sal_False;
+ m_bReadOnly = false;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
@@ -1012,7 +1012,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
lObjArgs[nObjInd].Value >>= xObj;
if ( xObj.is() )
{
- m_bHasClonedSize = sal_True;
+ m_bHasClonedSize = true;
m_aClonedSize = xObj->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT );
m_nClonedMapUnit = xObj->getMapUnit( embed::Aspects::MSOLE_CONTENT );
}
@@ -1183,7 +1183,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
SAL_WARN( "embeddedobj.common", "Can not retrieve own storage media type!" );
}
- sal_Bool bTryOptimization = sal_False;
+ bool bTryOptimization = false;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
@@ -1191,7 +1191,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
lObjArgs[nInd].Value >>= bTryOptimization;
}
- sal_Bool bSwitchBackToLoaded = sal_False;
+ bool bSwitchBackToLoaded = false;
// Storing to different format can be done only in running state.
if ( m_nObjectState == embed::EmbedStates::LOADED )
@@ -1199,7 +1199,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
// TODO/LATER: copying is not legal for documents with relative links.
if ( nTargetStorageFormat == nOriginalStorageFormat )
{
- sal_Bool bOptimizationWorks = sal_False;
+ bool bOptimizationWorks = false;
if ( bTryOptimization )
{
try
@@ -1208,7 +1208,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
uno::Reference< embed::XOptimizedStorage > xSource( m_xParentStorage, uno::UNO_QUERY_THROW );
uno::Reference< embed::XOptimizedStorage > xTarget( xStorage, uno::UNO_QUERY_THROW );
xSource->copyElementDirectlyTo( m_aEntryName, xTarget, sEntName );
- bOptimizationWorks = sal_True;
+ bOptimizationWorks = true;
}
catch( const uno::Exception& )
{
@@ -1221,7 +1221,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
else
{
changeState( embed::EmbedStates::RUNNING );
- bSwitchBackToLoaded = sal_True;
+ bSwitchBackToLoaded = true;
}
}
@@ -1235,7 +1235,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
aGuard.clear();
// TODO/LATER: support hierarchical name for embedded objects in embedded objects
- StoreDocToStorage_Impl( xSubStorage, nTargetStorageFormat, GetBaseURLFrom_Impl( lArguments, lObjArgs ), sEntName, sal_False );
+ StoreDocToStorage_Impl( xSubStorage, nTargetStorageFormat, GetBaseURLFrom_Impl( lArguments, lObjArgs ), sEntName, false );
aGuard.reset();
if ( bSwitchBackToLoaded )
@@ -1316,7 +1316,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
PostEvent_Impl( OUString( "OnSaveAs" ) );
- sal_Bool bTryOptimization = sal_False;
+ bool bTryOptimization = false;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
// StoreVisualReplacement and VisualReplacement args have no sence here
@@ -1324,7 +1324,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
lObjArgs[nInd].Value >>= bTryOptimization;
}
- sal_Bool bSwitchBackToLoaded = sal_False;
+ bool bSwitchBackToLoaded = false;
// Storing to different format can be done only in running state.
if ( m_nObjectState == embed::EmbedStates::LOADED )
@@ -1332,7 +1332,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
// TODO/LATER: copying is not legal for documents with relative links.
if ( nTargetStorageFormat == nOriginalStorageFormat )
{
- sal_Bool bOptimizationWorks = sal_False;
+ bool bOptimizationWorks = false;
if ( bTryOptimization )
{
try
@@ -1341,7 +1341,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
uno::Reference< embed::XOptimizedStorage > xSource( m_xParentStorage, uno::UNO_QUERY_THROW );
uno::Reference< embed::XOptimizedStorage > xTarget( xStorage, uno::UNO_QUERY_THROW );
xSource->copyElementDirectlyTo( m_aEntryName, xTarget, sEntName );
- bOptimizationWorks = sal_True;
+ bOptimizationWorks = true;
}
catch( const uno::Exception& )
{
@@ -1354,7 +1354,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
else
{
changeState( embed::EmbedStates::RUNNING );
- bSwitchBackToLoaded = sal_True;
+ bSwitchBackToLoaded = true;
}
}
@@ -1368,18 +1368,18 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
{
aGuard.clear();
// TODO/LATER: support hierarchical name for embedded objects in embedded objects
- StoreDocToStorage_Impl( xSubStorage, nTargetStorageFormat, GetBaseURLFrom_Impl( lArguments, lObjArgs ), sEntName, sal_False );
+ StoreDocToStorage_Impl( xSubStorage, nTargetStorageFormat, GetBaseURLFrom_Impl( lArguments, lObjArgs ), sEntName, false );
aGuard.reset();
if ( bSwitchBackToLoaded )
changeState( embed::EmbedStates::LOADED );
}
- m_bWaitSaveCompleted = sal_True;
+ m_bWaitSaveCompleted = true;
m_xNewObjectStorage = xSubStorage;
m_xNewParentStorage = xStorage;
m_aNewEntryName = sEntName;
- m_aNewDocMediaDescriptor = GetValuableArgs_Impl( lArguments, sal_True );
+ m_aNewDocMediaDescriptor = GetValuableArgs_Impl( lArguments, true );
// TODO: register listeners for storages above, in case thay are disposed
// an exception will be thrown on saveCompleted( true )
@@ -1457,7 +1457,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xNewParentStorage = uno::Reference< embed::XStorage >();
m_aNewEntryName = OUString();
m_aNewDocMediaDescriptor.realloc( 0 );
- m_bWaitSaveCompleted = sal_False;
+ m_bWaitSaveCompleted = false;
if ( bUseNew )
{
@@ -1591,7 +1591,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
}
aGuard.clear();
- StoreDocToStorage_Impl( m_xObjectStorage, nStorageFormat, GetBaseURL_Impl(), m_aEntryName, sal_True );
+ StoreDocToStorage_Impl( m_xObjectStorage, nStorageFormat, GetBaseURL_Impl(), m_aEntryName, true );
aGuard.reset();
}
@@ -1710,7 +1710,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
}
}
- m_aDocMediaDescriptor = GetValuableArgs_Impl( lArguments, sal_True );
+ m_aDocMediaDescriptor = GetValuableArgs_Impl( lArguments, true );
// TODO: use lObjArgs for StoreVisualReplacement
for ( sal_Int32 nObjInd = 0; nObjInd < lObjArgs.getLength(); nObjInd++ )
@@ -1726,9 +1726,9 @@ void SAL_CALL OCommonEmbeddedObject::reload(
// TODO:
// when document allows reloading through API the object can be reloaded not only in loaded state
- sal_Bool bOldReadOnlyValue = m_bReadOnly;
+ bool bOldReadOnlyValue = m_bReadOnly;
- m_bReadOnly = sal_False;
+ m_bReadOnly = false;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
@@ -1807,7 +1807,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
// detect entry existence
/*sal_Bool bElExists =*/ xNameAccess->hasByName( sEntName );
- m_bReadOnly = sal_False;
+ m_bReadOnly = false;
if ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) )
SwitchOwnPersistence( xStorage, sEntName );
@@ -1835,12 +1835,12 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
{
// the state is changed and can not be switched to loaded state back without saving
m_nObjectState = embed::EmbedStates::RUNNING;
- StateChangeNotification_Impl( sal_False, embed::EmbedStates::LOADED, m_nObjectState, aGuard );
+ StateChangeNotification_Impl( false, embed::EmbedStates::LOADED, m_nObjectState, aGuard );
}
else if ( m_nObjectState == embed::EmbedStates::ACTIVE )
m_pDocHolder->Show();
- m_bIsLink = sal_False;
+ m_bIsLink = false;
m_aLinkFilterName = OUString();
m_aLinkURL = OUString();
}
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 873d320e0eab..20a3e0a26aa1 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -49,9 +49,9 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
throw embed::WrongStateException( OUString( "The own object has no persistence!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
- m_bHasClonedSize = sal_False;
+ m_bHasClonedSize = false;
- sal_Bool bBackToLoaded = sal_False;
+ bool bBackToLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED )
{
changeState( embed::EmbedStates::RUNNING );
@@ -60,7 +60,7 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
bBackToLoaded = m_bIsLink;
}
- sal_Bool bSuccess = m_pDocHolder->SetExtent( nAspect, aSize );
+ bool bSuccess = m_pDocHolder->SetExtent( nAspect, aSize );
if ( bBackToLoaded )
changeState( embed::EmbedStates::LOADED );
@@ -88,7 +88,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
if ( m_bHasClonedSize )
return m_aClonedSize;
- sal_Bool bBackToLoaded = sal_False;
+ bool bBackToLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED )
{
changeState( embed::EmbedStates::RUNNING );
@@ -98,7 +98,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
}
awt::Size aResult;
- sal_Bool bSuccess = m_pDocHolder->GetExtent( nAspect, &aResult );
+ bool bSuccess = m_pDocHolder->GetExtent( nAspect, &aResult );
if ( bBackToLoaded )
changeState( embed::EmbedStates::LOADED );
@@ -130,7 +130,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect )
if ( m_bHasClonedSize )
return m_nClonedMapUnit;
- sal_Bool bBackToLoaded = sal_False;
+ bool bBackToLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED )
{
changeState( embed::EmbedStates::RUNNING );
@@ -171,7 +171,7 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
throw embed::WrongStateException( OUString( "Illegal call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
- sal_Bool bBackToLoaded = sal_False;
+ bool bBackToLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED )
{
changeState( embed::EmbedStates::RUNNING );
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index dcb99a1e521a..1634f060ff42 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -108,8 +108,8 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
sal_Int32 nInd = 0;
OUString aModuleIdentPropName( "ModuleIdentifier" );
OUString aDispProvPropName( "DispatchProvider" );
- sal_Bool bModuleNameSet = sal_False;
- sal_Bool bDispProvSet = sal_False;
+ bool bModuleNameSet = false;
+ bool bDispProvSet = false;
uno::Sequence< beans::PropertyValue > aSourceProps;
xSourceMenu->getByIndex( nSourceIndex ) >>= aSourceProps;
@@ -120,12 +120,12 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
if ( !aContModuleName.isEmpty() && aTargetProps[nInd].Name.equals( aModuleIdentPropName ) )
{
aTargetProps[nInd].Value <<= aContModuleName;
- bModuleNameSet = sal_True;
+ bModuleNameSet = true;
}
else if ( aTargetProps[nInd].Name.equals( aDispProvPropName ) )
{
aTargetProps[nInd].Value <<= xSourceDisp;
- bDispProvSet = sal_True;
+ bDispProvSet = true;
}
else
aTargetProps[nInd].Value = aSourceProps[nInd].Value;
@@ -154,10 +154,10 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
: m_pEmbedObj( pEmbObj ),
m_pInterceptor( NULL ),
m_xContext( xContext ),
- m_bReadOnly( sal_False ),
- m_bWaitForClose( sal_False ),
- m_bAllowClosing( sal_False ),
- m_bDesktopTerminated( sal_False ),
+ m_bReadOnly( false ),
+ m_bWaitForClose( false ),
+ m_bAllowClosing( false ),
+ m_bDesktopTerminated( false ),
m_nNoBorderResizeReact( 0 ),
m_nNoResizeReact( 0 )
{
@@ -199,7 +199,7 @@ DocumentHolder::~DocumentHolder()
if ( m_xComponent.is() )
{
try {
- CloseDocument( sal_True, sal_False );
+ CloseDocument( true, false );
} catch( const uno::Exception& ) {}
}
@@ -270,7 +270,7 @@ void DocumentHolder::FreeOffice()
}
-void DocumentHolder::CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose )
+void DocumentHolder::CloseDocument( bool bDeliverOwnership, bool bWaitForClose )
{
uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent, uno::UNO_QUERY );
if ( xBroadcaster.is() )
@@ -290,7 +290,7 @@ void DocumentHolder::CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitFo
uno::Reference< util::XCloseable > xCloseable( xBroadcaster, uno::UNO_QUERY );
if ( xCloseable.is() )
{
- m_bAllowClosing = sal_True;
+ m_bAllowClosing = true;
m_bWaitForClose = bWaitForClose;
xCloseable->close( bDeliverOwnership );
}
@@ -358,9 +358,9 @@ void DocumentHolder::ResizeWindows_Impl( const awt::Rectangle& aHatchRect )
}
-sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFrame >& xFrame, sal_Bool bVisible )
+bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFrame >& xFrame, bool bVisible )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
try
{
@@ -378,7 +378,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra
else
xLayoutManager->lock();
- bResult = sal_True;
+ bResult = true;
}
}
catch( const uno::Exception& )
@@ -388,7 +388,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra
}
-sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xParent,
+bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xParent,
const awt::Rectangle& aRectangleToShow,
const uno::Reference< frame::XDispatchProvider >& xContDisp )
{
@@ -473,7 +473,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
m_xHatchWindow = xHWindow;
m_xOwnWindow = xOwnWindow;
- if ( !SetFrameLMVisibility( m_xFrame, sal_False ) )
+ if ( !SetFrameLMVisibility( m_xFrame, false ) )
{
OSL_FAIL( "Can't deactivate LayoutManager!\n" );
// TODO/LATER: error handling?
@@ -490,10 +490,10 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
if ( m_xComponent.is() )
{
- if ( !LoadDocToFrame( sal_True ) )
+ if ( !LoadDocToFrame( true ) )
{
CloseFrame();
- return sal_False;
+ return false;
}
uno::Reference< frame::XControllerBorder > xControllerBorder( m_xFrame->getController(), uno::UNO_QUERY );
@@ -508,10 +508,10 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
if ( m_xHatchWindow.is() )
m_xHatchWindow->setVisible( sal_True );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -646,12 +646,12 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
}
-sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
+bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
const uno::Reference< frame::XDispatchProvider >& xContDisp,
const OUString& aContModuleName )
{
- sal_Bool bMenuMerged = sal_False;
+ bool bMenuMerged = false;
try
{
uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings(
@@ -676,11 +676,11 @@ sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star
return bMenuMerged;
}
-sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM,
+bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM,
const uno::Reference< frame::XDispatchProvider >& xContainerDP,
const OUString& aContModuleName )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if ( xContainerLM.is() )
{
// the LM of the embedded frame and its current DockingAreaAcceptor
@@ -696,8 +696,8 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
catch( const uno::Exception& ){}
// make sure that lock state of LM is correct even if an exception is thrown in between
- sal_Bool bUnlock = sal_False;
- sal_Bool bLock = sal_False;
+ bool bUnlock = false;
+ bool bLock = false;
if ( xOwnLM.is() && xDocAreaAcc.is() )
{
try
@@ -716,7 +716,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
// prevent further changes at this LM
xContainerLM->setVisible( sal_False );
xContainerLM->lock();
- bUnlock = sal_True;
+ bUnlock = true;
// by unlocking the LM each layout change will now resize the containers window; pending layouts will be processed now
xOwnLM->setVisible( sal_True );
@@ -726,8 +726,8 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
xSupp->setActiveFrame( m_xFrame );
xOwnLM->unlock();
- bLock = sal_True;
- bResult = sal_True;
+ bLock = true;
+ bResult = true;
// TODO/LATER: The following action should be done only if the window is not hidden
// otherwise the activation must fail, unfortunately currently it is not possible
@@ -773,9 +773,9 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
}
-sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM )
+bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if ( xContainerLM.is() )
{
@@ -808,11 +808,11 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::
xContainerLM->unlock();
xContainerLM->doLayout();
- bResult = sal_True;
+ bResult = true;
}
catch( const uno::Exception& )
{
- SetFrameLMVisibility( m_xFrame, sal_True );
+ SetFrameLMVisibility( m_xFrame, true );
}
}
}
@@ -870,7 +870,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
// TODO/LATER: get it for the real aspect
awt::Size aSize;
GetExtent( embed::Aspects::MSOLE_CONTENT, &aSize );
- LoadDocToFrame(sal_False);
+ LoadDocToFrame(false);
if ( xOwnLM.is() )
{
@@ -917,13 +917,13 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
}
-void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDoc, sal_Bool bReadOnly )
+void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDoc, bool bReadOnly )
{
if ( m_xComponent.is() )
{
// May be should be improved
try {
- CloseDocument( sal_True, sal_False );
+ CloseDocument( true, false );
} catch( const uno::Exception& )
{}
}
@@ -931,7 +931,7 @@ void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDo
m_xComponent = xDoc;
m_bReadOnly = bReadOnly;
- m_bAllowClosing = sal_False;
+ m_bAllowClosing = false;
uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent, uno::UNO_QUERY );
if ( xBroadcaster.is() )
@@ -950,11 +950,11 @@ void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDo
}
if ( m_xFrame.is() )
- LoadDocToFrame(sal_False);
+ LoadDocToFrame(false);
}
-sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
+bool DocumentHolder::LoadDocToFrame( bool bInPlace )
{
if ( m_xFrame.is() && m_xComponent.is() )
{
@@ -987,7 +987,7 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
0,
aArgs.getPropertyValues() );
- return sal_True;
+ return true;
}
else
{
@@ -995,11 +995,11 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
if ( xLoader.is() )
return xLoader->load( uno::Sequence < beans::PropertyValue >(), m_xFrame );
else
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
@@ -1017,7 +1017,7 @@ void DocumentHolder::Show()
}
-sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
+bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
{
uno::Reference< embed::XVisualObject > xDocVis( m_xComponent, uno::UNO_QUERY );
if ( xDocVis.is() )
@@ -1025,7 +1025,7 @@ sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
try
{
xDocVis->setVisualAreaSize( nAspect, aSize );
- return sal_True;
+ return true;
}
catch( const uno::Exception& )
{
@@ -1033,11 +1033,11 @@ sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
}
}
- return sal_False;
+ return false;
}
-sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
+bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
{
uno::Reference< embed::XVisualObject > xDocVis( m_xComponent, uno::UNO_QUERY );
if ( pSize && xDocVis.is() )
@@ -1045,7 +1045,7 @@ sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
try
{
*pSize = xDocVis->getVisualAreaSize( nAspect );
- return sal_True;
+ return true;
}
catch( const uno::Exception& )
{
@@ -1053,7 +1053,7 @@ sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
}
}
- return sal_False;
+ return false;
}
@@ -1102,7 +1102,7 @@ void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject
m_xComponent = 0;
if ( m_bWaitForClose )
{
- m_bWaitForClose = sal_False;
+ m_bWaitForClose = false;
FreeOffice();
}
}
@@ -1133,7 +1133,7 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
m_xComponent = 0;
if ( m_bWaitForClose )
{
- m_bWaitForClose = sal_False;
+ m_bWaitForClose = false;
FreeOffice();
}
}
@@ -1161,7 +1161,7 @@ void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSourc
OSL_ENSURE( !m_xComponent.is(), "Just a disaster..." );
uno::Reference< frame::XDesktop > xDesktop( aSource.Source, uno::UNO_QUERY );
- m_bDesktopTerminated = sal_True;
+ m_bDesktopTerminated = true;
if ( xDesktop.is() )
xDesktop->removeTerminateListener( ( frame::XTerminateListener* )this );
}
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 85f1843e063e..531cb8fd0064 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -241,7 +241,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
m_nCachedAspect = nAspect;
m_aCachedSize = aSize;
- m_bHasCachedSize = sal_True;
+ m_bHasCachedSize = true;
}
@@ -412,7 +412,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
- m_bWaitSaveCompleted = sal_True;
+ m_bWaitSaveCompleted = true;
m_xNewParentStorage = xStorage;
m_aNewEntryName = sEntName;
}
@@ -448,7 +448,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xNewParentStorage = uno::Reference< embed::XStorage >();
m_aNewEntryName = OUString();
- m_bWaitSaveCompleted = sal_False;
+ m_bWaitSaveCompleted = false;
}
@@ -664,7 +664,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
m_pInterfaceContainer->disposeAndClear( aSource );
}
- m_bDisposed = sal_True; // the object is disposed now for outside
+ m_bDisposed = true; // the object is disposed now for outside
}
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 861450f5b740..cdeab464ebaa 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -86,10 +86,10 @@ protected:
::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
- sal_Bool m_bReadOnly;
+ bool m_bReadOnly;
- sal_Bool m_bDisposed;
- sal_Bool m_bClosed;
+ bool m_bDisposed;
+ bool m_bClosed;
sal_Int32 m_nObjectState;
sal_Int32 m_nTargetState; // should be -1 exept during state changing
@@ -118,11 +118,11 @@ protected:
OUString m_aContainerName;
OUString m_aDefaultParentBaseURL;
OUString m_aModuleName;
- sal_Bool m_bEmbeddedScriptSupport;
- sal_Bool m_bDocumentRecoverySupport;
+ bool m_bEmbeddedScriptSupport;
+ bool m_bDocumentRecoverySupport;
// following information will be used between SaveAs and SaveCompleted
- sal_Bool m_bWaitSaveCompleted;
+ bool m_bWaitSaveCompleted;
OUString m_aNewEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewObjectStorage;
@@ -132,7 +132,7 @@ protected:
::com::sun::star::awt::Rectangle m_aOwnRectangle;
::com::sun::star::awt::Rectangle m_aClipRectangle;
- sal_Bool m_bIsLink;
+ bool m_bIsLink;
// embedded object related stuff
OUString m_aEntryName;
@@ -143,12 +143,12 @@ protected:
// link related stuff
OUString m_aLinkURL;
OUString m_aLinkFilterName;
- sal_Bool m_bLinkHasPassword;
+ bool m_bLinkHasPassword;
OUString m_aLinkPassword;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
- sal_Bool m_bHasClonedSize; // the object has cached size
+ bool m_bHasClonedSize; // the object has cached size
::com::sun::star::awt::Size m_aClonedSize;
sal_Int32 m_nClonedMapUnit;
::com::sun::star::awt::Size m_aDefaultSizeForChart_In_100TH_MM;//#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this member
@@ -182,7 +182,7 @@ private:
void Deactivate();
- void StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState,::osl::ResettableMutexGuard& _rGuard );
+ void StateChangeNotification_Impl( bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState,::osl::ResettableMutexGuard& _rGuard );
void SwitchStateTo_Impl( sal_Int32 nNextState );
@@ -199,7 +199,7 @@ private:
sal_Int32 nStorageVersion,
const OUString& aBaseURL,
const OUString& aHierarchName,
- sal_Bool bAttachToStorage );
+ bool bAttachToStorage );
void SwitchDocToStorage_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageBasedDocument >& xDoc,
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 38e6f09c0c32..8ab030933bcc 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -70,11 +70,11 @@ private:
OUString m_aContainerName;
OUString m_aDocumentNamePart;
- sal_Bool m_bReadOnly;
+ bool m_bReadOnly;
- sal_Bool m_bWaitForClose;
- sal_Bool m_bAllowClosing;
- sal_Bool m_bDesktopTerminated;
+ bool m_bWaitForClose;
+ bool m_bAllowClosing;
+ bool m_bDesktopTerminated;
sal_Int32 m_nNoBorderResizeReact;
sal_Int32 m_nNoResizeReact;
@@ -85,7 +85,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetDocFrame();
- sal_Bool LoadDocToFrame( sal_Bool );
+ bool LoadDocToFrame( bool );
::com::sun::star::awt::Rectangle CalculateBorderedArea( const ::com::sun::star::awt::Rectangle& aRect );
::com::sun::star::awt::Rectangle AddBorderToArea( const ::com::sun::star::awt::Rectangle& aRect );
@@ -93,7 +93,7 @@ private:
void ResizeWindows_Impl( const ::com::sun::star::awt::Rectangle& aHatchRect );
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > RetrieveOwnMenu_Impl();
- sal_Bool MergeMenus_Impl(
+ bool MergeMenus_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp,
@@ -121,12 +121,12 @@ public:
OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; }
- void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, sal_Bool bReadOnly );
+ void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, bool bReadOnly );
void ResizeHatchWindow();
void LockOffice();
void FreeOffice();
- void CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose );
+ void CloseDocument( bool bDeliverOwnership, bool bWaitForClose );
void CloseFrame();
OUString GetTitle() const
@@ -141,24 +141,24 @@ public:
void PlaceFrame( const ::com::sun::star::awt::Rectangle& aNewRect );
- sal_Bool SetFrameLMVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
- sal_Bool bVisible );
+ bool SetFrameLMVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+ bool bVisible );
- sal_Bool ShowInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
+ bool ShowInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent,
const ::com::sun::star::awt::Rectangle& aRectangleToShow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP );
- sal_Bool ShowUI(
+ bool ShowUI(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContainerDP,
const OUString& aContModuleName );
- sal_Bool HideUI(
+ bool HideUI(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM );
void Show();
- sal_Bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize );
- sal_Bool GetExtent( sal_Int64 nAspect, ::com::sun::star::awt::Size *pSize );
+ bool SetExtent( sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize );
+ bool GetExtent( sal_Int64 nAspect, ::com::sun::star::awt::Size *pSize );
sal_Int32 GetMapUnit( sal_Int64 nAspect );
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 15b3dd7eba3b..4e490a0ca54d 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -50,7 +50,7 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2
{
::osl::Mutex m_aMutex;
::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
- sal_Bool m_bDisposed;
+ bool m_bDisposed;
OUString m_aEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xParentStorage;
@@ -60,10 +60,10 @@ class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2
sal_Int64 m_nCachedAspect;
::com::sun::star::awt::Size m_aCachedSize;
- sal_Bool m_bHasCachedSize;
+ bool m_bHasCachedSize;
// following information will be used between SaveAs and SaveCompleted
- sal_Bool m_bWaitSaveCompleted;
+ bool m_bWaitSaveCompleted;
OUString m_aNewEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage;
@@ -76,11 +76,11 @@ public:
ODummyEmbeddedObject()
: m_pInterfaceContainer( NULL )
- , m_bDisposed( sal_False )
+ , m_bDisposed( false )
, m_nObjectState( -1 )
, m_nCachedAspect( 0 )
- , m_bHasCachedSize( sal_False )
- , m_bWaitSaveCompleted( sal_False )
+ , m_bHasCachedSize( false )
+ , m_bWaitSaveCompleted( false )
{}
virtual ~ODummyEmbeddedObject();
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index cfc864325985..4b4c148bd9cc 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -48,24 +48,24 @@ class VerbExecutionController
// the following mutex is allowed to be locked only for variables initialization, so no deadlock can be caused
::osl::Mutex m_aVerbExecutionMutex;
- sal_Bool m_bVerbExecutionInProgress;
+ bool m_bVerbExecutionInProgress;
#ifdef WNT
oslThreadIdentifier m_nVerbExecutionThreadIdentifier;
sal_Bool m_bChangedOnVerbExecution;
#endif
- sal_Bool m_bWasEverActive;
+ bool m_bWasEverActive;
sal_Int32 m_nNotificationLock;
public:
VerbExecutionController()
- : m_bVerbExecutionInProgress( sal_False )
+ : m_bVerbExecutionInProgress( false )
#ifdef WNT
, m_nVerbExecutionThreadIdentifier( 0 )
, m_bChangedOnVerbExecution( sal_False )
#endif
- , m_bWasEverActive( sal_False )
+ , m_bWasEverActive( false )
, m_nNotificationLock( 0 )
{}
#ifdef WNT
@@ -77,9 +77,9 @@ public:
void UnlockNotification();
// no need to lock anything to check the value of the numeric members
- sal_Bool CanDoNotification() { return ( !m_bVerbExecutionInProgress && !m_bWasEverActive && !m_nNotificationLock ); }
+ bool CanDoNotification() { return ( !m_bVerbExecutionInProgress && !m_bWasEverActive && !m_nNotificationLock ); }
// ... or to change it
- void ObjectIsActive() { m_bWasEverActive = sal_True; }
+ void ObjectIsActive() { m_bWasEverActive = true; }
};
class VerbExecutionControllerGuard
@@ -117,7 +117,7 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5
::cppu::OMultiTypeInterfaceContainerHelper* m_pInterfaceContainer;
- sal_Bool m_bReadOnly;
+ bool m_bReadOnly;
bool m_bDisposed;
sal_Int32 m_nObjectState;
@@ -135,34 +135,34 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5
::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > m_xClosePreventer;
- sal_Bool m_bWaitSaveCompleted;
- sal_Bool m_bNewVisReplInStream;
+ bool m_bWaitSaveCompleted;
+ bool m_bNewVisReplInStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewCachedVisRepl;
OUString m_aNewEntryName;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xNewParentStorage;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xNewObjectStream;
- sal_Bool m_bStoreLoaded;
+ bool m_bStoreLoaded;
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xCachedVisualRepresentation;
- sal_Bool m_bVisReplInitialized;
- sal_Bool m_bVisReplInStream;
- sal_Bool m_bStoreVisRepl;
+ bool m_bVisReplInitialized;
+ bool m_bVisReplInStream;
+ bool m_bStoreVisRepl;
- sal_Bool m_bIsLink;
+ bool m_bIsLink;
// TODO/LATER: may need to cache more than one aspect in future
- sal_Bool m_bHasCachedSize; // the object has cached size
+ bool m_bHasCachedSize; // the object has cached size
::com::sun::star::awt::Size m_aCachedSize;
sal_Int64 m_nCachedAspect;
- sal_Bool m_bHasSizeToSet; // the object has cached size that should be set to OLE component
+ bool m_bHasSizeToSet; // the object has cached size that should be set to OLE component
::com::sun::star::awt::Size m_aSizeToSet; // this size might be different from the cached one ( scaling is applied )
sal_Int64 m_nAspectToSet;
// cache the status of the object
// TODO/LATER: may need to cache more than one aspect in future
- sal_Bool m_bGotStatus;
+ bool m_bGotStatus;
sal_Int64 m_nStatus;
sal_Int64 m_nStatusAspect;
@@ -178,7 +178,7 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5
OwnView_Impl* m_pOwnView;
// whether the object should be initialized from clipboard in case of default initialization
- sal_Bool m_bFromClipboard;
+ bool m_bFromClipboard;
OUString m_aTempURL;
@@ -190,7 +190,7 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5
// if the following member is set, the object works in wrapper mode
::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > m_xWrappedObject;
- sal_Bool m_bTriedConversion;
+ bool m_bTriedConversion;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
@@ -236,7 +236,7 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const OUString& sEntName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs,
- sal_Bool bSaveAs )
+ bool bSaveAs )
throw ( ::com::sun::star::uno::Exception );
#ifdef WNT
void StoreObjectToStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutStream )
@@ -250,8 +250,8 @@ protected:
void RemoveVisualCache_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
throw ( ::com::sun::star::uno::Exception );
- void SetVisReplInStream( sal_Bool bExists );
- sal_Bool HasVisReplInStream();
+ void SetVisReplInStream( bool bExists );
+ bool HasVisReplInStream();
::com::sun::star::embed::VisualRepresentation GetVisualRepresentationInNativeFormat_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xCachedVisRepr )
@@ -259,7 +259,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > TryToRetrieveCachedVisualRepresentation_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream,
- sal_Bool bAllowRepair50 = sal_False )
+ bool bAllowRepair50 = false )
throw ();
#ifdef WNT
sal_Bool SaveObject_Impl();
@@ -268,7 +268,7 @@ protected:
void CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent = NULL );
void CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent = NULL );
#endif
- void SetObjectIsLink_Impl( sal_Bool bIsLink ) { m_bIsLink = bIsLink; }
+ void SetObjectIsLink_Impl( bool bIsLink ) { m_bIsLink = bIsLink; }
#ifdef WNT
OUString CreateTempURLEmpty_Impl();
@@ -280,7 +280,7 @@ protected:
void MoveListeners();
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > CreateTemporarySubstorage( OUString& o_aStorageName );
OUString MoveToTemporarySubstream();
- sal_Bool TryToConvertToOOo();
+ bool TryToConvertToOOo();
public:
// in case a new object must be created the class ID must be specified
@@ -291,7 +291,7 @@ public:
// in case object will be loaded from a persistent entry or from a file the class ID will be detected on loading
// factory can do it for OOo objects, but for OLE objects OS dependent code is required
OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory,
- sal_Bool bLink );
+ bool bLink );
#ifdef WNT
// this constructor let object be initialized from clipboard
OleEmbeddedObject( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index fe2108676620..800166167746 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -247,16 +247,16 @@ OUString OleEmbeddedObject::MoveToTemporarySubstream()
}
-sal_Bool OleEmbeddedObject::TryToConvertToOOo()
+bool OleEmbeddedObject::TryToConvertToOOo()
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
OUString aStorageName;
OUString aTmpStreamName;
sal_Int32 nStep = 0;
if ( m_pOleComponent || m_bReadOnly )
- return sal_False;
+ return false;
try
{
@@ -289,7 +289,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
{
// create the model
uno::Sequence< uno::Any > aArguments(1);
- aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( (sal_Bool)sal_True ));
+ aArguments[0] <<= beans::NamedValue( OUString( "EmbeddedObject" ), uno::makeAny( true ));
uno::Reference< util::XCloseable > xDocument( m_xFactory->createInstanceWithArguments( aDocServiceName, aArguments ), uno::UNO_QUERY_THROW );
uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY_THROW );
@@ -356,7 +356,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
nStep = 4;
m_xWrappedObject.set( xEmbCreator->createInstanceInitFromEntry( m_xParentStorage, m_aEntryName, uno::Sequence< beans::PropertyValue >(), uno::Sequence< beans::PropertyValue >() ), uno::UNO_QUERY_THROW );
- bResult = sal_True; // the change is no more revertable
+ bResult = true; // the change is no more revertable
try
{
m_xParentStorage->removeElement( aTmpStreamName );
@@ -699,7 +699,7 @@ namespace
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[0] <<= xObjectStream;
- aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+ aArgs[1] <<= true; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
xFactory->createInstanceWithArguments(
OUString("com.sun.star.embed.OLESimpleStorage"),
@@ -715,7 +715,7 @@ namespace
// ignore
}
- sal_Bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream());
+ bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream());
uno::Reference< io::XSeekable > xSeekableStor(xObjectStream, uno::UNO_QUERY);
if (xSeekableStor.is())
@@ -836,7 +836,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
// if it is possible, the object will be converted to OOo format
if ( !m_bTriedConversion )
{
- m_bTriedConversion = sal_True;
+ m_bTriedConversion = true;
if ( TryToConvertToOOo() )
{
changeState( embed::EmbedStates::UI_ACTIVE );
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 96a03922f3ea..7bd0354d5f69 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -38,7 +38,7 @@
using namespace ::com::sun::star;
-sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
+bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
@@ -47,7 +47,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
const OUString& aClassName )
: m_pOleComponent( NULL )
, m_pInterfaceContainer( NULL )
-, m_bReadOnly( sal_False )
+, m_bReadOnly( false )
, m_bDisposed( false )
, m_nObjectState( -1 )
, m_nTargetState( -1 )
@@ -55,55 +55,55 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
, m_xFactory( xFactory )
, m_aClassID( aClassID )
, m_aClassName( aClassName )
-, m_bWaitSaveCompleted( sal_False )
-, m_bNewVisReplInStream( sal_True )
-, m_bStoreLoaded( sal_False )
-, m_bVisReplInitialized( sal_False )
-, m_bVisReplInStream( sal_False )
-, m_bStoreVisRepl( sal_False )
-, m_bIsLink( sal_False )
-, m_bHasCachedSize( sal_False )
+, m_bWaitSaveCompleted( false )
+, m_bNewVisReplInStream( true )
+, m_bStoreLoaded( false )
+, m_bVisReplInitialized( false )
+, m_bVisReplInStream( false )
+, m_bStoreVisRepl( false )
+, m_bIsLink( false )
+, m_bHasCachedSize( false )
, m_nCachedAspect( 0 )
-, m_bHasSizeToSet( sal_False )
+, m_bHasSizeToSet( false )
, m_nAspectToSet( 0 )
-, m_bGotStatus( sal_False )
+, m_bGotStatus( false )
, m_nStatus( 0 )
, m_nStatusAspect( 0 )
, m_pOwnView( NULL )
-, m_bFromClipboard( sal_False )
-, m_bTriedConversion( sal_False )
+, m_bFromClipboard( false )
+, m_bTriedConversion( false )
{
}
// In case of loading from persistent entry the classID of the object
// will be retrieved from the entry, during construction it is unknown
-OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, sal_Bool bLink )
+OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, bool bLink )
: m_pOleComponent( NULL )
, m_pInterfaceContainer( NULL )
-, m_bReadOnly( sal_False )
+, m_bReadOnly( false )
, m_bDisposed( false )
, m_nObjectState( -1 )
, m_nTargetState( -1 )
, m_nUpdateMode( embed::EmbedUpdateModes::ALWAYS_UPDATE )
, m_xFactory( xFactory )
-, m_bWaitSaveCompleted( sal_False )
-, m_bNewVisReplInStream( sal_True )
-, m_bStoreLoaded( sal_False )
-, m_bVisReplInitialized( sal_False )
-, m_bVisReplInStream( sal_False )
-, m_bStoreVisRepl( sal_False )
+, m_bWaitSaveCompleted( false )
+, m_bNewVisReplInStream( true )
+, m_bStoreLoaded( false )
+, m_bVisReplInitialized( false )
+, m_bVisReplInStream( false )
+, m_bStoreVisRepl( false )
, m_bIsLink( bLink )
-, m_bHasCachedSize( sal_False )
+, m_bHasCachedSize( false )
, m_nCachedAspect( 0 )
-, m_bHasSizeToSet( sal_False )
+, m_bHasSizeToSet( false )
, m_nAspectToSet( 0 )
-, m_bGotStatus( sal_False )
+, m_bGotStatus( false )
, m_nStatus( 0 )
, m_nStatusAspect( 0 )
, m_pOwnView( NULL )
-, m_bFromClipboard( sal_False )
-, m_bTriedConversion( sal_False )
+, m_bFromClipboard( false )
+, m_bTriedConversion( false )
{
}
#ifdef WNT
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index f403bb4ecb71..32ac4b0603b7 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -54,12 +54,12 @@ using namespace ::com::sun::star;
using namespace ::comphelper;
-sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
+bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
{
if ( !xFactory.is() )
- return sal_False;
+ return false;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
@@ -67,7 +67,7 @@ sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMulti
ucb::SimpleFileAccess::create( comphelper::getComponentContext(xFactory) ) );
xAccess->kill( aURL );
- bRet = sal_True;
+ bRet = true;
}
catch( const uno::Exception& )
{
@@ -204,7 +204,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface
xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
- uno::makeAny( (sal_Bool)sal_True ) );
+ uno::makeAny( true ) );
}
#ifdef WNT
@@ -377,7 +377,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[0] <<= xTargetStream;
- aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+ aArgs[1] <<= true; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
m_xFactory->createInstanceWithArguments(
@@ -527,7 +527,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[0] <<= xTargetStream;
- aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+ aArgs[1] <<= true; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
m_xFactory->createInstanceWithArguments(
OUString( "com.sun.star.embed.OLESimpleStorage" ),
@@ -552,19 +552,19 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
}
-void OleEmbeddedObject::SetVisReplInStream( sal_Bool bExists )
+void OleEmbeddedObject::SetVisReplInStream( bool bExists )
{
- m_bVisReplInitialized = sal_True;
+ m_bVisReplInitialized = true;
m_bVisReplInStream = bExists;
}
-sal_Bool OleEmbeddedObject::HasVisReplInStream()
+bool OleEmbeddedObject::HasVisReplInStream()
{
if ( !m_bVisReplInitialized )
{
if ( m_xCachedVisualRepresentation.is() )
- SetVisReplInStream( sal_True );
+ SetVisReplInStream( true );
else
{
SAL_INFO( "embeddedobj.ole", "embeddedobj (mv76033) OleEmbeddedObject::HasVisualReplInStream, analizing" );
@@ -591,11 +591,11 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
if ( xStream.is() )
{
- sal_Bool bExists = sal_False;
+ bool bExists = false;
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[0] <<= xStream;
- aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+ aArgs[1] <<= true; // do not create copy
uno::Reference< container::XNameContainer > xNameContainer(
m_xFactory->createInstanceWithArguments(
OUString( "com.sun.star.embed.OLESimpleStorage" ),
@@ -627,7 +627,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepresentation_Impl(
const uno::Reference< io::XStream >& xStream,
- sal_Bool bAllowToRepair50 )
+ bool bAllowToRepair50 )
throw ()
{
uno::Reference< io::XStream > xResult;
@@ -639,7 +639,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
uno::Reference< container::XNameContainer > xNameContainer;
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[0] <<= xStream;
- aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+ aArgs[1] <<= true; // do not create copy
try
{
xNameContainer = uno::Reference< container::XNameContainer >(
@@ -745,7 +745,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
#endif
}
- xResult = TryToRetrieveCachedVisualRepresentation_Impl( xStream, sal_False );
+ xResult = TryToRetrieveCachedVisualRepresentation_Impl( xStream, false );
}
}
}
@@ -1070,7 +1070,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
const uno::Reference< embed::XStorage >& xStorage,
const OUString& sEntName,
const uno::Sequence< beans::PropertyValue >& lObjArgs,
- sal_Bool bSaveAs )
+ bool bSaveAs )
throw ( uno::Exception )
{
// TODO: use lObjArgs
@@ -1090,10 +1090,10 @@ void OleEmbeddedObject::StoreToLocation_Impl(
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" );
- sal_Bool bVisReplIsStored = sal_False;
+ bool bVisReplIsStored = false;
- sal_Bool bTryOptimization = sal_False;
- sal_Bool bStoreVis = m_bStoreVisRepl;
+ bool bTryOptimization = false;
+ bool bStoreVis = m_bStoreVisRepl;
uno::Reference< io::XStream > xCachedVisualRepresentation;
for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
{
@@ -1113,11 +1113,11 @@ void OleEmbeddedObject::StoreToLocation_Impl(
throw io::IOException(); // TODO: there is no cached visual representation and nothing is provided from outside
// if the representation is provided from outside it should be copied to a local stream
- sal_Bool bNeedLocalCache = xCachedVisualRepresentation.is();
+ bool bNeedLocalCache = xCachedVisualRepresentation.is();
uno::Reference< io::XStream > xTargetStream;
- sal_Bool bStoreLoaded = sal_False;
+ bool bStoreLoaded = false;
if ( m_nObjectState == embed::EmbedStates::LOADED
#ifdef WNT
// if the object was NOT modified after storing it can be just copied
@@ -1126,7 +1126,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
#endif
)
{
- sal_Bool bOptimizedCopyingDone = sal_False;
+ bool bOptimizedCopyingDone = false;
if ( bTryOptimization && bStoreVis == HasVisReplInStream() )
{
@@ -1135,7 +1135,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
uno::Reference< embed::XOptimizedStorage > xSourceOptStor( m_xParentStorage, uno::UNO_QUERY_THROW );
uno::Reference< embed::XOptimizedStorage > xTargetOptStor( xStorage, uno::UNO_QUERY_THROW );
xSourceOptStor->copyElementDirectlyTo( m_aEntryName, xTargetOptStor, sEntName );
- bOptimizedCopyingDone = sal_True;
+ bOptimizedCopyingDone = true;
}
catch( const uno::Exception& )
{
@@ -1153,11 +1153,11 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( m_xCachedVisualRepresentation.is() )
{
xCachedVisualRepresentation = m_xCachedVisualRepresentation;
- bNeedLocalCache = sal_False;
+ bNeedLocalCache = false;
}
bVisReplIsStored = HasVisReplInStream();
- bStoreLoaded = sal_True;
+ bStoreLoaded = true;
}
#ifdef WNT
else if ( m_pOleComponent )
@@ -1227,7 +1227,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
{
xCachedVisualRepresentation
= GetNewFilledTempStream_Impl( xCachedVisualRepresentation->getInputStream() );
- bNeedLocalCache = sal_False;
+ bNeedLocalCache = false;
}
}
@@ -1245,7 +1245,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( bSaveAs )
{
- m_bWaitSaveCompleted = sal_True;
+ m_bWaitSaveCompleted = true;
m_xNewObjectStream = xTargetStream;
m_xNewParentStorage = xStorage;
m_aNewEntryName = sEntName;
@@ -1353,9 +1353,9 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
throw uno::RuntimeException(); //TODO
// detect entry existence
- sal_Bool bElExists = xNameAccess->hasByName( sEntName );
+ bool bElExists = xNameAccess->hasByName( sEntName );
- m_bReadOnly = sal_False;
+ m_bReadOnly = false;
for ( sal_Int32 nInd = 0; nInd < lArguments.getLength(); nInd++ )
if ( lArguments[nInd].Name == "ReadOnly" )
lArguments[nInd].Value >>= m_bReadOnly;
@@ -1516,7 +1516,7 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto
VerbExecutionControllerGuard aVerbGuard( m_aVerbExecutionController );
- StoreToLocation_Impl( xStorage, sEntName, lObjArgs, sal_False );
+ StoreToLocation_Impl( xStorage, sEntName, lObjArgs, false );
// TODO: should the listener notification be done?
}
@@ -1550,7 +1550,7 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto
VerbExecutionControllerGuard aVerbGuard( m_aVerbExecutionController );
- StoreToLocation_Impl( xStorage, sEntName, lObjArgs, sal_True );
+ StoreToLocation_Impl( xStorage, sEntName, lObjArgs, true );
// TODO: should the listener notification be done here or in saveCompleted?
}
@@ -1617,21 +1617,21 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
}
}
- sal_Bool bStoreLoaded = m_bStoreLoaded;
+ bool bStoreLoaded = m_bStoreLoaded;
m_xNewObjectStream = uno::Reference< io::XStream >();
m_xNewParentStorage = uno::Reference< embed::XStorage >();
m_aNewEntryName = OUString();
- m_bWaitSaveCompleted = sal_False;
- m_bNewVisReplInStream = sal_False;
+ m_bWaitSaveCompleted = false;
+ m_bNewVisReplInStream = false;
m_xNewCachedVisRepl = uno::Reference< io::XStream >();
- m_bStoreLoaded = sal_False;
+ m_bStoreLoaded = false;
if ( bUseNew && m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded
&& m_nObjectState != embed::EmbedStates::LOADED )
{
// the object replacement image should be updated, so the cached size as well
- m_bHasCachedSize = sal_False;
+ m_bHasCachedSize = false;
try
{
// the call will cache the size in case of success
@@ -1765,7 +1765,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
LetCommonStoragePassBeUsed_Impl( m_xObjectStream );
- sal_Bool bStoreLoaded = sal_True;
+ bool bStoreLoaded = true;
#ifdef WNT
if ( m_nObjectState != embed::EmbedStates::LOADED && m_pOleComponent && m_pOleComponent->IsDirty() )
@@ -1818,7 +1818,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded )
{
// the object replacement image should be updated, so the cached size as well
- m_bHasCachedSize = sal_False;
+ m_bHasCachedSize = false;
try
{
// the call will cache the size in case of success
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index b50c031c01e0..2a7625ef50c4 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -152,7 +152,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
#endif
// cache the values
- m_bHasCachedSize = sal_True;
+ m_bHasCachedSize = true;
m_aCachedSize = aSize;
m_nCachedAspect = nAspect;
}
@@ -345,7 +345,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
if ( !m_xCachedVisualRepresentation.is() && ( !m_bVisReplInitialized || m_bVisReplInStream )
&& m_nObjectState == embed::EmbedStates::LOADED )
{
- m_xCachedVisualRepresentation = TryToRetrieveCachedVisualRepresentation_Impl( m_xObjectStream, sal_True );
+ m_xCachedVisualRepresentation = TryToRetrieveCachedVisualRepresentation_Impl( m_xObjectStream, true );
SetVisReplInStream( m_xCachedVisualRepresentation.is() );
}
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index d1515e2458b6..e4e5d8827abe 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -49,7 +49,7 @@
using namespace ::com::sun::star;
using namespace ::comphelper;
-sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
+bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHandler >
{
@@ -80,8 +80,8 @@ void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractio
OwnView_Impl::OwnView_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory,
const uno::Reference< io::XInputStream >& xInputStream )
: m_xFactory( xFactory )
-, m_bBusy( sal_False )
-, m_bUseNative( sal_False )
+, m_bBusy( false )
+, m_bUseNative( false )
{
if ( !xFactory.is() || !xInputStream.is() )
throw uno::RuntimeException();
@@ -103,9 +103,9 @@ OwnView_Impl::~OwnView_Impl()
}
-sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
+bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if ( !aFileURL.isEmpty() )
{
@@ -157,7 +157,7 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
::osl::MutexGuard aGuard( m_aMutex );
m_xModel = xModel;
- bResult = sal_True;
+ bResult = true;
}
}
}
@@ -172,9 +172,9 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
}
-sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
+bool OwnView_Impl::CreateModel( bool bUseNative )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
try {
bResult = CreateModelFromURL( bUseNative ? m_aNativeTempURL : m_aTempFileURL );
@@ -249,8 +249,8 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
}
-sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io::XInputStream >& xInStream,
- sal_Bool bParseHeader )
+bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io::XInputStream >& xInStream,
+ bool bParseHeader )
{
uno::Reference< io::XSeekable > xSeekable( xInStream, uno::UNO_QUERY_THROW );
xSeekable->seek( 0 );
@@ -275,7 +275,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
{
}
- sal_Bool bFailed = sal_False;
+ bool bFailed = false;
OUString aFileSuffix;
if ( bParseHeader )
@@ -283,17 +283,17 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
uno::Sequence< sal_Int8 > aReadSeq( 4 );
// read the complete size of the Object Package
if ( xInStream->readBytes( aReadSeq, 4 ) != 4 )
- return sal_False;
+ return false;
// read the first header ( have no idea what does this header mean )
if ( xInStream->readBytes( aReadSeq, 2 ) != 2 || aReadSeq[0] != 2 || aReadSeq[1] != 0 )
- return sal_False;
+ return false;
// read file name
// only extension is interesting so only subset of symbols is accepted
do
{
if ( xInStream->readBytes( aReadSeq, 1 ) != 1 )
- return sal_False;
+ return false;
if (
(aReadSeq[0] >= '0' && aReadSeq[0] <= '9') ||
@@ -311,17 +311,17 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
do
{
if ( xInStream->readBytes( aReadSeq, 1 ) != 1 )
- return sal_False;
+ return false;
} while( aReadSeq[0] );
// check the next header
if ( xInStream->readBytes( aReadSeq, 4 ) != 4
|| aReadSeq[0] || aReadSeq[1] || aReadSeq[2] != 3 || aReadSeq[3] )
- return sal_False;
+ return false;
// get the size of the next entry
if ( xInStream->readBytes( aReadSeq, 4 ) != 4 )
- return sal_False;
+ return false;
sal_uInt32 nUrlSize = (sal_uInt8)aReadSeq[0]
+ (sal_uInt8)aReadSeq[1] * 0x100
@@ -333,7 +333,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
// get the size of stored data
if ( xInStream->readBytes( aReadSeq, 4 ) != 4 )
- return sal_False;
+ return false;
sal_uInt32 nDataSize = (sal_uInt8)aReadSeq[0]
+ (sal_uInt8)aReadSeq[1] * 0x100
@@ -350,7 +350,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
if ( !nLocalRead )
{
- bFailed = sal_True;
+ bFailed = true;
break;
}
else if ( nLocalRead == 32000 )
@@ -433,13 +433,13 @@ void OwnView_Impl::CreateNative()
xNameAccess->getByName( aSubStreamName ) >>= xSubStream;
if ( xSubStream.is() )
{
- sal_Bool bOk = sal_False;
+ bool bOk = false;
if ( MimeConfigurationHelper::ClassIDsEqual( aPackageClassID, aStorClassID ) )
{
// the storage represents Object Package
- bOk = ReadContentsAndGenerateTempFile( xSubStream->getInputStream(), sal_True );
+ bOk = ReadContentsAndGenerateTempFile( xSubStream->getInputStream(), true );
if ( !bOk && !m_aNativeTempURL.isEmpty() )
{
@@ -450,7 +450,7 @@ void OwnView_Impl::CreateNative()
if ( !bOk )
{
- bOk = ReadContentsAndGenerateTempFile( xSubStream->getInputStream(), sal_False );
+ bOk = ReadContentsAndGenerateTempFile( xSubStream->getInputStream(), false );
if ( !bOk && !m_aNativeTempURL.isEmpty() )
{
@@ -470,9 +470,9 @@ void OwnView_Impl::CreateNative()
}
-sal_Bool OwnView_Impl::Open()
+bool OwnView_Impl::Open()
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
uno::Reference< frame::XModel > xExistingModel;
@@ -480,9 +480,9 @@ sal_Bool OwnView_Impl::Open()
::osl::MutexGuard aGuard( m_aMutex );
xExistingModel = m_xModel;
if ( m_bBusy )
- return sal_False;
+ return false;
- m_bBusy = sal_True;
+ m_bBusy = true;
}
if ( xExistingModel.is() )
@@ -499,7 +499,7 @@ sal_Bool OwnView_Impl::Open()
if(xTopWindow.is())
xTopWindow->toFront();
- bResult = sal_True;
+ bResult = true;
}
}
}
@@ -522,14 +522,14 @@ sal_Bool OwnView_Impl::Open()
if ( !m_aNativeTempURL.isEmpty() )
{
- bResult = CreateModel( sal_True );
+ bResult = CreateModel( true );
if ( bResult )
- m_bUseNative = sal_True;
+ m_bUseNative = true;
}
}
}
- m_bBusy = sal_False;
+ m_bBusy = false;
return bResult;
}
@@ -549,7 +549,7 @@ void OwnView_Impl::Close()
if ( m_bBusy )
return;
- m_bBusy = sal_True;
+ m_bBusy = true;
}
try {
@@ -571,7 +571,7 @@ void OwnView_Impl::Close()
catch( uno::Exception& )
{}
- m_bBusy = sal_False;
+ m_bBusy = false;
}
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 4b08c5d3779d..2aab2aabbe60 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -43,16 +43,16 @@ class OwnView_Impl : public ::cppu::WeakImplHelper2 < ::com::sun::star::util::XC
OUString m_aFilterName;
- sal_Bool m_bBusy;
+ bool m_bBusy;
- sal_Bool m_bUseNative;
+ bool m_bUseNative;
private:
- sal_Bool CreateModelFromURL( const OUString& aFileURL );
+ bool CreateModelFromURL( const OUString& aFileURL );
- sal_Bool CreateModel( sal_Bool bUseNative );
+ bool CreateModel( bool bUseNative );
- sal_Bool ReadContentsAndGenerateTempFile( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream, sal_Bool bParseHeader );
+ bool ReadContentsAndGenerateTempFile( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream, bool bParseHeader );
void CreateNative();
@@ -66,7 +66,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
virtual ~OwnView_Impl();
- sal_Bool Open();
+ bool Open();
void Close();
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index eb74f407bf50..1b4f94965df0 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -94,7 +94,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
}
uno::Reference< uno::XInterface > xResult(
- static_cast< ::cppu::OWeakObject* > ( new OleEmbeddedObject( m_xFactory, sal_False ) ),
+ static_cast< ::cppu::OWeakObject* > ( new OleEmbeddedObject( m_xFactory, false ) ),
uno::UNO_QUERY );
uno::Reference< embed::XEmbedPersist > xPersist( xResult, uno::UNO_QUERY );
@@ -152,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
2 );
uno::Reference< uno::XInterface > xResult(
- static_cast< ::cppu::OWeakObject* > ( new OleEmbeddedObject( m_xFactory, sal_False ) ),
+ static_cast< ::cppu::OWeakObject* > ( new OleEmbeddedObject( m_xFactory, false ) ),
uno::UNO_QUERY );
uno::Reference< embed::XEmbedPersist > xPersist( xResult, uno::UNO_QUERY );
@@ -237,7 +237,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
2 );
uno::Reference< uno::XInterface > xResult(
- static_cast< ::cppu::OWeakObject* > ( new OleEmbeddedObject( m_xFactory, sal_True ) ),
+ static_cast< ::cppu::OWeakObject* > ( new OleEmbeddedObject( m_xFactory, true ) ),
uno::UNO_QUERY );
uno::Reference< embed::XEmbedPersist > xPersist( xResult, uno::UNO_QUERY );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 16:47:17 +0000