oovbaapi/ooo/vba/excel/Constants.idl | 12 ++++++++++++ oovbaapi/ooo/vba/excel/XInterior.idl | 3 +++ sc/source/ui/vba/vbainterior.cxx | 33 +++++++++++++++++++++++++++++++++ sc/source/ui/vba/vbainterior.hxx | 6 ++++++ 4 files changed, 54 insertions(+)
New commits: commit e3828e7bed641bf8475845045accec6131544f42 Author: Miklos Vajna <[email protected]> Date: Wed Jun 7 17:50:32 2017 +0200 oovbaapi: add Interior.PatternTintAndShade Property (Excel) As documented at <https://msdn.microsoft.com/en-us/library/office/ff192986.aspx>. Change-Id: I390c22e75c8cfb41034287848f92578ad67e724f Reviewed-on: https://gerrit.libreoffice.org/38524 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl index 71ec105ac86c..98e24dd625a9 100644 --- a/oovbaapi/ooo/vba/excel/XInterior.idl +++ b/oovbaapi/ooo/vba/excel/XInterior.idl @@ -40,6 +40,7 @@ interface XInterior [attribute] any PatternColorIndex; [attribute] any ThemeColor; [attribute] any TintAndShade; + [attribute] any PatternTintAndShade; }; diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 8896724f6957..bd9b15cb49fe 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -406,6 +406,17 @@ void SAL_CALL ScVbaInterior::setTintAndShade(const uno::Any& /*rAny*/) // Just a stub for now. } +uno::Any SAL_CALL ScVbaInterior::getPatternTintAndShade() +{ + // Just a stub for now. + return uno::makeAny(static_cast<double>(0)); +} + +void SAL_CALL ScVbaInterior::setPatternTintAndShade(const uno::Any& /*rAny*/) +{ + // Just a stub for now. +} + OUString ScVbaInterior::getServiceImplName() { diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 3a01b4247cf7..3dd642fd146d 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -74,6 +74,8 @@ public: void SAL_CALL setThemeColor(const css::uno::Any& rAny) override; css::uno::Any SAL_CALL getTintAndShade() override; void SAL_CALL setTintAndShade(const css::uno::Any& rAny) override; + css::uno::Any SAL_CALL getPatternTintAndShade() override; + void SAL_CALL setPatternTintAndShade(const css::uno::Any& rAny) override; //XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; commit d8a84e7df7ad75362d4fb2db9aa2f1de0a025654 Author: Miklos Vajna <[email protected]> Date: Wed Jun 7 17:39:40 2017 +0200 oovbaapi: add Interior.TintAndShade Property (Excel) As documented at <https://msdn.microsoft.com/en-us/library/office/ff197557.aspx>. Change-Id: I4ffa74293978e4642e043a9cda80a7b4a9b5512c Reviewed-on: https://gerrit.libreoffice.org/38523 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl index 06baa2645864..71ec105ac86c 100644 --- a/oovbaapi/ooo/vba/excel/XInterior.idl +++ b/oovbaapi/ooo/vba/excel/XInterior.idl @@ -39,6 +39,7 @@ interface XInterior [attribute] any PatternColor; [attribute] any PatternColorIndex; [attribute] any ThemeColor; + [attribute] any TintAndShade; }; diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 62f2d26f1766..8896724f6957 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -395,6 +395,17 @@ void SAL_CALL ScVbaInterior::setThemeColor(const uno::Any& /*rAny*/) // Just a stub for now. } +uno::Any SAL_CALL ScVbaInterior::getTintAndShade() +{ + // Just a stub for now. + return uno::makeAny(static_cast<double>(0)); +} + +void SAL_CALL ScVbaInterior::setTintAndShade(const uno::Any& /*rAny*/) +{ + // Just a stub for now. +} + OUString ScVbaInterior::getServiceImplName() { diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index d036392e25ec..3a01b4247cf7 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -72,6 +72,8 @@ public: virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) override; css::uno::Any SAL_CALL getThemeColor() override; void SAL_CALL setThemeColor(const css::uno::Any& rAny) override; + css::uno::Any SAL_CALL getTintAndShade() override; + void SAL_CALL setTintAndShade(const css::uno::Any& rAny) override; //XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; commit 1365a9f95a8e97a8ec9bbf9a351f9f4ab2696d92 Author: Miklos Vajna <[email protected]> Date: Wed Jun 7 17:22:22 2017 +0200 oovbaapi: add XlThemeColor Enumeration (Excel) As documented at <https://msdn.microsoft.com/en-us/library/office/ff839402.aspx>. And also extend ov::excel::XInterior with a ThemeColor property, as documented at <https://msdn.microsoft.com/en-us/library/office/ff820778.aspx>; implementation is just a stub for now. Change-Id: I05f1490cdc366f5db127d340cab5f51efcafa862 Reviewed-on: https://gerrit.libreoffice.org/38522 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/oovbaapi/ooo/vba/excel/Constants.idl b/oovbaapi/ooo/vba/excel/Constants.idl index 061e679d61db..af32f2cccf8b 100644 --- a/oovbaapi/ooo/vba/excel/Constants.idl +++ b/oovbaapi/ooo/vba/excel/Constants.idl @@ -168,6 +168,18 @@ module ooo { module vba { module excel { const long xlWorksheet4 = 1; const long xlWorksheetCell = 3; const long xlWorksheetShort = 5; + const long xlThemeColorAccent1 = 5; + const long xlThemeColorAccent2 = 6; + const long xlThemeColorAccent3 = 7; + const long xlThemeColorAccent4 = 8; + const long xlThemeColorAccent5 = 9; + const long xlThemeColorAccent6 = 10; + const long xlThemeColorDark1 = 1; + const long xlThemeColorDark2 = 3; + const long xlThemeColorFollowedHyperlink = 12; + const long xlThemeColorHyperlink = 11; + const long xlThemeColorLight1 = 2; + const long xlThemeColorLight2 = 4; }; }; }; }; diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl index aef589de9327..06baa2645864 100644 --- a/oovbaapi/ooo/vba/excel/XInterior.idl +++ b/oovbaapi/ooo/vba/excel/XInterior.idl @@ -38,6 +38,7 @@ interface XInterior [attribute] any Pattern; [attribute] any PatternColor; [attribute] any PatternColorIndex; + [attribute] any ThemeColor; }; diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 51b4c2270615..62f2d26f1766 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -384,6 +384,17 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw uno::RuntimeException("Invalid Pattern Color" ); } +uno::Any SAL_CALL ScVbaInterior::getThemeColor() +{ + // Just a stub for now. + return uno::makeAny(static_cast<sal_Int32>(0)); +} + +void SAL_CALL ScVbaInterior::setThemeColor(const uno::Any& /*rAny*/) +{ + // Just a stub for now. +} + OUString ScVbaInterior::getServiceImplName() { diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 9bb86ab308c0..d036392e25ec 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -70,6 +70,8 @@ public: virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) override; virtual css::uno::Any SAL_CALL getPatternColorIndex() override; virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) override; + css::uno::Any SAL_CALL getThemeColor() override; + void SAL_CALL setThemeColor(const css::uno::Any& rAny) override; //XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
