mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfx2/childwin.hxx: sal_Bool->bool

Browse Source 
Change-Id: I4fe18964a3178c797ce6e1fe259ec230c2de6eb7
This commit is contained in:
Noel Grandin 2014-03-26 13:25:02 +02:00
parent 75ebd3bdf3
commit ffca950230
13 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/sfx2/childwin.hxx
View File

@ -50,7 +50,7 @@ class SfxChildWindowContext;
// ChildWindow Configuration // ChildWindow Configuration
struct SfxChildWinInfo struct SfxChildWinInfo
{ {
sal_Bool bVisible; sal_Bool bVisible; // this can be sal_True, or sal_False, or 42
Point aPos; Point aPos;
Size aSize; Size aSize;
sal_uInt16 nFlags; sal_uInt16 nFlags;
@ -63,7 +63,7 @@ struct SfxChildWinInfo
bVisible = sal_False; bVisible = sal_False;
nFlags = 0; nFlags = 0;
} }
sal_Bool GetExtraData_Impl( SfxChildAlignment *pAlign, bool GetExtraData_Impl( SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign = 0, SfxChildAlignment *pLastAlign = 0,
Size *pSize = 0, Size *pSize = 0,
sal_uInt16 *pLine = 0, sal_uInt16 *pLine = 0,
@ -141,7 +141,7 @@ public:
FloatingWindow* GetFloatingWindow() const; FloatingWindow* GetFloatingWindow() const;
virtual void Resizing( Size& rSize ); virtual void Resizing( Size& rSize );
virtual sal_Bool Close(); virtual bool Close();
static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
}; };
@ -181,13 +181,13 @@ public:
{ pWindow->SetPosSizePixel(rPoint, rSize); } { pWindow->SetPosSizePixel(rPoint, rSize); }
Point GetPosPixel() Point GetPosPixel()
{ return pWindow->GetPosPixel(); } { return pWindow->GetPosPixel(); }
virtual void Hide(); virtual void Hide();
virtual void Show( sal_uInt16 nFlags ); virtual void Show( sal_uInt16 nFlags );
sal_uInt16 GetFlags() const sal_uInt16 GetFlags() const
{ return GetInfo().nFlags; } { return GetInfo().nFlags; }
sal_Bool CanGetFocus() const; bool CanGetFocus() const;
sal_uInt16 GetPosition(); sal_uInt16 GetPosition();
sal_uInt16 GetType() sal_uInt16 GetType()
{ return nType; } { return nType; }
void CreateContext( sal_uInt16 nContextId, SfxBindings& ); void CreateContext( sal_uInt16 nContextId, SfxBindings& );
@ -205,14 +205,14 @@ public:
static void RegisterChildWindow(SfxModule*, SfxChildWinFactory*); static void RegisterChildWindow(SfxModule*, SfxChildWinFactory*);
static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&); static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&);
void SetHideNotDelete( sal_Bool bOn ); void SetHideNotDelete( bool bOn );
sal_Bool IsHideNotDelete() const; bool IsHideNotDelete() const;
sal_Bool IsHideAtToggle() const; bool IsHideAtToggle() const;
sal_Bool IsVisible() const; sal_Bool IsVisible() const;
void SetWantsFocus( sal_Bool ); void SetWantsFocus( bool );
sal_Bool WantsFocus() const; bool WantsFocus() const;
virtual sal_Bool QueryClose(); virtual bool QueryClose();
virtual com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame(); 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 > & ); void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & );

2
include/svx/hyperdlg.hxx
View File

@ -41,7 +41,7 @@ public:
SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SfxBindings* pBindings, SfxChildWinInfo* pInfo );
SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper); SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper);
virtual sal_Bool QueryClose(); virtual bool QueryClose();
}; };
#endif // INCLUDED_SVX_HYPERDLG_HXX #endif // INCLUDED_SVX_HYPERDLG_HXX

2
sc/source/ui/view/tabvwshc.cxx
View File

