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

15 files changed, 262 insertions, 257 deletions

diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 67bb8b7d56c0..7b8d804a65e4 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -103,7 +103,7 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const
                 nFldSnapY    == rItem.nFldSnapY     );
 }
 
-SfxItemPresentation  SvxGridItem::GetPresentation
+bool  SvxGridItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -115,13 +115,13 @@ SfxItemPresentation  SvxGridItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = "SvxGridItem";
             return ePres;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 4983389f86dd..ce98f9c82038 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -119,14 +119,14 @@ bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
     return false;
 }
 
-SfxItemPresentation SvxLongLRSpaceItem::GetPresentation(
+bool SvxLongLRSpaceItem::GetPresentation(
                         SfxItemPresentation /*ePres*/,
                         SfxMapUnit          /*eCoreUnit*/,
                         SfxMapUnit          /*ePresUnit*/,
                         OUString&           /*rText*/,
                         const IntlWrapper*  /*pWrapper*/) const
 {
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const
@@ -252,14 +252,14 @@ bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
     return false;
 }
 
-SfxItemPresentation SvxLongULSpaceItem::GetPresentation(
+bool SvxLongULSpaceItem::GetPresentation(
                         SfxItemPresentation /*ePres*/,
                         SfxMapUnit          /*eCoreUnit*/,
                         SfxMapUnit          /*ePresUnit*/,
                         OUString&           /*rText*/,
                         const IntlWrapper*  /*pWrapper*/ ) const
 {
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const
@@ -379,14 +379,14 @@ OUString SvxPagePosSizeItem::GetValueText() const
     return OUString();
 }
 
-SfxItemPresentation SvxPagePosSizeItem::GetPresentation(
+bool SvxPagePosSizeItem::GetPresentation(
                         SfxItemPresentation /*ePres*/,
                         SfxMapUnit          /*eCoreUnit*/,
                         SfxMapUnit          /*ePresUnit*/,
                         OUString&           /*rText*/,
                         const IntlWrapper*  /*pWrapper*/ ) const
 {
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 SfxPoolItem* SvxPagePosSizeItem::Clone(SfxItemPool *) const
@@ -475,14 +475,14 @@ OUString SvxColumnItem::GetValueText() const
     return OUString();
 }
 
-SfxItemPresentation SvxColumnItem::GetPresentation(
+bool SvxColumnItem::GetPresentation(
                         SfxItemPresentation /*ePres*/,
                         SfxMapUnit          /*eCoreUnit*/,
                         SfxMapUnit          /*ePresUnit*/,
                         OUString&           /*rText*/,
                         const IntlWrapper*  /*pWrapper*/ ) const
 {
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const
@@ -723,14 +723,14 @@ OUString SvxObjectItem::GetValueText() const
     return OUString();
 }
 
-SfxItemPresentation SvxObjectItem::GetPresentation(
+bool SvxObjectItem::GetPresentation(
                         SfxItemPresentation /*ePres*/,
                         SfxMapUnit          /*eCoreUnit*/,
                         SfxMapUnit          /*ePresUnit*/,
                         OUString&           /*rText*/,
                         const IntlWrapper*  /*pWrapper*/ ) const
 {
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 2cdc3ca31635..5f534a31c43d 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -60,7 +60,7 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons
 
 
 
-SfxItemPresentation SvxOrientationItem::GetPresentation
+bool SvxOrientationItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -71,14 +71,14 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetValueText( GetValue() );
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         default: ; //prevent warning
     }
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
@@ -228,7 +228,7 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) :
 
 
 
-SfxItemPresentation SvxMarginItem::GetPresentation
+bool SvxMarginItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          eCoreUnit,
@@ -242,7 +242,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
             rText = GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
@@ -252,7 +252,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation
                         GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
                         cpDelimTmp +
                         GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl );
-            return SFX_ITEM_PRESENTATION_NAMELESS;
+            return true;
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
@@ -271,11 +271,11 @@ SfxItemPresentation SvxMarginItem::GetPresentation
                         SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) +
                         GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) +
                         " " + EE_RESSTR(GetMetricId(ePresUnit));
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         }
         default: ; //prevent warning
     }
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index f975bd9bf02d..128df692105a 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -246,7 +246,7 @@ OUString SvxDoubleItem::GetValueText() const
 
 
 
