[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/fd_inputstream.hxx |8 +++-
ucbhelper/source/provider/fd_inputstream.cxx | 10 +-
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit b4a5e6f025973b5a4ba8210168569fc1a5a34254
Author: Noel Grandin
AuthorDate: Mon Feb 20 15:49:41 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 17:45:49 2023 +
osl::Mutex->std::mutex in ucbhelper::FdInputStream
Change-Id: I10482c3a5f9848f45463837d5d8982476b3910a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147340
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/fd_inputstream.hxx
b/include/ucbhelper/fd_inputstream.hxx
index ebef7dae7869..5035ecd906dd 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -24,9 +24,8 @@
#include
#include
#include
-#include
-
#include
+#include
namespace ucbhelper
{
@@ -37,9 +36,7 @@ namespace ucbhelper
/** Implements a seekable InputStream
* working on a buffer.
*/
-class UCBHELPER_DLLPUBLIC FdInputStream final
-: protected cppu::BaseMutex,
- public FdInputStream_Base
+class UCBHELPER_DLLPUBLIC FdInputStream final : public FdInputStream_Base
{
public:
@@ -83,6 +80,7 @@ namespace ucbhelper
getLength() override;
private:
+std::mutex m_aMutex;
oslFileHandle m_tmpfl;
sal_uInt64 m_nLength;
};
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx
b/ucbhelper/source/provider/fd_inputstream.cxx
index 795c2dcaea7c..05f3357b7157 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -57,7 +57,7 @@ namespace ucbhelper
sal_Int32 SAL_CALL FdInputStream::readBytes(Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead)
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
sal_uInt64 nBeforePos( 0 );
sal_uInt64 nBytesRequested( nBytesToRead );
@@ -87,7 +87,7 @@ namespace ucbhelper
void SAL_CALL FdInputStream::skipBytes(sal_Int32 nBytesToSkip)
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(!m_tmpfl)
throw IOException();
@@ -104,7 +104,7 @@ namespace ucbhelper
void SAL_CALL FdInputStream::closeInput()
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(m_tmpfl)
{
osl_closeFile(m_tmpfl);
@@ -115,7 +115,7 @@ namespace ucbhelper
void SAL_CALL FdInputStream::seek(sal_Int64 location)
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(!m_tmpfl)
throw IOException();
@@ -127,7 +127,7 @@ namespace ucbhelper
sal_Int64 SAL_CALL
FdInputStream::getPosition()
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(!m_tmpfl)
throw IOException();
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/contenthelper.hxx |6 +++---
include/ucbhelper/providerhelper.hxx |2 +-
include/ucbhelper/resultsethelper.hxx|6 +++---
ucbhelper/source/provider/contenthelper.cxx | 15 ---
ucbhelper/source/provider/contentinfo.cxx|9 +
ucbhelper/source/provider/contentinfo.hxx|4 ++--
ucbhelper/source/provider/interactionrequest.cxx |5 +++--
ucbhelper/source/provider/providerhelper.cxx |5 +++--
ucbhelper/source/provider/resultset.cxx | 19 ++-
ucbhelper/source/provider/resultsethelper.cxx|9 +
10 files changed, 43 insertions(+), 37 deletions(-)
New commits:
commit eea6b27762cdd5f831f4a83b8c5d2979652aab03
Author: Noel Grandin
AuthorDate: Mon Jun 27 10:11:20 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Jun 27 13:40:26 2022 +0200
clang-tidy modernize-pass-by-value in ucbhelper
Change-Id: I9f73760a800bee5a810add9ee0ebed3a778ddd8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136475
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/contenthelper.hxx
b/include/ucbhelper/contenthelper.hxx
index 3f269e475d4a..b5906402cc52 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -293,9 +293,9 @@ public:
* @param Identifier is the content identifier for the content.
*/
ContentImplHelper(
-const css::uno::Reference< css::uno::XComponentContext >&
rxContext,
-const rtl::Reference< ContentProviderImplHelper >& rxProvider,
-const css::uno::Reference< css::ucb::XContentIdentifier >&
Identifier );
+css::uno::Reference< css::uno::XComponentContext > xContext,
+rtl::Reference< ContentProviderImplHelper > xProvider,
+css::uno::Reference< css::ucb::XContentIdentifier > Identifier );
/**
* Destructor.
diff --git a/include/ucbhelper/providerhelper.hxx
b/include/ucbhelper/providerhelper.hxx
index 550da6c0ec13..36daec868049 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -130,7 +130,7 @@ public:
ContentProviderImplHelper(
-const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
+css::uno::Reference< css::uno::XComponentContext > xContext );
virtual ~ContentProviderImplHelper() override;
diff --git a/include/ucbhelper/resultsethelper.hxx
b/include/ucbhelper/resultsethelper.hxx
index 486d07fe5f89..31f96790581a 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -118,9 +118,9 @@ public:
*this resultset.
*/
ResultSetImplHelper(
-const css::uno::Reference<
-css::uno::XComponentContext >& rxContext,
-const css::ucb::OpenCommandArgument2& rCommand );
+css::uno::Reference<
+css::uno::XComponentContext > xContext,
+css::ucb::OpenCommandArgument2 aCommand );
/**
* Destructor.
diff --git a/ucbhelper/source/provider/contenthelper.cxx
b/ucbhelper/source/provider/contenthelper.cxx
index 75d0a8479860..3a8b8f19a604 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -43,6 +43,7 @@
#include
#include
+#include
using namespace com::sun::star;
@@ -124,14 +125,14 @@ using namespace ucbhelper_impl;
namespace ucbhelper {
ContentImplHelper::ContentImplHelper(
-const uno::Reference< uno::XComponentContext >& rxContext,
-const rtl::Reference< ContentProviderImplHelper >& rxProvider,
-const uno::Reference<
-css::ucb::XContentIdentifier >& Identifier )
+uno::Reference< uno::XComponentContext > xContext,
+rtl::Reference< ContentProviderImplHelper > xProvider,
+uno::Reference<
+css::ucb::XContentIdentifier > Identifier )
: m_pImpl( new ContentImplHelper_Impl ),
- m_xContext( rxContext ),
- m_xIdentifier( Identifier ),
- m_xProvider( rxProvider ),
+ m_xContext(std::move( xContext )),
+ m_xIdentifier(std::move( Identifier )),
+ m_xProvider(std::move( xProvider )),
m_nCommandId( 0 )
{
}
diff --git a/ucbhelper/source/provider/contentinfo.cxx
b/ucbhelper/source/provider/contentinfo.cxx
index b5ca80b79d0b..561a80e77e1c 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -28,6 +28,7 @@
#include
#include
+#include
#include "contentinfo.hxx"
using namespace com::sun::star;
@@ -39,9 +40,9 @@ using namespace com::sun::star;
namespace ucbhelper {
PropertySetInfo::PropertySetInfo(
-const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
+uno::Reference< css::ucb::XCommandEnvironment > xEnv,
ContentImplHelper* pContent )
-: m_xEnv( rxEnv ),
+: m_xEnv(std
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/propertyvalueset.hxx |4 ++--
ucbhelper/source/provider/propertyvalueset.cxx | 10 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit a22772c4393f4b0a3d1a838f074c4d51be762388
Author: Noel Grandin
AuthorDate: Fri Dec 17 18:10:08 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 18 18:18:56 2021 +0100
osl::Mutex->std::mutex in ucbhelper::PropertyValueSet
Change-Id: Ie4d3392e26a24ff3ffd9869809bb48bee7fcc2bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127067
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/propertyvalueset.hxx
b/include/ucbhelper/propertyvalueset.hxx
index 680aa0cd8879..ea088e910694 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -25,7 +25,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -61,7 +61,7 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet final :
{
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
-osl::Mutex m_aMutex;
+std::mutex m_aMutex;
std::unique_ptr m_pValues;
boolm_bWasNull;
boolm_bTriedToGetTypeConverter;
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx
b/ucbhelper/source/provider/propertyvalueset.cxx
index 0255a14337a6..1c2345a8c4c0 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -158,7 +158,7 @@ PropertyValueSet::~PropertyValueSet()
template
T PropertyValueSet::getValue(PropsSet nTypeName, sal_Int32 columnIndex)
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
T aValue {}; /* default ctor */
@@ -352,7 +352,7 @@ Any SAL_CALL PropertyValueSet::getObject(
sal_Int32 columnIndex,
const Reference< XNameAccess >& )
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
Any aValue;
@@ -510,7 +510,7 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray(
sal_Int32 columnIndex )
// virtual
sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName )
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( !columnName.isEmpty() )
{
@@ -530,7 +530,7 @@ sal_Int32 SAL_CALL PropertyValueSet::findColumn( const
OUString& columnName )
const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
{
@@ -548,7 +548,7 @@ const Reference< XTypeConverter >&
PropertyValueSet::getTypeConverter()
template
void PropertyValueSet::appendValue(const OUString& rPropName, PropsSet
nTypeName, const T& rValue)
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
ucbhelper_impl::PropertyValue aNewValue;
aNewValue.sPropertyName = rPropName;
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/resultsethelper.hxx |7 ---
ucbhelper/source/provider/resultsethelper.cxx | 18 --
2 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 580b5227144c6d71b1dc2663fc741ed29f119767
Author: Noel Grandin
AuthorDate: Fri Dec 17 18:43:18 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 18 18:18:32 2021 +0100
osl::Mutex->std::mutex in ResultSetImplHelper
Change-Id: I7567369120593579740e23668d3426a25377a105
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127068
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/resultsethelper.hxx
b/include/ucbhelper/resultsethelper.hxx
index 94ab9e1a51de..e929531aa586 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -21,10 +21,11 @@
#define INCLUDED_UCBHELPER_RESULTSETHELPER_HXX
#include
-#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -54,12 +55,12 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
css::lang::XServiceInfo,
css::ucb::XDynamicResultSet>
{
-std::unique_ptr m_pDisposeEventListeners;
+
std::unique_ptr>
m_pDisposeEventListeners;
bool m_bStatic;
bool m_bInitDone;
protected:
-osl::Mutex m_aMutex;
+std::mutex m_aMutex;
css::ucb::OpenCommandArgument2 m_aCommand;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
// Resultset #1
diff --git a/ucbhelper/source/provider/resultsethelper.cxx
b/ucbhelper/source/provider/resultsethelper.cxx
index 5ff9e6c27483..77c901d62ee7 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -88,13 +88,13 @@ css::uno::Sequence< OUString > SAL_CALL
ResultSetImplHelper::getSupportedService
// virtual
void SAL_CALL ResultSetImplHelper::dispose()
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
{
lang::EventObject aEvt;
aEvt.Source = static_cast< lang::XComponent * >( this );
-m_pDisposeEventListeners->disposeAndClear( aEvt );
+m_pDisposeEventListeners->disposeAndClear( aGuard, aEvt );
}
}
@@ -103,10 +103,10 @@ void SAL_CALL ResultSetImplHelper::dispose()
void SAL_CALL ResultSetImplHelper::addEventListener(
const uno::Reference< lang::XEventListener >& Listener )
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( !m_pDisposeEventListeners )
-m_pDisposeEventListeners.reset(new cppu::OInterfaceContainerHelper(
m_aMutex ));
+m_pDisposeEventListeners.reset(new
comphelper::OInterfaceContainerHelper4());
m_pDisposeEventListeners->addInterface( Listener );
}
@@ -116,7 +116,7 @@ void SAL_CALL ResultSetImplHelper::addEventListener(
void SAL_CALL ResultSetImplHelper::removeEventListener(
const uno::Reference< lang::XEventListener >& Listener )
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( m_pDisposeEventListeners )
m_pDisposeEventListeners->removeInterface( Listener );
@@ -130,7 +130,7 @@ void SAL_CALL ResultSetImplHelper::removeEventListener(
uno::Reference< sdbc::XResultSet > SAL_CALL
ResultSetImplHelper::getStaticResultSet()
{
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( m_xListener.is() )
throw css::ucb::ListenerAlreadySetException();
@@ -144,7 +144,7 @@ ResultSetImplHelper::getStaticResultSet()
void SAL_CALL ResultSetImplHelper::setListener(
const uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
{
-osl::ClearableMutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( m_bStatic || m_xListener.is() )
throw css::ucb::ListenerAlreadySetException();
@@ -173,7 +173,7 @@ void SAL_CALL ResultSetImplHelper::setListener(
0, // Count; not used
css::ucb::ListActionType::WELCOME,
aInfo ) };
-aGuard.clear();
+aGuard.unlock();
Listener->notify(
css::ucb::ListEvent(
@@ -229,8 +229,6 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
void ResultSetImplHelper::init( bool bStatic )
{
-osl::MutexGuard aGuard( m_aMutex );
-
if ( m_bInitDone )
return;
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/interceptedinteraction.hxx |2 +-
ucbhelper/source/client/interceptedinteraction.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0ff2a432f776d878fc17af5442f14844a9970bf7
Author: Noel Grandin
AuthorDate: Sun Oct 10 16:54:30 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Oct 10 18:23:20 2021 +0200
loplugin:moveparam in ucbhelper
Change-Id: Id6b03af5ecd662ce2e390bb76819cfe5d2ec05ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123336
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/interceptedinteraction.hxx
b/include/ucbhelper/interceptedinteraction.hxx
index 85699c1d534b..b94f51cf9bb2 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -160,7 +160,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public
InterceptedInteraction
@param lInterceptions
the list of intercepted requests.
*/
-void setInterceptions(const ::std::vector< InterceptedRequest >&
lInterceptions);
+void setInterceptions(::std::vector< InterceptedRequest >&&
lInterceptions);
/** @short extract a requested continuation from the list of
available ones.
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx
b/ucbhelper/source/client/interceptedinteraction.cxx
index 682732958aee..96b3fd32cb41 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -32,9 +32,9 @@ void InterceptedInteraction::setInterceptedHandler(const
css::uno::Reference< cs
m_xInterceptedHandler = xInterceptedHandler;
}
-void InterceptedInteraction::setInterceptions(const ::std::vector<
InterceptedRequest >& lInterceptions)
+void InterceptedInteraction::setInterceptions(::std::vector<
InterceptedRequest >&& lInterceptions)
{
-m_lInterceptions = lInterceptions;
+m_lInterceptions = std::move(lInterceptions);
}
InterceptedInteraction::EInterceptionState InterceptedInteraction::intercepted(
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/resultsetmetadata.hxx |2 +-
ucb/source/ucp/file/filrset.cxx |2 +-
ucbhelper/source/provider/resultsetmetadata.cxx |8
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 6d200d8e739595bd4c6310bede7d66e3c05fbb85
Author: Noel Grandin
AuthorDate: Wed Oct 6 19:45:33 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Oct 6 21:17:18 2021 +0200
loplugin:moveparam in ucbhelper
Change-Id: I1b9cc0366fb8e9b2525a56816ae4f76737a31b73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123184
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/resultsetmetadata.hxx
b/include/ucbhelper/resultsetmetadata.hxx
index 9c42dc1b788b..856c28a0a873 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -105,7 +105,7 @@ public:
ResultSetMetaData(
const css::uno::Reference< css::uno::XComponentContext >&
rxContext,
const css::uno::Sequence< css::beans::Property >& rProps,
-const std::vector< ResultSetColumnData >& rColumnData );
+std::vector< ResultSetColumnData >&& rColumnData );
/**
* Destructor.
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 716c9bbe4b89..74531e226a23 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -603,7 +603,7 @@ XResultSet_impl::getMetaData()
return new ::ucbhelper::ResultSetMetaData(
m_pMyShell->m_xContext,
m_sProperty,
-aColumnData );
+std::move(aColumnData) );
}
return new ::ucbhelper::ResultSetMetaData( m_pMyShell->m_xContext,
m_sProperty );
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx
b/ucbhelper/source/provider/resultsetmetadata.cxx
index fe3d2b7c1e1f..ef4f678b9f5f 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -63,8 +63,8 @@ struct ResultSetMetaData_Impl
: m_aColumnData( nSize ), m_bObtainedTypes( false ) {}
explicit ResultSetMetaData_Impl(
-const std::vector< ::ucbhelper::ResultSetColumnData >& rColumnData )
-: m_aColumnData( rColumnData ), m_bObtainedTypes( false ) {}
+std::vector< ::ucbhelper::ResultSetColumnData >&& rColumnData )
+: m_aColumnData( std::move(rColumnData) ), m_bObtainedTypes( false ) {}
};
}
@@ -90,8 +90,8 @@ ResultSetMetaData::ResultSetMetaData(
ResultSetMetaData::ResultSetMetaData(
const Reference< XComponentContext >& rxContext,
const Sequence< Property >& rProps,
-const std::vector< ResultSetColumnData >& rColumnData )
-: m_pImpl( new ResultSetMetaData_Impl( rColumnData ) ),
+std::vector< ResultSetColumnData >&& rColumnData )
+: m_pImpl( new ResultSetMetaData_Impl( std::move(rColumnData) ) ),
m_xContext( rxContext ),
m_aProps( rProps )
{
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/contentinfo.hxx | 17 ---
ucbhelper/source/provider/contentinfo.cxx | 32 --
2 files changed, 1 insertion(+), 48 deletions(-)
New commits:
commit cf1b5ae4c5f7c9111a745199ac993742f9007263
Author: Noel Grandin
AuthorDate: Mon Oct 7 14:38:57 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Oct 8 14:23:08 2019 +0200
use cppu::WeakImplHelper in CommandProcessorInfo
Change-Id: Ifbb2d50b1d88f0bceed38bddd23858a54b8527dc
Reviewed-on: https://gerrit.libreoffice.org/80403
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/contentinfo.hxx
b/include/ucbhelper/contentinfo.hxx
index f3f455af98ff..405b1057b3a3 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -86,9 +86,7 @@ public:
* ucb::ContentImplHelper.
*/
class CommandProcessorInfo :
-public cppu::OWeakObject,
-public css::lang::XTypeProvider,
-public css::ucb::XCommandInfo
+public cppu::WeakImplHelper
{
css::uno::Reference< css::ucb::XCommandEnvironment >
m_xEnv;
@@ -108,19 +106,6 @@ public:
ContentImplHelper* pContent );
virtual ~CommandProcessorInfo() override;
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-getImplementationId() override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-getTypes() override;
-
// XCommandInfo
virtual css::uno::Sequence<
css::ucb::CommandInfo > SAL_CALL
diff --git a/ucbhelper/source/provider/contentinfo.cxx
b/ucbhelper/source/provider/contentinfo.cxx
index 64feb16e2b74..a0a26745b758 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -191,38 +191,6 @@ CommandProcessorInfo::~CommandProcessorInfo()
}
-// XInterface methods.
-
-
-void SAL_CALL CommandProcessorInfo::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL CommandProcessorInfo::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const
css::uno::Type & rType )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast<
lang::XTypeProvider* >(this),
- static_cast<
css::ucb::XCommandInfo* >(this)
-);
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
- lang::XTypeProvider,
- css::ucb::XCommandInfo );
-
-
// XCommandInfo methods.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/resultset.hxx | 34 +++-
ucbhelper/source/provider/resultset.cxx | 45
2 files changed, 10 insertions(+), 69 deletions(-)
New commits:
commit 7426fd34b3979ce546f749dba15f58e299b62eac
Author: Noel Grandin
AuthorDate: Mon Oct 7 14:48:02 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Oct 8 14:08:36 2019 +0200
use cppu::WeakImplHelper in ResultSet
Change-Id: I9d6feef38532b0057e16fc3f25b0f285d3dfcb99
Reviewed-on: https://gerrit.libreoffice.org/80407
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 7dcdce8cb8d4..2c5e99bdc2a9 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -32,7 +32,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -58,16 +58,15 @@ struct ResultSet_Impl;
* @see ResultSetDataSupplier
*/
class UCBHELPER_DLLPUBLIC ResultSet :
-public cppu::OWeakObject,
-public css::lang::XTypeProvider,
-public css::lang::XServiceInfo,
-public css::lang::XComponent,
-public css::ucb::XContentAccess,
-public css::sdbc::XResultSet,
-public css::sdbc::XResultSetMetaDataSupplier,
-public css::sdbc::XRow,
-public css::sdbc::XCloseable,
-public css::beans::XPropertySet
+public cppu::WeakImplHelper<
+css::lang::XServiceInfo,
+css::lang::XComponent,
+css::ucb::XContentAccess,
+css::sdbc::XResultSet,
+css::sdbc::XResultSetMetaDataSupplier,
+css::sdbc::XRow,
+css::sdbc::XCloseable,
+css::beans::XPropertySet>
{
std::unique_ptr m_pImpl;
@@ -101,19 +100,6 @@ public:
const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv
);
virtual ~ResultSet() override;
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-getImplementationId() override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-getTypes() override;
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
diff --git a/ucbhelper/source/provider/resultset.cxx
b/ucbhelper/source/provider/resultset.cxx
index 64991e0a4c7c..133b66a1da56 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -208,51 +208,6 @@ ResultSet::~ResultSet()
}
-// XInterface methods.
-
-void SAL_CALL ResultSet::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL ResultSet::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType
)
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast<
lang::XTypeProvider* >(this),
- static_cast<
lang::XServiceInfo* >(this),
- static_cast< lang::XComponent*
>(this),
- static_cast<
css::ucb::XContentAccess* >(this),
- static_cast< sdbc::XResultSet*
>(this),
- static_cast<
sdbc::XResultSetMetaDataSupplier* >(this),
- static_cast< sdbc::XRow*
>(this),
- static_cast< sdbc::XCloseable*
>(this),
- static_cast<
beans::XPropertySet* >(this)
- );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_9( ResultSet,
- lang::XTypeProvider,
- lang::XServiceInfo,
- lang::XComponent,
- css::ucb::XContentAccess,
- sdbc::XResultSet,
- sdbc::XResultSetMetaDataSupplier,
- sdbc::XRow,
- sdbc::XCloseable,
- beans::XPropertySet );
-
-
// XServiceInfo methods.
OUString SAL_CALL ResultSet::getImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/propertyvalueset.hxx |9
ucbhelper/source/provider/propertyvalueset.cxx | 241 -
2 files changed, 129 insertions(+), 121 deletions(-)
New commits:
commit 9d8bac40899b656ca5173fec880102f54e996382
Author: Arkadiy Illarionov
AuthorDate: Sun Jun 30 19:22:37 2019 +0300
Commit: Stephan Bergmann
CommitDate: Mon Jul 15 10:00:46 2019 +0200
Drop GETVALUE_IMPL/SETVALUE_IMPL macros
Replace with PropertyValueSet getValue/appendValue templates
Change-Id: I5714e6c4e6daf5ba6a4a9f9b363de3a1541834da
Reviewed-on: https://gerrit.libreoffice.org/74930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/ucbhelper/propertyvalueset.hxx
b/include/ucbhelper/propertyvalueset.hxx
index a0ecaf0df86d..97ee7c6ec889 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -40,6 +40,9 @@ namespace com { namespace sun { namespace star { namespace
beans {
namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+enum class PropsSet;
+namespace ucbhelper_impl { struct PropertyValue; }
+
namespace ucbhelper {
class PropertyValues;
@@ -69,6 +72,12 @@ private:
UCBHELPER_DLLPRIVATE const css::uno::Reference<
css::script::XTypeConverter >&
getTypeConverter();
+template
+T getValue(PropsSet nTypeName, sal_Int32 columnIndex);
+
+template
+void appendValue(const OUString& rPropName, PropsSet nTypeName, const T&
rValue);
+
public:
PropertyValueSet(
const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx
b/ucbhelper/source/provider/propertyvalueset.cxx
index d1adaad4e6f2..486ac962aa34 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -130,101 +130,6 @@ class PropertyValues : public std::vector<
ucbhelper_impl::PropertyValue > {};
} // namespace ucbhelper
-// Welcome to the macro hell...
-
-
-#define GETVALUE_IMPL( _type_, _type_name_, _member_name_ ) \
- \
-osl::MutexGuard aGuard( m_aMutex ); \
- \
-_type_ aValue {}; /* default ctor */\
- \
-m_bWasNull = true;\
- \
-if ( ( columnIndex < 1 ) \
- || ( columnIndex > sal_Int32( m_pValues->size() ) ) )\
-{ \
-OSL_FAIL( "PropertyValueSet - index out of range!" ); \
-return aValue;\
-} \
-ucbhelper_impl::PropertyValue& rValue \
-= (*m_pValues)[ columnIndex - 1 ];\
- \
-if ( rValue.nOrigValue == PropsSet::NONE )\
-return aValue;\
- \
-if ( rValue.nPropsSet & _type_name_ ) \
-{ \
-/* Values is present natively... */ \
-aValue = rValue._member_name_;\
-m_bWasNull = false; \
-return aValue;\
-} \
- \
-if ( !(rValue.nPropsSet & PropsSet::Object) ) \
-{ \
-/* Value is not (yet) available as Any. Create it. */ \
-getObject( columnIndex, Reference< XNameAccess >() ); \
-} \
- \
-if ( rValue.nPropsSet & PropsSet::Object )\
-{ \
-/* Value is available as Any. */ \
- \
-if ( rValue.aObject.hasValue() ) \
-{ \
-/* Try to convert into native value. */ \
-if ( rValue.aObject >>= aValue ) \
-{
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/interactionrequest.hxx |1 -
ucb/source/cacher/cachedcontentresultsetstub.cxx |8 +++-
ucb/source/cacher/cachedcontentresultsetstub.hxx |5 +
ucb/source/ucp/hierarchy/hierarchyuri.cxx|2 --
ucb/source/ucp/hierarchy/hierarchyuri.hxx|1 -
ucb/source/ucp/tdoc/tdoc_uri.cxx |9 -
ucb/source/ucp/tdoc/tdoc_uri.hxx |2 --
ucbhelper/source/provider/interactionrequest.cxx |5 +
8 files changed, 5 insertions(+), 28 deletions(-)
New commits:
commit 131cc96a890b8988703532d09773bb0bde20ee8a
Author: Noel Grandin
AuthorDate: Thu Feb 21 16:03:13 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 22 07:39:44 2019 +0100
loplugin:unusedfields in ucb,ucbhelper
Change-Id: Id15c92e54669bd5f26adfe0d0b9dda0e8894ccf3
Reviewed-on: https://gerrit.libreoffice.org/68161
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/interactionrequest.hxx
b/include/ucbhelper/interactionrequest.hxx
index 74df7f1f6c87..fca1a63c2cdd 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -314,7 +314,6 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
OUString m_aRealm;
OUString m_aUserName;
OUString m_aPassword;
-OUString m_aAccount;
css::ucb::RememberAuthentication m_eRememberPasswordMode;
css::ucb::RememberAuthentication const m_eDefaultRememberPasswordMode;
css::ucb::RememberAuthentication const m_eDefaultRememberAccountMode;
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx
b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index b9085f7ac323..a648beac5e76 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -497,10 +497,8 @@ FetchResult SAL_CALL CachedContentResultSetStub
// class CachedContentResultSetStubFactory
-CachedContentResultSetStubFactory::CachedContentResultSetStubFactory(
-const Reference< XMultiServiceFactory > & rSMgr )
+CachedContentResultSetStubFactory::CachedContentResultSetStubFactory()
{
-m_xSMgr = rSMgr;
}
CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory()
@@ -546,10 +544,10 @@ XSERVICEINFO_COMMOM_IMPL(
CachedContentResultSetStubFactory,
OUString(
"com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ) )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
-CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference<
css::lang::XMultiServiceFactory> & rSMgr )
+CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference<
css::lang::XMultiServiceFactory> & )
{
css::lang::XServiceInfo* pX =
-static_cast(new
CachedContentResultSetStubFactory( rSMgr ));
+static_cast(new
CachedContentResultSetStubFactory);
return css::uno::Reference< css::uno::XInterface >::query( pX );
}
css::uno::Sequence< OUString >
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx
b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index c4ba74410680..5a4182a63efd 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -146,12 +146,9 @@ class CachedContentResultSetStubFactory final
, public css::lang::XServiceInfo
, public css::ucb::XCachedContentResultSetStubFactory
{
-css::uno::Reference< css::lang::XMultiServiceFactory >m_xSMgr;
-
public:
-CachedContentResultSetStubFactory(
-const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
+CachedContentResultSetStubFactory();
virtual ~CachedContentResultSetStubFactory() override;
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 8b7402d22dac..6bd2fc5952f1 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -46,7 +46,6 @@ void HierarchyUri::init() const
// Note: Maybe it's a re-init, setUri only resets m_aPath!
m_aService.clear();
m_aParentUri.clear();
-m_aName.clear();
// URI must match at least: :
if ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 )
@@ -165,7 +164,6 @@ void HierarchyUri::init() const
( nLastSlash != m_aUri.getLength() - 1 ) ) // root
{
m_aParentUri = m_aUri.copy( 0, nLastSlash );
-m_aName = m_aUri.copy( nLastSlash + 1 );
}
// success
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index 4e67db7751ed..12973a9c3326 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -35,7 +35,6 @@ class HierarchyUri
mutable OUString m_aParentUri;
mutab
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/providerhelper.hxx |4 +--
ucb/source/core/providermap.hxx |4 +--
ucb/source/ucp/cmis/children_provider.hxx|4 +--
ucb/source/ucp/cmis/cmis_content.cxx |4 +--
ucb/source/ucp/cmis/cmis_content.hxx |4 +--
ucb/source/ucp/cmis/cmis_datasupplier.cxx|5 +---
ucb/source/ucp/cmis/cmis_repo_content.cxx| 19 --
ucb/source/ucp/cmis/cmis_repo_content.hxx|2 -
ucb/source/ucp/gio/gio_content.hxx |4 +--
ucb/source/ucp/package/pkgcontent.hxx|4 +--
ucb/source/ucp/tdoc/tdoc_content.hxx |2 -
ucb/source/ucp/webdav-neon/webdavcontent.hxx |2 -
ucb/source/ucp/webdav/webdavcontent.hxx |2 -
ucbhelper/source/client/proxydecider.cxx | 28 +++
14 files changed, 37 insertions(+), 51 deletions(-)
New commits:
commit b80403167935550a4dd97f31b79d2bdcb97e4e88
Author: Julien Nabet
Date: Thu Nov 2 22:46:22 2017 +0100
Replace lists by vector or deque in ucb/ucbhelper
Change-Id: I9f72d7c8ab48f8dc2eec779db2f40531a33db6f9
Reviewed-on: https://gerrit.libreoffice.org/44238
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/include/ucbhelper/providerhelper.hxx
b/include/ucbhelper/providerhelper.hxx
index 894d6177b41b..8d3508784d10 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
#define INCLUDED_UCBHELPER_PROVIDERHELPER_HXX
-#include
+#include
#include
#include
#include
@@ -45,7 +45,7 @@ namespace ucbhelper {
class ContentImplHelper;
typedef rtl::Reference< ContentImplHelper > ContentImplHelperRef;
-typedef std::list< ContentImplHelperRef > ContentRefList;
+typedef std::vector< ContentImplHelperRef > ContentRefList;
/**
* This is an abstract base class for implementations of the service
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index ba793aad9e73..c1b50e058820 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_UCB_SOURCE_CORE_PROVIDERMAP_HXX
#define INCLUDED_UCB_SOURCE_CORE_PROVIDERMAP_HXX
-#include
+#include
#include
#include
@@ -56,7 +56,7 @@ ProviderListEntry_Impl::getResolvedProvider() const
}
-typedef std::list< ProviderListEntry_Impl > ProviderList_Impl;
+typedef std::deque< ProviderListEntry_Impl > ProviderList_Impl;
typedef ucb_impl::RegexpMap< ProviderList_Impl > ProviderMap_Impl;
diff --git a/ucb/source/ucp/cmis/children_provider.hxx
b/ucb/source/ucp/cmis/children_provider.hxx
index 770c29e68d11..210522a5f916 100644
--- a/ucb/source/ucp/cmis/children_provider.hxx
+++ b/ucb/source/ucp/cmis/children_provider.hxx
@@ -9,7 +9,7 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CHILDREN_PROVIDER_HXX
#define INCLUDED_UCB_SOURCE_UCP_CMIS_CHILDREN_PROVIDER_HXX
-#include
+#include
#include
@@ -20,7 +20,7 @@ namespace cmis
public:
virtual ~ChildrenProvider( ) { };
-virtual std::list< css::uno::Reference< css::ucb::XContent > >
getChildren( ) = 0;
+virtual std::vector< css::uno::Reference< css::ucb::XContent > >
getChildren( ) = 0;
};
}
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index da5f779631ec..db55e200b6e5 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -2033,9 +2033,9 @@ namespace cmis
return uno::Sequence< ucb::ContentInfo >();
}
-list< uno::Reference< ucb::XContent > > Content::getChildren( )
+std::vector< uno::Reference< ucb::XContent > > Content::getChildren( )
{
-list< uno::Reference< ucb::XContent > > results;
+std::vector< uno::Reference< ucb::XContent > > results;
SAL_INFO( "ucb.ucp.cmis", "Content::getChildren() " << m_sURL );
libcmis::FolderPtr pFolder = boost::dynamic_pointer_cast<
libcmis::Folder >( getObject( uno::Reference< ucb::XCommandEnvironment >() ) );
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx
b/ucb/source/ucp/cmis/cmis_content.hxx
index acd45e8d65b6..3a83cde97b06 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -98,7 +98,7 @@ private:
private:
typedef rtl::Reference< Content > ContentRef;
-typedef std::list< ContentRef > ContentRefList;
+typedef std::vector< ContentRef > ContentRefList;
/// @throws css::uno::Exception
/// @throws libcmis::Exception
@@ -201,7 +201,7 @@ public:
css::uno::Sequence< css::ucb::ContentInfo >
queryCreatableContentsInfo( const css::uno::Reference<
css::ucb::XCommandEnvironment >& xEnv );
-virtual std::list< css::uno::Reference< css::ucb::XContent > >
getChildren( ) override;
+virtual std::vector< css::uno::Reference< css::ucb::XContent > >
getChildren( ) override;
/// @t
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/contentinfo.hxx|4 ++--
include/ucbhelper/propertyvalueset.hxx |3 ++-
include/ucbhelper/resultsethelper.hxx|2 +-
ucb/source/cacher/cachedcontentresultset.cxx | 23 +--
ucb/source/cacher/cachedcontentresultset.hxx |5 -
ucb/source/cacher/dynamicresultsetwrapper.cxx|6 ++
ucb/source/cacher/dynamicresultsetwrapper.hxx|3 ++-
ucb/source/core/ucb.cxx |3 +--
ucb/source/core/ucb.hxx |3 ++-
ucb/source/core/ucbcmds.cxx | 12 ++--
ucb/source/core/ucbstore.cxx | 18 +-
ucb/source/ucp/file/filnot.cxx |1 -
ucb/source/ucp/file/filnot.hxx |3 ++-
ucb/source/ucp/file/prov.cxx |9 -
ucb/source/ucp/file/prov.hxx |3 ++-
ucb/source/ucp/ftp/ftpdynresultset.cxx |1 -
ucb/source/ucp/ftp/ftpdynresultset.hxx |2 +-
ucb/source/ucp/hierarchy/hierarchydatasource.cxx |5 ++---
ucb/source/ucp/hierarchy/hierarchydatasource.hxx |7 ---
ucb/source/ucp/package/pkgprovider.cxx |3 +--
ucb/source/ucp/package/pkgprovider.hxx |2 +-
ucb/source/ucp/webdav-neon/LinkSequence.cxx |9 +
ucb/source/ucp/webdav-neon/LockEntrySequence.cxx |7 ---
ucb/source/ucp/webdav-neon/LockSequence.cxx |8
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx |2 +-
ucb/source/ucp/webdav-neon/webdavprovider.cxx|1 -
ucb/source/ucp/webdav-neon/webdavprovider.hxx|2 +-
ucbhelper/source/provider/contentinfo.cxx| 16 ++--
ucbhelper/source/provider/propertyvalueset.cxx |1 -
ucbhelper/source/provider/resultset.cxx | 11 ++-
ucbhelper/source/provider/resultsethelper.cxx|4 +---
31 files changed, 69 insertions(+), 110 deletions(-)
New commits:
commit 84defbc556c17aa58851fd14f8af0deaa3cc6e05
Author: Noel Grandin
Date: Thu Jan 19 09:09:05 2017 +0200
new loplugin: useuniqueptr: ucb..ucbhelper
Change-Id: Ib19ca3225b96d1bfec8a43bb762e16597f33b690
Reviewed-on: https://gerrit.libreoffice.org/33297
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/contentinfo.hxx
b/include/ucbhelper/contentinfo.hxx
index ee1f9ec..171479ca 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -50,7 +50,7 @@ class PropertySetInfo :
{
css::uno::Reference< css::ucb::XCommandEnvironment >
m_xEnv;
-css::uno::Sequence< css::beans::Property >*
+std::unique_ptr>
m_pProps;
osl::Mutex m_aMutex;
ContentImplHelper* m_pContent;
@@ -113,7 +113,7 @@ class CommandProcessorInfo :
{
css::uno::Reference< css::ucb::XCommandEnvironment >
m_xEnv;
-css::uno::Sequence< css::ucb::CommandInfo >*
+std::unique_ptr>
m_pCommands;
osl::Mutex m_aMutex;
ContentImplHelper* m_pContent;
diff --git a/include/ucbhelper/propertyvalueset.hxx
b/include/ucbhelper/propertyvalueset.hxx
index c0c8c34..e475243 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
namespace com { namespace sun { namespace star { namespace script {
class XTypeConverter;
@@ -60,7 +61,7 @@ class UCBHELPER_DLLPUBLIC PropertyValueSet :
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
osl::Mutex m_aMutex;
-PropertyValues* m_pValues;
+std::unique_ptr m_pValues;
boolm_bWasNull;
boolm_bTriedToGetTypeConverter;
diff --git a/include/ucbhelper/resultsethelper.hxx
b/include/ucbhelper/resultsethelper.hxx
index e35466f..078b1cb 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -56,7 +56,7 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper :
public css::lang::XServiceInfo,
public css::ucb::XDynamicResultSet
{
-cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
+std::unique_ptr m_pDisposeEventListeners;
bool m_bStatic;
bool m_bInitDone;
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index e1ab4c1..e08edb3 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -129,17 +129,12 @@ CachedContentResultSet::CCRS_Cache::CCRS_Cache(
CachedContentResultSet::CCRS_Cache::~CCRS_Cache()
{
-
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/macros.hxx | 12 +-
include/ucbhelper/resultset.hxx |3 -
include/ucbhelper/resultsethelper.hxx|3 -
ucb/source/cacher/cachedcontentresultset.cxx | 21 +---
ucb/source/cacher/cachedcontentresultset.hxx |3 -
ucb/source/cacher/cachedcontentresultsetstub.cxx | 20 +--
ucb/source/cacher/cachedcontentresultsetstub.hxx |3 -
ucb/source/cacher/cacheddynamicresultset.cxx | 19 +-
ucb/source/cacher/cacheddynamicresultset.hxx |4 --
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 20 +--
ucb/source/cacher/cacheddynamicresultsetstub.hxx |4 --
ucb/source/core/provprox.cxx | 19 +-
ucb/source/core/provprox.hxx |3 -
ucb/source/core/ucbstore.cxx | 40 +++
ucb/source/core/ucbstore.hxx |6 ---
ucb/source/inc/regexpmap.hxx | 26 +-
ucb/source/sorter/sortdynres.cxx | 13 ---
ucb/source/sorter/sortdynres.hxx |2 -
ucb/source/sorter/sortresult.cxx | 13 ---
ucb/source/sorter/sortresult.hxx |3 -
ucb/source/ucp/ftp/ftpcontent.cxx| 13 ---
ucb/source/ucp/ftp/ftpcontent.hxx|3 -
ucb/source/ucp/ftp/ftpcontentprovider.cxx| 11 --
ucb/source/ucp/ftp/ftpcontentprovider.hxx|4 --
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 24 -
ucbhelper/source/provider/resultset.cxx | 19 +-
ucbhelper/source/provider/resultsethelper.cxx| 19 --
27 files changed, 177 insertions(+), 153 deletions(-)
New commits:
commit 47317f041693db1a9d4618a1d9f7dcefe52b2904
Author: Noel Grandin
Date: Tue Oct 25 13:46:23 2016 +0200
loplugin:expandablemethods in ucb..ucbhelper
Change-Id: I42d077d7ebcfb77447d011644f8d64e80eae69c2
Reviewed-on: https://gerrit.libreoffice.org/30266
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 57de0ed..91a3aa3 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -214,13 +214,6 @@ Class::createServiceFactory( const css::uno::Reference<
css::lang::XMultiService
// Service without service factory.
-// Own implementation of getSupportedServiceNames_Static().
-#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName )\
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
-\
-css::uno::Sequence< OUString > \
-Class::getSupportedServiceNames_Static()
-
// 1 service name
#define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
@@ -228,8 +221,7 @@ XSERVICEINFO_COMMOM_IMPL( Class, ImplName )
\
css::uno::Sequence< OUString > \
Class::getSupportedServiceNames_Static()\
{ \
-css::uno::Sequence< OUString > aSNS { Service1 }; \
-return aSNS;\
+return { Service1 }; \
}
// Service with service factory.
@@ -256,7 +248,7 @@ Class::getSupportedServiceNames_Static()
css::uno::Sequence< OUString > \
Class::getSupportedServiceNames_Static()\
{
\
- return css::uno::Sequence< OUString > { Service1 };
\
+ return { Service1 }; \
}
// 1 service name
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index e2f9945..d7f831f 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -125,9 +125,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-static OUString getImplementationName_Static();
-static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
// XComponent
virtual void SAL_CALL
dispose()
diff --git a/include/ucbhelper/resultsethelper.hxx
b/include/ucbhelper/resultsethelper.hxx
index d2f6c73..e35466f 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -152,9 +152,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) o
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source unotools/source
include/ucbhelper/fileidentifierconverter.hxx | 14 --
ucbhelper/source/client/fileidentifierconverter.cxx | 18 --
unotools/source/ucbhelper/localfilehelper.cxx |6 ++
3 files changed, 2 insertions(+), 36 deletions(-)
New commits:
commit 1242a3a55ffb8c5716d0a6f2e17dadc1f2c02818
Author: Stephan Bergmann
Date: Tue Aug 18 14:19:30 2015 +0200
Remove obsolete getLocalFileURL
...vnd.sun.star.wfs is long gone
Change-Id: I64da15a6c16e429aeda57c435e353891fb28f04d
diff --git a/include/ucbhelper/fileidentifierconverter.hxx
b/include/ucbhelper/fileidentifierconverter.hxx
index d2ace14..27e7c8e 100644
--- a/include/ucbhelper/fileidentifierconverter.hxx
+++ b/include/ucbhelper/fileidentifierconverter.hxx
@@ -31,20 +31,6 @@ namespace com { namespace sun { namespace star { namespace
ucb {
namespace ucbhelper {
-
-/** Get a 'root' URL for the most 'local' file content provider.
-
-@descr
-The result can be used as the rBaseURL parameter of
-ucb::getFileURLFromSystemPath().
-
-@returns
-either a 'root' URL for the most 'local' file content provider, or an
-empty string, if no such URL can meaningfully be constructed.
- */
-UCBHELPER_DLLPUBLIC OUString getLocalFileURL();
-
-
/** Using a specific content provider manager, convert a file path in system
dependent notation to a (file) URL.
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx
b/ucbhelper/source/client/fileidentifierconverter.cxx
index e3f3ec9..4916975 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.cxx
@@ -31,24 +31,6 @@ using namespace com::sun::star;
namespace ucbhelper {
-
-
-// getLocalFileURL
-
-
-
-OUString
-getLocalFileURL()
-{
-// If there were more file systems than just "file:///" (e.g., the obsolete
-// "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for
-// their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality
-// and return the most local one:
-return OUString("file:///");
-}
-
-
-
// getFileURLFromSystemPath
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx
b/unotools/source/ucbhelper/localfilehelper.cxx
index b459769..d5ff1e4 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -82,8 +82,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const
OUString& rName, OUString&
comphelper::getProcessComponentContext() ) );
try
{
-OUString aBase( ::ucbhelper::getLocalFileURL() );
-rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName
);
+rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, "file:///",
rName );
}
catch (const ::com::sun::star::uno::RuntimeException&)
{
@@ -101,8 +100,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const
OUString& rName, OUString&
try
{
INetURLObject aObj( rName );
-INetURLObject aLocal( ::ucbhelper::getLocalFileURL() );
-if ( aObj.GetProtocol() == aLocal.GetProtocol() )
+if ( aObj.GetProtocol() == INetProtocol::File )
rReturn = ::ucbhelper::getSystemPathFromFileURL( pBroker, rName );
}
catch (const ::com::sun::star::uno::RuntimeException&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/activedatasink.hxx | 36 -
ucbhelper/source/client/activedatasink.cxx | 49 -
2 files changed, 9 insertions(+), 76 deletions(-)
New commits:
commit a6e19ea7a8885dcbdb1d8b2f56586373595ba8aa
Author: Norbert Thiebaud
Date: Wed Mar 5 19:47:58 2014 -0600
use WeakImplHelper for ActivaDataSink
Change-Id: Ife32157ff876a0860b3920cadc24b7888200796b
Signed-off-by: Stephan Bergmann
diff --git a/include/ucbhelper/activedatasink.hxx
b/include/ucbhelper/activedatasink.hxx
index 5adf7be..3a8470f 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -20,51 +20,31 @@
#ifndef INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
#define INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX
-#include
#include
-#include
-#include
#include
+#include
namespace ucbhelper
{
-
-
/**
* This class implements the interface com::sun::star::io::XActiveDataSink.
* Instances of this class can be passed with the parameters of an
* "open" command.
*/
-class UCBHELPER_DLLPUBLIC ActiveDataSink : public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::io::XActiveDataSink
+class UCBHELPER_DLLPUBLIC ActiveDataSink :
+public cppu::WeakImplHelper1< css::io::XActiveDataSink >
{
-com::sun::star::uno::Reference<
-com::sun::star::io::XInputStream > m_xStream;
+css::uno::Reference< css::io::XInputStream > m_xStream;
public:
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+// XActiveDataSink methods.
+virtual void SAL_CALL setInputStream( const css::uno::Reference<
css::io::XInputStream >& aStream )
throw( css::uno::RuntimeException, std::exception );
-virtual void SAL_CALL acquire()
-throw();
-virtual void SAL_CALL release()
-throw();
-// XTypeProvider
-XTYPEPROVIDER_DECL()
-
-// XActiveDataSink methods.
-virtual void SAL_CALL
-setInputStream( const com::sun::star::uno::Reference<
-com::sun::star::io::XInputStream >& aStream )
-throw( com::sun::star::uno::RuntimeException, std::exception );
-virtual com::sun::star::uno::Reference<
-com::sun::star::io::XInputStream > SAL_CALL
-getInputStream()
-throw( com::sun::star::uno::RuntimeException, std::exception );
+virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getInputStream()
+throw( css::uno::RuntimeException, std::exception );
};
} /* namespace ucbhelper */
diff --git a/ucbhelper/source/client/activedatasink.cxx
b/ucbhelper/source/client/activedatasink.cxx
index d83643f..604801f 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -29,58 +29,11 @@ using namespace com::sun::star;
namespace ucbhelper
{
-
-
-
-
// ActiveDataSink Implementation.
-
-
-
-
-
-
-// XInterface methods
-
-void SAL_CALL ActiveDataSink::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL ActiveDataSink::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ActiveDataSink::queryInterface( const css::uno::Type &
rType )
-throw( css::uno::RuntimeException, std::exception )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
- (static_cast<
lang::XTypeProvider* >(this)),
- (static_cast<
io::XActiveDataSink* >(this))
- );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods
-
-
-
-XTYPEPROVIDER_IMPL_2( ActiveDataSink,
- lang::XTypeProvider,
- io::XActiveDataSink );
-
-
-
// XActiveDataSink methods.
-
-
// virtual
-void SAL_CALL ActiveDataSink::setInputStream(
-const uno::Reference< io::XInputStream >& aStream )
+void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference<
io::XInputStream >& aStream )
throw( uno::RuntimeException, std::exception )
{
m_xStream = aStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source xmlhelp/source
include/ucbhelper/activedatasink.hxx |9 +-- include/ucbhelper/activedatastreamer.hxx |9 +-- include/ucbhelper/commandenvironment.hxx |7 + include/ucbhelper/contenthelper.hxx |7 + include/ucbhelper/contentinfo.hxx| 14 ++- include/ucbhelper/macros.hxx | 17 -- include/ucbhelper/propertyvalueset.hxx |7 + include/ucbhelper/providerhelper.hxx | 10 +--- include/ucbhelper/resultset.hxx |7 + include/ucbhelper/resultsethelper.hxx|7 + include/ucbhelper/resultsetmetadata.hxx |7 + ucb/source/cacher/cachedcontentresultset.cxx |7 + ucb/source/cacher/cachedcontentresultset.hxx | 18 +++ ucb/source/cacher/cachedcontentresultsetstub.hxx | 18 +++ ucb/source/cacher/cacheddynamicresultset.hxx | 19 +++- ucb/source/cacher/cacheddynamicresultsetstub.hxx | 20 +++-- ucb/source/cacher/contentresultsetwrapper.hxx|9 +-- ucb/source/cacher/dynamicresultsetwrapper.hxx|9 +-- ucb/source/core/identify.hxx |7 + ucb/source/core/provprox.hxx | 14 ++- ucb/source/core/ucb.hxx |7 + ucb/source/core/ucbprops.hxx |7 + ucb/source/core/ucbstore.cxx |7 + ucb/source/core/ucbstore.hxx | 21 +++-- ucb/source/sorter/sortdynres.hxx | 27 +++ ucb/source/sorter/sortresult.cxx |7 + ucb/source/sorter/sortresult.hxx |7 + ucb/source/ucp/cmis/cmis_content.hxx |8 +- ucb/source/ucp/cmis/cmis_provider.hxx|7 + ucb/source/ucp/cmis/cmis_repo_content.hxx|8 +- ucb/source/ucp/ftp/ftpcontent.hxx|7 + ucb/source/ucp/ftp/ftpcontentprovider.hxx|7 + ucb/source/ucp/gio/gio_content.hxx |8 +- ucb/source/ucp/gio/gio_provider.hxx |7 + ucb/source/ucp/gvfs/gvfs_content.hxx |7 + ucb/source/ucp/gvfs/gvfs_provider.hxx|7 + ucb/source/ucp/hierarchy/hierarchycontent.hxx|7 + ucb/source/ucp/hierarchy/hierarchydatasource.cxx |7 + ucb/source/ucp/hierarchy/hierarchydatasource.hxx |7 + ucb/source/ucp/hierarchy/hierarchyprovider.hxx |7 + ucb/source/ucp/package/pkgcontent.hxx|7 + ucb/source/ucp/package/pkgprovider.hxx |7 + ucb/source/ucp/tdoc/tdoc_content.hxx |7 + ucb/source/ucp/tdoc/tdoc_provider.hxx|7 + ucb/source/ucp/webdav-neon/webdavcontent.hxx |7 + ucb/source/ucp/webdav-neon/webdavprovider.hxx|7 + ucb/source/ucp/webdav/webdavcontent.hxx |7 + ucb/source/ucp/webdav/webdavprovider.hxx |7 + ucbhelper/source/client/content.cxx |7 + ucbhelper/source/provider/resultset.cxx |7 + xmlhelp/source/cxxhelp/provider/content.hxx |7 + xmlhelp/source/cxxhelp/provider/provider.hxx |7 + 52 files changed, 375 insertions(+), 108 deletions(-) New commits: commit 66f2c35fac22a235a1e491824126f105e6d3869c Author: Norbert Thiebaud Date: Tue Mar 4 12:55:07 2014 -0600 de-macroize XINTERFACE_DECL Change-Id: Iaa1cf999189f6b62547c208eadc38150400ca0fe Reviewed-on: https://gerrit.libreoffice.org/8454 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index deaf6ac..5adf7be 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -45,8 +45,13 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink : public cppu::OWeakObject, com::sun::star::io::XInputStream > m_xStream; public: - // XInterface -XINTERFACE_DECL() +// XInterface +virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) +throw( css::uno::RuntimeException, std::exception ); +virtual void SAL_CALL acquire() +throw(); +virtual void SAL_CALL release() +throw(); // XTypeProvider XTYPEPROVIDER_DECL() diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx index 799f7ee..0c1af6a 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/include/ucbhelper/activedatastreamer.hxx @@ -44,8 +44,13 @@ class ActiveDataStreamer : public cppu::OWeakObject, com::sun::star::io::XStream > m_xStream; public: - // XInterface -XINTERFACE_DECL() +// XInterface +virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Typ
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
include/ucbhelper/registerucb.hxx | 26 +-
ucb/source/core/ucb.cxx |3 +--
ucbhelper/source/provider/registerucb.cxx | 11 +--
3 files changed, 3 insertions(+), 37 deletions(-)
New commits:
commit f31d4ad929339b4a06d5f84b14a2198345d88757
Author: Stephan Bergmann
Date: Fri Jun 14 12:22:40 2013 +0200
Remove unused ContentProviderRegistrationInfo
Change-Id: Ic30cbc95b4baa4dabaa0f8f8e129aa5cf4ca5f2f
diff --git a/include/ucbhelper/registerucb.hxx
b/include/ucbhelper/registerucb.hxx
index 183dabd..89b1d00 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
#include
@@ -37,28 +36,6 @@ namespace com { namespace sun { namespace star {
namespace ucbhelper {
//
-/** Information about a registered content provider.
- */
-struct ContentProviderRegistrationInfo
-{
-/** The registered content provider (or null if registration failed).
- */
-com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >
-m_xProvider;
-
-/** The arguments the content provider was instantiated with.
- */
-OUString m_aArguments;
-
-/** The URL template the content provider is registered on.
- */
-OUString m_aTemplate;
-};
-
-typedef std::vector< ContentProviderRegistrationInfo >
-ContentProviderRegistrationInfoList;
-
-//
/** Information about a content provider, passed to
configureUcb.
*/
@@ -113,8 +90,7 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
rxContext,
OUString const & rName,
OUString const & rArguments,
-OUString const & rTemplate,
-ContentProviderRegistrationInfo * pInfo)
+OUString const & rTemplate)
throw (com::sun::star::uno::RuntimeException);
}
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 3d45c7f..45cdb42 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -849,8 +849,7 @@ void UniversalContentBroker::prepareAndRegister(
m_xContext,
aIt->ServiceName,
aProviderArguments,
- aIt->URLTemplate,
- 0);
+ aIt->URLTemplate);
}
else
diff --git a/ucbhelper/source/provider/registerucb.cxx
b/ucbhelper/source/provider/registerucb.cxx
index a17e0ad..bce135f 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -45,8 +45,7 @@ registerAtUcb(
uno::Reference< uno::XComponentContext > const & rxContext,
OUString const & rName,
OUString const & rArguments,
-OUString const & rTemplate,
-ContentProviderRegistrationInfo * pInfo)
+OUString const & rTemplate)
throw (uno::RuntimeException)
{
OSL_ENSURE(rxContext.is(),
@@ -85,8 +84,6 @@ registerAtUcb(
catch (uno::RuntimeException const &) { throw; }
catch (uno::Exception const &) {}
-uno::Reference< ucb::XContentProvider >
-xOriginalProvider(xProvider);
uno::Reference< ucb::XParameterizedContentProvider >
xParameterized(xProvider, uno::UNO_QUERY);
if (xParameterized.is())
@@ -137,12 +134,6 @@ registerAtUcb(
throw;
}
}
-if (bSuccess && pInfo)
-{
-pInfo->m_xProvider = xOriginalProvider;
-pInfo->m_aArguments = aProviderArguments;
-pInfo->m_aTemplate = rTemplate;
-}
return bSuccess;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
