oovbaapi/ooo/vba/excel/XApplication.idl | 1 + sc/source/ui/vba/vbaapplication.cxx | 8 ++++++++ sc/source/ui/vba/vbaapplication.hxx | 1 + vbahelper/source/vbahelper/vbashape.cxx | 4 +++- 4 files changed, 13 insertions(+), 1 deletion(-)
New commits: commit 1ac1caff62d0d72d158a2fafb3f06b7ec18cb346 Author: Tamas Bunth <[email protected]> Date: Sat Jun 24 14:03:41 2017 +0200 oovbaapi: use autoshape in case of EllipseShape Required for msoShapeOval autoshape type Change-Id: I62ef053e8f387f4d87b28b7d17b82209d28fe0fd Reviewed-on: https://gerrit.libreoffice.org/39209 Tested-by: Jenkins <[email protected]> Reviewed-by: Tamás Bunth <[email protected]> diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index b1c43e08d1e4..ca012370267c 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -144,7 +144,9 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape >& xShape ) } else if( sShapeType == "com.sun.star.drawing.LineShape" ) return office::MsoShapeType::msoLine; - else if( sShapeType == "com.sun.star.drawing.CustomShape" || sShapeType == "com.sun.star.drawing.RectangleShape" ) + else if( sShapeType == "com.sun.star.drawing.CustomShape" + || sShapeType == "com.sun.star.drawing.RectangleShape" + || sShapeType == "com.sun.star.drawing.EllipseShape" ) return office::MsoShapeType::msoAutoShape; else if( sShapeType == "com.sun.star.drawing.TextShape" ) return office::MsoShapeType::msoTextBox; commit 50f4e1883c2e9eb8ec25ad9095889fc7699440dd Author: Tamas Bunth <[email protected]> Date: Sat Jun 24 12:58:20 2017 +0200 oovbaapi: add Application.OperatingSystem property stub As documented at: https://msdn.microsoft.com/en-us/vba/excel-vba/articles/application-operatingsystem-property-excel Change-Id: I2ccf17c698eb631e7b5ca420752b2268d2142d2a Reviewed-on: https://gerrit.libreoffice.org/39208 Tested-by: Jenkins <[email protected]> Reviewed-by: Tamás Bunth <[email protected]> diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl index a8de92208937..153ed8bfc952 100644 --- a/oovbaapi/ooo/vba/excel/XApplication.idl +++ b/oovbaapi/ooo/vba/excel/XApplication.idl @@ -67,6 +67,7 @@ interface XApplication [attribute, readonly] string LibraryPath; [attribute, readonly] string TemplatesPath; [attribute, readonly] string PathSeparator; + [attribute, readonly] string OperatingSystem; void setDefaultFilePath([in] string DefaultFilePath) raises(com::sun::star::script::BasicErrorException); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 47b94985dd5b..e678d58a67d4 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -914,6 +914,14 @@ ScVbaApplication::getPathSeparator() return OUString( (sal_Unicode) SAL_PATHDELIMITER ); } +OUString SAL_CALL +ScVbaApplication::getOperatingSystem() +{ + // TODO implement + SAL_WARN("sc", "not implemented"); + return OUString(); +} + // Helpers for Intersect and Union namespace { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index cc995d0b471f..49180d214055 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -67,6 +67,7 @@ public: virtual OUString SAL_CALL getPathSeparator() override; virtual OUString SAL_CALL getLibraryPath() override; virtual OUString SAL_CALL getTemplatesPath() override; + virtual OUString SAL_CALL getOperatingSystem() override; virtual OUString SAL_CALL getName() override; virtual sal_Bool SAL_CALL getDisplayAlerts() override;
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
