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

[Caolán McNamara (via logerrit)]

 dbaccess/source/core/dataaccess/intercept.cxx |   11 +++++------
 embeddedobj/source/general/intercept.cxx      |   10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit c4aa4b55e21915ca072daa7db93edabc043f26ab
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Dec 18 10:41:58 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Dec 18 17:42:04 2021 +0100

    cid#1495784 Missing move assignment operator
    
    Change-Id: I44004ad1628fed0c71392a000cd0633107732651
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127027
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/dbaccess/source/core/dataaccess/intercept.cxx 
b/dbaccess/source/core/dataaccess/intercept.cxx
index 6ca2bf4c70b5..bef079d47080 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -303,14 +303,13 @@ Reference< XDispatch > SAL_CALL 
OInterceptor::queryDispatch( const URL& URL,cons
 
 Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches(  
const Sequence<DispatchDescriptor >& Requests )
 {
-    Sequence< Reference< XDispatch > > aRet;
     osl::MutexGuard aGuard(m_aMutex);
-    if(m_xSlaveDispatchProvider.is())
-        aRet = m_xSlaveDispatchProvider->queryDispatches(Requests);
-    else
-        aRet.realloc(Requests.getLength());
-    auto aRetRange = asNonConstRange(aRet);
+    typedef Sequence<Reference<XDispatch>> DispatchSeq;
+    DispatchSeq aRet = m_xSlaveDispatchProvider.is() ?
+        m_xSlaveDispatchProvider->queryDispatches(Requests) :
+        DispatchSeq(Requests.getLength());
 
+    auto aRetRange = asNonConstRange(aRet);
     for(sal_Int32 i = 0; i < Requests.getLength(); ++i)
     {
         const OUString* pIter = m_aInterceptedURL.getConstArray();
diff --git a/embeddedobj/source/general/intercept.cxx 
b/embeddedobj/source/general/intercept.cxx
index 3c4990031376..58a7ed49bcc0 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -250,12 +250,12 @@ uno::Sequence< uno::Reference< frame::XDispatch > > 
SAL_CALL
 Interceptor::queryDispatches(
     const uno::Sequence<frame::DispatchDescriptor >& Requests )
 {
-    uno::Sequence< uno::Reference< frame::XDispatch > > aRet;
     osl::MutexGuard aGuard(m_aMutex);
-    if(m_xSlaveDispatchProvider.is())
-        aRet = m_xSlaveDispatchProvider->queryDispatches(Requests);
-    else
-        aRet.realloc(Requests.getLength());
+    typedef uno::Sequence<uno::Reference<frame::XDispatch>> DispatchSeq;
+    DispatchSeq aRet = m_xSlaveDispatchProvider.is()
+        ? m_xSlaveDispatchProvider->queryDispatches(Requests)
+        : DispatchSeq(Requests.getLength());
+
     auto aRetRange = asNonConstRange(aRet);
     for(sal_Int32 i = 0; i < Requests.getLength(); ++i)
         if(m_aInterceptedURL[0] == Requests[i].FeatureURL.Complete)