diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-04-11 18:32:27 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-04-12 06:30:03 +0900 |
commit | bd7b2c7befbd10bebaba3a9b6ea491969ac1dcb0 (patch) | |
tree | 52bc006aed2467707c830f46a780d6d5565d74bc /svx | |
parent | fix typo (diff) | |
download | core-bd7b2c7befbd10bebaba3a9b6ea491969ac1dcb0.tar.gz core-bd7b2c7befbd10bebaba3a9b6ea491969ac1dcb0.zip |
sal_Bool to bool
Change-Id: Ia86be34c6cfeab2a853305aa1568c384d7b4e2b9
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 24 | ||||
-rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 12 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 56 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 8 | ||||
-rw-r--r-- | svx/source/tbxctrls/verttexttbxctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 4 |
8 files changed, 57 insertions, 57 deletions
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 559ea4c0db1b..aec84efc13b4 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -459,7 +459,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) } else { - sal_Bool bDone = sal_False; + bool bDone = false; // Wenn wir eine DrawView haben und uns im TextEdit-Modus befinden, // wird nicht die Flaechen-, sondern die Textfarbe zugewiesen @@ -472,7 +472,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR ); pDispatcher->Execute( SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aTextColorItem, 0L ); - bDone = sal_True; + bDone = true; } } if ( !bDone ) diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 91a012c7bfc9..ac1fb637b6ac 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -664,7 +664,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) { XFillStyle eXFS = (XFillStyle)pLbFillType->GetSelectEntryPos(); XFillStyleItem aXFillStyleItem( eXFS ); - sal_Bool bAction = pBox && !pLbFillAttr->IsTravelSelect(); + bool bAction = pBox && !pLbFillAttr->IsTravelSelect(); SfxObjectShell* pSh = SfxObjectShell::Current(); if ( bAction ) diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index b458aa62d084..ba93c47f8d24 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -65,8 +65,8 @@ private: ::Color aBackgroundColor; long nCol; long nLine; - sal_Bool bInitialKeyInput; - sal_Bool m_bMod1; + bool bInitialKeyInput; + bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; OUString maCommand; @@ -221,7 +221,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) //make sure that a table can initially be created if(bInitialKeyInput) { - bInitialKeyInput = sal_False; + bInitialKeyInput = false; if(!nNewLine) nNewLine = 1; if(!nNewCol) @@ -232,7 +232,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) } else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey) { - m_bMod1 = sal_True; + m_bMod1 = true; EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } @@ -401,8 +401,8 @@ private: long nWidth; long nMX; long nTextHeight; - sal_Bool bInitialKeyInput; - sal_Bool m_bMod1; + bool bInitialKeyInput; + bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; OUString maCommand; @@ -426,8 +426,8 @@ public: ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), - bInitialKeyInput(sal_True), - m_bMod1(sal_False), + bInitialKeyInput(true), + m_bMod1(false), rTbx(rParentTbx), mxFrame(rFrame), maCommand( rCmd ) @@ -556,7 +556,7 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt ) void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier(); sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode(); if(!nModifier) @@ -565,7 +565,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) KEY_RETURN == nKey ||KEY_ESCAPE == nKey || KEY_UP == nKey) { - bHandled = sal_True; + bHandled = true; long nNewCol = nCol; switch(nKey) { @@ -589,7 +589,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) //make sure that a table can initially be created if(bInitialKeyInput) { - bInitialKeyInput = sal_False; + bInitialKeyInput = false; if(!nNewCol) nNewCol = 1; } @@ -598,7 +598,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) } else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey) { - m_bMod1 = sal_True; + m_bMod1 = true; if(IsMouseCaptured()) ReleaseMouse(); EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL ); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index d5666600592e..ab150fa45deb 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -60,7 +60,7 @@ class SvxPopupWindowListBox : public SfxPopupWindow ListBox * pListBox; ToolBox & rToolBox; - sal_Bool bUserSel; + bool bUserSel; sal_uInt16 nTbxId; OUString maCommandURL; // disallow copy-constructor and assignment-operator @@ -82,8 +82,8 @@ public: inline ListBox & GetListBox() { return *pListBox; } - sal_Bool IsUserSelected() const { return bUserSel; } - void SetUserSelected( sal_Bool bVal ) { bUserSel = bVal; } + bool IsUserSelected() const { return bUserSel; } + void SetUserSelected( bool bVal ) { bUserSel = bVal; } /*virtual*/Window* GetPreferredKeyInputWindow(); }; @@ -92,7 +92,7 @@ public: SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ), rToolBox ( rTbx ), - bUserSel ( sal_False ), + bUserSel ( false ), nTbxId ( nId ), maCommandURL( rCommandURL ) { @@ -225,14 +225,14 @@ IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl) { if (pPopupWin) { - //pPopupWin->SetUserSelected( sal_False ); + //pPopupWin->SetUserSelected( false ); ListBox &rListBox = pPopupWin->GetListBox(); if (rListBox.IsTravelSelect()) Impl_SetInfo( rListBox.GetSelectEntryCount() ); else { - pPopupWin->SetUserSelected( sal_True ); + pPopupWin->SetUserSelected( true ); pPopupWin->EndPopupMode( 0 ); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 55be77165dfb..723509b5eb7a 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -128,11 +128,11 @@ class SvxStyleBox_Impl : public ComboBox using Window::IsVisible; public: SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, - const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, sal_Bool bInSpecialMode ); + const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, bool bInSpecialMode ); ~SvxStyleBox_Impl(); void SetFamily( SfxStyleFamily eNewFamily ); - inline sal_Bool IsVisible() { return bVisible; } + inline bool IsVisible() { return bVisible; } virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -153,17 +153,17 @@ protected: private: SfxStyleFamily eStyleFamily; sal_uInt16 nCurSel; - sal_Bool bRelease; + bool bRelease; Size aLogicalSize; Link aVisibilityListener; - sal_Bool bVisible; + bool bVisible; Reference< XDispatchProvider > m_xDispatchProvider; Reference< XFrame > m_xFrame; OUString m_aCommand; String aClearFormatKey; String aMoreKey; String sDefaultStyle; - sal_Bool bInSpecialMode; + bool bInSpecialMode; void ReleaseFocus(); }; @@ -184,7 +184,7 @@ private: Size aLogicalSize; String aCurText; sal_uInt16 nFtCount; - sal_Bool bRelease; + bool bRelease; Reference< XDispatchProvider > m_xDispatchProvider; Reference< XFrame > m_xFrame; @@ -325,13 +325,13 @@ SvxStyleBox_Impl::SvxStyleBox_Impl( const Reference< XFrame >& _xFrame, const String& rClearFormatKey, const String& rMoreKey, - sal_Bool bInSpec) : + bool bInSpec) : ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ), eStyleFamily( eFamily ), - bRelease ( sal_True ), - bVisible(sal_False), + bRelease ( true ), + bVisible(false), m_xDispatchProvider( rDispatchProvider ), m_xFrame(_xFrame), m_aCommand ( rCommand ), @@ -355,7 +355,7 @@ void SvxStyleBox_Impl::ReleaseFocus() { if ( !bRelease ) { - bRelease = sal_True; + bRelease = true; return; } if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() ) @@ -492,7 +492,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_TAB: { if ( KEY_TAB == nCode ) - bRelease = sal_False; + bRelease = false; else nHandled = 1; Select(); @@ -534,7 +534,7 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange ) } else if ( nStateChange == STATE_CHANGE_INITSHOW ) { - bVisible = sal_True; + bVisible = true; if ( aVisibilityListener.IsSet() ) aVisibilityListener.Call( this ); } @@ -701,9 +701,9 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl ) // ----------------------------------------------------------------------- -sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) +bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) { - sal_Bool bChanged = sal_False; + bool bChanged = false; const SfxObjectShell* pDocSh = SfxObjectShell::Current(); SvxFontListItem* pFontListItem = NULL; @@ -717,7 +717,7 @@ sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* SAL_WNODEPRECATED_DECLARATIONS_POP *ppFontList = aFontList.get(); pBox->SetOwnFontList(aFontList); - bChanged = sal_True; + bChanged = true; } if ( pFontListItem ) @@ -730,7 +730,7 @@ sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* { // => take over *ppFontList = pNewFontList; - bChanged = sal_True; + bChanged = true; } else { @@ -783,7 +783,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDis pFontList ( NULL ), aLogicalSize ( 60,160 ), nFtCount ( 0 ), - bRelease ( sal_True ), + bRelease ( true ), m_xDispatchProvider( rDispatchProvider ), m_xFrame (_xFrame) { @@ -885,7 +885,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_TAB: { if ( KEY_TAB == nCode ) - bRelease = sal_False; + bRelease = false; else nHandled = 1; Select(); @@ -928,7 +928,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl() { if ( !bRelease ) { - bRelease = sal_True; + bRelease = true; return; } if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() ) @@ -1465,20 +1465,20 @@ void SvxFrameWindow_Impl::StateChanged( //initial calls mustn't insert or remove elements if(aFrameSet.GetItemCount()) { - sal_Bool bTableMode = ( aFrameSet.GetItemCount() == 12 ); - sal_Bool bResize = sal_False; + bool bTableMode = ( aFrameSet.GetItemCount() == 12 ); + bool bResize = false; if ( bTableMode && bParagraphMode ) { for ( sal_uInt16 i = 9; i < 13; i++ ) aFrameSet.RemoveItem(i); - bResize = sal_True; + bResize = true; } else if ( !bTableMode && !bParagraphMode ) { for ( sal_uInt16 i = 9; i < 13; i++ ) aFrameSet.InsertItem( i, aImgList.GetImage(i) ); - bResize = sal_True; + bResize = true; } if ( bResize ) @@ -1931,7 +1931,7 @@ void SvxStyleToolBoxControl::FillStyleBox() const SfxStyleFamily eFamily = GetActFamily(); sal_uInt16 nCount = pStyleSheetPool->Count(); SfxStyleSheetBase* pStyle = NULL; - sal_Bool bDoFill = sal_False; + bool bDoFill = false; pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED ); @@ -1941,7 +1941,7 @@ void SvxStyleToolBoxControl::FillStyleBox() //!!! so the list doesn't show the count if ( nCount != pBox->GetEntryCount() ) { - bDoFill = sal_True; + bDoFill = true; } else { @@ -2576,12 +2576,12 @@ void SvxColorExtToolBoxControl::Select( sal_Bool ) { OUString aCommand; OUString aParamName; - sal_Bool bNoArgs = sal_False; + bool bNoArgs = false; switch( GetSlotId() ) { case SID_ATTR_CHAR_COLOR2 : - bNoArgs = sal_True; + bNoArgs = true; aCommand = OUString( ".uno:CharColorExt" ); aParamName = OUString( "CharColorExt" ); break; @@ -2597,7 +2597,7 @@ void SvxColorExtToolBoxControl::Select( sal_Bool ) break; case SID_ATTR_CHAR_COLOR_BACKGROUND : - bNoArgs = sal_True; + bNoArgs = true; aCommand = OUString( ".uno:CharBackgroundExt" ); aParamName = OUString( "CharBackgroundExt" ); break; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 740a2acb7574..dc7e1dd1c361 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -63,7 +63,7 @@ private: FontHeightToolBoxControl* m_pCtrl; String m_aCurText; Size m_aLogicalSize; - sal_Bool m_bRelease; + bool m_bRelease; uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< frame::XFrame > m_xFrame; uno::Reference< awt::XWindow > m_xOldFocusWindow; @@ -85,7 +85,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( m_pCtrl ( &_rCtrl ), m_aLogicalSize ( 30,100 ), - m_bRelease ( sal_True ), + m_bRelease ( true ), m_xDispatchProvider ( _rDispatchProvider ), m_xFrame ( _xFrame ) { @@ -100,7 +100,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl() { if ( !m_bRelease ) { - m_bRelease = sal_True; + m_bRelease = true; return; } @@ -196,7 +196,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_TAB: { if ( KEY_TAB == nCode ) - m_bRelease = sal_False; + m_bRelease = false; else nHandled = 1; Select(); diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 645537739b63..2721c9aaf254 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -61,7 +61,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged( const SfxPoolItem* pState ) { SvtLanguageOptions aLangOptions; - sal_Bool bCalc = sal_False; + bool bCalc = false; sal_Bool bEnabled = sal_False; if ( nSID == SID_VERTICALTEXT_STATE ) bEnabled = aLangOptions.IsVerticalTextEnabled(); @@ -78,7 +78,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged( // always hide if either IsVerticalTextEnabled or IsCTLFontEnabled // is false GetToolBox().HideItem( GetId() ); - bCalc = sal_True; + bCalc = true; } if(bCalc) { diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 582d462f1618..ef8fe93b1f18 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -170,7 +170,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem case SID_EXTRUSION_TILT_LEFT: case SID_EXTRUSION_TILT_RIGHT: { - sal_Bool bHorizontal = ( nSID == SID_EXTRUSION_TILT_DOWN ) || ( nSID == SID_EXTRUSION_TILT_UP ); + bool bHorizontal = ( nSID == SID_EXTRUSION_TILT_DOWN ) || ( nSID == SID_EXTRUSION_TILT_UP ); sal_Int32 nDiff = ( nSID == SID_EXTRUSION_TILT_LEFT ) || ( nSID == SID_EXTRUSION_TILT_UP ) ? 5 : -5; EnhancedCustomShapeParameterPair aRotateAnglePropPair; double fX = 0.0; @@ -671,7 +671,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) continue; } - sal_Bool bParallel = sal_True; + bool bParallel = true; Position3D aViewPoint( 3472, -3472, 25000 ); double fSkewAngle = -135; |