-SfxItemPresentation SvxDoubleItem::GetPresentation
+bool SvxDoubleItem::GetPresentation
             ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/,
               SfxMapUnit /*ePresentationMetric*/, OUString& rText,
               const IntlWrapper * pIntlWrapper) const
@@ -259,7 +259,7 @@ SfxItemPresentation SvxDoubleItem::GetPresentation
     }
     else
         rText = GetValueText();
-    return SFX_ITEM_PRESENTATION_NAMELESS;
+    return true;
 }
 
 
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 16a57671eba3..b5bc7a9d56fb 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -239,7 +239,7 @@ bool SdrCustomShapeGeometryItem::operator==( const SfxPoolItem& rCmp ) const
     return bRet;
 }
 
-SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation(
+bool SdrCustomShapeGeometryItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
 {
@@ -247,8 +247,11 @@ SfxItemPresentation SdrCustomShapeGeometryItem::GetPresentation(
     if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE )
     {
         rText = " " + rText;
+        return true;
     }
-    return ePresentation;
+    else if ( ePresentation == SFX_ITEM_PRESENTATION_NAMELESS )
+        return true;
+    return false;
 }
 
 SfxPoolItem* SdrCustomShapeGeometryItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 91c2282343c7..93a981918639 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -54,7 +54,7 @@ SvxColorListItem::SvxColorListItem( const SvxColorListItem& rItem ) :
 {
 }
 
-SfxItemPresentation SvxColorListItem::GetPresentation
+bool SvxColorListItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -63,7 +63,7 @@ SfxItemPresentation SvxColorListItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 bool SvxColorListItem::operator==( const SfxPoolItem& rItem ) const
@@ -123,7 +123,7 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) :
 
 
 
-SfxItemPresentation SvxGradientListItem::GetPresentation
+bool SvxGradientListItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -132,7 +132,7 @@ SfxItemPresentation SvxGradientListItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
@@ -177,7 +177,7 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) :
 
 
 
-SfxItemPresentation SvxHatchListItem::GetPresentation
+bool SvxHatchListItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -186,7 +186,7 @@ SfxItemPresentation SvxHatchListItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
@@ -227,7 +227,7 @@ SvxBitmapListItem::SvxBitmapListItem( const SvxBitmapListItem& rItem ) :
 {
 }
 
-SfxItemPresentation SvxBitmapListItem::GetPresentation
+bool SvxBitmapListItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -236,7 +236,7 @@ SfxItemPresentation SvxBitmapListItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 bool SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const
@@ -275,7 +275,7 @@ SvxDashListItem::SvxDashListItem( const SvxDashListItem& rItem ) :
 {
 }
 
-SfxItemPresentation SvxDashListItem::GetPresentation
+bool SvxDashListItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -284,7 +284,7 @@ SfxItemPresentation SvxDashListItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 bool SvxDashListItem::operator==( const SfxPoolItem& rItem ) const
@@ -322,7 +322,7 @@ SvxLineEndListItem::SvxLineEndListItem( const SvxLineEndListItem& rItem ) :
 {
 }
 
-SfxItemPresentation SvxLineEndListItem::GetPresentation
+bool SvxLineEndListItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -331,7 +331,7 @@ SfxItemPresentation SvxLineEndListItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 bool SvxLineEndListItem::operator==( const SfxPoolItem& rItem ) const
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 748221048dca..3158b83853b1 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -128,7 +128,7 @@ bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return  true;
 }
 
-SfxItemPresentation SvxGrfCrop::GetPresentation(
+bool SvxGrfCrop::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit /*ePresUnit*/,
     OUString &rText, const IntlWrapper* pIntl ) const
 {
@@ -136,21 +136,19 @@ SfxItemPresentation SvxGrfCrop::GetPresentation(
     switch( ePres )
     {
     case SFX_ITEM_PRESENTATION_NAMELESS:
+        return true;
     case SFX_ITEM_PRESENTATION_COMPLETE:
-        if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
-        {
-            rText = "L: "  + OUString(::GetMetricText( GetLeft(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) +
-                    " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) +
-                    " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) +
-                    " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, SFX_MAPUNIT_MM, pIntl ));
-        }
+        rText = "L: "  + OUString(::GetMetricText( GetLeft(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) +
+                " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) +
+                " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, SFX_MAPUNIT_MM, pIntl )) +
+                " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, SFX_MAPUNIT_MM, pIntl ));
+        return true;
         break;
 
     default:
-        ePres = SFX_ITEM_PRESENTATION_NONE;
+        return false;
         break;
     }
-    return ePres;
 }
 
 
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index cbceee89cd80..6aabe79d4063 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -117,7 +117,7 @@ SvxNumberInfoItem::~SvxNumberInfoItem()
 
 
 
-SfxItemPresentation SvxNumberInfoItem::GetPresentation
+bool SvxNumberInfoItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -126,7 +126,7 @@ SfxItemPresentation SvxNumberInfoItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 3539ff1cc6f7..b7dee44cdf66 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -96,7 +96,7 @@ inline OUString GetUsageText( const sal_uInt16 eU )
 
 
 
-SfxItemPresentation SvxPageItem::GetPresentation
+bool SvxPageItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -110,7 +110,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
             if ( !aDescName.isEmpty() )
@@ -128,7 +128,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
             {
                 rText += cpDelimTmp + aUsageText;
             }
-            return SFX_ITEM_PRESENTATION_NAMELESS;
+            return true;
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
@@ -148,11 +148,11 @@ SfxItemPresentation SvxPageItem::GetPresentation
             {
                 rText += cpDelimTmp + aUsageText;
             }
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         }
         default: ;//prevent warning
     }
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
@@ -297,7 +297,7 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const
 
 
 
-SfxItemPresentation SvxSetItem::GetPresentation
+bool SvxSetItem::GetPresentation
 (
     SfxItemPresentation /*ePres*/,
     SfxMapUnit          /*eCoreUnit*/,
@@ -306,7 +306,7 @@ SfxItemPresentation SvxSetItem::GetPresentation
 )   const
 {
     rText = OUString();
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, sal_uInt16 /*nVersion*/) const
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 38e1384ab8dc..36e4ff367c1a 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -45,7 +45,7 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor,
 
 
 
-SfxItemPresentation SvxPostItAuthorItem::GetPresentation
+bool SvxPostItAuthorItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -57,16 +57,16 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText = GetValue();
-            return SFX_ITEM_PRESENTATION_NAMELESS;
+            return true;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = SVX_RESSTR(RID_SVXITEMS_AUTHOR_COMPLETE) + GetValue();
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         default: ;//prevent warning
     }
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
@@ -93,7 +93,7 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich
 
 
 
-SfxItemPresentation SvxPostItDateItem::GetPresentation
+bool SvxPostItDateItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -105,16 +105,16 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText = GetValue();
-            return SFX_ITEM_PRESENTATION_NAMELESS;
+            return true;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = SVX_RESSTR(RID_SVXITEMS_DATE_COMPLETE) + GetValue();
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         default: ;//prevent warning
     }
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
@@ -141,7 +141,7 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich
 
 
 
-SfxItemPresentation SvxPostItTextItem::GetPresentation
+bool SvxPostItTextItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -153,16 +153,16 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText = GetValue();
-            return SFX_ITEM_PRESENTATION_NAMELESS;
+            return true;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = SVX_RESSTR(RID_SVXITEMS_TEXT_COMPLETE) + GetValue();
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         default: ;//prevent warning
     }
