summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-18 11:23:57 +0200
committerNoel Grandin <noel@peralex.com>2014-03-18 11:27:39 +0200
commitc3e3f466571e4993c1b5e42c6d15e37c48f3a069 (patch)
tree538fb90ed2c05e725f28ff16d41fd27ca38a7573 /sd
parente399c0759812affd4f7f6e1e3aacfbcafc06ad6d (diff)
sfx2: sal_Bool->bool
Change-Id: I375a72c34e46778385a9fdc24c9ebd0f0a3f3c9b
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/docshell/docshell.cxx4
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx4
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx4
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx4
-rw-r--r--sd/source/ui/inc/PresentationViewShell.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx4
-rw-r--r--sd/source/ui/inc/ViewShell.hxx4
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx4
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx4
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx2
-rw-r--r--sd/source/ui/view/drviews1.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx4
-rw-r--r--sd/source/ui/view/presvish.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx6
16 files changed, 29 insertions, 29 deletions
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 518eabf0712b..573fb792f689 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -340,7 +340,7 @@ void DrawDocShell::InPlaceActivate( bool bActive )
}
}
-void DrawDocShell::Activate( sal_Bool bMDI)
+void DrawDocShell::Activate( bool bMDI)
{
if (bMDI)
{
@@ -349,7 +349,7 @@ void DrawDocShell::Activate( sal_Bool bMDI)
}
}
-void DrawDocShell::Deactivate( sal_Bool )
+void DrawDocShell::Deactivate( bool )
{
}
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 031ed17217f0..c8b22c8240ec 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -71,8 +71,8 @@ public:
virtual ~DrawDocShell();
void UpdateRefDevice();
- virtual void Activate( sal_Bool bMDI );
- virtual void Deactivate( sal_Bool bMDI );
+ virtual void Activate( bool bMDI );
+ virtual void Deactivate( bool bMDI );
virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
virtual bool ImportFrom(SfxMedium &rMedium,
css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index a6537d6c2e9f..73414906a7ff 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -150,8 +150,8 @@ public:
void SelectionHasChanged();
void ModelHasChanged();
- virtual void Activate(sal_Bool bIsMDIActivate);
- virtual void Deactivate(sal_Bool IsMDIActivate);
+ virtual void Activate(bool bIsMDIActivate);
+ virtual void Deactivate(bool IsMDIActivate);
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
virtual OUString GetSelectionText( bool bCompleteWords = false );
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index f69132ba9986..deb9307a89cb 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -78,8 +78,8 @@ public:
virtual void AddWindow(::sd::Window* pWin);
virtual void RemoveWindow(::sd::Window* pWin);
- virtual void Activate( sal_Bool IsMDIActivate );
- virtual void Deactivate( sal_Bool IsMDIActivate );
+ virtual void Activate( bool IsMDIActivate );
+ virtual void Deactivate( bool IsMDIActivate );
virtual SdPage* GetActualPage();
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index bed98a2be47d..f23f501716a0 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -56,7 +56,7 @@ protected:
private:
Rectangle maOldVisArea;
- virtual void Activate (sal_Bool bIsMDIActivate);
+ virtual void Activate (bool bIsMDIActivate);
virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin);
};
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index dd0684241087..6e212a243075 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -110,8 +110,8 @@ public:
*/
virtual void ArrangeGUIElements (void);
- virtual void Activate (sal_Bool IsMDIActivate);
- virtual void Deactivate (sal_Bool IsMDIActivate);
+ virtual void Activate (bool IsMDIActivate);
+ virtual void Deactivate (bool IsMDIActivate);
//===== Drag and Drop =====================================================
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 7fab33cda0c5..759bed49a220 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -541,8 +541,8 @@ protected:
virtual void UpdateHRuler();
virtual void UpdateVRuler();
- virtual void Activate(sal_Bool IsMDIActivate);
- virtual void Deactivate(sal_Bool IsMDIActivate);
+ virtual void Activate(bool IsMDIActivate);
+ virtual void Deactivate(bool IsMDIActivate);
virtual void SetZoomFactor( const Fraction &rZoomX,
const Fraction &rZoomY );
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index c8bc54f64f6a..03689244a198 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -153,8 +153,8 @@ public:
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
- virtual void Activate (sal_Bool IsMDIActivate);
- virtual void Deactivate (sal_Bool IsMDIActivate);
+ virtual void Activate (bool IsMDIActivate);
+ virtual void Deactivate (bool IsMDIActivate);
virtual void SetZoomFactor (
const Fraction &rZoomX,
const Fraction &rZoomY);
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 2cbeb8680e65..ce71491687a6 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -492,7 +492,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
SfxRequest aRequest (mrBase.GetViewFrame(), SID_ASSIGN_LAYOUT);
aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATPAGE, ((*iPage)->GetPageNum()-1)/2));
aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout));
- pMainViewShell->ExecuteSlot (aRequest, sal_Bool(sal_False));
+ pMainViewShell->ExecuteSlot (aRequest, false);
}
}
while(false);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 87ef407e6d86..9e6d070c70d2 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -562,7 +562,7 @@ void SlideSorterViewShell::ArrangeGUIElements (void)
-void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate)
+void SlideSorterViewShell::Activate (bool bIsMDIActivate)
{
ViewShell::Activate(bIsMDIActivate);
if (mbIsArrangeGUIElementsPending)
@@ -601,7 +601,7 @@ void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate)
-void SlideSorterViewShell::Deactivate (sal_Bool /*bIsMDIActivate*/)
+void SlideSorterViewShell::Deactivate (bool /*bIsMDIActivate*/)
{
// Save Settings - Specifically SlidesPerRow to retrieve it later
WriteFrameViewData();
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index c585ca44bb5d..9c14f4aaba6a 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -793,7 +793,7 @@ void ViewShellBase::ReadUserDataSequence (
-void ViewShellBase::Activate (sal_Bool bIsMDIActivate)
+void ViewShellBase::Activate (bool bIsMDIActivate)
{
SfxViewShell::Activate(bIsMDIActivate);
@@ -811,7 +811,7 @@ void ViewShellBase::Activate (sal_Bool bIsMDIActivate)
-void ViewShellBase::Deactivate (sal_Bool bIsMDIActivate)
+void ViewShellBase::Deactivate (bool bIsMDIActivate)
{
SfxViewShell::Deactivate(bIsMDIActivate);
}
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index bfb8ef893439..dba0ca8ee24f 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1334,7 +1334,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell)
}
// Now we can deactivate the shell.
- pShell->Deactivate(sal_True);
+ pShell->Deactivate(true);
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 009288e5dba7..51db4f60a4b4 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -88,7 +88,7 @@ using namespace com::sun::star;
namespace sd {
-void DrawViewShell::Activate(sal_Bool bIsMDIActivate)
+void DrawViewShell::Activate(bool bIsMDIActivate)
{
ViewShell::Activate(bIsMDIActivate);
}
@@ -114,7 +114,7 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli )
}
-void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate)
+void DrawViewShell::Deactivate(bool bIsMDIActivate)
{
// Temporarily disable context broadcasting while the Deactivate()
// call is forwarded to our base class.
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 5aff9af4bee9..c3b780d7cc59 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -359,7 +359,7 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin)
/**
* Activate(): during the first invocation the fields get updated
*/
-void OutlineViewShell::Activate( sal_Bool bIsMDIActivate )
+void OutlineViewShell::Activate( bool bIsMDIActivate )
{
if ( ! mbInitialized)
{
@@ -382,7 +382,7 @@ void OutlineViewShell::Activate( sal_Bool bIsMDIActivate )
}
}
-void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate )
+void OutlineViewShell::Deactivate( bool bIsMDIActivate )
{
pOlView->DisconnectFromApplication();
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 143b31ef5fe6..94988d8ff4cb 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -127,7 +127,7 @@ SvxRuler* PresentationViewShell::CreateVRuler(::sd::Window*)
}
-void PresentationViewShell::Activate( sal_Bool bIsMDIActivate )
+void PresentationViewShell::Activate( bool bIsMDIActivate )
{
DrawViewShell::Activate( bIsMDIActivate );
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 1770bc053b2b..d3bfeecd7de3 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -287,7 +287,7 @@ void ViewShell::Exit (void)
pView->UnmarkAll();
}
- Deactivate (sal_True);
+ Deactivate (true);
if (IsMainViewShell())
{
@@ -303,7 +303,7 @@ void ViewShell::Exit (void)
/**
* set focus to working window
*/
-void ViewShell::Activate(sal_Bool bIsMDIActivate)
+void ViewShell::Activate(bool bIsMDIActivate)
{
// Do not forward to SfxShell::Activate()
@@ -371,7 +371,7 @@ void ViewShell::UIDeactivated( SfxInPlaceClient* )
}
-void ViewShell::Deactivate(sal_Bool bIsMDIActivate)
+void ViewShell::Deactivate(bool bIsMDIActivate)
{
// remove view from a still active drag'n'drop session
SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;