[Libreoffice-commits] core.git: include/editeng include/svx sw/inc sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Jul 27 22:13:24 UTC 2018 

 include/editeng/colritem.hxx        |    1 +
 include/editeng/contouritem.hxx     |    1 +
 include/editeng/crossedoutitem.hxx  |    1 +
 include/editeng/fhgtitem.hxx        |    1 +
 include/editeng/fontitem.hxx        |    1 +
 include/editeng/formatbreakitem.hxx |    1 +
 include/editeng/frmdiritem.hxx      |    2 ++
 include/editeng/justifyitem.hxx     |    2 ++
 include/editeng/keepitem.hxx        |    1 +
 include/editeng/langitem.hxx        |    1 +
 include/editeng/lrspitem.hxx        |    1 +
 include/editeng/opaqitem.hxx        |    1 +
 include/editeng/postitem.hxx        |    1 +
 include/editeng/protitem.hxx        |    1 +
 include/editeng/shaditem.hxx        |    1 +
 include/editeng/shdditem.hxx        |    2 +-
 include/editeng/sizeitem.hxx        |    1 +
 include/editeng/tstpitem.hxx        |    1 +
 include/editeng/udlnitem.hxx        |    1 +
 include/editeng/ulspitem.hxx        |    1 +
 include/editeng/wghtitem.hxx        |    1 +
 include/svx/algitem.hxx             |    2 ++
 sw/inc/fmtftntx.hxx                 |    2 ++
 sw/inc/fmtornt.hxx                  |    2 ++
 sw/inc/paratr.hxx                   |    1 +
 sw/source/uibase/inc/envimg.hxx     |    1 +
 sw/source/uibase/inc/labimg.hxx     |    1 +
 27 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit dea2c65032eafb0398ffd10bcd3485499be17eb4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jul 27 10:26:52 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Jul 28 00:12:53 2018 +0200

    -Werror=deprecated-copy (GCC trunk towards GCC 9)
    
    ...in SfxPoolItem-derived classes that have a user-provided copy assignment op
    (to override the explicitly deleted one of SfxPoolItem, cf.
    727878a7d8ae25342db75173cc314fa330ccc077 "Remove unused copy assignment ops of
    SfxPoolItem-derived classes"), so GCC 9 would warn about the implicitly-defined
    copy ctor.  Mark all those with "SfxPoolItem copy function dichotomy" comments
    so they can be found again should the odd design of SfxPoolItem ever be changed.
    
    Change-Id: If206716747c42205ae4822a3f54c9de037c75286
    Reviewed-on: https://gerrit.libreoffice.org/58172
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index d58ee5866817..49415c9a7b82 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -61,6 +61,7 @@ public:
         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 34602f575ede..d0514da0d174 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -51,6 +51,7 @@ public:
         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 536d1fd44f03..834f4840fb15 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -64,6 +64,7 @@ public:
             SetValue( rCross.GetValue() );
             return *this;
         }
+    SvxCrossedOutItem(SvxCrossedOutItem const &) = default; // SfxPoolItem copy function dichotomy
 
     // enum cast
     FontStrikeout           GetStrikeout() const
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 799c17cc6da3..de6079c221f8 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -72,6 +72,7 @@ public:
             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 ddb974acbea5..224ebf682002 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -107,6 +107,7 @@ public:
     }
 
     SvxFontItem& operator=(const SvxFontItem& rFont);
+    SvxFontItem(SvxFontItem const &) = default; // SfxPoolItem copy function dichotomy
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 2a1292e4e4af..f26f516d72b9 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -41,6 +41,7 @@ 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
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index df8aecdd40a5..929cbc5b0b3e 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -56,6 +56,8 @@ public:
         SetValue( rItem.GetValue() );
         return *this;
     }
+    SvxFrameDirectionItem(SvxFrameDirectionItem const &) = default;
+        // SfxPoolItem copy function dichotomy
 };
 
 #endif // INCLUDED_EDITENG_FRMDIRITEM_HXX
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index 59d4182f2c01..7c25846e63d3 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -54,6 +54,7 @@ public:
                 SetValue( rHorJustify.GetValue() );
                 return *this;
             }
+    SvxHorJustifyItem(SvxHorJustifyItem const &) = default; // SfxPoolItem copy function dichotomy
 };
 
 
@@ -86,6 +87,7 @@ public:
                 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 77b528d7c631..b5f0ddbd6418 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -38,6 +38,7 @@ 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;
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index e90b6cbee1f2..4be285b978a7 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -62,6 +62,7 @@ public:
             SetValue( rLang.GetValue() );
             return *this;
         }
