diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-24 11:31:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-07-29 11:04:01 +0200 |
| commit | 7e018afaf74ab118fe21d92edc9fb95ddea5d61b (patch) | |
| tree | 740eb08b1a2841f35f68e8f6257d7abd46d09219 /include | |
| parent | 86c0a56a9ee2e3d15286b11afad65568d1a87c11 (diff) | |
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
Diffstat (limited to 'include')
145 files changed, 177 insertions, 174 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index b8e9dcf7f225..e3300b31d4c6 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -73,7 +73,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, OUString& rText, diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 038822ce9801..0711e23f9b4e 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -59,7 +59,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 2c4f0b4426d2..2b2f95669f50 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index be813385c542..c4f02cfa6a04 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 37c2d8f4aab0..2d268b6d54c6 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -74,7 +74,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -181,7 +181,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 12cb66657cea..ae4cb9a13667 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -80,7 +80,7 @@ public: public: - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 42cbf2ce2eda..1dbb47388ed7 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -117,7 +117,7 @@ public: virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index 6f49c5e58677..16a563637188 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -37,7 +37,7 @@ public: SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 459ea435f111..a21b341f138f 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -47,7 +47,7 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 8dad9e7f0c98..574d2fc30183 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -48,7 +48,7 @@ public: virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 74bb3f438dde..46bcc65f46c2 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -45,7 +45,7 @@ public: virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 54ee7f4e4f52..b64bf3b4fcb5 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 59bc82f14600..00ba3ad0bc2c 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 7ec7b69e77f4..31a7af48dc36 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -54,7 +54,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 072a0ace1a59..fad8a116c684 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -41,7 +41,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 8019292c90a5..8e64ba9feff1 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -40,7 +40,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 3c62e8635ffa..44a3cbf27ff7 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 829ddcbeb9be..59715b227113 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -53,7 +53,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 1655a982e379..3ff3e64bd532 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -52,7 +52,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index c1f90c135d05..06319e007a71 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -53,7 +53,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 0d2f27571c46..3b9fbb2bd141 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -61,7 +61,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 56262a7f7919..19a14937b77d 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -41,7 +41,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 84da2ca376e6..65a1bf12cc81 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index e8f962928d1e..3c2e906f0a19 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -47,7 +47,7 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index b4d16475e05b..34f281ecd51f 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -46,7 +46,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index 7358d550e74a..d79cdb8fe4e2 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -40,7 +40,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 771880a625d7..7cac264d750a 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -53,7 +53,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 3a002b97146a..6e09634ab4ab 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -36,7 +36,7 @@ public: const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -69,7 +69,7 @@ public: const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -98,7 +98,7 @@ public: const SvxCellJustifyMethod eMethod, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 7cfc750044b8..1092311baeda 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index f4d52bad4e5d..d1f596d72c57 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -48,7 +48,7 @@ public: virtual bool ScaleMetrics( long nMult, long nDiv ) SAL_OVERRIDE; virtual bool HasMetrics() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 60d740230645..f8a5b03884e5 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index 35488265c1b1..6720424bd83f 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -36,7 +36,7 @@ public: SvxLineColorItem( const SvxLineColorItem& rCopy ); virtual ~SvxLineColorItem(); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index ce2819c4edb7..9c250273ddca 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -49,7 +49,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 6ccce38c0efe..c5eb6eccc1fa 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -78,7 +78,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index e866c72a411d..9bb1d8021209 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -57,7 +57,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index eda9a193304d..afd0305212c5 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 704b392930ee..41ea3c9214a8 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 5ef06a9398b5..dccf910ee705 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 077f9cc3e270..f0fd65239560 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -42,7 +42,7 @@ public: sal_uInt16 nWhich ); SfxSpellCheckItem( const SfxSpellCheckItem& rItem ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -74,7 +74,7 @@ public: SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index 99bd179898f2..ff523a3134a3 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 62dfd68fdd64..982cad6281b1 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -45,7 +45,7 @@ public: virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index 1d3acfe5e886..b3c48b435870 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index 05ffd0e1c6ea..ae898319b4ac 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 1a9eaf704dbb..02db19da70aa 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 3937371b5ce2..00cbbf4c5c74 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SwEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index b80318bec8a3..33ad3baebe02 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 46b9e37d9652..9c05284d914a 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -47,7 +47,7 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 2abe4b506c08..ca25dc871a9c 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -42,7 +42,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 8a3f503ff5e9..b159ffb6d0dc 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -42,7 +42,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 36c589a7cbd1..43ec3bc7210e 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -56,7 +56,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 3bfd6c2d15f6..54b88ae2e293 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index 3f605af62cce..d156ebf7b753 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 35b728bb1bd9..f84ce3b348bc 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -46,7 +46,7 @@ public: virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index a02983d41dbb..2d7384c696b4 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -150,7 +150,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 9c21c8c04355..ddd87a8ba254 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -43,7 +43,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 4130333a4a42..e966d2bdb308 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -40,7 +40,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index de30339b1c2e..c61cb743eeb6 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -52,7 +52,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 17435f3770c9..7ecca5707252 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -41,7 +41,7 @@ public: const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index c60bac0b40fb..b6d3bffce230 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -44,7 +44,7 @@ public: virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream & , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 9435a18acf65..0118f0d41ef0 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -42,7 +42,7 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index 4e4a6814cc4d..1ebc611aa0bb 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 3899784f7b16..25df0a420cdc 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -44,7 +44,7 @@ public: using SfxPoolItem::Compare; virtual int Compare( const SfxPoolItem &rWith ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( + virtual bool GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 15e230d69131..371c716c0fca 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -79,7 +79,7 @@ public: SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} 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/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index b312606d1ff2..08e3a407321a 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -240,7 +240,7 @@ public: virtual bool operator ==( const SfxPoolItem& ) const SAL_OVERRIDE; SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & ); - 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/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) diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index fd532b6e32a7..8ccf990d02be 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -42,7 +42,7 @@ public: sal_Int32 nRotation, bool bStacked, const sal_uInt16 nId ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -85,7 +85,7 @@ public: const sal_uInt16 nId ); SvxMarginItem( const SvxMarginItem& ); - 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/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 750985b35e1b..840df880c710 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -313,7 +313,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - 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/svx/drawitem.hxx b/include/svx/drawitem.hxx index 11a3d2ca548e..d2eaafa2f650 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -40,7 +40,7 @@ public: sal_uInt16 nWhich ); SvxColorListItem( const SvxColorListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -70,7 +70,7 @@ public: sal_uInt16 nWhich ); SvxGradientListItem( const SvxGradientListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -100,7 +100,7 @@ public: sal_uInt16 nWhich ); SvxHatchListItem( const SvxHatchListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -131,7 +131,7 @@ public: sal_uInt16 nWhich ); SvxBitmapListItem( const SvxBitmapListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -162,7 +162,7 @@ public: sal_uInt16 nWhich ); SvxDashListItem( const SvxDashListItem& ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -190,7 +190,7 @@ public: sal_uInt16 nWhich ); SvxLineEndListItem( const SvxLineEndListItem& ); - 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/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 7564bf2731ff..4fd7c8904edf 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -40,7 +40,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 9a9a30f36583..cea29a0c4a8d 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -54,7 +54,7 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 0d15690f0ee9..86e5e1d5ee96 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -85,7 +85,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 7600c750a18a..87d936b7f03b 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -75,7 +75,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 8328b7cbe380..45cf1204e25d 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -38,7 +38,7 @@ public: SvxPostItAuthorItem( sal_uInt16 nWhich ); SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 nWhich ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -69,7 +69,7 @@ public: SvxPostItDateItem( sal_uInt16 nWhich ); SvxPostItDateItem( const OUString& rDate, sal_uInt16 nWhich ); - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -101,7 +101,7 @@ public: SvxPostItTextItem( const OUString& rText, sal_uInt16 nWhich ); // "pure virtual methods" from SfxPoolItem - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 938a9f2e3288..fda9314581b3 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -48,7 +48,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index e856cf030d20..9671f858a1b7 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -36,7 +36,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -70,7 +70,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -103,7 +103,7 @@ protected: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -163,7 +163,7 @@ protected: virtual OUString GetValueText() const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -220,7 +220,7 @@ protected: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - 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/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index f333a1c9218a..ccb46b6cbf32 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -35,7 +35,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index a1b8be1d10b1..733b4e7f4097 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -49,7 +49,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem SVX_DLLPUBLIC virtual ~SdrCustomShapeAdjustmentItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const SAL_OVERRIDE; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 101b461380ab..2144b8622c91 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -79,7 +79,7 @@ private: virtual ~SdrCustomShapeGeometryItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 52fc3396c1d7..ae6631cfd4c1 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -44,7 +44,7 @@ public: GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } virtual OUString GetValueTextByPos( sal_uInt16 nPos ) 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/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 843c279f7add..ece56a64fff6 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -39,7 +39,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) 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/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 0fe0c83e9110..1129f0ecc33f 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -39,7 +39,7 @@ public: virtual OUString GetValueTextByVal(bool bVal) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index d90e76a67552..d952ee80fc2e 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -38,7 +38,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -56,7 +56,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 7ae67f4481bb..5d0067ef3f7a 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -33,7 +33,7 @@ public: virtual bool HasMetrics() const SAL_OVERRIDE; virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 44ac96f93857..82e9b36ff1b8 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -47,7 +47,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index c1e452e8ef3b..13bd2a9e9731 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -48,7 +48,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -75,7 +75,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 5ae81af7b840..fc0730fb778b 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -89,7 +89,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index be3cb1cbd457..bf039bb6633a 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -30,7 +30,7 @@ public: SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 8d2b7448b68b..239b5f822272 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -29,7 +29,7 @@ public: SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false ); SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ); - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, + SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 4767e6d8d32a..0faa28edcdcd 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -56,7 +56,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual bool HasBoolValue() const SAL_OVERRIDE; virtual bool GetBoolValue() const SAL_OVERRIDE; virtual void SetBoolValue(bool bVal) SAL_OVERRIDE; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index 35ad48bd9f12..2a3824bb296f 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -37,7 +37,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; virtual OUString GetValueTextByVal(bool bVal) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index e5c91ba1b224..5b86389df961 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -39,7 +39,7 @@ protected: public: virtual SfxItemPool* Clone() const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(const SfxPoolItem& rItem, + virtual bool GetPresentation(const SfxPoolItem& rItem, SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index df786d2f407e..78b395fe9ec9 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -42,7 +42,7 @@ public: virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 36cce7364a41..bc3c4af67ff7 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -38,7 +38,7 @@ public: virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 5ad2b341165b..adbe9dad26d4 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index b1f587d00adf..570ebd02aa8c 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -34,7 +34,7 @@ public: SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 9133d7879ac1..e45e14d974cf 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -43,7 +43,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -63,7 +63,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 69bb5d92527f..57c8c1d79461 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -40,7 +40,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 65a7671c7846..29fdf624dd81 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -27,7 +27,7 @@ public: SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE; }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 686d3b6361ef..e6a83b8febe4 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -58,7 +58,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 1c28fc15824d..68a101565ed9 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index b8ccfb121589..f1b9ca3936dd 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -41,7 +41,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 3d6b319a91f2..1629fd12f36a 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -34,7 +34,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 27b2f98f87a1..bbf4409c5fcf 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 1f0a4cd27607..dfdf5f488213 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -54,7 +54,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index e513757aaca8..7cb12485ba2b 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -33,7 +33,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) 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/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index dcc239797ee3..09cfc153d28d 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -49,7 +49,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 7d0e9e72c7ac..b4a79f5f81f2 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -33,7 +33,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) 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/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index f229042894ad..b33fad67f944 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -33,7 +33,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; @@ -49,7 +49,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 27a9455723e8..d7b39d074f49 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -45,7 +45,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 1a715896edc1..dfff78d74236 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -47,7 +47,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const SAL_OVERRIDE; bool IsEnabled() const { return bEnabled; } diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 9618bb7ae871..bfba5e9ca551 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -51,7 +51,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index a37ac54b0883..95e43b18f084 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -48,7 +48,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index e1434d12cdde..cb556730ea08 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -37,7 +37,7 @@ public: XFillTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) 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/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index b1312aff2883..d289696c8aa9 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -37,7 +37,7 @@ public: XGradientStepCountItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) 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/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 6db9aa2fb39a..f0cb2aa04fe7 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -39,7 +39,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 58ce016109e0..10666395668e 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -42,7 +42,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 2367a0ea9887..6252628ee6e3 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -42,7 +42,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 0aef9bc127a8..f56e7c424a9d 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -41,7 +41,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 9c31904671e3..dcea8cbc375f 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -50,7 +50,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 767015bfa283..408aaf828b9f 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 175f02380b82..4149c19cdad8 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -49,7 +49,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual 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/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 8610a2560c56..07fffda77f02 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -41,7 +41,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index fa1514736424..2fb961a5285f 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 1d3b525e993c..1b52c060ab42 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -49,7 +49,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual 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/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 9214de6da034..55bc67d554e0 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -40,7 +40,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index 7b2f1bdc289b..eb8e85c98c06 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -37,7 +37,7 @@ public: XLineTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) 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/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index ef67521ed96b..26a47836d516 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 37f4f37301bf..de10534fa8c8 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -36,7 +36,7 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; |