[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - oovbaapi/ooo sw/source

[Libreoffice Gerrit user]

 oovbaapi/ooo/vba/word/XWordBasic.idl |    4 ++--
 sw/source/ui/vba/vbaapplication.cxx  |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 699676cec58083afd7fa60b67e32cf7d6c9cf63f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Feb 7 12:04:49 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Feb 7 12:08:33 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 97531796f92c..7341bd487fbd 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -108,7 +108,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;
@@ -651,7 +651,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 b1b54a5faf899488e5045c6b3e26241c9d7299de
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Feb 7 11:55:51 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Feb 7 12:08:28 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 222524f4207a..97531796f92c 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -110,7 +110,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;
 };
 
@@ -669,7 +669,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 << ")");