-    return SFX_ITEM_PRESENTATION_NONE;
+    return false;
 }
 
 
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index c3e87d97a596..abf7296632ba 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -66,7 +66,7 @@ SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const
     return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() );
 }
 
-SfxItemPresentation SvxRotateModeItem::GetPresentation(
+bool SvxRotateModeItem::GetPresentation(
                                 SfxItemPresentation ePres,
                                 SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
                                 OUString& rText, const IntlWrapper * )  const
@@ -81,11 +81,12 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText += OUString( GetValue() );
+            return true;
             break;
         default: ;//prevent warning
     }
 
-    return ePres;
+    return false;
 }
 
 OUString SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 0ddb21509427..61016ed6f333 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -395,7 +395,7 @@ SdrItemPool::~SdrItemPool()
     SetSecondaryPool(NULL);
 }
 
-SfxItemPresentation SdrItemPool::GetPresentation(
+bool SdrItemPool::GetPresentation(
               const SfxPoolItem& rItem,
               SfxMapUnit ePresentationMetric, OUString& rText,
               const IntlWrapper * pIntlWrapper) const
@@ -411,7 +411,7 @@ SfxItemPresentation SdrItemPool::GetPresentation(
             TakeItemName(nWhich, aStr);
             rText = aStr + " " + rText;
 
-            return SFX_ITEM_PRESENTATION_COMPLETE;
+            return true;
         }
     }
     return XOutdevItemPool::GetPresentation(rItem,ePresentationMetric,rText,pIntlWrapper);
@@ -662,7 +662,7 @@ bool SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
            ((SdrFractionItem&)rCmp).GetValue()==nValue;
 }
 
-SfxItemPresentation SdrFractionItem::GetPresentation(
+bool SdrFractionItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
 {
@@ -687,9 +687,12 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
 
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
+        return true;
     }
+    else if(ePresentation == SFX_ITEM_PRESENTATION_NAMELESS)
+        return true;
 
-    return ePresentation;
+    return false;
 }
 
 SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
@@ -715,7 +718,7 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
 
 TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
 
-SfxItemPresentation SdrScaleItem::GetPresentation(
+bool SdrScaleItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
 {
@@ -738,7 +741,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
         rText = aStr + " " + rText;
     }
 
-    return ePresentation;
+    return ePresentation != SFX_ITEM_PRESENTATION_NONE;
 }
 
 SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
@@ -774,7 +777,7 @@ OUString SdrOnOffItem::GetValueTextByVal(bool bVal) const
     return ImpGetResStr(STR_ItemValOFF);
 }
 
-SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByVal(GetValue());
@@ -784,7 +787,7 @@ SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
@@ -806,7 +809,7 @@ OUString SdrYesNoItem::GetValueTextByVal(bool bVal) const
     return ImpGetResStr(STR_ItemValNO);
 }
 
-SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByVal(GetValue());
@@ -816,7 +819,7 @@ SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 
@@ -835,7 +838,7 @@ SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new SdrPercentItem(Which(),rIn);
 }
 
-SfxItemPresentation SdrPercentItem::GetPresentation(
+bool SdrPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
@@ -850,7 +853,7 @@ SfxItemPresentation SdrPercentItem::GetPresentation(
         rText = aStr + " " + rText;
     }
 
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 
@@ -869,7 +872,7 @@ SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new SdrAngleItem(Which(),rIn);
 }
 
-SfxItemPresentation SdrAngleItem::GetPresentation(
+bool SdrAngleItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     OUString& rText, const IntlWrapper * pIntlWrapper) const
 {
@@ -939,7 +942,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     }
 
     rText = aText.makeStringAndClear();
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 
@@ -975,7 +978,7 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
     return true;
 }
 
-SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper *) const
 {
     long nValue=GetValue();
@@ -990,7 +993,7 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
         SdrItemPool::TakeItemName(Which(), aStr2);
         rText = aStr2 + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 
@@ -1010,7 +1013,7 @@ OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
 }
 
-SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1020,7 +1023,7 @@ SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePre
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
@@ -1036,7 +1039,7 @@ OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
 }
 
-SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1046,7 +1049,7 @@ SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation eP
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 
@@ -1067,7 +1070,7 @@ OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
 }
 
-SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1077,7 +1080,7 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; }
@@ -1127,7 +1130,7 @@ OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
 }
 
-SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1137,7 +1140,7 @@ SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation e
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1176,7 +1179,7 @@ OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
 }
 
-SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1186,7 +1189,7 @@ SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation e
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1225,7 +1228,7 @@ OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
 }
 
-SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1235,7 +1238,7 @@ SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePre
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1273,7 +1276,7 @@ OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
 }
 
-SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1283,7 +1286,7 @@ SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1315,7 +1318,7 @@ SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const
 
 SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniDelayItem(rIn); }
 
-SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
+bool SdrTextAniDelayItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     OUString& rText, const IntlWrapper *) const
 {
@@ -1329,7 +1332,7 @@ SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
         rText = aStr + " " + rText;
     }
 
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
@@ -1355,7 +1358,7 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
     } else return false;
 }
 
-SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
+bool SdrTextAniAmountItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
     OUString& rText, const IntlWrapper *) const
 {
@@ -1386,7 +1389,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
         rText = aStr + " " + rText;
     }
 
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
@@ -1404,7 +1407,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_
         SetValue( bValue );
     }
 }
-SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres,
+bool SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/,
                                     OUString &rText, const IntlWrapper * ) const
 {
@@ -1415,7 +1418,7 @@ SfxItemPresentation SdrTextFixedCellHeightItem::GetPresentation( SfxItemPresenta
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 SfxPoolItem* SdrTextFixedCellHeightItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
 {
@@ -1496,7 +1499,7 @@ bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const
     return bRet;
 }
 
-SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation(
+bool SdrCustomShapeAdjustmentItem::GetPresentation(
     SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const
 {
@@ -1513,7 +1516,7 @@ SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation(
         SdrItemPool::TakeItemName( Which(), aStr );
         rText = aStr + " " + rText;
     }
-    return ePresentation;
+    return ePresentation != SFX_ITEM_PRESENTATION_NONE;
 }
 
 SfxPoolItem* SdrCustomShapeAdjustmentItem::Create( SvStream& rIn, sal_uInt16 nItemVersion ) const
@@ -1620,7 +1623,7 @@ OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
 }
 
-SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1630,7 +1633,7 @@ SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1809,7 +1812,7 @@ OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
 }
 
-SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1819,7 +1822,7 @@ SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePre
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1857,7 +1860,7 @@ OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
 }
 
-SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1867,7 +1870,7 @@ SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1905,7 +1908,7 @@ OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
 }
 
-SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1915,7 +1918,7 @@ SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -1960,7 +1963,7 @@ OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
     return aRetval;
 }
 
-SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -1970,7 +1973,7 @@ SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePre
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2006,7 +2009,7 @@ OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
     return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
 }
 
-SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
+bool SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString& rText, const IntlWrapper *) const
 {
     rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
@@ -2016,7 +2019,7 @@ SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
         SdrItemPool::TakeItemName(Which(), aStr);
         rText = aStr + " " + rText;
     }
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
@@ -2058,7 +2061,7 @@ SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c
     return new SdrSignedPercentItem( Which(), rIn );
 }
 
-SfxItemPresentation SdrSignedPercentItem::GetPresentation(
+bool SdrSignedPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     OUString& rText, const IntlWrapper *) const
 {
@@ -2073,7 +2076,7 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation(
         rText = aStr + " " + rText;
     }
 
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2272,7 +2275,7 @@ OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
     return aStr;
 }
 
-SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
+bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
                                                                SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
                                                                OUString& rText, const IntlWrapper *) const
 {
@@ -2286,7 +2289,7 @@ SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
         rText = aStr + " " + rText;
     }
 
-    return ePres;
+    return ePres != SFX_ITEM_PRESENTATION_NONE;
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 7a652f08299b..37d610a4ff08 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -375,7 +375,7 @@ SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XLineStyleItem(rIn);
 }
 
-SfxItemPresentation XLineStyleItem::GetPresentation
+bool XLineStyleItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -388,7 +388,7 @@ SfxItemPresentation XLineStyleItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
@@ -406,10 +406,10 @@ SfxItemPresentation XLineStyleItem::GetPresentation
 
             if ( nId )
                 rText = SVX_RESSTR( nId );
-            return ePres;
+            return true;
         }
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -731,7 +731,7 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 }
 
 
-SfxItemPresentation XLineDashItem::GetPresentation
+bool XLineDashItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -743,13 +743,13 @@ SfxItemPresentation XLineDashItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -1059,7 +1059,7 @@ SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XLineWidthItem(rIn);
 }
 
-SfxItemPresentation XLineWidthItem::GetPresentation
+bool XLineWidthItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          eCoreUnit,
@@ -1071,15 +1071,15 @@ SfxItemPresentation XLineWidthItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetMetricText( (long) GetValue(),
                                     eCoreUnit, ePresUnit, pIntl) +
                     " " + EE_RESSTR( GetMetricId( ePresUnit) );
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -1133,7 +1133,7 @@ SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XLineColorItem(rIn);
 }
 
-SfxItemPresentation XLineColorItem::GetPresentation
+bool XLineColorItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -1145,13 +1145,13 @@ SfxItemPresentation XLineColorItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -1331,7 +1331,7 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 }
 
 
-SfxItemPresentation XLineStartItem::GetPresentation
+bool XLineStartItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -1343,13 +1343,13 @@ SfxItemPresentation XLineStartItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-        return SFX_ITEM_PRESENTATION_NONE;
+        return false;
     }
 }
 
@@ -1906,7 +1906,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
     return (XLineEndItem*)this;
 }
 
-SfxItemPresentation XLineEndItem::GetPresentation
+bool XLineEndItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -1918,13 +1918,13 @@ SfxItemPresentation XLineEndItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -1998,7 +1998,7 @@ SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
     return new XLineStartWidthItem(rIn);
 }
 
-SfxItemPresentation XLineStartWidthItem::GetPresentation
+bool XLineStartWidthItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          eCoreUnit,
@@ -2010,15 +2010,15 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetMetricText( (long) GetValue(),
                                     eCoreUnit, ePresUnit, pIntl) +
                     " " + EE_RESSTR( GetMetricId( ePresUnit) );
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2060,7 +2060,7 @@ SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XLineEndWidthItem(rIn);
 }
 
-SfxItemPresentation XLineEndWidthItem::GetPresentation
+bool XLineEndWidthItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          eCoreUnit,
@@ -2072,15 +2072,15 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetMetricText( (long) GetValue(),
                                     eCoreUnit, ePresUnit, pIntl) +
                     " " + EE_RESSTR( GetMetricId( ePresUnit) );
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2122,7 +2122,7 @@ SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co
     return new XLineStartCenterItem(rIn);
 }
 
-SfxItemPresentation XLineStartCenterItem::GetPresentation
+bool XLineStartCenterItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2134,14 +2134,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
                             RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2185,7 +2185,7 @@ SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
     return new XLineEndCenterItem(rIn);
 }
 
-SfxItemPresentation XLineEndCenterItem::GetPresentation
+bool XLineEndCenterItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2197,14 +2197,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = OUString( ResId( GetValue() ? RID_SVXSTR_CENTERED :
                             RID_SVXSTR_NOTCENTERED, DIALOG_MGR() ) );
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2250,7 +2250,7 @@ SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XFillStyleItem(rIn);
 }
 
