oovbaapi/ooo/vba/word/XWordBasic.idl | 4 ++-- sw/source/ui/vba/vbaapplication.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 6673aa3fefad3b64469e3c6457161e09f6c27f5f Author: Tor Lillqvist <[email protected]> AuthorDate: Thu Feb 7 12:04:49 2019 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Thu Feb 7 12:40:10 2019 +0200 The WindowName param to WordBasic.AppMaximize() is optional and must be an Any Change-Id: I52d75427fe30945293f347e3f49d21bc2016edae diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl b/oovbaapi/ooo/vba/word/XWordBasic.idl index 17cf27742b2f..908c963d6978 100644 --- a/oovbaapi/ooo/vba/word/XWordBasic.idl +++ b/oovbaapi/ooo/vba/word/XWordBasic.idl @@ -39,7 +39,7 @@ interface XWordBasic [in] any OpenExclusive, [in] any SubType ); - long AppMaximize( [in] string WindowName, [in] any State ); + long AppMaximize( [in] any WindowName, [in] any State ); long DocMaximize( [in] any State ); void AppShow( [in] any WindowName ); long AppCount(); diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index a1d902d61020..98236bacec81 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -109,7 +109,7 @@ public: const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Connection, const css::uno::Any& SQLStatement, const css::uno::Any& SQLStatement1, 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 AppMaximize( const css::uno::Any& 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 css::uno::Any& WindowName ) override; virtual sal_Int32 SAL_CALL AppCount() override; @@ -649,7 +649,7 @@ SwWordBasic::MailMergeOpenDataSource( const OUString& Name, const css::uno::Any& } sal_Int32 SAL_CALL -SwWordBasic::AppMaximize( const OUString& WindowName, const css::uno::Any& State ) +SwWordBasic::AppMaximize( const css::uno::Any& WindowName, const css::uno::Any& State ) { SAL_INFO("sw.vba", "WordBasic.AppMaximize( WindowName:=" << WindowName << ", State:=" << State); commit 49181f4b2f3cc1eeb6d0ed0ad317c6f314bb5eba Author: Tor Lillqvist <[email protected]> AuthorDate: Thu Feb 7 11:55:51 2019 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Thu Feb 7 12:40:10 2019 +0200 The parameter to WordBasic.AppShow() is optional and thus has to be an Any Change-Id: I134101d1be5922051e34352331a49f5706030ff2 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 add0d31ca6eb..a1d902d61020 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; }; @@ -667,7 +667,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 << ")"); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
