summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sfx2/childwin.hxx28
-rw-r--r--include/svx/hyperdlg.hxx2
-rw-r--r--sc/source/ui/view/tabvwshc.cxx2
-rw-r--r--sd/source/ui/dlg/AnimationChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx2
-rw-r--r--sfx2/source/appl/childwin.cxx66
-rw-r--r--sfx2/source/dialog/dockwin.cxx2
-rw-r--r--sfx2/source/dialog/partwnd.cxx4
-rw-r--r--sfx2/source/dialog/recfloat.cxx6
-rw-r--r--sfx2/source/inc/partwnd.hxx2
-rw-r--r--sfx2/source/inc/recfloat.hxx2
-rw-r--r--svx/source/dialog/hyperdlg.cxx2
-rw-r--r--svx/source/form/tabwin.cxx2
13 files changed, 61 insertions, 61 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index e0de7c7bef92..154e8b8f9dc8 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -50,7 +50,7 @@ class SfxChildWindowContext;
// ChildWindow Configuration
struct SfxChildWinInfo
{
- sal_Bool bVisible;
+ sal_Bool bVisible; // this can be sal_True, or sal_False, or 42
Point aPos;
Size aSize;
sal_uInt16 nFlags;
@@ -63,7 +63,7 @@ struct SfxChildWinInfo
bVisible = sal_False;
nFlags = 0;
}
- sal_Bool GetExtraData_Impl( SfxChildAlignment *pAlign,
+ bool GetExtraData_Impl( SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign = 0,
Size *pSize = 0,
sal_uInt16 *pLine = 0,
@@ -141,7 +141,7 @@ public:
FloatingWindow* GetFloatingWindow() const;
virtual void Resizing( Size& rSize );
- virtual sal_Bool Close();
+ virtual bool Close();
static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
};
@@ -181,13 +181,13 @@ public:
{ pWindow->SetPosSizePixel(rPoint, rSize); }
Point GetPosPixel()
{ return pWindow->GetPosPixel(); }
- virtual void Hide();
- virtual void Show( sal_uInt16 nFlags );
+ virtual void Hide();
+ virtual void Show( sal_uInt16 nFlags );
sal_uInt16 GetFlags() const
{ return GetInfo().nFlags; }
- sal_Bool CanGetFocus() const;
- sal_uInt16 GetPosition();
- sal_uInt16 GetType()
+ bool CanGetFocus() const;
+ sal_uInt16 GetPosition();
+ sal_uInt16 GetType()
{ return nType; }
void CreateContext( sal_uInt16 nContextId, SfxBindings& );
@@ -205,14 +205,14 @@ public:
static void RegisterChildWindow(SfxModule*, SfxChildWinFactory*);
static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&);
- void SetHideNotDelete( sal_Bool bOn );
- sal_Bool IsHideNotDelete() const;
- sal_Bool IsHideAtToggle() const;
+ void SetHideNotDelete( bool bOn );
+ bool IsHideNotDelete() const;
+ bool IsHideAtToggle() const;
sal_Bool IsVisible() const;
- void SetWantsFocus( sal_Bool );
- sal_Bool WantsFocus() const;
+ void SetWantsFocus( bool );
+ bool WantsFocus() const;
- virtual sal_Bool QueryClose();
+ virtual bool QueryClose();
virtual com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & );
diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx
index 9e86b6dccb84..fff6dc22cbe1 100644
--- a/include/svx/hyperdlg.hxx
+++ b/include/svx/hyperdlg.hxx
@@ -41,7 +41,7 @@ public:
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper);
- virtual sal_Bool QueryClose();
+ virtual bool QueryClose();
};
#endif // INCLUDED_SVX_HYPERDLG_HXX
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index f4701c7217ec..20c0ab12c4e1 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -135,7 +135,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
SfxModelessDialog* pResult = 0;
if(pCW)
- pCW->SetHideNotDelete(sal_True);
+ pCW->SetHideNotDelete(true);
ScDocument* pDoc = GetViewData()->GetDocument();
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx
index be24dea4198e..a9c8acb90bd1 100644
--- a/sd/source/ui/dlg/AnimationChildWindow.cxx
+++ b/sd/source/ui/dlg/AnimationChildWindow.cxx
@@ -49,7 +49,7 @@ AnimationChildWindow::AnimationChildWindow(
pAnimWin->Initialize( pInfo );
- SetHideNotDelete( sal_True );
+ SetHideNotDelete( true );
}
} // end of namespace sd
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index fd8237aa42b0..89a9f96936ec 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -67,7 +67,7 @@ PaneChildWindow::PaneChildWindow (
SD_RESSTR( nTitleBarResId ) );
eChildAlignment = eAlignment;
static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo);
- SetHideNotDelete(sal_True);
+ SetHideNotDelete(true);
ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame());
if (pBase != NULL)
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 9058a841a638..f9f7c1197b1b 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -48,10 +48,10 @@ struct SfxChildWindow_Impl
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xListener;
SfxChildWinFactory* pFact;
- sal_Bool bHideNotDelete;
+ bool bHideNotDelete;
sal_Bool bVisible;
- sal_Bool bHideAtToggle;
- sal_Bool bWantsFocus;
+ bool bHideAtToggle;
+ bool bWantsFocus;
SfxModule* pContextModule;
SfxWorkWindow* pWorkWin;
};
@@ -102,10 +102,10 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::
-sal_Bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize )
+bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize )
{
if ( comphelper::string::getTokenCount(rStr, '/') != 4 )
- return sal_False;
+ return false;
sal_Int32 nIdx = 0;
rPos.X() = rStr.getToken(0, '/', nIdx).toInt32();
@@ -115,12 +115,12 @@ sal_Bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize )
// negative sizes are invalid
if ( rSize.Width() < 0 || rSize.Height() < 0 )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
-sal_Bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
+bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
{
sal_Int32 nIndex = rStr.indexOf( ',' );
if ( nIndex != -1 )
@@ -129,19 +129,19 @@ sal_Bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
sal_Int32 nCount = comphelper::string::getTokenCount(aStr, ';');
if ( nCount != 2 )
- return sal_False;
+ return false;
rSize.Width() = aStr.getToken(0, ';' ).toInt32();
rSize.Height() = aStr.getToken(1, ';' ).toInt32();
// negative sizes are invalid
if ( rSize.Width() < 0 || rSize.Height() < 0 )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -153,9 +153,9 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId)
{
pImp = new SfxChildWindow_Impl;
pImp->pFact = 0L;
- pImp->bHideNotDelete = sal_False;
- pImp->bHideAtToggle = sal_False;
- pImp->bWantsFocus = sal_True;
+ pImp->bHideNotDelete = false;
+ pImp->bHideAtToggle = false;
+ pImp->bWantsFocus = true;
pImp->bVisible = sal_True;
pImp->pContextModule = NULL;
pImp->pWorkWin = NULL;
@@ -533,9 +533,9 @@ void SfxChildWindowContext::Resizing( Size& )
{
}
-sal_Bool SfxChildWindowContext::Close()
+bool SfxChildWindowContext::Close()
{
- return sal_True;
+ return true;
}
void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF )
@@ -543,32 +543,32 @@ void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF )
pImp->pFact = pF;
}
-void SfxChildWindow::SetHideNotDelete( sal_Bool bOn )
+void SfxChildWindow::SetHideNotDelete( bool bOn )
{
pImp->bHideNotDelete = bOn;
}
-sal_Bool SfxChildWindow::IsHideNotDelete() const
+bool SfxChildWindow::IsHideNotDelete() const
{
return pImp->bHideNotDelete;
}
-sal_Bool SfxChildWindow::IsHideAtToggle() const
+bool SfxChildWindow::IsHideAtToggle() const
{
return pImp->bHideAtToggle;
}
-void SfxChildWindow::SetWantsFocus( sal_Bool bSet )
+void SfxChildWindow::SetWantsFocus( bool bSet )
{
pImp->bWantsFocus = bSet;
}
-sal_Bool SfxChildWindow::WantsFocus() const
+bool SfxChildWindow::WantsFocus() const
{
return pImp->bWantsFocus;
}
-sal_Bool SfxChildWinInfo::GetExtraData_Impl
+bool SfxChildWinInfo::GetExtraData_Impl
(
SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign,
@@ -579,11 +579,11 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
{
// invalid?
if ( aExtraString.isEmpty() )
- return sal_False;
+ return false;
OUString aStr;
sal_Int32 nPos = aExtraString.indexOf("AL:");
if ( nPos == -1 )
- return sal_False;
+ return false;
// Try to read the alignment string "ALIGN :(...)", but if
// it is not present, then use an older version
@@ -601,14 +601,14 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
// First extract the Alignment
if ( aStr.isEmpty() )
- return sal_False;
+ return false;
if ( pAlign )
*pAlign = (SfxChildAlignment) (sal_uInt16) aStr.toInt32();
// then the LastAlignment
nPos = aStr.indexOf(',');
if ( nPos == -1 )
- return sal_False;
+ return false;
aStr = aStr.copy(nPos+1);
if ( pLastAlign )
*pLastAlign = (SfxChildAlignment) (sal_uInt16) aStr.toInt32();
@@ -617,7 +617,7 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
nPos = aStr.indexOf(',');
if ( nPos == -1 )
// No docking in a Splitwindow
- return sal_True;
+ return true;
aStr = aStr.copy(nPos+1);
Point aChildPos;
Size aChildSize;
@@ -629,9 +629,9 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
*pLine = (sal_uInt16) aChildPos.X();
if ( pPos )
*pPos = (sal_uInt16) aChildPos.Y();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
sal_Bool SfxChildWindow::IsVisible() const
@@ -698,9 +698,9 @@ void SfxChildWindow::Deactivate_Impl()
{
}
-sal_Bool SfxChildWindow::QueryClose()
+bool SfxChildWindow::QueryClose()
{
- sal_Bool bAllow = sal_True;
+ bool bAllow = true;
if ( pImp->xFrame.is() )
{
@@ -743,7 +743,7 @@ void SfxChildWindow::SetFrame( const ::com::sun::star::uno::Reference< ::com::su
}
}
-sal_Bool SfxChildWindow::CanGetFocus() const
+bool SfxChildWindow::CanGetFocus() const
{
return !(pImp->pFact->aInfo.nFlags & SFX_CHILDWIN_CANTGETFOCUS);
}
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index bc42133cc972..54a7fdb01dcc 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -211,7 +211,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
pWindow->SetOutputSizePixel( Size( 270, 240 ) );
( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
- SetHideNotDelete( sal_True );
+ SetHideNotDelete( true );
}
SfxChildWindow* SfxDockingWrapper::CreateImpl(
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 591a9598f6fc..27baa2b75946 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -69,7 +69,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
pWindow->SetSizePixel( Size( 175, 175 ) );
( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
- SetHideNotDelete( sal_True );
+ SetHideNotDelete( true );
}
SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
@@ -88,7 +88,7 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
pWin->GetBindings().SetActiveFrame( NULL );
}
-sal_Bool SfxPartChildWnd_Impl::QueryClose()
+bool SfxPartChildWnd_Impl::QueryClose()
{
return ( (SfxPartDockWnd_Impl*)pWindow )->QueryClose();
}
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index a9d91171ac6e..1f925990ecd5 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -132,7 +132,7 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd
, pBindings( pBind )
{
pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParentWnd );
- SetWantsFocus( sal_False );
+ SetWantsFocus( false );
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
( ( SfxFloatingWindow* ) pWindow )->Initialize( pInfo );
}
@@ -145,10 +145,10 @@ SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
}
-sal_Bool SfxRecordingFloatWrapper_Impl::QueryClose()
+bool SfxRecordingFloatWrapper_Impl::QueryClose()
{
// asking for recorded macro should be replaced if index access is available!
- sal_Bool bRet = sal_True;
+ bool bRet = true;
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
if ( xRecorder.is() && !xRecorder->getRecordedMacro().isEmpty() )
{
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 71bb4467cd96..0686b2115bba 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -52,7 +52,7 @@ public:
SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl);
~SfxPartChildWnd_Impl();
- virtual sal_Bool QueryClose();
+ virtual bool QueryClose();
};
// class SfxExplorerDockWnd_Impl -----------------------------------------
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index 1562b5edb5ed..88a481187856 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -34,7 +34,7 @@ public:
~SfxRecordingFloatWrapper_Impl();
SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl);
- virtual sal_Bool QueryClose();
+ virtual bool QueryClose();
};
class SfxRecordingFloat_Impl : public SfxFloatingWindow
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 31f3ffa4a160..8134696c61b8 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -87,7 +87,7 @@ SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
return SfxChildWindow::GetInfo();
}
-sal_Bool SvxHlinkDlgWrapper::QueryClose()
+bool SvxHlinkDlgWrapper::QueryClose()
{
return !mpDlg || mpDlg->QueryClose();
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index a560d01442d7..25472c726c09 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -432,7 +432,7 @@ FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId,
:SfxChildWindow(_pParent, _nId)
{
pWindow = new FmFieldWin(_pBindings, this, _pParent);
- SetHideNotDelete(sal_True);
+ SetHideNotDelete(true);
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
((SfxFloatingWindow*)pWindow)->Initialize( _pInfo );
}