diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-15 17:58:45 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-15 18:07:34 +0530 |
| commit | a895f6356159f4267c0ac24781814ae0cbcba0b9 (patch) | |
| tree | a692f48fe2eb9ad1bfa8b143a94cee77339497d3 | |
| parent | 41f4fee00f1cddbf93f7d0ff732b1b41f8d13955 (diff) | |
lokdialog: Give non-programmatic name to autofilter
Change-Id: I8670a5aaa1703677cab173b2341c6e70e689f61a
(cherry-picked from 04abf03ecb18ccf1f805faa763d6f29013efc6bb)
| -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, 6 insertions, 0 deletions
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc index 27d534532c5c..5491a39eedbf 100644 --- a/sc/inc/strings.hrc +++ b/sc/inc/strings.hrc @@ -164,6 +164,7 @@ #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 df026bf60549..a1416600d9d2 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -628,7 +628,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(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 63ae2172fc60..6377c6c6f853 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -624,6 +624,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) |