drop use of SFX_ITEM_PRESENTATION_NONE

since none of the call sites specify it

Change-Id: I9c15f0e042e21f6f78560c1962a533112d588c90

8 files changed, 184 insertions, 528 deletions

diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 7b8d804a65e4..f1df7ae8ded4 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -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
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 5f534a31c43d..7615aa8c8cc6 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -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 ) +
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index b7dee44cdf66..9968429eb8e7 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -109,8 +109,6 @@ bool SvxPageItem::GetPresentation
 
     switch ( ePres )
     {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
             if ( !aDescName.isEmpty() )
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 36e4ff367c1a..6a6b68a63f69 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -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;
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 61016ed6f333..0d6ade274ae7 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -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;
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 37d610a4ff08..109ae972e536 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -377,7 +377,7 @@ SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XLineStyleItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
@@ -385,32 +385,21 @@ bool XLineStyleItem::GetPresentation
 {
     rText = OUString();
 
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-        {
-            sal_uInt16 nId = 0;
+    sal_uInt16 nId = 0;
 
-            switch( (sal_uInt16)GetValue() )
-            {
-                case XLINE_NONE:
-                    nId = RID_SVXSTR_INVISIBLE;
-                    break;
-                case XLINE_SOLID:
-                    nId = RID_SVXSTR_SOLID;
-                    break;
-            }
-
-            if ( nId )
-                rText = SVX_RESSTR( nId );
-            return true;
-        }
-        default:
-            return false;
+    switch( (sal_uInt16)GetValue() )
+    {
+        case XLINE_NONE:
+            nId = RID_SVXSTR_INVISIBLE;
+            break;
+        case XLINE_SOLID:
+            nId = RID_SVXSTR_SOLID;
+            break;
     }
+
+    if ( nId )
+        rText = SVX_RESSTR( nId );
+    return true;
 }
 
 bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -733,24 +722,14 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 
 bool XLineDashItem::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 XLineDashItem::HasMetrics() const
@@ -1061,26 +1040,16 @@ SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XLineWidthItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
     SfxMapUnit          ePresUnit,
     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:
-            rText = GetMetricText( (long) GetValue(),
-                                    eCoreUnit, ePresUnit, pIntl) +
-                    " " + EE_RESSTR( GetMetricId( ePresUnit) );
-            return true;
-        default:
-            return false;
-    }
+    rText = GetMetricText( (long) GetValue(),
+                            eCoreUnit, ePresUnit, pIntl) +
+            " " + EE_RESSTR( GetMetricId( ePresUnit) );
+    return true;
 }
 
 bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1135,24 +1104,14 @@ SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XLineColorItem::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 XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1333,24 +1292,14 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 
 bool XLineStartItem::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 XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1908,24 +1857,14 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
 
 bool XLineEndItem::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 XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -2000,26 +1939,16 @@ SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
 
 bool XLineStartWidthItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
     SfxMapUnit          ePresUnit,
     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:
-            rText = GetMetricText( (long) GetValue(),
-                                    eCoreUnit, ePresUnit, pIntl) +
-                    " " + EE_RESSTR( GetMetricId( ePresUnit) );
-            return true;
-        default:
-            return false;
-    }
+    rText = GetMetricText( (long) GetValue(),
+                            eCoreUnit, ePresUnit, pIntl) +
+            " " + EE_RESSTR( GetMetricId( ePresUnit) );
+    return true;
 }
 
 bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2062,26 +1991,16 @@ SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XLineEndWidthItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          eCoreUnit,
     SfxMapUnit          ePresUnit,
     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:
-            rText = GetMetricText( (long) GetValue(),
-                                    eCoreUnit, ePresUnit, pIntl) +
-                    " " + EE_RESSTR( GetMetricId( ePresUnit) );
-            return true;
-        default:
-            return false;
-    }
+    rText = GetMetricText( (long) GetValue(),
+                            eCoreUnit, ePresUnit, pIntl) +
+            " " + EE_RESSTR( GetMetricId( ePresUnit) );
+    return true;
 }
 
 bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2124,25 +2043,15 @@ SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co
 
 bool XLineStartCenterItem::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 = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
-                            RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
-            return true;
-        default:
-            return false;
-    }
+    rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
+                    RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
+    return true;
 }
 
 bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2187,25 +2096,15 @@ SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 bool XLineEndCenterItem::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 = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
-                            RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
-            return true;
-        default:
-            return false;
-    }
+    rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
+                    RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
+    return true;
 }
 
 bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2252,7 +2151,7 @@ SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XFillStyleItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
@@ -2260,42 +2159,30 @@ bool XFillStyleItem::GetPresentation
 {
     rText = OUString();
 
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        {
-            sal_uInt16 nId = 0;
-
-            switch( (sal_uInt16)GetValue() )
-            {
-                case drawing::FillStyle_NONE:
-                    nId = RID_SVXSTR_INVISIBLE;
-                    break;
-                case drawing::FillStyle_SOLID:
-                    nId = RID_SVXSTR_SOLID;
-                    break;
-                case drawing::FillStyle_GRADIENT:
-                    nId = RID_SVXSTR_GRADIENT;
-                    break;
-                case drawing::FillStyle_HATCH:
-                    nId = RID_SVXSTR_HATCH;
-                    break;
-                case drawing::FillStyle_BITMAP:
-                    nId = RID_SVXSTR_BITMAP;
-                    break;
-            }
+    sal_uInt16 nId = 0;
 
-            if ( nId )
-                rText = SVX_RESSTR( nId );
-            return true;
-        }
-        default:
-            return false;
+    switch( (sal_uInt16)GetValue() )
+    {
+        case drawing::FillStyle_NONE:
+            nId = RID_SVXSTR_INVISIBLE;
+            break;
+        case drawing::FillStyle_SOLID:
+            nId = RID_SVXSTR_SOLID;
+            break;
+        case drawing::FillStyle_GRADIENT:
+            nId = RID_SVXSTR_GRADIENT;
+            break;
+        case drawing::FillStyle_HATCH:
+            nId = RID_SVXSTR_HATCH;
+            break;
+        case drawing::FillStyle_BITMAP:
+            nId = RID_SVXSTR_BITMAP;
+            break;
     }
+
+    if ( nId )
+        rText = SVX_RESSTR( nId );
+    return true;
 }
 
 sal_uInt16 XFillStyleItem::GetValueCount() const
@@ -2360,24 +2247,14 @@ SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XFillColorItem::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 XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2431,24 +2308,14 @@ sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*
 
 bool XSecondaryFillColorItem::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;
 }
 
 // class XGradient
@@ -2634,24 +2501,14 @@ sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) con
 
 bool XFillGradientItem::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 XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -3110,24 +2967,14 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 
 bool XFillHatchItem::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 XFillHatchItem::HasMetrics() const
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 4e283d5b1914..cd03b2b08e7e 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -68,8 +68,6 @@ bool XLineTransparenceItem::GetPresentation
 
     switch ( ePres )
     {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
@@ -115,55 +113,44 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const
     return new XLineJointItem( *this );
 }
 
-bool XLineJointItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
+bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
     SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
 {
     rText = OUString();
 
-    switch( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE: return false;
-
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-        {
-            sal_uInt16 nId = 0;
+    sal_uInt16 nId = 0;
 
-            switch( GetValue() )
-            {
-                case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ):
-                case( com::sun::star::drawing::LineJoint_NONE ):
-                    nId = RID_SVXSTR_LINEJOINT_NONE;
-                break;
+    switch( GetValue() )
+    {
+        case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ):
+        case( com::sun::star::drawing::LineJoint_NONE ):
+            nId = RID_SVXSTR_LINEJOINT_NONE;
+        break;
 
-                case( com::sun::star::drawing::LineJoint_MIDDLE ):
-                    nId = RID_SVXSTR_LINEJOINT_MIDDLE;
-                break;
+        case( com::sun::star::drawing::LineJoint_MIDDLE ):
+            nId = RID_SVXSTR_LINEJOINT_MIDDLE;
+        break;
 
 
-                case( com::sun::star::drawing::LineJoint_BEVEL ):
-                    nId = RID_SVXSTR_LINEJOINT_BEVEL;
-                break;
+        case( com::sun::star::drawing::LineJoint_BEVEL ):
+            nId = RID_SVXSTR_LINEJOINT_BEVEL;
+        break;
 
 
-                case( com::sun::star::drawing::LineJoint_MITER ):
-                    nId = RID_SVXSTR_LINEJOINT_MITER;
-                break;
+        case( com::sun::star::drawing::LineJoint_MITER ):
+            nId = RID_SVXSTR_LINEJOINT_MITER;
+        break;
 
 
-                case( com::sun::star::drawing::LineJoint_ROUND ):
-                    nId = RID_SVXSTR_LINEJOINT_ROUND;
-                break;
-            }
+        case( com::sun::star::drawing::LineJoint_ROUND ):
+            nId = RID_SVXSTR_LINEJOINT_ROUND;
+        break;
+    }
 
-            if( nId )
-                rText = SVX_RESSTR( nId );
+    if( nId )
+        rText = SVX_RESSTR( nId );
 
-            return true;
-        }
-        default:
-            return false;
-    }
+    return true;
 }
 
 bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -334,43 +321,32 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const
     return new XLineCapItem( *this );
 }
 
-bool XLineCapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
+bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
                                                      SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
 {
     rText = OUString();
 
-    switch( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE: return false;
+    sal_uInt16 nId = 0;
 
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-        {
-            sal_uInt16 nId = 0;
-
-            switch( GetValue() )
-            {
-                default: /*com::sun::star::drawing::LineCap_BUTT*/
-                    nId = RID_SVXSTR_LINECAP_BUTT;
-                break;
+    switch( GetValue() )
+    {
+        default: /*com::sun::star::drawing::LineCap_BUTT*/
+            nId = RID_SVXSTR_LINECAP_BUTT;
+        break;
 
-                case(com::sun::star::drawing::LineCap_ROUND):
-                    nId = RID_SVXSTR_LINECAP_ROUND;
-                break;
+        case(com::sun::star::drawing::LineCap_ROUND):
+            nId = RID_SVXSTR_LINECAP_ROUND;
+        break;
 
-                case(com::sun::star::drawing::LineCap_SQUARE):
-                    nId = RID_SVXSTR_LINECAP_SQUARE;
-                break;
-            }
+        case(com::sun::star::drawing::LineCap_SQUARE):
+            nId = RID_SVXSTR_LINECAP_SQUARE;
+        break;
+    }
 
-            if( nId )
-                rText = SVX_RESSTR( nId );
+    if( nId )
+        rText = SVX_RESSTR( nId );
 
-            return true;
-        }
-        default:
-            return false;
-    }
+    return true;
 }
 
 bool XLineCapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -458,8 +434,6 @@ bool XFillTransparenceItem::GetPresentation
 
     switch ( ePres )
     {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
@@ -521,7 +495,7 @@ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
 
 bool XGradientStepCountItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
@@ -529,18 +503,8 @@ bool XGradientStepCountItem::GetPresentation
 {
     rText = OUString();
 
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-//          rText = OUString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ) + ": ";
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += OUString::number(GetValue());
-            return true;
-        default:
-            return false;
-    }
+    rText += OUString::number(GetValue());
+    return true;
 }
 
 // class XFillBmpTileItem
@@ -569,24 +533,14 @@ SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XFillBmpTileItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBmpTilePosItem
@@ -615,24 +569,14 @@ SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 
 bool XFillBmpPosItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 sal_uInt16 XFillBmpPosItem::GetValueCount() const
@@ -666,24 +610,14 @@ SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 bool XFillBmpSizeXItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 bool XFillBmpSizeXItem::HasMetrics() const
@@ -717,24 +651,14 @@ SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons
 
 bool XFillBmpSizeYItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 bool XFillBmpSizeYItem::HasMetrics() const
@@ -768,24 +692,14 @@ SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co
 
 bool XFillBmpSizeLogItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBmpTileOffXItem
@@ -814,24 +728,14 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/
 
 bool XFillBmpTileOffsetXItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBmpTileOffYItem
@@ -860,24 +764,14 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/
 
 bool XFillBmpTileOffsetYItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBmpStretchItem
@@ -906,24 +800,14 @@ SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co
 
 bool XFillBmpStretchItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBmpTileOffPosXItem
@@ -952,24 +836,14 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/)
 
 bool XFillBmpPosOffsetXItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBmpTileOffPosYItem
@@ -998,24 +872,14 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/)
 
 bool XFillBmpPosOffsetYItem::GetPresentation
 (
-    SfxItemPresentation ePres,
+    SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
     SfxMapUnit          /*ePresUnit*/,
     OUString&           rText, const IntlWrapper *
 )   const
 {
     rText = OUString();
-
-    switch ( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 // class XFillBackgroundItem
@@ -1042,22 +906,11 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
     return new XFillBackgroundItem( rIn );
 }
 
-bool XFillBackgroundItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
+bool XFillBackgroundItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/,
                                                           SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
 {
     rText = OUString();
-
-    switch( ePres )
-    {
-        case SFX_ITEM_PRESENTATION_NONE:
-            return false;
-
-        case SFX_ITEM_PRESENTATION_COMPLETE:
-        case SFX_ITEM_PRESENTATION_NAMELESS:
-            return true;
-        default:
-            return false;
-    }
+    return true;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index ed12a6217f48..b7cce270d38a 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -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