@ -135,7 +135,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
SfxModelessDialog* pResult = 0; SfxModelessDialog* pResult = 0;
if(pCW) if(pCW)
pCW->SetHideNotDelete(sal_True); pCW->SetHideNotDelete(true);
ScDocument* pDoc = GetViewData()->GetDocument(); ScDocument* pDoc = GetViewData()->GetDocument();

2
sd/source/ui/dlg/AnimationChildWindow.cxx
View File

@ -49,7 +49,7 @@ AnimationChildWindow::AnimationChildWindow(
pAnimWin->Initialize( pInfo ); pAnimWin->Initialize( pInfo );
SetHideNotDelete( sal_True ); SetHideNotDelete( true );
} }
} // end of namespace sd } // end of namespace sd

2
sd/source/ui/dlg/PaneChildWindows.cxx
View File

@ -67,7 +67,7 @@ PaneChildWindow::PaneChildWindow (
SD_RESSTR( nTitleBarResId ) ); SD_RESSTR( nTitleBarResId ) );
eChildAlignment = eAlignment; eChildAlignment = eAlignment;
static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo); static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo);
SetHideNotDelete(sal_True); SetHideNotDelete(true);
ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame()); ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame());
if (pBase != NULL) if (pBase != NULL)

66
sfx2/source/appl/childwin.cxx
View File