+    SvxLanguageItem(SvxLanguageItem const &) = default; // SfxPoolItem copy function dichotomy
 
     LanguageType            GetLanguage() const
                                 { return GetValue(); }
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 6a1a16d61144..a1b768dda66d 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -69,6 +69,7 @@ public:
                     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
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx
index 3b94b5a55e86..12e3caf2c44b 100644
--- a/include/editeng/opaqitem.hxx
+++ b/include/editeng/opaqitem.hxx
@@ -37,6 +37,7 @@ 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;
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index d28796abd7be..2d19f544dcbc 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -63,6 +63,7 @@ public:
         SetValue( rPost.GetValue() );
         return *this;
     }
+    SvxPostureItem(SvxPostureItem const &) = default; // SfxPoolItem copy function dichotomy
 
     // enum cast
     FontItalic              GetPosture() const
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 77d5cb9f4d9f..1de4c9fd5dfc 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -43,6 +43,7 @@ public:
 
     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
     virtual bool             operator==( const SfxPoolItem& ) const override;
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 7a75d55c2e30..ee09121c2200 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -46,6 +46,7 @@ public:
                  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;
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index a27b54ccc145..22f9ccf25a3a 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -53,7 +53,7 @@ public:
             SetValue(rShadow.GetValue());
             return *this;
         }
-
+    SvxShadowedItem(SvxShadowedItem const &) = default; // SfxPoolItem copy function dichotomy
 };
 
 #endif
diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index 9e2bdc6efabf..ab2fb380a54f 100644
--- a/include/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
@@ -42,6 +42,7 @@ public:
     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;
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 1e8c061ecf03..85fcc2286762 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -117,6 +117,7 @@ public:
 
     // 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/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 2942b08586d4..b26c9a7e9ade 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -65,6 +65,7 @@ public:
             SetColor( rTextLine.GetColor() );
             return *this;
         }
+    SvxTextLineItem(SvxTextLineItem const &) = default; // SfxPoolItem copy function dichotomy
 
     // enum cast
     FontLineStyle           GetLineStyle() const
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index 5734afbf5696..d93aa47d5094 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -45,6 +45,7 @@ public:
     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;
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 16a4e099bada..3ed7e54cdc1d 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -63,6 +63,7 @@ public:
             SetValue( rWeight.GetValue() );
             return *this;
         }
+    SvxWeightItem(SvxWeightItem const &) = default; // SfxPoolItem copy function dichotomy
 
     // enum cast
     FontWeight              GetWeight() const { return GetValue(); }
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 797b3be24c86..b1cc5f70ec77 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -60,6 +60,7 @@ public:
                 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;
@@ -110,6 +111,7 @@ public:
                 nBottomMargin = rMargin.nBottomMargin;
                 return *this;
             }
+    SvxMarginItem(SvxMarginItem const &) = default; // SfxPoolItem copy function dichotomy
 };
 
 #endif
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 52279dbca158..2cc217f0ae12 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -63,6 +63,8 @@ public:
     bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
 
     SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );
+    SwFormatFootnoteEndAtTextEnd(SwFormatFootnoteEndAtTextEnd const &) = default;
+        // SfxPoolItem copy function dichotomy
 
     SvxNumType GetNumType() const        { return aFormat.GetNumberingType(); }
     void SetNumType( SvxNumType eType )  { aFormat.SetNumberingType(eType); }
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 5de9f2ff6949..817bdf871db7 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -39,6 +39,7 @@ 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.
     virtual bool            operator==( const SfxPoolItem& ) const override;
@@ -75,6 +76,7 @@ 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.
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index a42788b6c20f..cc173cb9173b 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -140,6 +140,7 @@ public:
 
     SwNumRuleItem& operator=( const SwNumRuleItem& rCpy )
     { SetValue( rCpy.GetValue() ); return *this; }
+    SwNumRuleItem(SwNumRuleItem const &) = default; // SfxPoolItem copy function dichotomy
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 7bb83499e47a..46974d37a4dd 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -57,6 +57,7 @@ public:
 
     static SfxPoolItem* CreateDefault();
     SwEnvItem& operator =(const SwEnvItem& rItem);
+    SwEnvItem(SwEnvItem const &) = default; // SfxPoolItem copy function dichotomy
 
     virtual bool operator ==(const SfxPoolItem& rItem) const override;
 
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index fc21242ec5e6..e81a986e025f 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -34,6 +34,7 @@ public:
     SwLabItem();
 
     SwLabItem& operator =(const SwLabItem& rItem);
+    SwLabItem(SwLabItem const &) = default; // SfxPoolItem copy function dichotomy
 
     virtual bool operator ==(const SfxPoolItem& rItem) const override;

More information about the Libreoffice-commits mailing list