[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - oovbaapi/ooo sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 18 16:40:36 UTC 2019
oovbaapi/ooo/vba/word/XWordBasic.idl | 2 +
sw/source/ui/vba/vbaapplication.cxx | 52 +++++++++++++++++++++++++++++++++++
sw/source/ui/vba/vbadocuments.cxx | 1
3 files changed, 55 insertions(+)
New commits:
commit 78579b56ccb51ca0f011614f0549b2c9f9452eb7
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 18:39:31 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Jan 18 18:39:55 2019 +0200
Add a (dummy) WordBasic.FileSave()
Change-Id: I021d63c9d57f1e0435bcc5f97abc57bc39fece01
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 29ff8e394038..2fd7d4943136 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -75,6 +75,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,
@@ -532,6 +533,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 bac428070379c1da45851760a92971a6eaece408
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 18:38:59 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Jan 18 18:38:59 2019 +0200
Add TODO FIXME
Change-Id: I1492c604ac39ce72fe2cfe8804ac15e8c41b9a46
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index aef486ba4718..b32b80beeac5 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -110,6 +110,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*/ )
{
commit ac43be5afca3691f85f455035628df009f2d9694
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 16:59:51 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Jan 18 17:09:16 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
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 b423cf3b63b1..29ff8e394038 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -75,6 +75,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,
@@ -511,6 +531,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()
{
More information about the Libreoffice-commits
mailing list