[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source ucb/source
Stephan Bergmann
sbergman at redhat.com
Fri Jun 14 03:23:10 PDT 2013
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 <sbergman at redhat.com>
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 <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <vector>
@@ -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
<method>configureUcb</method>.
*/
@@ -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;
}
More information about the Libreoffice-commits
mailing list