Skip to content

C
core
Kaydet (Commit) 9d140ccd authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

drop use of SFX_ITEM_PRESENTATION_NONE 

since none of the call sites specify it

Change-Id: I9c15f0e042e21f6f78560c1962a533112d588c90
üst a0b89100
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 247 deletions
editeng/source/items/bulitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -380,28 +380,14 @@ OUString SvxBulletItem::GetFullText() const
bool SvxBulletItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
bool eRet = false;
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
eRet = false;
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetFullText();
eRet = true;
break;
default: ; //prevent warning
}
return eRet;
rText = GetFullText();
return true;
}
......
editeng/source/items/charhiddenitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -35,30 +35,19 @@ SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const
bool SvxCharHiddenItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
OUString& rText,
const IntlWrapper * /*pIntl*/
) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
rText = EE_RESSTR(nId);
return true;
}
default: ; //prevent warning
}
return false;
if ( GetValue() )
nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
rText = EE_RESSTR(nId);
return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
editeng/source/items/justifyitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -52,23 +52,13 @@ SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
bool SvxHorJustifyItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetValueText( GetValue() );
return true;
default: ; //prevent warning
}
return false;
rText = GetValueText( GetValue() );
return true;
}
......@@ -209,24 +199,14 @@ SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
bool SvxVerJustifyItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper * ) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetValueText( GetValue() );
return true;
default: ; //prevent warning
}
return false;
rText = GetValueText( GetValue() );
return true;
}
......@@ -350,24 +330,14 @@ SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify,
bool SvxJustifyMethodItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper * ) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetValueText( GetValue() );
return true;
default: ; //prevent warning
}
return false;
rText = GetValueText( GetValue() );
return true;
}
......
editeng/source/items/optitems.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -60,27 +60,14 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) :
bool SfxSpellCheckItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation ,
SfxMapUnit ,
SfxMapUnit ,
OUString& rText,
OUString& ,
const IntlWrapper*
) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
return true;
}
default:
return false;
}
return true;
}
......@@ -139,31 +126,18 @@ SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const
bool SfxHyphenRegionItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit ,
SfxMapUnit ,
OUString& rText,
const IntlWrapper*
) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
rText = rText +
EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
"," +
EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail));
return true;
}
default:
return false;
}
rText = rText +
EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
"," +
EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail));
return true;
}
......
editeng/source/items/writingmodeitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -65,28 +65,14 @@ sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const
return USHRT_MAX;
}
bool SvxWritingModeItem::GetPresentation( SfxItemPresentation ePres,
bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreMetric*/,
SfxMapUnit /*ePresMetric*/,
OUString &rText,
const IntlWrapper * ) const
{
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:
return false;
}
rText = EE_RESSTR(RID_SVXITEMS_FRMDIR_BEGIN + GetValue());
return true;
}
bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
......
include/svl/poolitem.hxx
Dosyayı görüntüle @ 9d140ccd
......@@ -119,7 +119,6 @@ enum SfxItemPresentation
*/
{
SFX_ITEM_PRESENTATION_NONE,
SFX_ITEM_PRESENTATION_NAMELESS,
SFX_ITEM_PRESENTATION_COMPLETE
};
......
sc/source/core/data/attrib.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -302,10 +302,6 @@ bool ScProtectionAttr::GetPresentation
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = GetValueText();
break;
......@@ -328,11 +324,10 @@ bool ScProtectionAttr::GetPresentation
+ (!bHidePrint ? aStrYes : aStrNo);
break;
default:
ePres = SFX_ITEM_PRESENTATION_NONE;
default: break;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const
......@@ -433,7 +428,7 @@ bool ScRangeItem::GetPresentation
}
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
// ScTableListItem - List from Tables (-numbers)
......@@ -514,10 +509,6 @@ bool ScTableListItem::GetPresentation
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return ePres;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
rText = "(";
......@@ -1025,7 +1016,7 @@ bool ScPageScaleToItem::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* ) const
{
rText = OUString();
if( !IsValid() || (ePres == SFX_ITEM_PRESENTATION_NONE) )
if( !IsValid())
return false;
OUString aName( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETO ) );
......@@ -1036,10 +1027,6 @@ bool ScPageScaleToItem::GetPresentation(
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
return false;
break;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = aValue;
return true;
......
svl/source/items/poolitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -172,11 +172,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
* The corresponding unit of measure is passed as 'ePresentationMetric'.
*
*
* @return SfxItemPresentation SFX_ITEM_PRESENTATION_NONE
* A textual representation could not be
* created
*
* SFX_ITEM_PRESENTATION_NAMELESS
* @return SfxItemPresentation SFX_ITEM_PRESENTATION_NAMELESS
* A textual representation (if applicable
* with a unit of measure) could be created,
* but it doesn't contain any semantic meaning
......
svx/source/dialog/optgrid.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -105,24 +105,14 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const
bool SvxGridItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = "SvxGridItem";
return ePres;
default:
return false;
}
rText = "SvxGridItem";
return true;
}
// TabPage Screen Settings
......
svx/source/items/algitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -62,23 +62,13 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons
bool SvxOrientationItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * ) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText = GetValueText( GetValue() );
return true;
default: ; //prevent warning
}
return false;
rText = GetValueText( GetValue() );
return true;
}
......@@ -240,9 +230,6 @@ bool SvxMarginItem::GetPresentation
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
......
svx/source/items/pageitem.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -109,8 +109,6 @@ bool SvxPageItem::GetPresentation
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
{
if ( !aDescName.isEmpty() )
......
svx/source/items/postattr.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -55,9 +55,6 @@ bool SvxPostItAuthorItem::GetPresentation
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = GetValue();
return true;
......@@ -103,9 +100,6 @@ bool SvxPostItDateItem::GetPresentation
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = GetValue();
return true;
......@@ -151,9 +145,6 @@ bool SvxPostItTextItem::GetPresentation
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
rText = GetValue();
return true;
......
svx/source/svdraw/svdattr.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -741,7 +741,7 @@ bool SdrScaleItem::GetPresentation(
rText = aStr + " " + rText;
}
return ePresentation != SFX_ITEM_PRESENTATION_NONE;
return true;
}
SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
......@@ -787,7 +787,7 @@ bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
......@@ -819,7 +819,7 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
......@@ -853,7 +853,7 @@ bool SdrPercentItem::GetPresentation(
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
......@@ -942,7 +942,7 @@ bool SdrAngleItem::GetPresentation(
}
rText = aText.makeStringAndClear();
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
......@@ -993,7 +993,7 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr2);
rText = aStr2 + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
......@@ -1023,7 +1023,7 @@ bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
......@@ -1049,7 +1049,7 @@ bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
......@@ -1080,7 +1080,7 @@ bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; }
......@@ -1140,7 +1140,7 @@ bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1189,7 +1189,7 @@ bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1238,7 +1238,7 @@ bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1286,7 +1286,7 @@ bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1332,7 +1332,7 @@ bool SdrTextAniDelayItem::GetPresentation(
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
......@@ -1389,7 +1389,7 @@ bool SdrTextAniAmountItem::GetPresentation(
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
......@@ -1418,7 +1418,7 @@ bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
SfxPoolItem* SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
{
......@@ -1516,7 +1516,7 @@ bool SdrCustomShapeAdjustmentItem::GetPresentation(
SdrItemPool::TakeItemName( Which(), aStr );
rText = aStr + " " + rText;
}
return ePresentation != SFX_ITEM_PRESENTATION_NONE;
return true;
}
SfxPoolItem* SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
......@@ -1633,7 +1633,7 @@ bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1822,7 +1822,7 @@ bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1870,7 +1870,7 @@ bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1918,7 +1918,7 @@ bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -1973,7 +1973,7 @@ bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -2019,7 +2019,7 @@ bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
SdrItemPool::TakeItemName(Which(), aStr);
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
......@@ -2076,7 +2076,7 @@ bool SdrSignedPercentItem::GetPresentation(
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......@@ -2289,7 +2289,7 @@ bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
rText = aStr + " " + rText;
}
return ePres != SFX_ITEM_PRESENTATION_NONE;
return true;
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
svx/source/xoutdev/xattr.cxx
Dosyayı görüntüle @ 9d140ccd
This diff is collapsed.
svx/source/xoutdev/xattr2.cxx
Dosyayı görüntüle @ 9d140ccd
This diff is collapsed.
svx/source/xoutdev/xattrbmp.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -382,24 +382,14 @@ sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
}
bool XFillBitmapItem::GetPresentation(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
SfxMapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper*) const
{
switch (ePres)
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
rText += GetName();
return true;
default:
return false;
}
rText += GetName();
return true;
}
bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) const
......
sw/source/uibase/utlui/uiitems.cxx
Dosyayı görüntüle @ 9d140ccd
......@@ -61,33 +61,21 @@ bool SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const
bool SwPageFtnInfoItem::GetPresentation
(
SfxItemPresentation ePres,
SfxItemPresentation /*ePres*/,
SfxMapUnit eCoreUnit,
SfxMapUnit ePresUnit,
OUString& rText,
const IntlWrapper* pIntl
) const
{
switch ( ePres )
const SwTwips nHght = GetPageFtnInfo().GetHeight();
if ( nHght )
{
case SFX_ITEM_PRESENTATION_NONE:
rText = OUString();
return false;
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
const SwTwips nHght = GetPageFtnInfo().GetHeight();
if ( nHght )
{
rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " +
::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " +
::GetSvxString( ::GetMetricId( ePresUnit ) );
}
return true;
}
default:; //prevent warning
rText = SW_RESSTR( STR_MAX_FTN_HEIGHT ) + " " +
::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " +
::GetSvxString( ::GetMetricId( ePresUnit ) );
}
return false;
return true;
}
bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment