Kaydet (Commit) a895f635 authored tarafından Pranav Kant's avatar Pranav Kant

lokdialog: Give non-programmatic name to autofilter

Change-Id: I8670a5aaa1703677cab173b2341c6e70e689f61a
(cherry-picked from 04abf03e)
üst 41f4fee0
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
#define SCSTR_QHLP_SCEN_LISTBOX NC_("SCSTR_QHLP_SCEN_LISTBOX", "Scenario Name") #define SCSTR_QHLP_SCEN_LISTBOX NC_("SCSTR_QHLP_SCEN_LISTBOX", "Scenario Name")
#define SCSTR_QHLP_SCEN_COMMENT NC_("SCSTR_QHLP_SCEN_COMMENT", "Comment") #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_ASC NC_("STR_MENU_SORT_ASC", "Sort Ascending")
#define STR_MENU_SORT_DESC NC_("STR_MENU_SORT_DESC", "Sort Descending") #define STR_MENU_SORT_DESC NC_("STR_MENU_SORT_DESC", "Sort Descending")
#define STR_MENU_SORT_CUSTOM NC_("STR_MENU_SORT_CUSTOM", "Custom Sort") #define STR_MENU_SORT_CUSTOM NC_("STR_MENU_SORT_CUSTOM", "Custom Sort")
......
...@@ -628,7 +628,10 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) ...@@ -628,7 +628,10 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
mpAutoFilterPopup.disposeAndClear(); mpAutoFilterPopup.disposeAndClear();
mpAutoFilterPopup.reset(VclPtr<ScCheckListMenuWindow>::Create(this, pDoc)); mpAutoFilterPopup.reset(VclPtr<ScCheckListMenuWindow>::Create(this, pDoc));
if (comphelper::LibreOfficeKit::isActive()) if (comphelper::LibreOfficeKit::isActive())
{
mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current()); mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
mpAutoFilterPopup->SetText(ScResId(STR_MENU_AUTOFILTER));
}
mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal)); mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
mpAutoFilterPopup->setPopupEndAction( mpAutoFilterPopup->setPopupEndAction(
new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab))); new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab)));
......
...@@ -624,6 +624,8 @@ void FloatingWindow::StateChanged( StateChangedType nType ) ...@@ -624,6 +624,8 @@ void FloatingWindow::StateChanged( StateChangedType nType )
} }
aItems.emplace_back("size", GetSizePixel().toString()); aItems.emplace_back("size", GetSizePixel().toString());
aItems.emplace_back("position", mpImplData->maPos.toString()); aItems.emplace_back("position", mpImplData->maPos.toString());
if (!GetText().isEmpty())
aItems.emplace_back("title", GetText().toUtf8());
GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems); GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems);
} }
else if (!IsVisible() && nType == StateChangedType::Visible) else if (!IsVisible() && nType == StateChangedType::Visible)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment