[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - oovbaapi/ooo sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 18 12:22:04 UTC 2019
oovbaapi/ooo/vba/word/XApplication.idl | 1 +
oovbaapi/ooo/vba/word/XDocuments.idl | 2 ++
sw/source/ui/vba/vbaapplication.cxx | 11 +++++++++++
sw/source/ui/vba/vbaapplication.hxx | 2 ++
sw/source/ui/vba/vbadocuments.cxx | 6 ++++++
sw/source/ui/vba/vbadocuments.hxx | 1 +
sw/source/ui/vba/vbawindow.cxx | 2 +-
7 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 0043408b027be8664dbf88093da538ba8bbbbe24
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 14:17:50 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Jan 18 14:21:17 2019 +0200
Don't throw an exception, just ignore trying to set an unhandled WindowState
End-user VB6 applications might not like the exception. Better to just
ignore.
Change-Id: I42718de7855079e38c7983db39180c184ab7224f
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index 8a640f346b14..2ab68ec81c9f 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -109,7 +109,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate )
else if (nwindowState == word::WdWindowState::wdWindowStateNormal)
pWork -> Restore();
else
- throw uno::RuntimeException("Invalid Parameter" );
+ SAL_WARN("sw.vba", "Unhandled window state " << nwindowState);
}
}
commit 5a615ebe4d4c076d9daff9610038a20397c45792
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 14:14:37 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Jan 18 14:21:17 2019 +0200
Add Documents.OpenOld() method and Application.CustomizationContext property
OpenOld() just forwards to the regular Open(), passing empty extra
parameters. CustomizationContext is fully dummy for now.
Change-Id: I167494700853768d971fe16afea35e90a647a00e
diff --git a/oovbaapi/ooo/vba/word/XApplication.idl b/oovbaapi/ooo/vba/word/XApplication.idl
index d061586b8de1..76d8a326c806 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -50,6 +50,7 @@ interface XApplication : XConnectable
// Actually write-only but there is no way to say that in UNO IDL.
// The getter just returns an empty string.
[attribute] string StatusBar;
+ [attribute] any CustomizationContext;
any CommandBars( [in] any Index );
any Documents( [in] any Index );
diff --git a/oovbaapi/ooo/vba/word/XDocuments.idl b/oovbaapi/ooo/vba/word/XDocuments.idl
index a9b6cdac8056..79517c53576f 100644
--- a/oovbaapi/ooo/vba/word/XDocuments.idl
+++ b/oovbaapi/ooo/vba/word/XDocuments.idl
@@ -32,6 +32,8 @@ interface XDocuments : com::sun::star::uno::XInterface
any OpenNoRepairDialog([in] string Filename, [in] any ConfirmConversions, [in] any ReadOnly, [in] any AddToRecentFiles, [in] any PasswordDocument, [in] any PasswordTemplate, [in] any Revert, [in] any WritePasswordDocument, [in] any WritePasswordTemplate, [in] any Format, [in] any Encoding, [in] any Visible, [in] any OpenAndRepair, [in] any DocumentDirection, [in] any NoEncodingDialog, [in] any XMLTransform);
+ any OpenOld([in] string FileName, [in] any ConfirmConversions, [in] any ReadOnly, [in] any AddToRecentFiles, [in] any PasswordDocument, [in] any PasswordTemplate, [in] any Revert, [in] any WritePasswordDocument, [in] any WritePasswordTemplate, [in] any Format);
+
void Close([in] any SaveChanges,[in] any OriginalFormat,[in] any RouteDocument);
};
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index e4f0363ede4b..ff1952e42a4c 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -318,6 +318,17 @@ OUString SAL_CALL SwVbaApplication::getStatusBar()
return OUString("");
}
+uno::Any SAL_CALL SwVbaApplication::getCustomizationContext()
+{
+ return uno::Any(); // ???
+}
+
+void SAL_CALL SwVbaApplication::setCustomizationContext( const uno::Any& _customizationcontext )
+{
+ (void) _customizationcontext;
+ // ???
+}
+
void SAL_CALL SwVbaApplication::setStatusBar( const OUString& _statusbar )
{
// ScVbaAppSettings::setStatusBar() also uses the XStatusIndicator to show this, so maybe that is OK?
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index d1a19abb2e28..295b2b9933b1 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -90,6 +90,8 @@ public:
virtual void SAL_CALL setTop( sal_Int32 _top ) override;
virtual OUString SAL_CALL getStatusBar() override;
virtual void SAL_CALL setStatusBar( const OUString& _statusbar ) override;
+ virtual css::uno::Any SAL_CALL getCustomizationContext() override;
+ virtual void SAL_CALL setCustomizationContext( const css::uno::Any& _customizationcontext ) override;
virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override;
virtual void SAL_CALL ShowMe() override;
virtual void SAL_CALL Resize( sal_Int32 Width, sal_Int32 Height ) override;
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index fd54e5f5e4d1..aef486ba4718 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -145,6 +145,12 @@ SwVbaDocuments::OpenNoRepairDialog( const OUString& Filename, const uno::Any& Co
return Open( Filename, ConfirmConversions, ReadOnly, AddToRecentFiles, PasswordDocument, PasswordTemplate, Revert, WritePasswordDocument, WritePasswordTemplate, Format, Encoding, Visible, OpenAndRepair, DocumentDirection, NoEncodingDialog, XMLTransform );
}
+uno::Any SAL_CALL
+SwVbaDocuments::OpenOld( const OUString& FileName, const uno::Any& ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& WritePasswordTemplate, const uno::Any& Format )
+{
+ return Open( FileName, ConfirmConversions, ReadOnly, AddToRecentFiles, PasswordDocument, PasswordTemplate, Revert, WritePasswordDocument, WritePasswordTemplate, Format, uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any() );
+}
+
OUString
SwVbaDocuments::getServiceImplName()
{
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index 45dcfab61b88..d72b1a168486 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -46,6 +46,7 @@ public:
virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) override;
virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) override;
virtual css::uno::Any SAL_CALL OpenNoRepairDialog( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) override;
+ virtual css::uno::Any SAL_CALL OpenOld( const OUString& FileName, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format ) override;
virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) override;
};
More information about the Libreoffice-commits
mailing list