diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-01 10:00:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 08:55:38 +0000 |
commit | 3c43a4810f505c071bcc99aeda47162a4b7b1681 (patch) | |
tree | b8f06caae940f47d4d5c0e71677c2afae3c217d5 /sc/source/filter | |
parent | 229f10c6d0b88f795038063ce7af61e40a3be35a (diff) |
tdf#94306 Replace boost::noncopyable in sc/source
and sc/workben with C++11 delete copy ctors
add default ctors needed missing
delete some ctors instead of making them private
Change-Id: I0a131f95444ef040e5d580d8326f372b8167e19b
Reviewed-on: https://gerrit.libreoffice.org/23717
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/filter')
-rw-r--r-- | sc/source/filter/inc/fprogressbar.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/ftools.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/xehelper.hxx | 40 | ||||
-rw-r--r-- | sc/source/filter/inc/xicontent.hxx | 48 | ||||
-rw-r--r-- | sc/source/filter/inc/xihelper.hxx | 45 | ||||
-rw-r--r-- | sc/source/filter/inc/xiname.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/xistyle.hxx | 32 | ||||
-rw-r--r-- | sc/source/filter/inc/xlpage.hxx | 7 | ||||
-rw-r--r-- | sc/source/filter/inc/xltools.hxx | 17 | ||||
-rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 15 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLExportIterator.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 7 |
14 files changed, 160 insertions, 89 deletions
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index ad0f9924876e..9070a007b63b 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_INC_FPROGRESSBAR_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_FPROGRESSBAR_HXX -#include <boost/noncopyable.hpp> #include <vector> #include <memory> #include "globstr.hrc" @@ -101,9 +100,12 @@ const sal_Int32 SCF_INV_SEGMENT = -1; // not allowed (second segment active): aProgress.Progress(); // not allowed (first segment not empty): aProgress.GetSegmentProgressBar( nSeg1 ); */ -class ScfProgressBar : private boost::noncopyable +class ScfProgressBar { public: + ScfProgressBar(const ScfProgressBar&) = delete; + const ScfProgressBar operator=(const ScfProgressBar&) = delete; + explicit ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText ); explicit ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ); virtual ~ScfProgressBar(); diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 6a36b3d51929..2ee65551bf64 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -25,7 +25,6 @@ #include <limits> #include <sal/macros.h> #include <sot/storage.hxx> -#include <boost/noncopyable.hpp> #include <oox/helper/helper.hxx> #include "filter.hxx" #include "scdllapi.h" @@ -121,9 +120,12 @@ class ScStyleSheetPool; class SvStream; /** Contains static methods used anywhere in the filters. */ -class ScfTools : private boost::noncopyable +class ScfTools { public: +// *** noncopyable *** -------------------------------------------------------- + ScfTools(const ScfTools&) = delete; + const ScfTools& operator=(const ScfTools&) = delete; // *** common methods *** ----------------------------------------------------- diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index c07d18e4c36b..30eae8dca7f7 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_INC_XEHELPER_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_XEHELPER_HXX -#include <boost/noncopyable.hpp> #include <memory> #include "xladdress.hxx" #include "xeroot.hxx" @@ -209,9 +208,17 @@ class ScPatternAttr; /** This class provides methods to create an XclExpString. @descr The string can be created from an edit engine text object or directly from a Calc edit cell. */ -class XclExpStringHelper : private boost::noncopyable +class XclExpStringHelper { public: + /** removes copy constructor */ + XclExpStringHelper(const XclExpStringHelper &) = delete; + /** remove copy-assignment operator */ + const XclExpStringHelper& operator=(const XclExpStringHelper&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods */ + XclExpStringHelper() = delete; + /** Creates a new unformatted string from the passed string. @descr Creates a Unicode string or a byte string, depending on the current BIFF version contained in the passed XclExpRoot object. @@ -315,12 +322,6 @@ public: /** Returns the script type first text portion different to WEAK, or the system default script type, if there is only weak script in the passed string. */ static sal_Int16 GetLeadingScriptType( const XclExpRoot& rRoot, const OUString& rString ); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclExpStringHelper(); }; // Header/footer conversion =================================================== @@ -356,9 +357,14 @@ class EditEngine; Known but unsupported control sequences: &G picture */ -class XclExpHFConverter : protected XclExpRoot, private boost::noncopyable +class XclExpHFConverter : protected XclExpRoot { public: + /** delete copy constructor */ + XclExpHFConverter(const XclExpHFConverter&) = delete; + /** delete copy-assignment operator */ + const XclExpHFConverter& operator=(const XclExpHFConverter&) = delete; + explicit XclExpHFConverter( const XclExpRoot& rRoot ); /** Generates the header/footer string from the passed edit engine text objects. */ @@ -389,20 +395,22 @@ private: /** This class contains static methods to encode a file URL. @descr Excel stores URLs in a format that contains special control characters, i.e. for directory separators or volume names. */ -class XclExpUrlHelper : private boost::noncopyable +class XclExpUrlHelper { public: + /** delete copy constructor */ + XclExpUrlHelper(const XclExpUrlHelper&) = delete; + /** delete copy-assignment operator */ + const XclExpUrlHelper& operator=(const XclExpUrlHelper&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods. */ + XclExpUrlHelper() = delete; + /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL. @param pTableName Optional pointer to a table name to be encoded in this URL. */ static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = nullptr ); /** Encodes and returns the passed DDE link to an Excel like DDE link. */ static OUString EncodeDde( const OUString& rApplic, const OUString& rTopic ); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclExpUrlHelper(); }; class ScMatrix; diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 5eb6811b8f69..47fabf38a19d 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -31,7 +31,6 @@ #include <map> #include <vector> #include <memory> -#include <boost/noncopyable.hpp> /* ============================================================================ Classes to import the big Excel document contents (related to several cells or @@ -73,9 +72,17 @@ private: // Hyperlinks ================================================================= /** Provides importing hyperlinks and inserting them into a document. */ -class XclImpHyperlink : private boost::noncopyable +class XclImpHyperlink { public: + /** delete copy constructor */ + XclImpHyperlink(const XclImpHyperlink&) = delete; + /** delete copy-assignment operator */ + const XclImpHyperlink& operator=(const XclImpHyperlink&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods. */ + XclImpHyperlink() = delete; + /** Reads a HLINK record and inserts it into the document. @descr Import stream must be located at start of a HLINK record. */ static void ReadHlink( XclImpStream& rStrm ); @@ -89,29 +96,24 @@ public: /** Convert the sheet name with invalid character(s) in URL when the URL is to a location within the same document (e.g. #'Sheet&Name'.A1). */ static void ConvertToValidTabName(OUString& rName); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclImpHyperlink(); }; // Label ranges =============================================================== /** Provides importing label ranges and inserting them into a document. */ -class XclImpLabelranges : private boost::noncopyable +class XclImpLabelranges { public: + /** delete copy constructor */ + XclImpLabelranges(const XclImpLabelranges&) = delete; + /** delete copy-assignment operator */ + const XclImpLabelranges& operator=(const XclImpLabelranges&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods. */ + XclImpLabelranges() = delete; /** Reads a LABELRANGES record and inserts the label ranges into the document. @descr Import stream must be located at start of a LABELRANGES record. */ static void ReadLabelranges( XclImpStream& rStrm ); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclImpLabelranges(); }; // Conditional formatting ===================================================== @@ -253,18 +255,20 @@ private: // Decryption ================================================================= /** Provides static functions to import stream decryption settings. */ -class XclImpDecryptHelper : private boost::noncopyable +class XclImpDecryptHelper { public: + /** delete copy constructor */ + XclImpDecryptHelper(const XclImpDecryptHelper&) = delete; + /** delete copy-assignment operator */ + const XclImpDecryptHelper& operator=(const XclImpDecryptHelper&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods. */ + XclImpDecryptHelper() = delete; + /** Reads the FILEPASS record, queries a password and sets decryption algorithm. @return Error code that may cause an error message after import. */ static ErrCode ReadFilepass( XclImpStream& rStrm ); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclImpDecryptHelper(); }; // Document protection ======================================================== diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 08fb98635435..a0ff9bc8db1a 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SC_SOURCE_FILTER_INC_XIHELPER_HXX #include <editeng/editdata.hxx> -#include <boost/noncopyable.hpp> #include "types.hxx" #include "xladdress.hxx" #include "xiroot.hxx" @@ -105,9 +104,16 @@ class EditTextObject; /** This class provides methods to convert an XclImpString. @The string can be converted to an edit engine text object or directly to a Calc edit cell. */ -class XclImpStringHelper : private boost::noncopyable +class XclImpStringHelper { public: + /** delete copy constructor */ + XclImpStringHelper(const XclImpStringHelper&) = delete; + /** delete copy-assignment operator */ + const XclImpStringHelper& operator=(const XclImpStringHelper&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods. */ + XclImpStringHelper() = delete; /** Returns a new edit engine text object. @param nXFIndex Index to XF for first text portion (for escapement). */ static EditTextObject* CreateTextObject( @@ -117,12 +123,6 @@ public: static void SetToDocument( ScDocumentImport& rDoc, const ScAddress& rPos, const XclImpRoot& rRoot, const XclImpString& rString, sal_uInt16 nXFIndex = 0 ); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclImpStringHelper(); }; // Header/footer conversion =================================================== @@ -162,9 +162,14 @@ struct XclFontData; Known but unsupported control sequences: &G picture */ -class XclImpHFConverter : protected XclImpRoot, private boost::noncopyable +class XclImpHFConverter : protected XclImpRoot { public: + /** delete copy constructor */ + XclImpHFConverter(const XclImpHFConverter&) = delete; + /** delete copy-assignment operator */ + const XclImpHFConverter& operator=(const XclImpHFConverter&) = delete; + explicit XclImpHFConverter( const XclImpRoot& rRoot ); virtual ~XclImpHFConverter(); @@ -247,9 +252,17 @@ private: /** This class contains static methods to decode an URL stored in an Excel file. @descr Excel URLs can contain a sheet name, for instance: path\[test.xls]Sheet1 This sheet name will be extracted automatically. */ -class XclImpUrlHelper : private boost::noncopyable +class XclImpUrlHelper { public: + /** delete copy constructor */ + XclImpUrlHelper(const XclImpUrlHelper&) = delete; + /** delete copy-assignment operator */ + const XclImpUrlHelper& operator=(const XclImpUrlHelper&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static methods. */ + XclImpUrlHelper() = delete; + /** Decodes an encoded external document URL with optional sheet name. @param rUrl Returns the decoded file name incl. path. @param rTabName Returns the decoded sheet name. @@ -278,12 +291,6 @@ public: For OLE object links: Decodes to class name and document URL. @return true = decoding was successful, returned strings are valid (not empty). */ static bool DecodeLink( OUString& rApplic, OUString& rTopic, const OUString& rEncUrl ); - -private: - /** We don't want anybody to instantiate this class, since it is just a - collection of static methods. To enforce this, the default constructor - is made private */ - XclImpUrlHelper(); }; // Cached values ============================================================== @@ -292,9 +299,13 @@ class ScTokenArray; /** This class stores one cached value of a cached value list (used for instance in CRN, EXTERNNAME, tArray). */ -class XclImpCachedValue : private boost::noncopyable +class XclImpCachedValue { public: + /** delete copy constructor */ + XclImpCachedValue(const XclImpCachedValue&) = delete; + /** delete copy-assignment operator */ + const XclImpCachedValue& operator=(const XclImpCachedValue&) = delete; /** Creates a cached value and reads contents from stream and stores it with its array address. */ explicit XclImpCachedValue( XclImpStream& rStrm ); virtual ~XclImpCachedValue(); diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 8c06a13406bd..ca3b8dc3a36c 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -26,7 +26,6 @@ #include "rangenam.hxx" -#include <boost/noncopyable.hpp> #include <memory> #include <vector> @@ -34,7 +33,7 @@ class ScRangeData; class ScTokenArray; /** Represents a defined name. It may be related to a single sheet or global. */ -class XclImpName : protected XclImpRoot, public boost::noncopyable +class XclImpName : protected XclImpRoot { struct TokenStrmData { @@ -47,6 +46,9 @@ class XclImpName : protected XclImpRoot, public boost::noncopyable }; public: + XclImpName(const XclImpName&) = delete; + const XclImpName& operator=(const XclImpName&) = delete; + explicit XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ); inline const OUString& GetXclName() const { return maXclName; } diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index 55c4132cb239..0237d5007c52 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -24,7 +24,6 @@ #include <memory> #include <vector> #include <tools/mempool.hxx> -#include <boost/noncopyable.hpp> #include "rangelst.hxx" #include "patattr.hxx" #include "xladdress.hxx" @@ -156,9 +155,14 @@ private: }; /** Stores the data of all fonts occurred in an Excel file. */ -class XclImpFontBuffer : protected XclImpRoot, private boost::noncopyable +class XclImpFontBuffer : protected XclImpRoot { public: + /** delete copy constructor */ + XclImpFontBuffer(const XclImpFontBuffer&) = delete; + /** delete copy-assignment operator */ + const XclImpFontBuffer& operator=(const XclImpFontBuffer&) = delete; + explicit XclImpFontBuffer( const XclImpRoot& rRoot ); /** Clears all buffered data, used to set up for a new sheet. */ @@ -376,9 +380,13 @@ inline bool operator!=( const XclImpXFIndex& rLeft, const XclImpXFIndex& rRight { return !(rLeft == rRight); } /** Contains all data of a XF record and a Calc item set. */ -class XclImpXF : public XclXFBase, protected XclImpRoot, private boost::noncopyable +class XclImpXF : public XclXFBase, protected XclImpRoot { public: + /** make noncopyable */ + XclImpXF(const XclImpXF&) = delete; + const XclImpXF& operator=(const XclImpXF&) = delete; + explicit XclImpXF( const XclImpRoot& rRoot ); virtual ~XclImpXF(); @@ -472,9 +480,13 @@ private: /** Contains all XF records occurred in the file. @descr This class is able to read XF records (BIFF2 - BIFF8) and STYLE records (BIFF8). */ -class XclImpXFBuffer : protected XclImpRoot, private boost::noncopyable +class XclImpXFBuffer : protected XclImpRoot { public: + /** make noncopyable */ + XclImpXFBuffer(const XclImpXFBuffer&) = delete; + const XclImpXFBuffer& operator=(const XclImpXFBuffer&) = delete; + explicit XclImpXFBuffer( const XclImpRoot& rRoot ); /** Clears all buffered data, used to set up for a new sheet. */ @@ -557,9 +569,13 @@ inline bool XclImpXFRange::Contains( SCROW nScRow ) const } /** Contains the XF indexes for every used cell in a column. */ -class XclImpXFRangeColumn : private boost::noncopyable +class XclImpXFRangeColumn { public: + /** make noncopyable */ + XclImpXFRangeColumn(const XclImpXFRangeColumn&) = delete; + const XclImpXFRangeColumn& operator=(const XclImpXFRangeColumn&) = delete; + typedef std::vector< std::unique_ptr<XclImpXFRange> > IndexList; inline explicit XclImpXFRangeColumn() {} @@ -595,9 +611,13 @@ private: }; /** Contains the XF indexes for every used cell in a single sheet. */ -class XclImpXFRangeBuffer : protected XclImpRoot, private boost::noncopyable +class XclImpXFRangeBuffer : protected XclImpRoot { public: + /** make noncopyable */ + XclImpXFRangeBuffer(const XclImpXFRangeBuffer&) = delete; + const XclImpXFRangeBuffer& operator=(const XclImpXFRangeBuffer&) = delete; + explicit XclImpXFRangeBuffer( const XclImpRoot& rRoot ); virtual ~XclImpXFRangeBuffer(); diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx index b60d21a3f4a9..9fe993c35842 100644 --- a/sc/source/filter/inc/xlpage.hxx +++ b/sc/source/filter/inc/xlpage.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SC_SOURCE_FILTER_INC_XLPAGE_HXX #include <tools/gen.hxx> -#include <boost/noncopyable.hpp> #include "xltools.hxx" #include <memory> @@ -90,8 +89,12 @@ const sal_uInt16 EXC_PAPERSIZE_USER = 0xFFFF; class SvxBrushItem; /** Contains all page (print) settings for a single sheet. */ -struct XclPageData : private boost::noncopyable +struct XclPageData { + /** noncopyable */ + XclPageData(const XclPageData&) = delete; + const XclPageData& operator=(const XclPageData&) = delete; + typedef std::unique_ptr< SvxBrushItem > SvxBrushItemPtr; ScfUInt16Vec maHorPageBreaks; /// Horizontal page breaks. diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 7e203f7c8b7c..fa0b952d6375 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -22,7 +22,6 @@ #include "address.hxx" #include "ftools.hxx" -#include <boost/noncopyable.hpp> class SfxObjectShell; @@ -76,9 +75,18 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclGuid& rGuid ); // Excel Tools ================================================================ /** This class contains static helper methods for the Excel import and export filters. */ -class XclTools : private boost::noncopyable +class XclTools { public: + // noncopyable nonconstructable ------------------------------------------- + + XclTools(const XclTools&) = delete; + const XclTools& operator=(const XclTools&) = delete; + /** We don't want anybody to instantiate this class, since it is just a + collection of static items. */ + XclTools() = delete; + + // GUID's ----------------------------------------------------------------- static const XclGuid maGuidStdLink; /// GUID of StdLink (HLINK record). @@ -238,11 +246,6 @@ private: static const OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter. static const OUString maSbMacroPrefix; /// Prefix for StarBasic macros. static const OUString maSbMacroSuffix; /// Suffix for StarBasic macros. - - /** We don't want anybody to instantiate this class, since it is just a - collection of static items. To enforce this, the default constructor - is made private */ - XclTools(); }; // read/write colors ---------------------------------------------------------- diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 818dd4da166d..9c010cb39f68 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::container; -#include <boost/noncopyable.hpp> #include <memory> namespace oox { namespace xls { @@ -47,15 +46,20 @@ namespace { * Cache the token array for the last cell position in each column. We use * one cache per sheet. */ -class CachedTokenArray : private boost::noncopyable +class CachedTokenArray { public: + CachedTokenArray(const CachedTokenArray&) = delete; + const CachedTokenArray& operator=(const CachedTokenArray&) = delete; - struct Item : boost::noncopyable + struct Item { SCROW mnRow; ScFormulaCell* mpCell; + Item(const Item&) = delete; + const Item& operator=(const Item&) = delete; + Item() : mnRow(-1), mpCell(nullptr) {} }; @@ -307,7 +311,7 @@ void processSheetFormulaCells( applyCellFormulaValues(rDoc, *rItem.mpCellFormulaValues); } -class WorkerThread: public salhelper::Thread, private boost::noncopyable +class WorkerThread: public salhelper::Thread { ScDocumentImport& mrDoc; FormulaBuffer::SheetItem& mrItem; @@ -315,6 +319,9 @@ class WorkerThread: public salhelper::Thread, private boost::noncopyable const uno::Sequence<sheet::ExternalLinkInfo>& mrExternalLinks; public: + WorkerThread(const WorkerThread&) = delete; + const WorkerThread& operator=(const WorkerThread&) = delete; + WorkerThread( ScDocumentImport& rDoc, FormulaBuffer::SheetItem& rItem, SvNumberFormatter* pFormatter, const uno::Sequence<sheet::ExternalLinkInfo>& rExternalLinks ) : diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 62bc87d0bc43..546d4f4394f7 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -85,7 +85,6 @@ #include <comphelper/processfactory.hxx> #include <officecfg/Office/Calc.hxx> -#include <boost/noncopyable.hpp> #include <memory> namespace oox { @@ -110,9 +109,14 @@ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rNam return rName1.compareToIgnoreAsciiCase(rName2 ) < 0; } -class WorkbookGlobals : private boost::noncopyable +class WorkbookGlobals { public: + // noncopyable ------------------------------------------------------------ + + WorkbookGlobals(const WorkbookGlobals&) = delete; + const WorkbookGlobals& operator=(const WorkbookGlobals&) = delete; + explicit WorkbookGlobals( ExcelFilter& rFilter ); ~WorkbookGlobals(); diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 203f2f4a57e5..2419616c43ba 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -36,7 +36,6 @@ #include "postit.hxx" #include "cellvalue.hxx" -#include <boost/noncopyable.hpp> #include <memory> class ScHorizontalCellIterator; @@ -315,8 +314,11 @@ struct ScMyCell ~ScMyCell(); }; -class ScMyNotEmptyCellsIterator : private boost::noncopyable +class ScMyNotEmptyCellsIterator { + ScMyNotEmptyCellsIterator(const ScMyNotEmptyCellsIterator&) = delete; + const ScMyNotEmptyCellsIterator& operator=(const ScMyNotEmptyCellsIterator&) = delete; + css::uno::Reference<css::sheet::XSpreadsheet> xTable; css::uno::Reference<css::table::XCellRange> xCellRange; css::table::CellAddress aLastAddress; diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 56090ca95bcf..883b3c71bb7d 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -28,7 +28,6 @@ #include <editeng/flditem.hxx> #include <boost/optional.hpp> -#include <boost/noncopyable.hpp> #include <memory> #include <vector> @@ -47,11 +46,14 @@ class ScXMLTableRowCellContext : public ScXMLImportContext explicit ParaFormat(ScEditEngineDefaulter& rEditEngine); }; - struct Field : boost::noncopyable + struct Field { SvxFieldData* mpData; ESelection maSelection; + Field(const Field&) = delete; + const Field& operator=(const Field&) = delete; + explicit Field(SvxFieldData* pData); ~Field(); }; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 395c0e871b52..18aaddf3accb 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -42,8 +42,6 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp> -#include <boost/noncopyable.hpp> - #include <memory> #include <unordered_map> #include <map> @@ -820,8 +818,11 @@ typedef std::vector<ScMyImportValidation> ScMyImportValidations; class ScMyStylesImportHelper; class ScXMLEditAttributeMap; -class ScXMLImport: public SvXMLImport, private boost::noncopyable +class ScXMLImport: public SvXMLImport { + ScXMLImport(const ScXMLImport&) = delete; + const ScXMLImport& operator=(const ScXMLImport&) = delete; + typedef std::unordered_map< OUString, sal_Int16, OUStringHash > CellTypeMap; typedef ::std::map<SCTAB, std::unique_ptr<ScMyNamedExpressions>> SheetNamedExpMap; |