Kaydet (Commit) 5c44aae8 authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) pranavk

Revert "lokdialog: Give non-programmatic name to autofilter"

The online now shows no title when no title name is provided, which is better
for the AutoFilter too.

This reverts commit 04abf03e.

Change-Id: If3e26e2b6d5b5b5a6d6a85c95ce1b8a7e6d358c8
Reviewed-on: https://gerrit.libreoffice.org/51953Reviewed-by: 's avatarpranavk <pranavk@collabora.co.uk>
Tested-by: 's avatarpranavk <pranavk@collabora.co.uk>
üst 5bed90ff
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
Resource RID_POPUP_FILTER Resource RID_POPUP_FILTER
{ {
String STR_MENU_TITLE
{
Text [ en-US ] = "AutoFilter" ;
};
String STR_MENU_SORT_ASC String STR_MENU_SORT_ASC
{ {
Text [ en-US ] = "Sort Ascending" ; Text [ en-US ] = "Sort Ascending" ;
......
...@@ -22,14 +22,13 @@ ...@@ -22,14 +22,13 @@
#include <sc.hrc> #include <sc.hrc>
#define STR_MENU_TITLE 1 #define STR_MENU_SORT_ASC 1
#define STR_MENU_SORT_ASC 2 #define STR_MENU_SORT_DESC 2
#define STR_MENU_SORT_DESC 3 #define STR_MENU_SORT_CUSTOM 3
#define STR_MENU_SORT_CUSTOM 4 #define STR_BTN_TOGGLE_ALL 4
#define STR_BTN_TOGGLE_ALL 5 #define STR_BTN_SELECT_CURRENT 5
#define STR_BTN_SELECT_CURRENT 6 #define STR_BTN_UNSELECT_CURRENT 6
#define STR_BTN_UNSELECT_CURRENT 7 #define STR_EDIT_SEARCH_ITEMS 7
#define STR_EDIT_SEARCH_ITEMS 8
#endif #endif
......
...@@ -682,10 +682,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) ...@@ -682,10 +682,7 @@ 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(SC_STRLOAD(RID_POPUP_FILTER, STR_MENU_TITLE));
}
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)));
......
...@@ -645,8 +645,6 @@ void FloatingWindow::StateChanged( StateChangedType nType ) ...@@ -645,8 +645,6 @@ void FloatingWindow::StateChanged( StateChangedType nType )
aItems.emplace_back("position", mpImplData->maPos.toString()); // pixels aItems.emplace_back("position", mpImplData->maPos.toString()); // pixels
} }
aItems.emplace_back("size", GetSizePixel().toString()); aItems.emplace_back("size", GetSizePixel().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