filter/source/config/fragments/filters/Beagle_Works.xcu | 2 +-
filter/source/config/fragments/filters/Beagle_Works_Calc.xcu | 2 +-
filter/source/config/fragments/filters/Beagle_Works_Draw.xcu | 2 +-
filter/source/config/fragments/filters/ClarisWorks.xcu | 2 +-
filter/source/config/fragments/filters/ClarisWorks_Calc.xcu | 2 +-
filter/source/config/fragments/filters/ClarisWorks_Draw.xcu | 2 +-
filter/source/config/fragments/filters/Great_Works.xcu | 2 +-
filter/source/config/fragments/filters/Great_Works_Calc.xcu | 2 +-
filter/source/config/fragments/filters/Great_Works_Draw.xcu | 2 +-
filter/source/config/fragments/filters/Mac_Works.xcu | 2 +-
filter/source/config/fragments/filters/Mac_Works_Calc.xcu | 2 +-
filter/source/config/fragments/filters/Mac_Works_Draw.xcu | 2 +-
svx/uiconfig/ui/sidebarparagraph.ui | 11 ++++++++++-
13 files changed, 22 insertions(+), 13 deletions(-)
New commits:
commit af28a77724cb552c18df9ca5ca76e4d1da10694b
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Tue Aug 5 22:29:11 2014 +0300
Better names for several filters
Thanks to David Tardon
Change-Id: I646f43fde5b7481ba77a2b12b7111b2093476f78
diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu
b/filter/source/config/fragments/filters/Beagle_Works.xcu
index 8b26456..a0cd6bc 100644
--- a/filter/source/config/fragments/filters/Beagle_Works.xcu
+++ b/filter/source/config/fragments/filters/Beagle_Works.xcu
@@ -15,7 +15,7 @@
<value>com.sun.star.comp.Writer.MWAWImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Document
(Writer)</value>
+ <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Text
Document</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu
b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu
index 6ae87c1..4471531 100644
--- a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu
+++ b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu
@@ -15,7 +15,7 @@
<value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Document
(Calc)</value>
+ <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1
Spreadsheet</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu
b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu
index 09520b3..0dad311 100644
--- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu
+++ b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu
@@ -15,7 +15,7 @@
<value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Document
(Draw)</value>
+ <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1
Drawing</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu
b/filter/source/config/fragments/filters/ClarisWorks.xcu
index c2ad8a4..f429d00 100644
--- a/filter/source/config/fragments/filters/ClarisWorks.xcu
+++ b/filter/source/config/fragments/filters/ClarisWorks.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">ClarisWorks/AppleWorks Document
(Writer)</value>
+ <value xml:lang="en-US">ClarisWorks/AppleWorks Text
Document</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_ClarisWorks</value></prop>
diff --git a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu
b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu
index 8f689e0..aa6edbb 100644
--- a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu
+++ b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">ClarisWorks/AppleWorks Document
(Calc)</value>
+ <value xml:lang="en-US">ClarisWorks/AppleWorks Spreadsheet</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>calc_ClarisWorks</value></prop>
diff --git a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu
b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu
index baeaf9f..d97162b 100644
--- a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu
+++ b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">ClarisWorks/AppleWorks Document
(Draw)</value>
+ <value xml:lang="en-US">ClarisWorks/AppleWorks Drawing</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>draw_ClarisWorks</value></prop>
diff --git a/filter/source/config/fragments/filters/Great_Works.xcu
b/filter/source/config/fragments/filters/Great_Works.xcu
index 305f3a4..8ca633b 100644
--- a/filter/source/config/fragments/filters/Great_Works.xcu
+++ b/filter/source/config/fragments/filters/Great_Works.xcu
@@ -15,7 +15,7 @@
<value>com.sun.star.comp.Writer.MWAWImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">GreatWorks Document (Writer)</value>
+ <value xml:lang="en-US">GreatWorks Text Document</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/Great_Works_Calc.xcu
b/filter/source/config/fragments/filters/Great_Works_Calc.xcu
index c0760dd..8d5206a 100644
--- a/filter/source/config/fragments/filters/Great_Works_Calc.xcu
+++ b/filter/source/config/fragments/filters/Great_Works_Calc.xcu
@@ -15,7 +15,7 @@
<value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">GreatWorks Document (Calc)</value>
+ <value xml:lang="en-US">GreatWorks Spreadsheet</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/Great_Works_Draw.xcu
b/filter/source/config/fragments/filters/Great_Works_Draw.xcu
index 9add566..1f7055e 100644
--- a/filter/source/config/fragments/filters/Great_Works_Draw.xcu
+++ b/filter/source/config/fragments/filters/Great_Works_Draw.xcu
@@ -15,7 +15,7 @@
<value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">GreatWorks Document (Draw)</value>
+ <value xml:lang="en-US">GreatWorks Drawing</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/Mac_Works.xcu
b/filter/source/config/fragments/filters/Mac_Works.xcu
index 6266d14..455ef15 100644
--- a/filter/source/config/fragments/filters/Mac_Works.xcu
+++ b/filter/source/config/fragments/filters/Mac_Works.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Works for Mac Document (v1 - v4)
(Writer)</value>
+ <value xml:lang="en-US">Microsoft Works for Mac Text Document (v1
- v4)</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_Mac_Works</value></prop>
diff --git a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu
b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu
index 1f44e45..579ee3c 100644
--- a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu
+++ b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Works for Mac Document (v1 - v4)
(Calc)</value>
+ <value xml:lang="en-US">Microsoft Works for Mac Spreadsheet (v1 -
v4)</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>calc_Mac_Works</value></prop>
diff --git a/filter/source/config/fragments/filters/Mac_Works_Draw.xcu
b/filter/source/config/fragments/filters/Mac_Works_Draw.xcu
index c7e3194..7b4b50f 100644
--- a/filter/source/config/fragments/filters/Mac_Works_Draw.xcu
+++ b/filter/source/config/fragments/filters/Mac_Works_Draw.xcu
@@ -21,7 +21,7 @@
<prop
oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Works for Mac Document (v1 - v4)
(Draw)</value>
+ <value xml:lang="en-US">Microsoft Works for Mac Drawing (v1 -
v4)</value>
</prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>draw_Mac_Works</value></prop>
commit 36f275cb0f19d11151abf85f3c191a2736bd73da
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Tue Aug 5 13:57:48 2014 +0300
sidebar: don't stretch icons vertically
fix a regression in master.
Change-Id: I0fd0980225bdfd43cba884f145bcc7ebb8c05d85
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui
b/svx/uiconfig/ui/sidebarparagraph.ui
index 83eed78..286d12a 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -343,7 +343,8 @@
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="ypad">15</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property
name="pixbuf">svx/res/symphony/spacing1.png</property>
</object>
<packing>
@@ -386,6 +387,8 @@
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property
name="pixbuf">svx/res/symphony/spacing2.png</property>
</object>
<packing>
@@ -623,6 +626,8 @@
<object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property
name="pixbuf">svx/res/symphony/Indent4.png</property>
</object>
<packing>
@@ -663,6 +668,8 @@
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property
name="pixbuf">svx/res/symphony/Indent3.png</property>
</object>
<packing>
@@ -703,6 +710,8 @@
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property
name="pixbuf">svx/res/symphony/Indent2.png</property>
</object>
<packing>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
