summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2016-07-14 10:59:47 -0400
committerHenry Castro <hcastro@collabora.com>2016-07-14 13:42:06 -0400
commitcc49daa85de86e7dec71f7289533d9c977c0bdd2 (patch)
treeb187bcf458cd380767ba133e9f7f3b380b2eb134
parent7e38d503be827eaecf5702c03c7f10c85181c4a9 (diff)
sc lok: add more toolbar items
.uno:SortAscending .uno:SortDescending Change-Id: I3d307b43fb18ffce75b00a0b919b63320bf6db05 Reviewed-on: https://gerrit.libreoffice.org/27223 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
-rw-r--r--desktop/source/lib/init.cxx4
-rw-r--r--sfx2/source/control/unoctitm.cxx10
2 files changed, 9 insertions, 5 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c278d4ba2d44..4cd1649c2f39 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1018,7 +1018,9 @@ static void doc_iniUnoCommands ()
OUString(".uno:ToggleMergeCells"),
OUString(".uno:NumberFormatCurrency"),
OUString(".uno:NumberFormatPercent"),
- OUString(".uno:NumberFormatDate")
+ OUString(".uno:NumberFormatDate"),
+ OUString(".uno:SortAscending"),
+ OUString(".uno:SortDescending")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 2508688bbbff..7c7dafac514c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1176,14 +1176,17 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
}
else if (aEvent.FeatureURL.Path == "InsertPage" ||
aEvent.FeatureURL.Path == "DeletePage" ||
- aEvent.FeatureURL.Path == "DuplicatePage")
+ aEvent.FeatureURL.Path == "DuplicatePage" ||
+ aEvent.FeatureURL.Path == "SortAscending" ||
+ aEvent.FeatureURL.Path == "SortDescending")
{
aBuffer.append(OUString::boolean(aEvent.IsEnabled));
}
else if (aEvent.FeatureURL.Path == "AssignLayout" ||
aEvent.FeatureURL.Path == "StatusSelectionMode" ||
aEvent.FeatureURL.Path == "Signature" ||
- aEvent.FeatureURL.Path == "SelectionMode")
+ aEvent.FeatureURL.Path == "SelectionMode" ||
+ aEvent.FeatureURL.Path == "StatusBarFunc")
{
sal_Int32 aInt32;
@@ -1233,8 +1236,7 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c
aBuffer.append(OUString::number(aPoint.X) + OUString(" / ") + OUString::number(aPoint.Y));
}
}
- else if (aEvent.FeatureURL.Path == "StatusBarFunc" ||
- aEvent.FeatureURL.Path == "Size")
+ else if (aEvent.FeatureURL.Path == "Size")
{
css::awt::Size aSize;