diff options
author | Armin Le Grand <Armin.Le.Grand@me.com> | 2019-04-18 19:25:06 +0200 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2019-04-25 19:59:04 +0200 |
commit | 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 (patch) | |
tree | 17457bc49d6faf37270c8a481b94765f58a5f434 /sw/inc/fmtornt.hxx | |
parent | 5e4c1e6ba425ce0b75864e4584a846957b032e61 (diff) |
WIP: Further preparations for deeper Item changes
(1) Migrated all still existing binary load/save stuff
in SfxPoolItem to legacy files. Isolated from Item
implementations. Adapted all usages. No more methods
Create/Store needed, also GetVersion removed
(2) Removed operator= for SfxPoolItem. Adapted all
usages. Goal ist to handle Items more as Objects
('Object-Oriented') in the sense to move/handle
instances, not to copy one instance over another one
(which is more and more problematic with hard to copy
content as UNO API stuff or similar). This lead to
much more usages of std::shared_ptr which correlates
well with future plans fr Items (see dev branch).
Next logic step will be to also remove copy constructor
Linux build and corrections done
Fixed Writer test and removed unused defines
Fixed another unused m,acro
Started to unify the AutoFormat stuff
Changes to OUString constructor usages, tests completely
No idea why, but SfxStringItem constructor which
takes a OUString& now insists of not getting ::OUString's
handed in - changed all 'SfxStringItem.*OUString.*".*"'
accordingly
Change-Id: Ibed7358b18fb019994a7490332b9d797a6694c29
Reviewed-on: https://gerrit.libreoffice.org/71075
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'sw/inc/fmtornt.hxx')
-rw-r--r-- | sw/inc/fmtornt.hxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 055db32bade3..24ffdc907e26 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -38,7 +38,6 @@ class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem public: SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = css::text::VertOrientation::NONE, sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA ); - inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy ); SwFormatVertOrient(SwFormatVertOrient const &) = default; // SfxPoolItem copy function dichotomy /// "Pure virtual methods" of SfxPoolItem. @@ -52,9 +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; - SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const override; - SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const override; - sal_Int16 GetVertOrient() const { return m_eOrient; } sal_Int16 GetRelationOrient() const { return m_eRelation; } void SetVertOrient( sal_Int16 eNew ) { m_eOrient = eNew; } @@ -75,7 +71,6 @@ class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem public: SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = css::text::HoriOrientation::NONE, sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA, bool bPos = false ); - inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy ); SwFormatHoriOrient(SwFormatHoriOrient const &) = default; // SfxPoolItem copy function dichotomy /// "Pure virtual methods" of SfxPoolItem. @@ -103,22 +98,6 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy ) -{ - m_nYPos = rCpy.GetPos(); - m_eOrient = rCpy.GetVertOrient(); - m_eRelation = rCpy.GetRelationOrient(); - return *this; -} -inline SwFormatHoriOrient &SwFormatHoriOrient::operator=( const SwFormatHoriOrient &rCpy ) -{ - m_nXPos = rCpy.GetPos(); - m_eOrient = rCpy.GetHoriOrient(); - m_eRelation = rCpy.GetRelationOrient(); - m_bPosToggle = rCpy.IsPosToggle(); - return *this; -} - inline const SwFormatVertOrient &SwAttrSet::GetVertOrient(bool bInP) const { return Get( RES_VERT_ORIENT,bInP); } inline const SwFormatHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const |