[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 |    1 +
 sw/source/ui/vba/vbaapplication.cxx  |    7 +++++++
 sw/source/ui/vba/vbadocuments.cxx    |    1 +
 3 files changed, 9 insertions(+)

New commits:
commit 489e1ff053584f2d6eb9a62a23bbbeead8879c46
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 18:39:31 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 22:42:38 2019 +0200

    Add a (dummy) WordBasic.FileSave()
    
    Change-Id: I021d63c9d57f1e0435bcc5f97abc57bc39fece01
    (cherry picked from commit 78579b56ccb51ca0f011614f0549b2c9f9452eb7)
    Reviewed-on: https://gerrit.libreoffice.org/79150
    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 3d9454b812b7..320787361ca9 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 FileSave();
     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 );
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 3ce0d8cedae5..af7db0f26f79 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -76,6 +76,7 @@ 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 FileSave() override;
     virtual void SAL_CALL ToolsOptionsView( const css::uno::Any& Whatever1,
                                             const css::uno::Any& Whatever2,
                                             const css::uno::Any& Whatever3,
@@ -533,6 +534,12 @@ SwWordBasic::FileOpen( const OUString& Name, const uno::Any& ConfirmConversions,
 }
 
 void SAL_CALL
+SwWordBasic::FileSave()
+{
+    // FIXME save it
+}
+
+void SAL_CALL
 SwWordBasic::ToolsOptionsView( const css::uno::Any& /*Whatever1*/,
                                const css::uno::Any& /*Whatever2*/,
                                const css::uno::Any& /*Whatever3*/,
commit 11d04ec33d8d6474bcb1c0f77195b8354d9e4ec8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 18:38:59 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 22:42:07 2019 +0200

    Add TODO FIXME
    
    Change-Id: I1492c604ac39ce72fe2cfe8804ac15e8c41b9a46
    (cherry picked from commit bac428070379c1da45851760a92971a6eaece408)
    Reviewed-on: https://gerrit.libreoffice.org/79149
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index b8385540b177..c2566cbc7a35 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -106,6 +106,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/,
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
+// #TODO# #FIXME# surely we should actually close the document here
 void SAL_CALL
 SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ )
 {