sc/CppunitTest_sc_namedrangesobj.mk | 41 +-------
sfx2/uiconfig/ui/documentfontspage.ui | 170 ++++++++++++++++++----------------
2 files changed, 97 insertions(+), 114 deletions(-)
New commits:
commit a1b58837206fec2fe89a8a16567b1e1499ec9385
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Mon Jul 23 04:23:45 2018 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Mon Jul 23 17:21:39 2018 +0200
Remove obsolete (cargo-cult copied) dependencies
Change-Id: I1a926f45510e18cf399aa2eb7e1bf0ad8f4f0226
Reviewed-on: https://gerrit.libreoffice.org/57836
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk
b/sc/CppunitTest_sc_namedrangesobj.mk
index 0f36a8ece33e..558981fe6bba 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -14,48 +14,19 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_namedrangesobj))
$(eval $(call gb_CppunitTest_use_external,sc_namedrangesobj,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \
- sc/qa/extras/scnamedrangesobj \
+ sc/qa/extras/scnamedrangesobj \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- sfx \
- sot \
- subsequenttest \
- svl \
- svt \
- svx \
- svxcore \
+ cppu \
+ sal \
+ subsequenttest \
test \
- tk \
- tl \
- ucbhelper \
unotest \
- utl \
- vbahelper \
- vcl \
- xo \
))
$(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
+ $$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_namedrangesobj))
@@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_namedrangesobj))
$(eval $(call gb_CppunitTest_use_vcl,sc_namedrangesobj))
$(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
- $(sc_unoapi_common_components) \
+ $(sc_unoapi_common_components) \
))
$(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj))
commit dafcb7f57961227b3ebae5f4ae8edae27bd0cbe5
Author: heiko tietze <tietze.he...@gmail.com>
AuthorDate: Mon Jul 23 15:44:54 2018 +0200
Commit: Heiko Tietze <tietze.he...@gmail.com>
CommitDate: Mon Jul 23 17:21:26 2018 +0200
tdf#118760 Inconsistent label "Select font scripts to embed"
Fixed also alignment and accelerator issues
Change-Id: I3182b98a793ebc3d2e9d11975842bf7aac010d7c
Reviewed-on: https://gerrit.libreoffice.org/57848
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/sfx2/uiconfig/ui/documentfontspage.ui
b/sfx2/uiconfig/ui/documentfontspage.ui
index a32fb1d4ed7f..44fdaf383541 100644
--- a/sfx2/uiconfig/ui/documentfontspage.ui
+++ b/sfx2/uiconfig/ui/documentfontspage.ui
@@ -21,9 +21,10 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="embedFonts">
<property name="label" translatable="yes"
context="documentfontspage|embedFonts">_Embed fonts in the document</property>
@@ -35,13 +36,14 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="embedUsedFonts">
- <property name="label" translatable="yes"
context="documentfontspage|embedUsedFonts">Only embed fonts that are used in
documents</property>
+ <property name="label" translatable="yes"
context="documentfontspage|embedUsedFonts">_Only embed fonts that are used in
documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -50,84 +52,94 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="fontEmbeddingLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="documentfontspage|fontEmbeddingLabel">Font embedding</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="scriptframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="embedLatinScriptFonts">
+ <property name="label" translatable="yes"
context="documentfontspage|embedLatinScriptFonts">_Latin fonts</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="embedAsianScriptFonts">
+ <property name="label" translatable="yes"
context="documentfontspage|embedAsianScriptFonts">_Asian fonts</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkCheckButton" id="embedComplexScriptFonts">
+ <property name="label" translatable="yes"
context="documentfontspage|embedComplexScriptFonts">_Complex fonts</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton"
id="embedLatinScriptFonts">
- <property name="label" translatable="yes"
context="documentfontspage|embedLatinScriptFonts">Latin fonts</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="embedAsianScriptFonts">
- <property name="label" translatable="yes"
context="documentfontspage|embedAsianScriptFonts">Asian fonts</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="embedComplexScriptFonts">
- <property name="label" translatable="yes"
context="documentfontspage|embedComplexScriptFonts">Complex fonts</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="documentfontspage|fontScriptFrameLabel">Select font scripts to
embed</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -135,10 +147,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="fontEmbeddingLabel">
+ <object class="GtkLabel" id="scriptlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="documentfontspage|fontEmbeddingLabel">Font Embedding</property>
+ <property name="label" translatable="yes"
context="documentfontspage|fontScriptFrameLabel">Font scripts to
embed</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -147,7 +159,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
