android/experimental/DocumentLoader/Makefile | 12 +- android/experimental/LibreOffice4Android/Makefile | 10 +- android/experimental/desktop/Makefile | 12 +- oovbaapi/UnoApi_oovbaapi.mk | 4 oovbaapi/ooo/vba/excel/Buttons.idl | 40 ++++++++ oovbaapi/ooo/vba/excel/SheetObjects.idl | 98 ---------------------- oovbaapi/ooo/vba/excel/XDrawings.idl | 48 ++++++++++ oovbaapi/ooo/vba/excel/XLineObjects.idl | 54 ++++++++++++ solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 9 files changed, 165 insertions(+), 116 deletions(-)
New commits: commit 419d5631a5612122f3a84f7e73d7aec26885e9db Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 11 10:23:04 2013 +0200 Put every UNOIDL entity into an .idl file of its own ...so that future type manager mechanisms to access entities directly from .idl files can work. Generation of C++ headers for XDrawings and XLineObjects was also (inadvertently?) missing. Change-Id: I1a1a9cc39302eede2143742e03838a83d1e3a948 diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index ff32f15..3f8918a 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/oovbaapi/UnoApi_oovbaapi.mk @@ -48,7 +48,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\ Button \ - SheetObjects \ + Buttons \ )) $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ @@ -241,6 +241,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ XDataLabels \ XDialog \ XDialogs \ + XDrawings \ XFont \ XFormat \ XFormatCondition \ @@ -252,6 +253,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ XHyperlink \ XHyperlinks \ XInterior \ + XLineObjects \ XlApplicationInternational \ XlApplyNamesOrder \ XlArabicModes \ diff --git a/oovbaapi/ooo/vba/excel/Buttons.idl b/oovbaapi/ooo/vba/excel/Buttons.idl new file mode 100644 index 0000000..7166ac1 --- /dev/null +++ b/oovbaapi/ooo/vba/excel/Buttons.idl @@ -0,0 +1,40 @@ +/* + * 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 . + */ + +#ifndef __ooo_vba_excel_Buttons_idl__ +#define __ooo_vba_excel_Buttons_idl__ + +#include <ooo/vba/XCollection.idl> +#include <ooo/vba/excel/XGraphicObjects.idl> + +module ooo { module vba { module excel { + +/** Represents the collection of drawing button controls in a spreadsheet. + + <p>This service is now deprecated in VBA but kept for compatibility with old + VBA scripts.</p> +*/ +service Buttons +{ + interface ooo::vba::XCollection; + interface XGraphicObjects; +}; + +}; }; }; + +#endif diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl b/oovbaapi/ooo/vba/excel/SheetObjects.idl deleted file mode 100644 index 4d88ab1..0000000 --- a/oovbaapi/ooo/vba/excel/SheetObjects.idl +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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 . - */ - -#ifndef __ooo_vba_excel_SheetObjects_idl__ -#define __ooo_vba_excel_SheetObjects_idl__ - -#include <ooo/vba/XCollection.idl> -#include <ooo/vba/excel/XGraphicObjects.idl> - -//============================================================================= - -/* Note: This file collects all compatibility interfaces for collections of - drawing objects and drawing controls embedded in sheets. All these symbols - are deprecated in VBA and kept for compatibility with old VBA scripts. */ - -//============================================================================= - -module ooo { module vba { module excel { - -//============================================================================= - -/** Collections that implement this interface provide access to a specific type - of drawing objects in a single sheet. - - <p>The following sheet symbols represent collections of line objects, and - therefore implement this interface:</p> - <ul><li>Arcs: arc objects, and</li> - <li>Lines: straight line ojects.</li></ul> - - <p>These symbols are now deprecated in VBA but kept for compatibility with - old VBA scripts.</p> - */ -interface XLineObjects : com::sun::star::uno::XInterface -{ - /** Adds a new line object to the sheet this collection belongs to. The - type of the object is determined by the type of the collection. - - @param X1 Position of the first X coordinate in points (1/72 inch). - @param Y1 Position of the first Y coordinate in points (1/72 inch). - @param X2 Position of the last X coordinate in points (1/72 inch). - @param Y2 Position of the last Y coordinate in points (1/72 inch). - - @return The created line object. - */ - any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2 ); -}; - -//============================================================================= - -/** A collection providing access to all polygon objects in a single sheet. - - <p>This symbol is now deprecated in VBA but kept for compatibility with old - VBA scripts.</p> - */ -interface XDrawings : com::sun::star::uno::XInterface -{ - /** Adds a new polygon object to the sheet this collection belongs to. - - @param X1 Position of the first X coordinate in points (1/72 inch). - @param Y1 Position of the first Y coordinate in points (1/72 inch). - @param X2 Position of the last X coordinate in points (1/72 inch). - @param Y2 Position of the last Y coordinate in points (1/72 inch). - @param Closed True = outline closed (last and first point connected). - - @return The created polygon object. - */ - any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2, [in] any Closed ); -}; - -//============================================================================= - -/** Represents the collection of drawing button controls in a spreadsheet. */ -service Buttons -{ - interface ooo::vba::XCollection; - interface XGraphicObjects; -}; - -//============================================================================= - -}; }; }; - -#endif diff --git a/oovbaapi/ooo/vba/excel/XDrawings.idl b/oovbaapi/ooo/vba/excel/XDrawings.idl new file mode 100644 index 0000000..6b0a3cd --- /dev/null +++ b/oovbaapi/ooo/vba/excel/XDrawings.idl @@ -0,0 +1,48 @@ +/* + * 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 . + */ + +#ifndef __ooo_vba_excel_XDrawings_idl__ +#define __ooo_vba_excel_XDrawings_idl__ + +#include <com/sun/star/uno/XInterface.idl> + +module ooo { module vba { module excel { + +/** A collection providing access to all polygon objects in a single sheet. + + <p>This symbol is now deprecated in VBA but kept for compatibility with old + VBA scripts.</p> + */ +interface XDrawings : com::sun::star::uno::XInterface +{ + /** Adds a new polygon object to the sheet this collection belongs to. + + @param X1 Position of the first X coordinate in points (1/72 inch). + @param Y1 Position of the first Y coordinate in points (1/72 inch). + @param X2 Position of the last X coordinate in points (1/72 inch). + @param Y2 Position of the last Y coordinate in points (1/72 inch). + @param Closed True = outline closed (last and first point connected). + + @return The created polygon object. + */ + any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2, [in] any Closed ); +}; + +}; }; }; + +#endif diff --git a/oovbaapi/ooo/vba/excel/XLineObjects.idl b/oovbaapi/ooo/vba/excel/XLineObjects.idl new file mode 100644 index 0000000..9b3cc6c --- /dev/null +++ b/oovbaapi/ooo/vba/excel/XLineObjects.idl @@ -0,0 +1,54 @@ +/* + * 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 . + */ + +#ifndef __ooo_vba_excel_XLineObjects_idl__ +#define __ooo_vba_excel_XLineObjects_idl__ + +#include <com/sun/star/uno/XInterface.idl> + +module ooo { module vba { module excel { + +/** Collections that implement this interface provide access to a specific type + of drawing objects in a single sheet. + + <p>The following sheet symbols represent collections of line objects, and + therefore implement this interface:</p> + <ul><li>Arcs: arc objects, and</li> + <li>Lines: straight line ojects.</li></ul> + + <p>This symbol is now deprecated in VBA but kept for compatibility with old + VBA scripts.</p> + */ +interface XLineObjects : com::sun::star::uno::XInterface +{ + /** Adds a new line object to the sheet this collection belongs to. The + type of the object is determined by the type of the collection. + + @param X1 Position of the first X coordinate in points (1/72 inch). + @param Y1 Position of the first Y coordinate in points (1/72 inch). + @param X2 Position of the last X coordinate in points (1/72 inch). + @param Y2 Position of the last Y coordinate in points (1/72 inch). + + @return The created line object. + */ + any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2 ); +}; + +}; }; }; + +#endif commit 5a6272552eab140886aa0fb7dae18fc58de9fb42 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Sep 11 11:24:45 2013 +0300 Set gb_INSTROOT and gb_DEVINSTALLROOT here, too Change-Id: I6831d9436dfb24ae42e124676cf283aae075be7e diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index f4ef48a..9ee7a37 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -28,6 +28,9 @@ endif gb_COMPILERDEFAULTOPTFLAGS := -O3 +gb_INSTROOT := $(INSTDIR) +gb_DEVINSTALLROOT := $(gb_INSTROOT) + include $(GBUILDDIR)/platform/com_GCC_defs.mk # Darwin mktemp -t expects a prefix, not a pattern commit ca995611705c759d4b0512d45ed9078687a8640c Author: Tor Lillqvist <t...@collabora.com> Date: Wed Sep 11 11:23:56 2013 +0300 More files are no longer in OUTDIR, only in INSTDIR Change-Id: Ide6654cbc378621a41a4a207978a4f42bc44d3e3 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 759cf65..8410fb3 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -22,14 +22,14 @@ copy-stuff: # android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some # extent). # - mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util + mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? # So just hardcode the known APP_DATA_PATH for now... - for F in xml/services xml/ure/services; do \ - sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ + for F in program/services/services ure/share/misc/services; do \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \ done cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \ $(SRC_ROOT)/sc/qa/unit/data/xls/border.xls \ @@ -65,13 +65,13 @@ copy-stuff: echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc - echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc + echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' >> assets/program/fundamentalrc # # Set up unorc echo '[Bootstrap]' > assets/program/unorc echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb $${URE_MORE_TYPES}' >> assets/program/unorc - echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc + echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc # # Set up bootstraprc echo '[Bootstrap]' > assets/program/bootstraprc @@ -90,7 +90,7 @@ copy-stuff: # # .res files mkdir -p assets/program/resource - cp $(OUTDIR)/bin/*en-US.res assets/program/resource + cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource # # Assets that are unpacked at run-time into the app's data directory. These # are files read by non-LO code, fontconfig and freetype for now, that doesn't diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index e523a4d..1149499 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -23,13 +23,13 @@ copy-stuff: # android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some # extent). # - mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util + mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? - for F in xml/services xml/ure/services; do \ - sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ + for F in program/services/services ure/share/misc/services; do \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \ done cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \ $(SRC_ROOT)/sc/qa/unit/data/xls/border.xls \ @@ -69,7 +69,7 @@ copy-stuff: echo '[Bootstrap]' > assets/program/unorc echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/unorc echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb file://$$APP_DATA_DIR/program/offapi.rdb file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc - echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/unorc + echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb file:///assets/program/services/services.rdb' >> assets/program/unorc # # Set up bootstraprc echo '[Bootstrap]' > assets/program/bootstraprc @@ -88,7 +88,7 @@ copy-stuff: # # .res files mkdir -p assets/program/resource - cp $(OUTDIR)/bin/*en-US.res assets/program/resource + cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource # # Assets that are unpacked at run-time into the app's data directory. These # are files read by non-LO code, fontconfig and freetype for now, that doesn't diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 25cc0fb..98b2f23 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -23,14 +23,14 @@ copy-stuff: # Please note that some of thses files being set up to be present in # the .apk and/or unpacked at install time might be unnecessary. # - mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util + mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? # So just hardcode the known APP_DATA_PATH for now... - for F in xml/services xml/ure/services; do \ - sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ + for F in program/services/services ure/share/misc/services; do \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \ done cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \ $(SRC_ROOT)/sc/qa/unit/data/xls/border.xls \ @@ -66,13 +66,13 @@ copy-stuff: echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc - echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc + echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' >> assets/program/fundamentalrc # # Set up unorc echo '[Bootstrap]' > assets/program/unorc echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb $${URE_MORE_TYPES}' >> assets/program/unorc - echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc + echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc # # Set up bootstraprc echo '[Bootstrap]' > assets/program/bootstraprc @@ -91,7 +91,7 @@ copy-stuff: # # .res files mkdir -p assets/program/resource - cp $(OUTDIR)/bin/*en-US.res assets/program/resource + cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource # # Assets that are unpacked at run-time into the app's data directory. These # are files read by non-LO code, fontconfig and freetype for now, that doesn't _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits