summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-05 16:01:17 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:20 +0200
commit37a2ed040e0e11ecef115d8955e09845aeff7511 (patch)
tree6387f7f6d66e0e02f79b1e8bc604ba7832249d4e /svx/source/dialog
parenteeae5cf0432adb83e5e948a217020b776144d783 (diff)
svx: sal_Bool->bool
Change-Id: I7e7bdce5c3ddb7871b9c1fbfe93dc7f7c254f1bb
Diffstat (limited to 'svx/source/dialog')
-rw-r--r--svx/source/dialog/hdft.cxx12
-rw-r--r--svx/source/dialog/pagectrl.cxx24
-rw-r--r--svx/source/dialog/paraprev.cxx4
-rw-r--r--svx/source/dialog/passwd.cxx2
4 files changed, 21 insertions, 21 deletions
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 ))