summaryrefslogtreecommitdiffstats
path: root/stoc/source/uriproc
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-13 10:11:37 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-13 11:19:04 +0000
commit97abbec95665b43a9a09e10a0fb31854cdbd5c0d (patch)
treeb6917d80775c411a5480febd77b89fb256203b6a /stoc/source/uriproc
parentremove dead stuff from Windows SalData (diff)
downloadcore-97abbec95665b43a9a09e10a0fb31854cdbd5c0d.tar.gz
core-97abbec95665b43a9a09e10a0fb31854cdbd5c0d.zip
tdf#94306 replace boost::noncopyable in stoc to xmlsec..
Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes. Add missing default ctors. With this commit there should be no users of boost::noncopyable left. Change-Id: I6b1e47824912a6a80cc3f00f34938ebc048d8975 Reviewed-on: https://gerrit.libreoffice.org/24051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'stoc/source/uriproc')
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.cxx7
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx13
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx13
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx13
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx7
5 files changed, 32 insertions, 21 deletions
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 7c81651d87d1..cc08209ecf27 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -42,12 +41,14 @@ namespace {
class Translator:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>
{
public:
Translator() {}
+ Translator(const Translator&) = delete;
+ Translator& operator=(const Translator&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index e8d3c6acb86f..88310c5cd340 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -25,7 +25,6 @@
#include <exception>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -93,8 +92,7 @@ sal_Int32 parseScheme(OUString const & uriReference) {
}
class UriReference:
- public cppu::WeakImplHelper<css::uri::XUriReference>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::uri::XUriReference>
{
public:
UriReference(
@@ -106,6 +104,9 @@ public:
query)
{}
+ UriReference(const UriReference&) = delete;
+ UriReference& operator=(const UriReference&) = delete;
+
virtual OUString SAL_CALL getUriReference()
throw (css::uno::RuntimeException, std::exception) override
{ return m_base.getUriReference(); }
@@ -258,14 +259,16 @@ void processSegments(
class Factory:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XUriReferenceFactory>
{
public:
explicit Factory(
css::uno::Reference< css::uno::XComponentContext > const & context):
m_context(context) {}
+ Factory(const Factory&) = delete;
+ Factory& operator=(const Factory&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 263795825bc5..cd6eef41f788 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -21,7 +21,6 @@
#include <exception>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -56,8 +55,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
}
class UrlReference:
- public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>,
- private boost::noncopyable
+ public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>
{
public:
UrlReference(OUString const & scheme, OUString const & path):
@@ -66,6 +64,9 @@ public:
OUString())
{}
+ UrlReference(const UrlReference&) = delete;
+ UrlReference& operator=(const UrlReference&) = delete;
+
virtual OUString SAL_CALL getUriReference()
throw (css::uno::RuntimeException, std::exception) override
{ return base_.getUriReference(); }
@@ -152,12 +153,14 @@ OUString UrlReference::expand(
class Parser:
public ::cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XUriSchemeParser>
{
public:
Parser() {}
+ Parser(const Parser&) = delete;
+ Parser& operator=(const Parser&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 3092c8d3284a..2f1297913d67 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -19,7 +19,6 @@
#include "UriReference.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -188,8 +187,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
}
class UrlReference:
- public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>
{
public:
UrlReference(OUString const & scheme, OUString const & path):
@@ -197,6 +195,9 @@ public:
scheme, false, false, OUString(), path, false, OUString())
{}
+ UrlReference(const UrlReference&) = delete;
+ UrlReference& operator=(const UrlReference&) = delete;
+
virtual OUString SAL_CALL getUriReference()
throw (css::uno::RuntimeException, std::exception) override
{ return m_base.getUriReference(); }
@@ -374,12 +375,14 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
class Parser:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XUriSchemeParser>
{
public:
Parser() {}
+ Parser(const Parser&) = delete;
+ Parser& operator=(const Parser&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 5bb9fb09b868..c96b081b2982 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -45,14 +44,16 @@ namespace {
class Factory:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>
{
public:
explicit Factory(
css::uno::Reference< css::uno::XComponentContext > const & context):
m_context(context) {}
+ Factory(const Factory&) = delete;
+ Factory& operator=(const Factory&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;