diff options
-rw-r--r-- | cui/source/tabpages/page.cxx | 14 | ||||
-rw-r--r-- | include/svx/pagectrl.hxx | 36 | ||||
-rw-r--r-- | include/svx/pageitem.hxx | 6 | ||||
-rw-r--r-- | include/svx/paraprev.hxx | 4 | ||||
-rw-r--r-- | include/svx/passwd.hxx | 4 | ||||
-rw-r--r-- | include/svx/polygn3d.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/func/fupage.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/hdft.cxx | 12 | ||||
-rw-r--r-- | svx/source/dialog/pagectrl.cxx | 24 | ||||
-rw-r--r-- | svx/source/dialog/paraprev.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/passwd.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/polygn3d.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/pageitem.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/uibase/frmdlg/colex.cxx | 16 | ||||
-rw-r--r-- | sw/source/core/uibase/inc/colex.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 2 |
16 files changed, 74 insertions, 74 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index c49ff5d012fb..58853eef05c8 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -270,7 +270,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : m_pTextFlowBox->Show(); m_pTextFlowBox->SetSelectHdl(LINK(this, SvxPageDescPage, FrameDirectionModify_Impl )); - m_pBspWin->EnableFrameDirection(sal_True); + m_pBspWin->EnableFrameDirection(true); } Init_Impl(); @@ -567,7 +567,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) : sal_False ); // set example window on the table - m_pBspWin->SetTable( sal_True ); + m_pBspWin->SetTable( true ); m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); m_pBspWin->SetVert( m_pVertBox->IsChecked() ); @@ -1298,10 +1298,10 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) rHeaderSet.Get( GetWhich( SID_ATTR_LRSPACE ) ); m_pBspWin->SetHdLeft( rLR.GetLeft() ); m_pBspWin->SetHdRight( rLR.GetRight() ); - m_pBspWin->SetHeader( sal_True ); + m_pBspWin->SetHeader( true ); } else - m_pBspWin->SetHeader( sal_False ); + m_pBspWin->SetHeader( false ); // show background and border in the example sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH ); @@ -1345,10 +1345,10 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) ); m_pBspWin->SetFtLeft( rLR.GetLeft() ); m_pBspWin->SetFtRight( rLR.GetRight() ); - m_pBspWin->SetFooter( sal_True ); + m_pBspWin->SetFooter( true ); } else - m_pBspWin->SetFooter( sal_False ); + m_pBspWin->SetFooter( false ); // show background and border in the example sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH ); @@ -1602,7 +1602,7 @@ void SvxPageDescPage::DisableVerticalPageDir() { m_pTextFlowLbl->Hide(); m_pTextFlowBox->Hide(); - m_pBspWin->EnableFrameDirection( sal_False ); + m_pBspWin->EnableFrameDirection( false ); } } diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index db168d4d4cb8..2d253328a4de 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -59,11 +59,11 @@ private: Color aFtColor; SvxBoxItem* pFtBorder; - sal_Bool bFooter :1; - sal_Bool bHeader :1; - sal_Bool bTable :1; - sal_Bool bHorz :1; - sal_Bool bVert :1; + bool bFooter :1; + bool bHeader :1; + bool bTable :1; + bool bHorz :1; + bool bVert :1; sal_uInt16 eUsage; @@ -74,8 +74,8 @@ protected: virtual void Paint( const Rectangle& rRect ); virtual void DrawPage( const Point& rPoint, - const sal_Bool bSecond, - const sal_Bool bEnabled ); + const bool bSecond, + const bool bEnabled ); public: SvxPageWindow( Window* pParent ); @@ -136,19 +136,19 @@ public: void SetUsage( sal_uInt16 eU ) { eUsage = eU; } sal_uInt16 GetUsage() const { return eUsage;} - void SetHeader( sal_Bool bNew ) { bHeader = bNew; } - sal_Bool GetHeader() const { return bHeader;} - void SetFooter( sal_Bool bNew ) { bFooter = bNew; } - sal_Bool GetFooter() const { return bFooter;} + void SetHeader( bool bNew ) { bHeader = bNew; } + bool GetHeader() const { return bHeader;} + void SetFooter( bool bNew ) { bFooter = bNew; } + bool GetFooter() const { return bFooter;} - void SetTable( sal_Bool bNew ) { bTable = bNew; } - sal_Bool GetTable() const { return bTable;} - void SetHorz( sal_Bool bNew ) { bHorz = bNew; } - sal_Bool GetHorz() const { return bHorz;} - void SetVert( sal_Bool bNew ) { bVert = bNew; } - sal_Bool GetVert() const { return bVert;} + void SetTable( bool bNew ) { bTable = bNew; } + bool GetTable() const { return bTable;} + void SetHorz( bool bNew ) { bHorz = bNew; } + bool GetHorz() const { return bHorz;} + void SetVert( bool bNew ) { bVert = bNew; } + bool GetVert() const { return bVert;} - void EnableFrameDirection(sal_Bool bEnable); + void EnableFrameDirection(bool bEnable); //uses enum SvxFrameDirection void SetFrameDirection(sal_Int32 nFrameDirection); diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 2062347bb815..ac479ae65dc1 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem private: OUString aDescName; // name of the template SvxNumType eNumType; // enumeration - sal_Bool bLandscape; // Portrait / Landscape + bool bLandscape; // Portrait / Landscape sal_uInt16 eUse; // Layout public: @@ -89,8 +89,8 @@ public: sal_uInt16 GetPageUsage() const { return eUse; } void SetPageUsage(sal_uInt16 eU) { eUse= eU; } - sal_Bool IsLandscape() const { return bLandscape; } - void SetLandscape(sal_Bool bL) { bLandscape = bL; } + bool IsLandscape() const { return bLandscape; } + void SetLandscape(bool bL) { bLandscape = bL; } // enumeration SvxNumType GetNumType() const { return eNumType; } diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 66f227158447..db1c498af86a 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -65,7 +65,7 @@ protected: virtual void Paint( const Rectangle& rRect ); virtual Size GetOptimalSize() const; - void DrawParagraph( sal_Bool bAll ); + void DrawParagraph( bool bAll ); public: SvxParaPrevWindow( Window* pParent, WinBits nBits); @@ -94,7 +94,7 @@ public: OUString GetText() const { return aText; } Size GetSize() const { return aSize; } - void Draw( sal_Bool bAll ) { DrawParagraph( bAll ); } + void Draw( bool bAll ) { DrawParagraph( bAll ); } }; #endif diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 819d573547cb..6c74fa237a03 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -45,13 +45,13 @@ private: Link aCheckPasswordHdl; - sal_Bool bEmpty; + bool bEmpty; DECL_LINK(ButtonHdl, void *); DECL_LINK(EditModifyHdl, void *); public: - SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False ); + SvxPasswordDialog( Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); ~SvxPasswordDialog(); OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index f507a07421ab..bb139374d9b0 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -30,7 +30,7 @@ private: basegfx::B3DPolyPolygon aPolyPoly3D; basegfx::B3DPolyPolygon aPolyNormals3D; basegfx::B2DPolyPolygon aPolyTexture2D; - sal_Bool bLineOnly; + bool bLineOnly; SVX_DLLPRIVATE void CreateDefaultNormals(); SVX_DLLPRIVATE void CreateDefaultTexture(); @@ -48,7 +48,7 @@ public: E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, - sal_Bool bLinOnly=sal_False); + bool bLinOnly=false); E3dPolygonObj(); virtual ~E3dPolygonObj(); @@ -63,8 +63,8 @@ public: virtual E3dPolygonObj* Clone() const; // LineOnly? - sal_Bool GetLineOnly() { return bLineOnly; } - void SetLineOnly(sal_Bool bNew); + bool GetLineOnly() { return bLineOnly; } + void SetLineOnly(bool bNew); }; #endif // INCLUDED_SVX_POLYGN3D_HXX diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 5a91b7428fc7..df99c0f70903 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -498,7 +498,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) { mpDoc->SetPageNumType(((const SvxPageItem*) pPoolItem)->GetNumType()); - eOrientation = (((const SvxPageItem*) pPoolItem)->IsLandscape() == ORIENTATION_LANDSCAPE) ? + eOrientation = ((const SvxPageItem*) pPoolItem)->IsLandscape() ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; if( mpPage->GetOrientation() != eOrientation ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index aad1dcc3ce93..059dc8fefeab 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -794,7 +794,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) m_pBspWin->SetHdDist( nDist ); m_pBspWin->SetHdLeft( rLR.GetLeft() ); m_pBspWin->SetHdRight( rLR.GetRight() ); - m_pBspWin->SetHeader( sal_True ); + m_pBspWin->SetHeader( true ); } else pSetItem = 0; @@ -802,7 +802,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( !pSetItem ) { - m_pBspWin->SetHeader( sal_False ); + m_pBspWin->SetHeader( false ); if ( SID_ATTR_PAGE_HEADERSET == nId ) { @@ -834,7 +834,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) m_pBspWin->SetFtDist( nDist ); m_pBspWin->SetFtLeft( rLR.GetLeft() ); m_pBspWin->SetFtRight( rLR.GetRight() ); - m_pBspWin->SetFooter( sal_True ); + m_pBspWin->SetFooter( true ); } else pSetItem = 0; @@ -842,7 +842,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( !pSetItem ) { - m_pBspWin->SetFooter( sal_False ); + m_pBspWin->SetFooter( false ); if ( SID_ATTR_PAGE_FOOTERSET == nId ) { @@ -855,7 +855,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem && pItem->ISA(SfxBoolItem) ) { - m_pBspWin->SetTable( sal_True ); + m_pBspWin->SetTable( true ); m_pBspWin->SetHorz( ( (SfxBoolItem*)pItem )->GetValue() ); } @@ -863,7 +863,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem && pItem->ISA(SfxBoolItem) ) { - m_pBspWin->SetTable( sal_True ); + m_pBspWin->SetTable( true ); m_pBspWin->SetVert( ( (SfxBoolItem*)pItem )->GetValue() ); } ResetBackground_Impl( rSet ); diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index c10815dd8bf5..fae0f2b7d8fa 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -79,11 +79,11 @@ SvxPageWindow::SvxPageWindow( Window* pParent ) : nFtHeight ( 0 ), aFtColor ( COL_TRANSPARENT ), pFtBorder ( 0 ), - bFooter ( sal_False ), - bHeader ( sal_False ), - bTable ( sal_False ), - bHorz ( sal_False ), - bVert ( sal_False ), + bFooter ( false ), + bHeader ( false ), + bTable ( false ), + bHorz ( false ), + bVert ( false ), eUsage ( SVX_PAGE_ALL ) { pImpl = new PageWindow_Impl; @@ -152,23 +152,23 @@ void SvxPageWindow::Paint( const Rectangle& ) aSz = PixelToLogic( GetSizePixel() ); nYPos = ( aSz.Height() - aSize.Height() ) / 2; long nXPos = ( aSz.Width() - aSize.Width() ) / 2; - DrawPage( Point( nXPos, nYPos ), sal_True, sal_True ); + DrawPage( Point( nXPos, nYPos ), true, true ); } else // Portrait - DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True ); + DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), true, true ); } else { // Left and right page are different -> draw two pages if possible - DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) ); - DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True, - (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) ); + DrawPage( Point( 0, nYPos ), false, eUsage & SVX_PAGE_LEFT ); + DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), true, + eUsage & SVX_PAGE_RIGHT ); } } -void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled ) +void SvxPageWindow::DrawPage( const Point& rOrg, const bool bSecond, const bool bEnabled ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color& rFieldColor = rStyleSettings.GetFieldColor(); @@ -389,7 +389,7 @@ void SvxPageWindow::SetFtBorder( const SvxBoxItem& rNew ) pFtBorder = new SvxBoxItem( rNew ); } -void SvxPageWindow::EnableFrameDirection(sal_Bool bEnable) +void SvxPageWindow::EnableFrameDirection(bool bEnable) { pImpl->EnableFrameDirection(bEnable); } diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index e05f029f1d52..edce422089ea 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -61,14 +61,14 @@ Size SvxParaPrevWindow::GetOptimalSize() const void SvxParaPrevWindow::Paint( const Rectangle& ) { - DrawParagraph( sal_True ); + DrawParagraph( true ); } #define DEF_MARGIN 120 -void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll ) +void SvxParaPrevWindow::DrawParagraph( bool bAll ) { Size aWinSize = GetOutputSizePixel(); aWinSize = PixelToLogic( aWinSize ); diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 9c84e195ada8..5d186ba0a5be 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -74,7 +74,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl) -SvxPasswordDialog::SvxPasswordDialog(Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword) +SvxPasswordDialog::SvxPasswordDialog(Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") , aOldPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_OLD_PASSWD)) , aRepeatPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_REPEAT_PASSWD )) diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index d0814a94bfa8..a0cd8e738321 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -38,7 +38,7 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, - sal_Bool bLinOnly) + bool bLinOnly) : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { @@ -228,7 +228,7 @@ E3dPolygonObj* E3dPolygonObj::Clone() const return CloneHelper< E3dPolygonObj >(); } -void E3dPolygonObj::SetLineOnly(sal_Bool bNew) +void E3dPolygonObj::SetLineOnly(bool bNew) { if(bNew != bLineOnly) { diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 225c9a5dca57..6adc0541fba1 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -43,7 +43,7 @@ TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0)); SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), eNumType ( SVX_ARABIC ), - bLandscape ( sal_False ), + bLandscape ( false ), eUse ( SVX_PAGE_ALL ) { } diff --git a/sw/source/core/uibase/frmdlg/colex.cxx b/sw/source/core/uibase/frmdlg/colex.cxx index 3137ec7565c5..10864e64c934 100644 --- a/sw/source/core/uibase/frmdlg/colex.cxx +++ b/sw/source/core/uibase/frmdlg/colex.cxx @@ -116,7 +116,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) SetHdDist( rUL.GetLower() ); SetHdLeft( rLR.GetLeft() ); SetHdRight( rLR.GetRight() ); - SetHeader( sal_True ); + SetHeader( true ); if ( rHeaderSet.GetItemState( RES_BACKGROUND ) == SFX_ITEM_SET ) { const SvxBrushItem& rItem = @@ -131,7 +131,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) } } else - SetHeader( sal_False ); + SetHeader( false ); } if( SFX_ITEM_SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_FOOTERSET), @@ -155,7 +155,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) SetFtDist( rUL.GetUpper() ); SetFtLeft( rLR.GetLeft() ); SetFtRight( rLR.GetRight() ); - SetFooter( sal_True ); + SetFooter( true ); if( rFooterSet.GetItemState( RES_BACKGROUND ) == SFX_ITEM_SET ) { const SvxBrushItem& rItem = @@ -170,7 +170,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) } } else - SetFooter( sal_False ); + SetFooter( false ); } if( SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) @@ -191,8 +191,8 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet ) } void SwColExample::DrawPage( const Point& rOrg, - const sal_Bool bSecond, - const sal_Bool bEnabled ) + const bool bSecond, + const bool bEnabled ) { SwPageExample::DrawPage( rOrg, bSecond, bEnabled ); sal_uInt16 nColumnCount; @@ -465,8 +465,8 @@ SwPageGridExample::~SwPageGridExample() } void SwPageGridExample::DrawPage( const Point& rOrg, - const sal_Bool bSecond, - const sal_Bool bEnabled ) + const bool bSecond, + const bool bEnabled ) { SwPageExample::DrawPage(rOrg, bSecond, bEnabled); if(pGridItem && pGridItem->GetGridType()) diff --git a/sw/source/core/uibase/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx index 748cc8db0396..dc7d25b1ba73 100644 --- a/sw/source/core/uibase/inc/colex.hxx +++ b/sw/source/core/uibase/inc/colex.hxx @@ -48,8 +48,8 @@ class SW_DLLPUBLIC SwPageGridExample : public SwPageExample bool m_bVertical; protected: virtual void DrawPage( const Point& rPoint, - const sal_Bool bSecond, - const sal_Bool bEnabled ); + const bool bSecond, + const bool bEnabled ); public: SwPageGridExample(Window* pPar) : SwPageExample(pPar), @@ -68,8 +68,8 @@ class SW_DLLPUBLIC SwColExample : public SwPageExample protected: virtual void DrawPage( const Point& rPoint, - const sal_Bool bSecond, - const sal_Bool bEnabled ); + const bool bSecond, + const bool bEnabled ); public: SwColExample(Window* pPar) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index d406a226a22a..b2394e9ddc9e 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -2211,7 +2211,7 @@ IMPL_LINK_NOARG(SwSectionIndentTabPage, IndentModifyHdl) { m_pPreviewWin->SetLeftMargin( static_cast< long >(m_pBeforeMF->Denormalize(m_pBeforeMF->GetValue(FUNIT_TWIP))) ); m_pPreviewWin->SetRightMargin( static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))) ); - m_pPreviewWin->Draw(sal_True); + m_pPreviewWin->Draw(true); return 0; } |