sw/inc/pch/precompiled_msword.hxx | 1 -
sw/inc/pch/precompiled_sw.hxx | 1 -
sw/inc/pch/precompiled_swui.hxx | 1 -
sw/inc/pch/precompiled_vbaswobj.hxx | 1 -
sw/source/core/doc/tblafmt.cxx | 7 ++++---
sw/source/filter/ww8/wrtw8sty.cxx | 6 ++++--
sw/source/filter/ww8/wrtww8.cxx | 11 ++++++++---
sw/source/filter/ww8/ww8par.cxx | 6 ++++--
sw/source/filter/ww8/ww8par.hxx | 19 +++++++++++++++----
sw/source/filter/ww8/ww8par2.cxx | 12 +++++++++---
sw/source/filter/xml/xmlimpit.cxx | 6 ++++--
sw/source/ui/dbui/dbinsdlg.cxx | 6 ++++--
sw/source/uibase/app/swdllimpl.hxx | 6 ++++--
sw/source/uibase/sidebar/SwPanelFactory.cxx | 10 ++++++----
sw/source/uibase/uno/unomailmerge.cxx | 13 +++++++++----
15 files changed, 71 insertions(+), 35 deletions(-)
New commits:
commit 082005bf81b1c72da042193449974bbb610ca85f
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 6 17:47:34 2016 +0200
sw: replace boost::noncopyable with C++11 delete
Change-Id: Iac20763c7d1db467420f9c2fbb3cd636839d4c80
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 53ad3c2..e085bba 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -52,7 +52,6 @@
#include <unordered_map>
#include <utility>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/optional.hpp>
#include <boost/optional/optional.hpp>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index f49478c..480012e 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -61,7 +61,6 @@
#include <utility>
#include <vector>
#include <boost/intrusive_ptr.hpp>
-#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 9edc798..a9e3d58 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -41,8 +41,6 @@
#include <fmtornt.hxx>
#include <editsh.hxx>
-#include <boost/noncopyable.hpp>
-
#include <memory>
#include <vector>
@@ -130,7 +128,7 @@ namespace
See also: BeginSwBlock and EndSwBlock.
*/
- class WriterSpecificAutoFormatBlock : private ::boost::noncopyable
+ class WriterSpecificAutoFormatBlock
{
public:
explicit WriterSpecificAutoFormatBlock(SvStream &rStream) :
_rStream(rStream)
@@ -144,6 +142,9 @@ namespace
}
private:
+ WriterSpecificAutoFormatBlock(WriterSpecificAutoFormatBlock const&) =
delete;
+ WriterSpecificAutoFormatBlock& operator=(WriterSpecificAutoFormatBlock
const&) = delete;
+
SvStream &_rStream;
sal_uInt64 _whereToWriteEndOfBlock;
};
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index ae4abb0..b0153bd 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -91,7 +91,6 @@
#include <o3tl/make_unique.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <swuiexp.hxx>
@@ -157,7 +156,7 @@ struct DB_Column
}
};
-struct DB_ColumnConfigData: private boost::noncopyable
+struct DB_ColumnConfigData
{
SwInsDBColumns aDBColumns;
OUString sSource;
@@ -171,6 +170,9 @@ struct DB_ColumnConfigData: private boost::noncopyable
bIsHeadlineOn : 1,
bIsEmptyHeadln : 1;
+ DB_ColumnConfigData(DB_ColumnConfigData const&) = delete;
+ DB_ColumnConfigData& operator=(DB_ColumnConfigData const&) = delete;
+
DB_ColumnConfigData()
{
bIsTable = bIsHeadlineOn = true;
diff --git a/sw/source/uibase/app/swdllimpl.hxx
b/sw/source/uibase/app/swdllimpl.hxx
index 06f277c..57a34be 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -12,12 +12,11 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace sw { class Filters; }
-class SwDLL: private boost::noncopyable
+class SwDLL
{
public:
static void RegisterFactories();
@@ -30,6 +29,9 @@ public:
sw::Filters & getFilters();
private:
+ SwDLL(SwDLL const&) = delete;
+ SwDLL& operator=(SwDLL const&) = delete;
+
std::unique_ptr< sw::Filters > filters_;
};
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index dc048745..ed9263b 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -37,7 +37,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <boost/noncopyable.hpp>
using namespace css;
using namespace css::uno;
@@ -49,10 +48,13 @@ typedef ::cppu::WeakComponentImplHelper <
> PanelFactoryInterfaceBase;
class SwPanelFactory
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
- public PanelFactoryInterfaceBase
+ : private ::cppu::BaseMutex
+ , public PanelFactoryInterfaceBase
{
+private:
+ SwPanelFactory(SwPanelFactory const&) = delete;
+ SwPanelFactory& operator=(SwPanelFactory const&) = delete;
+
public:
SwPanelFactory();
virtual ~SwPanelFactory();
diff --git a/sw/source/uibase/uno/unomailmerge.cxx
b/sw/source/uibase/uno/unomailmerge.cxx
index d29be10..7c8a602 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -70,7 +70,6 @@
#include <unomid.h>
-#include <boost/noncopyable.hpp>
#include <memory>
using namespace ::com::sun::star;
@@ -184,8 +183,7 @@ static bool LoadFromURL_impl(
namespace
{
- class DelayedFileDeletion : public ::cppu::WeakImplHelper<
util::XCloseListener >,
- private boost::noncopyable
+ class DelayedFileDeletion : public
::cppu::WeakImplHelper<util::XCloseListener>
{
protected:
::osl::Mutex m_aMutex;
@@ -194,6 +192,9 @@ namespace
OUString m_sTemporaryFile;
sal_Int32 m_nPendingDeleteAttempts;
+ DelayedFileDeletion(DelayedFileDeletion const&) = delete;
+ DelayedFileDeletion& operator=(DelayedFileDeletion const&) = delete;
+
public:
DelayedFileDeletion( const Reference< XModel >& _rxModel,
const OUString& _rTemporaryFile );
@@ -409,7 +410,8 @@ SwXMailMerge::~SwXMailMerge()
}
// Guarantee object consistence in case of an exception
-class MailMergeExecuteFinalizer: private boost::noncopyable {
+class MailMergeExecuteFinalizer
+{
public:
explicit MailMergeExecuteFinalizer(SwXMailMerge *mailmerge)
: m_pMailMerge(mailmerge)
@@ -423,6 +425,9 @@ public:
}
private:
+ MailMergeExecuteFinalizer(MailMergeExecuteFinalizer const&) = delete;
+ MailMergeExecuteFinalizer& operator=(MailMergeExecuteFinalizer const&) =
delete;
+
SwXMailMerge *m_pMailMerge;
};
commit 1f036d51fa581c3a4f80065d0fbe77b7076665e4
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 6 17:40:50 2016 +0200
sw: replace boost::noncopyable with C++11 delete
Change-Id: I5c97c500096dee70bf9208daae38c3f042ac57d3
diff --git a/sw/inc/pch/precompiled_msword.hxx
b/sw/inc/pch/precompiled_msword.hxx
index 7986563..9e6a8a8 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -63,7 +63,6 @@
#include <utility>
#include <vector>
#include <boost/intrusive_ptr.hpp>
-#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
#include <osl/diagnose.h>
#include <osl/diagnose.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx
b/sw/inc/pch/precompiled_vbaswobj.hxx
index 4775356..7d06a87 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -60,7 +60,6 @@
#include <utility>
#include <vector>
#include <boost/intrusive_ptr.hpp>
-#include <boost/noncopyable.hpp>
#include <boost/operators.hpp>
#include <boost/optional.hpp>
#include <osl/diagnose.h>
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index f945e32..19abee1 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -20,7 +20,6 @@
#include <algorithm>
#include <functional>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -100,12 +99,15 @@ struct WW8_SED
// class WW8_WrPlc0 is only used for header and footer positioning
// ie there is no content support structure
-class WW8_WrPlc0: private boost::noncopyable
+class WW8_WrPlc0
{
private:
std::vector<sal_uLong> aPos; // PTRARR of CPs / FCs
sal_uLong nOfs;
+ WW8_WrPlc0(WW8_WrPlc0 const&) = delete;
+ WW8_WrPlc0& operator=(WW8_WrPlc0 const&) = delete;
+
public:
explicit WW8_WrPlc0( sal_uLong nOffset );
sal_uInt16 Count() const { return aPos.size(); }
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index a872f68..a248e85 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -19,7 +19,6 @@
#include <iostream>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <unotools/ucbstreamhelper.hxx>
@@ -183,12 +182,15 @@ typedef std::pair<long,BKMK> BKMKCP;
typedef std::multimap<long,BKMKCP*> BKMKCPs;
typedef BKMKCPs::iterator CPItr;
-class WW8_WrtBookmarks: private boost::noncopyable
+class WW8_WrtBookmarks
{
private:
BKMKCPs aSttCps,aEndCps;
BKMKNames maSwBkmkNms;
+ WW8_WrtBookmarks(WW8_WrtBookmarks const&) = delete;
+ WW8_WrtBookmarks& operator=(WW8_WrtBookmarks const&) = delete;
+
public:
WW8_WrtBookmarks();
~WW8_WrtBookmarks();
@@ -315,12 +317,15 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom,
WW8_CP nTo)
}
/// Handles export of smart tags.
-class WW8_WrtFactoids: private boost::noncopyable
+class WW8_WrtFactoids
{
std::vector<WW8_CP> m_aStartCPs;
std::vector<WW8_CP> m_aEndCPs;
std::vector< std::map<OUString, OUString> > m_aStatements;
+ WW8_WrtFactoids(WW8_WrtFactoids const&) = delete;
+ WW8_WrtFactoids& operator=(WW8_WrtFactoids const&) = delete;
+
public:
WW8_WrtFactoids();
~WW8_WrtFactoids();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 72919f6..b1d72b9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -21,7 +21,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <i18nlangtag/languagetag.hxx>
@@ -439,7 +438,7 @@ OUString BasicProjImportHelper::getProjectName()
return sProjName;
}
-class Sttb : public TBBase, private boost::noncopyable
+class Sttb : public TBBase
{
struct SBBItem
{
@@ -453,6 +452,9 @@ struct SBBItem
std::vector< SBBItem > dataItems;
+ Sttb(Sttb const&) = delete;
+ Sttb& operator=(Sttb const&) = delete;
+
public:
Sttb();
virtual ~Sttb();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 72f453b..a9e1b77 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -54,7 +54,6 @@
#include <editeng/lrspitem.hxx>
#include <oox/ole/olehelper.hxx>
-#include <boost/noncopyable.hpp>
class SwDoc;
class SwPaM;
@@ -653,10 +652,14 @@ enum SwWw8ControlType
WW8_CT_DROPDOWN
};
-class WW8FormulaControl : private ::boost::noncopyable
+class WW8FormulaControl
{
protected:
SwWW8ImplReader &mrRdr;
+
+ WW8FormulaControl(WW8FormulaControl const&) = delete;
+ WW8FormulaControl& operator=(WW8FormulaControl const&) = delete;
+
public:
WW8FormulaControl(const OUString& rN, SwWW8ImplReader &rRdr)
: mrRdr(rRdr), mfUnknown(0), mfDropdownIndex(0),
@@ -915,7 +918,7 @@ public:
//Safest thing is to not delete SwTextNodes from a document during import, and
//remove these extraneous paragraphs at the end after all SwFltControlStack are
//destroyed.
-class wwExtraneousParas : private ::boost::noncopyable
+class wwExtraneousParas
{
private:
/*
@@ -923,6 +926,10 @@ private:
*/
std::set<SwTextNode*, SwWW8::ltnode> m_aTextNodes;
SwDoc& m_rDoc;
+
+ wwExtraneousParas(wwExtraneousParas const&) = delete;
+ wwExtraneousParas& operator=(wwExtraneousParas const&) = delete;
+
public:
explicit wwExtraneousParas(SwDoc &rDoc) : m_rDoc(rDoc) {}
~wwExtraneousParas() { delete_all_from_doc(); }
@@ -930,12 +937,16 @@ public:
void delete_all_from_doc();
};
-class wwFrameNamer : private ::boost::noncopyable
+class wwFrameNamer
{
private:
OUString msSeed;
sal_Int32 mnImportedGraphicsCount;
bool mbIsDisabled;
+
+ wwFrameNamer(wwFrameNamer const&) = delete;
+ wwFrameNamer& operator=(wwFrameNamer const&) = delete;
+
public:
void SetUniqueGraphName(SwFrameFormat *pFrameFormat, const OUString
&rFixedPart);
wwFrameNamer(bool bIsDisabled, const OUString &rSeed)
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 47566bb..acafdd7 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <comphelper/string.hxx>
#include <tools/solar.h>
#include <vcl/vclenum.hxx>
@@ -76,8 +75,12 @@
using namespace ::com::sun::star;
class WW8SelBoxInfo
- : public std::vector<SwTableBox*>, private boost::noncopyable
+ : public std::vector<SwTableBox*>
{
+private:
+ WW8SelBoxInfo(WW8SelBoxInfo const&) = delete;
+ WW8SelBoxInfo& operator=(WW8SelBoxInfo const&) = delete;
+
public:
short nGroupXStart;
short nGroupWidth;
@@ -102,7 +105,7 @@ WW8TabBandDesc::~WW8TabBandDesc()
delete[] pNewSHDs;
}
-class WW8TabDesc: private boost::noncopyable
+class WW8TabDesc
{
std::vector<OUString> aNumRuleNames;
sw::util::RedlineStack *mpOldRedlineStack;
@@ -167,6 +170,9 @@ class WW8TabDesc: private boost::noncopyable
void StartMiserableHackForUnsupportedDirection(short nWwCol);
void EndMiserableHackForUnsupportedDirection(short nWwCol);
+ WW8TabDesc(WW8TabDesc const&) = delete;
+ WW8TabDesc& operator=(WW8TabDesc const&) = delete;
+
public:
const SwTable* pTable; // table
SwPosition* pParentPos;
diff --git a/sw/source/filter/xml/xmlimpit.cxx
b/sw/source/filter/xml/xmlimpit.cxx
index 0e28509..ea475c3 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -50,7 +50,6 @@
#include <xmloff/xmlprhdl.hxx>
#include "xmlithlp.hxx"
#include <com/sun/star/uno/Any.hxx>
-#include <boost/noncopyable.hpp>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -222,13 +221,16 @@ SvXMLImportItemMapper::finished(SfxItemSet &,
SvXMLUnitConverter const&) const
// nothing to do here
}
-struct BoxHolder : private boost::noncopyable
+struct BoxHolder
{
SvxBorderLine* pTop;
SvxBorderLine* pBottom;
SvxBorderLine* pLeft;
SvxBorderLine* pRight;
+ BoxHolder(BoxHolder const&) = delete;
+ BoxHolder& operator=(BoxHolder const&) = delete;
+
explicit BoxHolder(SvxBoxItem& rBox)
{
pTop = rBox.GetTop() == nullptr ?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
