sal_Bool to bool

Change-Id: I01986d22cfc6544cbad39c3276d272d0520e3f53

sw/inc/ndgrf.hxx

@@ -180,8 +180,8 @@ public:
     bool IsSelected() const;
 
     /// Communicate to graphic that node is in Undo-range.
-    virtual sal_Bool SavePersistentData();
-    virtual sal_Bool RestorePersistentData();
+    virtual bool SavePersistentData();
+    virtual bool RestorePersistentData();
 
     /// Query link-data.
     bool IsGrfLink() const                  { return refLink.Is(); }

sw/inc/ndnotxt.hxx

@@ -57,8 +57,8 @@ public:
 
     virtual Size GetTwipSize() const = 0;
 
-    virtual sal_Bool SavePersistentData();
-    virtual sal_Bool RestorePersistentData();
+    virtual bool SavePersistentData();
+    virtual bool RestorePersistentData();
 
     OUString GetTitle() const;
     void SetTitle( const OUString& rTitle, bool bBroadcast = false );

sw/inc/ndole.hxx

@@ -111,8 +111,8 @@ public:
 
     void GetNewReplacement();
 
-    virtual sal_Bool SavePersistentData();
-    virtual sal_Bool RestorePersistentData();
+    virtual bool SavePersistentData();
+    virtual bool RestorePersistentData();
 
     sal_Bool IsInGlobalDocSection() const;
     sal_Bool IsOLEObjectDeleted() const;

sw/source/core/docnode/ndnotxt.cxx

@@ -75,14 +75,14 @@ void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
 
 /// Dummies for loading/saving of persistent data
 /// when working with graphics and OLE objects
-sal_Bool SwNoTxtNode::RestorePersistentData()
+bool SwNoTxtNode::RestorePersistentData()
 {
-    return sal_True;
+    return true;
 }
 
-sal_Bool SwNoTxtNode::SavePersistentData()
+bool SwNoTxtNode::SavePersistentData()
 {
-    return sal_True;
+    return true;
 }
 
 void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, sal_Bool bAutomatic )

sw/source/core/graphic/ndgrf.cxx

@@ -655,18 +655,18 @@ bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
  *
  * If it is already in storage, it needs to be loaded.
  */
-sal_Bool SwGrfNode::SavePersistentData()
+bool SwGrfNode::SavePersistentData()
 {
     if( refLink.Is() )
     {
         OSL_ENSURE( !bInSwapIn, "SavePersistentData: I am still in SwapIn" );
         GetDoc()->GetLinkManager().Remove( refLink );
-        return sal_True;
+        return true;
     }
 
     // swap in first if already in storage
     if( HasStreamName() && !SwapIn() )
-        return sal_False;
+        return false;
 
     // #i44367#
     // Do not delete graphic file in storage, because the graphic file could
@@ -680,10 +680,10 @@ sal_Bool SwGrfNode::SavePersistentData()
     // Important note: see also fix for #i40014#
 
     // swap out into temp file
-    return (sal_Bool) SwapOut();
+    return SwapOut();
 }
 
-sal_Bool SwGrfNode::RestorePersistentData()
+bool SwGrfNode::RestorePersistentData()
 {
     if( refLink.Is() )
     {
@@ -693,7 +693,7 @@ sal_Bool SwGrfNode::RestorePersistentData()
         if( getIDocumentLayoutAccess()->GetCurrentLayout() )
             refLink->Update();
     }
-    return sal_True;
+    return true;
 }
 
 void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )

sw/source/core/ole/ndole.cxx

@@ -266,7 +266,7 @@ SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )
 
 // Laden eines in den Undo-Bereich verschobenen OLE-Objekts
 
-sal_Bool SwOLENode::RestorePersistentData()
+bool SwOLENode::RestorePersistentData()
 {
     OSL_ENSURE( aOLEObj.GetOleRef().is(), "No object to restore!" );
     if ( aOLEObj.xOLERef.is() )
@@ -302,11 +302,11 @@ sal_Bool SwOLENode::RestorePersistentData()
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 // OLE object is transported into UNDO area
-sal_Bool SwOLENode::SavePersistentData()
+bool SwOLENode::SavePersistentData()
 {
     if( aOLEObj.xOLERef.is() )
     {
@@ -337,18 +337,18 @@ sal_Bool SwOLENode::SavePersistentData()
            Resolution:
            In pCnt->RemoveEmbeddedObject in SaveSection process of table chart, only remove the object from the object container,
            without removing it's storage and graphic stream. The chart already removed from formatter.> */
-           sal_Bool bChartWithInternalProvider = sal_False;
-           sal_Bool bKeepObjectToTempStorage = sal_True;
+           bool bChartWithInternalProvider = false;
            uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
            if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
            {
                uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
                if ( xChart.is() && xChart->hasInternalDataProvider() )
-                   bChartWithInternalProvider = sal_True;
+                   bChartWithInternalProvider = true;
            }
 
-           if ( IsChart() && !sChartTblName.isEmpty() && !bChartWithInternalProvider )
-               bKeepObjectToTempStorage = sal_False;
+           const bool bKeepObjectToTempStorage = !IsChart() ||
+                                                 sChartTblName.isEmpty() ||
+                                                 bChartWithInternalProvider;
            pCnt->RemoveEmbeddedObject( aOLEObj.aName, false, bKeepObjectToTempStorage );
            // modify end
 
@@ -368,7 +368,7 @@ sal_Bool SwOLENode::SavePersistentData()
 
     DisconnectFileLink_Impl();
 
-    return sal_True;
+    return true;
 }
 
 SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,