[Libreoffice-commits] core.git: 2 commits - bin/check-elf-dynamic-objects sw/inc sw/source

[Michael Stahl (via logerrit)]

 bin/check-elf-dynamic-objects  |    2 -
 sw/inc/tblafmt.hxx             |    2 +
 sw/source/core/doc/tblafmt.cxx |   43 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 7bc6a7187c26690c64acb397e68d921be71e362e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Sat May 11 22:58:00 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Sun May 12 09:35:35 2019 +0200

    check-elf-dynamic-objects: add libgstaudio-1.0.so.0
    
    It's in GSTREAMER_1_0_LIBS on Fedora 30.
    
    Change-Id: I0a9e5a53ee1bbd4ac4109ccbdbbd94b909b62118
    Reviewed-on: https://gerrit.libreoffice.org/72174
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 80885cc7e37e..de9601dae334 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -93,7 +93,7 @@ x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 l
 openglwhitelist="libGL.so.1"
 giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 gstreamer010whitelist="libgstpbutils-0.10.so.0 libgstinterfaces-0.10.so.0 libgstreamer-0.10.so.0"
-gstreamerwhitelist="libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
+gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
 gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0"
commit c7026059fcab70cac99eb776c50e260036a2f1d9
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Sat May 11 21:46:02 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Sun May 12 09:35:25 2019 +0200

    sw: -Werror=deprecated-copy; restore SwBoxAutoFormat::operator=
    
    Presumably 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 assumed that it's
    not called any more but evidently it is.
    
    Change-Id: I5b7bad52d0a0c40494b33c3a604c8af1ace2b090
    Reviewed-on: https://gerrit.libreoffice.org/72173
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 8b0320f9f929..3d2e7e3ff1e3 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -79,6 +79,8 @@ public:
     SwBoxAutoFormat( const SwBoxAutoFormat& rNew );
     ~SwBoxAutoFormat();
 
+    SwBoxAutoFormat& operator=(const SwBoxAutoFormat& rNew);
+
     /// Comparing based of boxes backgrounds.
     bool operator==(const SwBoxAutoFormat& rRight);
 
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index e9331971edc0..1cbe79762e49 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -268,6 +268,49 @@ SwBoxAutoFormat::~SwBoxAutoFormat()
 {
 }
 
+SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew )
+{
+    m_aFont = rNew.m_aFont;
+    m_aHeight = rNew.m_aHeight;
+    m_aWeight = rNew.m_aWeight;
+    m_aPosture = rNew.m_aPosture;
+    m_aCJKFont = rNew.m_aCJKFont;
+    m_aCJKHeight = rNew.m_aCJKHeight;
+    m_aCJKWeight = rNew.m_aCJKWeight;
+    m_aCJKPosture = rNew.m_aCJKPosture;
+    m_aCTLFont = rNew.m_aCTLFont;
+    m_aCTLHeight = rNew.m_aCTLHeight;
+    m_aCTLWeight = rNew.m_aCTLWeight;
+    m_aCTLPosture = rNew.m_aCTLPosture;
+    m_aUnderline = rNew.m_aUnderline;
+    m_aOverline = rNew.m_aOverline;
+    m_aCrossedOut = rNew.m_aCrossedOut;
+    m_aContour = rNew.m_aContour;
+    m_aShadowed = rNew.m_aShadowed;
+    m_aColor = rNew.m_aColor;
+    SetAdjust( *rNew.m_aAdjust );
+    m_aTextOrientation = rNew.m_aTextOrientation;
+    m_aVerticalAlignment = rNew.m_aVerticalAlignment;
+    m_aBox = rNew.m_aBox;
+    m_aTLBR = rNew.m_aTLBR;
+    m_aBLTR = rNew.m_aBLTR;
+    m_aBackground = rNew.m_aBackground;
+
+    m_aHorJustify = rNew.m_aHorJustify;
+    m_aVerJustify = rNew.m_aVerJustify;
+    m_aStacked->SetValue( rNew.m_aStacked->GetValue() );
+    m_aMargin = rNew.m_aMargin;
+    m_aLinebreak->SetValue( rNew.m_aLinebreak->GetValue() );
+    m_aRotateAngle->SetValue( rNew.m_aRotateAngle->GetValue() );
+    m_aRotateMode->SetValue( rNew.m_aRotateMode->GetValue() );
+
+    m_sNumFormatString = rNew.m_sNumFormatString;
+    m_eSysLanguage = rNew.m_eSysLanguage;
+    m_eNumFormatLanguage = rNew.m_eNumFormatLanguage;
+
+    return *this;
+}
+
 bool SwBoxAutoFormat::operator==(const SwBoxAutoFormat& rRight)
 {
     return GetBackground().GetColor() == rRight.GetBackground().GetColor();