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

[Tor Lillqvist (via logerrit)]

 oovbaapi/ooo/vba/word/XWordBasic.idl |    3 +++
 sw/source/ui/vba/vbaapplication.cxx  |   20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit 302da5638649a01a3ed8396264fac047117e91e6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Feb 6 12:08:59 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 11:00:40 2019 +0200

    Add a dummy implementation of WordBasic.DocMaximize()
    
    Change-Id: I972f9446560cc8ac51031dbc36fc05d438d150e7
    (cherry picked from commit 3c42f006076ecd71371612d67d84381ac42b88da)
    Reviewed-on: https://gerrit.libreoffice.org/79158
    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 3b3fbe79f4cc..bbebd72ebd89 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -40,6 +40,7 @@ interface XWordBasic
                                   [in] any SubType );
 
     long AppMaximize( [in] string WindowName, [in] any State );
+    long DocMaximize( [in] any State );
 };
 
 }; }; };
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 970cc46966f7..dd5b0aa9a0bf 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -110,6 +110,7 @@ public:
                                                   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 DocMaximize( const css::uno::Any& State ) override;
 };
 
 SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ):
@@ -651,4 +652,13 @@ SwWordBasic::AppMaximize( const OUString& WindowName, const css::uno::Any& State
     return 0;
 }
 
+sal_Int32 SAL_CALL
+SwWordBasic::DocMaximize( const css::uno::Any& State )
+{
+    SAL_INFO("sw.vba", "WordBasic.DocMaximize(State:=" << State << ")");
+
+    // FIXME: Implement if necessary
+    return 0;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2ecb599f8e89271bf494588165b1abad2eae975c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Feb 6 11:58:56 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 11:00:15 2019 +0200

    Add a dummy implementation of WordBasic.AppMaximize()
    
    Change-Id: I4606e5a3717c3717d105dd2e63c9fd7d2e1abf83
    (cherry picked from commit 990c88a9a84c1960a704052f84318bc33b744fb5)
    Reviewed-on: https://gerrit.libreoffice.org/79157
    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 5150a431401b..3b3fbe79f4cc 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -38,6 +38,8 @@ interface XWordBasic
                                   [in] any SQLStatement1,
                                   [in] any OpenExclusive,
                                   [in] any SubType );
+
+    long AppMaximize( [in] string WindowName, [in] any State );
 };
 
 }; }; };
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 4d92fbd6b8a8..970cc46966f7 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -109,6 +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;
 };
 
 SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ):
@@ -641,4 +642,13 @@ SwWordBasic::MailMergeOpenDataSource( const OUString& Name, const css::uno::Any&
                                                                 OpenExclusive, SubType );
 }
 
+sal_Int32 SAL_CALL
+SwWordBasic::AppMaximize( const OUString& WindowName, const css::uno::Any& State )
+{
+    SAL_INFO("sw.vba", "WordBasic.AppMaximize( WindowName:=" << WindowName << ", State:=" << State);
+
+    // FIXME: Implement if necessary
+    return 0;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */