avmedia/source/framework/mediaitem.cxx | 4 editeng/source/items/bulitem.cxx | 8 - editeng/source/items/charhiddenitem.cxx | 8 - editeng/source/items/frmitems.cxx | 126 +++++++++---------- editeng/source/items/justifyitem.cxx | 24 +-- editeng/source/items/optitems.cxx | 16 +- editeng/source/items/paraitem.cxx | 80 ++++++------ editeng/source/items/textitem.cxx | 190 ++++++++++++++-------------- editeng/source/items/writingmodeitem.cxx | 8 - editeng/source/items/xmlcnitm.cxx | 4 include/avmedia/mediaitem.hxx | 2 include/editeng/adjustitem.hxx | 2 include/editeng/autokernitem.hxx | 2 include/editeng/blinkitem.hxx | 2 include/editeng/boxitem.hxx | 4 include/editeng/brushitem.hxx | 2 include/editeng/bulletitem.hxx | 2 include/editeng/charhiddenitem.hxx | 2 include/editeng/charreliefitem.hxx | 2 include/editeng/charrotateitem.hxx | 2 include/editeng/charscaleitem.hxx | 2 include/editeng/charsetcoloritem.hxx | 2 include/editeng/cmapitem.hxx | 2 include/editeng/colritem.hxx | 2 include/editeng/contouritem.hxx | 2 include/editeng/crossedoutitem.hxx | 2 include/editeng/emphasismarkitem.hxx | 2 include/editeng/escapementitem.hxx | 2 include/editeng/fhgtitem.hxx | 2 include/editeng/flstitem.hxx | 2 include/editeng/fontitem.hxx | 2 include/editeng/forbiddenruleitem.hxx | 2 include/editeng/formatbreakitem.hxx | 2 include/editeng/frmdiritem.hxx | 2 include/editeng/fwdtitem.hxx | 2 include/editeng/hngpnctitem.hxx | 2 include/editeng/hyphenzoneitem.hxx | 2 include/editeng/justifyitem.hxx | 6 include/editeng/keepitem.hxx | 2 include/editeng/kernitem.hxx | 2 include/editeng/langitem.hxx | 2 include/editeng/lcolitem.hxx | 2 include/editeng/lineitem.hxx | 2 include/editeng/lrspitem.hxx | 2 include/editeng/lspcitem.hxx | 2 include/editeng/nhypitem.hxx | 2 include/editeng/nlbkitem.hxx | 2 include/editeng/opaqitem.hxx | 2 include/editeng/optitems.hxx | 4 include/editeng/orphitem.hxx | 2 include/editeng/paravertalignitem.hxx | 2 include/editeng/pbinitem.hxx | 2 include/editeng/pgrditem.hxx | 2 include/editeng/pmdlitem.hxx | 2 include/editeng/postitem.hxx | 2 include/editeng/prntitem.hxx | 2 include/editeng/protitem.hxx | 2 include/editeng/prszitem.hxx | 2 include/editeng/scriptspaceitem.hxx | 2 include/editeng/shaditem.hxx | 2 include/editeng/shdditem.hxx | 2 include/editeng/sizeitem.hxx | 2 include/editeng/spltitem.hxx | 2 include/editeng/tstpitem.hxx | 2 include/editeng/twolinesitem.hxx | 2 include/editeng/udlnitem.hxx | 2 include/editeng/ulspitem.hxx | 2 include/editeng/wghtitem.hxx | 2 include/editeng/widwitem.hxx | 2 include/editeng/writingmodeitem.hxx | 2 include/editeng/wrlmitem.hxx | 2 include/editeng/xmlcnitm.hxx | 2 include/sfx2/evntconf.hxx | 2 include/sfx2/frmdescr.hxx | 2 include/svl/cenumitm.hxx | 2 include/svl/cintitem.hxx | 8 - include/svl/ctypeitm.hxx | 2 include/svl/custritm.hxx | 2 include/svl/eitem.hxx | 2 include/svl/flagitem.hxx | 2 include/svl/int64item.hxx | 2 include/svl/intitem.hxx | 2 include/svl/itempool.hxx | 4 include/svl/macitem.hxx | 2 include/svl/poolitem.hxx | 7 - include/svl/ptitem.hxx | 2 include/svl/rectitem.hxx | 2 include/svl/rngitem.hxx | 4 include/svl/slstitm.hxx | 2 include/svl/srchitem.hxx | 2 include/svl/szitem.hxx | 2 include/svl/visitem.hxx | 2 include/svx/algitem.hxx | 4 include/svx/chrtitem.hxx | 2 include/svx/drawitem.hxx | 12 - include/svx/grfcrop.hxx | 2 include/svx/numinf.hxx | 2 include/svx/optgrid.hxx | 2 include/svx/pageitem.hxx | 4 include/svx/postattr.hxx | 6 include/svx/rotmodit.hxx | 2 include/svx/rulritem.hxx | 10 - include/svx/sdangitm.hxx | 2 include/svx/sdasaitm.hxx | 2 include/svx/sdasitm.hxx | 2 include/svx/sdgmoitm.hxx | 2 include/svx/sdmetitm.hxx | 2 include/svx/sdooitm.hxx | 2 include/svx/sdprcitm.hxx | 4 include/svx/sdtaaitm.hxx | 2 include/svx/sdtaditm.hxx | 2 include/svx/sdtaitm.hxx | 4 include/svx/sdtakitm.hxx | 2 include/svx/sdtayitm.hxx | 2 include/svx/sdtfchim.hxx | 2 include/svx/sdtfsitm.hxx | 2 include/svx/sdynitm.hxx | 2 include/svx/svdpool.hxx | 2 include/svx/sxcecitm.hxx | 2 include/svx/sxctitm.hxx | 2 include/svx/sxekitm.hxx | 2 include/svx/sxfiitm.hxx | 2 include/svx/sxmtpitm.hxx | 4 include/svx/sxmuitm.hxx | 2 include/svx/sxsiitm.hxx | 2 include/svx/xbtmpit.hxx | 2 include/svx/xfillit0.hxx | 2 include/svx/xflbckit.hxx | 2 include/svx/xflbmpit.hxx | 2 include/svx/xflbmsli.hxx | 2 include/svx/xflbmsxy.hxx | 4 include/svx/xflbmtit.hxx | 2 include/svx/xflboxy.hxx | 4 include/svx/xflbstit.hxx | 2 include/svx/xflbtoxy.hxx | 4 include/svx/xflclit.hxx | 2 include/svx/xflftrit.hxx | 2 include/svx/xflgrit.hxx | 2 include/svx/xflhtit.hxx | 2 include/svx/xfltrit.hxx | 2 include/svx/xgrscit.hxx | 2 include/svx/xlineit0.hxx | 2 include/svx/xlinjoit.hxx | 2 include/svx/xlncapit.hxx | 2 include/svx/xlnclit.hxx | 2 include/svx/xlndsit.hxx | 2 include/svx/xlnedcit.hxx | 2 include/svx/xlnedit.hxx | 2 include/svx/xlnedwit.hxx | 2 include/svx/xlnstcit.hxx | 2 include/svx/xlnstit.hxx | 2 include/svx/xlnstwit.hxx | 2 include/svx/xlntrit.hxx | 2 include/svx/xlnwtit.hxx | 2 include/svx/xsflclit.hxx | 2 sc/inc/attrib.hxx | 10 - sc/inc/docpool.hxx | 2 sc/source/core/data/attrib.cxx | 35 ++--- sc/source/core/data/docpool.cxx | 23 +-- sfx2/source/config/evntconf.cxx | 4 sfx2/source/doc/frmdescr.cxx | 4 svl/source/items/cenumitm.cxx | 9 - svl/source/items/cintitem.cxx | 16 +- svl/source/items/ctypeitm.cxx | 4 svl/source/items/custritm.cxx | 5 svl/source/items/flagitem.cxx | 4 svl/source/items/int64item.cxx | 4 svl/source/items/intitem.cxx | 4 svl/source/items/itempool.cxx | 2 svl/source/items/macitem.cxx | 4 svl/source/items/poolitem.cxx | 8 - svl/source/items/ptitem.cxx | 4 svl/source/items/rectitem.cxx | 4 svl/source/items/rngitem.cxx | 8 - svl/source/items/sitem.cxx | 4 svl/source/items/slstitm.cxx | 4 svl/source/items/srchitem.cxx | 4 svl/source/items/szitem.cxx | 4 svl/source/items/visitem.cxx | 4 svx/inc/sxcikitm.hxx | 2 svx/inc/sxmkitm.hxx | 2 svx/source/dialog/optgrid.cxx | 6 svx/source/dialog/rulritem.cxx | 20 +-- svx/source/items/algitem.cxx | 18 +- svx/source/items/chrtitem.cxx | 4 svx/source/items/customshapeitem.cxx | 7 - svx/source/items/drawitem.cxx | 24 +-- svx/source/items/grfitem.cxx | 18 +- svx/source/items/numinf.cxx | 4 svx/source/items/pageitem.cxx | 14 +- svx/source/items/postattr.cxx | 30 ++-- svx/source/items/rotmodit.cxx | 5 svx/source/svdraw/svdattr.cxx | 111 ++++++++-------- svx/source/xoutdev/xattr.cxx | 122 +++++++++--------- svx/source/xoutdev/xattr2.cxx | 128 +++++++++---------- svx/source/xoutdev/xattrbmp.cxx | 8 - sw/inc/fchrfmt.hxx | 2 sw/inc/fmtanchr.hxx | 2 sw/inc/fmtautofmt.hxx | 2 sw/inc/fmtclds.hxx | 2 sw/inc/fmtcnct.hxx | 2 sw/inc/fmteiro.hxx | 2 sw/inc/fmtfollowtextflow.hxx | 2 sw/inc/fmtfsize.hxx | 2 sw/inc/fmtftntx.hxx | 2 sw/inc/fmthdft.hxx | 4 sw/inc/fmtinfmt.hxx | 2 sw/inc/fmtline.hxx | 2 sw/inc/fmtlsplt.hxx | 2 sw/inc/fmtornt.hxx | 4 sw/inc/fmtpdsc.hxx | 2 sw/inc/fmtrowsplt.hxx | 2 sw/inc/fmtruby.hxx | 2 sw/inc/fmtsrnd.hxx | 2 sw/inc/fmturl.hxx | 2 sw/inc/grfatr.hxx | 18 +- sw/inc/hfspacingitem.hxx | 2 sw/inc/paratr.hxx | 8 - sw/inc/tgrditem.hxx | 2 sw/source/uibase/inc/uiitems.hxx | 2 sw/source/uibase/utlui/attrdesc.cxx | 204 +++++++++++++++---------------- sw/source/uibase/utlui/uiitems.cxx | 8 - 222 files changed, 904 insertions(+), 898 deletions(-)
New commits: commit 7e018afaf74ab118fe21d92edc9fb95ddea5d61b Author: Noel Grandin <n...@peralex.com> Date: Thu Jul 24 11:31:39 2014 +0200 simplify return argument of SfxPoolItem::GetPresentation since all two of the actual call-sites only care about whether it is a valid presentation or not, not what kind of presentation it is. Change-Id: I75717c88878d37b2897741b0c833ff283b3fee59 diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 1c06ebc..4890104 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 2faf308..285cfc2 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 f1df369..b32d41a 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 798ae03..f4297b7 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 827edd7..289d549 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 dfe61a8..839430b 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 bba1468..9775a27 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 9fd76b0..2a8dea5 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 1a715be..9000ecb 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 38d24e5..4d237d1 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 b8e9dcf..e3300b3 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 038822c..0711e23 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 2c4f0b4..2b2f956 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 be81338..c4f02cf 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 37c2d8f..2d268b6 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 12cb666..ae4cb9a 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 42cbf2c..1dbb473 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 6f49c5e..16a5636 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 459ea43..a21b341 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 8dad9e7..574d2fc 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 74bb3f4..46bcc65 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 54ee7f4..b64bf3b 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 59bc82f..00ba3ad 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 7ec7b69..31a7af4 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 072a0ac..fad8a11 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 8019292..8e64ba9 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 3c62e86..44a3cbf 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 829ddcb..59715b2 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 1655a98..3ff3e64 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 c1f90c13..06319e0 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 0d2f275..3b9fbb2 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 56262a7..19a1493 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 84da2ca..65a1bf1 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 e8f9629..3c2e906 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 b4d1647..34f281e 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 7358d55..d79cdb8 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 771880a..7cac264 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 3a002b9..6e09634 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 7cfc750..1092311 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 f4d52ba..d1f596d 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 60d7402..f8a5b03 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 3548826..6720424 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 ce2819c..9c25027 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 6ccce38..c5eb6ec 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 e866c72..9bb1d80 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 eda9a19..afd0305 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 704b392..41ea3c9 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 5ef06a9..dccf910 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 077f9cc..f0fd652 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 99bd179..ff523a3 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 62dfd68..982cad6 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 1d3acfe..b3c48b4 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 05ffd0e..ae89831 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 1a9eaf7..02db19d 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 3937371..00cbbf4 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 b80318b..33ad3ba 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 46b9e37..9c05284 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 2abe4b5..ca25dc8 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 8a3f503..b159ffb 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 36c589a..43ec3bc 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 3bfd6c2..54b88ae 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, ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits