[Libreoffice-commits] core.git: 2 commits - svx/inc svx/source
Takeshi Abe
tabe at fixedpoint.jp
Fri Mar 15 07:22:04 PDT 2013
svx/inc/svx/fntctrl.hxx | 6 +-
svx/inc/svx/fontwork.hxx | 4 -
svx/source/customshapes/EnhancedCustomShape3d.cxx | 12 ++---
svx/source/customshapes/EnhancedCustomShape3d.hxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 20 ++++----
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 4 -
svx/source/dialog/connctrl.cxx | 10 ++--
svx/source/dialog/contwnd.cxx | 4 -
svx/source/dialog/contwnd.hxx | 2
svx/source/dialog/ctredlin.cxx | 9 ---
svx/source/dialog/dlgctrl.cxx | 18 +++----
svx/source/dialog/docrecovery.cxx | 12 ++---
svx/source/dialog/fntctrl.cxx | 24 +++++-----
svx/source/dialog/fontwork.cxx | 6 +-
svx/source/inc/docrecovery.hxx | 10 ++--
svx/source/unodraw/recoveryui.cxx | 4 -
16 files changed, 69 insertions(+), 78 deletions(-)
New commits:
commit 079b16d044fffd05dc2402bbff4ab7d60635fa0f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Mar 15 10:56:55 2013 +0900
sal_Bool to bool
Change-Id: I74d02b86664263519b4758511d885e35a8c9a78d
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index e801eeb..355ff61 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -66,11 +66,11 @@ public:
void SetColor( const Color& rColor );
void ResetColor();
void SetBackColor( const Color& rColor );
- void UseResourceText( sal_Bool bUse = sal_True );
+ void UseResourceText( bool bUse = true );
void Paint( const Rectangle& );
- sal_Bool IsTwoLines() const;
- void SetTwoLines(sal_Bool bSet);
+ bool IsTwoLines() const;
+ void SetTwoLines(bool bSet);
void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd);
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 8bb81ec..4d2c4a0 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -148,7 +148,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetShowForm_Impl(const XFormTextHideFormItem*);
void SetOutline_Impl(const XFormTextOutlineItem*);
void SetShadow_Impl(const XFormTextShadowItem*,
- sal_Bool bRestoreValues = sal_False);
+ bool bRestoreValues = false);
void SetShadowColor_Impl(const XFormTextShadowColorItem*);
void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
@@ -170,7 +170,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
~SvxFontWorkDialog();
void SetColorList(const XColorListRef &pTable);
- void SetActive(sal_Bool bActivate = sal_True);
+ void SetActive(bool bActivate = true);
void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
const SfxItemSet& rAttr, SdrObject& rOldObj,
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index c43d9d4..f1dc1d1 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -246,7 +246,7 @@ Point EnhancedCustomShape3d::Transformation2D::Transform2D( const basegfx::B3DPo
return aPoint2D;
}
-sal_Bool EnhancedCustomShape3d::Transformation2D::IsParallel() const
+bool EnhancedCustomShape3d::Transformation2D::IsParallel() const
{
return eProjectionMode == com::sun::star::drawing::ProjectionMode_PARALLEL;
}
@@ -328,8 +328,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
- sal_Bool bSceneHasObjects ( sal_False );
- sal_Bool bUseTwoFillStyles( sal_False );
+ bool bSceneHasObjects ( false );
+ bool bUseTwoFillStyles( false );
drawing::ShadeMode eShadeMode( GetShadeMode( rGeometryItem, drawing::ShadeMode_FLAT ) );
const rtl::OUString aExtrusionColor( "Color" );
@@ -353,7 +353,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
if ( eFillStyle == XFILL_NONE )
aSet.Put( XFillStyleItem( XFILL_SOLID ) );
else if ( ( eFillStyle == XFILL_BITMAP ) || ( eFillStyle == XFILL_GRADIENT ) || bUseExtrusionColor )
- bUseTwoFillStyles = sal_True;
+ bUseTwoFillStyles = true;
// #116336#
// If shapes are mirrored once (mirroring two times correct geometry again)
@@ -370,7 +370,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
while( aIter.IsMore() )
{
const SdrObject* pNext = aIter.Next();
- sal_Bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == XFILL_NONE )
+ bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == XFILL_NONE )
&& (((XLineStyleItem&)pNext->GetMergedItem( XATTR_LINESTYLE )).GetValue() == XLINE_NONE );
basegfx::B2DPolyPolygon aPolyPoly;
@@ -473,7 +473,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
}
pScene->Insert3DObj( p3DObj );
- bSceneHasObjects = sal_True;
+ bSceneHasObjects = true;
}
}
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 72cf893..e629b0e 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -54,7 +54,7 @@ class EnhancedCustomShape3d
basegfx::B3DPolygon ApplySkewSettings( const basegfx::B3DPolygon& rPolygon3D ) const;
Point Transform2D( const basegfx::B3DPoint& rPoint ) const;
- sal_Bool IsParallel() const;
+ bool IsParallel() const;
};
friend class Transformation2D;
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index d6a829e..7c26fe1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -80,17 +80,17 @@ struct FWData // representing the whole text
double fHorizontalTextScaling;
sal_uInt32 nMaxParagraphsPerTextArea;
sal_Int32 nSingleLineHeight;
- sal_Bool bSingleLineMode;
+ bool bSingleLineMode;
};
-static sal_Bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uInt16 nOutlinesCount2d, FWData& rFWData )
+static bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uInt16 nOutlinesCount2d, FWData& rFWData )
{
- sal_Bool bNoErr = sal_False;
- sal_Bool bSingleLineMode = sal_False;
+ bool bNoErr = false;
+ bool bSingleLineMode = false;
sal_uInt16 nTextAreaCount = nOutlinesCount2d;
if ( nOutlinesCount2d & 1 )
- bSingleLineMode = sal_True;
+ bSingleLineMode = true;
else
nTextAreaCount >>= 1;
@@ -124,7 +124,7 @@ static sal_Bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal
nParagraphsLeft -= nParagraphs;
nTextAreaCount--;
}
- bNoErr = sal_True;
+ bNoErr = true;
}
}
return bNoErr;
@@ -149,10 +149,10 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
FWData& rFWData, const PolyPolygon& rOutline2d )
{
double fScalingFactor = 1.0;
- sal_Bool bScalingFactorDefined = sal_False;
+ bool bScalingFactorDefined = false;
sal_uInt16 i = 0;
- sal_Bool bSingleLineMode = sal_False;
+ bool bSingleLineMode = false;
sal_uInt16 nOutlinesCount2d = rOutline2d.Count();
Font aFont;
@@ -170,7 +170,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
aVirDev.SetFont( aFont );
if ( nOutlinesCount2d & 1 )
- bSingleLineMode = sal_True;
+ bSingleLineMode = true;
std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin();
std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end();
@@ -194,7 +194,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
if ( !bScalingFactorDefined )
{
fScalingFactor = fScale;
- bScalingFactorDefined = sal_True;
+ bScalingFactorDefined = true;
}
else
{
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index a44ab76..cc8038e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -583,8 +583,8 @@ public:
}
else
{
- sal_Bool bFirstIsEmpty = mpFirstArg->isConstant() && ( (*mpFirstArg)() == 0 );
- sal_Bool bSecondIsEmpty = mpSecondArg->isConstant() && ( (*mpSecondArg)() == 0 );
+ bool bFirstIsEmpty = mpFirstArg->isConstant() && ( (*mpFirstArg)() == 0 );
+ bool bSecondIsEmpty = mpSecondArg->isConstant() && ( (*mpSecondArg)() == 0 );
if ( bFirstIsEmpty )
aRet = mpSecondArg->fillNode( rEquations, NULL, nFlags );
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 29108a4..59b149c 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 428e5d4..deb6740 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 100d77e..5ab4e70 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 0d6770e..cbb2a1f 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 c1df29d..e87fb87 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 06ee2c5..b79d7d7 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 4e078a7..5efd33a 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*/)
{
}
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 51f312e..071ff8a 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -217,7 +217,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
on the core dispatch implementation, we must know,
which URL we have to use for deregistration!
*/
- sal_Bool m_bListenForSaving;
+ bool m_bListenForSaving;
//-------------------------------------------
// native interface
@@ -226,7 +226,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
//---------------------------------------
/** @short TODO */
RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- sal_Bool bUsedForSaving);
+ bool bUsedForSaving);
//---------------------------------------
/** @short TODO */
@@ -242,7 +242,7 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
//---------------------------------------
/** @short TODO */
- static sal_Bool isBrokenTempEntry(const TURLInfo& rInfo);
+ static bool isBrokenTempEntry(const TURLInfo& rInfo);
virtual void saveBrokenTempEntries(const ::rtl::OUString& sSaveDir);
virtual void saveAllTempEntries(const ::rtl::OUString& sSaveDir);
virtual void forgetBrokenTempEntries();
@@ -698,7 +698,7 @@ class BrokenRecoveryDialog : public ModalDialog
::rtl::OUString m_sSavePath;
RecoveryCore* m_pCore;
- sal_Bool m_bBeforeRecovery;
+ bool m_bBeforeRecovery;
sal_Bool m_bExecutionNeeded;
//-------------------------------------------
@@ -709,7 +709,7 @@ class BrokenRecoveryDialog : public ModalDialog
/** @short TODO */
BrokenRecoveryDialog(Window* pParent ,
RecoveryCore* pCore ,
- sal_Bool bBeforeRecovery);
+ bool bBeforeRecovery);
//---------------------------------------
/** @short TODO */
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 0c6ae0d..164457e 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -253,7 +253,7 @@ RecoveryUI::EJob RecoveryUI::impl_classifyJob(const css::util::URL& aURL)
sal_Bool RecoveryUI::impl_doEmergencySave()
{
// create core service, which implements the real "emergency save" algorithm.
- svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xContext, sal_True);
+ svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xContext, true);
css::uno::Reference< css::frame::XStatusListener > xCore(pCore);
// create all needed dialogs for this operation
@@ -291,7 +291,7 @@ void RecoveryUI::impl_doRecovery()
bRecoveryOnly = !bCrashRepEnabled;
// create core service, which implements the real "emergency save" algorithm.
- svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xContext, sal_False);
+ svxdr::RecoveryCore* pCore = new svxdr::RecoveryCore(m_xContext, false);
css::uno::Reference< css::frame::XStatusListener > xCore(pCore);
// create all needed dialogs for this operation
commit 4a5b2c017509ff0ba5e4a2ae2c21621385e2952a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Mar 15 10:54:59 2013 +0900
Remove unused code
Change-Id: I3ec10c31139c369ff6950ada57ee3d3f4e8f2d34
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 6d47ea7..f1e8639 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -39,20 +39,11 @@
// Local Defines and Function
//----------------------------------------------------------------------------
-inline void EnableDisable( Window& rWin, sal_Bool bEnable )
-{
- if (bEnable)
- rWin.Enable();
- else
- rWin.Disable();
-}
-
static long nStaticTabs[]=
{
5,10,65,120,170,220
};
-#define MIN_DISTANCE 6
#define WRITER_DATE 2
#define CALC_DATE 3
More information about the Libreoffice-commits
mailing list