diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-24 01:53:13 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-28 03:19:47 -0600 |
| commit | 381f8a5673b70e31fda2739da25f3863895ae665 (patch) | |
| tree | d9366671e0e2794164ef6cbffbf3e53242139efb /sfx2 | |
| parent | cd56e54df1df9c9e1a455f81bd86457f1d832604 (diff) | |
sal_Bool -> bool in mostly vcl module
Conflicts:
include/vcl/settings.hxx
svtools/source/table/tablecontrol_impl.cxx
sw/source/core/frmedt/fecopy.cxx
vcl/inc/canvasbitmap.hxx
vcl/inc/headless/svpframe.hxx
vcl/inc/unx/salframe.h
vcl/inc/win/salframe.h
vcl/inc/win/salprn.h
vcl/inc/win/salvd.h
vcl/osx/DragSource.cxx
vcl/osx/DragSource.hxx
vcl/osx/DropTarget.cxx
vcl/osx/DropTarget.hxx
vcl/osx/OSXTransferable.cxx
vcl/osx/OSXTransferable.hxx
vcl/osx/clipboard.cxx
vcl/osx/clipboard.hxx
vcl/osx/salprn.cxx
vcl/qa/cppunit/canvasbitmaptest.cxx
vcl/source/components/fontident.cxx
vcl/source/control/edit.cxx
vcl/source/control/spinfld.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/virdev.cxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/window/dockwin.cxx
vcl/unx/generic/dtrans/X11_selection.hxx
vcl/unx/kde/UnxFilePicker.cxx
vcl/unx/kde/UnxFilePicker.hxx
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
vcl/unx/kde4/KDESalFrame.hxx
Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0
Reviewed-on: https://gerrit.libreoffice.org/8219
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 8d75488c9b1d..0350df0a7c1c 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -759,7 +759,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) -void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) +void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode ) /* [Description] @@ -772,7 +772,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) return; SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl(); - sal_Bool bReArrange = sal_False; + bool bReArrange = sal_False; if ( pImp->bSplitable ) { // If the alignment changes and the window is in a docked state in a @@ -780,7 +780,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) // PrepareToggleFloatingMode() and ToggleFloatingMode() preform the // re-registered if ( !bFloatMode ) - bReArrange = sal_True; + bReArrange = true; } if ( bReArrange ) diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index e51167ab0eb4..2a9a7a393696 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -290,8 +290,8 @@ namespace sfx2 SfxDockingWindow::StateChanged( i_nType ); } - - void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, sal_Bool i_bFloatMode ) + //------------------------------------------------------------------------------------------------------------------ + void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, bool i_bFloatMode ) { SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode ); |