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

[Jan Holesovsky]

 sc/inc/strings.hrc             |    1 -
 sc/source/ui/view/gridwin.cxx  |    3 ---
 vcl/source/window/floatwin.cxx |    2 --
 3 files changed, 6 deletions(-)

New commits:
commit 55933a7098ab45543ab8b3152c5868c5d41a407f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon May 21 14:39:10 2018 +0200

    Revert "lokdialog: Give non-programmatic name to autofilter"
    
    In the meantime, we are able to treat the title-less pop-ups just fine.
    
    This reverts commit a895f6356159f4267c0ac24781814ae0cbcba0b9.
    
    Change-Id: I1e2913190e9a1141eddf9aba0732e57bd5407987
    Reviewed-on: https://gerrit.libreoffice.org/54635
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 5491a39eedbf..27d534532c5c 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -164,7 +164,6 @@
 #define SCSTR_QHLP_SCEN_LISTBOX                     NC_("SCSTR_QHLP_SCEN_LISTBOX", "Scenario Name")
 #define SCSTR_QHLP_SCEN_COMMENT                     NC_("SCSTR_QHLP_SCEN_COMMENT", "Comment")
 
-#define STR_MENU_AUTOFILTER                         NC_("STR_MENU_AUTOFILTER", "AutoFilter")
 #define STR_MENU_SORT_ASC                           NC_("STR_MENU_SORT_ASC", "Sort Ascending")
 #define STR_MENU_SORT_DESC                          NC_("STR_MENU_SORT_DESC", "Sort Descending")
 #define STR_MENU_SORT_CUSTOM                        NC_("STR_MENU_SORT_CUSTOM", "Custom Sort")
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 4df3462c9431..23a6144b66da 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -628,10 +628,7 @@ 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(ScResId(STR_MENU_AUTOFILTER));
-    }
     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 84105f7ff865..61c61fe5a4f7 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -652,8 +652,6 @@ void FloatingWindow::StateChanged( StateChangedType nType )
                 aItems.emplace_back("position", mpImplData->maPos.toString()); // pixels
             }
             aItems.emplace_back("size", GetSizePixel().toString());
-            if (!GetText().isEmpty())
-                aItems.emplace_back("title", GetText().toUtf8());
             GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems);
         }
         else if (!IsVisible() && nType == StateChangedType::Visible)