[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - oovbaapi/ooo sw/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 20 07:59:44 UTC 2019
oovbaapi/ooo/vba/word/XWordBasic.idl | 2
sw/source/ui/vba/vbaapplication.cxx | 108 +++++++++++++++++++++--------------
2 files changed, 67 insertions(+), 43 deletions(-)
New commits:
commit 1beb93822b8f34afc481fd3ea6e99795b6fa6dbd
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jan 22 13:59:18 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 09:58:41 2019 +0200
Found documentation for WordBasic.ToolsOptionsView()
Change-Id: Ic049f78fddcaabafbe6be18b92a87b56352c1a4c
(cherry picked from commit ac97be7a81370289b2e82705952eea80ba00fc68)
Reviewed-on: https://gerrit.libreoffice.org/79154
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 24f4853024c9..d704b92b122c 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -18,14 +18,7 @@ interface XWordBasic
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();
- // There is no documentation for ToolsOptionsView, but all examples seem to pass it only named
- // parameters, so the order of parameters in the definition doesn't matter, I hope. Define some
- // (named) parameters found in sample code on the net. And ones found in customer code as
- // necessary later.
- //
- // If it turns out that ToolsOptionsView is actually called with both named and positional parameters in customer code
- // we might be in trouble.
- void ToolsOptionsView( [in] any FieldCodes, [in] any ShowAll, [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 );
+ void ToolsOptionsView( [in] any DraftFont, [in] any WrapToWindow, [in] any PicturePlaceHolders, [in] any FieldCodes, [in] any BookMarks, [in] any FieldShading, [in] any StatusBar, [in] any HScroll, [in] any VScroll, [in] any StyleAreaWidth, [in] any Tabs, [in] any Spaces, [in] any Paras, [in] any Hyphens, [in] any Hidden, [in] any ShowAll, [in] any Drawings, [in] any Anchors, [in] any TextBoundaries, [in] any VRuler, [in] any Highlight );
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 914cc925bf7d..d3689de69efb 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -77,26 +77,27 @@ public:
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& FieldCodes,
+ virtual void SAL_CALL ToolsOptionsView( const css::uno::Any& DraftFont,
+ const css::uno::Any& WrapToWindow,
+ const css::uno::Any& PicturePlaceHolders,
+ const css::uno::Any& FieldCodes,
+ const css::uno::Any& BookMarks,
+ const css::uno::Any& FieldShading,
+ const css::uno::Any& StatusBar,
+ const css::uno::Any& HScroll,
+ const css::uno::Any& VScroll,
+ const css::uno::Any& StyleAreaWidth,
+ const css::uno::Any& Tabs,
+ const css::uno::Any& Spaces,
+ const css::uno::Any& Paras,
+ const css::uno::Any& Hyphens,
+ const css::uno::Any& Hidden,
const css::uno::Any& ShowAll,
- 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;
+ const css::uno::Any& Drawings,
+ const css::uno::Any& Anchors,
+ const css::uno::Any& TextBoundaries,
+ const css::uno::Any& VRuler,
+ const css::uno::Any& Highlight ) 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,
@@ -541,28 +542,51 @@ SwWordBasic::FileSave()
}
void SAL_CALL
-SwWordBasic::ToolsOptionsView( const css::uno::Any& /*FieldCodes*/,
- const css::uno::Any& /*ShowAll*/,
- 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*/)
-{
- // ???
+SwWordBasic::ToolsOptionsView( const css::uno::Any& DraftFont,
+ const css::uno::Any& WrapToWindow,
+ const css::uno::Any& PicturePlaceHolders,
+ const css::uno::Any& FieldCodes,
+ const css::uno::Any& BookMarks,
+ const css::uno::Any& FieldShading,
+ const css::uno::Any& StatusBar,
+ const css::uno::Any& HScroll,
+ const css::uno::Any& VScroll,
+ const css::uno::Any& StyleAreaWidth,
+ const css::uno::Any& Tabs,
+ const css::uno::Any& Spaces,
+ const css::uno::Any& Paras,
+ const css::uno::Any& Hyphens,
+ const css::uno::Any& Hidden,
+ const css::uno::Any& ShowAll,
+ const css::uno::Any& Drawings,
+ const css::uno::Any& Anchors,
+ const css::uno::Any& TextBoundaries,
+ const css::uno::Any& VRuler,
+ const css::uno::Any& Highlight )
+{
+ SAL_INFO("sw.vba", "WordBasic.ToolsOptionsView("
+ << "DraftFont:=" << DraftFont
+ << ", WrapToWindow:=" << WrapToWindow
+ << ", PicturePlaceHolders:=" << PicturePlaceHolders
+ << ", FieldCodes:=" << FieldCodes
+ << ", BookMarks:=" << BookMarks
+ << ", FieldShading:=" << FieldShading
+ << ", StatusBar:=" << StatusBar
+ << ", HScroll:=" << HScroll
+ << ", VScroll:=" << VScroll
+ << ", StyleAreaWidth:=" << StyleAreaWidth
+ << ", Tabs:=" << Tabs
+ << ", Spaces:=" << Spaces
+ << ", Paras:=" << Paras
+ << ", Hyphens:=" << Hyphens
+ << ", Hidden:=" << Hidden
+ << ", ShowAll:=" << ShowAll
+ << ", Drawings:=" << Drawings
+ << ", Anchors:=" << Anchors
+ << ", TextBoundaries:=" << TextBoundaries
+ << ", VRuler:=" << VRuler
+ << ", Highlight:=" << Highlight
+ << ")");
}
OUString SAL_CALL
commit b21b0dbfe192a262772f9060166e3873fa234910
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jan 21 18:08:12 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 09:58:13 2019 +0200
Add a couple know parameters to WordBasic.ToolsOptionsView
Change-Id: Ifd472f4ca79ab97a1d6d5c5007537375121f6f58
(cherry picked from commit f3b2383b2c8967ad57c8b9316395edcb297121ed)
Reviewed-on: https://gerrit.libreoffice.org/79153
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 320787361ca9..24f4853024c9 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -18,7 +18,14 @@ interface XWordBasic
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 );
+ // There is no documentation for ToolsOptionsView, but all examples seem to pass it only named
+ // parameters, so the order of parameters in the definition doesn't matter, I hope. Define some
+ // (named) parameters found in sample code on the net. And ones found in customer code as
+ // necessary later.
+ //
+ // If it turns out that ToolsOptionsView is actually called with both named and positional parameters in customer code
+ // we might be in trouble.
+ void ToolsOptionsView( [in] any FieldCodes, [in] any ShowAll, [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 97b9a59c5b6a..914cc925bf7d 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -77,8 +77,8 @@ public:
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,
+ virtual void SAL_CALL ToolsOptionsView( const css::uno::Any& FieldCodes,
+ const css::uno::Any& ShowAll,
const css::uno::Any& Whatever3,
const css::uno::Any& Whatever4,
const css::uno::Any& Whatever5,
@@ -541,8 +541,8 @@ SwWordBasic::FileSave()
}
void SAL_CALL
-SwWordBasic::ToolsOptionsView( const css::uno::Any& /*Whatever1*/,
- const css::uno::Any& /*Whatever2*/,
+SwWordBasic::ToolsOptionsView( const css::uno::Any& /*FieldCodes*/,
+ const css::uno::Any& /*ShowAll*/,
const css::uno::Any& /*Whatever3*/,
const css::uno::Any& /*Whatever4*/,
const css::uno::Any& /*Whatever5*/,
More information about the Libreoffice-commits
mailing list