[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source framework/source

[Noel Grandin (via logerrit)]

 editeng/source/editeng/editdbg.cxx  |  235 
--
 extensions/source/logging/csvformatter.cxx  |9 
 extensions/source/logging/plaintextformatter.cxx|9 
 extensions/source/propctrlr/eventhandler.cxx|6 
 extensions/source/propctrlr/formcomponenthandler.cxx|9 
 extensions/source/propctrlr/standardcontrol.cxx |4 
 extensions/source/propctrlr/stringrepresentation.cxx|3 
 filter/source/msfilter/rtfutil.cxx  |   14 
 filter/source/svg/svgwriter.cxx |8 
 forms/source/component/DatabaseForm.cxx |   10 
 forms/source/component/Filter.cxx   |   14 
 forms/source/xforms/model_ui.cxx|3 
 forms/source/xforms/submission/submission_get.cxx   |3 
 framework/source/fwe/helper/titlehelper.cxx |3 
 framework/source/fwi/classes/converter.cxx  |   11 
 framework/source/recording/dispatchrecorder.cxx |   36 -
 framework/source/services/urltransformer.cxx|7 
 framework/source/uielement/headermenucontroller.cxx |   11 
 framework/source/uielement/langselectionstatusbarcontroller.cxx |3 
 framework/source/uielement/recentfilesmenucontroller.cxx|3 
 20 files changed, 184 insertions(+), 217 deletions(-)

New commits:
commit 3a0c5b782001fc398740b46f2adc9e07055505d6
Author: Noel Grandin 
AuthorDate: Fri Mar 24 19:12:58 2023 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 25 07:27:34 2023 +

loplugin:stringadd in editeng..framework

after my patch to merge the bufferadd loplugin into stringadd

Change-Id: Ieac16a01fde6467a2f6fe47864069304a3c44e47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149552
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index e3c8f5a2bff8..308d4af93794 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -64,83 +64,83 @@ static OString DbgOutItem(const SfxItemPool& rPool, const 
SfxPoolItem& rItem)
 switch ( rItem.Which() )
 {
 case EE_PARA_WRITINGDIR:
-aDebStr.append("WritingDir=");
-aDebStr.append(static_cast(static_cast(rItem).GetValue()));
+aDebStr.append("WritingDir="
++ OString::number(static_cast(static_cast(rItem).GetValue(;
 break;
 case EE_PARA_OUTLLRSPACE:
 case EE_PARA_LRSPACE:
-aDebStr.append("FI=");
-aDebStr.append(static_cast(static_cast(rItem).GetTextFirstLineOffset()));
-aDebStr.append(", LI=");
-aDebStr.append(static_cast(static_cast(rItem).GetTextLeft()));
-aDebStr.append(", RI=");
-aDebStr.append(static_cast(static_cast(rItem).GetRight()));
+aDebStr.append("FI="
++ OString::number(static_cast(static_cast(rItem).GetTextFirstLineOffset()))
++ ", LI="
++ OString::number(static_cast(static_cast(rItem).GetTextLeft()))
++ ", RI="
++ OString::number(static_cast(static_cast(rItem).GetRight(;
 break;
 case EE_PARA_NUMBULLET:
 aDebStr.append("NumItem ");
 for ( sal_uInt16 nLevel = 0; nLevel < 3; nLevel++ )
 {
-aDebStr.append("Level");
-aDebStr.append(static_cast(nLevel));
-aDebStr.append('=');
+aDebStr.append("Level"
++ OString::number(static_cast(nLevel))
++ "=");
 const SvxNumberFormat* pFmt = static_cast(rItem).GetNumRule().Get( nLevel );
 if ( pFmt )
 {
-aDebStr.append('(');
-aDebStr.append(pFmt->GetFirstLineOffset());
-aDebStr.append(',');
-aDebStr.append(pFmt->GetAbsLSpace());
-aDebStr.append(',');
+aDebStr.append("("
++ OString::number(pFmt->GetFirstLineOffset())
++ ","
++ OString::number(pFmt->GetAbsLSpace())
++ ",");
 if ( pFmt->GetNumberingType() == SVX_NUM_BITMAP )
 aDebStr.append("Bitmap");
 else if( pFmt->GetNumberingType() != SVX_NUM_CHAR_SPECIAL )
 aDebStr.append("Number");
 else
 {
-aDebStr.append("Char=[");
-
aDebStr.append(static_cast(pFmt->GetBulletChar()));
-aDebStr.append(']');
+aDebStr.append("Char=["
+ 

[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source fpicker/source framework/source helpcompiler/source i18npool/source

[Libreoffice Gerrit user]

 editeng/source/items/paperinf.cxx   |2 +-
 editeng/source/misc/acorrcfg.cxx|3 ++-
 editeng/source/outliner/outliner.cxx|2 +-
 extensions/source/bibliography/bibload.cxx  |2 +-
 filter/source/flash/swfwriter1.cxx  |4 ++--
 filter/source/graphicfilter/eps/eps.cxx |6 +++---
 filter/source/graphicfilter/etiff/etiff.cxx |2 +-
 filter/source/graphicfilter/icgm/actimpr.cxx|2 +-
 filter/source/msfilter/escherex.cxx |2 +-
 filter/source/msfilter/msvbahelper.cxx  |2 +-
 filter/source/svg/svgwriter.cxx |2 +-
 filter/source/xsltfilter/LibXSLTTransformer.cxx |   12 +++-
 forms/source/richtext/richtextengine.cxx|2 +-
 fpicker/source/office/iodlg.cxx |2 +-
 framework/source/fwe/helper/actiontriggerhelper.cxx |2 +-
 framework/source/fwi/helper/mischelper.cxx  |2 +-
 framework/source/tabwin/tabwindow.cxx   |4 ++--
 helpcompiler/source/HelpCompiler.cxx|3 +--
 i18npool/source/localedata/LocaleNode.cxx   |   12 ++--
 19 files changed, 31 insertions(+), 37 deletions(-)

New commits:
commit 51d1ec7883444e6216f1020122084d3a996c9ecb
Author: Noel Grandin 
AuthorDate: Tue Oct 23 07:50:57 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 23 11:48:22 2018 +0200

clang-tidy performance-unnecessary-copy-init in editeng..i18npool

Change-Id: I2ee2c8d15d8700cfaa1697363da4557c741a5f36
Reviewed-on: https://gerrit.libreoffice.org/62216
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/items/paperinf.cxx 
b/editeng/source/items/paperinf.cxx
index 546c1e9c1d68..07ab725f1591 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -65,7 +65,7 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter )
 
 if ( aPaperSize == aInvalidSize )
 return GetPaperSize(PAPER_A4);
-MapMode aMap1 = pPrinter->GetMapMode();
+const MapMode& aMap1 = pPrinter->GetMapMode();
 MapMode aMap2;
 
 if ( aMap1 == aMap2 )
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index e2c45e1850b0..c2b3dbe6fe31 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -48,7 +48,8 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
 bSearchInAllCategories(false)
 {
 SvtPathOptions aPathOpt;
-OUString sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
+OUString sSharePath, sUserPath;
+OUString const & sAutoPath( aPathOpt.GetAutoCorrectPath() );
 
 sSharePath = sAutoPath.getToken(0, ';');
 sUserPath = sAutoPath.getToken(1, ';');
diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index da008ce69989..51e0a5f96383 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -969,7 +969,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& 
rStartPos,
 
 if(bStrippingPortions)
 {
-const vcl::Font aSvxFont(pOutDev->GetFont());
+const vcl::Font& aSvxFont(pOutDev->GetFont());
 std::unique_ptr pBuf(new long[ 
pPara->GetText().getLength() ]);
 pOutDev->GetTextArray( pPara->GetText(), pBuf.get() );
 
diff --git a/extensions/source/bibliography/bibload.cxx 
b/extensions/source/bibliography/bibload.cxx
index 76d4ed6fc43e..06c77c01d902 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -471,7 +471,7 @@ Any BibliographyLoader::getByName(const OUString& rName)
 const Mapping* pMapping = pConfig->GetMapping(aBibDesc);
 for(sal_uInt16 nEntry = 0; nEntry < COLUMN_COUNT; nEntry++)
 {
-const OUString sColName = pConfig->GetDefColumnName(
+const OUString& sColName = pConfig->GetDefColumnName(
 nEntry);
 pValues[nEntry].Name = sColName;
 pValues[nEntry].Value <<= lcl_AddProperty(xColumns, 
pMapping, sColName);
diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index f32eb9538f53..436c2783d63a 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1250,7 +1250,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const 
LineInfo& rInfo, const basegf
 {
 for(sal_uInt32 a(0); a < aLinePolyPolygon.count(); a++)
 {
-const basegfx::B2DPolygon 
aCandidate(aLinePolyPolygon.getB2DPolygon(a));
+const basegfx::B2DPolygon& 
aCandidate(aLinePolyPolygon.getB2DPolygon(a));
 

[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source

[Noel Grandin]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |   12 -
 editeng/source/accessibility/AccessibleImageBullet.cxx  |4 +--
 editeng/source/editeng/impedit3.cxx |6 ++--
 editeng/source/items/frmitems.cxx   |   12 -
 editeng/source/items/numitem.cxx|2 -
 editeng/source/items/textitem.cxx   |   15 
 editeng/source/uno/unonrule.cxx |2 -
 extensions/source/propctrlr/fontdialog.cxx  |   10 
 extensions/source/propctrlr/formcomponenthandler.cxx|9 ++-
 extensions/source/propctrlr/standardcontrol.cxx |4 +--
 filter/source/flash/swfwriter1.cxx  |2 -
 filter/source/msfilter/escherex.cxx |6 ++--
 filter/source/msfilter/msdffimp.cxx |2 -
 filter/source/msfilter/svdfppt.cxx  |9 +++
 filter/source/msfilter/util.cxx |6 ++--
 forms/source/component/Grid.cxx |4 +--
 forms/source/component/formcontrolfont.cxx  |8 +++---
 forms/source/component/navigationbar.cxx|8 +++---
 forms/source/inc/formcontrolfont.hxx|9 ---
 forms/source/richtext/richtextcontrol.cxx   |4 +--
 forms/source/solar/component/navbarcontrol.cxx  |6 ++--
 21 files changed, 66 insertions(+), 74 deletions(-)

New commits:
commit a498b12dc1723b072a165f8c528c377024fd4c98
Author: Noel Grandin 
Date:   Wed Mar 7 08:42:58 2018 +0200

use more Color in editeng..forms

Change-Id: If6c862e7bb61cd78c3379afde11b528a74162900
Reviewed-on: https://gerrit.libreoffice.org/50860
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 90859aac7a73..cbb1d51bb224 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1143,12 +1143,12 @@ namespace accessibility
 sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground(  )
 {
 // #10# Added to XAccessibleComponent interface
-Color aColor( 
Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
+Color aColor( 
Application::GetSettings().GetStyleSettings().GetWindowColor() );
 
 // the background is transparent
 aColor.SetTransparency( 0xFF);
 
-return static_cast( aColor.GetColor() );
+return static_cast( aColor );
 }
 
 // XAccessibleText
@@ -1470,7 +1470,7 @@ namespace accessibility
 if (rRes.Name == "CharColor")
 {
 uno::Any  = rRes.Value;
-sal_uInt32 crChar = static_cast( 
reinterpret_cast(anyChar.pReserved));
+Color crChar = static_cast( 
reinterpret_cast(anyChar.pReserved));
 if (COL_AUTO == crChar )
 {
 uno::Reference< css::accessibility::XAccessibleComponent > 
xComponent(mxParent,uno::UNO_QUERY);
@@ -1485,7 +1485,7 @@ namespace accessibility
 else
 {
 Color cr(xComponent->getBackground());
-crChar = sal_uInt32(cr.IsDark() ? COL_WHITE : 
COL_BLACK);
+crChar = cr.IsDark() ? COL_WHITE : COL_BLACK;
 anyChar <<= crChar;
 }
 }
@@ -1501,7 +1501,7 @@ namespace accessibility
 if (rRes.Name == "CharUnderlineColor")
 {
 uno::Any  = rRes.Value;
-sal_uInt32 crCharUnderLine = static_cast( 
reinterpret_cast( anyCharUnderLine.pReserved));
+Color crCharUnderLine = static_cast( 
reinterpret_cast( anyCharUnderLine.pReserved));
 if (COL_AUTO == crCharUnderLine )
 {
 uno::Reference< css::accessibility::XAccessibleComponent > 
xComponent(mxParent,uno::UNO_QUERY);
@@ -1516,7 +1516,7 @@ namespace accessibility
 else
 {
 Color cr(xComponent->getBackground());
-crCharUnderLine = sal_uInt32(cr.IsDark() ? 
COL_WHITE : COL_BLACK);
+crCharUnderLine = cr.IsDark() ? COL_WHITE : 
COL_BLACK;
 anyCharUnderLine <<= crCharUnderLine;
 }
 }
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx 
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 

[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source formula/source fpicker/source

[Noel Grandin]

 editeng/source/editeng/editdoc.hxx|4 ++--
 editeng/source/editeng/editobj2.hxx   |4 ++--
 editeng/source/editeng/impedit.hxx|   12 ++--
 editeng/source/rtf/rtfitem.cxx|4 ++--
 extensions/source/bibliography/datman.hxx |2 +-
 extensions/source/bibliography/toolbar.cxx|2 +-
 extensions/source/bibliography/toolbar.hxx|6 +++---
 extensions/source/dbpilots/controlwizard.hxx  |2 +-
 extensions/source/propctrlr/browserlistbox.hxx|2 +-
 extensions/source/propctrlr/cellbindinghelper.hxx |4 ++--
 extensions/source/propctrlr/propertyhandler.hxx   |8 
 filter/source/graphicfilter/eps/eps.cxx   |   14 +++---
 filter/source/graphicfilter/ipict/ipict.cxx   |2 +-
 filter/source/msfilter/eschesdo.hxx   |4 ++--
 forms/source/component/DatabaseForm.hxx   |6 +++---
 forms/source/richtext/richtextcontrol.cxx |2 +-
 forms/source/richtext/richtextimplcontrol.hxx |2 +-
 forms/source/richtext/richtextvclcontrol.hxx  |2 +-
 forms/source/xforms/submission.hxx|2 +-
 formula/source/ui/dlg/structpg.hxx|8 
 fpicker/source/office/OfficeControlAccess.hxx |2 +-
 fpicker/source/office/asyncfilepicker.hxx |2 +-
 22 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit b4e12269e813338afc895986fbc4f2703cedd016
Author: Noel Grandin 
Date:   Fri Aug 5 11:11:03 2016 +0200

loplugin:countusersofdefaultparams in editeng..fpicker

Change-Id: I6356c95296d81736fc6d66e510cd70606ee55f68
Reviewed-on: https://gerrit.libreoffice.org/27897
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 93b9495..0c8f09b 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -791,8 +791,8 @@ public:
 voidInsertAttrib( const SfxPoolItem& rItem, ContentNode* 
pNode, sal_Int32 nStart, sal_Int32 nEnd );
 voidInsertAttrib( ContentNode* pNode, sal_Int32 nStart, 
sal_Int32 nEnd, const SfxPoolItem& rPoolItem );
 voidInsertAttribInSelection( ContentNode* pNode, sal_Int32 
nStart, sal_Int32 nEnd, const SfxPoolItem& rPoolItem );
-boolRemoveAttribs( ContentNode* pNode, sal_Int32 nStart, 
sal_Int32 nEnd, sal_uInt16 nWhich = 0 );
-boolRemoveAttribs( ContentNode* pNode, sal_Int32 nStart, 
sal_Int32 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, 
sal_uInt16 nWhich = 0 );
+boolRemoveAttribs( ContentNode* pNode, sal_Int32 nStart, 
sal_Int32 nEnd, sal_uInt16 nWhich );
+boolRemoveAttribs( ContentNode* pNode, sal_Int32 nStart, 
sal_Int32 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, 
sal_uInt16 nWhich );
 static void FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, 
sal_Int32 nEndPos, SfxItemSet& rCurSet );
 
 sal_Int32 GetPos(const ContentNode* pNode) const;
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index 289427f..cd5d53a 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -225,7 +225,7 @@ public:
 
 void GetCharAttribs( sal_Int32 nPara, std::vector& rLst ) 
const;
 
-bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
+bool RemoveCharAttribs( sal_uInt16 nWhich );
 
 void GetAllSections( std::vector& rAttrs ) const;
 
@@ -233,7 +233,7 @@ public:
 const SvxFieldItem* GetField() const;
 const SvxFieldData* GetFieldData(sal_Int32 nPara, size_t nPos, sal_Int32 
nType) const;
 
-bool HasField( sal_Int32 nType = css::text::textfield::Type::UNSPECIFIED ) 
const;
+bool HasField( sal_Int32 nType ) const;
 
 const SfxItemSet& GetParaAttribs(sal_Int32 nPara) const;
 
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index f74d05a..69bac8d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -293,7 +293,7 @@ public:
 
 boolIsVertical() const;
 
-boolPostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* 
pFrameWin = nullptr );
+boolPostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* 
pFrameWin );
 
 boolMouseButtonUp( const MouseEvent& rMouseEvent );
 boolMouseButtonDown( const MouseEvent& rMouseEvent );
@@ -530,7 +530,7 @@ private:
 EditTextObject* GetEmptyTextObject();
 
 EditPaM GetPaM( Point aDocPos, bool bSmart = true );
-EditPaM GetPaM( ParaPortion* pPortion, Point aPos, bool bSmart 
= true );
+EditPaM GetPaM( ParaPortion* pPortion, Point aPos, bool bSmart 
);
 long GetXPos(const ParaPortion* 

[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source framework/inc framework/source jvmfwk/plugins l10ntools/inc lingucomponent/source linguistic/source oox/sour

[Jochen Nitschke]

 editeng/source/editeng/editattr.hxx |7 +++--
 editeng/source/editeng/editdoc.hxx  |6 ++--
 editeng/source/editeng/editobj2.hxx |   10 +--
 editeng/source/editeng/impedit.hxx  |5 ++-
 extensions/source/abpilot/datasourcehandling.cxx|5 ++-
 extensions/source/config/ldap/ldapaccess.cxx|6 ++--
 extensions/source/propctrlr/browserlistbox.cxx  |5 ++-
 extensions/source/propctrlr/composeduiupdate.cxx|6 ++--
 extensions/source/propctrlr/genericpropertyhandler.cxx  |6 ++--
 extensions/source/propctrlr/stringrepresentation.cxx|6 ++--
 extensions/source/update/check/updatehdl.hxx|6 ++--
 filter/source/svg/test/odfserializer.cxx|6 ++--
 forms/source/inc/propertybaghelper.hxx  |6 ++--
 framework/inc/threadhelp/gate.hxx   |   13 
--
 framework/inc/threadhelp/transactionguard.hxx   |5 ++-
 framework/inc/threadhelp/transactionmanager.hxx |5 ++-
 framework/source/layoutmanager/layoutmanager.cxx|5 ++-
 framework/source/services/ContextChangeEventMultiplexer.cxx |6 ++--
 framework/source/services/modulemanager.cxx |8 +++---
 framework/source/uielement/langselectionstatusbarcontroller.cxx |5 ++-
 framework/source/uielement/menubarmanager.cxx   |6 ++--
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx  |6 +++-
 l10ntools/inc/po.hxx|   13 
++
 lingucomponent/source/languageguessing/guesslang.cxx|6 ++--
 linguistic/source/convdiclist.cxx   |6 ++--
 linguistic/source/lngsvcmgr.cxx |8 +++---
 linguistic/source/spelldsp.cxx  |5 ++-
 oox/source/core/filterbase.cxx  |5 ++-
 28 files changed, 106 insertions(+), 76 deletions(-)

New commits:
commit d84ef731d8f5d8c1e896ecda3d03d4bb9129578d
Author: Jochen Nitschke 
Date:   Sat Apr 9 17:07:54 2016 +0200

tdf#94306 replace boost::noncopyable ...

... in modules editeng to oox.
Replace with C++11 delete copy-constructur and
copy-assignment.
Remove boost/noncopyable.hpp includes and
one unused boost/checked_delete.hpp include in linguistic.

Change-Id: I5a38d8e5ac1b4286bdeb3858d56490a53d13fe80
Reviewed-on: https://gerrit.libreoffice.org/23928
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/editeng/editattr.hxx 
b/editeng/source/editeng/editattr.hxx
index 6db6fd6..13bf5a2 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -23,8 +23,6 @@
 #include 
 #include 
 
-#include 
-
 class Color;
 class SvxFont;
 class SvxFontItem;
@@ -65,7 +63,7 @@ class SfxGrabBagItem;
 
 // bFeature: Attribute must not expand/shrink, length is always 1
 // bEdge: Attribute will not expand, if you want to expand just on the edge
-class EditCharAttrib : private boost::noncopyable
+class EditCharAttrib
 {
 protected:
 const SfxPoolItem*  pItem;
@@ -79,6 +77,9 @@ public:
 EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 
nEnd );
 virtual ~EditCharAttrib();
 
+EditCharAttrib(const EditCharAttrib&) = delete;
+EditCharAttrib& operator=(const EditCharAttrib&) = delete;
+
 sal_uInt16  Which() const   { return pItem->Which(); }
 const SfxPoolItem*  GetItem() const { return pItem; }
 
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 024c4b4..a18a682 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -35,8 +35,6 @@
 #include 
 #include 
 
-#include 
-
 class ImpEditEngine;
 class SvxTabStop;
 
@@ -233,7 +231,7 @@ public:
 
 // class ContentNode
 
-class ContentNode : private boost::noncopyable
+class ContentNode
 {
 private:
 OUString maString;
@@ -247,6 +245,8 @@ public:
 ContentNode( SfxItemPool& rItemPool );
 ContentNode( const OUString& rStr, const ContentAttribs& 
rContentAttribs );
 ~ContentNode();
+ContentNode(const ContentNode&) = delete;
+ContentNode&operator=(const ContentNode&) = delete;
 
 ContentAttribs& GetContentAttribs() { return aContentAttribs; }
 const ContentAttribs& GetContentAttribs() const { return aContentAttribs; }
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index 6f9fae2..aeeab19 100644
--- a/editeng/source/editeng/editobj2.hxx
+++