[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - extensions/source sw/source

[Libreoffice Gerrit user]

 extensions/source/ole/unoobjw.cxx   |    4 ++++
 sw/source/ui/vba/vbaapplication.cxx |    3 ++-
 sw/source/ui/vba/vbaapplication.hxx |    1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit bd70fbe1d93c72dda2e8518975cf0b94e606199e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jan 21 17:33:01 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jan 21 17:33:01 2019 +0200

    Implement WordBasic.FileSave()
    
    Change-Id: Iafb5be16ebb23aa09e0300a77c2f2dbe29b85cad

diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 2fd7d4943136..073d22eedf07 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -535,7 +535,8 @@ SwWordBasic::FileOpen( const OUString& Name, const uno::Any& ConfirmConversions,
 void SAL_CALL
 SwWordBasic::FileSave()
 {
-    // FIXME save it
+    uno::Reference< frame::XModel > xModel( mpApp->getCurrentDocument(), uno::UNO_SET_THROW );
+    dispatchRequests(xModel,".uno:Save");
 }
 
 void SAL_CALL
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index 295b2b9933b1..f8e454036247 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -112,7 +112,6 @@ public:
     // XSinkCaller
     virtual void SAL_CALL CallSinks( const OUString& Method, css::uno::Sequence< css::uno::Any >& Arguments ) override;
 
-protected:
     virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override;
 };
 #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAPPLICATION_HXX
commit b8b8f358da1b81f85c056ea32dd9372e641b345e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jan 21 17:21:29 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jan 21 17:21:29 2019 +0200

    SAL_INFO also for parameter names that are not found
    
    Change-Id: I1b3fd47a23002673cb81811ebfd0034ca546d837

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 213f2521b56f..798418f482d7 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1189,15 +1189,19 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
                         auto aParamInfos = xIdlMethod->getParameterInfos();
                         for (unsigned int i = 1; i < cNames; ++i)
                         {
+                            bool bFound = false;
                             for (int j = 0; j < aParamInfos.getLength(); ++j)
                             {
                                 if (aParamInfos[j].aName.equalsIgnoreAsciiCase(OUString(o3tl::toU(rgszNames[i]))))
                                 {
                                     rgdispid[i] = j;
+                                    bFound = true;
                                     SAL_INFO("extensions.olebridge", "  " << OUString(o3tl::toU(rgszNames[i])) << ": " << rgdispid[i]);
                                     break;
                                 }
                             }
+                            if (!bFound)
+                                SAL_INFO("extensions.olebridge", "  " << OUString(o3tl::toU(rgszNames[i])) << ": NOT FOUND");
                         }
                     }
                 }