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

[Tor Lillqvist (via logerrit)]

 oovbaapi/ooo/vba/word/XWordBasic.idl |    1 
 sw/source/ui/vba/vbaapplication.cxx  |   45 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

New commits:
commit 5f3e3b99a0be949c7d806312771e39849aa28b7f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 16:59:51 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 22:41:47 2019 +0200

    Add a dummy WordBasic.ToolsOptionsView
    
    Does nothing. Needed for customer application to proceed. Once we are
    further along in getting it to work, we can investigate what the
    parameters passed to this ToolsOptionsView method actually are. (This
    WordBasic thing is something that has been deprecated since last
    century, I suspect, so no wonder it is hard to find authoritative
    documentation on it.)
    
    Change-Id: I62a6d6d9abb9364afca110570fa341a2375a77a6
    (cherry picked from commit ac43be5afca3691f85f455035628df009f2d9694)
    Reviewed-on: https://gerrit.libreoffice.org/79148
    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 769d8aad3faf..3d9454b812b7 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -17,6 +17,7 @@ interface XWordBasic
     [attribute] long MailMergeMainDocumentType;
 
     void FileOpen( [in] string Name, [in] any ConfirmConversions, [in] any ReadOnly, [in] any AddToMru, [in] any PasswordDoc, [in] any PasswordDot, [in] any Revert, [in] any WritePasswordDoc, [in] any WritePasswordDot );
+    void ToolsOptionsView( [in] any Whatever1, [in] any Whatever2, [in] any Whatever3, [in] any Whatever4, [in] any Whatever5, [in] any Whatever6, [in] any Whatever7, [in] any Whatever8, [in] any Whatever9, [in] any Whatever10, [in] any Whatever11, [in] any Whatever12, [in] any Whatever13, [in] any Whatever14, [in] any Whatever15, [in] any Whatever16, [in] any Whatever17, [in] any Whatever18, [in] any Whatever19, [in] any Whatever20 );
     string WindowName();
     boolean ExistingBookmark( [in] string Name );
     void MailMergeOpenDataSource( [in] string Name,
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 9b57e50b7348..3ce0d8cedae5 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -76,6 +76,26 @@ public:
     virtual void SAL_CALL setMailMergeMainDocumentType( sal_Int32 _mailmergemaindocumenttype ) override;
 
     virtual void SAL_CALL FileOpen( const OUString& Name, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert, const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot ) override;
+    virtual void SAL_CALL ToolsOptionsView( const css::uno::Any& Whatever1,
+                                            const css::uno::Any& Whatever2,
+                                            const css::uno::Any& Whatever3,
+                                            const css::uno::Any& Whatever4,
+                                            const css::uno::Any& Whatever5,
+                                            const css::uno::Any& Whatever6,
+                                            const css::uno::Any& Whatever7,
+                                            const css::uno::Any& Whatever8,
+                                            const css::uno::Any& Whatever9,
+                                            const css::uno::Any& Whatever10,
+                                            const css::uno::Any& Whatever11,
+                                            const css::uno::Any& Whatever12,
+                                            const css::uno::Any& Whatever13,
+                                            const css::uno::Any& Whatever14,
+                                            const css::uno::Any& Whatever15,
+                                            const css::uno::Any& Whatever16,
+                                            const css::uno::Any& Whatever17,
+                                            const css::uno::Any& Whatever18,
+                                            const css::uno::Any& Whatever19,
+                                            const css::uno::Any& Whatever20 ) override;
     virtual OUString SAL_CALL WindowName() override;
     virtual sal_Bool SAL_CALL ExistingBookmark( const OUString& Name ) override;
     virtual void SAL_CALL MailMergeOpenDataSource(const OUString& Name, const css::uno::Any& Format,
@@ -512,6 +532,31 @@ SwWordBasic::FileOpen( const OUString& Name, const uno::Any& ConfirmConversions,
         rDocuments->Open( Name, ConfirmConversions, ReadOnly, AddToMru, PasswordDoc, PasswordDot, Revert, WritePasswordDoc, WritePasswordDot, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any() );
 }
 
+void SAL_CALL
+SwWordBasic::ToolsOptionsView( const css::uno::Any& /*Whatever1*/,
+                               const css::uno::Any& /*Whatever2*/,
+                               const css::uno::Any& /*Whatever3*/,
+                               const css::uno::Any& /*Whatever4*/,
+                               const css::uno::Any& /*Whatever5*/,
+                               const css::uno::Any& /*Whatever6*/,
+                               const css::uno::Any& /*Whatever7*/,
+                               const css::uno::Any& /*Whatever8*/,
+                               const css::uno::Any& /*Whatever9*/,
+                               const css::uno::Any& /*Whatever10*/,
+                               const css::uno::Any& /*Whatever11*/,
+                               const css::uno::Any& /*Whatever12*/,
+                               const css::uno::Any& /*Whatever13*/,
+                               const css::uno::Any& /*Whatever14*/,
+                               const css::uno::Any& /*Whatever15*/,
+                               const css::uno::Any& /*Whatever16*/,
+                               const css::uno::Any& /*Whatever17*/,
+                               const css::uno::Any& /*Whatever18*/,
+                               const css::uno::Any& /*Whatever19*/,
+                               const css::uno::Any& /*Whatever20*/)
+{
+    // ???
+}
+
 OUString SAL_CALL
 SwWordBasic::WindowName()
 {