[Libreoffice-commits] core.git: dbaccess/source

[Noel Grandin (via logerrit)]

 dbaccess/source/core/dataaccess/databasedocument.cxx |    9 +++++++++
 dbaccess/source/core/dataaccess/databasedocument.hxx |    7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 31315fea28ad327f36c0e593156bf808c7af3467
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Oct 29 11:35:14 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Oct 29 13:41:39 2021 +0200

    tdf#143392 fix title on Base window
    
    regression from
        commit 857caa5fc69b92e781457a1b67a89aa051c2d70f
        tdf#79049 speed up OOXML workbook load
    
    Change-Id: Ia2d55386a7508dc2bbb2fa8501b45c3f30ad6a75
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124423
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 45867c0e3bac..fa8e755b799b 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -796,6 +796,15 @@ Sequence< PropertyValue > SAL_CALL 
ODatabaseDocument::getArgs(  )
     return m_pImpl->getMediaDescriptor().getPropertyValues();
 }
 
+Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getArgs2( const 
::css::uno::Sequence< ::rtl::OUString >& requestedArgs )
+{
+    DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
+    std::vector<PropertyValue> aRet;
+    for (const auto & rArgName : requestedArgs)
+        aRet.push_back(PropertyValue(rArgName, 0, 
m_pImpl->getMediaDescriptor().get(rArgName), PropertyState_DIRECT_VALUE));
+    return comphelper::containerToSequence(aRet);
+}
+
 void SAL_CALL ODatabaseDocument::setArgs(const Sequence<beans::PropertyValue>& 
/* aArgs */)
 {
     throw NoSupportException();
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx 
b/dbaccess/source/core/dataaccess/databasedocument.hxx
index b1bfbedc61b2..b20a2f3ed1d8 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -28,7 +28,7 @@
 
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/frame/DoubleInitializationException.hpp>
-#include <com/sun/star/frame/XModel2.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
@@ -130,7 +130,7 @@ private:
 };
 
 // ODatabaseDocument
-typedef cppu::PartialWeakComponentImplHelper<   css::frame::XModel2
+typedef cppu::PartialWeakComponentImplHelper<   css::frame::XModel3
                                                 ,   css::util::XModifiable
                                                 ,   css::frame::XStorable
                                                 ,   
css::document::XEventBroadcaster
@@ -330,6 +330,9 @@ public:
     virtual css::uno::Reference< css::frame::XController2 > SAL_CALL 
createViewController( const OUString& ViewName, const css::uno::Sequence< 
css::beans::PropertyValue >& Arguments, const css::uno::Reference< 
css::frame::XFrame >& Frame ) override ;
     virtual void SAL_CALL setArgs(const 
css::uno::Sequence<css::beans::PropertyValue>& aArgs) override;
 
+    // XModel3
+    virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL 
getArgs2( const ::css::uno::Sequence< ::rtl::OUString >& requestedArgs ) 
override;
+
     // XStorable
     virtual sal_Bool SAL_CALL hasLocation(  ) override ;
     virtual OUString SAL_CALL getLocation(  ) override ;