[Libreoffice-commits] core.git: 2 commits - include/comphelper sd/source

[Libreoffice Gerrit user]

 include/comphelper/weak.hxx    |    5 +++++
 sd/source/ui/inc/ViewShell.hxx |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5571d3c8621e18a3bea527da807b7b99d19ec409
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 17 22:18:46 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 18 07:32:54 2018 +0200

    CppunitTest_sd_dialogs_test needs sd::ViewShell::GetFrameWeld
    
    ...since 88582ebee383c63c3fba588924f36ff7655af9c1 "weld SdCharDlg"
    
    Change-Id: Id6069271806e1a19688debf045169890e557cc66
    Reviewed-on: https://gerrit.libreoffice.org/60645
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 9596a8d7155d..aee6057b9977 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -152,7 +152,7 @@ public:
         show running then the active window is a ShowWindow.
     */
     ::sd::Window* GetActiveWindow() const { return mpActiveWindow;}
-    weld::Window* GetFrameWeld() const;
+    SD_DLLPUBLIC weld::Window* GetFrameWeld() const;
 
     /** Set the active window.  When the shell is displayed in the center
         pane then the window of the ViewShellBase is also set to the given
commit 2f6bd6799c0b43afa6e01925456054082c6968be
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 17 22:14:46 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 18 07:32:41 2018 +0200

    -Werror=deprecated-copy (GCC trunk towards GCC 9)
    
    ...after 27463197176fd7f68cbdeed790621dad6b4c63d3 "clang-tidy bugprone-copy-
    constructor-init" made e.g. the SfxStyleSheetBase copy ctor (in
    svl/source/items/style.cxx) use the copy instead of the default ctor for its
    OWeakTypeObject sub-object
    
    Change-Id: I7deec4ea2f968587ba1dc03e33206cecfa3f8df5
    Reviewed-on: https://gerrit.libreoffice.org/60644
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 1a9c99f2324d..929ecbf495ca 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -40,6 +40,11 @@ public:
     OWeakTypeObject();
     virtual ~OWeakTypeObject() override;
 
+    OWeakTypeObject(OWeakTypeObject const &) = default;
+    OWeakTypeObject(OWeakTypeObject &&) = default;
+    OWeakTypeObject & operator =(OWeakTypeObject const &) = default;
+    OWeakTypeObject & operator =(OWeakTypeObject &&) = default;
+
     virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;