[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 19 22:23:37 UTC 2019
cui/uiconfig/ui/optuserpage.ui | 66 ++++++++++++++++++++++++++++-----------
sw/source/filter/ww8/ww8par6.cxx | 2 -
2 files changed, 49 insertions(+), 19 deletions(-)
New commits:
commit d7cf4e02d0bac0a5948ad82c62a8c0fb650dceb8
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Tue Nov 19 22:42:25 2019 +0100
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Nov 19 23:22:36 2019 +0100
Fix typo
Change-Id: Ib5a16d8b5030e1974e5493b50caf7268c5c61191
Reviewed-on: https://gerrit.libreoffice.org/83242
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 43b376062401..67ed6c321c21 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1516,7 +1516,7 @@ bool SwWW8ImplReader::SetBorder(SvxBoxItem& rBox, const WW8_BRCVer9* pbrc,
##826##, ##653##
If a style has borders set,and the para attributes attempt remove
- the borders, then this is perfectably acceptable, so we shouldn't
+ the borders, then this is perfectly acceptable, so we shouldn't
ignore this blank entry
nSetBorders has a bit set for each location that a sprm set a
commit ec93706a9eea072e25f5caad47505cb5293e7071
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Nov 18 21:24:31 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Nov 19 23:22:14 2019 +0100
Options - User Data Dialog labels left align
Change-Id: If18abdb3e6d23ada149a9cfc7b2744db9ec3b5f8
Reviewed-on: https://gerrit.libreoffice.org/83124
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 24616760fbb9..e770410c04b1 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -7,11 +7,11 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -25,15 +25,16 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="companyft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|companyft">_Company:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">company</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -44,10 +45,11 @@
<object class="GtkLabel" id="nameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|nameft">First/last _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">firstname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -58,10 +60,11 @@
<object class="GtkLabel" id="streetft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|streetft">_Street:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">street</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -72,10 +75,11 @@
<object class="GtkLabel" id="cityft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|cityft">City/state/_zip:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">city</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -86,10 +90,11 @@
<object class="GtkLabel" id="countryft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|countryft">Country/re_gion:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">country</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -100,10 +105,11 @@
<object class="GtkLabel" id="titleft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|titleft">_Title/position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -114,10 +120,11 @@
<object class="GtkLabel" id="phoneft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|phoneft">Telephone (home/_work):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">home</property>
+ <property name="xalign">0</property>
<child internal-child="accessible">
<object class="AtkObject" id="phoneft-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="phoneft-atkobject">Home telephone number</property>
@@ -133,10 +140,11 @@
<object class="GtkLabel" id="faxft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|faxft">Fa_x/email:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fax</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -435,10 +443,11 @@
<object class="GtkLabel" id="rusnameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes" context="optuserpage|rusnameft">Last name/first _name/father’s name/initials:</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="optuserpage|rusnameft">Last/first/father’s _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ruslastname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -532,10 +541,11 @@
<object class="GtkLabel" id="eastnameft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|eastnameft">Last/first _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">eastlastname</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -611,10 +621,11 @@
<object class="GtkLabel" id="russtreetft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|russtreetft">_Street/apartment number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">russtreet</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -672,10 +683,11 @@
<object class="GtkLabel" id="icityft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="halign">end</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes" context="optuserpage|icityft">_Zip/city:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">izip</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -842,15 +854,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="signingkeylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="optuserpage|signingkeylabel">OpenPGP signing key:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">signingkey</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -861,10 +873,10 @@
<object class="GtkLabel" id="encryptionkeylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
<property name="label" translatable="yes" context="optuserpage|encryptionkeylabel">OpenPGP encryption key:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">encryptionkey</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -940,4 +952,22 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroupLabel">
+ <widgets>
+ <widget name="companyft"/>
+ <widget name="nameft"/>
+ <widget name="streetft"/>
+ <widget name="cityft"/>
+ <widget name="countryft"/>
+ <widget name="titleft"/>
+ <widget name="phoneft"/>
+ <widget name="faxft"/>
+ <widget name="rusnameft"/>
+ <widget name="eastnameft"/>
+ <widget name="russtreetft"/>
+ <widget name="icityft"/>
+ <widget name="signingkeylabel"/>
+ <widget name="encryptionkeylabel"/>
+ </widgets>
+ </object>
</interface>
More information about the Libreoffice-commits
mailing list