diff options
| -rw-r--r-- | include/svl/itempool.hxx | 11 | ||||
| -rw-r--r-- | include/svl/poolitem.hxx | 22 | ||||
| -rw-r--r-- | svl/source/items/poolitem.cxx | 4 |
3 files changed, 18 insertions, 19 deletions
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 6960d5e80c89..77e43a5d9161 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -119,12 +119,12 @@ public: virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; void SetDefaultMetric( SfxMapUnit eNewMetric ); - /** Request string representation of pool items + /** Request string representation of pool items. - This virtual function produces a string representation, of + This virtual function produces a string representation from the respective SfxItemPool subclass' known SfxPoolItems. - Subclasses, please overwrite this method, and handle + Subclasses, please override this method, and handle SfxPoolItems that don't return useful/complete information on SfxPoolItem::GetPresentation() @@ -147,10 +147,9 @@ public: SfxItemPresentation ePresentation, SfxMapUnit ePresentationMetric, OUString& rText, - const IntlWrapper * pIntlWrapper - = 0 ) const; + const IntlWrapper * pIntlWrapper = 0 ) const; virtual SfxItemPool* Clone() const; - const OUString& GetName() const; + const OUString& GetName() const; virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index e61e13cb5aad..af8e405de58e 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -170,9 +170,9 @@ private: inline void SetRefCount( sal_uLong n ); inline void SetKind( sal_uInt16 n ); public: - inline sal_uLong AddRef( sal_uLong n = 1 ) const; + inline sal_uLong AddRef( sal_uLong n = 1 ) const; private: - inline sal_uLong ReleaseRef( sal_uLong n = 1 ) const; + inline sal_uLong ReleaseRef( sal_uLong n = 1 ) const; SVL_DLLPRIVATE long Delete_Impl(void*); protected: @@ -184,7 +184,7 @@ public: virtual ~SfxPoolItem(); void SetWhich( sal_uInt16 nId ) { m_nWhich = nId; } - sal_uInt16 Which() const { return m_nWhich; } + sal_uInt16 Which() const { return m_nWhich; } virtual bool operator==( const SfxPoolItem& ) const = 0; bool operator!=( const SfxPoolItem& rItem ) const { return !(*this == rItem); } @@ -197,7 +197,7 @@ public: OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual bool ScaleMetrics( long lMult, long lDiv ); virtual bool HasMetrics() const; @@ -208,8 +208,8 @@ public: virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0; - sal_uLong GetRefCount() const { return m_nRefCount; } - inline sal_uInt16 GetKind() const { return m_nKind; } + sal_uLong GetRefCount() const { return m_nRefCount; } + inline sal_uInt16 GetKind() const { return m_nKind; } /** Read in a Unicode string from a streamed byte string representation. @@ -254,7 +254,7 @@ public: const OUString& rString); private: - SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!! + SfxPoolItem& operator=( const SfxPoolItem& ); // not implemented!! }; @@ -333,7 +333,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - // von sich selbst eine Kopie erzeugen + // create a copy of itself virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; void SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; } }; @@ -361,7 +361,7 @@ public: OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - // von sich selbst eine Kopie erzeugen + // create a copy of itself virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE = 0; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE = 0; virtual SvStream& Store(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; @@ -373,12 +373,12 @@ public: }; -// Handle Klasse fuer PoolItems +// Handle class for PoolItems class SVL_DLLPUBLIC SfxItemHandle { sal_uInt16 *pRef; - SfxPoolItem *pItem; + SfxPoolItem *pItem; public: explicit SfxItemHandle( SfxPoolItem& ); SfxItemHandle( const SfxItemHandle& ); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index e1c4b0f8f621..38c74375565c 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -144,7 +144,7 @@ bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const { - return Clone(0); + return Clone(); } @@ -284,7 +284,7 @@ SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const // SfxItemHandle ---------------------------------------------------------- SfxItemHandle::SfxItemHandle(SfxPoolItem &rItem): pRef(new sal_uInt16(1)), - pItem(rItem.Clone(0)) + pItem(rItem.Clone()) { } |