[Libreoffice-commits] core.git: 3 commits - basctl/uiconfig chart2/uiconfig officecfg/registry sc/source sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig
Michael Meeks
michael.meeks at collabora.com
Mon Feb 3 09:06:44 PST 2014
basctl/uiconfig/basicide/toolbar/standardbar.xml | 5 -
chart2/uiconfig/toolbar/standardbar.xml | 3
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 12 +--
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 43 +----------
sc/uiconfig/scalc/toolbar/standardbar.xml | 3
sc/uiconfig/scalc/toolbar/viewerbar.xml | 5 -
sd/uiconfig/sdraw/toolbar/standardbar.xml | 3
sd/uiconfig/sdraw/toolbar/viewerbar.xml | 5 -
sd/uiconfig/simpress/toolbar/standardbar.xml | 3
sd/uiconfig/simpress/toolbar/viewerbar.xml | 5 -
starmath/uiconfig/smath/toolbar/standardbar.xml | 3
sw/uiconfig/sglobal/toolbar/standardbar.xml | 3
sw/uiconfig/sglobal/toolbar/viewerbar.xml | 5 -
sw/uiconfig/sweb/toolbar/standardbar.xml | 3
sw/uiconfig/sweb/toolbar/viewerbar.xml | 5 -
sw/uiconfig/swform/toolbar/standardbar.xml | 3
sw/uiconfig/swform/toolbar/viewerbar.xml | 5 -
sw/uiconfig/swreport/toolbar/standardbar.xml | 3
sw/uiconfig/swreport/toolbar/viewerbar.xml | 5 -
sw/uiconfig/swriter/toolbar/standardbar.xml | 3
sw/uiconfig/swriter/toolbar/viewerbar.xml | 5 -
sw/uiconfig/swxform/toolbar/standardbar.xml | 3
sw/uiconfig/swxform/toolbar/viewerbar.xml | 5 -
23 files changed, 62 insertions(+), 76 deletions(-)
New commits:
commit 0f7542a7a74a24b3cdb69f7e860caacbfcd2cc23
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Feb 3 17:46:05 2014 +0100
fdo#74455 - hide direct printing button and replace with new print dialog.
Change-Id: I7ae80079f4bd5fed1234753b521a680498ec43e1
diff --git a/basctl/uiconfig/basicide/toolbar/standardbar.xml b/basctl/uiconfig/basicide/toolbar/standardbar.xml
index 9dec388..f490c52 100644
--- a/basctl/uiconfig/basicide/toolbar/standardbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/standardbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Cut"/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
@@ -39,4 +40,4 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
<toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/chart2/uiconfig/toolbar/standardbar.xml b/chart2/uiconfig/toolbar/standardbar.xml
index eef05bd..3b9ab0f 100644
--- a/chart2/uiconfig/toolbar/standardbar.xml
+++ b/chart2/uiconfig/toolbar/standardbar.xml
@@ -28,7 +28,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:text="" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:text=""/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text=""/>
<toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text=""/>
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 7f91e05..5368218 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellDialog"/>
diff --git a/sc/uiconfig/scalc/toolbar/viewerbar.xml b/sc/uiconfig/scalc/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sc/uiconfig/scalc/toolbar/viewerbar.xml
+++ b/sc/uiconfig/scalc/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml
index e5b046f..7264492 100644
--- a/sd/uiconfig/sdraw/toolbar/standardbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
<toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021"/>
diff --git a/sd/uiconfig/sdraw/toolbar/viewerbar.xml b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sd/uiconfig/sdraw/toolbar/viewerbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml
index 901d895..87e81ff 100644
--- a/sd/uiconfig/simpress/toolbar/standardbar.xml
+++ b/sd/uiconfig/simpress/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellDialog"/>
<toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:helpid="12021" />
diff --git a/sd/uiconfig/simpress/toolbar/viewerbar.xml b/sd/uiconfig/simpress/toolbar/viewerbar.xml
index 7ad6a17..5fa4ee3 100644
--- a/sd/uiconfig/simpress/toolbar/viewerbar.xml
+++ b/sd/uiconfig/simpress/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -34,4 +35,4 @@
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Presentation"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/starmath/uiconfig/smath/toolbar/standardbar.xml b/starmath/uiconfig/smath/toolbar/standardbar.xml
index 6d5e1f7..a941fe7 100644
--- a/starmath/uiconfig/smath/toolbar/standardbar.xml
+++ b/starmath/uiconfig/smath/toolbar/standardbar.xml
@@ -27,7 +27,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="5331"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:text=""/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:text=""/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:text="" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print" toolbar:text=""/>
<toolbar:toolbaritem xlink:href=".uno:SendFax" toolbar:text="" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text=""/>
diff --git a/sw/uiconfig/sglobal/toolbar/standardbar.xml b/sw/uiconfig/sglobal/toolbar/standardbar.xml
index 363f03b..cf5c96a 100644
--- a/sw/uiconfig/sglobal/toolbar/standardbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
diff --git a/sw/uiconfig/sglobal/toolbar/viewerbar.xml b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sw/uiconfig/sglobal/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml
index b2097422..6ca8c3f 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
<toolbar:toolbaritem xlink:href=".uno:SourceView" toolbar:helpid="5675"/>
diff --git a/sw/uiconfig/sweb/toolbar/viewerbar.xml b/sw/uiconfig/sweb/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sw/uiconfig/sweb/toolbar/viewerbar.xml
+++ b/sw/uiconfig/sweb/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/standardbar.xml b/sw/uiconfig/swform/toolbar/standardbar.xml
index 363f03b..cf5c96a 100644
--- a/sw/uiconfig/swform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swform/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
diff --git a/sw/uiconfig/swform/toolbar/viewerbar.xml b/sw/uiconfig/swform/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sw/uiconfig/swform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swform/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/standardbar.xml b/sw/uiconfig/swreport/toolbar/standardbar.xml
index 363f03b..cf5c96a 100644
--- a/sw/uiconfig/swreport/toolbar/standardbar.xml
+++ b/sw/uiconfig/swreport/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
diff --git a/sw/uiconfig/swreport/toolbar/viewerbar.xml b/sw/uiconfig/swreport/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sw/uiconfig/swreport/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swreport/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 255af1b..b786bf4 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellingAndGrammarDialog" toolbar:helpid="20622"/>
diff --git a/sw/uiconfig/swriter/toolbar/viewerbar.xml b/sw/uiconfig/swriter/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sw/uiconfig/swriter/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swriter/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/standardbar.xml b/sw/uiconfig/swxform/toolbar/standardbar.xml
index 4c98bba..57d51c3 100644
--- a/sw/uiconfig/swxform/toolbar/standardbar.xml
+++ b/sw/uiconfig/swxform/toolbar/standardbar.xml
@@ -29,7 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="6674"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="5509"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPreview" toolbar:helpid="5325"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:helpid="20622"/>
diff --git a/sw/uiconfig/swxform/toolbar/viewerbar.xml b/sw/uiconfig/swxform/toolbar/viewerbar.xml
index a200750..a371876 100644
--- a/sw/uiconfig/swxform/toolbar/viewerbar.xml
+++ b/sw/uiconfig/swxform/toolbar/viewerbar.xml
@@ -24,7 +24,8 @@
<toolbar:toolbaritem xlink:href=".uno:SendMail"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Print"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Copy"/>
<toolbar:toolbarseparator/>
@@ -32,4 +33,4 @@
<toolbar:toolbaritem xlink:href=".uno:Navigator"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Zoom"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
commit f792dbb33adf65c98f82a2586442c29c9320e4d9
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Feb 3 17:11:05 2014 +0100
sc: re-order number formatting higher up and make it visible by default.
Change-Id: Iaaaa513718fdaefb44bd48f2adcb5c9fd61c7e84
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 9f60067..0f5f2ea 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -750,18 +750,18 @@
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
- Calc, Auditing, hidden ;
- Calc, Cell, hidden ;
- Calc, EditCell, hidden ;
- Calc, default, hidden ;
- Calc, Pivot, hidden ;
+ Calc, Auditing, visible ;
+ Calc, Cell, visible ;
+ Calc, EditCell, visible ;
+ Calc, default, visible ;
+ Calc, Pivot, visible ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
<value>private:resource/toolpanel/ScPanelFactory/NumberFormatPropertyPanel</value>
</prop>
<prop oor:name="OrderIndex" oor:type="xs:int">
- <value>400</value>
+ <value>150</value>
</prop>
</node>
commit 98568a5da6fd0a6540cdc9911cfbb16e34c55de2
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Feb 3 17:11:38 2014 +0100
sc: cleanup cruft in NumberFormatPropertyPanel.
Change-Id: I379cc8da83231be3b66e8bc413dc0a3f1388c507
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 4ea37c9..142bd51 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -43,22 +43,14 @@ const char UNO_NUMBERFORMATCURRENCY[] = ".uno:NumberFormatCurrency";
const char UNO_NUMBERFORMATDATE[] = ".uno:NumberFormatDate";
const char UNO_INSERTFIXEDTEXT[] = ".uno:InsertFixedText";
-//////////////////////////////////////////////////////////////////////////////
-// namespace open
-
namespace sc { namespace sidebar {
-//////////////////////////////////////////////////////////////////////////////
-
NumberFormatPropertyPanel::NumberFormatPropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame),
maNumFormatControl(SID_NUMBER_TYPE_FORMAT, *pBindings, *this),
-
- // Caution! SID_NUMBER_FORMAT is reworked in symphony code, may be needed (!) If
- // yes, grep for it in SC and symphony (!)
maFormatControl(SID_NUMBER_FORMAT, *pBindings, *this),
mnCategorySelected(0),
@@ -76,20 +68,16 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel(
Initialize();
}
-//////////////////////////////////////////////////////////////////////////////
-
NumberFormatPropertyPanel::~NumberFormatPropertyPanel()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void NumberFormatPropertyPanel::Initialize()
{
Link aLink = LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl);
mpLbCategory->SetSelectHdl ( aLink );
mpLbCategory->SelectEntryPos(0);
- mpLbCategory->SetAccessibleName(OUString( "Category")); //wj acc
+ mpLbCategory->SetAccessibleName(OUString( "Category"));
mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount());
aLink = LINK(this, NumberFormatPropertyPanel, NumFormatHdl);
@@ -99,16 +87,15 @@ void NumberFormatPropertyPanel::Initialize()
mpEdDecimals->SetModifyHdl( aLink );
mpEdLeadZeroes->SetModifyHdl( aLink );
- mpEdDecimals->SetAccessibleName(OUString( "Decimal Places")); //wj acc
- mpEdLeadZeroes->SetAccessibleName(OUString( "Leading Zeroes")); //wj acc
+ mpEdDecimals->SetAccessibleName(OUString( "Decimal Places"));
+ mpEdLeadZeroes->SetAccessibleName(OUString( "Leading Zeroes"));
+
mpBtnNegRed->SetClickHdl( aLink );
mpBtnThousand->SetClickHdl( aLink );
mpTBCategory->SetAccessibleRelationLabeledBy(mpTBCategory);
}
-//////////////////////////////////////////////////////////////////////////////
-
IMPL_LINK( NumberFormatPropertyPanel, NumFormatHdl, ToolBox*, pBox )
{
const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId()));
@@ -133,8 +120,6 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatHdl, ToolBox*, pBox )
return 0L;
}
-//////////////////////////////////////////////////////////////////////////////
-
IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox )
{
sal_uInt16 nVal = pBox->GetSelectEntryPos();
@@ -147,8 +132,6 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox )
return 0L;
}
-//////////////////////////////////////////////////////////////////////////////
-
IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG )
{
OUString aFormat;
@@ -183,8 +166,6 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG )
return 0L;
}
-//////////////////////////////////////////////////////////////////////////////
-
NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
@@ -203,16 +184,12 @@ NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create (
pBindings);
}
-//////////////////////////////////////////////////////////////////////////////
-
void NumberFormatPropertyPanel::DataChanged(
const DataChangedEvent& rEvent)
{
(void)rEvent;
}
-//////////////////////////////////////////////////////////////////////////////
-
void NumberFormatPropertyPanel::HandleContextChange(
const ::sfx2::sidebar::EnumContext aContext)
{
@@ -224,13 +201,9 @@ void NumberFormatPropertyPanel::HandleContextChange(
maContext = aContext;
-
-
// todo
}
-//////////////////////////////////////////////////////////////////////////////
-
void NumberFormatPropertyPanel::NotifyItemUpdate(
sal_uInt16 nSID,
SfxItemState eState,
@@ -343,19 +316,11 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SfxBindings* NumberFormatPropertyPanel::GetBindings()
{
return mpBindings;
}
-//////////////////////////////////////////////////////////////////////////////
-// namespace close
-
}} // end of namespace ::sc::sidebar
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list