@ -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::frame::XFrame > xFrame;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xListener; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xListener;
SfxChildWinFactory* pFact; SfxChildWinFactory* pFact;
sal_Bool bHideNotDelete; bool bHideNotDelete;
sal_Bool bVisible; sal_Bool bVisible;
sal_Bool bHideAtToggle; bool bHideAtToggle;
sal_Bool bWantsFocus; bool bWantsFocus;
SfxModule* pContextModule; SfxModule* pContextModule;
SfxWorkWindow* pWorkWin; 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 ) if ( comphelper::string::getTokenCount(rStr, '/') != 4 )
return sal_False; return false;
sal_Int32 nIdx = 0; sal_Int32 nIdx = 0;
rPos.X() = rStr.getToken(0, '/', nIdx).toInt32(); 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 // negative sizes are invalid
if ( rSize.Width() < 0 || rSize.Height() < 0 ) 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( ',' ); sal_Int32 nIndex = rStr.indexOf( ',' );
if ( nIndex != -1 ) if ( nIndex != -1 )
@ -129,19 +129,19 @@ sal_Bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
sal_Int32 nCount = comphelper::string::getTokenCount(aStr, ';'); sal_Int32 nCount = comphelper::string::getTokenCount(aStr, ';');
if ( nCount != 2 ) if ( nCount != 2 )
return sal_False; return false;
rSize.Width() = aStr.getToken(0, ';' ).toInt32(); rSize.Width() = aStr.getToken(0, ';' ).toInt32();
rSize.Height() = aStr.getToken(1, ';' ).toInt32(); rSize.Height() = aStr.getToken(1, ';' ).toInt32();
// negative sizes are invalid // negative sizes are invalid
if ( rSize.Width() < 0 || rSize.Height() < 0 ) 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 = new SfxChildWindow_Impl;
pImp->pFact = 0L; pImp->pFact = 0L;
pImp->bHideNotDelete = sal_False; pImp->bHideNotDelete = false;
pImp->bHideAtToggle = sal_False; pImp->bHideAtToggle = false;
pImp->bWantsFocus = sal_True; pImp->bWantsFocus = true;
pImp->bVisible = sal_True; pImp->bVisible = sal_True;
pImp->pContextModule = NULL; pImp->pContextModule = NULL;
pImp->pWorkWin = 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 ) void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF )
@ -543,32 +543,32 @@ void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF )
pImp->pFact = pF; pImp->pFact = pF;
} }
void SfxChildWindow::SetHideNotDelete( sal_Bool bOn ) void SfxChildWindow::SetHideNotDelete( bool bOn )
{ {
pImp->bHideNotDelete = bOn; pImp->bHideNotDelete = bOn;
} }
sal_Bool SfxChildWindow::IsHideNotDelete() const bool SfxChildWindow::IsHideNotDelete() const
{ {
return pImp->bHideNotDelete; return pImp->bHideNotDelete;
} }
sal_Bool SfxChildWindow::IsHideAtToggle() const bool SfxChildWindow::IsHideAtToggle() const
{ {
return pImp->bHideAtToggle; return pImp->bHideAtToggle;
} }
void SfxChildWindow::SetWantsFocus( sal_Bool bSet ) void SfxChildWindow::SetWantsFocus( bool bSet )
{ {
pImp->bWantsFocus = bSet; pImp->bWantsFocus = bSet;
} }
sal_Bool SfxChildWindow::WantsFocus() const bool SfxChildWindow::WantsFocus() const
{ {
return pImp->bWantsFocus; return pImp->bWantsFocus;
} }
sal_Bool SfxChildWinInfo::GetExtraData_Impl bool SfxChildWinInfo::GetExtraData_Impl
( (
SfxChildAlignment *pAlign, SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign, SfxChildAlignment *pLastAlign,
@ -579,11 +579,11 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
{ {
// invalid? // invalid?
if ( aExtraString.isEmpty() ) if ( aExtraString.isEmpty() )
return sal_False; return false;
OUString aStr; OUString aStr;
sal_Int32 nPos = aExtraString.indexOf("AL:"); sal_Int32 nPos = aExtraString.indexOf("AL:");
if ( nPos == -1 ) if ( nPos == -1 )
return sal_False; return false;
// Try to read the alignment string "ALIGN :(...)", but if // Try to read the alignment string "ALIGN :(...)", but if
// it is not present, then use an older version // it is not present, then use an older version
@ -601,14 +601,14 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
// First extract the Alignment // First extract the Alignment
if ( aStr.isEmpty() ) if ( aStr.isEmpty() )
return sal_False; return false;
if ( pAlign ) if ( pAlign )
*pAlign = (SfxChildAlignment) (sal_uInt16) aStr.toInt32(); *pAlign = (SfxChildAlignment) (sal_uInt16) aStr.toInt32();
// then the LastAlignment // then the LastAlignment
nPos = aStr.indexOf(','); nPos = aStr.indexOf(',');
if ( nPos == -1 ) if ( nPos == -1 )
return sal_False; return false;
aStr = aStr.copy(nPos+1); aStr = aStr.copy(nPos+1);
if ( pLastAlign ) if ( pLastAlign )
*pLastAlign = (SfxChildAlignment) (sal_uInt16) aStr.toInt32(); *pLastAlign = (SfxChildAlignment) (sal_uInt16) aStr.toInt32();
@ -617,7 +617,7 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
nPos = aStr.indexOf(','); nPos = aStr.indexOf(',');
if ( nPos == -1 ) if ( nPos == -1 )
// No docking in a Splitwindow // No docking in a Splitwindow
return sal_True; return true;
aStr = aStr.copy(nPos+1); aStr = aStr.copy(nPos+1);
Point aChildPos; Point aChildPos;
Size aChildSize; Size aChildSize;
@ -629,9 +629,9 @@ sal_Bool SfxChildWinInfo::GetExtraData_Impl
*pLine = (sal_uInt16) aChildPos.X(); *pLine = (sal_uInt16) aChildPos.X();
if ( pPos ) if ( pPos )
*pPos = (sal_uInt16) aChildPos.Y(); *pPos = (sal_uInt16) aChildPos.Y();
return sal_True; return true;
} }
return sal_False; return false;
} }
sal_Bool SfxChildWindow::IsVisible() const 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() ) 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); return !(pImp->pFact->aInfo.nFlags & SFX_CHILDWIN_CANTGETFOCUS);
} }

2
sfx2/source/dialog/dockwin.cxx
View File

