diff options
Diffstat (limited to 'unoxml')
-rw-r--r-- | unoxml/source/rdf/CBlankNode.cxx | 7 | ||||
-rw-r--r-- | unoxml/source/rdf/CLiteral.cxx | 7 | ||||
-rw-r--r-- | unoxml/source/rdf/CURI.cxx | 7 | ||||
-rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 18 |
4 files changed, 25 insertions, 14 deletions
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 0a79cf1ccc8b..5db736e11769 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -19,7 +19,6 @@ #include "CNodes.hxx" -#include <boost/noncopyable.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -36,8 +35,7 @@ class CBlankNode: public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, - css::rdf::XBlankNode>, - private boost::noncopyable + css::rdf::XBlankNode> { public: CBlankNode(); @@ -55,6 +53,9 @@ public: virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; private: + CBlankNode(CBlankNode const&) = delete; + CBlankNode& operator=(CBlankNode const&) = delete; + OUString m_NodeID; }; diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 15026c7b62ad..a46a4a6f5c60 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -19,7 +19,6 @@ #include "CNodes.hxx" -#include <boost/noncopyable.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -38,8 +37,7 @@ class CLiteral: public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, - css::rdf::XLiteral>, - private boost::noncopyable + css::rdf::XLiteral> { public: explicit CLiteral(); @@ -62,6 +60,9 @@ public: virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) override; private: + CLiteral(CLiteral const&) = delete; + CLiteral& operator=(CLiteral const&) = delete; + OUString m_Value; OUString m_Language; css::uno::Reference< css::rdf::XURI > m_xDatatype; diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index eef6245c0fa3..64f31ddee079 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -19,7 +19,6 @@ #include "CNodes.hxx" -#include <boost/noncopyable.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -37,8 +36,7 @@ class CURI: public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, - css::rdf::XURI>, - private boost::noncopyable + css::rdf::XURI> { public: explicit CURI(); @@ -60,6 +58,9 @@ public: virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception) override; private: + CURI(CURI const&) = delete; + CURI& operator=(CURI const&) = delete; + /// handle css.rdf.URIs void SAL_CALL initFromConstant(const sal_Int16 i_Constant); diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 04e0f7f5c35b..3b3a1804a1ec 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -28,7 +28,6 @@ #include <functional> #include <algorithm> -#include <boost/noncopyable.hpp> #include <boost/shared_array.hpp> #include <boost/optional.hpp> @@ -261,7 +260,6 @@ private: /** implements the repository service. */ class librdf_Repository: - private boost::noncopyable, // private ::cppu::BaseMutex, public ::cppu::WeakImplHelper< lang::XServiceInfo, @@ -402,6 +400,9 @@ public: private: + librdf_Repository(librdf_Repository const&) = delete; + librdf_Repository& operator=(librdf_Repository const&) = delete; + /// this is const, no need to lock m_aMutex to access it uno::Reference< uno::XComponentContext > const m_xContext; @@ -443,7 +444,6 @@ private: an XEnumeration of statements. */ class librdf_GraphResult: - private boost::noncopyable, public ::cppu::WeakImplHelper< container::XEnumeration> { @@ -478,6 +478,10 @@ public: lang::WrappedTargetException, std::exception) override; private: + + librdf_GraphResult(librdf_GraphResult const&) = delete; + librdf_GraphResult& operator=(librdf_GraphResult const&) = delete; + // NB: this is not a weak pointer: streams _must_ be deleted before the // storage they point into, so we keep the repository alive here // also, sequence is important: the stream must be destroyed first. @@ -555,7 +559,6 @@ throw (uno::RuntimeException, container::NoSuchElementException, /** result of tuple queries ("SELECT"). */ class librdf_QuerySelectResult: - private boost::noncopyable, public ::cppu::WeakImplHelper< rdf::XQuerySelectResult> { @@ -594,6 +597,9 @@ public: private: + librdf_QuerySelectResult(librdf_QuerySelectResult const&) = delete; + librdf_QuerySelectResult& operator=(librdf_QuerySelectResult const&) = delete; + // NB: this is not a weak pointer: streams _must_ be deleted before the // storage they point into, so we keep the repository alive here // also, sequence is important: the stream must be destroyed first. @@ -679,7 +685,6 @@ librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::e /** represents a named graph, and forwards all the work to repository. */ class librdf_NamedGraph: - private boost::noncopyable, public ::cppu::WeakImplHelper< rdf::XNamedGraph> { @@ -730,6 +735,9 @@ public: private: + librdf_NamedGraph(librdf_NamedGraph const&) = delete; + librdf_NamedGraph& operator=(librdf_NamedGraph const&) = delete; + /// weak reference: this is needed to check if m_pRep is valid uno::WeakReference< rdf::XRepository > const m_wRep; librdf_Repository *const m_pRep; |