officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu | 8
++++++++
reportdesign/source/ui/report/ReportController.cxx | 9
++++-----
reportdesign/uiconfig/dbreport/toolbar/toolbar.xml | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 81397e1d0c0731fb354ad01ef9e4ef710a2067c5
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Sun Feb 9 15:11:12 2020 +0200
Commit: Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Mon Feb 10 21:05:34 2020 +0100
reportdesign: Hide some internal commands from customization
In addition:
- .uno:BackColor was unused, and internally mapped to the same
id as .uno:DBBackgroundColor which is used and has a label. So
remove the former, and make the latter visible in the
customization dialog instead.
- .uno:DSBEditDoc is mapped to SID_EDITDOC, and handled by the
code, but has no label. On the other hand, the toolbar has an
.uno:EditDoc item, which has no mapping in reportdesign, but
happens to be mapped to SID_EDITDOC elsewhere. So assume this
was a mistake, and .uno:DSBEditDoc should be used instead of
.uno:EditDoc.
Change-Id: I9da2ed36167571627b32a4055b734847c3ea1e64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88342
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index a3b1378a1993..dc8d802ccd8b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -313,6 +313,14 @@
<value xml:lang="en-US">Background Color...</value>
</prop>
</node>
+ <node oor:name=".uno:DSBEditDoc" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Edit Mode</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
</node>
<node oor:name="Popups">
<node oor:name=".uno:ExportReportTo" oor:op="replace">
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index faeed5df7f21..c3b761e4fce8 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1808,7 +1808,7 @@ void OReportController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:DbSortingAndGrouping",
SID_SORTINGANDGROUPING, CommandGroup::VIEW );
implDescribeSupportedFeature( ".uno:PageHeaderFooter",
SID_PAGEHEADERFOOTER, CommandGroup::VIEW );
implDescribeSupportedFeature( ".uno:ReportHeaderFooter",
SID_REPORTHEADERFOOTER, CommandGroup::VIEW );
- implDescribeSupportedFeature( ".uno:ZoomSlider",
SID_ATTR_ZOOMSLIDER, CommandGroup::VIEW );
+ implDescribeSupportedFeature( ".uno:ZoomSlider",
SID_ATTR_ZOOMSLIDER );
implDescribeSupportedFeature( ".uno:Zoom",
SID_ATTR_ZOOM, CommandGroup::VIEW );
implDescribeSupportedFeature( ".uno:ConditionalFormatting",
SID_CONDITIONALFORMATTING, CommandGroup::FORMAT );
@@ -1818,7 +1818,7 @@ void OReportController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:Bold",
SID_ATTR_CHAR_WEIGHT, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:Italic",
SID_ATTR_CHAR_POSTURE, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:Underline",
SID_ATTR_CHAR_UNDERLINE, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:BackColor",
SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:DBBackgroundColor",
SID_ATTR_CHAR_COLOR_BACKGROUND, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:BackgroundColor",
SID_BACKGROUND_COLOR, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:CharColorExt",
SID_ATTR_CHAR_COLOR_EXT);
implDescribeSupportedFeature( ".uno:Color",
SID_ATTR_CHAR_COLOR);
@@ -1848,7 +1848,7 @@ void OReportController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:AlignMiddle",
SID_OBJECT_ALIGN_MIDDLE, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:AlignDown",
SID_OBJECT_ALIGN_DOWN, CommandGroup::FORMAT );
- implDescribeSupportedFeature( ".uno:SectionAlign",
SID_SECTION_ALIGN, CommandGroup::FORMAT );
+ implDescribeSupportedFeature( ".uno:SectionAlign",
SID_SECTION_ALIGN );
implDescribeSupportedFeature( ".uno:SectionAlignLeft",
SID_SECTION_ALIGN_LEFT, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:SectionAlignCenter",
SID_SECTION_ALIGN_CENTER, CommandGroup::FORMAT );
implDescribeSupportedFeature( ".uno:SectionAlignRight",
SID_SECTION_ALIGN_RIGHT, CommandGroup::FORMAT );
@@ -2018,14 +2018,13 @@ void OReportController::describeSupportedFeatures()
// keys
- implDescribeSupportedFeature( ".uno:Escape",
SID_ESCAPE, CommandGroup::CONTROLS);
+ implDescribeSupportedFeature( ".uno:Escape",
SID_ESCAPE);
// internal one
implDescribeSupportedFeature( ".uno:RPT_RPTHEADER_UNDO",
SID_REPORTHEADER_WITHOUT_UNDO);
implDescribeSupportedFeature( ".uno:RPT_RPTFOOTER_UNDO",
SID_REPORTFOOTER_WITHOUT_UNDO);
implDescribeSupportedFeature( ".uno:RPT_PGHEADER_UNDO",
SID_PAGEHEADER_WITHOUT_UNDO);
implDescribeSupportedFeature( ".uno:RPT_PGFOOTER_UNDO",
SID_PAGEFOOTER_WITHOUT_UNDO);
- implDescribeSupportedFeature( ".uno:DBBackgroundColor",
SID_ATTR_CHAR_COLOR_BACKGROUND);
implDescribeSupportedFeature( ".uno:SID_GROUPHEADER",
SID_GROUPHEADER);
implDescribeSupportedFeature( ".uno:SID_GROUPHEADER_WITHOUT_UNDO",
SID_GROUPHEADER_WITHOUT_UNDO);
implDescribeSupportedFeature( ".uno:SID_GROUPFOOTER",
SID_GROUPFOOTER);
diff --git a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
index 0ab455e843a3..8aff178313bb 100644
--- a/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
+++ b/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
@@ -20,7 +20,7 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Cut"/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
