diff options
222 files changed, 904 insertions, 898 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 1c06ebcadf18..48901045e265 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -127,14 +127,14 @@ SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const return new MediaItem( *this ); } -SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation, +bool MediaItem::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper * ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 2faf3087f983..285cfc21bdfb 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -378,7 +378,7 @@ OUString SvxBulletItem::GetFullText() const -SfxItemPresentation SvxBulletItem::GetPresentation +bool SvxBulletItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -386,18 +386,18 @@ SfxItemPresentation SvxBulletItem::GetPresentation OUString& rText, const IntlWrapper * ) const { - SfxItemPresentation eRet = SFX_ITEM_PRESENTATION_NONE; + bool eRet = false; switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - eRet = SFX_ITEM_PRESENTATION_NONE; + eRet = false; break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetFullText(); - eRet = SFX_ITEM_PRESENTATION_COMPLETE; + eRet = true; break; default: ; //prevent warning } diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index f1df36916655..b32d41acf743 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -33,7 +33,7 @@ SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const return new SvxCharHiddenItem( *this ); } -SfxItemPresentation SvxCharHiddenItem::GetPresentation +bool SvxCharHiddenItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -45,7 +45,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -54,11 +54,11 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_CHARHIDDEN_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 798ae03e7999..f4297b79c4fe 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -179,7 +179,7 @@ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxPaperBinItem::GetPresentation +bool SvxPaperBinItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -191,11 +191,11 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: rText = OUString::number( GetValue() ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -207,13 +207,13 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation { rText = EE_RESSTR(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue ); } - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } //no break necessary default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxSizeItem ----------------------------------------------------- @@ -325,7 +325,7 @@ SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const -SfxItemPresentation SvxSizeItem::GetPresentation +bool SvxSizeItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -338,13 +338,13 @@ SfxItemPresentation SvxSizeItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH) + @@ -354,12 +354,12 @@ SfxItemPresentation SvxSizeItem::GetPresentation EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT) + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; //no break necessary default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -587,7 +587,7 @@ SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const -SfxItemPresentation SvxLRSpaceItem::GetPresentation +bool SvxLRSpaceItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -599,7 +599,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { if ( 100 != nPropLeftMargin ) @@ -628,7 +628,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation else rText += GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -669,11 +669,11 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation eCoreUnit, ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)); } - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -957,7 +957,7 @@ SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const -SfxItemPresentation SvxULSpaceItem::GetPresentation +bool SvxULSpaceItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -969,7 +969,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { if ( 100 != nPropUpper ) @@ -987,7 +987,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation } else rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1015,11 +1015,11 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)); } - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1106,7 +1106,7 @@ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxPrintItem::GetPresentation +bool SvxPrintItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1118,7 +1118,7 @@ SfxItemPresentation SvxPrintItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -1128,11 +1128,11 @@ SfxItemPresentation SvxPrintItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_PRINT_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxOpaqueItem --------------------------------------------------- @@ -1161,7 +1161,7 @@ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxOpaqueItem::GetPresentation +bool SvxOpaqueItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1173,7 +1173,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -1183,11 +1183,11 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_OPAQUE_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxProtectItem -------------------------------------------------- @@ -1244,7 +1244,7 @@ SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const -SfxItemPresentation SvxProtectItem::GetPresentation +bool SvxProtectItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1256,7 +1256,7 @@ SfxItemPresentation SvxProtectItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -1276,11 +1276,11 @@ SfxItemPresentation SvxProtectItem::GetPresentation if ( bPos ) nId = RID_SVXITEMS_PROT_POS_TRUE; rText += EE_RESSTR(nId); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1478,7 +1478,7 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const -SfxItemPresentation SvxShadowItem::GetPresentation +bool SvxShadowItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -1490,7 +1490,7 @@ SfxItemPresentation SvxShadowItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { @@ -1505,7 +1505,7 @@ SfxItemPresentation SvxShadowItem::GetPresentation GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + OUString(cpDelim) + EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation); - return ePres; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1523,11 +1523,11 @@ SfxItemPresentation SvxShadowItem::GetPresentation " " + EE_RESSTR(GetMetricId(ePresUnit)) + OUString(cpDelim) + EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -2084,7 +2084,7 @@ SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const -SfxItemPresentation SvxBoxItem::GetPresentation +bool SvxBoxItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -2097,7 +2097,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { @@ -2137,7 +2137,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation GetMetricText( (long)nRightDist, eCoreUnit, ePresUnit, pIntl ); } - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -2218,11 +2218,11 @@ SfxItemPresentation SvxBoxItem::GetPresentation ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)); } - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -2606,7 +2606,7 @@ SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const -SfxItemPresentation SvxBoxInfoItem::GetPresentation +bool SvxBoxInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -2615,7 +2615,7 @@ SfxItemPresentation SvxBoxInfoItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -2952,7 +2952,7 @@ bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const -SfxItemPresentation SvxFmtBreakItem::GetPresentation +bool SvxFmtBreakItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2964,7 +2964,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -2972,7 +2972,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation return ePres; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -3103,7 +3103,7 @@ SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxFmtKeepItem::GetPresentation +bool SvxFmtKeepItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -3115,7 +3115,7 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -3125,11 +3125,11 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_FMTKEEP_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxLineItem ------------------------------------------------------ @@ -3253,7 +3253,7 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId ) -SfxItemPresentation SvxLineItem::GetPresentation +bool SvxLineItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -3266,18 +3266,18 @@ SfxItemPresentation SvxLineItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { if ( pLine ) rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl, (SFX_ITEM_PRESENTATION_COMPLETE == ePres) ); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -3803,7 +3803,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) -SfxItemPresentation SvxBrushItem::GetPresentation +bool SvxBrushItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -3815,7 +3815,7 @@ SfxItemPresentation SvxBrushItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -3834,12 +3834,12 @@ SfxItemPresentation SvxBrushItem::GetPresentation rText = EE_RESSTR(RID_SVXITEMS_GRAPHIC); } - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -4246,28 +4246,28 @@ sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxFrameDirectionItem::GetPresentation( +bool SvxFrameDirectionItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *) const { - SfxItemPresentation eRet = ePres; switch( ePres ) { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); + return false; break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ); + return true; break; default: - eRet = SFX_ITEM_PRESENTATION_NONE; + return false; } - return eRet; } bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal, diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 827edd7bcc86..289d54976c0f 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -50,7 +50,7 @@ SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify, } -SfxItemPresentation SvxHorJustifyItem::GetPresentation +bool SvxHorJustifyItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -61,14 +61,14 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueText( GetValue() ); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -207,7 +207,7 @@ SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify, } -SfxItemPresentation SvxVerJustifyItem::GetPresentation +bool SvxVerJustifyItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -219,14 +219,14 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueText( GetValue() ); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -348,7 +348,7 @@ SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify, } -SfxItemPresentation SvxJustifyMethodItem::GetPresentation +bool SvxJustifyMethodItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -360,14 +360,14 @@ SfxItemPresentation SvxJustifyMethodItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueText( GetValue() ); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index dfe61a8582f8..839430be4313 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -58,7 +58,7 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : -SfxItemPresentation SfxSpellCheckItem::GetPresentation +bool SfxSpellCheckItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit , @@ -71,15 +71,15 @@ SfxItemPresentation SfxSpellCheckItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { - return ePres; + return true; } default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -137,7 +137,7 @@ SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const -SfxItemPresentation SfxHyphenRegionItem::GetPresentation +bool SfxHyphenRegionItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit , @@ -150,7 +150,7 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -159,10 +159,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + "," + EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)); - return ePres; + return true; } default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index bba14684afec..9775a2758b6c 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -223,7 +223,7 @@ SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const -SfxItemPresentation SvxLineSpacingItem::GetPresentation +bool SvxLineSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -236,7 +236,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation #else rText = OUString(); #endif - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -416,7 +416,7 @@ SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const -SfxItemPresentation SvxAdjustItem::GetPresentation +bool SvxAdjustItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -428,14 +428,14 @@ SfxItemPresentation SvxAdjustItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueTextByPos( (sal_uInt16)GetAdjust() ); - return ePres; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -545,7 +545,7 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c -SfxItemPresentation SvxWidowsItem::GetPresentation +bool SvxWidowsItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -580,7 +580,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation } rText = rText.replaceFirst( "%1", OUString::number( GetValue() ) ); - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } // class SvxOrphansItem -------------------------------------------------- @@ -616,7 +616,7 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) -SfxItemPresentation SvxOrphansItem::GetPresentation +bool SvxOrphansItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -651,7 +651,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation } rText = rText.replaceFirst( "%1", OUString::number( GetValue() ) ); - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } // class SvxHyphenZoneItem ----------------------------------------------- @@ -736,7 +736,7 @@ SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const -SfxItemPresentation SvxHyphenZoneItem::GetPresentation +bool SvxHyphenZoneItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -749,7 +749,7 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE; @@ -765,7 +765,7 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation OUString::number( nMinLead ) + cpDelimTmp + OUString::number( nMinTrail ) + cpDelimTmp + OUString::number( nMaxHyphens ); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -786,11 +786,11 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) + cpDelimTmp + EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens)); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1091,7 +1091,7 @@ SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const -SfxItemPresentation SvxTabStopItem::GetPresentation +bool SvxTabStopItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -1121,7 +1121,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation } } } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } @@ -1259,7 +1259,7 @@ SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxFmtSplitItem::GetPresentation +bool SvxFmtSplitItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1271,7 +1271,7 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1284,7 +1284,7 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1325,7 +1325,7 @@ bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 return bRet; } -SfxItemPresentation SvxPageModelItem::GetPresentation +bool SvxPageModelItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1339,22 +1339,22 @@ SfxItemPresentation SvxPageModelItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: if ( bSet ) rText = GetValue(); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: if ( bSet ) { rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue(); } - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1386,7 +1386,7 @@ sal_uInt16 SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxScriptSpaceItem::GetPresentation( +bool SvxScriptSpaceItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const @@ -1402,11 +1402,11 @@ SfxItemPresentation SvxScriptSpaceItem::GetPresentation( rText = EE_RESSTR( !GetValue() ? RID_SVXITEMS_SCRPTSPC_OFF : RID_SVXITEMS_SCRPTSPC_ON ); - return ePres; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1439,7 +1439,7 @@ sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxHangingPunctuationItem::GetPresentation( +bool SvxHangingPunctuationItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const @@ -1455,12 +1455,12 @@ SfxItemPresentation SvxHangingPunctuationItem::GetPresentation( rText = EE_RESSTR( !GetValue() ? RID_SVXITEMS_HNGPNCT_OFF : RID_SVXITEMS_HNGPNCT_ON ); - return ePres; + return true; } default: ;//prevent warning break; } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1492,7 +1492,7 @@ sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxForbiddenRuleItem::GetPresentation( +bool SvxForbiddenRuleItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const @@ -1508,12 +1508,12 @@ SfxItemPresentation SvxForbiddenRuleItem::GetPresentation( rText = EE_RESSTR( !GetValue() ? RID_SVXITEMS_FORBIDDEN_RULE_OFF : RID_SVXITEMS_FORBIDDEN_RULE_ON ); - return ePres; + return true; } default: ;//prevent warning break; } - return SFX_ITEM_PRESENTATION_NONE; + return false; } /************************************************************************* @@ -1549,7 +1549,7 @@ sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxParaVertAlignItem::GetPresentation( +bool SvxParaVertAlignItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const @@ -1572,12 +1572,12 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation( default: nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break; } rText = EE_RESSTR( nTmp ); - return ePres; + return true; } default: ;//prevent warning break; } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal, @@ -1634,7 +1634,7 @@ sal_uInt16 SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxParaGridItem::GetPresentation( +bool SvxParaGridItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const @@ -1651,12 +1651,12 @@ SfxItemPresentation SvxParaGridItem::GetPresentation( EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_ON ) : EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_OFF ); - return ePres; + return true; } default: ;//prevent warning break; } - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 9fd76b0d334e..2a8dea5ec370 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -195,7 +195,7 @@ bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM -SfxItemPresentation SvxFontListItem::GetPresentation +bool SvxFontListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -204,7 +204,7 @@ SfxItemPresentation SvxFontListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxFontItem ----------------------------------------------------- @@ -438,7 +438,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxFontItem::GetPresentation +bool SvxFontItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -450,14 +450,14 @@ SfxItemPresentation SvxFontItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = aFamilyName; - return ePres; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -507,7 +507,7 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxPostureItem::GetPresentation +bool SvxPostureItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -519,14 +519,14 @@ SfxItemPresentation SvxPostureItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueTextByPos( GetValue() ); - return ePres; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -672,7 +672,7 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxWeightItem::GetPresentation +bool SvxWeightItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -684,14 +684,14 @@ SfxItemPresentation SvxWeightItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueTextByPos( GetValue() ); - return ePres; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1034,7 +1034,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) -SfxItemPresentation SvxFontHeightItem::GetPresentation +bool SvxFontHeightItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -1046,7 +1046,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1065,11 +1065,11 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation } else rText = OUString::number( nProp ) + "%"; - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1233,7 +1233,7 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) -SfxItemPresentation SvxFontWidthItem::GetPresentation +bool SvxFontWidthItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -1245,7 +1245,7 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1257,11 +1257,11 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation } else rText = OUString::number( nProp ) + "%"; - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxTextLineItem ------------------------------------------------ @@ -1327,7 +1327,7 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxTextLineItem::GetPresentation +bool SvxTextLineItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1339,16 +1339,16 @@ SfxItemPresentation SvxTextLineItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueTextByPos( GetValue() ); if( !mColor.GetTransparency() ) rText = rText + OUString(cpDelim) + ::GetColorString( mColor ); - return ePres; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1555,7 +1555,7 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxCrossedOutItem::GetPresentation +bool SvxCrossedOutItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1567,14 +1567,14 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueTextByPos( GetValue() ); - return ePres; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -1652,7 +1652,7 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxShadowedItem::GetPresentation +bool SvxShadowedItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1664,7 +1664,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1673,11 +1673,11 @@ SfxItemPresentation SvxShadowedItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_SHADOWED_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxAutoKernItem ------------------------------------------------- @@ -1713,7 +1713,7 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxAutoKernItem::GetPresentation +bool SvxAutoKernItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1725,7 +1725,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1734,11 +1734,11 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_AUTOKERN_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxWordLineModeItem --------------------------------------------- @@ -1775,7 +1775,7 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxWordLineModeItem::GetPresentation +bool SvxWordLineModeItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1787,7 +1787,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1796,11 +1796,11 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_WORDLINE_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxContourItem -------------------------------------------------- @@ -1836,7 +1836,7 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxContourItem::GetPresentation +bool SvxContourItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1848,7 +1848,7 @@ SfxItemPresentation SvxContourItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -1857,11 +1857,11 @@ SfxItemPresentation SvxContourItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_CONTOUR_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxPropSizeItem ------------------------------------------------- @@ -1897,7 +1897,7 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxPropSizeItem::GetPresentation +bool SvxPropSizeItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -1906,7 +1906,7 @@ SfxItemPresentation SvxPropSizeItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxBackgroundColorItem ----------------------------------------- @@ -2053,7 +2053,7 @@ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const -SfxItemPresentation SvxColorItem::GetPresentation +bool SvxColorItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2065,14 +2065,14 @@ SfxItemPresentation SvxColorItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = ::GetColorString( mColor ); - return ePres; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -2132,7 +2132,7 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxCharSetColorItem::GetPresentation +bool SvxCharSetColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -2141,7 +2141,7 @@ SfxItemPresentation SvxCharSetColorItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxKerningItem -------------------------------------------------- @@ -2192,7 +2192,7 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxKerningItem::GetPresentation +bool SvxKerningItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -2204,11 +2204,11 @@ SfxItemPresentation SvxKerningItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) + " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); - return ePres; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: { rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE); @@ -2224,11 +2224,11 @@ SfxItemPresentation SvxKerningItem::GetPresentation rText = rText + GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) + " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT)); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -2291,7 +2291,7 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxCaseMapItem::GetPresentation +bool SvxCaseMapItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2303,14 +2303,14 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueTextByPos( GetValue() ); - return ePres; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -2439,7 +2439,7 @@ sal_uInt16 SvxEscapementItem::GetValueCount() const -SfxItemPresentation SvxEscapementItem::GetPresentation +bool SvxEscapementItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2451,7 +2451,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -2464,11 +2464,11 @@ SfxItemPresentation SvxEscapementItem::GetPresentation else rText = rText + OUString::number( nEsc ) + "%"; } - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -2604,7 +2604,7 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxLanguageItem::GetPresentation +bool SvxLanguageItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2616,16 +2616,16 @@ SfxItemPresentation SvxLanguageItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { rText = SvtLanguageTable::GetLanguageString( (LanguageType)GetValue() ); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxLanguageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -2703,7 +2703,7 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxNoLinebreakItem::GetPresentation +bool SvxNoLinebreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -2712,7 +2712,7 @@ SfxItemPresentation SvxNoLinebreakItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxNoHyphenItem ------------------------------------------------- @@ -2748,7 +2748,7 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxNoHyphenItem::GetPresentation +bool SvxNoHyphenItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -2757,7 +2757,7 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } /* @@ -2789,7 +2789,7 @@ SvxLineColorItem::~SvxLineColorItem() -SfxItemPresentation SvxLineColorItem::GetPresentation +bool SvxLineColorItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -2836,7 +2836,7 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const -SfxItemPresentation SvxBlinkItem::GetPresentation +bool SvxBlinkItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2848,7 +2848,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -2857,11 +2857,11 @@ SfxItemPresentation SvxBlinkItem::GetPresentation if ( GetValue() ) nId = RID_SVXITEMS_BLINK_TRUE; rText = EE_RESSTR(nId); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // class SvxEmphaisMarkItem --------------------------------------------------- @@ -2899,7 +2899,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const -SfxItemPresentation SvxEmphasisMarkItem::GetPresentation +bool SvxEmphasisMarkItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2912,7 +2912,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -2926,11 +2926,11 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation : 0; if( nId ) rText += EE_RESSTR( nId ); - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -3101,7 +3101,7 @@ bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal, return bRet; } -SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres, +bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { @@ -3123,11 +3123,11 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres, if( GetEndBracket() ) rText += OUString(GetEndBracket()); } - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -3192,7 +3192,7 @@ sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxCharRotateItem::GetPresentation( +bool SvxCharRotateItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const @@ -3215,11 +3215,11 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation( if( IsFitToLine() ) rText += EE_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE ); } - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal, @@ -3335,7 +3335,7 @@ sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -SfxItemPresentation SvxCharScaleWidthItem::GetPresentation( +bool SvxCharScaleWidthItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const @@ -3356,11 +3356,11 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation( rText = rText.replaceFirst( "$(ARG1)", OUString::number( GetValue() )); } - return ePres; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) @@ -3432,7 +3432,7 @@ sal_uInt16 SvxCharReliefItem::GetValueCount() const return RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE; } -SfxItemPresentation SvxCharReliefItem::GetPresentation +bool SvxCharReliefItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -3455,7 +3455,7 @@ SfxItemPresentation SvxCharReliefItem::GetPresentation default: eRet = SFX_ITEM_PRESENTATION_NONE; } - return eRet; + return eRet != SFX_ITEM_PRESENTATION_NONE; } bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal, diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 1a715bed52e8..9000ecbed2d1 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -65,28 +65,28 @@ sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const return USHRT_MAX; } -SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePres, +bool SvxWritingModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper * ) const { - SfxItemPresentation eRet = ePres; switch( ePres ) { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); + return false; break; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = EE_RESSTR(RID_SVXITEMS_FRMDIR_BEGIN + GetValue()); + return true; break; default: - eRet = SFX_ITEM_PRESENTATION_NONE; + return false; } - return eRet; } bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 38d24e5c5752..4d237d15aa48 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -63,14 +63,14 @@ int SvXMLAttrContainerItem::Compare( const SfxPoolItem &/*rWith*/ ) const return 0; } -SfxItemPresentation SvXMLAttrContainerItem::GetPresentation( +bool SvXMLAttrContainerItem::GetPresentation( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString & /*rText*/, const IntlWrapper * /*pIntlWrapper*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index b8e9dcf7f225..e3300b31d4c6 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -73,7 +73,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, OUString& rText, diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 038822ce9801..0711e23f9b4e 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -59,7 +59,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 2c4f0b4426d2..2b2f95669f50 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index be813385c542..c4f02cfa6a04 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 37c2d8f4aab0..2d268b6d54c6 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -74,7 +74,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -181,7 +181,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 12cb66657cea..ae4cb9a13667 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -80,7 +80,7 @@ public: public: - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 42cbf2ce2eda..1dbb47388ed7 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -117,7 +117,7 @@ public: virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 6f49c5e58677..16a563637188 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -37,7 +37,7 @@ public: SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 459ea435f111..a21b341f138f 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -47,7 +47,7 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 8dad9e7f0c98..574d2fc30183 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -48,7 +48,7 @@ public: virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 74bb3f438dde..46bcc65f46c2 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -45,7 +45,7 @@ public: virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 54ee7f4e4f52..b64bf3b4fcb5 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 59bc82f14600..00ba3ad0bc2c 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 7ec7b69e77f4..31a7af48dc36 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -54,7 +54,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 072a0ace1a59..fad8a116c684 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -41,7 +41,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 8019292c90a5..8e64ba9feff1 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -40,7 +40,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 3c62e8635ffa..44a3cbf27ff7 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 829ddcbeb9be..59715b227113 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -53,7 +53,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 1655a982e379..3ff3e64bd532 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -52,7 +52,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index c1f90c135d05..06319e007a71 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -53,7 +53,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 0d2f27571c46..3b9fbb2bd141 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -61,7 +61,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 56262a7f7919..19a14937b77d 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -41,7 +41,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 84da2ca376e6..65a1bf12cc81 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index e8f962928d1e..3c2e906f0a19 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -47,7 +47,7 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index b4d16475e05b..34f281ecd51f 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -46,7 +46,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index 7358d550e74a..d79cdb8fe4e2 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -40,7 +40,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 771880a625d7..7cac264d750a 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -53,7 +53,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 3a002b97146a..6e09634ab4ab 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -36,7 +36,7 @@ public: const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -69,7 +69,7 @@ public: const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -98,7 +98,7 @@ public: const SvxCellJustifyMethod eMethod, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 7cfc750044b8..1092311baeda 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index f4d52bad4e5d..d1f596d72c57 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -48,7 +48,7 @@ public: virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; virtual bool HasMetrics() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 60d740230645..f8a5b03884e5 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index 35488265c1b1..6720424bd83f 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -36,7 +36,7 @@ public: SvxLineColorItem( const SvxLineColorItem& rCopy ); virtual ~SvxLineColorItem(); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index ce2819c4edb7..9c250273ddca 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -49,7 +49,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 6ccce38c0efe..c5eb6eccc1fa 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -78,7 +78,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index e866c72a411d..9bb1d8021209 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -57,7 +57,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index eda9a193304d..afd0305212c5 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 704b392930ee..41ea3c9214a8 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 5ef06a9398b5..dccf910ee705 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 077f9cc3e270..f0fd65239560 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -42,7 +42,7 @@ public: sal_uInt16 nWhich ); SfxSpellCheckItem( const SfxSpellCheckItem& rItem ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -74,7 +74,7 @@ public: SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index 99bd179898f2..ff523a3134a3 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 62dfd68fdd64..982cad6281b1 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -45,7 +45,7 @@ public: virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index 1d3acfe5e886..b3c48b435870 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index 05ffd0e1c6ea..ae898319b4ac 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 1a9eaf704dbb..02db19da70aa 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 3937371b5ce2..00cbbf4c5c74 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SwEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index b80318bec8a3..33ad3baebe02 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 46b9e37d9652..9c05284d914a 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -47,7 +47,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 2abe4b506c08..ca25dc871a9c 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -42,7 +42,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 8a3f503ff5e9..b159ffb6d0dc 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -42,7 +42,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 36c589a7cbd1..43ec3bc7210e 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -56,7 +56,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 3bfd6c2d15f6..54b88ae2e293 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 3f605af62cce..d156ebf7b753 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 35b728bb1bd9..f84ce3b348bc 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index a02983d41dbb..2d7384c696b4 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -150,7 +150,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 9c21c8c04355..ddd87a8ba254 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 4130333a4a42..e966d2bdb308 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -40,7 +40,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index de30339b1c2e..c61cb743eeb6 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -52,7 +52,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 17435f3770c9..7ecca5707252 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index c60bac0b40fb..b6d3bffce230 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 9435a18acf65..0118f0d41ef0 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -42,7 +42,7 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 4e4a6814cc4d..1ebc611aa0bb 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 3899784f7b16..25df0a420cdc 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -44,7 +44,7 @@ public: using SfxPoolItem::Compare; virtual int Compare( const SfxPoolItem &rWith ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 15e230d69131..371c716c0fca 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -79,7 +79,7 @@ public: SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index b312606d1ff2..08e3a407321a 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -240,7 +240,7 @@ public: virtual bool operator ==( const SfxPoolItem& ) const SAL_OVERRIDE; SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 2a8a32d441a2..7b7de9ac8d9c 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -37,7 +37,7 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 0fe12969b124..658aa94099a7 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -45,7 +45,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) @@ -104,7 +104,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) @@ -163,7 +163,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) @@ -222,7 +222,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index b8315ab51994..abb900003f54 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -52,7 +52,7 @@ public: using SfxPoolItem::Compare; virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 1cdc6d72b1b9..0897ab5d43d1 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -51,7 +51,7 @@ public: virtual int Compare(SfxPoolItem const & rWith, IntlWrapper const & rIntlWrapper) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 328216bfa05e..e8c65904660b 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -91,7 +91,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 24e38627cce4..cabfd16f6013 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -44,7 +44,7 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index c49ead68e29f..dbba22528343 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -29,7 +29,7 @@ public: virtual int Compare( const SfxPoolItem& r ) const SAL_OVERRIDE; virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const SAL_OVERRIDE; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 262915df4ba5..bea485b46c8b 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -62,7 +62,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 5b6a14dbe139..8f83f4f981c2 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -142,8 +142,10 @@ public: @param[out] rText string representation of 'rItem' + + @return true if it has a valid string representation */ - virtual SfxItemPresentation GetPresentation( const SfxPoolItem& rItem, + virtual bool GetPresentation( const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper = 0 ) const; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index c0a4dda44e2f..a88092f50c7f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -132,7 +132,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index f19003e81bc9..0aaf16d8a9e1 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -184,7 +184,8 @@ public: virtual int Compare( const SfxPoolItem &rWith ) const; virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, + /** @return true if it has a valid string representation */ + virtual bool GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, @@ -278,7 +279,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -306,7 +307,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 911a067fb3b4..6ec1716b3e92 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -36,7 +36,7 @@ public: SfxPointItem( const SfxPointItem& ); virtual ~SfxPointItem() {} - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 129f17f7667f..dd6826ecf841 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -37,7 +37,7 @@ public: SfxRectangleItem( const SfxRectangleItem& ); virtual ~SfxRectangleItem() {} - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 7f5b17c618c1..ac5bd12904aa 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -38,7 +38,7 @@ public: SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo ); SfxRangeItem( const SfxRangeItem& rItem ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -67,7 +67,7 @@ public: SfxUShortRangesItem( const SfxUShortRangesItem& rItem ); virtual ~SfxUShortRangesItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 80b81e44380b..f63d8b35a804 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -54,7 +54,7 @@ public: void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 3a681afc546c..a6edfcbe6366 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -85,7 +85,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool operator == ( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 690e3ee82899..e807a553baf8 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -37,7 +37,7 @@ public: SfxSizeItem( const SfxSizeItem& ); virtual ~SfxSizeItem() {} - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 3a8406279bc8..9d0599989ee7 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -51,7 +51,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index fd532b6e32a7..8ccf990d02be 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -42,7 +42,7 @@ public: sal_Int32 nRotation, bool bStacked, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -85,7 +85,7 @@ public: const sal_uInt16 nId ); SvxMarginItem( const SvxMarginItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 750985b35e1b..840df880c710 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -313,7 +313,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 11a3d2ca548e..d2eaafa2f650 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -40,7 +40,7 @@ public: sal_uInt16 nWhich ); SvxColorListItem( const SvxColorListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -70,7 +70,7 @@ public: sal_uInt16 nWhich ); SvxGradientListItem( const SvxGradientListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -100,7 +100,7 @@ public: sal_uInt16 nWhich ); SvxHatchListItem( const SvxHatchListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -131,7 +131,7 @@ public: sal_uInt16 nWhich ); SvxBitmapListItem( const SvxBitmapListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -162,7 +162,7 @@ public: sal_uInt16 nWhich ); SvxDashListItem( const SvxDashListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -190,7 +190,7 @@ public: sal_uInt16 nWhich ); SvxLineEndListItem( const SvxLineEndListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 7564bf2731ff..4fd7c8904edf 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -40,7 +40,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 9a9a30f36583..cea29a0c4a8d 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -54,7 +54,7 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 0d15690f0ee9..86e5e1d5ee96 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -85,7 +85,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 7600c750a18a..87d936b7f03b 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -75,7 +75,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 8328b7cbe380..45cf1204e25d 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -38,7 +38,7 @@ public: SvxPostItAuthorItem( sal_uInt16 nWhich ); SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 nWhich ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -69,7 +69,7 @@ public: SvxPostItDateItem( sal_uInt16 nWhich ); SvxPostItDateItem( const OUString& rDate, sal_uInt16 nWhich ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -101,7 +101,7 @@ public: SvxPostItTextItem( const OUString& rText, sal_uInt16 nWhich ); // "pure virtual methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 938a9f2e3288..fda9314581b3 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -48,7 +48,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index e856cf030d20..9671f858a1b7 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -36,7 +36,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -70,7 +70,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -103,7 +103,7 @@ protected: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -163,7 +163,7 @@ protected: virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -220,7 +220,7 @@ protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index f333a1c9218a..ccb46b6cbf32 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -35,7 +35,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index a1b8be1d10b1..733b4e7f4097 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -49,7 +49,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem SVX_DLLPUBLIC virtual ~SdrCustomShapeAdjustmentItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const SAL_OVERRIDE; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 101b461380ab..2144b8622c91 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -79,7 +79,7 @@ private: virtual ~SdrCustomShapeGeometryItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 52fc3396c1d7..ae6631cfd4c1 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -44,7 +44,7 @@ public: GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 843c279f7add..ece56a64fff6 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -39,7 +39,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 0fe0c83e9110..1129f0ecc33f 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -39,7 +39,7 @@ public: virtual OUString GetValueTextByVal(bool bVal) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index d90e76a67552..d952ee80fc2e 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -38,7 +38,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -56,7 +56,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 7ae67f4481bb..5d0067ef3f7a 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -33,7 +33,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 44ac96f93857..82e9b36ff1b8 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -47,7 +47,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index c1e452e8ef3b..13bd2a9e9731 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -48,7 +48,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -75,7 +75,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 5ae81af7b840..fc0730fb778b 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -89,7 +89,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index be3cb1cbd457..bf039bb6633a 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -30,7 +30,7 @@ public: SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 8d2b7448b68b..239b5f822272 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -29,7 +29,7 @@ public: SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false ); SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ); - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, + SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 4767e6d8d32a..0faa28edcdcd 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -56,7 +56,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual bool HasBoolValue() const SAL_OVERRIDE; virtual bool GetBoolValue() const SAL_OVERRIDE; virtual void SetBoolValue(bool bVal) SAL_OVERRIDE; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 35ad48bd9f12..2a3824bb296f 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -37,7 +37,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; virtual OUString GetValueTextByVal(bool bVal) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index e5c91ba1b224..5b86389df961 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -39,7 +39,7 @@ protected: public: virtual SfxItemPool* Clone() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(const SfxPoolItem& rItem, + virtual bool GetPresentation(const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index df786d2f407e..78b395fe9ec9 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -42,7 +42,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 36cce7364a41..bc3c4af67ff7 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -38,7 +38,7 @@ public: virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 5ad2b341165b..adbe9dad26d4 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index b1f587d00adf..570ebd02aa8c 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -34,7 +34,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 9133d7879ac1..e45e14d974cf 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -43,7 +43,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -63,7 +63,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 69bb5d92527f..57c8c1d79461 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -40,7 +40,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 65a7671c7846..29fdf624dd81 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -27,7 +27,7 @@ public: SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE; }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 686d3b6361ef..e6a83b8febe4 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -58,7 +58,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 1c28fc15824d..68a101565ed9 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index b8ccfb121589..f1b9ca3936dd 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -41,7 +41,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 3d6b319a91f2..1629fd12f36a 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -34,7 +34,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 27b2f98f87a1..bbf4409c5fcf 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 1f0a4cd27607..dfdf5f488213 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -54,7 +54,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index e513757aaca8..7cb12485ba2b 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -33,7 +33,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index dcc239797ee3..09cfc153d28d 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -49,7 +49,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 7d0e9e72c7ac..b4a79f5f81f2 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -33,7 +33,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index f229042894ad..b33fad67f944 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -49,7 +49,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 27a9455723e8..d7b39d074f49 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -45,7 +45,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 1a715896edc1..dfff78d74236 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -47,7 +47,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const SAL_OVERRIDE; bool IsEnabled() const { return bEnabled; } diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 9618bb7ae871..bfba5e9ca551 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -51,7 +51,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index a37ac54b0883..95e43b18f084 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index e1434d12cdde..cb556730ea08 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -37,7 +37,7 @@ public: XFillTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index b1312aff2883..d289696c8aa9 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -37,7 +37,7 @@ public: XGradientStepCountItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 6db9aa2fb39a..f0cb2aa04fe7 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -39,7 +39,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 58ce016109e0..10666395668e 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -42,7 +42,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 2367a0ea9887..6252628ee6e3 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -42,7 +42,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 0aef9bc127a8..f56e7c424a9d 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -41,7 +41,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 9c31904671e3..dcea8cbc375f 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -50,7 +50,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 767015bfa283..408aaf828b9f 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 175f02380b82..4149c19cdad8 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -49,7 +49,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 8610a2560c56..07fffda77f02 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -41,7 +41,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index fa1514736424..2fb961a5285f 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 1d3b525e993c..1b52c060ab42 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -49,7 +49,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 9214de6da034..55bc67d554e0 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -40,7 +40,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index 7b2f1bdc289b..eb8e85c98c06 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -37,7 +37,7 @@ public: XLineTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index ef67521ed96b..26a47836d516 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 37f4f37301bf..de10534fa8c8 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index df7ed0106b6c..ab083065bc4e 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -111,7 +111,7 @@ public: virtual ~ScProtectionAttr(); virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -164,7 +164,7 @@ public: // "pure virtual methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -219,7 +219,7 @@ public: // "pure virtual Methoden" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -290,7 +290,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, @@ -350,7 +350,7 @@ public: { mnWidth = nWidth; mnHeight = nHeight; } inline void SetInvalid() { mnWidth = mnHeight = 0; } - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit, SfxMapUnit, OUString& rText, diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index ceff3d1210f3..db65148a391b 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -58,7 +58,7 @@ public: void StyleDeleted( ScStyleSheet* pStyle ); // delete templates(?) in organizer void CellStyleCreated( const OUString& rName ); - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 5ff9f05736f8..f0edf65caa28 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -288,7 +288,7 @@ OUString ScProtectionAttr::GetValueText() const return aValue; } -SfxItemPresentation ScProtectionAttr::GetPresentation +bool ScProtectionAttr::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /* eCoreMetric */, @@ -332,7 +332,7 @@ SfxItemPresentation ScProtectionAttr::GetPresentation ePres = SFX_ITEM_PRESENTATION_NONE; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const @@ -403,7 +403,7 @@ SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const return new ScRangeItem( *this ); } -SfxItemPresentation ScRangeItem::GetPresentation +bool ScRangeItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, @@ -433,7 +433,7 @@ SfxItemPresentation ScRangeItem::GetPresentation } } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } // ScTableListItem - List from Tables (-numbers) @@ -503,7 +503,7 @@ SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const return new ScTableListItem( *this ); } -SfxItemPresentation ScTableListItem::GetPresentation +bool ScTableListItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, @@ -530,11 +530,11 @@ SfxItemPresentation ScTableListItem::GetPresentation } rText += ")"; } - return ePres; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; default: { @@ -542,7 +542,7 @@ SfxItemPresentation ScTableListItem::GetPresentation } } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // ScPageHFItem - Dates from the Head and Foot lines @@ -842,7 +842,7 @@ ScViewObjectModeItem::~ScViewObjectModeItem() { } -SfxItemPresentation ScViewObjectModeItem::GetPresentation +bool ScViewObjectModeItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, @@ -879,15 +879,14 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation case SFX_ITEM_PRESENTATION_NAMELESS: rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue()); + return true; break; - default: - { + default: break; // added to avoid warnings - } } - return ePres; + return false; } OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const @@ -1022,12 +1021,12 @@ void lclAppendScalePageCount( OUString& rText, sal_uInt16 nPages ) } } // namespace -SfxItemPresentation ScPageScaleToItem::GetPresentation( +bool ScPageScaleToItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* ) const { rText = OUString(); if( !IsValid() || (ePres == SFX_ITEM_PRESENTATION_NONE) ) - return SFX_ITEM_PRESENTATION_NONE; + return false; OUString aName( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETO ) ); OUString aValue( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_WIDTH ) ); @@ -1038,21 +1037,23 @@ SfxItemPresentation ScPageScaleToItem::GetPresentation( switch( ePres ) { case SFX_ITEM_PRESENTATION_NONE: + return false; break; case SFX_ITEM_PRESENTATION_NAMELESS: rText = aValue; + return true; break; case SFX_ITEM_PRESENTATION_COMPLETE: rText = aName + " (" + aValue + ")"; + return true; break; default: OSL_FAIL( "ScPageScaleToItem::GetPresentation - unknown presentation mode" ); - ePres = SFX_ITEM_PRESENTATION_NONE; } - return ePres; + return false; } bool ScPageScaleToItem::QueryValue( uno::Any& rAny, sal_uInt8 nMemberId ) const diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 33297310a022..ee6d55788317 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -690,10 +690,9 @@ SfxItemPool* ScDocumentPool::Clone() const return new SfxItemPool (*this, true); } -static SfxItemPresentation lcl_HFPresentation +static bool lcl_HFPresentation ( const SfxPoolItem& rItem, - SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString& rText, @@ -706,7 +705,7 @@ static SfxItemPresentation lcl_HFPresentation if ( SFX_ITEM_SET == rSet.GetItemState(ATTR_PAGE_ON,false,&pItem) ) { if( false == ((const SfxBoolItem*)pItem)->GetValue() ) - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxItemIter aIter( rSet ); @@ -773,7 +772,7 @@ static SfxItemPresentation lcl_HFPresentation default: if ( !pIntl ) pIntl = ScGlobal::GetScIntlWrapper(); - pItem->GetPresentation( ePresentation, eCoreMetric, ePresentationMetric, aText, pIntl ); + pItem->GetPresentation( SFX_ITEM_PRESENTATION_COMPLETE, eCoreMetric, ePresentationMetric, aText, pIntl ); } @@ -788,10 +787,10 @@ static SfxItemPresentation lcl_HFPresentation rText = comphelper::string::stripEnd(rText, ' '); rText = comphelper::string::stripEnd(rText, '+'); rText = comphelper::string::stripEnd(rText, ' '); - return ePresentation; + return true; } -SfxItemPresentation ScDocumentPool::GetPresentation( +bool ScDocumentPool::GetPresentation( const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, @@ -802,7 +801,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( OUString aStrNo ( ScGlobal::GetRscString(STR_NO) ); OUString aStrSep(": "); - SfxItemPresentation ePresentationRet = SFX_ITEM_PRESENTATION_COMPLETE; + bool ePresentationRet = true; switch( nW ) { case ATTR_PAGE_TOPDOWN: @@ -850,7 +849,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( } else { - ePresentationRet = SFX_ITEM_PRESENTATION_NONE; + ePresentationRet = false; } } break; @@ -866,7 +865,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( } else { - ePresentationRet = SFX_ITEM_PRESENTATION_NONE; + ePresentationRet = false; } } break; @@ -883,7 +882,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( } else { - ePresentationRet = SFX_ITEM_PRESENTATION_NONE; + ePresentationRet = false; } } break; @@ -892,7 +891,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( { OUString aBuffer; - if( lcl_HFPresentation( rItem, SFX_ITEM_PRESENTATION_COMPLETE, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) + if( lcl_HFPresentation( rItem, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) ) { rText = ScGlobal::GetRscString(STR_HEADER) + " ( " + aBuffer + " ) "; } @@ -903,7 +902,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation( { OUString aBuffer; - if( lcl_HFPresentation( rItem, SFX_ITEM_PRESENTATION_COMPLETE, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) + if( lcl_HFPresentation( rItem, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) ) { rText = ScGlobal::GetRscString(STR_FOOTER) + " ( " + aBuffer + " ) "; } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 79901d9ddd97..9c43b48a5d46 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -98,14 +98,14 @@ bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const } -SfxItemPresentation SfxEventNamesItem::GetPresentation( SfxItemPresentation, +bool SfxEventNamesItem::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString &rText, const IntlWrapper* ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 6b9e23663f67..66c0329faed1 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -198,7 +198,7 @@ SfxPoolItem* SfxFrameDescriptorItem::Clone( SfxItemPool* ) const -SfxItemPresentation SfxFrameDescriptorItem::GetPresentation +bool SfxFrameDescriptorItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -208,7 +208,7 @@ SfxItemPresentation SfxFrameDescriptorItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 49250a70ac5c..536d2d717220 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -37,13 +37,12 @@ bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const } // virtual -SfxItemPresentation -SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, +bool SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number( GetEnumValue() ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual @@ -173,13 +172,13 @@ int SfxBoolItem::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation SfxBoolItem::GetPresentation(SfxItemPresentation, +bool SfxBoolItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = GetValueTextByVal(m_bValue); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index f90acae6d388..e1291e26480b 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -43,13 +43,13 @@ int CntByteItem::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation, +bool CntByteItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number( m_nValue ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual @@ -146,14 +146,14 @@ int CntUInt16Item::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation, +bool CntUInt16Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number( m_nValue ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual @@ -248,13 +248,13 @@ int CntInt32Item::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation, +bool CntInt32Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number( m_nValue ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual @@ -350,14 +350,14 @@ int CntUInt32Item::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation, +bool CntUInt32Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number(m_nValue); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index d0a2734d3204..cbc8d28bf038 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -130,7 +130,7 @@ int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rI return rIntlWrapper.getCollator()->compareString( aOwnText, aWithText ); } -SfxItemPresentation CntContentTypeItem::GetPresentation( +bool CntContentTypeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -149,7 +149,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation( if (!_aPresentation.isEmpty()) { rText = _aPresentation; - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } else return CntUnencodedStringItem::GetPresentation(ePres, eCoreMetric, diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index a2ff0f6b4431..e03504175ff3 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -58,13 +58,12 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith, } // virtual -SfxItemPresentation -CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, +bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = m_aValue; - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } // virtual diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index c0c85af1772f..b7ac57498db2 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -50,7 +50,7 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const -SfxItemPresentation SfxFlagItem::GetPresentation +bool SfxFlagItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -62,7 +62,7 @@ SfxItemPresentation SfxFlagItem::GetPresentation rText = OUString(); for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag ) rText += GetFlag(nFlag) ? OUString("true") : OUString("false"); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index c407fbeb763a..dca26fab9860 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -51,12 +51,12 @@ int SfxInt64Item::Compare( const SfxPoolItem& r, const IntlWrapper& /*rIntlWrapp return Compare(r); } -SfxItemPresentation SfxInt64Item::GetPresentation( +bool SfxInt64Item::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* /*pIntlWrapper*/ ) const { rText = OUString::number(mnValue); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } bool SfxInt64Item::QueryValue( diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 3fa147c6a890..681a32373a0b 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -69,13 +69,13 @@ int SfxInt16Item::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation, +bool SfxInt16Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = OUString::number(m_nValue); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 473652bae51e..92cfb622efea 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -474,7 +474,7 @@ const OUString& SfxItemPool::GetName() const -SfxItemPresentation SfxItemPool::GetPresentation +bool SfxItemPool::GetPresentation ( const SfxPoolItem& rItem, SfxMapUnit eMetric, diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index ecdfa9fa5159..3c0ff239275d 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -205,7 +205,7 @@ SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const } -SfxItemPresentation SvxMacroItem::GetPresentation +bool SvxMacroItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -229,7 +229,7 @@ SfxItemPresentation SvxMacroItem::GetPresentation } */ rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 6445721cd141..f9d76e184ca6 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -199,7 +199,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const * pSvxBorderItem->GetPresentation( SFX_PRESENTATION_COMPLETE, ... ) * "1cm top border, 2cm left border, 0.2cm bottom border, ..." */ -SfxItemPresentation SfxPoolItem::GetPresentation +bool SfxPoolItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, // IN: how we should format SfxMapUnit /*eCoreMetric*/, // IN: current metric of the SfxPoolItems @@ -208,7 +208,7 @@ SfxItemPresentation SfxPoolItem::GetPresentation const IntlWrapper * ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } // SfxVoidItem ------------------------------------------------------------ @@ -235,7 +235,7 @@ rCmp } -SfxItemPresentation SfxVoidItem::GetPresentation +bool SfxVoidItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -245,7 +245,7 @@ SfxItemPresentation SfxVoidItem::GetPresentation ) const { rText = "Void"; - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index c9c36e26a51e..87940444d863 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -55,7 +55,7 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : -SfxItemPresentation SfxPointItem::GetPresentation +bool SfxPointItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -65,7 +65,7 @@ SfxItemPresentation SfxPointItem::GetPresentation ) const { rText = OUString::number(aVal.X()) + ", " + OUString::number(aVal.Y()) + ", "; - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 2b43a61738d3..0441fd907608 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -52,7 +52,7 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : -SfxItemPresentation SfxRectangleItem::GetPresentation +bool SfxRectangleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -65,7 +65,7 @@ SfxItemPresentation SfxRectangleItem::GetPresentation OUString::number(aVal.Left()) + ", " + OUString::number(aVal.Bottom()) + ", " + OUString::number(aVal.Right()); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index a3d9a680e859..cfea5b9f9349 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -58,7 +58,7 @@ SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) : -SfxItemPresentation SfxRangeItem::GetPresentation +bool SfxRangeItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -68,7 +68,7 @@ SfxItemPresentation SfxRangeItem::GetPresentation ) const { rText = OUString::number(nFrom) + ":" + OUString::number(nTo); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } @@ -159,14 +159,14 @@ bool SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const } -SfxItemPresentation SfxUShortRangesItem::GetPresentation( SfxItemPresentation /*ePres*/, +bool SfxUShortRangesItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString & /*rText*/, const IntlWrapper * ) const { // not implemented - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index b91b42808df8..206a2e6ce426 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -62,7 +62,7 @@ bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const -SfxItemPresentation SfxSetItem::GetPresentation +bool SfxSetItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -71,7 +71,7 @@ SfxItemPresentation SfxSetItem::GetPresentation const IntlWrapper * ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 8fc3c5d10e34..e15106367511 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -138,7 +138,7 @@ bool SfxStringListItem::operator==( const SfxPoolItem& rItem ) const } -SfxItemPresentation SfxStringListItem::GetPresentation +bool SfxStringListItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -148,7 +148,7 @@ SfxItemPresentation SfxStringListItem::GetPresentation ) const { rText = "(List)"; - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index dbaf87fcb5af..bcd8266fcf79 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -262,7 +262,7 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const -SfxItemPresentation SvxSearchItem::GetPresentation +bool SvxSearchItem::GetPresentation ( SfxItemPresentation , SfxMapUnit , @@ -271,7 +271,7 @@ SfxItemPresentation SvxSearchItem::GetPresentation const IntlWrapper * ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } void SvxSearchItem::Notify( const Sequence< OUString > & ) diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 1b0203cf02d6..fa25151339e4 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -52,7 +52,7 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) : -SfxItemPresentation SfxSizeItem::GetPresentation +bool SfxSizeItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, @@ -62,7 +62,7 @@ SfxItemPresentation SfxSizeItem::GetPresentation ) const { rText = OUString::number(aVal.Width()) + ", " + OUString::number(aVal.Height()) + ", "; - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index f1723ab86698..322c178ffa83 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -48,13 +48,13 @@ int SfxVisibilityItem::Compare(const SfxPoolItem & rWith) const } // virtual -SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation, +bool SfxVisibilityItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const { rText = GetValueTextByVal(m_nValue.bVisible); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index a6576c0f250e..f215264d3bd2 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -41,7 +41,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index 9af73fe91ae2..ff4f4593c009 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -41,7 +41,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 67bb8b7d56c0..7b8d804a65e4 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -103,7 +103,7 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const nFldSnapY == rItem.nFldSnapY ); } -SfxItemPresentation SvxGridItem::GetPresentation +bool SvxGridItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -115,13 +115,13 @@ SfxItemPresentation SvxGridItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = "SvxGridItem"; return ePres; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 4983389f86dd..ce98f9c82038 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -119,14 +119,14 @@ bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u return false; } -SfxItemPresentation SvxLongLRSpaceItem::GetPresentation( +bool SvxLongLRSpaceItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const @@ -252,14 +252,14 @@ bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u return false; } -SfxItemPresentation SvxLongULSpaceItem::GetPresentation( +bool SvxLongULSpaceItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const @@ -379,14 +379,14 @@ OUString SvxPagePosSizeItem::GetValueText() const return OUString(); } -SfxItemPresentation SvxPagePosSizeItem::GetPresentation( +bool SvxPagePosSizeItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SvxPagePosSizeItem::Clone(SfxItemPool *) const @@ -475,14 +475,14 @@ OUString SvxColumnItem::GetValueText() const return OUString(); } -SfxItemPresentation SvxColumnItem::GetPresentation( +bool SvxColumnItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const @@ -723,14 +723,14 @@ OUString SvxObjectItem::GetValueText() const return OUString(); } -SfxItemPresentation SvxObjectItem::GetPresentation( +bool SvxObjectItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& /*rText*/, const IntlWrapper* /*pWrapper*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 2cdc3ca31635..5f534a31c43d 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -60,7 +60,7 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons -SfxItemPresentation SvxOrientationItem::GetPresentation +bool SvxOrientationItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -71,14 +71,14 @@ SfxItemPresentation SvxOrientationItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetValueText( GetValue() ); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -228,7 +228,7 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : -SfxItemPresentation SvxMarginItem::GetPresentation +bool SvxMarginItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -242,7 +242,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + @@ -252,7 +252,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + cpDelimTmp + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -271,11 +271,11 @@ SfxItemPresentation SvxMarginItem::GetPresentation SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) + GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) + " " + EE_RESSTR(GetMetricId(ePresUnit)); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } default: ; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index f975bd9bf02d..128df692105a 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -246,7 +246,7 @@ OUString SvxDoubleItem::GetValueText() const -SfxItemPresentation SvxDoubleItem::GetPresentation +bool SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString& rText, const IntlWrapper * pIntlWrapper) const @@ -259,7 +259,7 @@ SfxItemPresentation SvxDoubleItem::GetPresentation } else rText = GetValueText(); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 16a57671eba3..b5bc7a9d56fb 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -239,7 +239,7 @@ bool SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const return bRet; } -SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation( +bool SdrCustomShapeGeometryItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { @@ -247,8 +247,11 @@ SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation( if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE ) { rText = " " + rText; + return true; } - return ePresentation; + else if ( ePresentation == SFX_ITEM_PRESENTATION_NAMELESS ) + return true; + return false; } SfxPoolItem* SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 91c2282343c7..93a981918639 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -54,7 +54,7 @@ SvxColorListItem::SvxColorListItem( const SvxColorListItem& rItem ) : { } -SfxItemPresentation SvxColorListItem::GetPresentation +bool SvxColorListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -63,7 +63,7 @@ SfxItemPresentation SvxColorListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxColorListItem::operator==( const SfxPoolItem& rItem ) const @@ -123,7 +123,7 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) : -SfxItemPresentation SvxGradientListItem::GetPresentation +bool SvxGradientListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -132,7 +132,7 @@ SfxItemPresentation SvxGradientListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -177,7 +177,7 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) : -SfxItemPresentation SvxHatchListItem::GetPresentation +bool SvxHatchListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -186,7 +186,7 @@ SfxItemPresentation SvxHatchListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -227,7 +227,7 @@ SvxBitmapListItem::SvxBitmapListItem( const SvxBitmapListItem& rItem ) : { } -SfxItemPresentation SvxBitmapListItem::GetPresentation +bool SvxBitmapListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -236,7 +236,7 @@ SfxItemPresentation SvxBitmapListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const @@ -275,7 +275,7 @@ SvxDashListItem::SvxDashListItem( const SvxDashListItem& rItem ) : { } -SfxItemPresentation SvxDashListItem::GetPresentation +bool SvxDashListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -284,7 +284,7 @@ SfxItemPresentation SvxDashListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxDashListItem::operator==( const SfxPoolItem& rItem ) const @@ -322,7 +322,7 @@ SvxLineEndListItem::SvxLineEndListItem( const SvxLineEndListItem& rItem ) : { } -SfxItemPresentation SvxLineEndListItem::GetPresentation +bool SvxLineEndListItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -331,7 +331,7 @@ SfxItemPresentation SvxLineEndListItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 748221048dca..3158b83853b1 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -128,7 +128,7 @@ bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -SfxItemPresentation SvxGrfCrop::GetPresentation( +bool SvxGrfCrop::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* pIntl ) const { @@ -136,21 +136,19 @@ SfxItemPresentation SvxGrfCrop::GetPresentation( switch( ePres ) { case SFX_ITEM_PRESENTATION_NAMELESS: + return true; case SFX_ITEM_PRESENTATION_COMPLETE: - if( SFX_ITEM_PRESENTATION_COMPLETE == ePres ) - { - rText = "L: " + OUString(::GetMetricText( GetLeft(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + - " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + - " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + - " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )); - } + rText = "L: " + OUString(::GetMetricText( GetLeft(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + + " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + + " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) + + " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )); + return true; break; default: - ePres = SFX_ITEM_PRESENTATION_NONE; + return false; break; } - return ePres; } diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index cbceee89cd80..6aabe79d4063 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -117,7 +117,7 @@ SvxNumberInfoItem::~SvxNumberInfoItem() -SfxItemPresentation SvxNumberInfoItem::GetPresentation +bool SvxNumberInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -126,7 +126,7 @@ SfxItemPresentation SvxNumberInfoItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 3539ff1cc6f7..b7dee44cdf66 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -96,7 +96,7 @@ inline OUString GetUsageText( const sal_uInt16 eU ) -SfxItemPresentation SvxPageItem::GetPresentation +bool SvxPageItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -110,7 +110,7 @@ SfxItemPresentation SvxPageItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: { if ( !aDescName.isEmpty() ) @@ -128,7 +128,7 @@ SfxItemPresentation SvxPageItem::GetPresentation { rText += cpDelimTmp + aUsageText; } - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; } case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -148,11 +148,11 @@ SfxItemPresentation SvxPageItem::GetPresentation { rText += cpDelimTmp + aUsageText; } - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -297,7 +297,7 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const -SfxItemPresentation SvxSetItem::GetPresentation +bool SvxSetItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -306,7 +306,7 @@ SfxItemPresentation SvxSetItem::GetPresentation ) const { rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; } SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, sal_uInt16 /*nVersion*/) const diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 38e1384ab8dc..36e4ff367c1a 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -45,7 +45,7 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, -SfxItemPresentation SvxPostItAuthorItem::GetPresentation +bool SvxPostItAuthorItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -57,16 +57,16 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetValue(); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue(); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -93,7 +93,7 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich -SfxItemPresentation SvxPostItDateItem::GetPresentation +bool SvxPostItDateItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -105,16 +105,16 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetValue(); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE) + GetValue(); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } @@ -141,7 +141,7 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich -SfxItemPresentation SvxPostItTextItem::GetPresentation +bool SvxPostItTextItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -153,16 +153,16 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: rText = GetValue(); - return SFX_ITEM_PRESENTATION_NAMELESS; + return true; case SFX_ITEM_PRESENTATION_COMPLETE: rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE) + GetValue(); - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; default: ;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index c3e87d97a596..abf7296632ba 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -66,7 +66,7 @@ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() ); } -SfxItemPresentation SvxRotateModeItem::GetPresentation( +bool SvxRotateModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const @@ -81,11 +81,12 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation( case SFX_ITEM_PRESENTATION_NAMELESS: rText += OUString( GetValue() ); + return true; break; default: ;//prevent warning } - return ePres; + return false; } OUString SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 0ddb21509427..61016ed6f333 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -395,7 +395,7 @@ SdrItemPool::~SdrItemPool() SetSecondaryPool(NULL); } -SfxItemPresentation SdrItemPool::GetPresentation( +bool SdrItemPool::GetPresentation( const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper) const @@ -411,7 +411,7 @@ SfxItemPresentation SdrItemPool::GetPresentation( TakeItemName(nWhich, aStr); rText = aStr + " " + rText; - return SFX_ITEM_PRESENTATION_COMPLETE; + return true; } } return XOutdevItemPool::GetPresentation(rItem,ePresentationMetric,rText,pIntlWrapper); @@ -662,7 +662,7 @@ bool SdrFractionItem::operator==(const SfxPoolItem& rCmp) const ((SdrFractionItem&)rCmp).GetValue()==nValue; } -SfxItemPresentation SdrFractionItem::GetPresentation( +bool SdrFractionItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { @@ -687,9 +687,12 @@ SfxItemPresentation SdrFractionItem::GetPresentation( SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; + return true; } + else if(ePresentation == SFX_ITEM_PRESENTATION_NAMELESS) + return true; - return ePresentation; + return false; } SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -715,7 +718,7 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem); -SfxItemPresentation SdrScaleItem::GetPresentation( +bool SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { @@ -738,7 +741,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation( rText = aStr + " " + rText; } - return ePresentation; + return ePresentation != SFX_ITEM_PRESENTATION_NONE; } SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -774,7 +777,7 @@ OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const return ImpGetResStr(STR_ItemValOFF); } -SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, +bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); @@ -784,7 +787,7 @@ SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem); @@ -806,7 +809,7 @@ OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const return ImpGetResStr(STR_ItemValNO); } -SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, +bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByVal(GetValue()); @@ -816,7 +819,7 @@ SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } @@ -835,7 +838,7 @@ SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrPercentItem(Which(),rIn); } -SfxItemPresentation SdrPercentItem::GetPresentation( +bool SdrPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { @@ -850,7 +853,7 @@ SfxItemPresentation SdrPercentItem::GetPresentation( rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } @@ -869,7 +872,7 @@ SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrAngleItem(Which(),rIn); } -SfxItemPresentation SdrAngleItem::GetPresentation( +bool SdrAngleItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper * pIntlWrapper) const { @@ -939,7 +942,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation( } rText = aText.makeStringAndClear(); - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } @@ -975,7 +978,7 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) return true; } -SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, +bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper *) const { long nValue=GetValue(); @@ -990,7 +993,7 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, SdrItemPool::TakeItemName(Which(), aStr2); rText = aStr2 + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } @@ -1010,7 +1013,7 @@ OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); } -SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, +bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1020,7 +1023,7 @@ SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePre SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem); @@ -1036,7 +1039,7 @@ OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); } -SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, +bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1046,7 +1049,7 @@ SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation eP SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } @@ -1067,7 +1070,7 @@ OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); } -SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, +bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1077,7 +1080,7 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; } @@ -1127,7 +1130,7 @@ OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); } -SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, +bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1137,7 +1140,7 @@ SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation e SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1176,7 +1179,7 @@ OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); } -SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, +bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1186,7 +1189,7 @@ SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation e SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1225,7 +1228,7 @@ OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); } -SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, +bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1235,7 +1238,7 @@ SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePre SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1273,7 +1276,7 @@ OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); } -SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, +bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1283,7 +1286,7 @@ SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1315,7 +1318,7 @@ SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } -SfxItemPresentation SdrTextAniDelayItem::GetPresentation( +bool SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { @@ -1329,7 +1332,7 @@ SfxItemPresentation SdrTextAniDelayItem::GetPresentation( rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item); @@ -1355,7 +1358,7 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) } else return false; } -SfxItemPresentation SdrTextAniAmountItem::GetPresentation( +bool SdrTextAniAmountItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper *) const { @@ -1386,7 +1389,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem ); @@ -1404,7 +1407,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_ SetValue( bValue ); } } -SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, +bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper * ) const { @@ -1415,7 +1418,7 @@ SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresenta SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } SfxPoolItem* SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const { @@ -1496,7 +1499,7 @@ bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const return bRet; } -SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation( +bool SdrCustomShapeAdjustmentItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const { @@ -1513,7 +1516,7 @@ SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation( SdrItemPool::TakeItemName( Which(), aStr ); rText = aStr + " " + rText; } - return ePresentation; + return ePresentation != SFX_ITEM_PRESENTATION_NONE; } SfxPoolItem* SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const @@ -1620,7 +1623,7 @@ OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); } -SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, +bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1630,7 +1633,7 @@ SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1809,7 +1812,7 @@ OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); } -SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, +bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1819,7 +1822,7 @@ SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePre SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1857,7 +1860,7 @@ OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); } -SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, +bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1867,7 +1870,7 @@ SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1905,7 +1908,7 @@ OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); } -SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, +bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1915,7 +1918,7 @@ SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -1960,7 +1963,7 @@ OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const return aRetval; } -SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, +bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -1970,7 +1973,7 @@ SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePre SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -2006,7 +2009,7 @@ OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); } -SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, +bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); @@ -2016,7 +2019,7 @@ SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, SdrItemPool::TakeItemName(Which(), aStr); rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const @@ -2058,7 +2061,7 @@ SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c return new SdrSignedPercentItem( Which(), rIn ); } -SfxItemPresentation SdrSignedPercentItem::GetPresentation( +bool SdrSignedPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { @@ -2073,7 +2076,7 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation( rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -2272,7 +2275,7 @@ OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const return aStr; } -SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, +bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const { @@ -2286,7 +2289,7 @@ SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, rText = aStr + " " + rText; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 7a652f08299b..37d610a4ff08 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -375,7 +375,7 @@ SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new XLineStyleItem(rIn); } -SfxItemPresentation XLineStyleItem::GetPresentation +bool XLineStyleItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -388,7 +388,7 @@ SfxItemPresentation XLineStyleItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: { @@ -406,10 +406,10 @@ SfxItemPresentation XLineStyleItem::GetPresentation if ( nId ) rText = SVX_RESSTR( nId ); - return ePres; + return true; } default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -731,7 +731,7 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const } -SfxItemPresentation XLineDashItem::GetPresentation +bool XLineDashItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -743,13 +743,13 @@ SfxItemPresentation XLineDashItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -1059,7 +1059,7 @@ SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new XLineWidthItem(rIn); } -SfxItemPresentation XLineWidthItem::GetPresentation +bool XLineWidthItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -1071,15 +1071,15 @@ SfxItemPresentation XLineWidthItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl) + " " + EE_RESSTR( GetMetricId( ePresUnit) ); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -1133,7 +1133,7 @@ SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new XLineColorItem(rIn); } -SfxItemPresentation XLineColorItem::GetPresentation +bool XLineColorItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1145,13 +1145,13 @@ SfxItemPresentation XLineColorItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -1331,7 +1331,7 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const } -SfxItemPresentation XLineStartItem::GetPresentation +bool XLineStartItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1343,13 +1343,13 @@ SfxItemPresentation XLineStartItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -1906,7 +1906,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const return (XLineEndItem*)this; } -SfxItemPresentation XLineEndItem::GetPresentation +bool XLineEndItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1918,13 +1918,13 @@ SfxItemPresentation XLineEndItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -1998,7 +1998,7 @@ SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con return new XLineStartWidthItem(rIn); } -SfxItemPresentation XLineStartWidthItem::GetPresentation +bool XLineStartWidthItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -2010,15 +2010,15 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl) + " " + EE_RESSTR( GetMetricId( ePresUnit) ); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2060,7 +2060,7 @@ SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new XLineEndWidthItem(rIn); } -SfxItemPresentation XLineEndWidthItem::GetPresentation +bool XLineEndWidthItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -2072,15 +2072,15 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetMetricText( (long) GetValue(), eCoreUnit, ePresUnit, pIntl) + " " + EE_RESSTR( GetMetricId( ePresUnit) ); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2122,7 +2122,7 @@ SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co return new XLineStartCenterItem(rIn); } -SfxItemPresentation XLineStartCenterItem::GetPresentation +bool XLineStartCenterItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2134,14 +2134,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) ); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2185,7 +2185,7 @@ SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons return new XLineEndCenterItem(rIn); } -SfxItemPresentation XLineEndCenterItem::GetPresentation +bool XLineEndCenterItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2197,14 +2197,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED : RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) ); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2250,7 +2250,7 @@ SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new XFillStyleItem(rIn); } -SfxItemPresentation XFillStyleItem::GetPresentation +bool XFillStyleItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2263,7 +2263,7 @@ SfxItemPresentation XFillStyleItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: @@ -2291,10 +2291,10 @@ SfxItemPresentation XFillStyleItem::GetPresentation if ( nId ) rText = SVX_RESSTR( nId ); - return ePres; + return true; } default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2358,7 +2358,7 @@ SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const return new XFillColorItem(rIn); } -SfxItemPresentation XFillColorItem::GetPresentation +bool XFillColorItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2370,13 +2370,13 @@ SfxItemPresentation XFillColorItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2429,7 +2429,7 @@ sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion* return 2; } -SfxItemPresentation XSecondaryFillColorItem::GetPresentation +bool XSecondaryFillColorItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2441,13 +2441,13 @@ SfxItemPresentation XSecondaryFillColorItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2632,7 +2632,7 @@ sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) con return 1; } -SfxItemPresentation XFillGradientItem::GetPresentation +bool XFillGradientItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -2644,13 +2644,13 @@ SfxItemPresentation XFillGradientItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -2956,7 +2956,7 @@ bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVa return XFillGradientItem::PutValue( rVal, nMemberId ); } -SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres, +bool XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, OUString& rText, const IntlWrapper * pIntlWrapper ) const @@ -3108,7 +3108,7 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const } -SfxItemPresentation XFillHatchItem::GetPresentation +bool XFillHatchItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -3120,13 +3120,13 @@ SfxItemPresentation XFillHatchItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText = GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 0291ec402e0c..4e283d5b1914 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -56,7 +56,7 @@ SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c return new XLineTransparenceItem(rIn); } -SfxItemPresentation XLineTransparenceItem::GetPresentation +bool XLineTransparenceItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -69,15 +69,15 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; case SFX_ITEM_PRESENTATION_NAMELESS: rText += unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -115,14 +115,14 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const return new XLineJointItem( *this ); } -SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, +bool XLineJointItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { rText = OUString(); switch( ePres ) { - case SFX_ITEM_PRESENTATION_NONE: return ePres; + case SFX_ITEM_PRESENTATION_NONE: return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: @@ -159,10 +159,10 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, if( nId ) rText = SVX_RESSTR( nId ); - return ePres; + return true; } default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -334,14 +334,14 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const return new XLineCapItem( *this ); } -SfxItemPresentation XLineCapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, +bool XLineCapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { rText = OUString(); switch( ePres ) { - case SFX_ITEM_PRESENTATION_NONE: return ePres; + case SFX_ITEM_PRESENTATION_NONE: return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: @@ -366,10 +366,10 @@ SfxItemPresentation XLineCapItem::GetPresentation( SfxItemPresentation ePres, Sf if( nId ) rText = SVX_RESSTR( nId ); - return ePres; + return true; } default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -446,7 +446,7 @@ SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c return new XFillTransparenceItem(rIn); } -SfxItemPresentation XFillTransparenceItem::GetPresentation +bool XFillTransparenceItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -459,15 +459,15 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": "; case SFX_ITEM_PRESENTATION_NAMELESS: rText += unicode::formatPercent(GetValue(), Application::GetSettings().GetUILanguageTag()); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -519,7 +519,7 @@ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new XGradientStepCountItem( rIn ); } -SfxItemPresentation XGradientStepCountItem::GetPresentation +bool XGradientStepCountItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -532,14 +532,14 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: // rText = OUString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ) + ": "; case SFX_ITEM_PRESENTATION_NAMELESS: rText += OUString::number(GetValue()); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -567,7 +567,7 @@ SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new XFillBmpTileItem( rIn ); } -SfxItemPresentation XFillBmpTileItem::GetPresentation +bool XFillBmpTileItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -580,12 +580,12 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -613,7 +613,7 @@ SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new XFillBmpPosItem( rIn ); } -SfxItemPresentation XFillBmpPosItem::GetPresentation +bool XFillBmpPosItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -626,12 +626,12 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -664,7 +664,7 @@ SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons return new XFillBmpSizeXItem( rIn ); } -SfxItemPresentation XFillBmpSizeXItem::GetPresentation +bool XFillBmpSizeXItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -677,12 +677,12 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -715,7 +715,7 @@ SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons return new XFillBmpSizeYItem( rIn ); } -SfxItemPresentation XFillBmpSizeYItem::GetPresentation +bool XFillBmpSizeYItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -728,12 +728,12 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -766,7 +766,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co return new XFillBmpSizeLogItem( rIn ); } -SfxItemPresentation XFillBmpSizeLogItem::GetPresentation +bool XFillBmpSizeLogItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -779,12 +779,12 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -812,7 +812,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ return new XFillBmpTileOffsetXItem( rIn ); } -SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation +bool XFillBmpTileOffsetXItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -825,12 +825,12 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -858,7 +858,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ return new XFillBmpTileOffsetYItem( rIn ); } -SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation +bool XFillBmpTileOffsetYItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -871,12 +871,12 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -904,7 +904,7 @@ SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co return new XFillBmpStretchItem( rIn ); } -SfxItemPresentation XFillBmpStretchItem::GetPresentation +bool XFillBmpStretchItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -917,12 +917,12 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -950,7 +950,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) return new XFillBmpPosOffsetXItem( rIn ); } -SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation +bool XFillBmpPosOffsetXItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -963,12 +963,12 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -996,7 +996,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) return new XFillBmpPosOffsetYItem( rIn ); } -SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation +bool XFillBmpPosOffsetYItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -1009,12 +1009,12 @@ SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation switch ( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } @@ -1042,7 +1042,7 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con return new XFillBackgroundItem( rIn ); } -SfxItemPresentation XFillBackgroundItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, +bool XFillBackgroundItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const { rText = OUString(); @@ -1050,13 +1050,13 @@ SfxItemPresentation XFillBackgroundItem::GetPresentation( SfxItemPresentation eP switch( ePres ) { case SFX_ITEM_PRESENTATION_NONE: - return ePres; + return false; case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 3070c497d20b..ed12a6217f48 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -381,7 +381,7 @@ sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const return(2); } -SfxItemPresentation XFillBitmapItem::GetPresentation( +bool XFillBitmapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, @@ -392,13 +392,13 @@ SfxItemPresentation XFillBitmapItem::GetPresentation( { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return ePres; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: rText += GetName(); - return ePres; + return true; default: - return SFX_ITEM_PRESENTATION_NONE; + return false; } } diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 42c0f5afcbc2..4e70c617d986 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -54,7 +54,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 3a9d370f0017..f7e80620e73a 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -53,7 +53,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index a40416ec507a..90650b839de4 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -45,7 +45,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 956637de9013..465137c6346f 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -102,7 +102,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index e677d6434f96..4ff7c97c0e3d 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -42,7 +42,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 99853a0eb497..f7f4b25d0fba 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -34,7 +34,7 @@ public: /// "pure virtual methos" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 4bba61e2bc45..47913c8a246e 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -36,7 +36,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 5774178905f6..e80bd43680af 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -67,7 +67,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 26ec1ca4d7da..04016b338e3c 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -59,7 +59,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index ca09e16ece7e..23c4845e4996 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -47,7 +47,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -80,7 +80,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index d8664f051795..d3c4d6b8b48f 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -53,7 +53,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 096bfa45dcc5..9b1a795b1f58 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -40,7 +40,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index dfb0365558f9..c16c72afce5f 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -33,7 +33,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index bd97badcec9a..b267d8f08160 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -44,7 +44,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -79,7 +79,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index ce5cd4b0f5bb..9b7f9a508129 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -60,7 +60,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index b4d0151a5a64..f5fa372b28cc 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -33,7 +33,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 2835d4a5d2ab..f0945e6227d1 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -45,7 +45,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index c9687ffbbfed..4b27127141b1 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -42,7 +42,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index b39b8f7c5372..3f12aba99e83 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -51,7 +51,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 0aa3bddfff3d..cbd745a96172 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -57,7 +57,7 @@ public: // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -105,7 +105,7 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -128,7 +128,7 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -144,7 +144,7 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -160,7 +160,7 @@ protected: public: // pure virtual methods from SfxInt16Item - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -213,7 +213,7 @@ public: // pure virtual methods from SfxEnumItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -237,7 +237,7 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -253,7 +253,7 @@ public: // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -276,7 +276,7 @@ public: // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 573262081756..c53f83374c0c 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -33,7 +33,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 449eeba8fa6a..ef9b322335cb 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -66,7 +66,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -110,7 +110,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -148,7 +148,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -170,7 +170,7 @@ public: /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 3c7d3db44351..b110d386e2e4 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -53,7 +53,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 612a69ccf2c8..827c02e2fa4e 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -41,7 +41,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 7c5b8aed56b9..ebcda5e23d86 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -91,7 +91,7 @@ void SwAttrSet::GetPresentation( } } -SfxItemPresentation SwFmtCharFmt::GetPresentation +bool SwFmtCharFmt::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -118,14 +118,14 @@ SfxItemPresentation SwFmtCharFmt::GetPresentation } else rText = OUString( SW_RESSTR( STR_NO_CHARFMT ) ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtAutoFmt::GetPresentation +bool SwFmtAutoFmt::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -143,14 +143,14 @@ SfxItemPresentation SwFmtAutoFmt::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText = OUString(); //TODO - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtINetFmt::GetPresentation +bool SwFmtINetFmt::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -168,14 +168,14 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText = GetValue(); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, +bool SwFmtRuby::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { @@ -188,14 +188,14 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, case SFX_ITEM_PRESENTATION_COMPLETE: { rText = OUString(); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtDrop::GetPresentation +bool SwFmtDrop::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -227,14 +227,14 @@ SfxItemPresentation SwFmtDrop::GetPresentation } else rText = SW_RESSTR( STR_NO_DROP_LINES ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwRegisterItem::GetPresentation +bool SwRegisterItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -247,20 +247,20 @@ SfxItemPresentation SwRegisterItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { const sal_uInt16 nId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwNumRuleItem::GetPresentation +bool SwNumRuleItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -273,7 +273,7 @@ SfxItemPresentation SwNumRuleItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -282,14 +282,14 @@ SfxItemPresentation SwNumRuleItem::GetPresentation "(" + GetValue() + ")"; else rText = SW_RESSTR( STR_NUMRULE_OFF ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwParaConnectBorderItem::GetPresentation +bool SwParaConnectBorderItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -302,22 +302,22 @@ SfxItemPresentation SwParaConnectBorderItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { const sal_uInt16 nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // Frame attribute -SfxItemPresentation SwFmtFrmSize::GetPresentation +bool SwFmtFrmSize::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -363,17 +363,17 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //Header for page formats. //Client of FrmFmt which describes the header. -SfxItemPresentation SwFmtHeader::GetPresentation +bool SwFmtHeader::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -392,17 +392,17 @@ SfxItemPresentation SwFmtHeader::GetPresentation { const sal_uInt16 nId = GetHeaderFmt() ? STR_HEADER : STR_NO_HEADER; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //Footer for page formats. //Client of FrmFmt which describes the footer. -SfxItemPresentation SwFmtFooter::GetPresentation +bool SwFmtFooter::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -421,14 +421,14 @@ SfxItemPresentation SwFmtFooter::GetPresentation { const sal_uInt16 nId = GetFooterFmt() ? STR_FOOTER : STR_NO_FOOTER; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtSurround::GetPresentation +bool SwFmtSurround::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -475,16 +475,16 @@ SfxItemPresentation SwFmtSurround::GetPresentation { rText = rText + " " + SW_RESSTR( STR_SURROUND_ANCHORONLY ); } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //VertOrientation, how and by what orientate the FlyFrm in the vertical? -SfxItemPresentation SwFmtVertOrient::GetPresentation +bool SwFmtVertOrient::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -533,16 +533,16 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //HoriOrientation, how and by what orientate the FlyFrm in the horizontal? -SfxItemPresentation SwFmtHoriOrient::GetPresentation +bool SwFmtHoriOrient::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -591,16 +591,16 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // FlyAnchor, Anchor of the free-flying frame -SfxItemPresentation SwFmtAnchor::GetPresentation +bool SwFmtAnchor::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -633,14 +633,14 @@ SfxItemPresentation SwFmtAnchor::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtPageDesc::GetPresentation +bool SwFmtPageDesc::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -662,16 +662,16 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation rText = pPageDesc->GetName(); else rText = SW_RESSTR( STR_NO_PAGEDESC ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //The ColumnDescriptor -SfxItemPresentation SwFmtCol::GetPresentation +bool SwFmtCol::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -702,16 +702,16 @@ SfxItemPresentation SwFmtCol::GetPresentation } else rText = OUString(); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //URL's and maps -SfxItemPresentation SwFmtURL::GetPresentation +bool SwFmtURL::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -742,14 +742,14 @@ SfxItemPresentation SwFmtURL::GetPresentation { rText = rText + ", Target: " + sTargetFrameName; } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtEditInReadonly::GetPresentation +bool SwFmtEditInReadonly::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -769,14 +769,14 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation { if ( GetValue() ) rText = SW_RESSTR(STR_EDIT_IN_READONLY); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtLayoutSplit::GetPresentation +bool SwFmtLayoutSplit::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -789,20 +789,20 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { if ( GetValue() ) rText = SW_RESSTR(STR_LAYOUT_SPLIT); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtRowSplit::GetPresentation +bool SwFmtRowSplit::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -811,10 +811,10 @@ SfxItemPresentation SwFmtRowSplit::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation +bool SwFmtFtnEndAtTxtEnd::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -850,10 +850,10 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwFmtChain::GetPresentation +bool SwFmtChain::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -866,7 +866,7 @@ SfxItemPresentation SwFmtChain::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -882,14 +882,14 @@ SfxItemPresentation SwFmtChain::GetPresentation if ( GetNext() ) rText += GetNext()->GetName(); } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtLineNumber::GetPresentation +bool SwFmtLineNumber::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -902,7 +902,7 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -915,14 +915,14 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation rText = rText + " " + SW_RESSTR(STR_LINCOUNT_START) + OUString::number( GetStartValue() ); } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwTextGridItem::GetPresentation +bool SwTextGridItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -935,7 +935,7 @@ SfxItemPresentation SwTextGridItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -955,15 +955,15 @@ SfxItemPresentation SwTextGridItem::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation +bool SwHeaderAndFooterEatSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -972,12 +972,12 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } // Graphic attributes -SfxItemPresentation SwMirrorGrf::GetPresentation( +bool SwMirrorGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const { @@ -1008,10 +1008,10 @@ SfxItemPresentation SwMirrorGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwRotationGrf::GetPresentation( +bool SwRotationGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1031,10 +1031,10 @@ SfxItemPresentation SwRotationGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwLuminanceGrf::GetPresentation( +bool SwLuminanceGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1055,10 +1055,10 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwContrastGrf::GetPresentation( +bool SwContrastGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1079,10 +1079,10 @@ SfxItemPresentation SwContrastGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwChannelGrf::GetPresentation( +bool SwChannelGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1116,10 +1116,10 @@ SfxItemPresentation SwChannelGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwGammaGrf::GetPresentation( +bool SwGammaGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1139,10 +1139,10 @@ SfxItemPresentation SwGammaGrf::GetPresentation( break; } rText = aText.makeStringAndClear(); - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwInvertGrf::GetPresentation( +bool SwInvertGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1162,10 +1162,10 @@ SfxItemPresentation SwInvertGrf::GetPresentation( ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwTransparencyGrf::GetPresentation( +bool SwTransparencyGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1186,10 +1186,10 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwDrawModeGrf::GetPresentation( +bool SwDrawModeGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1217,10 +1217,10 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres, +bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, @@ -1242,7 +1242,7 @@ SfxItemPresentation SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation eP ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 0490a93e85dc..194933add10a 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -59,7 +59,7 @@ bool SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const return ( aFtnInfo == ((SwPageFtnInfoItem&)rAttr).GetPageFtnInfo()); } -SfxItemPresentation SwPageFtnInfoItem::GetPresentation +bool SwPageFtnInfoItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -72,7 +72,7 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -83,11 +83,11 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } - return ePres; + return true; } default:; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const |