embeddedobj: sal_Bool->bool

Change-Id: Ie3465a34963c768945b1ee7f5939ea1f233d3528

4 files changed, 58 insertions, 58 deletions

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 );