diff options
| -rw-r--r-- | editeng/source/editeng/editdbg.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit5.cxx | 4 | ||||
| -rw-r--r-- | include/svl/poolitem.hxx | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 8703a6a1ed6b..a6a6c7acd2f8 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -300,7 +300,7 @@ void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, bool bSearchInParent, bool for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ ) { fprintf( fp, "\nWhich: %i\t", nWhich ); - if ( rSet.GetItemState( nWhich, bSearchInParent ) == SFX_ITEM_OFF ) + if ( rSet.GetItemState( nWhich, bSearchInParent ) == SFX_ITEM_DEFAULT ) fprintf( fp, "ITEM_OFF " ); else if ( rSet.GetItemState( nWhich, bSearchInParent ) == SFX_ITEM_DONTCARE ) fprintf( fp, "ITEM_DC " ); diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index fb3820871041..03662ade8238 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2621,7 +2621,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nE if ( pItem ) { sal_uInt16 nWhich = pItem->Which(); - if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) + if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_DEFAULT ) { rCurSet.Put( *pItem ); } @@ -2671,7 +2671,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nE if ( pItem ) { sal_uInt16 nWhich = pItem->Which(); - if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) + if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_DEFAULT ) { rCurSet.Put( *pItem ); } diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 3e1a59909d95..66ca5a47c25f 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -335,7 +335,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnl // 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 ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DEFAULT ) { if ( nOnlyHardAttrib == EditEngineAttribs_All ) { @@ -381,7 +381,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnl { for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ ) { - if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) + if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DEFAULT ) { aCurSet.Put( aEditDoc.GetItemPool().GetDefaultItem( nWhich ) ); } diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index d32de3274e8b..c541871be657 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -137,7 +137,6 @@ enum SfxItemState { // old stuff - dont use!!! #define SFX_ITEM_AVAILABLE SFX_ITEM_DEFAULT -#define SFX_ITEM_OFF SFX_ITEM_DEFAULT #define SFX_ITEM_ON SFX_ITEM_SET class SvXMLUnitConverter; |