From 7e018afaf74ab118fe21d92edc9fb95ddea5d61b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 24 Jul 2014 11:31:39 +0200 Subject: simplify return argument of SfxPoolItem::GetPresentation since all two of the actual call-sites only care about whether it is a valid presentation or not, not what kind of presentation it is. Change-Id: I75717c88878d37b2897741b0c833ff283b3fee59 --- sw/inc/fchrfmt.hxx | 2 +- sw/inc/fmtanchr.hxx | 2 +- sw/inc/fmtautofmt.hxx | 2 +- sw/inc/fmtclds.hxx | 2 +- sw/inc/fmtcnct.hxx | 2 +- sw/inc/fmteiro.hxx | 2 +- sw/inc/fmtfollowtextflow.hxx | 2 +- sw/inc/fmtfsize.hxx | 2 +- sw/inc/fmtftntx.hxx | 2 +- sw/inc/fmthdft.hxx | 4 +- sw/inc/fmtinfmt.hxx | 2 +- sw/inc/fmtline.hxx | 2 +- sw/inc/fmtlsplt.hxx | 2 +- sw/inc/fmtornt.hxx | 4 +- sw/inc/fmtpdsc.hxx | 2 +- sw/inc/fmtrowsplt.hxx | 2 +- sw/inc/fmtruby.hxx | 2 +- sw/inc/fmtsrnd.hxx | 2 +- sw/inc/fmturl.hxx | 2 +- sw/inc/grfatr.hxx | 18 ++-- sw/inc/hfspacingitem.hxx | 2 +- sw/inc/paratr.hxx | 8 +- sw/inc/tgrditem.hxx | 2 +- sw/source/uibase/inc/uiitems.hxx | 2 +- sw/source/uibase/utlui/attrdesc.cxx | 204 ++++++++++++++++++------------------ sw/source/uibase/utlui/uiitems.cxx | 8 +- 26 files changed, 143 insertions(+), 143 deletions(-) (limited to 'sw') diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 42c0f5afcbc2..4e70c617d986 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -54,7 +54,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 3a9d370f0017..f7e80620e73a 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -53,7 +53,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index a40416ec507a..90650b839de4 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -45,7 +45,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 956637de9013..465137c6346f 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -102,7 +102,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index e677d6434f96..4ff7c97c0e3d 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -42,7 +42,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 99853a0eb497..f7f4b25d0fba 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -34,7 +34,7 @@ public: /// "pure virtual methos" of SfxPoolItem 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/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 4bba61e2bc45..47913c8a246e 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -36,7 +36,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 5774178905f6..e80bd43680af 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -67,7 +67,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 26ec1ca4d7da..04016b338e3c 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.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, diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index ca09e16ece7e..23c4845e4996 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -47,7 +47,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, @@ -80,7 +80,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index d8664f051795..d3c4d6b8b48f 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -53,7 +53,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 096bfa45dcc5..9b1a795b1f58 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -40,7 +40,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index dfb0365558f9..c16c72afce5f 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -33,7 +33,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index bd97badcec9a..b267d8f08160 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -44,7 +44,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, @@ -79,7 +79,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index ce5cd4b0f5bb..9b7f9a508129 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -60,7 +60,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index b4d0151a5a64..f5fa372b28cc 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -33,7 +33,7 @@ public: // "pure virtual methods" of SfxPoolItem 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/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 2835d4a5d2ab..f0945e6227d1 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -45,7 +45,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 eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index c9687ffbbfed..4b27127141b1 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -42,7 +42,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) 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/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index b39b8f7c5372..3f12aba99e83 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -51,7 +51,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. 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, diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 0aa3bddfff3d..cbd745a96172 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -57,7 +57,7 @@ public: // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() 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, @@ -105,7 +105,7 @@ public: // pure virtual methods from SfxInt16Item 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, @@ -128,7 +128,7 @@ public: // pure virtual methods from SfxInt16Item 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, @@ -144,7 +144,7 @@ public: // pure virtual methods from SfxInt16Item 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, @@ -160,7 +160,7 @@ protected: public: // pure virtual methods from SfxInt16Item - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, @@ -213,7 +213,7 @@ public: // pure virtual methods from SfxEnumItem 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, @@ -237,7 +237,7 @@ public: // pure virtual methods from SfxInt16Item 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, @@ -253,7 +253,7 @@ public: // pure virtual methods from SfxInt16Item 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, @@ -276,7 +276,7 @@ public: // pure virtual methods of SfxEnumItem 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/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 573262081756..c53f83374c0c 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -33,7 +33,7 @@ public: // "pure virtual methods" of SfxPoolItem 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/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 449eeba8fa6a..ef9b322335cb 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -66,7 +66,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, @@ -110,7 +110,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, @@ -148,7 +148,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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, @@ -170,7 +170,7 @@ public: /// "pure virtual methods" of SfxPoolItem 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/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 3c7d3db44351..b110d386e2e4 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -53,7 +53,7 @@ public: // "pure virtual methods" of SfxPoolItem 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, diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 612a69ccf2c8..827c02e2fa4e 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -41,7 +41,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, diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 7c5b8aed56b9..ebcda5e23d86 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -91,7 +91,7 @@ void SwAttrSet::GetPresentation( } } -SfxItemPresentation SwFmtCharFmt::GetPresentation +bool SwFmtCharFmt::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -118,14 +118,14 @@ SfxItemPresentation SwFmtCharFmt::GetPresentation } else rText = OUString( SW_RESSTR( STR_NO_CHARFMT ) ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtAutoFmt::GetPresentation +bool SwFmtAutoFmt::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -143,14 +143,14 @@ SfxItemPresentation SwFmtAutoFmt::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText = OUString(); //TODO - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtINetFmt::GetPresentation +bool SwFmtINetFmt::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -168,14 +168,14 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: { rText = GetValue(); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, +bool SwFmtRuby::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { @@ -188,14 +188,14 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, case SFX_ITEM_PRESENTATION_COMPLETE: { rText = OUString(); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtDrop::GetPresentation +bool SwFmtDrop::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -227,14 +227,14 @@ SfxItemPresentation SwFmtDrop::GetPresentation } else rText = SW_RESSTR( STR_NO_DROP_LINES ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwRegisterItem::GetPresentation +bool SwRegisterItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -247,20 +247,20 @@ SfxItemPresentation SwRegisterItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { const sal_uInt16 nId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwNumRuleItem::GetPresentation +bool SwNumRuleItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -273,7 +273,7 @@ SfxItemPresentation SwNumRuleItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -282,14 +282,14 @@ SfxItemPresentation SwNumRuleItem::GetPresentation "(" + GetValue() + ")"; else rText = SW_RESSTR( STR_NUMRULE_OFF ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwParaConnectBorderItem::GetPresentation +bool SwParaConnectBorderItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -302,22 +302,22 @@ SfxItemPresentation SwParaConnectBorderItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { const sal_uInt16 nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // Frame attribute -SfxItemPresentation SwFmtFrmSize::GetPresentation +bool SwFmtFrmSize::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -363,17 +363,17 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //Header for page formats. //Client of FrmFmt which describes the header. -SfxItemPresentation SwFmtHeader::GetPresentation +bool SwFmtHeader::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -392,17 +392,17 @@ SfxItemPresentation SwFmtHeader::GetPresentation { const sal_uInt16 nId = GetHeaderFmt() ? STR_HEADER : STR_NO_HEADER; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //Footer for page formats. //Client of FrmFmt which describes the footer. -SfxItemPresentation SwFmtFooter::GetPresentation +bool SwFmtFooter::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -421,14 +421,14 @@ SfxItemPresentation SwFmtFooter::GetPresentation { const sal_uInt16 nId = GetFooterFmt() ? STR_FOOTER : STR_NO_FOOTER; rText = SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtSurround::GetPresentation +bool SwFmtSurround::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -475,16 +475,16 @@ SfxItemPresentation SwFmtSurround::GetPresentation { rText = rText + " " + SW_RESSTR( STR_SURROUND_ANCHORONLY ); } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //VertOrientation, how and by what orientate the FlyFrm in the vertical? -SfxItemPresentation SwFmtVertOrient::GetPresentation +bool SwFmtVertOrient::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -533,16 +533,16 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //HoriOrientation, how and by what orientate the FlyFrm in the horizontal? -SfxItemPresentation SwFmtHoriOrient::GetPresentation +bool SwFmtHoriOrient::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -591,16 +591,16 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } // FlyAnchor, Anchor of the free-flying frame -SfxItemPresentation SwFmtAnchor::GetPresentation +bool SwFmtAnchor::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -633,14 +633,14 @@ SfxItemPresentation SwFmtAnchor::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtPageDesc::GetPresentation +bool SwFmtPageDesc::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -662,16 +662,16 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation rText = pPageDesc->GetName(); else rText = SW_RESSTR( STR_NO_PAGEDESC ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //The ColumnDescriptor -SfxItemPresentation SwFmtCol::GetPresentation +bool SwFmtCol::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -702,16 +702,16 @@ SfxItemPresentation SwFmtCol::GetPresentation } else rText = OUString(); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } //URL's and maps -SfxItemPresentation SwFmtURL::GetPresentation +bool SwFmtURL::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -742,14 +742,14 @@ SfxItemPresentation SwFmtURL::GetPresentation { rText = rText + ", Target: " + sTargetFrameName; } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtEditInReadonly::GetPresentation +bool SwFmtEditInReadonly::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -769,14 +769,14 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation { if ( GetValue() ) rText = SW_RESSTR(STR_EDIT_IN_READONLY); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtLayoutSplit::GetPresentation +bool SwFmtLayoutSplit::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -789,20 +789,20 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { if ( GetValue() ) rText = SW_RESSTR(STR_LAYOUT_SPLIT); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtRowSplit::GetPresentation +bool SwFmtRowSplit::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -811,10 +811,10 @@ SfxItemPresentation SwFmtRowSplit::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation +bool SwFmtFtnEndAtTxtEnd::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -850,10 +850,10 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwFmtChain::GetPresentation +bool SwFmtChain::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -866,7 +866,7 @@ SfxItemPresentation SwFmtChain::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -882,14 +882,14 @@ SfxItemPresentation SwFmtChain::GetPresentation if ( GetNext() ) rText += GetNext()->GetName(); } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwFmtLineNumber::GetPresentation +bool SwFmtLineNumber::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -902,7 +902,7 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -915,14 +915,14 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation rText = rText + " " + SW_RESSTR(STR_LINCOUNT_START) + OUString::number( GetStartValue() ); } - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwTextGridItem::GetPresentation +bool SwTextGridItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, @@ -935,7 +935,7 @@ SfxItemPresentation SwTextGridItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -955,15 +955,15 @@ SfxItemPresentation SwTextGridItem::GetPresentation } if ( nId ) rText += SW_RESSTR( nId ); - return ePres; + return true; } default:;//prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } -SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation +bool SwHeaderAndFooterEatSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, @@ -972,12 +972,12 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - return SFX_ITEM_PRESENTATION_NONE; + return false; } // Graphic attributes -SfxItemPresentation SwMirrorGrf::GetPresentation( +bool SwMirrorGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const { @@ -1008,10 +1008,10 @@ SfxItemPresentation SwMirrorGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwRotationGrf::GetPresentation( +bool SwRotationGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1031,10 +1031,10 @@ SfxItemPresentation SwRotationGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwLuminanceGrf::GetPresentation( +bool SwLuminanceGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1055,10 +1055,10 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwContrastGrf::GetPresentation( +bool SwContrastGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1079,10 +1079,10 @@ SfxItemPresentation SwContrastGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwChannelGrf::GetPresentation( +bool SwChannelGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1116,10 +1116,10 @@ SfxItemPresentation SwChannelGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwGammaGrf::GetPresentation( +bool SwGammaGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1139,10 +1139,10 @@ SfxItemPresentation SwGammaGrf::GetPresentation( break; } rText = aText.makeStringAndClear(); - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwInvertGrf::GetPresentation( +bool SwInvertGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1162,10 +1162,10 @@ SfxItemPresentation SwInvertGrf::GetPresentation( ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwTransparencyGrf::GetPresentation( +bool SwTransparencyGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1186,10 +1186,10 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation( rText = OUString(); break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwDrawModeGrf::GetPresentation( +bool SwDrawModeGrf::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString &rText, const IntlWrapper* /*pIntl*/) const { @@ -1217,10 +1217,10 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation( ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } -SfxItemPresentation SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres, +bool SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, OUString &rText, @@ -1242,7 +1242,7 @@ SfxItemPresentation SwFmtFollowTextFlow::GetPresentation( SfxItemPresentation eP ePres = SFX_ITEM_PRESENTATION_NONE; break; } - return ePres; + return ePres != SFX_ITEM_PRESENTATION_NONE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 0490a93e85dc..194933add10a 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -59,7 +59,7 @@ bool SwPageFtnInfoItem::operator==( const SfxPoolItem& rAttr ) const return ( aFtnInfo == ((SwPageFtnInfoItem&)rAttr).GetPageFtnInfo()); } -SfxItemPresentation SwPageFtnInfoItem::GetPresentation +bool SwPageFtnInfoItem::GetPresentation ( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, @@ -72,7 +72,7 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation { case SFX_ITEM_PRESENTATION_NONE: rText = OUString(); - return SFX_ITEM_PRESENTATION_NONE; + return false; case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { @@ -83,11 +83,11 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation ::GetMetricText( nHght, eCoreUnit, ePresUnit, pIntl ) + " " + ::GetSvxString( ::GetMetricId( ePresUnit ) ); } - return ePres; + return true; } default:; //prevent warning } - return SFX_ITEM_PRESENTATION_NONE; + return false; } bool SwPageFtnInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const -- cgit