From 7e018afaf74ab118fe21d92edc9fb95ddea5d61b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 24 Jul 2014 11:31:39 +0200 Subject: 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 --- include/svl/cenumitm.hxx | 2 +- include/svl/cintitem.hxx | 8 ++++---- include/svl/ctypeitm.hxx | 2 +- include/svl/custritm.hxx | 2 +- include/svl/eitem.hxx | 2 +- include/svl/flagitem.hxx | 2 +- include/svl/int64item.hxx | 2 +- include/svl/intitem.hxx | 2 +- include/svl/itempool.hxx | 4 +++- include/svl/macitem.hxx | 2 +- include/svl/poolitem.hxx | 7 ++++--- include/svl/ptitem.hxx | 2 +- include/svl/rectitem.hxx | 2 +- include/svl/rngitem.hxx | 4 ++-- include/svl/slstitm.hxx | 2 +- include/svl/srchitem.hxx | 2 +- include/svl/szitem.hxx | 2 +- include/svl/visitem.hxx | 2 +- 18 files changed, 27 insertions(+), 24 deletions(-) (limited to 'include/svl') diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 2a8a32d441a2..7b7de9ac8d9c 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -37,7 +37,7 @@ public: virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 0fe12969b124..658aa94099a7 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -45,7 +45,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) @@ -104,7 +104,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) @@ -163,7 +163,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) @@ -222,7 +222,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index b8315ab51994..abb900003f54 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -52,7 +52,7 @@ public: using SfxPoolItem::Compare; virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 1cdc6d72b1b9..0897ab5d43d1 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -51,7 +51,7 @@ public: virtual int Compare(SfxPoolItem const & rWith, IntlWrapper const & rIntlWrapper) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 328216bfa05e..e8c65904660b 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -91,7 +91,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 24e38627cce4..cabfd16f6013 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -44,7 +44,7 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index c49ead68e29f..dbba22528343 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -29,7 +29,7 @@ public: virtual int Compare( const SfxPoolItem& r ) const SAL_OVERRIDE; virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const SAL_OVERRIDE; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 262915df4ba5..bea485b46c8b 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -62,7 +62,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 5b6a14dbe139..8f83f4f981c2 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -142,8 +142,10 @@ public: @param[out] rText string representation of 'rItem' + + @return true if it has a valid string representation */ - virtual SfxItemPresentation GetPresentation( const SfxPoolItem& rItem, + virtual bool GetPresentation( const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper = 0 ) const; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index c0a4dda44e2f..a88092f50c7f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -132,7 +132,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index f19003e81bc9..0aaf16d8a9e1 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -184,7 +184,8 @@ public: virtual int Compare( const SfxPoolItem &rWith ) const; virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, + /** @return true if it has a valid string representation */ + virtual bool GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, @@ -278,7 +279,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -306,7 +307,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 911a067fb3b4..6ec1716b3e92 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -36,7 +36,7 @@ public: SfxPointItem( const SfxPointItem& ); virtual ~SfxPointItem() {} - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 129f17f7667f..dd6826ecf841 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -37,7 +37,7 @@ public: SfxRectangleItem( const SfxRectangleItem& ); virtual ~SfxRectangleItem() {} - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 7f5b17c618c1..ac5bd12904aa 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -38,7 +38,7 @@ public: SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo ); SfxRangeItem( const SfxRangeItem& rItem ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -67,7 +67,7 @@ public: SfxUShortRangesItem( const SfxUShortRangesItem& rItem ); virtual ~SfxUShortRangesItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 80b81e44380b..f63d8b35a804 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -54,7 +54,7 @@ public: void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 3a681afc546c..a6edfcbe6366 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -85,7 +85,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool operator == ( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 690e3ee82899..e807a553baf8 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -37,7 +37,7 @@ public: SfxSizeItem( const SfxSizeItem& ); virtual ~SfxSizeItem() {} - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 3a8406279bc8..9d0599989ee7 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -51,7 +51,7 @@ public: using SfxPoolItem::Compare; virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation, + virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) -- cgit