summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2013-03-15 10:56:55 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2013-03-15 23:20:34 +0900
commit079b16d044fffd05dc2402bbff4ab7d60635fa0f (patch)
tree4853f034dcc0f54b6ea6c8b8c8fca1207635415f /svx/source/dialog
parent4a5b2c017509ff0ba5e4a2ae2c21621385e2952a (diff)
sal_Bool to bool
Change-Id: I74d02b86664263519b4758511d885e35a8c9a78d
Diffstat (limited to 'svx/source/dialog')
-rw-r--r--svx/source/dialog/connctrl.cxx10
-rw-r--r--svx/source/dialog/contwnd.cxx4
-rw-r--r--svx/source/dialog/contwnd.hxx2
-rw-r--r--svx/source/dialog/dlgctrl.cxx18
-rw-r--r--svx/source/dialog/docrecovery.cxx12
-rw-r--r--svx/source/dialog/fntctrl.cxx24
-rw-r--r--svx/source/dialog/fontwork.cxx6
7 files changed, 38 insertions, 38 deletions
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 29108a42dae4..59b149ca257b 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -59,7 +59,7 @@ void SvxXConnectionPreview::Construct()
if( nMarkCount >= 1 )
{
- sal_Bool bFound = sal_False;
+ bool bFound = false;
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -70,7 +70,7 @@ void SvxXConnectionPreview::Construct()
sal_uInt16 nId = pObj->GetObjIdentifier();
if( nInv == SdrInventor && nId == OBJ_EDGE )
{
- bFound = sal_True;
+ bFound = true;
SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj;
pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone();
@@ -222,9 +222,9 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz()
void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
{
- sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
- sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
- sal_Bool bCtrl = rMEvt.IsMod1();
+ bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
+ bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+ bool bCtrl = rMEvt.IsMod1();
if( bZoomIn || bZoomOut )
{
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 428e5d4f226d..deb674022307 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -132,10 +132,10 @@ void ContourWindow::SdrObjCreated( const SdrObject& )
pView->CombineMarkedObjects( sal_False );
}
-sal_Bool ContourWindow::IsContourChanged() const
+bool ContourWindow::IsContourChanged() const
{
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( pPage && pPage->GetObjCount() )
bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged();
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 100d77e754c3..5ab4e706430b 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -59,7 +59,7 @@ public:
const Color& GetPipetteColor() const { return aPipetteColor; }
sal_Bool IsClickValid() const { return bClickValid; }
- sal_Bool IsContourChanged() const;
+ bool IsContourChanged() const;
void SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; }
sal_Bool IsWorkplaceMode() const { return bWorkplaceMode; }
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 0d6770ea0147..cbb2a1f86fa8 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -281,7 +281,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
if(!IsCompletelyDisabled())
{
RECT_POINT eNewRP = eRP;
- sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
+ bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
switch( rKeyEvt.GetKeyCode().GetCode() )
{
@@ -459,8 +459,8 @@ void SvxRectCtl::Paint( const Rectangle& )
Point aBtnPnt2( 11,0 );
Point aBtnPnt3( 22,0 );
- sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0;
- sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0;
+ bool bNoHorz = (m_nState & CS_NOHORZ) != 0;
+ bool bNoVert = (m_nState & CS_NOVERT) != 0;
Bitmap& rBitmap = GetRectBitmap();
@@ -480,9 +480,9 @@ void SvxRectCtl::Paint( const Rectangle& )
}
else
{
- DrawBitmap( aPtLT - aToCenter, aDstBtnSize, (bNoHorz | bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
+ DrawBitmap( aPtLT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
DrawBitmap( aPtMT - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
- DrawBitmap( aPtRT - aToCenter, aDstBtnSize, (bNoHorz | bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
+ DrawBitmap( aPtRT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
DrawBitmap( aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
@@ -492,9 +492,9 @@ void SvxRectCtl::Paint( const Rectangle& )
DrawBitmap( aPtRM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
- DrawBitmap( aPtLB - aToCenter, aDstBtnSize, (bNoHorz | bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
+ DrawBitmap( aPtLB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
DrawBitmap( aPtMB - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
- DrawBitmap( aPtRB - aToCenter, aDstBtnSize, (bNoHorz | bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
+ DrawBitmap( aPtRB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap );
}
// draw active button, avoid center pos for angle
@@ -1197,7 +1197,7 @@ void GradientLB::SelectEntryByList( const XGradientListRef &pList, const String&
{
long nCount = pList->Count();
XGradientEntry* pEntry;
- sal_Bool bFound = sal_False;
+ bool bFound = false;
String aStr;
long i;
@@ -1208,7 +1208,7 @@ void GradientLB::SelectEntryByList( const XGradientListRef &pList, const String&
aStr = pEntry->GetName();
if( rStr == aStr && rGradient == pEntry->GetGradient() )
- bFound = sal_True;
+ bFound = true;
}
if( bFound )
SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index c1df29d0f0cb..e87fb8749379 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -126,7 +126,7 @@ short TabDialog4Recovery::Execute()
//===============================================
RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- sal_Bool bUsedForSaving)
+ bool bUsedForSaving)
: m_xContext ( rxContext )
, m_pListener ( 0 )
, m_bListenForSaving(bUsedForSaving)
@@ -153,10 +153,10 @@ TURLList* RecoveryCore::getURLListAccess()
}
//===============================================
-sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
+bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
{
if (rInfo.TempURL.isEmpty())
- return sal_False;
+ return false;
// Note: If the original files was recovery ... but a temp file
// exists ... an error inside the temp file exists!
@@ -164,9 +164,9 @@ sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
!(rInfo.RecoveryState == E_RECOVERY_FAILED ) &&
!(rInfo.RecoveryState == E_ORIGINAL_DOCUMENT_RECOVERED)
)
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
//===============================================
@@ -1375,7 +1375,7 @@ String RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const
//===============================================
BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent ,
RecoveryCore* pCore ,
- sal_Bool bBeforeRecovery)
+ bool bBeforeRecovery)
: ModalDialog ( pParent, SVX_RES( RID_SVX_MDLG_DOCRECOVERY_BROKEN ) )
, m_aDescrFT ( this , SVX_RES( FT_BROKEN_DESCR ) )
, m_aFileListFT ( this , SVX_RES( FT_BROKEN_FILELIST ) )
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 06ee2c51adbf..b79d7d7d0c21 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -135,7 +135,7 @@ class FontPrevWin_Impl
SvxFont aFont;
Printer* pPrinter;
- sal_Bool bDelPrinter;
+ bool bDelPrinter;
Reference < XBreakIterator > xBreak;
std::vector<sal_uIntPtr> aTextWidth;
@@ -156,7 +156,7 @@ class FontPrevWin_Impl
long n100PercentFontWidthCTL;
sal_uInt16 nFontWidthScale;
- sal_Bool bSelection : 1,
+ bool bSelection : 1,
bGetSelection : 1,
bUseResText : 1,
bPreviewBackgroundToCharacter : 1,
@@ -170,12 +170,12 @@ class FontPrevWin_Impl
public:
inline FontPrevWin_Impl() :
- pPrinter( NULL ), bDelPrinter( sal_False ),
+ pPrinter( NULL ), bDelPrinter( false ),
pColor( NULL ), pBackColor( 0 ), nAscent( 0 ),
cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
- bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ),
- bPreviewBackgroundToCharacter( sal_False ), bTwoLines( sal_False ),
- bUseFontNameAsText( sal_False ), bTextInited( sal_False )
+ bSelection( false ), bGetSelection( false ), bUseResText( false ),
+ bPreviewBackgroundToCharacter( false ), bTwoLines( false ),
+ bUseFontNameAsText( false ), bTextInited( false )
{
SvtLanguageOptions aLanguageOptions;
m_bCJKEnabled = aLanguageOptions.IsAnyEnabled();
@@ -489,7 +489,7 @@ void SvxFontPrevWindow::Init()
if ( !pImpl->pPrinter )
{
pImpl->pPrinter = new Printer;
- pImpl->bDelPrinter = sal_True;
+ pImpl->bDelPrinter = true;
}
SetMapMode( MapMode( MAP_TWIP ) );
initFont(pImpl->aFont);
@@ -575,7 +575,7 @@ const SvxFont& SvxFontPrevWindow::GetFont() const
void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString )
{
pImpl->aText = rString;
- pImpl->bTextInited = sal_True;
+ pImpl->bTextInited = true;
}
// -----------------------------------------------------------------------
@@ -626,7 +626,7 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor)
// -----------------------------------------------------------------------
-void SvxFontPrevWindow::UseResourceText( sal_Bool bUse )
+void SvxFontPrevWindow::UseResourceText( bool bUse )
{
pImpl->bUseResText = bUse;
}
@@ -663,7 +663,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText )
{
pImpl->aText = pSh->GetSelectionText();
- pImpl->bGetSelection = sal_True;
+ pImpl->bGetSelection = true;
pImpl->bSelection = pImpl->aText.Len() != 0;
}
@@ -827,12 +827,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
}
}
-sal_Bool SvxFontPrevWindow::IsTwoLines() const
+bool SvxFontPrevWindow::IsTwoLines() const
{
return pImpl->bTwoLines;
}
-void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet)
+void SvxFontPrevWindow::SetTwoLines(bool bSet)
{
pImpl->bTwoLines = bSet;
}
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 4e078a70d1c7..5efd33ad151e 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -486,7 +486,7 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
// Set shadow buttons
void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
- sal_Bool bRestoreValues)
+ bool bRestoreValues)
{
if ( pItem )
{
@@ -742,7 +742,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
XFormTextShadowItem aItem(eShadow);
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L );
- SetShadow_Impl(&aItem, sal_True);
+ SetShadow_Impl(&aItem, true);
}
return 0;
}
@@ -839,7 +839,7 @@ void SvxFontWorkDialog::SetColorList(const XColorListRef &pList)
}
}
-void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/)
+void SvxFontWorkDialog::SetActive(bool /*bActivate*/)
{
}