summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-04 08:45:26 +0200
committerNoel Grandin <noel@peralex.com>2014-04-04 13:44:16 +0200
commit214751e3cc5b154d90963f4abf0a9317733b001b (patch)
tree9d7c0127be2b0e9ada88bcf73e632233bd841f61
parent6f349af57ebd6d160b6354c2033c46467da4598a (diff)
cleanup up the EditEngine::GetAttribs call
It was using a bool parameter, but passing various constants through it. Make the constants into an enum, and use the enum in the GetAttribs call. Change-Id: I3010397dfe83b24db3946b9dea2fb37f4393abdd
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/impedit.hxx2
-rw-r--r--editeng/source/editeng/impedit5.cxx12
-rw-r--r--editeng/source/uno/unoedprx.cxx5
-rw-r--r--editeng/source/uno/unofored.cxx6
-rw-r--r--editeng/source/uno/unoforou.cxx14
-rw-r--r--editeng/source/uno/unotext.cxx2
-rw-r--r--include/editeng/editeng.hxx16
-rw-r--r--include/editeng/unoedprx.hxx2
-rw-r--r--include/editeng/unoedsrc.hxx3
-rw-r--r--include/editeng/unofored.hxx2
-rw-r--r--include/editeng/unoforou.hxx2
-rw-r--r--include/editeng/unotext.hxx2
-rw-r--r--starmath/source/accessibility.cxx6
-rw-r--r--starmath/source/accessibility.hxx2
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx4
16 files changed, 45 insertions, 39 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 30413780943b..f1961ec908b5 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1725,11 +1725,11 @@ void EditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLs
pImpEditEngine->GetCharAttribs( nPara, rLst );
}
-SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib )
+SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib )
{
EditSelection aSel( pImpEditEngine->
ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
- return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
+ return pImpEditEngine->GetAttribs( aSel, nOnlyHardAttrib );
}
SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags ) const
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 93be9b569074..5be394786ac0 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -798,7 +798,7 @@ public:
sal_uInt32 GetParaHeight( sal_Int32 nParagraph );
SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
- SfxItemSet GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib = sal_False );
+ SfxItemSet GetAttribs( EditSelection aSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All );
void SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0 );
void RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 );
void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False );
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 447ea2300b16..37996a43a0a3 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -303,7 +303,7 @@ sal_Bool ImpEditEngine::Redo( EditView* pView )
return sal_False;
}
-SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib )
+SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnlyHardAttrib )
{
aSel.Adjust( aEditDoc );
@@ -330,14 +330,14 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
// First the very hard formatting ...
aEditDoc.FindAttribs( pNode, nStartPos, nEndPos, aCurSet );
- if( bOnlyHardAttrib != EditEngineAttribs_OnlyHard )
+ if( nOnlyHardAttrib != EditEngineAttribs_OnlyHard )
{
// and then paragraph formatting and template...
for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
{
if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
{
- if ( bOnlyHardAttrib == EditEngineAttribs_All )
+ if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
const SfxPoolItem& rItem = pNode->GetContentAttribs().GetItem( nWhich );
aCurSet.Put( rItem );
@@ -351,7 +351,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON )
{
const SfxPoolItem* pItem = NULL;
- if ( bOnlyHardAttrib == EditEngineAttribs_All )
+ if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
pItem = &pNode->GetContentAttribs().GetItem( nWhich );
}
@@ -359,7 +359,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
{
pItem = &pNode->GetContentAttribs().GetItems().Get( nWhich );
}
- // pItem can only be NULL when bOnlyHardAttrib...
+ // pItem can only be NULL when nOnlyHardAttrib...
if ( !pItem || ( *pItem != aCurSet.Get( nWhich ) ) )
{
// Problem: When Paragraph style with for example font,
@@ -377,7 +377,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
}
// fill empty slots with defaults ...
- if ( bOnlyHardAttrib == EditEngineAttribs_All )
+ if ( nOnlyHardAttrib == EditEngineAttribs_All )
{
for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ )
{
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index aa49d90e8a66..1a2a13dea7d8 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -524,7 +524,7 @@ OUString SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
return sStr;
}
-SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -534,8 +534,7 @@ SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Boo
aStartIndex.SetIndex( rSel.nStartPara, rSel.nStartPos, *this );
aEndIndex.SetIndex( rSel.nEndPara, rSel.nEndPos, *this );
- return mpTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex),
- bOnlyHardAttrib );
+ return mpTextForwarder->GetAttribs( MakeEESelection(aStartIndex, aEndIndex), nOnlyHardAttrib );
}
SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( sal_Int32 nPara ) const
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index d395baa10a9c..f667432e05d5 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -61,12 +61,12 @@ OUString SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
return convertLineEnd(rEditEngine.GetText(rSel, LINEEND_LF), GetSystemLineEnd());
}
-SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
if( rSel.nStartPara == rSel.nEndPara )
{
sal_uInt8 nFlags = 0;
- switch( bOnlyHardAttrib )
+ switch( nOnlyHardAttrib )
{
case EditEngineAttribs_All:
nFlags = GETATTRIBS_ALL;
@@ -85,7 +85,7 @@ SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, sal_Bool
}
else
{
- return rEditEngine.GetAttribs( rSel, bOnlyHardAttrib );
+ return rEditEngine.GetAttribs( rSel, nOnlyHardAttrib );
}
}
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index e6204f482b27..5d7d8f343019 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -71,13 +71,13 @@ OUString SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
return pEditEngine->GetText( rSel, LINEEND_LF );
}
-static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib, EditEngine& rEditEngine )
+static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib, EditEngine& rEditEngine )
{
if( rSel.nStartPara == rSel.nEndPara )
{
sal_uInt8 nFlags = 0;
- switch( bOnlyHardAttrib )
+ switch( nOnlyHardAttrib )
{
case EditEngineAttribs_All:
nFlags = GETATTRIBS_ALL;
@@ -95,13 +95,13 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, sal_B
}
else
{
- return rEditEngine.GetAttribs( rSel, bOnlyHardAttrib );
+ return rEditEngine.GetAttribs( rSel, nOnlyHardAttrib );
}
}
-SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
- if( mpAttribsCache && ( 0 == bOnlyHardAttrib ) )
+ if( mpAttribsCache && ( EditEngineAttribs_All == nOnlyHardAttrib ) )
{
// have we the correct set in cache?
if( ((SvxOutlinerForwarder*)this)->maAttribCacheSelection.IsEqual(rSel) )
@@ -121,9 +121,9 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, sal_Bool bO
//! and why is the GetAttribs on the EditEngine not a const?
EditEngine& rEditEngine = (EditEngine&)rOutliner.GetEditEngine();
- SfxItemSet aSet( ImplOutlinerForwarderGetAttribs( rSel, bOnlyHardAttrib, rEditEngine ) );
+ SfxItemSet aSet( ImplOutlinerForwarderGetAttribs( rSel, nOnlyHardAttrib, rEditEngine ) );
- if( 0 == bOnlyHardAttrib )
+ if( EditEngineAttribs_All == nOnlyHardAttrib )
{
mpAttribsCache = new SfxItemSet( aSet );
maAttribCacheSelection = rSel;
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index e2107565ed23..9c46bfbe8df7 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2433,7 +2433,7 @@ OUString SvxDummyTextSource::GetText( const ESelection& ) const
return OUString();
}
-SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, sal_Bool ) const
+SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, EditEngineAttribs ) const
{
// Very dangerous: The former implementation used a SfxItemPool created on the
// fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 128fdf50341e..bb5efa3be97f 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -109,12 +109,18 @@ class ParaPortionList;
-/** values for GetAttribs
+/** values for:
+ SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All );
*/
-const sal_uInt8 EditEngineAttribs_All = 0; /// returns all attributes even when theire not set
-const sal_uInt8 EditEngineAttribs_HardAndPara = 1; /// returns all attributes set on paragraph and on portions
-const sal_uInt8 EditEngineAttribs_OnlyHard = 2; /// returns only attributes hard set on portions
+enum EditEngineAttribs {
+ EditEngineAttribs_All, /// returns all attributes even when theire not set
+ EditEngineAttribs_HardAndPara, /// returns all attributes set on paragraph and on portions
+ EditEngineAttribs_OnlyHard /// returns only attributes hard set on portions
+};
+/** values for:
+ SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+*/
#define GETATTRIBS_STYLESHEET (sal_uInt8)0x01
#define GETATTRIBS_PARAATTRIBS (sal_uInt8)0x02
#define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04
@@ -297,7 +303,7 @@ public:
void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const;
SfxItemSet GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt8 nFlags = 0xFF ) const;
- SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = sal_False );
+ SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All );
bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
const SfxPoolItem& GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich );
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index 34ca35f6df76..1bc9ebc66d94 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -36,7 +36,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index d12372c2dfd0..aed5ee6ae5db 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -30,6 +30,7 @@
#include <svl/poolitem.hxx>
#include <svl/itempool.hxx>
#include <editeng/editengdllapi.h>
+#include <editeng/editeng.hxx>
#include <list>
@@ -141,7 +142,7 @@ public:
virtual sal_Int32 GetParagraphCount() const = 0;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const = 0;
virtual OUString GetText( const ESelection& rSel ) const = 0;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const = 0;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const = 0;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) = 0;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0;
diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx
index 5ea61a7bcedf..a07a784f047b 100644
--- a/include/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
@@ -38,7 +38,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 22d89a175d83..7840909a115d 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -56,7 +56,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 3250ec33de78..5c4eed690912 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -177,7 +177,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 4288e4e97c1c..0e76d68482c8 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -996,14 +996,14 @@ OUString SmTextForwarder::GetText( const ESelection& rSel ) const
return convertLineEnd(aRet, GetSystemLineEnd());
}
-SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
+SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
OSL_ENSURE( pEditEngine, "EditEngine missing" );
if( rSel.nStartPara == rSel.nEndPara )
{
sal_uInt8 nFlags = 0;
- switch( bOnlyHardAttrib )
+ switch( nOnlyHardAttrib )
{
case EditEngineAttribs_All:
nFlags = GETATTRIBS_ALL;
@@ -1022,7 +1022,7 @@ SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHa
}
else
{
- return pEditEngine->GetAttribs( rSel, bOnlyHardAttrib );
+ return pEditEngine->GetAttribs( rSel, nOnlyHardAttrib );
}
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 97e281bded19..fdcc40d0fbf9 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -204,7 +204,7 @@ public:
virtual sal_Int32 GetParagraphCount() const SAL_OVERRIDE;
virtual sal_Int32 GetTextLen( sal_Int32 nParagraph ) const SAL_OVERRIDE;
virtual OUString GetText( const ESelection& rSel ) const SAL_OVERRIDE;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ) const SAL_OVERRIDE;
virtual SfxItemSet GetParaAttribs( sal_Int32 nPara ) const SAL_OVERRIDE;
virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) SAL_OVERRIDE;
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 1f5784e3e540..a8b03dc36568 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -97,8 +97,8 @@ namespace accessibility
// SvxTextForwarder
sal_Int32 GetParagraphCount() const SAL_OVERRIDE { return 1; }
sal_Int32 GetTextLen( sal_Int32 /*nParagraph*/ ) const SAL_OVERRIDE { return 0; }
- OUString GetText( const ESelection& /*rSel*/ ) const SAL_OVERRIDE { return OUString(); }
- SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const SAL_OVERRIDE
+ OUString GetText( const ESelection& /*rSel*/ ) const SAL_OVERRIDE { return OUString(); }
+ SfxItemSet GetAttribs( const ESelection& /*rSel*/, EditEngineAttribs /*nOnlyHardAttrib*/ = EditEngineAttribs_All ) const SAL_OVERRIDE
{
// AW: Very dangerous: The former implementation used a SfxItemPool created on the
// fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using