diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-10 21:41:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-11 07:15:35 +0000 |
| commit | c210bf4510585b554e0e9a371f27fa27e2874762 (patch) | |
| tree | 62f8c45ab415da97af398508e3ea64329268e7a3 /reportdesign/source/filter/xml | |
| parent | cf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (diff) | |
tdf#94306 replace boost::noncopyable r.. to sdext
... in modules reportdesign to sdext
Replace with C++11 delete copy-constructur and
copy-assignment.
Remove boost/noncopyable.hpp includes.
Make some overloaded ctors explicit
(most in sd slidesorter).
Add deleted copy-assignment in sc/inc/chart2uno.hxx.
Change-Id: I21d4209f0ddb00063ca827474516a05ab4bb2f9a
Reviewed-on: https://gerrit.libreoffice.org/23970
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign/source/filter/xml')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlFixedContent.cxx | 5 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 4f89a2acf3a1..4546b21cdd3a 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -18,7 +18,6 @@ */ #include "xmlFixedContent.hxx" #include "xmlfilter.hxx" -#include <boost/noncopyable.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> @@ -38,7 +37,7 @@ namespace rptxml { using namespace ::com::sun::star; -class OXMLCharContent: public XMLCharContext, private boost::noncopyable +class OXMLCharContent: public XMLCharContext { OXMLFixedContent* m_pFixedContent; @@ -58,6 +57,8 @@ public: const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ); + OXMLCharContent(const OXMLCharContent&) = delete; + OXMLCharContent& operator=(const OXMLCharContent&) = delete; virtual void InsertControlCharacter(sal_Int16 _nControl) override; virtual void InsertString(const OUString& _sString) override; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index db17d7e1ad50..5b7c20501b4c 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -83,7 +82,7 @@ using namespace ::com::sun::star::util; class RptMLMasterStylesContext_Impl: - public XMLTextMasterStylesContext, private boost::noncopyable + public XMLTextMasterStylesContext { ORptFilter& m_rImport; @@ -95,6 +94,8 @@ public: const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~RptMLMasterStylesContext_Impl(); + RptMLMasterStylesContext_Impl(const RptMLMasterStylesContext_Impl&) = delete; + RptMLMasterStylesContext_Impl& operator=(const RptMLMasterStylesContext_Impl&) = delete; virtual void EndElement() override; }; |