svtools/source/misc/imagemgr.src | 22 +++++++++++----------- sw/CppunitTest_sw_macros_test.mk | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-)
New commits: commit bb5bad165e32603478ff590251fb88c46534dac6 Author: Michael Stahl <[email protected]> Date: Fri Dec 9 15:10:23 2011 +0100 svtools: imagemgr.src: use %PRODUCTXMLFILEFORMATNAME Currently on File->Properties we display "LibreOffice 1.0 Text Document" etc. for OpenOffice.org XML format documents, which is wrong: these should not be re-branded. diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index ca4a075..1ab37cb 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -289,19 +289,19 @@ String STR_DESCRIPTION_FACTORY_DATABASE }; String STR_DESCRIPTION_CALC_TEMPLATE { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ; }; String STR_DESCRIPTION_DRAW_TEMPLATE { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ; }; String STR_DESCRIPTION_IMPRESS_TEMPLATE { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ; }; String STR_DESCRIPTION_WRITER_TEMPLATE { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ; }; String STR_DESCRIPTION_LOCALE_VOLUME { @@ -336,37 +336,37 @@ String STR_DESCRIPTION_POWERPOINT_SHOW String STR_DESCRIPTION_SXMATH_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ; }; String STR_DESCRIPTION_SXCHART_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ; }; String STR_DESCRIPTION_SXDRAW_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ; }; String STR_DESCRIPTION_SXCALC_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ; }; String STR_DESCRIPTION_SXIMPRESS_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ; }; String STR_DESCRIPTION_SXWRITER_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ; }; String STR_DESCRIPTION_SXGLOBAL_DOC { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ; + Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ; }; String STR_DESCRIPTION_MATHML_DOC { commit 90bf7efd26d6d1bf047238857c429de9d0dbeed7 Author: Michael Stahl <[email protected]> Date: Wed Dec 7 12:57:51 2011 +0100 CppunitTest_sw_macros_test.mk: depends on vbaswobj This should fix the spurious segfaults caused by running the test while the library is being overwritten in parallel that cannot be reproduced by just running the test. diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 9c2c11f..a640452 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -137,6 +137,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ # a) explicitly depend on library msword because it is not implied by a link # relation # b) explicitly depend on the sw resource files needed at unit-test runtime -$(call gb_CppunitTest_get_target,sw_macros_test) : $(call gb_Library_get_target,msword) +$(call gb_CppunitTest_get_target,sw_macros_test) : \ + $(call gb_Library_get_target,msword) \ + $(call gb_Library_get_target,vbaswobj) \ # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