@ -211,7 +211,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
pWindow->SetOutputSizePixel( Size( 270, 240 ) ); pWindow->SetOutputSizePixel( Size( 270, 240 ) );
( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
SetHideNotDelete( sal_True ); SetHideNotDelete( true );
} }
SfxChildWindow* SfxDockingWrapper::CreateImpl( SfxChildWindow* SfxDockingWrapper::CreateImpl(

4
sfx2/source/dialog/partwnd.cxx
View File

@ -69,7 +69,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
pWindow->SetSizePixel( Size( 175, 175 ) ); pWindow->SetSizePixel( Size( 175, 175 ) );
( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
SetHideNotDelete( sal_True ); SetHideNotDelete( true );
} }
SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl() SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
@ -88,7 +88,7 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
pWin->GetBindings().SetActiveFrame( NULL ); pWin->GetBindings().SetActiveFrame( NULL );
} }
sal_Bool SfxPartChildWnd_Impl::QueryClose() bool SfxPartChildWnd_Impl::QueryClose()
{ {
return ( (SfxPartDockWnd_Impl*)pWindow )->QueryClose(); return ( (SfxPartDockWnd_Impl*)pWindow )->QueryClose();
} }

6
sfx2/source/dialog/recfloat.cxx
View File

@ -132,7 +132,7 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd
, pBindings( pBind ) , pBindings( pBind )
{ {
pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParentWnd ); pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParentWnd );
SetWantsFocus( sal_False ); SetWantsFocus( false );
eChildAlignment = SFX_ALIGN_NOALIGNMENT; eChildAlignment = SFX_ALIGN_NOALIGNMENT;
( ( SfxFloatingWindow* ) pWindow )->Initialize( pInfo ); ( ( SfxFloatingWindow* ) pWindow )->Initialize( pInfo );
} }
@ -145,10 +145,10 @@ SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SFX_CALLMODE_SYNCHRON, &aItem, 0L ); 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! // 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(); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
if ( xRecorder.is() && !xRecorder->getRecordedMacro().isEmpty() ) if ( xRecorder.is() && !xRecorder->getRecordedMacro().isEmpty() )
{ {

2
sfx2/source/inc/partwnd.hxx
View File

@ -52,7 +52,7 @@ public:
SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl); SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl);
~SfxPartChildWnd_Impl(); ~SfxPartChildWnd_Impl();
virtual sal_Bool QueryClose(); virtual bool QueryClose();
}; };
// class SfxExplorerDockWnd_Impl ----------------------------------------- // class SfxExplorerDockWnd_Impl -----------------------------------------

2
sfx2/source/inc/recfloat.hxx
View File

@ -34,7 +34,7 @@ public:
~SfxRecordingFloatWrapper_Impl(); ~SfxRecordingFloatWrapper_Impl();
SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl); SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl);
virtual sal_Bool QueryClose(); virtual bool QueryClose();
}; };
class SfxRecordingFloat_Impl : public SfxFloatingWindow class SfxRecordingFloat_Impl : public SfxFloatingWindow

2
svx/source/dialog/hyperdlg.cxx
View File

@ -87,7 +87,7 @@ SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
return SfxChildWindow::GetInfo(); return SfxChildWindow::GetInfo();
} }
sal_Bool SvxHlinkDlgWrapper::QueryClose() bool SvxHlinkDlgWrapper::QueryClose()
{ {
return !mpDlg || mpDlg->QueryClose(); return !mpDlg || mpDlg->QueryClose();
} }

2
svx/source/form/tabwin.cxx
View File

@ -432,7 +432,7 @@ FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId,
:SfxChildWindow(_pParent, _nId) :SfxChildWindow(_pParent, _nId)
{ {
pWindow = new FmFieldWin(_pBindings, this, _pParent); pWindow = new FmFieldWin(_pBindings, this, _pParent);
SetHideNotDelete(sal_True); SetHideNotDelete(true);
eChildAlignment = SFX_ALIGN_NOALIGNMENT; eChildAlignment = SFX_ALIGN_NOALIGNMENT;
((SfxFloatingWindow*)pWindow)->Initialize( _pInfo ); ((SfxFloatingWindow*)pWindow)->Initialize( _pInfo );
} }