[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - oovbaapi/ooo sw/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 20 09:16:59 UTC 2019
oovbaapi/ooo/vba/word/XWordBasic.idl | 2 +-
sw/source/ui/vba/vbaapplication.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6cfbb68f21412e57d25b2e5da4f7e5789ba21201
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Feb 7 11:55:51 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 11:15:41 2019 +0200
The parameter to WordBasic.AppShow() is optional and thus has to be an Any
Change-Id: I134101d1be5922051e34352331a49f5706030ff2
(cherry picked from commit b1b54a5faf899488e5045c6b3e26241c9d7299de)
Reviewed-on: https://gerrit.libreoffice.org/79162
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl b/oovbaapi/ooo/vba/word/XWordBasic.idl
index d9e2a239668e..17cf27742b2f 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -41,7 +41,7 @@ interface XWordBasic
long AppMaximize( [in] string WindowName, [in] any State );
long DocMaximize( [in] any State );
- void AppShow( [in] string WindowName );
+ void AppShow( [in] any WindowName );
long AppCount();
};
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 5a4ff94896c1..aefe022f41a1 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -111,7 +111,7 @@ public:
const css::uno::Any& OpenExclusive, const css::uno::Any& SubType) override;
virtual sal_Int32 SAL_CALL AppMaximize( const OUString& WindowName, const css::uno::Any& State ) override;
virtual sal_Int32 SAL_CALL DocMaximize( const css::uno::Any& State ) override;
- virtual void SAL_CALL AppShow( const OUString& WindowName ) override;
+ virtual void SAL_CALL AppShow( const css::uno::Any& WindowName ) override;
virtual sal_Int32 SAL_CALL AppCount() override;
};
@@ -670,7 +670,7 @@ SwWordBasic::DocMaximize( const css::uno::Any& State )
}
void SAL_CALL
-SwWordBasic::AppShow( const OUString& WindowName )
+SwWordBasic::AppShow( const css::uno::Any& WindowName )
{
SAL_INFO("sw.vba", "WordBasic.AppShow(WindowName:=" << WindowName << ")");
More information about the Libreoffice-commits
mailing list