-SfxItemPresentation XFillStyleItem::GetPresentation
+bool XFillStyleItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2263,7 +2263,7 @@ SfxItemPresentation XFillStyleItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
@@ -2291,10 +2291,10 @@ SfxItemPresentation XFillStyleItem::GetPresentation
 
             if ( nId )
                 rText = SVX_RESSTR( nId );
-            return ePres;
+            return true;
         }
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2358,7 +2358,7 @@ SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XFillColorItem(rIn);
 }
 
-SfxItemPresentation XFillColorItem::GetPresentation
+bool XFillColorItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2370,13 +2370,13 @@ SfxItemPresentation XFillColorItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2429,7 +2429,7 @@ sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*
     return 2;
 }
 
-SfxItemPresentation XSecondaryFillColorItem::GetPresentation
+bool XSecondaryFillColorItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2441,13 +2441,13 @@ SfxItemPresentation XSecondaryFillColorItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2632,7 +2632,7 @@ sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) con
     return 1;
 }
 
-SfxItemPresentation XFillGradientItem::GetPresentation
+bool XFillGradientItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -2644,13 +2644,13 @@ SfxItemPresentation XFillGradientItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -2956,7 +2956,7 @@ bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVa
     return XFillGradientItem::PutValue( rVal, nMemberId );
 }
 
-SfxItemPresentation XFillFloatTransparenceItem::GetPresentation(    SfxItemPresentation ePres,
+bool XFillFloatTransparenceItem::GetPresentation(    SfxItemPresentation ePres,
                                                                     SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
                                                                     OUString& rText,
                                                                     const IntlWrapper * pIntlWrapper ) const
@@ -3108,7 +3108,7 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 }
 
 
-SfxItemPresentation XFillHatchItem::GetPresentation
+bool XFillHatchItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -3120,13 +3120,13 @@ SfxItemPresentation XFillHatchItem::GetPresentation
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 0291ec402e0c..4e283d5b1914 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -56,7 +56,7 @@ SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
     return new XLineTransparenceItem(rIn);
 }
 
-SfxItemPresentation XLineTransparenceItem::GetPresentation
+bool XLineTransparenceItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -69,15 +69,15 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText += unicode::formatPercent(GetValue(),
                 Application::GetSettings().GetUILanguageTag());
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -115,14 +115,14 @@ SfxPoolItem* XLineJointItem::Clone(SfxItemPool* /*pPool*/) const
     return new XLineJointItem( *this );
 }
 
-SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
+bool XLineJointItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
     SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
 {
     rText = OUString();
 
     switch( ePres )
     {
-        case SFX_ITEM_PRESENTATION_NONE: return ePres;
+        case SFX_ITEM_PRESENTATION_NONE: return false;
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
@@ -159,10 +159,10 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
             if( nId )
                 rText = SVX_RESSTR( nId );
 
-            return ePres;
+            return true;
         }
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -334,14 +334,14 @@ SfxPoolItem* XLineCapItem::Clone(SfxItemPool* /*pPool*/) const
     return new XLineCapItem( *this );
 }
 
-SfxItemPresentation XLineCapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
+bool XLineCapItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
                                                      SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
 {
     rText = OUString();
 
     switch( ePres )
     {
-        case SFX_ITEM_PRESENTATION_NONE: return ePres;
+        case SFX_ITEM_PRESENTATION_NONE: return false;
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
@@ -366,10 +366,10 @@ SfxItemPresentation XLineCapItem::GetPresentation( SfxItemPresentation ePres, Sf
             if( nId )
                 rText = SVX_RESSTR( nId );
 
-            return ePres;
+            return true;
         }
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -446,7 +446,7 @@ SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
     return new XFillTransparenceItem(rIn);
 }
 
-SfxItemPresentation XFillTransparenceItem::GetPresentation
+bool XFillTransparenceItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -459,15 +459,15 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = OUString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ) + ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText += unicode::formatPercent(GetValue(),
                 Application::GetSettings().GetUILanguageTag());
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -519,7 +519,7 @@ SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
     return new XGradientStepCountItem( rIn );
 }
 
-SfxItemPresentation XGradientStepCountItem::GetPresentation
+bool XGradientStepCountItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -532,14 +532,14 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
 //          rText = OUString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ) + ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText += OUString::number(GetValue());
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -567,7 +567,7 @@ SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XFillBmpTileItem( rIn );
 }
 
-SfxItemPresentation XFillBmpTileItem::GetPresentation
+bool XFillBmpTileItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -580,12 +580,12 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -613,7 +613,7 @@ SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
     return new XFillBmpPosItem( rIn );
 }
 
-SfxItemPresentation XFillBmpPosItem::GetPresentation
+bool XFillBmpPosItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -626,12 +626,12 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -664,7 +664,7 @@ SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons
     return new XFillBmpSizeXItem( rIn );
 }
 
-SfxItemPresentation XFillBmpSizeXItem::GetPresentation
+bool XFillBmpSizeXItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -677,12 +677,12 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -715,7 +715,7 @@ SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons
     return new XFillBmpSizeYItem( rIn );
 }
 
-SfxItemPresentation XFillBmpSizeYItem::GetPresentation
+bool XFillBmpSizeYItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -728,12 +728,12 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -766,7 +766,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co
     return new XFillBmpSizeLogItem( rIn );
 }
 
-SfxItemPresentation XFillBmpSizeLogItem::GetPresentation
+bool XFillBmpSizeLogItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -779,12 +779,12 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -812,7 +812,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/
     return new XFillBmpTileOffsetXItem( rIn );
 }
 
-SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation
+bool XFillBmpTileOffsetXItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -825,12 +825,12 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -858,7 +858,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/
     return new XFillBmpTileOffsetYItem( rIn );
 }
 
-SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation
+bool XFillBmpTileOffsetYItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -871,12 +871,12 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -904,7 +904,7 @@ SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co
     return new XFillBmpStretchItem( rIn );
 }
 
-SfxItemPresentation XFillBmpStretchItem::GetPresentation
+bool XFillBmpStretchItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -917,12 +917,12 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -950,7 +950,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/)
     return new XFillBmpPosOffsetXItem( rIn );
 }
 
-SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation
+bool XFillBmpPosOffsetXItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -963,12 +963,12 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -996,7 +996,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/)
     return new XFillBmpPosOffsetYItem( rIn );
 }
 
-SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation
+bool XFillBmpPosOffsetYItem::GetPresentation
 (
     SfxItemPresentation ePres,
     SfxMapUnit          /*eCoreUnit*/,
@@ -1009,12 +1009,12 @@ SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
@@ -1042,7 +1042,7 @@ SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
     return new XFillBackgroundItem( rIn );
 }
 
-SfxItemPresentation XFillBackgroundItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
+bool XFillBackgroundItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/,
                                                           SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper*) const
 {
     rText = OUString();
@@ -1050,13 +1050,13 @@ SfxItemPresentation XFillBackgroundItem::GetPresentation( SfxItemPresentation eP
     switch( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
-            return ePres;
+            return false;
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }
 
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 3070c497d20b..ed12a6217f48 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -381,7 +381,7 @@ sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
     return(2);
 }
 
-SfxItemPresentation XFillBitmapItem::GetPresentation(
+bool XFillBitmapItem::GetPresentation(
     SfxItemPresentation ePres,
     SfxMapUnit /*eCoreUnit*/,
     SfxMapUnit /*ePresUnit*/,
@@ -392,13 +392,13 @@ SfxItemPresentation XFillBitmapItem::GetPresentation(
     {
         case SFX_ITEM_PRESENTATION_NONE:
             rText = OUString();
-            return ePres;
+            return false;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText += GetName();
-            return ePres;
+            return true;
         default:
-            return SFX_ITEM_PRESENTATION_NONE;
+            return false;
     }
 }