summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-19 09:01:06 +0200
committerNoel Grandin <noel@peralex.com>2014-03-19 09:21:24 +0200
commit9278df2c21fed09b6b10465ca33b227ad7c49b41 (patch)
tree5dc447f593f0244e7e8c5848a8da34f25cc4aa41 /sd/source
parent16752a8a773cf8096e28628237238a562016c4e5 (diff)
sfx2: sal_Bool->bool
Change-Id: I73acb3a150b01114d32274a6842f6db9654b3e63
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.cxx10
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx10
-rw-r--r--sd/source/ui/slideshow/showwin.cxx10
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx12
-rw-r--r--sd/source/ui/view/drviews1.cxx2
7 files changed, 25 insertions, 25 deletions
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index d3624a54a787..1bcd6e350eeb 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -594,7 +594,7 @@ void BasicViewFactory::ActivateCenterView (
// have to request a resize now.
rpDescriptor->mpViewShell->UIFeatureChanged();
if (mpBase->GetDocShell()->IsInPlaceActive())
- mpBase->GetViewFrame()->Resize(sal_True);
+ mpBase->GetViewFrame()->Resize(true);
mpBase->GetDrawController().SetSubController(
rpDescriptor->mpViewShell->CreateSubController());
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 41e179818950..3a208ace6ecf 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -59,7 +59,7 @@ ChildWindowPane::ChildWindowPane (
{
// The ViewShellBase has already been activated. Make
// the child window visible as soon as possible.
- pViewFrame->SetChildWindow(mnChildWindowId, sal_True);
+ pViewFrame->SetChildWindow(mnChildWindowId, true);
OSL_TRACE("ChildWindowPane:activating now");
}
else
@@ -81,7 +81,7 @@ ChildWindowPane::ChildWindowPane (
// The ViewShellBase has not yet been activated. Hide the
// window and wait a little before it is made visible. See
// comments in the GetWindow() method for an explanation.
- pViewFrame->SetChildWindow(mnChildWindowId, sal_False);
+ pViewFrame->SetChildWindow(mnChildWindowId, false);
OSL_TRACE("ChildWindowPane:base not active");
}
}
@@ -103,7 +103,7 @@ void ChildWindowPane::Hide (void)
if (pViewFrame != NULL)
if (pViewFrame->KnowsChildWindow(mnChildWindowId))
if (pViewFrame->HasChildWindow(mnChildWindowId))
- pViewFrame->SetChildWindow(mnChildWindowId, sal_False);
+ pViewFrame->SetChildWindow(mnChildWindowId, false);
// Release the window because when the child window is shown again it
// may use a different window.
@@ -159,7 +159,7 @@ void SAL_CALL ChildWindowPane::disposing (void)
if ( ! pViewFrame->KnowsChildWindow(mnChildWindowId))
break;
- pViewFrame->SetChildWindow(mnChildWindowId, sal_True);
+ pViewFrame->SetChildWindow(mnChildWindowId, true);
SfxChildWindow* pChildWindow = pViewFrame->GetChildWindow(mnChildWindowId);
if (pChildWindow == NULL)
if (pViewFrame->HasChildWindow(mnChildWindowId))
@@ -167,7 +167,7 @@ void SAL_CALL ChildWindowPane::disposing (void)
// The child window is not yet visible. Ask the view frame
// to show it and try again to get access to the child
// window.
- pViewFrame->ShowChildWindow(mnChildWindowId, sal_True);
+ pViewFrame->ShowChildWindow(mnChildWindowId, true);
pChildWindow = pViewFrame->GetChildWindow(mnChildWindowId);
}
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 03689244a198..231e5dadc89a 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -113,7 +113,7 @@ public:
/* override these from SfxViewShell */
virtual OUString GetSelectionText(bool);
- virtual sal_Bool HasSelection(sal_Bool) const;
+ virtual bool HasSelection(bool) const;
SvBorder GetBorder (bool bOuterResize);
virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize);
@@ -129,7 +129,7 @@ public:
virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void);
/// Forwarded to the print manager.
- virtual SfxPrinter* GetPrinter (sal_Bool bCreate = sal_False);
+ virtual SfxPrinter* GetPrinter (bool bCreate = false);
/// Forwarded to the print manager.
virtual sal_uInt16 SetPrinter (
@@ -140,7 +140,7 @@ public:
virtual void WriteUserDataSequence (
::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue >&,
- sal_Bool bBrowse = sal_False);
+ bool bBrowse = false);
/** Pass the given properties to the main view shell. After that we
ensure that the right view shell type is displayed in the center
@@ -149,7 +149,7 @@ public:
virtual void ReadUserDataSequence (
const ::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue >&,
- sal_Bool bBrowse = sal_False);
+ bool bBrowse = false);
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
@@ -158,7 +158,7 @@ public:
virtual void SetZoomFactor (
const Fraction &rZoomX,
const Fraction &rZoomY);
- virtual bool PrepareClose (sal_Bool bUI = sal_True) SAL_OVERRIDE;
+ virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE;
virtual void WriteUserData (OUString&, bool bBrowse = false);
virtual void ReadUserData (const OUString&, bool bBrowse = false);
virtual SdrView* GetDrawView (void) const;
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 9d9f35c879d6..00ffb1204cf0 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -326,7 +326,7 @@ bool ShowWindow::SetEndMode()
// hide navigator if it is visible
if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) )
{
- mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False );
+ mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, false );
mbShowNavigatorAfterSpecialMode = true;
}
@@ -360,7 +360,7 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout
// hide navigator if it is visible
if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) )
{
- mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False );
+ mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, false );
mbShowNavigatorAfterSpecialMode = true;
}
@@ -390,7 +390,7 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan
// hide navigator if it is visible
if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) )
{
- mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False );
+ mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, false );
mbShowNavigatorAfterSpecialMode = true;
}
@@ -424,7 +424,7 @@ void ShowWindow::TerminateShow()
// show navigator?
if( mbShowNavigatorAfterSpecialMode )
{
- mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_True );
+ mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, true );
mbShowNavigatorAfterSpecialMode = false;
}
}
@@ -482,7 +482,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart )
if( mbShowNavigatorAfterSpecialMode )
{
if (mpViewShell)
- mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_True );
+ mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, true );
mbShowNavigatorAfterSpecialMode = false;
}
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index c7e3ad4f4ce8..ffc7c6ddc88e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2606,7 +2606,7 @@ void SlideshowImpl::hideChildWindows()
if( pViewFrame->GetChildWindow( nId ) )
{
- pViewFrame->SetChildWindow( nId, sal_False );
+ pViewFrame->SetChildWindow( nId, false );
mnChildMask |= 1 << i;
}
}
@@ -2628,7 +2628,7 @@ void SlideshowImpl::showChildWindows()
for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
if( mnChildMask & ( 1 << i ) )
- pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), sal_True );
+ pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), true );
}
}
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 9c14f4aaba6a..b651ecf71c38 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -469,7 +469,7 @@ OUString ViewShellBase::GetSelectionText(bool bCompleteWords)
: SfxViewShell::GetSelectionText(bCompleteWords);
}
-sal_Bool ViewShellBase::HasSelection(sal_Bool bText) const
+bool ViewShellBase::HasSelection(bool bText) const
{
::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
DrawViewShell *const pDrawViewShell(
@@ -526,7 +526,7 @@ void ViewShellBase::Rearrange (void)
OSL_TRACE("Rearrange: window missing");
}
- GetViewFrame()->Resize(sal_True);
+ GetViewFrame()->Resize(true);
}
@@ -556,7 +556,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable (void)
-SfxPrinter* ViewShellBase::GetPrinter (sal_Bool bCreate)
+SfxPrinter* ViewShellBase::GetPrinter (bool bCreate)
{
OSL_ASSERT(mpImpl.get()!=NULL);
@@ -732,7 +732,7 @@ void ViewShellBase::GetState (SfxItemSet& rSet)
void ViewShellBase::WriteUserDataSequence (
::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue >& rSequence,
- sal_Bool bBrowse)
+ bool bBrowse)
{
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
@@ -746,7 +746,7 @@ void ViewShellBase::WriteUserDataSequence (
void ViewShellBase::ReadUserDataSequence (
const ::com::sun::star::uno::Sequence <
::com::sun::star::beans::PropertyValue >& rSequence,
- sal_Bool bBrowse)
+ bool bBrowse)
{
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
@@ -833,7 +833,7 @@ void ViewShellBase::SetZoomFactor (
-bool ViewShellBase::PrepareClose (sal_Bool bUI)
+bool ViewShellBase::PrepareClose (bool bUI)
{
bool nResult = SfxViewShell::PrepareClose (bUI);
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 51db4f60a4b4..230497bf9c1b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -400,7 +400,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
* MASTERPAGE
******************************************************************/
GetViewFrame()->SetChildWindow(
- AnimationChildWindow::GetChildWindowId(), sal_False );
+ AnimationChildWindow::GetChildWindowId(), false );
if (!mpActualPage)
{