[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 3 commits - dbaccess/source include/sfx2 scripting/Package_ScriptsPython.mk sfx2/source

[Ashod Nakashian (via logerrit)]

 dbaccess/source/ui/browser/genericcontroller.cxx |    1 +
 include/sfx2/sidebar/UnoSidebar.hxx              |   10 ++++------
 scripting/Package_ScriptsPython.mk               |    1 +
 sfx2/source/sidebar/SidebarController.cxx        |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c4d30aa3fc562fe7662440ab682023d3a76bacb8
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Mar 2 15:07:05 2019 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:38:54 2019 +0200

    scripting: copy python/InsertText.py to the Scripts directory
    
    Change-Id: I55e367f8fc3bbd2aa65ca9cdef2e97a3dfa3d117
    Reviewed-on: https://gerrit.libreoffice.org/68762
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit cffa813b8213122dba1206c362ec77a2343f48ba)
    Reviewed-on: https://gerrit.libreoffice.org/78441
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index 7612b7ba58bd..0c48839ca42d 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/exa
 $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\
 	python/Capitalise.py \
 	python/HelloWorld.py \
+	python/InsertText.py \
 	python/NamedRanges.py \
 	python/SetCellColor.py \
 	python/pythonSamples/TableSample.py \
commit 501cb09d91a26e5a72bc46c3e6085bf35e34c29d
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Jan 30 20:29:29 2019 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:38:45 2019 +0200

    sfx2: include what we use only
    
    Change-Id: If89e1ea4377549935ec27afe60543b4cf27fe5f2
    Reviewed-on: https://gerrit.libreoffice.org/68266
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 48e7d857b2626f742b87cfebdc905240bc42f845)
    Reviewed-on: https://gerrit.libreoffice.org/78440

diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 2e660ccb204d..29d4def3c7da 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -59,6 +59,7 @@
 #include <o3tl/functional.hxx>
 #include <limits>
 #include <unordered_map>
+#include <set>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx
index a60143b65f94..3a1282d8051a 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -16,16 +16,14 @@
 #include <com/sun/star/ui/XSidebarProvider.hpp>
 #include <com/sun/star/ui/XSidebar.hpp>
 
-#include <com/sun/star/awt/XWindow2.hpp>
-
 #include <cppuhelper/compbase.hxx>
 
-#include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/sidebar/SidebarDockingWindow.hxx>
-
-#include <sfx2/sidebar/UnoDecks.hxx>
 #include <com/sun/star/ui/XDecks.hpp>
 
+namespace sfx2 { namespace sidebar {
+class SidebarController;
+} }
+
 /** get the sidebar for a given frame
 */
 class SfxUnoSidebar : public cppu::WeakImplHelper<css::ui::XSidebarProvider>
commit 8e236993713dd1e08801a3a4233bad7958f9559f
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Nov 29 07:05:52 2018 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:38:26 2019 +0200

    sfx: fix -Wreturn-std-move warning
    
    Change-Id: Ibd927983505a6924d32c45f6425a08f28bf75f9e
    Reviewed-on: https://gerrit.libreoffice.org/68259
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 441300d5782caf9874cb1f37bdece160e041adbb)
    Reviewed-on: https://gerrit.libreoffice.org/78439
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 0b6df46d1388..6096d9730358 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1123,7 +1123,7 @@ SidebarController::CreatePopupMenu(const ::std::vector<TabBar::DeckMenuData>& rM
 
     pMenu->RemoveDisabledEntries(false);
 
-    return pMenu;
+    return std::move(pMenu);
 }
 
 IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool)