diff options
Diffstat (limited to 'include')
78 files changed, 548 insertions, 399 deletions
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 2918bb915d7b..a06b177dd719 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -65,9 +65,6 @@ public: virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; void SetOneWord( const SvxAdjust eType ) { @@ -120,6 +117,25 @@ public: eRet = SvxAdjust::Block; return eRet; } + + sal_Int8 GetAsFlags() const + { + sal_Int8 nFlags = 0; + if ( bOneBlock ) + nFlags |= 0x0001; + if ( bLastCenter ) + nFlags |= 0x0002; + if ( bLastBlock ) + nFlags |= 0x0004; + return nFlags; + } + + void SetAsFlags(sal_Int8 nFlags) + { + bOneBlock = 0 != (nFlags & 0x0001); + bLastCenter = 0 != (nFlags & 0x0002); + bLastBlock = 0 != (nFlags & 0x0004); + } }; #endif diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index db97f78e6d0f..38b19173f183 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -71,7 +71,6 @@ public: explicit SvxBoxItem( const sal_uInt16 nId ); SvxBoxItem( const SvxBoxItem &rCpy ); virtual ~SvxBoxItem() override; - SvxBoxItem &operator=( const SvxBoxItem& rBox ); // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; @@ -84,9 +83,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; @@ -189,7 +185,6 @@ public: explicit SvxBoxInfoItem( const sal_uInt16 nId ); SvxBoxInfoItem( const SvxBoxInfoItem &rCpy ); virtual ~SvxBoxInfoItem() override; - SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy ); // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 952b037c937b..8f298bd43408 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -55,9 +55,6 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem mutable bool bLoadAgain; void ApplyGraphicTransparency_Impl(); - // only used by Create - SvxBrushItem( SvStream& rStrm, - sal_uInt16 nVersion, sal_uInt16 nWhich ); public: static SfxPoolItem* CreateDefault(); @@ -90,9 +87,6 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const override; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; const Color& GetColor() const { return aColor; } Color& GetColor() { return aColor; } @@ -116,9 +110,6 @@ public: void SetGraphicLink( const OUString& rNew ); void SetGraphicFilter( const OUString& rNew ); - SvxBrushItem& operator=(const SvxBrushItem& rItem); - SvxBrushItem& operator=(SvxBrushItem&& rItem); - static sal_Int8 TransparencyToPercent(sal_Int32 nTrans); void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 012138c3b7ca..be792db86804 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -79,7 +79,6 @@ public: void SetFont( const vcl::Font& rNew) { aFont = rNew; } void SetScale( sal_uInt16 nNew ) { nScale = nNew; } - virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 80f269feea1f..64809845dfce 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -40,7 +40,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 794ef447c2e9..efa62398cec3 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -37,7 +37,6 @@ public: SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nId); virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; - virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -83,7 +82,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index cd116334d005..d8397f4e19ff 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -41,7 +41,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 5e62965486ba..d371b9ace3af 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -37,28 +37,18 @@ public: explicit SvxColorItem(const sal_uInt16 nId); SvxColorItem(const Color& aColor, const sal_uInt16 nId); - SvxColorItem(SvStream& rStream, const sal_uInt16 nId); virtual ~SvxColorItem() override; // "pure virtual Methods" from SfxPoolItem virtual bool operator==(const SfxPoolItem& rPoolItem) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& rIntlWrapper) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; - virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override; - - SvxColorItem& operator=(const SvxColorItem& rColor) - { - SetValue(rColor.GetValue()); - return *this; - } SvxColorItem(SvxColorItem const &) = default; // SfxPoolItem copy function dichotomy const Color& GetValue() const diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index d0514da0d174..0941e21d856c 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -38,20 +38,11 @@ public: // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - - SvxContourItem& operator=(const SvxContourItem& rCont) - { - SetValue(rCont.GetValue()); - return *this; - } - SvxContourItem(SvxContourItem const &) = default; // SfxPoolItem copy function dichotomy }; #endif diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index e8edcbc23258..f7967588ffd5 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -44,8 +44,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -57,11 +55,6 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) - { - SetValue( rCross.GetValue() ); - return *this; - } SvxCrossedOutItem(SvxCrossedOutItem const &) = default; // SfxPoolItem copy function dichotomy // enum cast diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index d9c33ab4e4a6..86a3ab0837f3 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -46,7 +46,6 @@ public: const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 686eed994ff0..5e67a71f0676 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -41,6 +41,11 @@ class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem sal_uInt32 nHeight; sal_uInt16 nProp; // default 100% MapUnit ePropUnit; // Percent, Twip, ... + +private: + friend void Create_legacy_direct_set(SvxFontHeightItem& rItem, sal_uInt32 nH, sal_uInt16 nP, MapUnit eP); + void legacy_direct_set(sal_uInt32 nH, sal_uInt16 nP, MapUnit eP) { nHeight = nH; nProp = nP; ePropUnit = eP; } + public: static SfxPoolItem* CreateDefault(); @@ -58,22 +63,9 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nItemVersion) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; - SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nHeight = rSize.nHeight; - nProp = rSize.nProp; - ePropUnit = rSize.ePropUnit; - return *this; - } - SvxFontHeightItem(SvxFontHeightItem const &) = default; // SfxPoolItem copy function dichotomy - void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100, MapUnit eUnit = MapUnit::MapRelative ); diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index f3ede8d73547..66134a2ea9d3 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -47,8 +47,6 @@ public: // "pure virtual Methods" from SfxPoolItem virtual bool operator==(const SfxPoolItem& rItem) const override; virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16) const override; - virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const override; virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override; virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; @@ -102,9 +100,6 @@ public: return eTextEncoding; } - SvxFontItem& operator=(const SvxFontItem& rFont); - SvxFontItem(SvxFontItem const &) = default; // SfxPoolItem copy function dichotomy - void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 6213eab66a64..66111f91f55f 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -36,7 +36,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 6eb2e03b5264..760aca9c4a3b 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -40,7 +40,6 @@ public: inline SvxFormatBreakItem( const SvxBreak eBrk /*= SvxBreak::NONE*/, const sal_uInt16 nWhich ); - inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy ); SvxFormatBreakItem(SvxFormatBreakItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem @@ -55,9 +54,6 @@ public: static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override; virtual sal_uInt16 GetValueCount() const override; SvxBreak GetBreak() const { return GetValue(); } @@ -70,13 +66,6 @@ inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak, {} -inline SvxFormatBreakItem& SvxFormatBreakItem::operator=( - const SvxFormatBreakItem& rBreak ) -{ - SetValue( rBreak.GetBreak() ); - return *this; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 25467ee628b8..840cae4a2f9e 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -35,8 +35,6 @@ public: virtual ~SvxFrameDirectionItem() override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -51,12 +49,7 @@ public: { return sal_uInt16(SvxFrameDirection::Environment) + 1; } - SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } - SvxFrameDirectionItem(SvxFrameDirectionItem const &) = default; + // SfxPoolItem copy function dichotomy void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index dea50716f29d..791890d023ca 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -35,7 +35,6 @@ public: SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 7c25846e63d3..c53a7b83b744 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -47,13 +47,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( sal_uInt16 nVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) - { - SetValue( rHorJustify.GetValue() ); - return *this; - } SvxHorJustifyItem(SvxHorJustifyItem const &) = default; // SfxPoolItem copy function dichotomy }; @@ -80,13 +74,7 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellVerJustify nVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) - { - SetValue( rVerJustify.GetValue() ); - return *this; - } SvxVerJustifyItem(SvxVerJustifyItem const &) = default; // SfxPoolItem copy function dichotomy }; diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index b5f0ddbd6418..f30d91289a44 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -37,13 +37,10 @@ public: inline SvxFormatKeepItem( const bool bKeep /*= false*/, const sal_uInt16 _nWhich ); - inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit ); SvxFormatKeepItem(SvxFormatKeepItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const override; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, @@ -55,12 +52,6 @@ inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 SfxBoolItem( _nWhich, bKeep ) {} -inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep ) -{ - SetValue( rKeep.GetValue() ); - return *this; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 78e19d745f18..4894edd79465 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -55,11 +55,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; - SvxLanguageItem& operator=(const SvxLanguageItem& rLang) - { - SetValue( rLang.GetValue() ); - return *this; - } SvxLanguageItem(SvxLanguageItem const &) = default; // SfxPoolItem copy function dichotomy LanguageType GetLanguage() const diff --git a/include/editeng/legacyitem.hxx b/include/editeng/legacyitem.hxx new file mode 100755 index 000000000000..4f118eff92c2 --- /dev/null +++ b/include/editeng/legacyitem.hxx @@ -0,0 +1,192 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_EDITENG_LEGACYITEM_HXX +#define INCLUDED_EDITENG_LEGACYITEM_HXX + +#include <editeng/editengdllapi.h> + +////////////////////////////////////////////////////////////////////////////// +// // editeng +// SvxFontItem aFont; +// SvxFontHeightItem aHeight; +// SvxWeightItem aWeight; +// SvxPostureItem aPosture; +// SvxUnderlineItem aUnderline; +// SvxOverlineItem aOverline; +// SvxCrossedOutItem aCrossedOut; +// SvxContourItem aContour; +// SvxShadowedItem aShadowed; +// SvxColorItem aColor; +// SvxBoxItem aBox; +// SvxLineItem aTLBR; +// SvxBrushItem aBackground; +// SvxAdjustItem aAdjust; +// SvxHorJustifyItem aHorJustify; +// SvxVerJustifyItem aVerJustify; +// SvxFrameDirectionItem m_aTextOrientation; +////////////////////////////////////////////////////////////////////////////// + +class SvStream; +class SvxFontItem; +class SvxFontHeightItem; +class SvxWeightItem; +class SvxPostureItem; +class SvxTextLineItem; +class SvxCrossedOutItem; +class SvxShadowedItem; +class SvxColorItem; +class SvxBoxItem; +class SvxLineItem; +class SvxBrushItem; +class SvxAdjustItem; +class SvxHorJustifyItem; +class SvxVerJustifyItem; +class SvxFrameDirectionItem; +class SvxFormatBreakItem; +class SvxFormatKeepItem; +class SvxShadowItem; + +namespace legacy +{ + namespace SvxFont + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxFontItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxFontItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxFontHeight + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxFontHeightItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxFontHeightItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxWeight + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxWeightItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxWeightItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxPosture + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxPostureItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxPostureItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxTextLine // SvxUnderlineItem, SvxOverlineItem -> SvxTextLineItem + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxTextLineItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxTextLineItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxCrossedOut + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxCrossedOutItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxCrossedOutItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + // SvxContourItem -> SfxBoolItem + // SvxShadowedItem -> SfxBoolItem + + namespace SvxColor + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxColorItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxColorItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxBox + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxBoxItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxBoxItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxLine + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxLineItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxLineItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxBrush + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxBrushItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxBrushItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxAdjust + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxAdjustItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxAdjustItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxHorJustify + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxHorJustifyItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxHorJustifyItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxVerJustify + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxVerJustifyItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxVerJustifyItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxFrameDirection + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxFrameDirectionItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxFrameDirectionItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxFormatBreak + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxFormatBreakItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxFormatBreakItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxFormatKeep + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxFormatKeepItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxFormatKeepItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + + namespace SvxShadow + { + sal_uInt16 EDITENG_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void EDITENG_DLLPUBLIC Create(SvxShadowItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + EDITENG_DLLPUBLIC SvStream& Store(const SvxShadowItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } +} + +#endif // INCLUDED_EDITENG_LEGACYITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 2dcdc97a763b..8d74b66ce462 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -44,7 +44,6 @@ public: explicit SvxLineItem( const sal_uInt16 nId ); SvxLineItem( const SvxLineItem& rCpy ); virtual ~SvxLineItem() override; - SvxLineItem &operator=( const SvxLineItem& rLine ); virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -55,8 +54,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 6cc7ad48a3b7..ba3fe2fbb867 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -68,7 +68,6 @@ public: SvxLRSpaceItem( const long nLeft, const long nRight, const long nTLeft /*= 0*/, const short nOfset /*= 0*/, const sal_uInt16 nId ); - inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy ); SvxLRSpaceItem(SvxLRSpaceItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem @@ -83,7 +82,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; @@ -121,21 +119,6 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -inline SvxLRSpaceItem &SvxLRSpaceItem::operator=( const SvxLRSpaceItem &rCpy ) -{ - nFirstLineOfst = rCpy.nFirstLineOfst; - nTxtLeft = rCpy.nTxtLeft; - nLeftMargin = rCpy.nLeftMargin; - nRightMargin = rCpy.nRightMargin; - nPropFirstLineOfst = rCpy.nPropFirstLineOfst; - nPropLeftMargin = rCpy.nPropLeftMargin; - nPropRightMargin = rCpy.nPropRightMargin; - bAutoFirst = rCpy.bAutoFirst; - bExplicitZeroMarginValRight = rCpy.bExplicitZeroMarginValRight; - bExplicitZeroMarginValLeft = rCpy.bExplicitZeroMarginValLeft; - return *this; -} - inline void SvxLRSpaceItem::SetLeft( const long nL, const sal_uInt16 nProp ) { nLeftMargin = (nL * nProp) / 100; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index e758d9021cf5..7757948a54aa 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -301,7 +301,6 @@ public: virtual ~SvxNumBulletItem() override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool operator==( const SfxPoolItem& ) const override; SvxNumRule* GetNumRule() const {return pNumRule.get();} diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 17517e6c59e7..268901ad956a 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -34,8 +34,6 @@ class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem { public: explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true ); - inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy ); - SvxOpaqueItem(SvxOpaqueItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -50,13 +48,6 @@ inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa ) : SfxBoolItem( nId, bOpa ) {} -inline SvxOpaqueItem &SvxOpaqueItem::operator=( const SvxOpaqueItem &rCpy ) -{ - SetValue( rCpy.GetValue() ); - return *this; -} - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 57f82c6d8e44..4aa3865739e9 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -41,7 +41,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index 7a830036fdcc..a38ab1bbe807 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -38,7 +38,6 @@ public: // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 9383689cc510..91e781dd199c 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -45,8 +45,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; @@ -57,12 +55,6 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - SvxPostureItem& operator=(const SvxPostureItem& rPost) { - SetValue( rPost.GetValue() ); - return *this; - } - SvxPostureItem(SvxPostureItem const &) = default; // SfxPoolItem copy function dichotomy - // enum cast FontItalic GetPosture() const { return GetValue(); } diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 178594ff2926..e7c7da1cf50b 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -40,7 +40,6 @@ public: static SfxPoolItem* CreateDefault(); explicit inline SvxProtectItem( const sal_uInt16 nId ); - inline SvxProtectItem &operator=( const SvxProtectItem &rCpy ); SvxProtectItem(SvxProtectItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem @@ -72,15 +71,6 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId ) bCntnt = bSize = bPos = false; } -inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy ) -{ - bCntnt = rCpy.IsContentProtected(); - bSize = rCpy.IsSizeProtected(); - bPos = rCpy.IsPosProtected(); - return *this; -} - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 46d3be6c7315..c1b5f80ead83 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -37,7 +37,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index 49c3945ca7d7..efe6b7a4d192 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -29,7 +29,6 @@ public: SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, sal_uInt16 nWhich ); diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index cae821ba4b86..187bb39aa04a 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -47,9 +47,6 @@ public: const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/, const SvxShadowLocation eLoc = SvxShadowLocation::NONE ); - inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); - SvxShadowItem(SvxShadowItem const &) = default; // SfxPoolItem copy function dichotomy - // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -61,8 +58,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; @@ -84,14 +79,6 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow ) -{ - aShadowColor = rFmtShadow.aShadowColor; - nWidth = rFmtShadow.GetWidth(); - eLocation = rFmtShadow.GetLocation(); - return *this; -} - #endif // INCLUDED_EDITENG_SHADITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 15bb414e06ce..a201549bfab4 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -39,18 +39,12 @@ public: // "pure virtual Methods" from SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { - SetValue(rShadow.GetValue()); - return *this; - } SvxShadowedItem(SvxShadowedItem const &) = default; // SfxPoolItem copy function dichotomy }; diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index ab2fb380a54f..bd4f86f7d070 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -41,9 +41,6 @@ public: explicit SvxSizeItem( const sal_uInt16 nId ); SvxSizeItem( const sal_uInt16 nId, const Size& rSize); - inline SvxSizeItem& operator=( const SvxSizeItem &rCpy ); - SvxSizeItem(SvxSizeItem const &) = default; // SfxPoolItem copy function dichotomy - // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -67,12 +64,6 @@ public: void SetHeight(long n) { m_aSize.setHeight(n); } }; -inline SvxSizeItem& SvxSizeItem::operator=( const SvxSizeItem &rCpy ) -{ - m_aSize = rCpy.m_aSize; - return *this; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index e434e9d5a961..a6f292107504 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -116,8 +116,6 @@ public: { maTabStops.erase( maTabStops.begin() + nPos, maTabStops.begin() + nPos + nLen ); } // Assignment operator, equality operator (caution: expensive!) - SvxTabStopItem& operator=( const SvxTabStopItem& rTSI ); - SvxTabStopItem(SvxTabStopItem const &) = default; // SfxPoolItem copy function dichotomy // this is already included in SfxPoolItem declaration //int operator!=( const SvxTabStopItem& rTSI ) const diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index 6f71c09391ff..8ec80758bcec 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -51,8 +51,6 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFFVer ) const override; - bool GetValue() const { return bOn; } sal_Unicode GetStartBracket() const { return cStartBracket; } diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index b4fef4612f80..386a28544c29 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -42,8 +42,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; @@ -57,14 +55,6 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) - { - SetValue( rTextLine.GetValue() ); - SetColor( rTextLine.GetColor() ); - return *this; - } - SvxTextLineItem(SvxTextLineItem const &) = default; // SfxPoolItem copy function dichotomy - // enum cast FontLineStyle GetLineStyle() const { return GetValue(); } @@ -88,7 +78,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; @@ -105,7 +94,6 @@ public: const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; }; diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index cfcfbb6f330f..2199d6f636bd 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -44,8 +44,6 @@ public: explicit SvxULSpaceItem( const sal_uInt16 nId ); SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow, const sal_uInt16 nId ); - inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy ); - SvxULSpaceItem(SvxULSpaceItem const &) = default; // SfxPoolItem copy function dichotomy // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; @@ -59,7 +57,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; @@ -80,16 +77,6 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy ) -{ - nUpper = rCpy.GetUpper(); - nLower = rCpy.GetLower(); - bContext = rCpy.GetContext(); - nPropUpper = rCpy.GetPropUpper(); - nPropLower = rCpy.GetPropLower(); - return *this; -} - inline void SvxULSpaceItem::SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp ) { nUpper = sal_uInt16((sal_uInt32(nU) * nProp ) / 100); nPropUpper = nProp; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 18d5e4f4af55..a718a3bfd387 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -45,8 +45,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; static OUString GetValueTextByPos( sal_uInt16 nPos ); virtual sal_uInt16 GetValueCount() const override; @@ -57,12 +55,6 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - SvxWeightItem& operator=(const SvxWeightItem& rWeight) { - SetValue( rWeight.GetValue() ); - return *this; - } - SvxWeightItem(SvxWeightItem const &) = default; // SfxPoolItem copy function dichotomy - // enum cast FontWeight GetWeight() const { return GetValue(); } diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 6c10ef62f0f5..6bdf02fe6986 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -38,7 +38,6 @@ public: SvxWritingModeItem & operator =(SvxWritingModeItem &&) = delete; // due to SfxUInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool operator==( const SfxPoolItem& ) const override; css::text::WritingMode GetValue() const { return static_cast<css::text::WritingMode>(SfxUInt16Item::GetValue()); } diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index d66c254523cc..61d883e3d497 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -45,8 +45,6 @@ public: OUString &rText, const IntlWrapper& rIntlWrapper) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index efd330260f53..7dad7c8f8053 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -78,7 +78,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; const SfxEventNamesList& GetEvents() const { return aEventsList;} void AddEvent( const OUString&, const OUString&, SvMacroItemId ); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index d4eb1fb71ae1..80cb3faade16 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -49,7 +49,6 @@ public: SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool); virtual SfxPoolItem* Clone(SfxItemPool* pToPool = nullptr) const override; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; }; class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index d69b1f086f4b..621468f32988 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -33,10 +33,6 @@ protected: explicit SfxAllEnumItem_Base(sal_uInt16 nWhich, sal_uInt16 nValue): SfxEnumItem(nWhich, nValue) {} - - explicit SfxAllEnumItem_Base(sal_uInt16 const nWhich, SvStream & rStream): - SfxEnumItem(nWhich, rStream) - {} }; class SVL_DLLPUBLIC SfxAllEnumItem: public SfxAllEnumItem_Base @@ -49,7 +45,6 @@ class SVL_DLLPUBLIC SfxAllEnumItem: public SfxAllEnumItem_Base public: explicit SfxAllEnumItem( sal_uInt16 nWhich); SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal ); - SfxAllEnumItem( sal_uInt16 nWhich, SvStream &rStream ); SfxAllEnumItem( const SfxAllEnumItem & ); virtual ~SfxAllEnumItem() override; @@ -61,7 +56,6 @@ public: sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; OUString const & GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; }; #endif diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index f8e1ea3f0fa3..5176d150629c 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -47,10 +47,6 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_uInt8 GetValue() const { return m_nValue; } @@ -74,8 +70,6 @@ public: SfxPoolItem(which), m_nValue(nTheValue) {} - CntUInt16Item(sal_uInt16 which, SvStream & rStream); - virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, @@ -90,10 +84,6 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_uInt16 GetValue() const { return m_nValue; } @@ -117,8 +107,6 @@ public: SfxPoolItem(which), m_nValue(nTheValue) {} - CntInt32Item(sal_uInt16 which, SvStream & rStream); - virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, @@ -133,10 +121,6 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream &, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_Int32 GetValue() const { return m_nValue; } @@ -160,8 +144,6 @@ public: SfxPoolItem(which), m_nValue(nTheValue) {} - CntUInt32Item(sal_uInt16 nWhich, SvStream & rStream); - virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, @@ -176,10 +158,6 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_uInt32 GetValue() const { return m_nValue; } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 268df41d6f4a..eadf1321b8a9 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -38,14 +38,6 @@ protected: SfxEnumItem(const SfxEnumItem &) = default; - SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream) - : SfxEnumItemInterface(nWhich) - { - sal_uInt16 nTmp = 0; - rStream.ReadUInt16( nTmp ); - m_nValue = static_cast<EnumT>(nTmp); - } - public: EnumT GetValue() const { return m_nValue; } @@ -56,12 +48,6 @@ public: m_nValue = nTheValue; } - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override - { - rStream.WriteUInt16( static_cast<sal_uInt16>(m_nValue) ); - return rStream; - } - virtual sal_uInt16 GetEnumValue() const override { return static_cast<sal_uInt16>(GetValue()); @@ -114,11 +100,6 @@ public: virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const - override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; virtual OUString GetValueTextByVal(bool bTheValue) const; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index f37a9e5ef548..db061e38c326 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -36,8 +36,6 @@ public: virtual sal_uInt8 GetFlagCount() const; virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 410beb21746b..428381b340a5 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -19,7 +19,6 @@ class SVL_DLLPUBLIC SfxInt64Item : public SfxPoolItem public: SfxInt64Item( sal_uInt16 nWhich, sal_Int64 nVal ); - SfxInt64Item( sal_uInt16 nWhich, SvStream & rStream ); virtual ~SfxInt64Item() override; @@ -40,10 +39,6 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const override; - - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pOther = nullptr ) const override; sal_Int64 GetValue() const { return mnValue;} diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index a4c14ebd863f..f6064ed8a335 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -32,8 +32,6 @@ public: explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): CntByteItem(which, nValue) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxByteItem(*this); } }; @@ -49,8 +47,6 @@ public: SfxPoolItem(which), m_nValue(nTheValue) {} - SfxInt16Item(sal_uInt16 nWhich, SvStream & rStream); - virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, @@ -65,10 +61,6 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; sal_Int16 GetValue() const { return m_nValue; } @@ -91,12 +83,6 @@ public: explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0): CntUInt16Item(which, nValue) {} - SfxUInt16Item(sal_uInt16 which, SvStream & rStream): - CntUInt16Item(which, rStream) {} - - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override - { return new SfxUInt16Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxUInt16Item(*this); } @@ -112,12 +98,6 @@ public: explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0): CntInt32Item(which, nValue) {} - SfxInt32Item(sal_uInt16 which, SvStream & rStream): - CntInt32Item(which, rStream) {} - - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override - { return new SfxInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxInt32Item(*this); } @@ -133,12 +113,6 @@ public: explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0): CntUInt32Item(which, nValue) {} - SfxUInt32Item(sal_uInt16 which, SvStream & rStream): - CntUInt32Item(which, rStream) {} - - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override - { return new SfxUInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SfxUInt32Item(*this); } diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index d6bf1a21e27c..331854a56d9a 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -30,7 +30,6 @@ class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); SfxLockBytesItem(); - SfxLockBytesItem( sal_uInt16 nWhich, SvStream & ); virtual ~SfxLockBytesItem() override; SfxLockBytesItem(SfxLockBytesItem const &) = default; @@ -40,8 +39,6 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; SvLockBytes* GetValue() const { return _xVal.get(); } diff --git a/include/svl/legacyitem.hxx b/include/svl/legacyitem.hxx new file mode 100755 index 000000000000..b2035aecaf9b --- /dev/null +++ b/include/svl/legacyitem.hxx @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_SVL_LEGACYITEM_HXX +#define INCLUDED_SVL_LEGACYITEM_HXX + +#include <svl/svldllapi.h> + +////////////////////////////////////////////////////////////////////////////// +// // svl +// SfxBoolItem aLinebreak; +// SfxInt32Item aRotateAngle; -> CntInt32Item +////////////////////////////////////////////////////////////////////////////// + +class SvStream; +class SfxBoolItem; +class CntInt32Item; + +namespace legacy +{ + namespace SfxBool + { + sal_uInt16 SVL_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void SVL_DLLPUBLIC Create(SfxBoolItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + SVL_DLLPUBLIC SvStream& Store(const SfxBoolItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + namespace CntInt32 + { + sal_uInt16 SVL_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void SVL_DLLPUBLIC Create(CntInt32Item& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + SVL_DLLPUBLIC SvStream& Store(const CntInt32Item& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } +} + +#endif // INCLUDED_SVL_LEGACYITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 7d17b3349dd3..a397cc6e3bb4 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -125,7 +125,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index c3800cc02c18..796d6aa476c9 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -31,7 +31,6 @@ #include <tools/mapunit.hxx> class IntlWrapper; -class SvStream; enum class SfxItemKind : sal_Int8 { @@ -164,15 +163,12 @@ public: OUString &rText, const IntlWrapper& rIntlWrapper ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual void ScaleMetrics( long lMult, long lDiv ); virtual bool HasMetrics() const; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ); - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nItemVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const = 0; // clone and call SetWhich std::unique_ptr<SfxPoolItem> CloneSetWhich( sal_uInt16 nNewWhich ) const; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 76e5022c441b..348d427d763f 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -44,8 +44,6 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; const Point& GetValue() const { return aVal; } void SetValue( const Point& rNewVal ) { diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 3dd119e1d089..412a695be464 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -42,8 +42,6 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; const tools::Rectangle& GetValue() const { return aVal; } virtual bool QueryValue( css::uno::Any& rVal, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 316b9c334f3d..de2d64d9c34c 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -41,8 +41,6 @@ public: const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; sal_uInt16& From() { return nFrom; } - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; }; diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index dc803e69103d..872903f3c7d8 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -36,7 +36,6 @@ public: SfxStringListItem(); SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=nullptr ); - SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream ); virtual ~SfxStringListItem() override; SfxStringListItem(SfxStringListItem const &) = default; @@ -62,8 +61,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; virtual bool PutValue ( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 2103e917ee13..37546d88b4b2 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -34,12 +34,6 @@ public: SfxStringItem(sal_uInt16 which, const OUString & rValue): CntUnencodedStringItem(which, rValue) {} - SfxStringItem(sal_uInt16 nWhich, SvStream & rStream); - - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; void dumpAsXml(xmlTextWriterPtr pWriter) const override; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index af382c426bc3..f83274644fdb 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -36,8 +36,6 @@ public: m_nValue.bVisible = bVisible; } - SfxVisibilityItem(sal_uInt16 which, SvStream & rStream); - virtual bool operator ==(const SfxPoolItem & rItem) const override; virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit, @@ -51,10 +49,6 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override; - - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; bool GetValue() const { return m_nValue.bVisible; } diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index b1cc5f70ec77..ee6eee0bec89 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -29,7 +29,6 @@ class IntlWrapper; class SfxItemPool; -class SvStream; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem<SvxCellOrientation> { @@ -53,14 +52,6 @@ public: virtual sal_uInt16 GetValueCount() const override; static OUString GetValueText( SvxCellOrientation nVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - - SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) - { - SetValue( rOrientation.GetValue() ); - return *this; - } - SvxOrientationItem(SvxOrientationItem const &) = default; // SfxPoolItem copy function dichotomy /** Returns sal_True, if the item represents STACKED state. */ bool IsStacked() const; @@ -88,8 +79,6 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -102,16 +91,6 @@ public: void SetRightMargin(sal_Int16 nRight); sal_Int16 GetBottomMargin() const {return nBottomMargin; } void SetBottomMargin(sal_Int16 nBottom); - - SvxMarginItem& operator=(const SvxMarginItem& rMargin) - { - nLeftMargin = rMargin.nLeftMargin; - nTopMargin = rMargin.nTopMargin; - nRightMargin = rMargin.nRightMargin; - nBottomMargin = rMargin.nBottomMargin; - return *this; - } - SvxMarginItem(SvxMarginItem const &) = default; // SfxPoolItem copy function dichotomy }; #endif diff --git a/include/svx/autoformathelper.hxx b/include/svx/autoformathelper.hxx new file mode 100755 index 000000000000..a2d72646cbce --- /dev/null +++ b/include/svx/autoformathelper.hxx @@ -0,0 +1,218 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SVX_AUTOFORMATHELPER_HXX +#define INCLUDED_SVX_AUTOFORMATHELPER_HXX + +#include <svx/svxdllapi.h> +#include <memory> + +class SvStream; +class SvxFontItem; +class SvxFontHeightItem; +class SvxWeightItem; +class SvxPostureItem; +class SvxUnderlineItem; +class SvxOverlineItem; +class SvxCrossedOutItem; +class SvxContourItem; +class SvxShadowedItem; +class SvxColorItem; +class SvxBoxItem; +class SvxLineItem; +class SvxBrushItem; +class SvxAdjustItem; +class SvxHorJustifyItem; +class SvxVerJustifyItem; +class SfxBoolItem; +class SvxMarginItem; +class SfxInt32Item; +class SvxRotateModeItem; + +////////////////////////////////////////////////////////////////////////////// +/// Struct with version numbers of the Items + +struct SVX_DLLPUBLIC AutoFormatVersions +{ +public: + // BlockA + sal_uInt16 nFontVersion; + sal_uInt16 nFontHeightVersion; + sal_uInt16 nWeightVersion; + sal_uInt16 nPostureVersion; + sal_uInt16 nUnderlineVersion; + sal_uInt16 nOverlineVersion; + sal_uInt16 nCrossedOutVersion; + sal_uInt16 nContourVersion; + sal_uInt16 nShadowedVersion; + sal_uInt16 nColorVersion; + sal_uInt16 nBoxVersion; + sal_uInt16 nLineVersion; + sal_uInt16 nBrushVersion; + sal_uInt16 nAdjustVersion; + + // BlockB + sal_uInt16 nHorJustifyVersion; + sal_uInt16 nVerJustifyVersion; + sal_uInt16 nOrientationVersion; + sal_uInt16 nMarginVersion; + sal_uInt16 nBoolVersion; + sal_uInt16 nInt32Version; + sal_uInt16 nRotateModeVersion; + sal_uInt16 nNumFormatVersion; + + AutoFormatVersions(); + + void LoadBlockA( SvStream& rStream, sal_uInt16 nVer ); + void LoadBlockB( SvStream& rStream, sal_uInt16 nVer ); + + static void WriteBlockA(SvStream& rStream, sal_uInt16 fileVersion); + static void WriteBlockB(SvStream& rStream, sal_uInt16 fileVersion); +}; + +////////////////////////////////////////////////////////////////////////////// + +class SVX_DLLPUBLIC AutoFormatBase +{ +protected: + // common attributes of Calc and Writer + // --- from 641 on: CJK and CTL font settings + std::shared_ptr<SvxFontItem> m_aFont; + std::shared_ptr<SvxFontHeightItem> m_aHeight; + std::shared_ptr<SvxWeightItem> m_aWeight; + std::shared_ptr<SvxPostureItem> m_aPosture; + + std::shared_ptr<SvxFontItem> m_aCJKFont; + std::shared_ptr<SvxFontHeightItem> m_aCJKHeight; + std::shared_ptr<SvxWeightItem> m_aCJKWeight; + std::shared_ptr<SvxPostureItem> m_aCJKPosture; + + std::shared_ptr<SvxFontItem> m_aCTLFont; + std::shared_ptr<SvxFontHeightItem> m_aCTLHeight; + std::shared_ptr<SvxWeightItem> m_aCTLWeight; + std::shared_ptr<SvxPostureItem> m_aCTLPosture; + + std::shared_ptr<SvxUnderlineItem> m_aUnderline; + std::shared_ptr<SvxOverlineItem> m_aOverline; + std::shared_ptr<SvxCrossedOutItem> m_aCrossedOut; + std::shared_ptr<SvxContourItem> m_aContour; + std::shared_ptr<SvxShadowedItem> m_aShadowed; + std::shared_ptr<SvxColorItem> m_aColor; + std::shared_ptr<SvxBoxItem> m_aBox; + std::shared_ptr<SvxLineItem> m_aTLBR; + std::shared_ptr<SvxLineItem> m_aBLTR; + std::shared_ptr<SvxBrushItem> m_aBackground; + + // Writer specific + std::shared_ptr<SvxAdjustItem> m_aAdjust; + + // Calc specific + std::shared_ptr<SvxHorJustifyItem> m_aHorJustify; + std::shared_ptr<SvxVerJustifyItem> m_aVerJustify; + std::shared_ptr<SfxBoolItem> m_aStacked; + std::shared_ptr<SvxMarginItem> m_aMargin; + std::shared_ptr<SfxBoolItem> m_aLinebreak; + + // from SO5, 504k on, rotated text + std::shared_ptr<SfxInt32Item> m_aRotateAngle; + std::shared_ptr<SvxRotateModeItem> m_aRotateMode; + +public: + AutoFormatBase(); + AutoFormatBase( const AutoFormatBase& rNew ); + ~AutoFormatBase(); + + /// Comparing based of boxes backgrounds. + bool operator==(const AutoFormatBase& rRight); + + // The get-methods. + const SvxFontItem &GetFont() const { return *m_aFont; } + const SvxFontHeightItem &GetHeight() const { return *m_aHeight; } + const SvxWeightItem &GetWeight() const { return *m_aWeight; } + const SvxPostureItem &GetPosture() const { return *m_aPosture; } + const SvxFontItem &GetCJKFont() const { return *m_aCJKFont; } + const SvxFontHeightItem &GetCJKHeight() const { return *m_aCJKHeight; } + const SvxWeightItem &GetCJKWeight() const { return *m_aCJKWeight; } + const SvxPostureItem &GetCJKPosture() const { return *m_aCJKPosture; } + const SvxFontItem &GetCTLFont() const { return *m_aCTLFont; } + const SvxFontHeightItem &GetCTLHeight() const { return *m_aCTLHeight; } + const SvxWeightItem &GetCTLWeight() const { return *m_aCTLWeight; } + const SvxPostureItem &GetCTLPosture() const { return *m_aCTLPosture; } + const SvxUnderlineItem &GetUnderline() const { return *m_aUnderline; } + const SvxOverlineItem &GetOverline() const { return *m_aOverline; } + const SvxCrossedOutItem &GetCrossedOut() const { return *m_aCrossedOut; } + const SvxContourItem &GetContour() const { return *m_aContour; } + const SvxShadowedItem &GetShadowed() const { return *m_aShadowed; } + const SvxColorItem &GetColor() const { return *m_aColor; } + const SvxBoxItem &GetBox() const { return *m_aBox; } + const SvxLineItem& GetTLBR() const { return *m_aTLBR; } + const SvxLineItem& GetBLTR() const { return *m_aBLTR; } + const SvxBrushItem &GetBackground() const { return *m_aBackground; } + const SvxAdjustItem &GetAdjust() const { return *m_aAdjust; } + const SvxHorJustifyItem& GetHorJustify() const { return *m_aHorJustify; } + const SvxVerJustifyItem& GetVerJustify() const { return *m_aVerJustify; } + const SfxBoolItem& GetStacked() const { return *m_aStacked; } + const SvxMarginItem& GetMargin() const { return *m_aMargin; } + const SfxBoolItem& GetLinebreak() const { return *m_aLinebreak; } + const SfxInt32Item& GetRotateAngle() const { return *m_aRotateAngle; } + const SvxRotateModeItem& GetRotateMode() const { return *m_aRotateMode; } + + // The set-methods. + void SetFont( const SvxFontItem& rNew ); + void SetHeight( const SvxFontHeightItem& rNew ); + void SetWeight( const SvxWeightItem& rNew ); + void SetPosture( const SvxPostureItem& rNew ); + void SetCJKFont( const SvxFontItem& rNew ); + void SetCJKHeight( const SvxFontHeightItem& rNew ); + void SetCJKWeight( const SvxWeightItem& rNew ); + void SetCJKPosture( const SvxPostureItem& rNew ); + void SetCTLFont( const SvxFontItem& rNew ); + void SetCTLHeight( const SvxFontHeightItem& rNew ); + void SetCTLWeight( const SvxWeightItem& rNew ); + void SetCTLPosture( const SvxPostureItem& rNew ); + void SetUnderline( const SvxUnderlineItem& rNew ); + void SetOverline( const SvxOverlineItem& rNew ); + void SetCrossedOut( const SvxCrossedOutItem& rNew ); + void SetContour( const SvxContourItem& rNew ); + void SetShadowed( const SvxShadowedItem& rNew ); + void SetColor( const SvxColorItem& rNew ); + void SetBox( const SvxBoxItem& rNew ); + void SetTLBR( const SvxLineItem& rNew ); + void SetBLTR( const SvxLineItem& rNew ); + void SetBackground( const SvxBrushItem& rNew ); + void SetAdjust( const SvxAdjustItem& rNew ); + void SetHorJustify( const SvxHorJustifyItem& rNew ); + void SetVerJustify( const SvxVerJustifyItem& rNew ); + void SetStacked( const SfxBoolItem& rNew ); + void SetMargin( const SvxMarginItem& rNew ); + void SetLinebreak( const SfxBoolItem& rNew ); + void SetRotateAngle( const SfxInt32Item& rNew ); + void SetRotateMode( const SvxRotateModeItem& rNew ); + + bool LoadBlockA( SvStream& rStream, const AutoFormatVersions& rVersions, sal_uInt16 nVer ); + bool LoadBlockB( SvStream& rStream, const AutoFormatVersions& rVersions, sal_uInt16 nVer ); + + bool SaveBlockA( SvStream& rStream, sal_uInt16 fileVersion ) const; + bool SaveBlockB( SvStream& rStream, sal_uInt16 fileVersion ) const; +}; + +#endif // INCLUDED_SVX_AUTOFORMATHELPER_HXX + +////////////////////////////////////////////////////////////////////////////// +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index d852cd10f0dc..5accfe78e0f9 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -88,7 +88,6 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; } - sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; }; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem<SvxChartTextOrder> @@ -114,8 +113,6 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; } - - sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; }; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem<SvxChartIndicate> @@ -127,8 +124,6 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; } - - sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; }; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 714d9c5fe3ef..47e033d7b1a5 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -43,8 +43,6 @@ public: const basegfx::B3DVector& GetValue() const { return aVal; } - virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const override; - void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 0762556f2428..f51749e0d448 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -69,8 +69,6 @@ public: HyperDialogEvent nEvents, SvxMacroTableDtor const *pMacroTbl ); - inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &rItem ); - virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx new file mode 100755 index 000000000000..e75d8186aefa --- /dev/null +++ b/include/svx/legacyitem.hxx @@ -0,0 +1,60 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef INCLUDED_SVX_LEGACYITEM_HXX +#define INCLUDED_SVX_LEGACYITEM_HXX + +#include <svx/svxdllapi.h> + +////////////////////////////////////////////////////////////////////////////// +// // svx +// SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 ); +// SvxMarginItem aMargin; +// SvxRotateModeItem aRotateMode; +////////////////////////////////////////////////////////////////////////////// + +class SvStream; +class SvxOrientationItem; +class SvxMarginItem; +class SvxRotateModeItem; + +namespace legacy +{ + namespace SvxOrientation + { + sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void SVX_DLLPUBLIC Create(SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + SVX_DLLPUBLIC SvStream& Store(const SvxOrientationItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + namespace SvxMargin + { + sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void SVX_DLLPUBLIC Create(SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + SVX_DLLPUBLIC SvStream& Store(const SvxMarginItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } + namespace SvxRotateMode + { + sal_uInt16 SVX_DLLPUBLIC GetVersion(sal_uInt16 nFileFormatVersion); + void SVX_DLLPUBLIC Create(SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + SVX_DLLPUBLIC SvStream& Store(const SvxRotateModeItem& rItem, SvStream& rStrm, sal_uInt16 nItemVersion); + } +} + +#endif // INCLUDED_SVX_LEGACYITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 7327880e0cd9..aa190a19dfa1 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -45,8 +45,6 @@ public: virtual sal_uInt16 GetValueCount() const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 3e2623b0ca76..b4014bdd8807 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -65,7 +65,6 @@ private: OUString &rText, const IntlWrapper&) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 76d402814d60..26459d83c55d 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -37,7 +37,6 @@ public: SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, SDRATTR_GRAFCROP ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; }; #endif // INCLUDED_SVX_SDGCPITM_HXX diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx index 056a5e79bb6a..43efa53c1826 100644 --- a/include/svx/sdtacitm.hxx +++ b/include/svx/sdtacitm.hxx @@ -26,10 +26,6 @@ class SdrTextAniCountItem: public SfxUInt16Item { public: SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} - SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {} - - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const override - { return new SdrTextAniCountItem(rStream); } virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override { return new SdrTextAniCountItem(*this); } diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index e00d3be87167..53198eb9d856 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -33,7 +33,6 @@ public: OUString &rText, const IntlWrapper&) const override; SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; SVX_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SVX_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 11b4179b2d11..82ea78b09684 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -63,7 +63,6 @@ inline SfxBoolItem makeSvx3DDoubleSidedItem(bool bVal) { class Svx3DReducedLineGeometryItem : public SfxBoolItem { public: Svx3DReducedLineGeometryItem(bool bVal = false); - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; @@ -283,7 +282,6 @@ public: class Svx3DSmoothNormalsItem : public SfxBoolItem { public: Svx3DSmoothNormalsItem(bool bVal = true); - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; @@ -291,7 +289,6 @@ public: class Svx3DSmoothLidsItem : public SfxBoolItem { public: Svx3DSmoothLidsItem(bool bVal = false); - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; @@ -299,7 +296,6 @@ public: class Svx3DCharacterModeItem : public SfxBoolItem { public: Svx3DCharacterModeItem(bool bVal = false); - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; @@ -307,7 +303,6 @@ public: class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: Svx3DCloseFrontItem(bool bVal = true); - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; @@ -315,7 +310,6 @@ public: class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: Svx3DCloseBackItem(bool bVal = true); - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const override; SfxPoolItem * Clone(SfxItemPool * = nullptr) const override; }; diff --git a/include/svx/unobrushitemhelper.hxx b/include/svx/unobrushitemhelper.hxx index b5ddc44c85c4..b3f7261f7708 100644 --- a/include/svx/unobrushitemhelper.hxx +++ b/include/svx/unobrushitemhelper.hxx @@ -43,7 +43,7 @@ SVX_DLLPUBLIC void setSvxBrushItemAsFillAttributesToTargetSet( // items in the range [XATTR_FILL_FIRST .. XATTR_FILL_LAST]. Since this is not 100% // representable this may lead to reduced data. With nBackgroundID a Which-ID for the // to-be-created SvxBrushItem has to be given (default should be 99 as in RES_BACKGROUND). -SVX_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet( +SVX_DLLPUBLIC std::shared_ptr<SvxBrushItem> getSvxBrushItemFromSourceSet( const SfxItemSet& rSourceSet, sal_uInt16 nBackgroundID, bool bSearchInParents = true, diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 7da764f7f9ac..bce24f860a4b 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -43,7 +43,6 @@ public: virtual bool operator==( const SfxPoolItem& rItem ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 95b29045631d..df78d6645bd7 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -43,7 +43,6 @@ public: virtual bool operator==( const SfxPoolItem& rItem ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 8f0424d23a74..159c6862dc79 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -43,7 +43,6 @@ public: virtual bool operator==(const SfxPoolItem& rItem) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index e56df6b4b997..b37aed1a45c0 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -35,7 +35,6 @@ public: static SfxPoolItem* CreateDefault(); XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND ); - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 20f5ed09b912..57f49e07c015 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -35,7 +35,6 @@ public: static SfxPoolItem* CreateDefault(); XLineCapItem(css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 12ed0e004fd8..805665f2a003 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -36,9 +36,6 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - }; #endif |