bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 2 +- extras/source/autotext/lang/oc/standard/FN/content.xml | 6 +++--- extras/source/autotext/lang/om/standard/FN/content.xml | 6 +++--- offapi/com/sun/star/document/XShapeEventBroadcaster.idl | 6 ++++-- offapi/com/sun/star/i18n/XCalendar4.idl | 10 ++++++++++ 5 files changed, 21 insertions(+), 9 deletions(-)
New commits: commit 29ac4c2979c63f1892e9d53bd17c860ea9ce3345 Author: Tomoyuki Kubota <himajin100...@gmail.com> AuthorDate: Tue Sep 24 23:35:06 2019 +0900 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Sep 24 21:45:59 2019 +0200 latest update of Visual Studio complains about typeinfo.h Change-Id: If8643ddd823ec1c970a7211be1547853162659a0 Reviewed-on: https://gerrit.libreoffice.org/79461 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 8d49ff6dafd1..9934714eecab 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -240,7 +240,7 @@ void #include <malloc.h> #include <new.h> -#include <typeinfo.h> +#include <typeinfo> #include <signal.h> #include <rtl/alloc.h> commit fe5c74ea22ec3b61bd1208ab7d1a16b25582dd9f Author: Laurent BP <laurent.balland-poir...@laposte.net> AuthorDate: Sun Sep 15 16:14:25 2019 +0200 Commit: Laurent BP <laurent.balland-poir...@laposte.net> CommitDate: Tue Sep 24 21:45:40 2019 +0200 Improve FN AutoText for om Translate names which appear in Navigator Change-Id: Iaae0f7e71251bdb206c3d7f59f78a34672b7fc14 Reviewed-on: https://gerrit.libreoffice.org/78935 Tested-by: Jenkins Reviewed-by: Laurent BP <laurent.balland-poir...@laposte.net> diff --git a/extras/source/autotext/lang/om/standard/FN/content.xml b/extras/source/autotext/lang/om/standard/FN/content.xml index b41b40baf853..c1327a65aa6a 100644 --- a/extras/source/autotext/lang/om/standard/FN/content.xml +++ b/extras/source/autotext/lang/om/standard/FN/content.xml @@ -34,13 +34,13 @@ <text:sequence-decl text:display-outline-level="0" text:name="Text"/> <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> </text:sequence-decls> - <table:table table:name="Tabel1" table:style-name="FormulaTable"> + <table:table table:name="Gabatee1" table:style-name="FormulaTable"> <table:table-column table:style-name="FormulaTable.A"/> <table:table-column table:style-name="FormulaTable.B"/> <table:table-header-rows> <table:table-row> <table:table-cell table:style-name="FormulaTable.A1" office:value-type="string"> - <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Objek1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Wanta1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> <svg:desc>formula</svg:desc> </draw:frame></text:p> </table:table-cell> @@ -52,4 +52,4 @@ </table:table> </office:text> </office:body> -</office:document-content> \ No newline at end of file +</office:document-content> commit bd776896c2035f5b247365f2d3b8442272d0731c Author: Tomoyuki Kubota <himajin100...@gmail.com> AuthorDate: Wed Sep 25 00:12:09 2019 +0900 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Sep 24 21:45:26 2019 +0200 doxygen warns on missing annotations for the parameters Change-Id: I3008c622179a417b9ab2076b2284be5ff296448e Reviewed-on: https://gerrit.libreoffice.org/79467 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/offapi/com/sun/star/document/XShapeEventBroadcaster.idl b/offapi/com/sun/star/document/XShapeEventBroadcaster.idl index 52e49ec8e96b..78a227eb993b 100644 --- a/offapi/com/sun/star/document/XShapeEventBroadcaster.idl +++ b/offapi/com/sun/star/document/XShapeEventBroadcaster.idl @@ -33,14 +33,16 @@ module com { module sun { module star { module document { interface XShapeEventBroadcaster : com::sun::star::document::XEventBroadcaster { /** registers the given listener - + @param Shape + the shape to be listened @param Listener listener which is interested on such events */ void addShapeEventListener( [in] com::sun::star::drawing::XShape Shape, [in] XShapeEventListener Listener ); /** unregisters the given listener - + @param Shape + the shape with the listener to be removed @param Listener listener which isn't interested on such events any longer */ diff --git a/offapi/com/sun/star/i18n/XCalendar4.idl b/offapi/com/sun/star/i18n/XCalendar4.idl index 94686b4a0031..7243cea65d76 100644 --- a/offapi/com/sun/star/i18n/XCalendar4.idl +++ b/offapi/com/sun/star/i18n/XCalendar4.idl @@ -51,6 +51,8 @@ interface XCalendar4 : com::sun::star::i18n::XCalendar3 /** Load the default calendar for the given locale with a given time zone. + @param rLocale + the locale for the calendar @param TimeZone If empty, the system's time zone is used. Else specified as "Region/City" name like "Europe/Berlin", @@ -62,6 +64,14 @@ interface XCalendar4 : com::sun::star::i18n::XCalendar3 /** Load a specific calendar for the given locale with a given time zone. + @param uniqueID + the uniqueID for the calendar. + As of 2019-09-25, we can specify ROC, dangi, buddhist, gengou, + gregorian, hanja, hanja_yoil, hijri, jewish. + If the calendar for the specified uniqueID is not found, + gregorian is used. + @param rLocale + the locale for the calendar @param TimeZone If empty, the system's time zone is used. Else specified as "Region/City" name like "Europe/Berlin", commit 1a13394cdd7f8c862c02356bda7f4ba54e914c8a Author: Laurent BP <laurent.balland-poir...@laposte.net> AuthorDate: Sun Sep 15 16:10:39 2019 +0200 Commit: Laurent BP <laurent.balland-poir...@laposte.net> CommitDate: Tue Sep 24 21:45:13 2019 +0200 Improve FN AutoText for oc Translate names which appear in Navigator Change-Id: Ic8412633aadf32aec17e0c347ffd82c1cd639fc0 Reviewed-on: https://gerrit.libreoffice.org/78934 Tested-by: Jenkins Reviewed-by: Laurent BP <laurent.balland-poir...@laposte.net> diff --git a/extras/source/autotext/lang/oc/standard/FN/content.xml b/extras/source/autotext/lang/oc/standard/FN/content.xml index b41b40baf853..543e81a67095 100644 --- a/extras/source/autotext/lang/oc/standard/FN/content.xml +++ b/extras/source/autotext/lang/oc/standard/FN/content.xml @@ -34,13 +34,13 @@ <text:sequence-decl text:display-outline-level="0" text:name="Text"/> <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> </text:sequence-decls> - <table:table table:name="Tabel1" table:style-name="FormulaTable"> + <table:table table:name="Tablèu1" table:style-name="FormulaTable"> <table:table-column table:style-name="FormulaTable.A"/> <table:table-column table:style-name="FormulaTable.B"/> <table:table-header-rows> <table:table-row> <table:table-cell table:style-name="FormulaTable.A1" office:value-type="string"> - <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Objek1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Objècte1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> <svg:desc>formula</svg:desc> </draw:frame></text:p> </table:table-cell> @@ -52,4 +52,4 @@ </table:table> </office:text> </office:body> -</office:document-content> \ No newline at end of file +</office:document-content> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits