[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source vcl/source

[Pranav Kant]

 sc/source/ui/cctrl/checklistmenu.src |    5 +++++
 sc/source/ui/inc/checklistmenu.hrc   |   15 ++++++++-------
 sc/source/ui/view/gridwin.cxx        |    3 +++
 vcl/source/window/floatwin.cxx       |    2 ++
 4 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 04abf03ecb18ccf1f805faa763d6f29013efc6bb
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Dec 15 14:52:31 2017 +0530

    lokdialog: Give non-programmatic name to autofilter
    
    Change-Id: I8670a5aaa1703677cab173b2341c6e70e689f61a
    Reviewed-on: https://gerrit.libreoffice.org/46505
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/cctrl/checklistmenu.src b/sc/source/ui/cctrl/checklistmenu.src
index 59c8eb09477b..2c65b2fbb851 100644
--- a/sc/source/ui/cctrl/checklistmenu.src
+++ b/sc/source/ui/cctrl/checklistmenu.src
@@ -21,6 +21,11 @@
 
 Resource RID_POPUP_FILTER
 {
+    String STR_MENU_TITLE
+    {
+        Text [ en-US ] = "AutoFilter" ;
+    };
+
     String STR_MENU_SORT_ASC
     {
         Text [ en-US ] = "Sort Ascending" ;
diff --git a/sc/source/ui/inc/checklistmenu.hrc b/sc/source/ui/inc/checklistmenu.hrc
index 7d009576f1dd..33b689887eb6 100644
--- a/sc/source/ui/inc/checklistmenu.hrc
+++ b/sc/source/ui/inc/checklistmenu.hrc
@@ -22,13 +22,14 @@
 
 #include <sc.hrc>
 
-#define STR_MENU_SORT_ASC           1
-#define STR_MENU_SORT_DESC          2
-#define STR_MENU_SORT_CUSTOM        3
-#define STR_BTN_TOGGLE_ALL          4
-#define STR_BTN_SELECT_CURRENT      5
-#define STR_BTN_UNSELECT_CURRENT    6
-#define STR_EDIT_SEARCH_ITEMS       7
+#define STR_MENU_TITLE              1
+#define STR_MENU_SORT_ASC           2
+#define STR_MENU_SORT_DESC          3
+#define STR_MENU_SORT_CUSTOM        4
+#define STR_BTN_TOGGLE_ALL          5
+#define STR_BTN_SELECT_CURRENT      6
+#define STR_BTN_UNSELECT_CURRENT    7
+#define STR_EDIT_SEARCH_ITEMS       8
 
 #endif
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d285f6c05287..9cd3f117118e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -682,7 +682,10 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
     mpAutoFilterPopup.disposeAndClear();
     mpAutoFilterPopup.reset(VclPtr<ScCheckListMenuWindow>::Create(this, pDoc));
     if (comphelper::LibreOfficeKit::isActive())
+    {
         mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
+        mpAutoFilterPopup->SetText(SC_STRLOAD(RID_POPUP_FILTER, STR_MENU_TITLE));
+    }
     mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
     mpAutoFilterPopup->setPopupEndAction(
         new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab)));
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 7a03108495b1..3ee264fad5ad 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -629,6 +629,8 @@ void FloatingWindow::StateChanged( StateChangedType nType )
             }
             aItems.emplace_back("size", GetSizePixel().toString());
             aItems.emplace_back("position", mpImplData->maPos.toString());
+            if (!GetText().isEmpty())
+                aItems.emplace_back("title", GetText().toUtf8());
             GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems);
         }
         else if (!IsVisible() && nType == StateChangedType::Visible)