diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-05-21 14:39:10 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 09:16:23 +0200 |
| commit | b6dda60b3e888f67d76402f29d7b5576814786dd (patch) | |
| tree | 24bd1af768d40fac928144b31b6f339ed6acbb35 | |
| parent | c8c7f19073eb7c2697cfe78de9e708ddc714c42a (diff) | |
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/54629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | sc/inc/strings.hrc | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc index 7c3890a3ff4e..ed0fc8df5663 100644 --- a/sc/inc/strings.hrc +++ b/sc/inc/strings.hrc @@ -165,7 +165,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 4ef41950c217..64f8012891d6 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 e30fd77f5c69..83966e42b0e5 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -642,8 +642,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) |