[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/core/access/accdoc.cxx  |    4 ++--
 sw/source/core/access/accdoc.hxx  |    2 +-
 sw/source/uibase/inc/pview.hxx    |    4 ++--
 sw/source/uibase/uiview/pview.cxx |   14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit cb7dc89f661170539a3917c1a33b4b2ccbf2899a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 15 15:59:40 2014 +0200

    sw: sal_Bool -> bool
    
    Change-Id: I9eb9fa5a5a5af1add3af4c6ff6a331075bd5e78e

diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 07e1c8f..9da98da 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -99,7 +99,7 @@ void SwAccessibleDocumentBase::SetVisArea()
     }
 }
 
-void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent )
+void SwAccessibleDocumentBase::AddChild( Window *pWin, bool bFireEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -369,7 +369,7 @@ SwAccessibleDocument::SwAccessibleDocument ( SwAccessibleMap* pInitMap ) :
             Window* pChildWin = pWin->GetChild( i );
             if( pChildWin &&
                 AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() )
-                AddChild( pChildWin, sal_False );
+                AddChild( pChildWin, false );
         }
     }
 }
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index b724508..15e7c8a 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -48,7 +48,7 @@ public:
 
     void SetVisArea();
 
-    virtual void AddChild( Window *pWin, sal_Bool bFireEvent = sal_True );
+    virtual void AddChild( Window *pWin, bool bFireEvent = true );
     virtual void RemoveChild( Window *pWin );
 
     // XAccessibleContext
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index e3372fb..b5f1d1e 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -187,7 +187,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
     SAL_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
     SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * );
-    SAL_DLLPRIVATE bool            ChgPage( int eMvMode, int bUpdateScrollbar = sal_True );
+    SAL_DLLPRIVATE bool            ChgPage( int eMvMode, bool bUpdateScrollbar = true );
 
     SAL_DLLPRIVATE virtual SfxPrinter*     GetPrinter( bool bCreate = false ) SAL_OVERRIDE;
     SAL_DLLPRIVATE virtual sal_uInt16      SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE;
@@ -235,7 +235,7 @@ public:
     void            DocSzChgd(const Size& rNewSize);
     const Size&     GetDocSz() const { return aDocSz; }
 
-    virtual void    SetVisArea( const Rectangle&, sal_Bool bUpdateScrollbar = sal_True);
+    virtual void    SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
 
     inline void     AdjustEditWin();
 
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 56430f4..d54d829 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -609,7 +609,7 @@ void SwPagePreview::_ExecPgUpAndPgDown( const bool  _bPgUp,
             const int eMvMode = _bPgUp ?
                                 SwPagePreviewWin::MV_PAGE_UP :
                                 SwPagePreviewWin::MV_PAGE_DOWN;
-            if ( ChgPage( eMvMode, sal_True ) )
+            if ( ChgPage( eMvMode, true ) )
                 pViewWin->Invalidate();
         }
         else
@@ -839,7 +839,7 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
                 {
                     pViewWin->SetSelectedPage( nNewSelectedPage );
                     pViewWin->SetSttPage( nNewStartPage );
-                    bRefresh = ChgPage( SwPagePreviewWin::MV_SELPAGE, sal_True );
+                    bRefresh = ChgPage( SwPagePreviewWin::MV_SELPAGE, true );
                 }
                 GetViewShell()->ShowPreviewSelection( nNewSelectedPage );
                 // invalidate page status.
@@ -873,7 +873,7 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
             eMvMode = SwPagePreviewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE;
 MOVEPAGE:
             {
-                bool nRet = ChgPage( eMvMode, sal_True );
+                bool nRet = ChgPage( eMvMode, true );
                 // return value fuer Basic
                 if(bRetVal)
                     rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !nRet));
@@ -1255,7 +1255,7 @@ int SwPagePreview::_CreateScrollbar( bool bHori )
     return 1;
 }
 
-bool SwPagePreview::ChgPage( int eMvMode, int bUpdateScrollbar )
+bool SwPagePreview::ChgPage( int eMvMode, bool bUpdateScrollbar )
 {
     Rectangle aPixVisArea( pViewWin->LogicToPixel( aVisArea ) );
     bool bChg = pViewWin->MovePage( eMvMode ) ||
@@ -1336,7 +1336,7 @@ void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize )
                     *pVScrollbar, *pHScrollbar, *pScrollFill );
 }
 
-void SwPagePreview::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar )
+void SwPagePreview::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar )
 {
     const Point aTopLeft(AlignToPixel(rRect.TopLeft()));
     const Point aBottomRight(AlignToPixel(rRect.BottomRight()));
@@ -1453,7 +1453,7 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar )
                     {
                         pViewWin->SetSttPage( nThmbPos );
                         pViewWin->SetSelectedPage( nThmbPos );
-                        ChgPage( SwPagePreviewWin::MV_SCROLL, sal_False );
+                        ChgPage( SwPagePreviewWin::MV_SCROLL, false );
                         // update scrollbars
                         ScrollViewSzChg();
                     }
@@ -1527,7 +1527,7 @@ void SwPagePreview::DocSzChgd( const Size &rSz )
 
     if( aVisArea.GetWidth() )
     {
-        ChgPage( SwPagePreviewWin::MV_CALC, sal_True );
+        ChgPage( SwPagePreviewWin::MV_CALC, true );
         ScrollDocSzChg();
 
         pViewWin->Invalidate();