oovbaapi/ooo/vba/word/XDocument.idl | 1 +
sw/source/ui/vba/vbadocument.cxx | 6 ++++++
sw/source/ui/vba/vbadocument.hxx | 1 +
3 files changed, 8 insertions(+)
New commits:
commit 9653c7d1440cefec4ef6851b136bcaeaa7104fe8
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Oct 23 12:12:25 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Dec 5 15:32:16 2019 +0100
Add ooo.vba.word.XDocument.Close() method and implement
Will be needed in COLEAT. And seems like a fairly obviously missing
API otherwise, too.
Change-Id: I990c605a7e3f9cff3b72f20a626477d010da9852
Reviewed-on: https://gerrit.libreoffice.org/81369
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit b0b0788ba040be2bf42aa19313759ba9f4811d38)
Reviewed-on: https://gerrit.libreoffice.org/83660
(cherry picked from commit 1562900446a99623a30fa9e719322a8c24132f9d)
(cherry picked from commit 939331c0935d671984079051fda03feb3dcf23d9)
Reviewed-on: https://gerrit.libreoffice.org/84527
Tested-by: Jenkins
diff --git a/oovbaapi/ooo/vba/word/XDocument.idl
b/oovbaapi/ooo/vba/word/XDocument.idl
index 63e4535e9075..80cbfe977d78 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -63,6 +63,7 @@ interface XDocument
any Frames( [in] any index );
void SaveAs2000( [in] any FileName, [in] any FileFormat, [in] any
LockComments, [in] any Password, [in] any AddToRecentFiles, [in] any
WritePassword, [in] any ReadOnlyRecommended, [in] any EmbedTrueTypeFonts, [in]
any SaveNativePictureFormat, [in] any SaveFormsData, [in] any SaveAsAOCELetter
);
void SaveAs( [in] any FileName, [in] any FileFormat, [in] any
LockComments, [in] any Password, [in] any AddToRecentFiles, [in] any
WritePassword, [in] any ReadOnlyRecommended, [in] any EmbedTrueTypeFonts, [in]
any SaveNativePictureFormat, [in] any SaveFormsData, [in] any SaveAsAOCELetter,
[in] any Encoding, [in] any InsertLineBreaks, [in] any AllowSubstitutions, [in]
any LineEnding, [in] any AddBiDiMarks );
+ void Close( [in] any SaveChanges, [in] any OriginalFormat, [in] any
RouteDocument );
// This is a COLEAT-specific addition
void SavePreviewPngAs( [in] any FileName );
};
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 894bac0aa996..156680d3bb0d 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -521,6 +521,12 @@ SwVbaDocument::SaveAs( const uno::Any& FileName, const
uno::Any& FileFormat, con
}
void SAL_CALL
+SwVbaDocument::Close( const uno::Any& SaveChanges, const uno::Any&
/*OriginalFormat*/, const uno::Any& /*RouteDocument*/ )
+{
+ VbaDocumentBase::Close( SaveChanges, uno::Any(), uno::Any() );
+}
+
+void SAL_CALL
SwVbaDocument::SavePreviewPngAs( const uno::Any& FileName )
{
OUString sFileName;
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index e8f7a311ae3f..a5e4dabf8452 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -89,6 +89,7 @@ public:
virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex )
override;
virtual void SAL_CALL SaveAs2000( const css::uno::Any& FileName, const
css::uno::Any& FileFormat, const css::uno::Any& LockComments, const
css::uno::Any& Password, const css::uno::Any& AddToRecentFiles, const
css::uno::Any& WritePassword, const css::uno::Any& ReadOnlyRecommended, const
css::uno::Any& EmbedTrueTypeFonts, const css::uno::Any&
SaveNativePictureFormat, const css::uno::Any& SaveFormsData, const
css::uno::Any& SaveAsAOCELetter ) override;
virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const
css::uno::Any& FileFormat, const css::uno::Any& LockComments, const
css::uno::Any& Password, const css::uno::Any& AddToRecentFiles, const
css::uno::Any& WritePassword, const css::uno::Any& ReadOnlyRecommended, const
css::uno::Any& EmbedTrueTypeFonts, const css::uno::Any&
SaveNativePictureFormat, const css::uno::Any& SaveFormsData, const
css::uno::Any& SaveAsAOCELetter, const css::uno::Any& Encoding, const
css::uno::Any& InsertLineBreaks, const css::uno::Any& AllowSubstitutions, const
css::uno::Any& LineEnding, const css::uno::Any& AddBiDiMarks ) override;
+ virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const
css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) override;
virtual void SAL_CALL SavePreviewPngAs( const css::uno::Any& FileName )
override;
// XInvocation
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
