[Libreoffice-commits] core.git: 2 commits - chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/CppunitTest_dbaccess_macros_test.mk RepositoryExternal.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_table sheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_import_tests.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk solenv/gbuild sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlexport.mk sw/CppunitTest_sw_ooxmlimport.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_ww8export.mk sw/CppunitTest_sw_ww8import.mk
Matúš Kukan
matus.kukan at gmail.com
Tue Oct 1 03:54:28 PDT 2013
RepositoryExternal.mk | 37 ++-
chart2/CppunitTest_chart2_export.mk | 2
chart2/CppunitTest_chart2_import.mk | 2
dbaccess/CppunitTest_dbaccess_firebird_test.mk | 2
dbaccess/CppunitTest_dbaccess_macros_test.mk | 2
sc/CppunitTest_sc_annotationobj.mk | 2
sc/CppunitTest_sc_annotationshapeobj.mk | 2
sc/CppunitTest_sc_annotationsobj.mk | 2
sc/CppunitTest_sc_cellrangeobj.mk | 2
sc/CppunitTest_sc_chart_regression_test.mk | 2
sc/CppunitTest_sc_databaserangeobj.mk | 2
sc/CppunitTest_sc_datapilotfieldobj.mk | 2
sc/CppunitTest_sc_datapilottableobj.mk | 2
sc/CppunitTest_sc_editfieldobj_cell.mk | 2
sc/CppunitTest_sc_editfieldobj_header.mk | 2
sc/CppunitTest_sc_filters_test.mk | 2
sc/CppunitTest_sc_macros_test.mk | 2
sc/CppunitTest_sc_modelobj.mk | 2
sc/CppunitTest_sc_namedrangeobj.mk | 2
sc/CppunitTest_sc_namedrangesobj.mk | 2
sc/CppunitTest_sc_outlineobj.mk | 2
sc/CppunitTest_sc_rangelst_test.mk | 2
sc/CppunitTest_sc_subsequent_export_test.mk | 2
sc/CppunitTest_sc_subsequent_filters_test.mk | 2
sc/CppunitTest_sc_tableautoformatfield.mk | 2
sc/CppunitTest_sc_tablesheetobj.mk | 2
sc/CppunitTest_sc_tablesheetsobj.mk | 2
sd/CppunitTest_sd_filters_test.mk | 2
sd/CppunitTest_sd_import_tests.mk | 2
sd/UIConfig_simpress.mk | 1
sd/source/ui/dlg/dlgfield.cxx | 128 ++++++-------
sd/source/ui/dlg/dlgfield.src | 104 ----------
sd/source/ui/inc/dlgfield.hrc | 31 ---
sd/source/ui/inc/dlgfield.hxx | 14 -
sd/uiconfig/simpress/ui/dlgfield.ui | 244 +++++++++++++++++++++++++
solenv/gbuild/CppunitTest.mk | 18 -
solenv/gbuild/Gallery.mk | 37 ---
sw/CppunitTest_sw_filters_test.mk | 2
sw/CppunitTest_sw_htmlexport.mk | 2
sw/CppunitTest_sw_layout_test.mk | 2
sw/CppunitTest_sw_macros_test.mk | 2
sw/CppunitTest_sw_odfexport.mk | 2
sw/CppunitTest_sw_odfimport.mk | 2
sw/CppunitTest_sw_ooxmlexport.mk | 2
sw/CppunitTest_sw_ooxmlimport.mk | 2
sw/CppunitTest_sw_rtfexport.mk | 2
sw/CppunitTest_sw_rtfimport.mk | 2
sw/CppunitTest_sw_ww8export.mk | 2
sw/CppunitTest_sw_ww8import.mk | 2
49 files changed, 334 insertions(+), 360 deletions(-)
New commits:
commit e1b51e7beb7f9cfa7b574b9c2a69799e62963a09
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Sep 27 09:41:09 2013 +0200
gbuild: use .xcd configuration files from instdir
..instead of .xcu files in solver/*/xml/registry
when running unittests and gengal.
Change-Id: I390a6c531d653acca7ef3379c49fe65fcb8f3c2a
Reviewed-on: https://gerrit.libreoffice.org/6057
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 423834e..5285bcc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2912,33 +2912,36 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
)
endef
-# Better duplication with gb_Gallery__UNO_COMPONENTS than nothing.
+gb_Gallery__UNO_COMPONENTS := \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ drawinglayer/drawinglayer \
+ fileaccess/source/fileacc \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ svgio/svgio \
+ svx/util/svx \
+ svx/util/svxcore \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml
+
# This is used to determine what we need for 'build' platform.
define gb_Executable__register_gengal
$(call gb_Executable_add_runtime_dependencies,gengal,\
- $(foreach component, \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- fileaccess/source/fileacc \
- framework/util/fwk \
- i18npool/util/i18npool \
- package/source/xstor/xstor \
- package/util/package2 \
- sfx2/util/sfx \
- svx/util/svx \
- svx/util/svxcore \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml \
+ $(foreach component,$(gb_Gallery__UNO_COMPONENTS) \
,$(call gb_ComponentTarget_get_target_for_build,$(component))) \
$(call gb_AllLangResTarget_get_target,ofa) \
- $(call gb_Configuration_get_target,registry) \
- $(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
$(call gb_Library_get_target,vclplug_svp) \
)) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
+ $(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 0c0e025..11599df 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\
$(eval $(call gb_CppunitTest_use_configuration,chart2_export))
-$(eval $(call gb_CppunitTest_use_filter_configuration,chart2_export))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_export))
# vim: set noet sw=4 ts=4:
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index a403366..0005363 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
$(eval $(call gb_CppunitTest_use_configuration,chart2_import))
-$(eval $(call gb_CppunitTest_use_filter_configuration,chart2_import))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_import))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 9d4173c..06164f7 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -65,8 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_firebird_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_firebird_test))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 18d7db4..cf7d983 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -102,8 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index 06e0ac6..25bc1c6 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annotationobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index f9f6a8c..e967812 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index 9728c94..d36fb5a 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annotationsobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationsobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index aecd1d7..e27a7a5 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
$(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesbase))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 6a64747..703ed0c 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -109,8 +109,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
$(eval $(call gb_CppunitTest_use_configuration,sc_chart_regression_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_chart_regression_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test))
$(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2))
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index c867d93..1022d94 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index e9e73d7..927f37d 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 2f18dae..79a106d 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 2a48401..a185997 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
$(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_cell))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index dd5d052..90160b1 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
$(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_header))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 82a6cf7..58c3949 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -116,6 +116,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
$(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index ace83ce..516474e 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -112,8 +112,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
$(eval $(call gb_CppunitTest_use_configuration,sc_macros_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 65be2c5ea..760842a 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_modelobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_modelobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_modelobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 337936b..5af7ada 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 92a160c..c346ff9 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index 62043f0..8d66171 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_outlineobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_outlineobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_outlineobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 5618c04..45cef04 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -125,8 +125,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
$(eval $(call gb_CppunitTest_use_configuration,sc_rangelst_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_rangelst_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_rangelst_test))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 1896bbd..fc53cc7 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -121,6 +121,4 @@ endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_export_test))
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 4bc57c3..a5acabd 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -121,6 +121,4 @@ endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index c5fff4e..413c6c5 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -102,8 +102,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
$(eval $(call gb_CppunitTest_use_configuration,sc_tableautoformatfield))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 84bcd60..06a8e6f 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tablesheetobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetobj))
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 210651c..dd6a8d8 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\
$(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetsobj))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tablesheetsobj))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetsobj))
# vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 23c9709..55f62c1 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
$(eval $(call gb_CppunitTest_use_configuration,sd_filters_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sd_filters_test))
-
$(call gb_CppunitTest_get_target,sd_filters_test) : $(call gb_AllLangResTarget_get_target,sd)
# vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 419269b..be5ec1a 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -108,8 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
$(eval $(call gb_CppunitTest_use_configuration,sd_import_tests))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sd_import_tests))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_import_tests))
$(eval $(call gb_CppunitTest_add_arguments,sd_import_tests,\
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d205e00..e281ffd 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -283,8 +283,8 @@ endef
# Use standard configuration.
define gb_CppunitTest_use_configuration
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,registry)
-$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry))
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry)
+$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTDIR)/$(LIBO_SHARE_FOLDER)/registry)
endef
@@ -293,20 +293,6 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS=
endef
-# Use configuration for filters.
-#
-# Okay, this is not exactly true, because there may be configuration
-# for more things than just filters in spool, but it is good enough.
-define gb_CppunitTest_use_filter_configuration
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,fcfg_langpack)
-$(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry)/spool)
-
-endef
-
-define gb_CppunitTest_use_extra_configuration
-$$(call gb_Output_error,gb_CppunitTest_use_extra_configuration: use gb_CppunitTest_use_unittest_configuration instead.))
-endef
-
# Use configuration in $(OUTDIR)/unittest/registry.
define gb_CppunitTest_use_unittest_configuration
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest)
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index e4201cf..12847e0 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -11,47 +11,17 @@
# Handles creation of image galleries.
-gb_Gallery__UNO_COMPONENTS := \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- drawinglayer/drawinglayer \
- fileaccess/source/fileacc \
- framework/util/fwk \
- i18npool/util/i18npool \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- sfx2/util/sfx \
- svgio/svgio \
- svx/util/svx \
- svx/util/svxcore \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- unoxml/source/service/unoxml
-
-gb_Gallery__UNO_TYPES := \
- offapi \
- udkapi
-
gb_Gallery_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl
-
-# TODO: this should be in RepositoryExternal.mk, but it would lead to
-# duplication. Fix.
-gb_Gallery_EXTRA_DEPENCENCIES := \
- $(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_target_for_build,$(component))) \
- $(foreach api,$(gb_Gallery__UNO_TYPES),$(call gb_UnoApi_get_target,$(api)))
-
gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
# BRAND_BASE_DIR is for resource files
define gb_Gallery__make_env_args
"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/unittest/install)" \
-"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(gb_Configuration_registry)) \
- module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool)" \
+"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTDIR)/$(LIBO_SHARE_FOLDER)/registry)" \
"-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \
$(foreach item,$(gb_Gallery__UNO_COMPONENTS),\
$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
-"-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\
+"-env:UNO_TYPES=$(foreach item,offapi udkapi,\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER))
@@ -96,8 +66,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \
- $(call gb_Executable_get_runtime_dependencies,gengal) \
- $(gb_Gallery_EXTRA_DEPENCENCIES)
+ $(call gb_Executable_get_runtime_dependencies,gengal)
$(call gb_Gallery__command,$@,$*)
$(call gb_Gallery__get_final_target,%) :
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 2545b35..0e2c044 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -87,6 +87,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_filters_test))
-
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 5041627..3213435 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_htmlexport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index c074f1d..1a52610 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -99,8 +99,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
$(eval $(call gb_CppunitTest_use_configuration,sw_layout_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_layout_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_layout_test))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index cf3c425..49b8b53 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
$(eval $(call gb_CppunitTest_use_configuration,sw_macros_test))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_macros_test))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index a484b9a..179f344 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfexport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 756f181..1320fef 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_odfimport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfimport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfimport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index 2e90bec..0158be6 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -83,8 +83,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlexport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 45cac9e..5831893 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlimport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlimport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index e62647c..7bc28b4 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -78,8 +78,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfexport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index be6613a..ba09f4b 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
$(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfimport))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfimport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 2b1a475..78ee4e3 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8export))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8export))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 1cb3425..e45addc 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -72,8 +72,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\
$(eval $(call gb_CppunitTest_use_configuration,sw_ww8import))
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8import))
-
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8import))
# vim: set noet sw=4 ts=4:
commit e8c8f02ffd6988ea72141992b1f26f9c5d918af5
Author: Manal Alhassoun <malhassoun at kacst.edu.sa>
Date: Sun Sep 29 10:52:53 2013 +0300
Convert edit field dialog to widget UI
Conflicts:
sd/AllLangResTarget_sd.mk
Change-Id: I7f60b1ac8a59e5e4a460fd26754dd83a7835ed45
Reviewed-on: https://gerrit.libreoffice.org/6073
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index d67bf3a..e13f035 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/customanimationtexttab \
sd/uiconfig/simpress/ui/customslideshows \
sd/uiconfig/simpress/ui/definecustomslideshow \
+ sd/uiconfig/simpress/ui/dlgfield \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/masterlayoutdlg \
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 3281d36..3eb2cd1 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -28,7 +28,6 @@
#include <unotools/useroptions.hxx>
#include "strings.hrc"
-#include "dlgfield.hrc"
#include "sdattr.hxx"
#include "sdresid.hxx"
#include "sdmod.hxx"
@@ -40,24 +39,17 @@
* dialog to edit field commands
*/
SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) :
- ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ),
- aGrpType ( this, SdResId( GRP_TYPE ) ),
- aRbtFix ( this, SdResId( RBT_FIX ) ),
- aRbtVar ( this, SdResId( RBT_VAR ) ),
- maFtLanguage( this, SdResId( FT_LANGUAGE ) ),
- maLbLanguage( this, SdResId( LB_LANGUAGE ) ),
- aFtFormat ( this, SdResId( FT_FORMAT ) ),
- aLbFormat ( this, SdResId( LB_FORMAT ) ),
- aBtnOK ( this, SdResId( BTN_OK ) ),
- aBtnCancel ( this, SdResId( BTN_CANCEL ) ),
- aBtnHelp ( this, SdResId( BTN_HELP ) ),
+ ModalDialog ( pWindow, "EditFieldsDialog", "modules/simpress/ui/dlgfield.ui" ),
maInputSet ( rSet ),
pField ( pInField )
{
- FreeResource();
+ get(m_pRbtFix, "fixedRB");
+ get(m_pRbtVar, "varRB");
+ get(m_pLbLanguage, "languageLB");
+ get(m_pLbFormat, "formatLB");
- maLbLanguage.SetLanguageList( LANG_LIST_ALL|LANG_LIST_ONLY_KNOWN, false );
- maLbLanguage.SetSelectHdl( LINK( this, SdModifyFieldDlg, LanguageChangeHdl ) );
+ m_pLbLanguage->SetLanguageList( LANG_LIST_ALL|LANG_LIST_ONLY_KNOWN, false );
+ m_pLbLanguage->SetSelectHdl( LINK( this, SdModifyFieldDlg, LanguageChangeHdl ) );
FillControls();
}
@@ -69,9 +61,9 @@ SvxFieldData* SdModifyFieldDlg::GetField()
{
SvxFieldData* pNewField = NULL;
- if( aRbtFix.IsChecked() != aRbtFix.GetSavedValue() ||
- aRbtVar.IsChecked() != aRbtVar.GetSavedValue() ||
- aLbFormat.GetSelectEntryPos() != aLbFormat.GetSavedValue() )
+ if( m_pRbtFix->IsChecked() != m_pRbtFix->GetSavedValue() ||
+ m_pRbtVar->IsChecked() != m_pRbtVar->GetSavedValue() ||
+ m_pLbFormat->GetSelectEntryPos() != m_pLbFormat->GetSavedValue() )
{
if( pField->ISA( SvxDateField ) )
{
@@ -79,12 +71,12 @@ SvxFieldData* SdModifyFieldDlg::GetField()
SvxDateType eType;
SvxDateFormat eFormat;
- if( aRbtFix.IsChecked() )
+ if( m_pRbtFix->IsChecked() )
eType = SVXDATETYPE_FIX;
else
eType = SVXDATETYPE_VAR;
- eFormat = (SvxDateFormat) ( aLbFormat.GetSelectEntryPos() + 2 );
+ eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 );
pNewField = new SvxDateField( *pDateField );
( (SvxDateField*) pNewField )->SetType( eType );
@@ -96,12 +88,12 @@ SvxFieldData* SdModifyFieldDlg::GetField()
SvxTimeType eType;
SvxTimeFormat eFormat;
- if( aRbtFix.IsChecked() )
+ if( m_pRbtFix->IsChecked() )
eType = SVXTIMETYPE_FIX;
else
eType = SVXTIMETYPE_VAR;
- eFormat = (SvxTimeFormat) ( aLbFormat.GetSelectEntryPos() + 2 );
+ eFormat = (SvxTimeFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 );
pNewField = new SvxExtTimeField( *pTimeField );
( (SvxExtTimeField*) pNewField )->SetType( eType );
@@ -113,12 +105,12 @@ SvxFieldData* SdModifyFieldDlg::GetField()
SvxFileType eType;
SvxFileFormat eFormat;
- if( aRbtFix.IsChecked() )
+ if( m_pRbtFix->IsChecked() )
eType = SVXFILETYPE_FIX;
else
eType = SVXFILETYPE_VAR;
- eFormat = (SvxFileFormat) ( aLbFormat.GetSelectEntryPos() );
+ eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectEntryPos() );
::sd::DrawDocShell* pDocSh = PTR_CAST( ::sd::DrawDocShell,
SfxObjectShell::Current() );
@@ -142,12 +134,12 @@ SvxFieldData* SdModifyFieldDlg::GetField()
SvxAuthorType eType;
SvxAuthorFormat eFormat;
- if( aRbtFix.IsChecked() )
+ if( m_pRbtFix->IsChecked() )
eType = SVXAUTHORTYPE_FIX;
else
eType = SVXAUTHORTYPE_VAR;
- eFormat = (SvxAuthorFormat) ( aLbFormat.GetSelectEntryPos() );
+ eFormat = (SvxAuthorFormat) ( m_pLbFormat->GetSelectEntryPos() );
// Get current state of address, not the old one
SvtUserOptions aUserOptions;
@@ -162,9 +154,9 @@ SvxFieldData* SdModifyFieldDlg::GetField()
void SdModifyFieldDlg::FillFormatList()
{
- LanguageType eLangType = maLbLanguage.GetSelectLanguage();
+ LanguageType eLangType = m_pLbLanguage->GetSelectLanguage();
- aLbFormat.Clear();
+ m_pLbFormat->Clear();
if( pField->ISA( SvxDateField ) )
{
@@ -173,24 +165,24 @@ void SdModifyFieldDlg::FillFormatList()
//SVXDATEFORMAT_APPDEFAULT, // not used
//SVXDATEFORMAT_SYSTEM, // not used
- aLbFormat.InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) );
- aLbFormat.InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96
- aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996
- aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996
- aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996
- aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996
- aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996
- aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) );
- aLbFormat.SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) );
+ m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) );
}
else if( pField->ISA( SvxExtTimeField ) )
{
@@ -199,38 +191,38 @@ void SdModifyFieldDlg::FillFormatList()
//SVXTIMEFORMAT_APPDEFAULT, // not used
//SVXTIMEFORMAT_SYSTEM, // not used
- aLbFormat.InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49
- aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38
- aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78
- aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49
- aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38
- aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78
- aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
+ m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) );
//SVXTIMEFORMAT_AM_HM, // 01:49 PM
//SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM
//SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM
- aLbFormat.SelectEntryPos( (sal_uInt16) ( pTimeField->GetFormat() - 2 ) );
+ m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pTimeField->GetFormat() - 2 ) );
}
else if( pField->ISA( SvxExtFileField ) )
{
const SvxExtFileField* pFileField = (const SvxExtFileField*) pField;
SvxExtFileField aFileField( *pFileField );
- aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) );
- aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) );
- aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) );
- aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) );
+ m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) );
- aLbFormat.SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) );
+ m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) );
}
else if( pField->ISA( SvxAuthorField ) )
{
@@ -240,10 +232,10 @@ void SdModifyFieldDlg::FillFormatList()
for( sal_uInt16 i = 0; i < 4; i++ )
{
aAuthorField.SetFormat( (SvxAuthorFormat) i );
- aLbFormat.InsertEntry( aAuthorField.GetFormatted() );
+ m_pLbFormat->InsertEntry( aAuthorField.GetFormatted() );
}
- aLbFormat.SelectEntryPos( (sal_uInt16) ( pAuthorField->GetFormat() ) );
+ m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pAuthorField->GetFormat() ) );
}
@@ -252,7 +244,7 @@ void SdModifyFieldDlg::FillFormatList()
void SdModifyFieldDlg::FillControls()
{
- aLbFormat.Clear();
+ m_pLbFormat->Clear();
if( pField->ISA( SvxDateField ) )
{
@@ -260,9 +252,9 @@ void SdModifyFieldDlg::FillControls()
SvxDateField aDateField( *pDateField );
if( pDateField->GetType() == SVXDATETYPE_FIX )
- aRbtFix.Check();
+ m_pRbtFix->Check();
else
- aRbtVar.Check();
+ m_pRbtVar->Check();
}
else if( pField->ISA( SvxExtTimeField ) )
{
@@ -270,9 +262,9 @@ void SdModifyFieldDlg::FillControls()
SvxExtTimeField aTimeField( *pTimeField );
if( pTimeField->GetType() == SVXTIMETYPE_FIX )
- aRbtFix.Check();
+ m_pRbtFix->Check();
else
- aRbtVar.Check();
+ m_pRbtVar->Check();
}
else if( pField->ISA( SvxExtFileField ) )
{
@@ -280,9 +272,9 @@ void SdModifyFieldDlg::FillControls()
SvxExtFileField aFileField( *pFileField );
if( pFileField->GetType() == SVXFILETYPE_FIX )
- aRbtFix.Check();
+ m_pRbtFix->Check();
else
- aRbtVar.Check();
+ m_pRbtVar->Check();
}
else if( pField->ISA( SvxAuthorField ) )
{
@@ -290,21 +282,21 @@ void SdModifyFieldDlg::FillControls()
SvxAuthorField aAuthorField( *pAuthorField );
if( pAuthorField->GetType() == SVXAUTHORTYPE_FIX )
- aRbtFix.Check();
+ m_pRbtFix->Check();
else
- aRbtVar.Check();
+ m_pRbtVar->Check();
}
- aRbtFix.SaveValue();
- aRbtVar.SaveValue();
+ m_pRbtFix->SaveValue();
+ m_pRbtVar->SaveValue();
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, sal_True, &pItem ) )
- maLbLanguage.SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() );
+ m_pLbLanguage->SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() );
- maLbLanguage.SaveValue();
+ m_pLbLanguage->SaveValue();
FillFormatList();
- aLbFormat.SaveValue();
+ m_pLbFormat->SaveValue();
}
@@ -319,9 +311,9 @@ SfxItemSet SdModifyFieldDlg::GetItemSet()
{
SfxItemSet aOutput( *maInputSet.GetPool(), EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL );
- if( maLbLanguage.GetSelectEntryPos() != maLbLanguage.GetSavedValue() )
+ if( m_pLbLanguage->GetSelectEntryPos() != m_pLbLanguage->GetSavedValue() )
{
- LanguageType eLangType = maLbLanguage.GetSelectLanguage();
+ LanguageType eLangType = m_pLbLanguage->GetSelectLanguage();
SvxLanguageItem aItem( eLangType, EE_CHAR_LANGUAGE );
aOutput.Put( aItem );
diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src
index bca8ff7..e69de29 100644
--- a/sd/source/ui/dlg/dlgfield.src
+++ b/sd/source/ui/dlg/dlgfield.src
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dlgfield.hrc"
-ModalDialog DLG_FIELD_MODIFY
-{
- HelpID = "sd:ModalDialog:DLG_FIELD_MODIFY";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 138 , 154 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- FixedLine GRP_TYPE
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 70 , 8 ) ;
- Text [ en-US ] = "Field type" ;
- };
- RadioButton RBT_FIX
- {
- HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 64 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Fixed" ;
- };
- RadioButton RBT_VAR
- {
- HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR";
- Pos = MAP_APPFONT ( 12 , 25 ) ;
- Size = MAP_APPFONT ( 64 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Variable" ;
- };
- FixedText FT_LANGUAGE
- {
- Pos = MAP_APPFONT ( 6 , 67 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
- Text [ en-US ] = "~Language" ;
- };
-
- ListBox LB_LANGUAGE
- {
- HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 52 , 65 ) ;
- Size = MAP_APPFONT ( 80 , 70 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
-
- ListBox LB_FORMAT
- {
- HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 94 ) ;
- Size = MAP_APPFONT ( 126 , 54 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_FORMAT
- {
- Pos = MAP_APPFONT ( 6 , 83 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "F~ormat" ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 82 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 82 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 82 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- Text [ en-US ] = "Edit Field" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/dlgfield.hrc b/sd/source/ui/inc/dlgfield.hrc
index be4dd9b..e69de29 100644
--- a/sd/source/ui/inc/dlgfield.hrc
+++ b/sd/source/ui/inc/dlgfield.hrc
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define GRP_TYPE 1
-#define RBT_FIX 1
-#define RBT_VAR 2
-#define LB_FORMAT 1
-#define FT_FORMAT 1
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define FT_LANGUAGE 2
-#define LB_LANGUAGE 3
-#define DLG_FIELD_MODIFY 448
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index 6b2394f..a60f1f7 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -36,16 +36,10 @@ class SvxFieldData;
class SdModifyFieldDlg : public ModalDialog
{
private:
- FixedLine aGrpType;
- RadioButton aRbtFix;
- RadioButton aRbtVar;
- FixedText maFtLanguage;
- SvxLanguageBox maLbLanguage;
- FixedText aFtFormat;
- ListBox aLbFormat;
- OKButton aBtnOK;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton* m_pRbtFix;
+ RadioButton* m_pRbtVar;
+ SvxLanguageBox* m_pLbLanguage;
+ ListBox* m_pLbFormat;
SfxItemSet maInputSet;
const SvxFieldData* pField;
diff --git a/sd/uiconfig/simpress/ui/dlgfield.ui b/sd/uiconfig/simpress/ui/dlgfield.ui
new file mode 100644
index 0000000..3ffef6c
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/dlgfield.ui
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkDialog" id="EditFieldsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Edit Field</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <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" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="fixedRB">
+ <property name="label" translatable="yes">_Fixed</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">varRB</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="varRB">
+ <property name="label" translatable="yes">_Variable</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">fixedRB</property>
+ </object>
+ <packing>
+ <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="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Field type</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Language</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">languageLB</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxcorelo-SvxLanguageBox" id="languageLB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <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="GtkComboBoxText" id="formatLB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">F_ormat</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list