[Libreoffice-commits] core.git: 16 commits - editeng/source include/editeng include/svx sc/inc sc/source sd/source starmath/source svx/source sw/source
Noel Grandin
noel at peralex.com
Tue Feb 11 23:01:42 PST 2014
editeng/source/uno/unoedprx.cxx | 2
editeng/source/uno/unoedsrc.cxx | 2
include/editeng/unoedprx.hxx | 6 -
include/editeng/unoedsrc.hxx | 2
include/svx/unopool.hxx | 2
include/svx/unoshtxt.hxx | 4 -
sc/inc/drdefuno.hxx | 2
sc/inc/editsrc.hxx | 4 -
sc/inc/editutil.hxx | 34 +++++------
sc/inc/filtopt.hxx | 4 -
sc/inc/filtuno.hxx | 5 -
sc/inc/fmtuno.hxx | 6 -
sc/inc/funcuno.hxx | 6 -
sc/inc/global.hxx | 18 ++---
sc/inc/hints.hxx | 10 +--
sc/source/core/data/global.cxx | 16 ++---
sc/source/core/data/global2.cxx | 4 -
sc/source/core/data/stlpool.cxx | 2
sc/source/core/tool/editutil.cxx | 40 ++++++-------
sc/source/core/tool/hints.cxx | 2
sc/source/filter/excel/xlroot.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 2
sc/source/ui/unoobj/drdefuno.cxx | 2
sc/source/ui/unoobj/editsrc.cxx | 6 -
sc/source/ui/unoobj/filtuno.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 2
sc/source/ui/unoobj/funcuno.cxx | 2
sc/source/ui/unoobj/textuno.cxx | 4 -
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/printfun.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 2
sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 2
starmath/source/accessibility.cxx | 2
starmath/source/accessibility.hxx | 4 -
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 6 -
svx/source/accessibility/AccessibleEmptyEditSource.hxx | 2
svx/source/unodraw/unopool.cxx | 12 +--
svx/source/unodraw/unoshtxt.cxx | 2
sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 4 -
sw/source/ui/uno/unodefaults.cxx | 2
sw/source/ui/uno/unodefaults.hxx | 2
43 files changed, 120 insertions(+), 121 deletions(-)
New commits:
commit e29c77479d7cffb6d2b5a4b68f5bc0ae93855ff3
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 16:30:44 2014 +0200
sal_Bool->bool
Change-Id: Ibd272f99af356d3dd16feeca2354dc502c685218
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index af45f86..79e6d44 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -27,8 +27,8 @@
class ScPaintHint : public SfxHint
{
ScRange aRange;
- sal_uInt16 nParts;
- sal_Bool bPrint; // flag indicating whether print/preview if affected
+ sal_uInt16 nParts;
+ bool bPrint; // flag indicating whether print/preview if affected
ScPaintHint(); // disabled
@@ -37,7 +37,7 @@ public:
ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL );
~ScPaintHint();
- void SetPrintFlag(sal_Bool bSet) { bPrint = bSet; }
+ void SetPrintFlag(bool bSet) { bPrint = bSet; }
const ScRange& GetRange() const { return aRange; }
SCCOL GetStartCol() const { return aRange.aStart.Col(); }
@@ -46,8 +46,8 @@ public:
SCCOL GetEndCol() const { return aRange.aEnd.Col(); }
SCROW GetEndRow() const { return aRange.aEnd.Row(); }
SCTAB GetEndTab() const { return aRange.aEnd.Tab(); }
- sal_uInt16 GetParts() const { return nParts; }
- sal_Bool GetPrintFlag() const { return bPrint; }
+ sal_uInt16 GetParts() const { return nParts; }
+ bool GetPrintFlag() const { return bPrint; }
};
class ScUpdateRefHint : public SfxHint
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index 45c9f75..28c8873 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -32,7 +32,7 @@ TYPEINIT1(ScDataPilotModifiedHint, SfxHint);
ScPaintHint::ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint ) :
aRange( rRng ),
nParts( nPaint ),
- bPrint( sal_True )
+ bPrint( true )
{
}
commit 4b852b30ad8bb7ae1e8eda40b7c9638ff79e88e6
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 16:28:13 2014 +0200
sal_Bool->bool
Change-Id: I82da14d2dec7f6110d1f6b7c4ece1f3498d82b6a
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 7eb8701..8cf6ba8 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -752,18 +752,18 @@ struct ScConsolidateParam
SCROW nRow; // or start of destination area respectively
SCTAB nTab;
ScSubTotalFunc eFunction;
- sal_uInt16 nDataAreaCount; // number of data areas
+ sal_uInt16 nDataAreaCount; // number of data areas
ScArea** ppDataAreas; // array of pointers into data areas
- sal_Bool bByCol;
- sal_Bool bByRow;
- sal_Bool bReferenceData; // reference source data
+ bool bByCol;
+ bool bByRow;
+ bool bReferenceData; // reference source data
ScConsolidateParam();
ScConsolidateParam( const ScConsolidateParam& r );
~ScConsolidateParam();
ScConsolidateParam& operator= ( const ScConsolidateParam& r );
- sal_Bool operator== ( const ScConsolidateParam& r ) const;
+ bool operator== ( const ScConsolidateParam& r ) const;
void Clear (); // = ClearDataAreas()+Members
void ClearDataAreas ();
void SetAreas ( ScArea* const* ppAreas, sal_uInt16 nCount );
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index ae5bdf9..db1a664 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -183,9 +183,9 @@ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r )
//------------------------------------------------------------------------
-sal_Bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
+bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
{
- sal_Bool bEqual = (nCol == r.nCol)
+ bool bEqual = (nCol == r.nCol)
&& (nRow == r.nRow)
&& (nTab == r.nTab)
&& (bByCol == r.bByCol)
commit 365d3105c97182def553d7dca4a88a59fce73d08
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 16:13:28 2014 +0200
sal_Bool->bool
Change-Id: I3d7d146723900b676e852132e8b99b60122c0b2b
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 13e4cdf..7eb8701 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -599,12 +599,12 @@ public:
static OUString GetErrorString(sal_uInt16 nErrNumber);
static OUString GetLongErrorString(sal_uInt16 nErrNumber);
- static sal_Bool EETextObjEqual( const EditTextObject* pObj1,
+ static bool EETextObjEqual( const EditTextObject* pObj1,
const EditTextObject* pObj2 );
- static sal_Bool CheckWidthInvalidate( bool& bNumFormatChanged,
+ static bool CheckWidthInvalidate( bool& bNumFormatChanged,
const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs );
- static sal_Bool HasAttrChanged( const SfxItemSet& rNewAttrs,
+ static bool HasAttrChanged( const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs,
const sal_uInt16 nWhich );
@@ -665,7 +665,7 @@ SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pStri
/// a "ReadOnly" formatter for UNO/XML export
static SvNumberFormatter* GetEnglishFormatter();
- static sal_Bool IsSystemRTL(); // depending on system language
+ static bool IsSystemRTL(); // depending on system language
static LanguageType GetEditDefaultLanguage(); // for EditEngine::SetDefaultLanguage
SC_DLLPUBLIC static sal_uInt8 GetDefaultScriptType(); // for all WEAK characters
/** Map ATTR_((CJK|CTL)_)?FONT_... to proper WhichIDs.
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 374c032..40bcb0d 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -147,11 +147,11 @@ void global_InitAppOptions();
//
//========================================================================
-sal_Bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
+bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs,
const sal_uInt16 nWhich )
{
- sal_Bool bInvalidate = false;
+ bool bInvalidate = false;
const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich );
const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich );
@@ -177,7 +177,7 @@ sal_Bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
? rNewAttrs.Get( nWhich )
: rNewAttrs.GetPool()->GetDefaultItem( nWhich );
- bInvalidate = sal::static_int_cast<sal_Bool>(rNewItem != rOldItem);
+ bInvalidate = rNewItem != rOldItem;
}
return bInvalidate;
@@ -222,7 +222,7 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter()
//------------------------------------------------------------------------
-sal_Bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged,
+bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged,
const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs )
{
@@ -889,11 +889,11 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico
//------------------------------------------------------------------------
-sal_Bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
+bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
const EditTextObject* pObj2 )
{
if ( pObj1 == pObj2 ) // both empty or the same object
- return sal_True;
+ return true;
if ( pObj1 && pObj2 )
{
@@ -912,7 +912,7 @@ sal_Bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
sal_uLong nSize = aStream1.Tell();
if ( aStream2.Tell() == nSize )
if ( !memcmp( aStream1.GetData(), aStream2.GetData(), (sal_uInt16) nSize ) )
- return sal_True;
+ return true;
}
return false;
@@ -971,7 +971,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget )
//------------------------------------------------------------------------
-sal_Bool ScGlobal::IsSystemRTL()
+bool ScGlobal::IsSystemRTL()
{
return MsLangId::isRightToLeft( Application::GetSettings().GetLanguageTag().getLanguageType() );
}
commit 68c80b09e8613be0250a1583cd43c196be85715a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:57:33 2014 +0200
sal_Bool->bool
Change-Id: I91b9c5bf42e4a094faf9a579814814f19a1bc8fe
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 0a8423f..96fe3c1 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -40,15 +40,15 @@ class ScTempDocCache
{
private:
ScDocument* pDoc;
- sal_Bool bInUse;
+ bool bInUse;
public:
ScTempDocCache();
~ScTempDocCache();
ScDocument* GetDocument() const { return pDoc; }
- sal_Bool IsInUse() const { return bInUse; }
- void SetInUse( sal_Bool bSet ) { bInUse = bSet; }
+ bool IsInUse() const { return bInUse; }
+ void SetInUse( bool bSet ) { bInUse = bSet; }
void SetDocument( ScDocument* pNew );
void Clear();
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index bcc3dde..5002b71 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -92,7 +92,7 @@ ScTempDocSource::ScTempDocSource( ScTempDocCache& rDocCache ) :
pTempDoc = CreateDocument();
else
{
- rCache.SetInUse( sal_True );
+ rCache.SetInUse( true );
if ( !rCache.GetDocument() )
rCache.SetDocument( CreateDocument() );
}
commit a5b444d21fe53bf80ffb6e5973c528f63e381fd6
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:55:52 2014 +0200
sal_Bool->bool
Change-Id: Idcb3f9960b158518c21bf3023bae75691a0a22d1
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 9e7f525..78e954c 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -217,12 +217,12 @@ private:
ScAddress aSrcPos;
OUString aPosString; // formula position as text
sal_uInt16 nValMode; // enum ScValidationMode
- sal_Bool bIgnoreBlank;
+ bool bIgnoreBlank;
sal_Int16 nShowList;
- sal_Bool bShowInput;
+ bool bShowInput;
OUString aInputTitle;
OUString aInputMessage;
- sal_Bool bShowError;
+ bool bShowError;
sal_uInt16 nErrorStyle; // enum ScValidErrorStyle
OUString aErrorTitle;
OUString aErrorMessage;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 628941a..425a72f 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -705,7 +705,7 @@ void ScTableValidationObj::ClearData_Impl()
{
nMode = SC_COND_NONE;
nValMode = SC_VALID_ANY;
- bIgnoreBlank = sal_True;
+ bIgnoreBlank = true;
nShowList = sheet::TableValidationVisibility::UNSORTED;
bShowInput = false;
bShowError = false;
commit 8c16c5bcfbb2844663a5b054cb55ef81a8c01dbb
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:53:12 2014 +0200
sal_Bool->bool
Change-Id: Ie2c2daa5ec370310946af9c9a77cededc6331302
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index 587a23e..e43bc18 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -50,9 +50,8 @@ private:
OUString aFileName;
OUString aFilterName;
OUString aFilterOptions;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream > xInputStream;
- sal_Bool bExport;
+ css::uno::Reference< css::io::XInputStream > xInputStream;
+ bool bExport;
public:
ScFilterOptionsObj();
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 053a075..3e30426 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -344,7 +344,7 @@ void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::
void SAL_CALL ScFilterOptionsObj::setSourceDocument( const uno::Reference<lang::XComponent>& /* xDoc */ )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
- bExport = sal_True;
+ bExport = true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 903fa82bbd6c48b47e516a84af2e58014c50e933
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:50:16 2014 +0200
sal_Bool->bool
Change-Id: I1a0f907d0616c5177a8e318193f01bc3febcfdbe
diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx
index 20adaff..68495e6 100644
--- a/sc/inc/filtopt.hxx
+++ b/sc/inc/filtopt.hxx
@@ -28,7 +28,7 @@
class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem
{
- sal_Bool bWK3Flag;
+ bool bWK3Flag;
double fExcelColScale;
double fExcelRowScale;
@@ -40,7 +40,7 @@ public:
virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames );
virtual void Commit();
- sal_Bool GetWK3Flag() const { return bWK3Flag; }
+ bool GetWK3Flag() const { return bWK3Flag; }
double GetExcelColScale() const { return fExcelColScale; }
double GetExcelRowScale() const { return fExcelRowScale; }
commit 615ad147fdbd3fafa8a4bf2f901de9411d7defb5
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:48:01 2014 +0200
sal_Bool->bool
Change-Id: I8a72f7d11a62cc70edeae34c87a9274266414432
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index bc0b8a1..1fbd1da 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -252,7 +252,7 @@ class ScNoteEditEngine : public ScEditEngineDefaulter
public:
ScNoteEditEngine( SfxItemPool* pEnginePool,
SfxItemPool* pTextObjectPool = NULL,
- sal_Bool bDeleteEnginePool = false );
+ bool bDeleteEnginePool = false );
};
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 403612a..a916744 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -891,7 +891,7 @@ void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal
}
ScNoteEditEngine::ScNoteEditEngine( SfxItemPool* pEnginePoolP,
- SfxItemPool* pTextObjectPool, sal_Bool bDeleteEnginePoolP ) :
+ SfxItemPool* pTextObjectPool, bool bDeleteEnginePoolP ) :
ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
{
if ( pTextObjectPool )
commit 04935907f22ddd1e5069e9263707ff32a930b6c7
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:42:15 2014 +0200
sal_Bool->bool
Change-Id: I5b36c8dbefb63ee84d33e9bf1a472c2bbb8b34f0
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index b107f7f..bc0b8a1 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -238,7 +238,7 @@ private:
ScHeaderFieldData aData;
public:
- ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = false );
+ ScHeaderEditEngine( SfxItemPool* pEnginePool, bool bDeleteEnginePool = false );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; }
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 4a37c3d..775e926 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -246,7 +246,7 @@ void ScStyleSheetPool::CreateStandardStyles()
SfxItemSet* pSet = NULL;
SfxItemSet* pHFSet = NULL;
SvxSetItem* pHFSetItem = NULL;
- ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True );
+ ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), true );
pEdEngine->SetUpdateMode( false );
EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject();
EditTextObject* pTxtObj = NULL;
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index a96c6de..403612a 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -794,7 +794,7 @@ ScHeaderFieldData::ScHeaderFieldData()
eNumType = SVX_ARABIC;
}
-ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, sal_Bool bDeleteEnginePoolP )
+ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, bool bDeleteEnginePoolP )
: ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
{
}
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 75edc18..1dd800d 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -352,7 +352,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const
{
if( !mrData.mxHFEditEngine.get() )
{
- mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True ) );
+ mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), true ) );
ScHeaderEditEngine& rEE = *mrData.mxHFEditEngine;
rEE.SetRefMapMode( MAP_TWIP ); // headers/footers use twips as default metric
rEE.SetUpdateMode( false );
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index c852311..0c82f17 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1491,7 +1491,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
{
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
- ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, sal_True );
+ ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, true );
pHdrEngine->EnableUndo( false );
pHdrEngine->SetRefMapMode( MAP_TWIP );
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index abcb31c..9906181 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -89,7 +89,7 @@ ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation
Size aSize( GetOutputSize() );
aSize.Height() *= 4;
- pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True );
+ pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), true );
pEdEngine->SetPaperSize( aSize );
pEdEngine->SetRefDevice( this );
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 0214d45..bff43a9 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -209,7 +209,7 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
{
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
- ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, sal_True );
+ ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, true );
pHdrEngine->EnableUndo( false );
pHdrEngine->SetRefMapMode( MAP_TWIP );
@@ -349,7 +349,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException
if (pData)
{
// for pure text, no font info is needed in pool defaults
- ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), sal_True );
+ ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), true );
ScHeaderFieldData aData;
FillDummyFieldData( aData );
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 9406a90..e4a1109 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1663,7 +1663,7 @@ void ScPrintFunc::MakeEditEngine()
{
// can't use document's edit engine pool here,
// because pool must have twips as default metric
- pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True );
+ pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), true );
pEditEngine->EnableUndo(false);
//fdo#45869 we want text to be positioned as it would be for the the
commit c04fa61cf3e793b497d55003821ce9fd16be8728
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:32:01 2014 +0200
sal_Bool->bool
Change-Id: I9d2b6313b8ae2b02286ed42254a292a853904b81
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 21cf643..b107f7f 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -135,17 +135,17 @@ public:
/// bDeleteEnginePool: Engine becomes the owner of the pool
/// and deletes it on destruction
ScEditEngineDefaulter( SfxItemPool* pEnginePool,
- sal_Bool bDeleteEnginePool = false );
+ bool bDeleteEnginePool = false );
/// If rOrg.bDeleteEnginePool: pool gets cloned and will be
/// deleted on destruction. Defaults are not set.
ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg );
virtual ~ScEditEngineDefaulter();
/// Creates a copy of SfxItemSet if bRememberCopy set
- void SetDefaults( const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
+ void SetDefaults( const SfxItemSet& rDefaults, bool bRememberCopy = true );
/// Becomes the owner of the SfxItemSet if bTakeOwnership set
- void SetDefaults( SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
+ void SetDefaults( SfxItemSet* pDefaults, bool bTakeOwnership = true );
/// Set the item in the default ItemSet which is created
/// if it doesn't exist yet.
@@ -159,19 +159,19 @@ public:
void SetText( const EditTextObject& rTextObject );
/// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const EditTextObject& rTextObject,
- const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
+ const SfxItemSet& rDefaults, bool bRememberCopy = true );
/// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const EditTextObject& rTextObject,
- SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
+ SfxItemSet* pDefaults, bool bTakeOwnership = true );
/// Overwritten method to be able to apply defaults already set
void SetText( const OUString& rText );
/// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const OUString& rText,
- const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
+ const SfxItemSet& rDefaults, bool bRememberCopy = true );
/// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const OUString& rText,
- SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
+ SfxItemSet* pDefaults, bool bTakeOwnership = true );
/// Paragraph attributes that are not defaults are copied to
/// character attributes and all paragraph attributes reset
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 6a1ceeb..a96c6de 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -459,7 +459,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper()
}
ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP,
- sal_Bool bDeleteEnginePoolP )
+ bool bDeleteEnginePoolP )
:
ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ),
EditEngine( pEnginePoolP )
@@ -482,7 +482,7 @@ ScEditEngineDefaulter::~ScEditEngineDefaulter()
{
}
-void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRememberCopy )
+void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, bool bRememberCopy )
{
if ( bRememberCopy )
{
@@ -508,7 +508,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem
EnableUndo( sal_True );
}
-void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, sal_Bool bTakeOwnership )
+void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, bool bTakeOwnership )
{
if ( bDeleteDefaults )
delete pDefaults;
@@ -552,7 +552,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
}
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
- const SfxItemSet& rSet, sal_Bool bRememberCopy )
+ const SfxItemSet& rSet, bool bRememberCopy )
{
sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
@@ -564,7 +564,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
}
void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
- SfxItemSet* pSet, sal_Bool bTakeOwnership )
+ SfxItemSet* pSet, bool bTakeOwnership )
{
sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
@@ -588,7 +588,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText )
}
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
- const SfxItemSet& rSet, sal_Bool bRememberCopy )
+ const SfxItemSet& rSet, bool bRememberCopy )
{
sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
@@ -600,7 +600,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
}
void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
- SfxItemSet* pSet, sal_Bool bTakeOwnership )
+ SfxItemSet* pSet, bool bTakeOwnership )
{
sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 650280f..a84b717 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
{
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
- pEditEngine = new ScEditEngineDefaulter( pEnginePool, sal_True );
+ pEditEngine = new ScEditEngineDefaulter( pEnginePool, true );
}
pForwarder = new SvxEditEngineForwarder(*pEditEngine);
}
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 56f227d..c5f0ab0 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -940,7 +940,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
else
{
// use EditEngine to draw mixed-script string
- pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True );
+ pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), true );
pEditEng->SetRefMapMode( pContentDev->GetMapMode() );
SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() );
rDefPattern.FillEditItemSet( pEditDefaults );
commit 49b78a5d67cf808736497f888163bfb10cffec3b
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:24:39 2014 +0200
sal_Bool->bool
Change-Id: I89492db6557109623418c610f8dbbee021d1eb5a
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index e9a1ad0..21cf643 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -116,11 +116,11 @@ class ScEnginePoolHelper
protected:
SfxItemPool* pEnginePool;
SfxItemSet* pDefaults;
- sal_Bool bDeleteEnginePool;
- sal_Bool bDeleteDefaults;
+ bool bDeleteEnginePool;
+ bool bDeleteDefaults;
ScEnginePoolHelper( SfxItemPool* pEnginePool,
- sal_Bool bDeleteEnginePool = false );
+ bool bDeleteEnginePool = false );
ScEnginePoolHelper( const ScEnginePoolHelper& rOrg );
virtual ~ScEnginePoolHelper();
};
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 7a032ff..6a1ceeb 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -432,7 +432,7 @@ ScEditAttrTester::~ScEditAttrTester()
}
ScEnginePoolHelper::ScEnginePoolHelper( SfxItemPool* pEnginePoolP,
- sal_Bool bDeleteEnginePoolP )
+ bool bDeleteEnginePoolP )
:
pEnginePool( pEnginePoolP ),
pDefaults( NULL ),
@@ -489,7 +489,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem
if ( bDeleteDefaults )
delete pDefaults;
pDefaults = new SfxItemSet( rSet );
- bDeleteDefaults = sal_True;
+ bDeleteDefaults = true;
}
const SfxItemSet& rNewSet = bRememberCopy ? *pDefaults : rSet;
sal_Bool bUndo = IsUndoEnabled();
@@ -523,7 +523,7 @@ void ScEditEngineDefaulter::SetDefaultItem( const SfxPoolItem& rItem )
if ( !pDefaults )
{
pDefaults = new SfxItemSet( GetEmptyItemSet() );
- bDeleteDefaults = sal_True;
+ bDeleteDefaults = true;
}
pDefaults->Put( rItem );
SetDefaults( *pDefaults, false );
@@ -534,7 +534,7 @@ const SfxItemSet& ScEditEngineDefaulter::GetDefaults()
if ( !pDefaults )
{
pDefaults = new SfxItemSet( GetEmptyItemSet() );
- bDeleteDefaults = sal_True;
+ bDeleteDefaults = true;
}
return *pDefaults;
}
commit c32f314d55f5d7d1a574cce30b2cc02f1713b9ff
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:19:39 2014 +0200
sal_Bool->bool
Change-Id: I19976ae2251c3f356c878538f12485af9516abf8
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index cf3614e..e9a1ad0 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -97,15 +97,15 @@ class ScEditAttrTester
{
ScEditEngineDefaulter* pEngine;
SfxItemSet* pEditAttrs;
- sal_Bool bNeedsObject;
- sal_Bool bNeedsCellAttr;
+ bool bNeedsObject;
+ bool bNeedsCellAttr;
public:
ScEditAttrTester( ScEditEngineDefaulter* pEng );
~ScEditAttrTester();
- sal_Bool NeedsObject() const { return bNeedsObject; }
- sal_Bool NeedsCellAttr() const { return bNeedsCellAttr; }
+ bool NeedsObject() const { return bNeedsObject; }
+ bool NeedsCellAttr() const { return bNeedsCellAttr; }
const SfxItemSet& GetAttribs() const { return *pEditAttrs; }
};
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index b0fb33d..7a032ff 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -377,7 +377,7 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
{
if ( pEngine->GetParagraphCount() > 1 )
{
- bNeedsObject = sal_True; //! Zellatribute finden ?
+ bNeedsObject = true; //! Zellatribute finden ?
}
else
{
@@ -390,7 +390,7 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
{
SfxItemState eState = pEditAttrs->GetItemState( nId, false, &pItem );
if (eState == SFX_ITEM_DONTCARE)
- bNeedsObject = sal_True;
+ bNeedsObject = true;
else if (eState == SFX_ITEM_SET)
{
if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING ||
@@ -402,12 +402,12 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
// from "user attributes applied to the cell".
if ( *pItem != rEditDefaults.Get(nId) )
- bNeedsObject = sal_True;
+ bNeedsObject = true;
}
else
if (!bNeedsCellAttr)
if ( *pItem != rEditDefaults.Get(nId) )
- bNeedsCellAttr = sal_True;
+ bNeedsCellAttr = true;
// rEditDefaults contains the defaults from the cell format
}
}
@@ -416,13 +416,13 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
SfxItemState eFieldState = pEditAttrs->GetItemState( EE_FEATURE_FIELD, false );
if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
- bNeedsObject = sal_True;
+ bNeedsObject = true;
// not converted characters?
SfxItemState eConvState = pEditAttrs->GetItemState( EE_FEATURE_NOTCONV, false );
if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET )
- bNeedsObject = sal_True;
+ bNeedsObject = true;
}
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8995933..f0ac6a7 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -941,7 +941,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich),
pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ).
- GetEditArea( pPattern, sal_True );
+ GetEditArea( pPattern, true );
// when right-aligned, leave space for the cursor
// in vertical mode, editing is always right-aligned
commit bcaf811e3b63109e9b0982d6727b03c4807c7333
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 15:12:51 2014 +0200
sal_Bool->bool
Change-Id: I13afb78450ef81e2269ab9a39a3f358e43f6f264
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index a8cd1ab..cf3614e 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -89,7 +89,7 @@ public:
aScrPos(rScrPosPixel),pDev(pDevice),
nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
- Rectangle GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForceToTop );
+ Rectangle GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop );
};
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 832fa77..b0fb33d 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -278,7 +278,7 @@ OUString ScEditUtil::GetCellFieldValue(
return aRet;
}
-Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForceToTop )
+Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop )
{
// bForceToTop = always align to top, for editing
// (sal_False for querying URLs etc.)
commit a79f1097eed72fcc5a9edc64f31b17ee29558fc3
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 14:28:50 2014 +0200
sal_Bool->bool
Change-Id: Ie477a46fae2b8c4deb55435f3769ba74037dd259
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index eea3766..3ebcbe6 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -385,7 +385,7 @@ SvxAccessibleTextEditViewAdapter* SvxEditSourceAdapter::GetEditViewForwarderAdap
return NULL;
}
-SvxEditViewForwarder* SvxEditSourceAdapter::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* SvxEditSourceAdapter::GetEditViewForwarder( bool bCreate )
{
return GetEditViewForwarderAdapter( bCreate );
}
diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index 3af4eca..ebeb6f4 100644
--- a/editeng/source/uno/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
@@ -65,7 +65,7 @@ SvxViewForwarder* SvxEditSource::GetViewForwarder()
return NULL;
}
-SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( sal_Bool )
+SvxEditViewForwarder* SvxEditSource::GetEditViewForwarder( bool )
{
return NULL;
}
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index c2b877c..94a4375 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -145,9 +145,9 @@ public:
virtual SvxEditSource* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
SvxAccessibleTextAdapter* GetTextForwarderAdapter(); // covariant return types don't work on MSVC
- virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
- SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( sal_Bool bCreate = sal_False ); // covariant return types don't work on MSVC
+ virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
+ SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( sal_Bool bCreate = sal_False ); // covariant return types don't work on MSVC
virtual void UpdateData();
virtual SfxBroadcaster& GetBroadcaster() const;
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 1b89fcc..fb34126 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -96,7 +96,7 @@ public:
sal_True, all previously returned text forwarder can become
invalid
*/
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false );
/// Write back data to model
virtual void UpdateData() = 0;
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index 88972bd..fd30b64 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -57,8 +57,8 @@ public:
virtual SvxEditSource* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
virtual void UpdateData();
virtual void addRange( SvxUnoTextRangeBase* pNewRange );
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 95aa541..004f638 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -147,7 +147,7 @@ public:
virtual SvxEditSource* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = false );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
virtual void UpdateData();
virtual SfxBroadcaster& GetBroadcaster() const;
};
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 50adbf4..650280f 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -275,7 +275,7 @@ SvxViewForwarder* ScAccessibilityEditSource::GetViewForwarder()
return mpAccessibleTextData->GetViewForwarder();
}
-SvxEditViewForwarder* ScAccessibilityEditSource::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* ScAccessibilityEditSource::GetEditViewForwarder( bool bCreate )
{
return mpAccessibleTextData->GetEditViewForwarder(bCreate);
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 981ee3b..a5ac5a6 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -80,7 +80,7 @@ namespace accessibility
return NULL;
}
- SvxEditViewForwarder* AccessibleOutlineEditSource::GetEditViewForwarder( sal_Bool )
+ SvxEditViewForwarder* AccessibleOutlineEditSource::GetEditViewForwarder( bool )
{
// TODO: maybe suboptimal
if( IsValid() )
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index 6449608..75b04f3 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -60,7 +60,7 @@ namespace accessibility
virtual SvxEditSource* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
virtual void UpdateData();
virtual SfxBroadcaster& GetBroadcaster() const;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 2d6becb..283d471 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -849,7 +849,7 @@ SvxViewForwarder* SmEditSource::GetViewForwarder()
return &aViewFwd;
}
-SvxEditViewForwarder* SmEditSource::GetEditViewForwarder( sal_Bool /*bCreate*/ )
+SvxEditViewForwarder* SmEditSource::GetEditViewForwarder( bool /*bCreate*/ )
{
return &aEditViewFwd;
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index d9d30ae..d770d09 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -302,8 +302,8 @@ public:
virtual SvxEditSource* Clone() const;
virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
virtual void UpdateData();
virtual SfxBroadcaster& GetBroadcaster() const;
};
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index fee79fd..e16dfaf 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -62,7 +62,7 @@ namespace accessibility
// from the SvxEditSource interface
SvxTextForwarder* GetTextForwarder();
SvxViewForwarder* GetViewForwarder();
- SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
SvxEditSource* Clone() const;
@@ -198,7 +198,7 @@ namespace accessibility
return maEditSource.GetViewForwarder();
}
- SvxEditViewForwarder* AccessibleProxyEditSource_Impl::GetEditViewForwarder( sal_Bool bCreate )
+ SvxEditViewForwarder* AccessibleProxyEditSource_Impl::GetEditViewForwarder( bool bCreate )
{
return maEditSource.GetEditViewForwarder( bCreate );
}
@@ -287,7 +287,7 @@ namespace accessibility
mbEditSourceEmpty = false;
}
- SvxEditViewForwarder* AccessibleEmptyEditSource::GetEditViewForwarder( sal_Bool bCreate )
+ SvxEditViewForwarder* AccessibleEmptyEditSource::GetEditViewForwarder( bool bCreate )
{
if( !mpEditSource.get() )
return NULL;
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index c10feb3..e4174aa 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -60,7 +60,7 @@ namespace accessibility
// this method internally switches from empty to proxy mode,
// creating an SvxTextEditSource for the functionality.
- SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
void UpdateData();
SfxBroadcaster& GetBroadcaster() const;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 991b6bf..3e47bda 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -1087,7 +1087,7 @@ SvxTextForwarder* SvxTextEditSource::GetTextForwarder()
}
//------------------------------------------------------------------------
-SvxEditViewForwarder* SvxTextEditSource::GetEditViewForwarder( sal_Bool bCreate )
+SvxEditViewForwarder* SvxTextEditSource::GetEditViewForwarder( bool bCreate )
{
return mpImpl->GetEditViewForwarder( bCreate );
}
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index f7a74cd..5f04529 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -48,7 +48,7 @@ class SidebarTextEditSource : public SvxEditSource,
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False );
+ virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
virtual void UpdateData();
@@ -96,7 +96,7 @@ SvxViewForwarder* SidebarTextEditSource::GetViewForwarder()
return &mViewForwarder;
}
-SvxEditViewForwarder* SidebarTextEditSource::GetEditViewForwarder( sal_Bool /*bCreate*/ )
+SvxEditViewForwarder* SidebarTextEditSource::GetEditViewForwarder( bool /*bCreate*/ )
{
return &mViewForwarder;
}
commit 3876dcbf859811d618e6fd30b755d03798ef2ff9
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 14:06:38 2014 +0200
sal_Bool->bool
Change-Id: Ib952b18bff75cf7ea1257a53ac378c064076dfea
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index cfb9d3e..95aa541 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -99,7 +99,7 @@ private:
ScAddress aCellPos;
ScEditEngineDefaulter* pEditEngine;
SvxEditEngineForwarder* pForwarder;
- sal_Bool bDataValid;
+ bool bDataValid;
SdrObject* GetCaptionObj();
public:
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index b48ae1b..50adbf4 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -167,7 +167,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
if ( const EditTextObject* pEditObj = pNote->GetEditTextObject() )
pEditEngine->SetText( *pEditObj ); // incl. Umbrueche
- bDataValid = sal_True;
+ bDataValid = true;
return pForwarder;
}
commit 11679c2c20241b6b3f6f8982b18c822e978ee76b
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 14:00:21 2014 +0200
sal_Bool->bool
Change-Id: Iee828ef0f5f4ed0192291c4681fbc8df6e863b7e
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index 98146e5..7d7bd4e 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -49,7 +49,7 @@ public:
/** This returns the item pool from the given model, or the default pool if there is no model and bReadOnly is true.
If bReadOnly is false and there is no model the default implementation returns NULL.
*/
- virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw();
+ virtual SfxItemPool* getModelPool( bool bReadOnly ) throw();
// overiden helpers from comphelper::PropertySetHelper
virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx
index 93cdd1b..0c0ea7e 100644
--- a/sc/inc/drdefuno.hxx
+++ b/sc/inc/drdefuno.hxx
@@ -37,7 +37,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
// from SvxUnoDrawPool
- virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw();
+ virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE;
};
#endif
diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx
index d97cf37..12de924 100644
--- a/sc/source/ui/unoobj/drdefuno.cxx
+++ b/sc/source/ui/unoobj/drdefuno.cxx
@@ -50,7 +50,7 @@ void ScDrawDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-SfxItemPool* ScDrawDefaultsObj::getModelPool( sal_Bool bReadOnly ) throw()
+SfxItemPool* ScDrawDefaultsObj::getModelPool( bool bReadOnly ) throw()
{
SfxItemPool* pRet = NULL;
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index be3b0dd..c8f71edc 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -78,7 +78,7 @@ void SvxUnoDrawPool::init()
mpDefaultsPool->FreezeIdRanges();
}
-SfxItemPool* SvxUnoDrawPool::getModelPool( sal_Bool bReadOnly ) throw()
+SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw()
{
if( mpModel )
{
@@ -204,7 +204,7 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp
{
SolarMutexGuard aGuard;
- SfxItemPool* pPool = getModelPool( sal_False );
+ SfxItemPool* pPool = getModelPool( false );
DBG_ASSERT( pPool, "I need a SfxItemPool!" );
if( NULL == pPool )
@@ -219,7 +219,7 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp
{
SolarMutexGuard aGuard;
- SfxItemPool* pPool = getModelPool( sal_True );
+ SfxItemPool* pPool = getModelPool( true );
DBG_ASSERT( pPool, "I need a SfxItemPool!" );
if( NULL == pPool )
@@ -234,7 +234,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp
{
SolarMutexGuard aGuard;
- SfxItemPool* pPool = getModelPool( sal_True );
+ SfxItemPool* pPool = getModelPool( true );
if( pPool && pPool != mpDefaultsPool )
{
@@ -297,7 +297,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
{
SolarMutexGuard aGuard;
- SfxItemPool* pPool = getModelPool( sal_True );
+ SfxItemPool* pPool = getModelPool( true );
// OD 10.10.2003 #i18732#
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
@@ -319,7 +319,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
// OD 13.10.2003 #i18732# - use method <GetPoolDefaultItem(..)> instead of
// using probably incompatible item pool <mpDefaultsPool>
uno::Any aAny;
- SfxItemPool* pPool = getModelPool( sal_True );
+ SfxItemPool* pPool = getModelPool( true );
const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich );
pItem->QueryValue( aAny, pEntry->mnMemberId );
diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx
index 5da8486..1959f74 100644
--- a/sw/source/ui/uno/unodefaults.cxx
+++ b/sw/source/ui/uno/unodefaults.cxx
@@ -32,7 +32,7 @@ SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw()
{
}
-SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw()
+SfxItemPool* SwSvxUnoDrawPool::getModelPool( bool /*bReadOnly*/ ) throw()
{
if(m_pDoc)
{
diff --git a/sw/source/ui/uno/unodefaults.hxx b/sw/source/ui/uno/unodefaults.hxx
index 093d9b4..1006b0e 100644
--- a/sw/source/ui/uno/unodefaults.hxx
+++ b/sw/source/ui/uno/unodefaults.hxx
@@ -30,7 +30,7 @@ public:
SwSvxUnoDrawPool( SwDoc* pDoc ) throw();
virtual ~SwSvxUnoDrawPool() throw();
- virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw();
+ virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE;
void Invalidate() {m_pDoc = 0;}
};
More information about the Libreoffice-commits
mailing list