[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - oovbaapi/ooo sw/source

[Tor Lillqvist (via logerrit)]

 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 +
 6 files changed, 23 insertions(+)

New commits:
commit acffb4d775db9d50ed7f1c980802b78c374543f0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 18 14:14:37 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 22:39:52 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
    (cherry picked from commit 5a615ebe4d4c076d9daff9610038a20397c45792)
    Reviewed-on: https://gerrit.libreoffice.org/79145
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

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 8eacf19b6ae2..a691d61709ff 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -319,6 +319,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 96b4be10100f..b32a372749cd 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -89,6 +89,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 968c0b7904df..b8385540b177 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -141,6 +141,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;
 };