[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng include/svl svl/source vcl/source

2023-11-25 Thread Armin Le Grand (allotropia) (via logerrit) 
 editeng/inc/editattr.hxx|   60 +--
 editeng/inc/editdoc.hxx |   16 +--
 editeng/source/editeng/editattr.cxx |  164 +++
 editeng/source/editeng/editdoc.cxx  |  167 +++-
 editeng/source/editeng/editeng.cxx  |5 
 editeng/source/editeng/editobj.cxx  |   37 +--
 editeng/source/editeng/editobj2.hxx |   11 --
 editeng/source/editeng/editundo.cxx |   20 ---
 editeng/source/editeng/editview.cxx |   12 +-
 editeng/source/editeng/fieldupdater.cxx |2 
 editeng/source/editeng/impedit.cxx  |6 -
 editeng/source/editeng/impedit.hxx  |1 
 editeng/source/editeng/impedit2.cxx |   24 +---
 editeng/source/editeng/impedit4.cxx |4 
 editeng/source/editeng/impedit5.cxx |5 
 include/editeng/editeng.hxx |1 
 include/svl/itemset.hxx |   18 +++
 svl/source/items/itempool.cxx   |   13 +-
 svl/source/items/itemset.cxx|   59 +++
 vcl/source/app/svapp.cxx|4 
 20 files changed, 306 insertions(+), 323 deletions(-)

New commits:
commit 52b692d16bc9b373067f3748fabf31aeace6e201
Author: Armin Le Grand (allotropia) 
AuthorDate: Fri Nov 24 16:12:03 2023 +0100
Commit: Armin Le Grand 
CommitDate: Sat Nov 25 16:13:47 2023 +0100

tdf#158317 fix cleanup of SfxPoolItems in editeng

It is not possible to use implCreateItemEntry/implCleanupItemEntry,
that is tooling limited *by purpose* to svl/Item/ItemSet stuff.
But what I can do is to do that SfxPoolItemHolder I already
talked/thought about. It is a helper that can safely hold a
SfxPoolItem in cases where an SfxItemSet is too expensive.
Think about it as a SfxItemSet for a single item. That solves
the problem why DirectPutItemInPool/DirectRemoveItemFromPool
is used in general (each usage is a 'compromize').
Did that now, works well. Editengine is now free of
DirectPutItemInPool/DirectRemoveItemFromPool.

Replaced ::CursorMoved with checkAndDeleteEmptyAttribs since all
these got static with no longer need to DirectRemoveItemFromPool.
Corrected create/delete counters.

Change-Id: Ia6e53f48ac2e479b461546515e68697039b5b628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159931
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index fcc14ba5ce25..bb609ac1e996 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SvxFont;
 class SvxFontItem;
@@ -65,7 +66,7 @@ class SfxGrabBagItem;
 // bEdge: Attribute will not expand, if you want to expand just on the edge
 class EditCharAttrib
 {
-const SfxPoolItem*  pItem;
+SfxPoolItemHolder   maItemHolder;
 
 sal_Int32   nStart;
 sal_Int32   nEnd;
@@ -73,7 +74,7 @@ class EditCharAttrib
 boolbEdge   :1;
 
 public:
-EditCharAttrib( const SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd 
);
+EditCharAttrib(SfxItemPool&, const SfxPoolItem&, sal_Int32 nStart, 
sal_Int32 nEnd);
 virtual ~EditCharAttrib();
 
 EditCharAttrib(const EditCharAttrib&) = delete;
@@ -81,8 +82,9 @@ public:
 
 voiddumpAsXml(xmlTextWriterPtr pWriter) const;
 
-sal_uInt16  Which() const   { return pItem->Which(); }
-const SfxPoolItem*  GetItem() const { return pItem; }
+const SfxPoolItemHolder& GetHolder() const {  return maItemHolder; }
+const SfxPoolItem* GetItem() const { return GetHolder().getItem(); }
+sal_uInt16 Which() const { if(GetItem()) return GetItem()->Which(); return 
0; }
 
 sal_Int32&  GetStart()  { return nStart; }
 sal_Int32&  GetEnd(){ return nEnd; }
@@ -153,7 +155,7 @@ inline void EditCharAttrib::Collaps( sal_Int32 nDiff )
 class EditCharAttribFont final : public EditCharAttrib
 {
 public:
-EditCharAttribFont( const SvxFontItem& rAttr, sal_Int32 nStart, sal_Int32 
nEnd );
+EditCharAttribFont(SfxItemPool&, const SfxPoolItem&, sal_Int32 nStart, 
sal_Int32 nEnd);
 
 virtual voidSetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
@@ -163,7 +165,7 @@ public:
 class EditCharAttribWeight final : public EditCharAttrib
 {
 public:
-EditCharAttribWeight( const SvxWeightItem& rAttr, sal_Int32 nStart, 
sal_Int32 nEnd );
+EditCharAttribWeight(SfxItemPool&, const SfxPoolItem&, sal_Int32 nStart, 
sal_Int32 nEnd);
 
 virtual voidSetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
@@ -172,7 +174,7 @@ public:
 class EditCharAttribItalic final : public EditCharAttrib
 {
 public:
-EditCharAttribItalic( const SvxPostureItem& rAttr, sal_Int32 nStart, 
sal_Int32 nEnd );
+EditCharAttribItalic(SfxItemPool&, const SfxPoolItem&, sal_Int32 nStart, 
sal_Int32 nEnd);

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng include/svx sd/qa sd/source solenv/clang-format svx/source

2023-02-28 Thread Sarper Akdemir (via logerrit) 
 editeng/inc/outleeng.hxx  |5 +
 editeng/source/editeng/impedit3.cxx   |   20 
 editeng/source/outliner/outleeng.cxx  |   12 +++-
 editeng/source/outliner/outlin2.cxx   |2 +-
 editeng/source/outliner/outliner.cxx  |2 +-
 editeng/source/outliner/outlvw.cxx|2 +-
 include/editeng/outliner.hxx  |4 
 include/svx/compatflags.hxx   |1 +
 include/svx/svdoutl.hxx   |5 +
 sd/qa/unit/data/odp/tdf148966-withflag.odp|binary
 sd/qa/unit/data/odp/tdf148966-withoutflag.odp |binary
 sd/qa/unit/data/pptx/tdf148966.pptx   |binary
 sd/qa/unit/layout-tests.cxx   |   26 ++
 sd/source/ui/docshell/docshel4.cxx|3 +++
 solenv/clang-format/excludelist   |2 +-
 svx/source/svdraw/svdmodel.cxx|   17 +
 svx/source/svdraw/svdoutl.cxx |   12 
 17 files changed, 108 insertions(+), 5 deletions(-)

New commits:
commit 0bb169dcfa14e6db44bc0eaeabe12d0d3b62ffd8
Author: Sarper Akdemir 
AuthorDate: Tue Feb 21 02:34:33 2023 +0300
Commit: Miklos Vajna 
CommitDate: Tue Feb 28 11:30:53 2023 +

tdf#148966: pptx: workaround for multiline fields followed by linebreaks

In Impress after fields that span multiple lines, a
linebreak is already forced. (PowerPoint doesn't have such
behaviour)

Therefore if the imported pptx file has a line break after
the multiline field - Impress ends up displaying an extra
line break.

This patch implements ignoring of a linebreak that follows
after a multiline field during paint (when not in EditMode),
using a compatibility flag. (IgnoreBreakAfterMultilineField)

Change-Id: I1e6772424cc0eead06b53d104b06820038a81ea1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147408
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/inc/outleeng.hxx
similarity index 96%
rename from editeng/source/outliner/outleeng.hxx
rename to editeng/inc/outleeng.hxx
index d19b54eba06a..449b5ca44ce8 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/inc/outleeng.hxx
@@ -21,6 +21,8 @@
 #include 
 #include 
 
+enum class SdrCompatibilityFlag;
+
 typedef std::vector NotifyList;
 
 class OutlinerEditEng : public EditEngine
@@ -75,6 +77,9 @@ public:
 
 virtual tools::Rectangle   GetBulletArea( sal_Int32 nPara ) override;
 
+/// @returns state of the SdrCompatibilityFlag
+std::optional GetCompatFlag(SdrCompatibilityFlag eFlag) const;
+
virtual voidSetParaAttribs( sal_Int32 nPara, const SfxItemSet& 
rSet ) override;
 
 // belongs into class Outliner, move there before incompatible update!
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 3191b7a874e7..376d1df7ad13 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -44,11 +45,14 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -3606,6 +3610,22 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev, 
tools::Rectangle aClipRect, Po
 nTextStart = *curIt;
 nTextLen = nTextLen - nTextStart;
 bParsingFields = false;
+
+if (nLine + 1 < nLines)
+{
+// tdf#148966 don't paint the 
line break following a
+// multiline field based on a 
compat flag
+OutlinerEditEng* pOutlEditEng{ 
dynamic_cast(pEditEngine) };
+if (pOutlEditEng
+&& 
pOutlEditEng->GetCompatFlag(SdrCompatibilityFlag::IgnoreBreakAfterMultilineField)
+   .value_or(false))
+{
+int nStartNextLine = 
pPortion->GetLines()[nLine + 1].GetStartPortion();
+const TextPortion& 
rNextTextPortion = pPortion->GetTextPortions()[nStartNextLine];
+if 
(rNextTextPortion.GetKind() == PortionKind::LINEBREAK)
+++nLine; //ignore the 
following linebreak
+}
+}

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng

2022-06-08 Thread Noel Grandin (via logerrit) 
 editeng/inc/AccessibleStringWrap.hxx|2 
 editeng/inc/editdoc.hxx |4 -
 editeng/source/accessibility/AccessibleContextBase.cxx  |4 -
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |5 +
 editeng/source/accessibility/AccessibleImageBullet.cxx  |5 +
 editeng/source/accessibility/AccessibleImageBullet.hxx  |2 
 editeng/source/accessibility/AccessibleStringWrap.cxx   |5 +
 editeng/source/editeng/editdoc.cxx  |9 +--
 editeng/source/editeng/editundo.cxx |   35 ++--
 editeng/source/editeng/editundo.hxx |   16 ++---
 editeng/source/editeng/eehtml.cxx   |5 +
 editeng/source/editeng/eehtml.hxx   |2 
 editeng/source/editeng/impedit.hxx  |2 
 editeng/source/editeng/impedit5.cxx |5 +
 editeng/source/items/CustomPropertyField.cxx|7 +-
 editeng/source/items/flditem.cxx|5 +
 editeng/source/items/frmitems.cxx   |7 +-
 editeng/source/items/textitem.cxx   |9 +--
 editeng/source/misc/SvXMLAutoCorrectImport.cxx  |6 +-
 editeng/source/misc/SvXMLAutoCorrectImport.hxx  |2 
 editeng/source/misc/forbiddencharacterstable.cxx|5 +
 editeng/source/misc/svxacorr.cxx|   17 +++--
 editeng/source/misc/unolingu.cxx|5 +
 editeng/source/outliner/overflowingtxt.cxx  |5 +
 editeng/source/uno/UnoForbiddenCharsTable.cxx   |5 +
 editeng/source/uno/unofield.cxx |5 +
 editeng/source/uno/unonrule.cxx |5 +
 editeng/source/xml/xmltxtimp.cxx|   13 ++--
 include/editeng/AccessibleContextBase.hxx   |2 
 include/editeng/AccessibleEditableTextPara.hxx  |2 
 include/editeng/CustomPropertyField.hxx |2 
 include/editeng/UnoForbiddenCharsTable.hxx  |2 
 include/editeng/brushitem.hxx   |2 
 include/editeng/editstat.hxx|5 +
 include/editeng/flditem.hxx |2 
 include/editeng/fontitem.hxx|4 -
 include/editeng/forbiddencharacterstable.hxx|2 
 include/editeng/outliner.hxx|5 +
 include/editeng/overflowingtxt.hxx  |2 
 include/editeng/svxacorr.hxx|   13 ++--
 include/editeng/swafopt.hxx |3 -
 include/editeng/unofield.hxx|2 
 include/editeng/unolingu.hxx|2 
 include/editeng/unonrule.hxx|2 
 44 files changed, 137 insertions(+), 112 deletions(-)

New commits:
commit 91fef4a47563451e0271784a14b471e4815729d1
Author: Noel Grandin 
AuthorDate: Wed Jun 8 15:53:34 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 9 07:56:10 2022 +0200

clang-tidy modernize-pass-by-value in editeng

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

diff --git a/editeng/inc/AccessibleStringWrap.hxx 
b/editeng/inc/AccessibleStringWrap.hxx
index 5281becdde61..f3888fd67d27 100644
--- a/editeng/inc/AccessibleStringWrap.hxx
+++ b/editeng/inc/AccessibleStringWrap.hxx
@@ -35,7 +35,7 @@ class AccessibleStringWrap
 {
 public:
 
-AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& 
rText );
+AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, OUString aText );
 
 void GetCharacterBounds( sal_Int32 nIndex, tools::Rectangle& rRect );
 sal_Int32 GetIndexAtPoint( const Point& rPoint );
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 5242a61a73f0..12532fde7e73 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -117,7 +117,7 @@ private:
 CharAttribsType aPrevCharAttribs;
 
 public:
-ContentAttribsInfo( const SfxItemSet& rParaAttribs );
+ContentAttribsInfo( SfxItemSet aParaAttribs );
 
 const SfxItemSet&   GetPrevParaAttribs() const  { return 
aPrevParaAttribs; }
 const CharAttribsType&  GetPrevCharAttribs() const  { return 
aPrevCharAttribs; }
@@ -244,7 +244,7 @@ private:
 
 public:
 ContentNode( SfxItemPool& rItemPool );
-ContentNode( const OUString& rStr, const ContentAttribs& 
rContentAttribs );
+ContentNode( OUString aStr, ContentAttribs

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng include/sfx2 include/xmloff sfx2/inc sfx2/source solenv/clang-format xmloff/inc xmloff/source

2020-03-03 Thread Noel Grandin (via logerrit) 
 editeng/inc/AccessibleStringWrap.hxx|5 +
 editeng/inc/unopracc.hxx|5 +
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |2 +-
 editeng/source/accessibility/AccessibleStringWrap.cxx   |2 +-
 editeng/source/uno/unoedprx.cxx |2 +-
 editeng/source/uno/unopracc.cxx |2 +-
 sfx2/inc/pch/precompiled_sfx.hxx|2 +-
 sfx2/inc/sidebar/Tools.hxx  |5 +
 sfx2/source/sidebar/ControllerFactory.cxx   |2 +-
 sfx2/source/sidebar/Paint.cxx   |2 +-
 sfx2/source/sidebar/PanelTitleBar.cxx   |2 +-
 sfx2/source/sidebar/ResourceManager.cxx |2 +-
 sfx2/source/sidebar/SidebarController.cxx   |2 +-
 sfx2/source/sidebar/TabBar.cxx  |2 +-
 sfx2/source/sidebar/Theme.cxx   |2 +-
 sfx2/source/sidebar/Tools.cxx   |2 +-
 sfx2/source/sidebar/UnoSidebar.cxx  |2 +-
 solenv/clang-format/blacklist   |6 +++---
 xmloff/inc/AutoStyleEntry.hxx   |7 ++-
 xmloff/source/style/XMLFontAutoStylePool.cxx|2 +-
 xmloff/source/style/impastpl.hxx|2 +-
 21 files changed, 24 insertions(+), 36 deletions(-)

New commits:
commit b55bf0cbdfdc68200ebf191b828a912373f1b7dc
Author: Noel Grandin 
AuthorDate: Tue Mar 3 10:17:42 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Mar 3 12:27:18 2020 +0100

move some headers inside their module

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

diff --git a/include/editeng/AccessibleStringWrap.hxx 
b/editeng/inc/AccessibleStringWrap.hxx
similarity index 90%
rename from include/editeng/AccessibleStringWrap.hxx
rename to editeng/inc/AccessibleStringWrap.hxx
index 9cad86b2988a..022c63086b24 100644
--- a/include/editeng/AccessibleStringWrap.hxx
+++ b/editeng/inc/AccessibleStringWrap.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
-#define INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
+#pragma once
 
 #include 
 #include 
@@ -49,6 +48,4 @@ private:
 OUStringmaText;
 };
 
-#endif // INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unopracc.hxx b/editeng/inc/unopracc.hxx
similarity index 96%
rename from include/editeng/unopracc.hxx
rename to editeng/inc/unopracc.hxx
index 5f94956e081a..7617bed0a86e 100644
--- a/include/editeng/unopracc.hxx
+++ b/editeng/inc/unopracc.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_UNOPRACC_HXX
-#define INCLUDED_EDITENG_UNOPRACC_HXX
+#pragma once
 
 #include 
 
@@ -55,6 +54,4 @@ public:
 virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 352557c85e8a..55f7940e5b10 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -63,7 +63,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 #include "AccessibleHyperlink.hxx"
 #include "AccessibleImageBullet.hxx"
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx 
b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 63a2fca3ef34..ccc4546e04df 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -23,7 +23,7 @@
 #include 
 
 #include 
-#include 
+#include 
 
 
 // AccessibleStringWrap implementation
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 2eabe3e6e0c5..46561a761345 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -36,7 +36,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 6b2e5b42c376..2262bdd9fcab 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -22,7 +22,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 87d51ac85d54..ac2f242cc5ef 100644
---

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng sd/source svx/source

2019-11-27 Thread Tamás Zolnai (via logerrit) 
 editeng/inc/editdoc.hxx |   13 +---
 editeng/source/editeng/editdoc.cxx  |   19 +++-
 editeng/source/editeng/editeng.cxx  |   19 +++-
 editeng/source/editeng/editobj.cxx  |   55 +---
 editeng/source/editeng/editobj2.hxx |7 +++-
 editeng/source/editeng/impedit.hxx  |5 ++-
 editeng/source/editeng/impedit3.cxx |   18 +--
 editeng/source/editeng/impedit4.cxx |6 ++-
 editeng/source/outliner/outlin2.cxx |9 -
 editeng/source/outliner/outlobj.cxx |   21 +++--
 include/editeng/editeng.hxx |5 ++-
 include/editeng/editobj.hxx |7 +++-
 include/editeng/outliner.hxx|4 +-
 include/editeng/outlobj.hxx |6 +++
 sd/source/ui/func/futext.cxx|5 ++-
 svx/source/table/cell.cxx   |7 +++-
 svx/source/unodraw/unoshtxt.cxx |5 ++-
 17 files changed, 172 insertions(+), 39 deletions(-)

New commits:
commit 653b53287ca09a9ffe3f5ce0242919e719c1086c
Author: Tamás Zolnai 
AuthorDate: Tue Nov 26 18:37:38 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Nov 27 09:32:42 2019 +0100

Better handling of text rotation attribute.

We need to have a separate attribute for vertical option and
for rotation option. So rotation won't be lost by setting
the text direction.
So I added a rotation member variable and use that as an orthogonal
variable to the vertical text direction.
A follow-up fix for tdf#100926. The problem was that the rotation
was imported / exported correctly from/in ODP, but the text was not
displayed as rotated.

Change-Id: Icddc0689f06fdcd52df6dc911e02a9a948c42654
Reviewed-on: https://gerrit.libreoffice.org/83809
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 2924a0e20c45..ccff24f1beb3 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -38,6 +38,7 @@
 
 class ImpEditEngine;
 class SvxTabStop;
+enum class TextRotation;
 
 
 #define CHARPOSGROW 16
@@ -742,7 +743,7 @@ private:
 SvxFont aDefFont;   //faster than ever from the pool!!
 sal_uInt16  nDefTab;
 boolbIsVertical:1;
-boolbIsTopToBottomVert : 1;
+TextRotationmnRotation;
 boolbIsFixedCellHeight:1;
 
 boolbOwnerOfPool:1;
@@ -769,10 +770,12 @@ public:
 voidSetDefTab( sal_uInt16 nTab ){ nDefTab = nTab ? nTab : 
DEFTAB; }
 sal_uInt16  GetDefTab() const   { return nDefTab; }
 
-voidSetVertical( bool bVertical, bool bTopToBottom )
-{ bIsVertical = bVertical; bIsTopToBottomVert = bVertical 
&& bTopToBottom; }
-boolIsVertical() const  { return bIsVertical; }
-boolIsTopToBottom() const   { return 
bIsTopToBottomVert; }
+voidSetVertical( bool bVertical )   { bIsVertical = bVertical; 
}
+boolIsVertical() const;
+boolIsTopToBottom() const;
+boolGetDirectVertical() const;
+voidSetRotation( TextRotation nRotation )   { mnRotation = 
nRotation; }
+TextRotationGetRotation() const { return 
mnRotation; }
 
 voidSetFixedCellHeight( bool bUseFixedCellHeight )  { 
bIsFixedCellHeight = bUseFixedCellHeight; }
 boolIsFixedCellHeight() const   { return 
bIsFixedCellHeight; }
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index ad71436ab89f..a745beb781de 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1903,7 +1903,7 @@ EditDoc::EditDoc( SfxItemPool* pPool ) :
 pItemPool(pPool ? pPool : new EditEngineItemPool()),
 nDefTab(DEFTAB),
 bIsVertical(false),
-bIsTopToBottomVert(false),
+mnRotation(TextRotation::NONE),
 bIsFixedCellHeight(false),
 bOwnerOfPool(pPool == nullptr),
 bModified(false)
@@ -2051,6 +2051,23 @@ void EditDoc::CreateDefFont( bool bUseStyles )
 }
 }
 
+bool EditDoc::IsVertical() const
+{
+return (bIsVertical && mnRotation == TextRotation::NONE) ||
+(!bIsVertical && mnRotation != TextRotation::NONE);
+}
+
+bool EditDoc::IsTopToBottom() const
+{
+return (bIsVertical && mnRotation == TextRotation::NONE) ||
+(!bIsVertical && mnRotation == TextRotation::TOPTOBOTTOM);
+}
+
+bool EditDoc::GetDirectVertical() const
+{
+return bIsVertical;
+}
+
 sal_Int32 EditDoc::GetPos(const ContentNode* p) const
 {
 return FastGetPos(maContents, p, nLastCache);
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index ac9fdd5202ce..e7faf821f0ee 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -431,9 +431,19 @@ const Size& EditEngine::GetPaperSize() const
 return

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng svx/source

2019-09-02 Thread Noel Grandin (via logerrit) 
 editeng/inc/editdoc.hxx|2 +-
 editeng/inc/eerdll2.hxx|2 +-
 editeng/source/accessibility/AccessibleContextBase.cxx |2 +-
 editeng/source/editeng/editeng.cxx |6 +++---
 editeng/source/editeng/editobj.cxx |2 +-
 editeng/source/editeng/editobj2.hxx|2 +-
 editeng/source/editeng/editview.cxx|6 +++---
 editeng/source/editeng/eerdll.cxx  |2 +-
 editeng/source/editeng/impedit.cxx |4 ++--
 editeng/source/editeng/impedit.hxx |   14 +++---
 editeng/source/misc/urlfieldhelper.cxx |4 ++--
 editeng/source/outliner/outleeng.cxx   |2 +-
 editeng/source/outliner/outlin2.cxx|2 +-
 editeng/source/outliner/outlvw.cxx |6 +++---
 include/editeng/AccessibleContextBase.hxx  |2 +-
 include/editeng/editeng.hxx|6 +++---
 include/editeng/editobj.hxx|2 +-
 include/editeng/editview.hxx   |6 +++---
 include/editeng/outliner.hxx   |8 
 include/editeng/splwrap.hxx|   10 +-
 include/editeng/urlfieldhelper.hxx |4 ++--
 svx/source/unodraw/unoshtxt.cxx|4 ++--
 22 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit 8cbafb908d5150aec9d4047ea06c5c5bc1854e8d
Author: Noel Grandin 
AuthorDate: Mon Sep 2 15:06:23 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Sep 2 20:40:04 2019 +0200

loplugin:constmethod in editeng

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

diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 089addc59c07..2924a0e20c45 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -764,7 +764,7 @@ public:
 voidSetModifyHdl( const Link& rLink ) { 
aModifyHdl = rLink; }
 
 voidCreateDefFont( bool bUseStyles );
-const SvxFont&  GetDefFont() { return aDefFont; }
+const SvxFont&  GetDefFont() const { return aDefFont; }
 
 voidSetDefTab( sal_uInt16 nTab ){ nDefTab = nTab ? nTab : 
DEFTAB; }
 sal_uInt16  GetDefTab() const   { return nDefTab; }
diff --git a/editeng/inc/eerdll2.hxx b/editeng/inc/eerdll2.hxx
index 2ce9c120b81c..87a2670bafd4 100644
--- a/editeng/inc/eerdll2.hxx
+++ b/editeng/inc/eerdll2.hxx
@@ -37,7 +37,7 @@ namespace editeng
 public:
 SharedVclResources();
 ~SharedVclResources();
-VclPtr const & GetVirtualDevice();
+VclPtr const & GetVirtualDevice() const;
 };
 }
 
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 8dc73b04f8ca..e0312f1e074b 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -518,7 +518,7 @@ void AccessibleContextBase::ThrowIfDisposed()
 }
 
 
-bool AccessibleContextBase::IsDisposed()
+bool AccessibleContextBase::IsDisposed() const
 {
 return (rBHelper.bDisposed || rBHelper.bInDispose);
 }
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 9dbf8a285cfa..ef821184ec7b 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -110,12 +110,12 @@ void EditEngine::EnableUndo( bool bEnable )
 pImpEditEngine->EnableUndo( bEnable );
 }
 
-bool EditEngine::IsUndoEnabled()
+bool EditEngine::IsUndoEnabled() const
 {
 return pImpEditEngine->IsUndoEnabled();
 }
 
-bool EditEngine::IsInUndo()
+bool EditEngine::IsInUndo() const
 {
 return pImpEditEngine->IsInUndo();
 }
@@ -169,7 +169,7 @@ void EditEngine::SetRefMapMode( const MapMode& rMapMode )
 pImpEditEngine->SetRefMapMode( rMapMode );
 }
 
-MapMode const & EditEngine::GetRefMapMode()
+MapMode const & EditEngine::GetRefMapMode() const
 {
 return pImpEditEngine->GetRefMapMode();
 }
diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index a0112468af5b..be4f1d920c92 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -326,7 +326,7 @@ void EditTextObject::ChangeStyleSheetName(
 mpImpl->ChangeStyleSheetName(eFamily, rOldName, rNewName);
 }
 
-editeng::FieldUpdater EditTextObject::GetFieldUpdater()
+editeng::FieldUpdater EditTextObject::GetFieldUpdater() const
 {
 return mpImpl->GetFieldUpdater();
 }
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index f3436930c484..e2a1fefc1535 100644
--- a/editeng/source/editeng/editobj2.hxx

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng include/sfx2 include/svl include/svx sc/inc sd/inc svl/source svx/source sw/inc sw/source

2019-02-28 Thread Libreoffice Gerrit user 
 editeng/inc/editattr.hxx |2 +-
 editeng/inc/editdoc.hxx  |8 
 editeng/source/editeng/editdoc.cxx   |8 
 editeng/source/editeng/editeng.cxx   |2 +-
 editeng/source/editeng/editobj2.hxx  |2 +-
 editeng/source/items/numitem.cxx |4 ++--
 editeng/source/outliner/outliner.cxx |2 +-
 editeng/source/outliner/paralist.cxx |4 ++--
 editeng/source/outliner/paralist.hxx |3 ++-
 include/editeng/brushitem.hxx|2 +-
 include/editeng/charrotateitem.hxx   |4 ++--
 include/editeng/colritem.hxx |2 +-
 include/editeng/editeng.hxx  |2 +-
 include/editeng/editobj.hxx  |2 +-
 include/editeng/fhgtitem.hxx |2 +-
 include/editeng/fontitem.hxx |2 +-
 include/editeng/frmdiritem.hxx   |2 +-
 include/editeng/lrspitem.hxx |2 +-
 include/editeng/numitem.hxx  |4 ++--
 include/editeng/outliner.hxx |4 ++--
 include/editeng/outlobj.hxx  |2 +-
 include/editeng/postitem.hxx |2 +-
 include/editeng/protitem.hxx |2 +-
 include/editeng/rsiditem.hxx |2 +-
 include/editeng/shaditem.hxx |2 +-
 include/editeng/tstpitem.hxx |4 ++--
 include/editeng/ulspitem.hxx |2 +-
 include/editeng/wghtitem.hxx |2 +-
 include/sfx2/viewsh.hxx  |2 +-
 include/svl/eitem.hxx|2 +-
 include/svl/intitem.hxx  |6 +++---
 include/svl/itempool.hxx |2 +-
 include/svl/itemset.hxx  |2 +-
 include/svl/poolitem.hxx |5 +++--
 include/svl/stritem.hxx  |2 +-
 include/svl/undo.hxx |7 ---
 include/svx/e3ditem.hxx  |2 +-
 include/svx/sdr/properties/defaultproperties.hxx |3 ++-
 include/svx/sdtaitm.hxx  |2 +-
 include/svx/svdmodel.hxx |2 +-
 include/svx/svdobj.hxx   |2 +-
 include/svx/svdogrp.hxx  |2 +-
 include/svx/svdotable.hxx|2 +-
 include/svx/svdpage.hxx  |2 +-
 include/svx/svdtext.hxx  |2 +-
 include/svx/xbtmpit.hxx  |2 +-
 include/svx/xfillit0.hxx |2 +-
 include/svx/xflbmpit.hxx |2 +-
 include/svx/xflbmtit.hxx |2 +-
 include/svx/xflbstit.hxx |2 +-
 include/svx/xflclit.hxx  |2 +-
 include/svx/xfltrit.hxx  |2 +-
 include/svx/xit.hxx  |2 +-
 sc/inc/attrib.hxx|6 +++---
 sd/inc/drawdoc.hxx   |2 +-
 sd/inc/sdpage.hxx|2 +-
 svl/source/items/cenumitm.cxx|2 +-
 svx/source/inc/cell.hxx  |2 +-
 svx/source/inc/tablemodel.hxx|3 ++-
 svx/source/sdr/properties/defaultproperties.cxx  |2 +-
 svx/source/svdraw/svdattr.cxx|2 +-
 svx/source/svdraw/svdtext.cxx|2 +-
 svx/source/table/cell.cxx|2 +-
 svx/source/table/svdotable.cxx   |2 +-
 svx/source/table/tablelayouter.hxx   |4 ++--
 svx/source/table/tablemodel.cxx  |2 +-
 sw/inc/IMark.hxx |2 +-
 sw/inc/charfmt.hxx   |2 +-
 sw/inc/crsrsh.hxx|2 +-
 sw/inc/doc.hxx   |2 +-
 sw/inc/docary.hxx|   18 +-
 sw/inc/docufld.hxx   |2 +-
 sw/inc/fldbas.hxx|8 +---
 sw/inc/fmtanchr.hxx  |2 +-
 sw/inc/fmtautofmt.hxx|2 +-
 sw/inc/fmtclbl.hxx   |2 +-
 sw/inc/fmtclds.hxx   |4 ++--
 sw/inc/fmtcntnt.hxx  |2 +-
 sw/inc/fmtcol.hxx|2 +-
 sw/inc/fmteiro.hxx   |2 +-
 sw/inc/fmtfld.hxx|2 +-
 sw/inc/fmtfollowtextflow.hxx |2 +-

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng

2018-12-05 Thread Libreoffice Gerrit user 
 editeng/inc/edtspell.hxx|2 +-
 editeng/source/editeng/edtspell.cxx |2 --
 editeng/source/items/textitem.cxx   |   10 --
 include/editeng/fontitem.hxx|2 --
 4 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 4d725e38b5cb53d039dfb6db0940c91ce62ce746
Author: Noel Grandin 
AuthorDate: Wed Dec 5 11:05:19 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Dec 5 13:10:29 2018 +0100

loplugin:singlevalfields in editeng

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

diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 82ed2f618e9d..53565fd71d9e 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -62,7 +62,7 @@ public:
  */
 class WrongList
 {
-static size_t Valid;
+static constexpr size_t Valid = std::numeric_limits::max();
 
 std::vector maRanges;
 size_t mnInvalidStart;
diff --git a/editeng/source/editeng/edtspell.cxx 
b/editeng/source/editeng/edtspell.cxx
index db235d41d7d5..63b402ffad53 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -154,8 +154,6 @@ void EditSpellWrapper::CheckSpellTo()
 }
 }
 
-size_t WrongList::Valid = std::numeric_limits::max();
-
 WrongList::WrongList() : mnInvalidStart(0), mnInvalidEnd(Valid) {}
 
 void WrongList::SetRanges( const std::vector& rRanges )
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 483e83f657f7..69246c19d3aa 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -99,8 +99,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
 
-bool SvxFontItem::bEnableStoreUnicodeNames = false;
-
 SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);}
 SfxPoolItem* SvxPostureItem::CreateDefault() { return new 
SvxPostureItem(ITALIC_NONE, 0);}
 SfxPoolItem* SvxWeightItem::CreateDefault() {return new 
SvxWeightItem(WEIGHT_NORMAL, 0);}
@@ -345,14 +343,6 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 
/*nItemVersion*/ ) co
 rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet());
 rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet());
 
-// catch for EditEngine, only set while creating clipboard stream.
-if ( bEnableStoreUnicodeNames )
-{
-rStrm.WriteUInt32( STORE_UNICODE_MAGIC_MARKER );
-rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE 
);
-rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
-}
-
 return rStrm;
 }
 
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 224ebf682002..3a226dfd3e3f 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -36,8 +36,6 @@ class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
 FontPitch ePitch;
 rtl_TextEncoding eTextEncoding;
 
-static bool bEnableStoreUnicodeNames;
-
 public:
 static SfxPoolItem* CreateDefault();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng

2017-12-28 Thread Noel Grandin 
 editeng/inc/eerdll2.hxx |2 +-
 editeng/source/editeng/editeng.cxx  |   16 
 editeng/source/editeng/editview.cxx |2 +-
 editeng/source/editeng/eerdll.cxx   |2 +-
 editeng/source/editeng/eertfpar.hxx |2 +-
 editeng/source/editeng/impedit.hxx  |4 ++--
 editeng/source/editeng/impedit2.cxx |4 ++--
 editeng/source/outliner/outlin2.cxx |   13 +++--
 editeng/source/outliner/outlvw.cxx  |6 +++---
 include/editeng/CustomPropertyField.hxx |4 ++--
 include/editeng/editeng.hxx |   16 
 include/editeng/editview.hxx|2 +-
 include/editeng/outliner.hxx|   18 +-
 13 files changed, 46 insertions(+), 45 deletions(-)

New commits:
commit b9183166214c0f461b6fefb34bbf4a57ea878bdf
Author: Noel Grandin 
Date:   Thu Dec 28 09:58:11 2017 +0200

loplugin:passstuffbyref improved return in editeng

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

diff --git a/editeng/inc/eerdll2.hxx b/editeng/inc/eerdll2.hxx
index f7dcb13ec696..96f90ac8453e 100644
--- a/editeng/inc/eerdll2.hxx
+++ b/editeng/inc/eerdll2.hxx
@@ -36,7 +36,7 @@ namespace editeng
 public:
 SharedVclResources();
 ~SharedVclResources();
-VclPtr GetVirtualDevice();
+VclPtr const & GetVirtualDevice();
 };
 }
 
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index db6c7710dc38..2a3ccb3d52bb 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -167,7 +167,7 @@ void EditEngine::SetRefMapMode( const MapMode& rMapMode )
 pImpEditEngine->SetRefMapMode( rMapMode );
 }
 
-MapMode EditEngine::GetRefMapMode()
+MapMode const & EditEngine::GetRefMapMode()
 {
 return pImpEditEngine->GetRefMapMode();
 }
@@ -177,7 +177,7 @@ void EditEngine::SetBackgroundColor( const Color& rColor )
 pImpEditEngine->SetBackgroundColor( rColor );
 }
 
-Color EditEngine::GetBackgroundColor() const
+Color const & EditEngine::GetBackgroundColor() const
 {
 return pImpEditEngine->GetBackgroundColor();
 }
@@ -1519,7 +1519,7 @@ void EditEngine::SetNotifyHdl( const 
Link& rLink )
 pImpEditEngine->SetNotifyHdl( rLink );
 }
 
-Link EditEngine::GetNotifyHdl() const
+Link const & EditEngine::GetNotifyHdl() const
 {
 return pImpEditEngine->GetNotifyHdl();
 }
@@ -1529,7 +1529,7 @@ void EditEngine::SetStatusEventHdl( const 
Link& rLink )
 pImpEditEngine->SetStatusEventHdl( rLink );
 }
 
-Link EditEngine::GetStatusEventHdl() const
+Link const & EditEngine::GetStatusEventHdl() const
 {
 return pImpEditEngine->GetStatusEventHdl();
 }
@@ -1636,7 +1636,7 @@ void EditEngine::SetModifyHdl( const 
Link& rLink )
 pImpEditEngine->SetModifyHdl( rLink );
 }
 
-Link EditEngine::GetModifyHdl() const
+Link const & EditEngine::GetModifyHdl() const
 {
 return pImpEditEngine->GetModifyHdl();
 }
@@ -2154,7 +2154,7 @@ void EditEngine::SetSpeller( Reference< XSpellChecker1 > 
const  )
 pImpEditEngine->SetSpeller( xSpeller );
 }
 
-Reference< XSpellChecker1 >  EditEngine::GetSpeller()
+Reference< XSpellChecker1 > const & EditEngine::GetSpeller()
 {
 return pImpEditEngine->GetSpeller();
 }
@@ -2719,7 +2719,7 @@ void EditEngine::SetBeginDropHdl( const 
Link& rLink )
 pImpEditEngine->SetBeginDropHdl( rLink );
 }
 
-Link EditEngine::GetBeginDropHdl() const
+Link const & EditEngine::GetBeginDropHdl() const
 {
 return pImpEditEngine->GetBeginDropHdl();
 }
@@ -2730,7 +2730,7 @@ void EditEngine::SetEndDropHdl( const 
Link& rLink )
 pImpEditEngine->SetEndDropHdl( rLink );
 }
 
-Link EditEngine::GetEndDropHdl() const
+Link const & EditEngine::GetEndDropHdl() const
 {
 return pImpEditEngine->GetEndDropHdl();
 }
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 5a852f003605..a7000ce5e5a9 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -660,7 +660,7 @@ void EditView::SetBackgroundColor( const Color& rColor )
 pImpEditView->SetBackgroundColor( rColor );
 }
 
-Color EditView::GetBackgroundColor() const
+Color const & EditView::GetBackgroundColor() const
 {
 return pImpEditView->GetBackgroundColor();
 }
diff --git a/editeng/source/editeng/eerdll.cxx 
b/editeng/source/editeng/eerdll.cxx
index f6b43af56221..9033db06b84d 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -216,7 +216,7 @@

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng

2017-11-12 Thread Jochen Nitschke 
 editeng/inc/editdoc.hxx |4 --
 editeng/source/editeng/editdoc.cxx  |   17 --
 editeng/source/editeng/fieldupdater.cxx |1 
 editeng/source/items/borderline.cxx |   24 --
 editeng/source/items/optitems.cxx   |   10 --
 editeng/source/items/paraitem.cxx   |7 
 editeng/source/items/textitem.cxx   |   28 
 editeng/source/misc/swafopt.cxx |   53 
 editeng/source/outliner/paralist.cxx|   15 -
 include/editeng/borderline.hxx  |3 -
 include/editeng/colritem.hxx|2 -
 include/editeng/flstitem.hxx|1 
 include/editeng/formatbreakitem.hxx |4 --
 include/editeng/optitems.hxx|1 
 include/editeng/paragraphdata.hxx   |3 -
 include/editeng/swafopt.hxx |2 -
 include/editeng/tstpitem.hxx|1 
 include/editeng/twolinesitem.hxx|1 
 18 files changed, 177 deletions(-)

New commits:
commit c8c5072a2f20d58807c233a1b62ded406931db78
Author: Jochen Nitschke 
Date:   Sun Nov 12 20:00:46 2017 +0100

clang-tidy modernize-use-equals-default in editeng

remove default-able copy constructors/assignments
and a non-virtual default dtor.

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

diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index c5f6f7ddf1fb..541ccca8b424 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -163,8 +163,6 @@ private:
 
 public:
 ContentAttribs( SfxItemPool& rItemPool );
-ContentAttribs( const ContentAttribs& );
-~ContentAttribs();  // only for larger Tabs
 
 voiddumpAsXml(struct _xmlTextWriter* pWriter) const;
 
@@ -311,7 +309,6 @@ private:
 
 public:
 EditPaM();
-EditPaM(const EditPaM& r);
 EditPaM(ContentNode* p, sal_Int32 n);
 
 const ContentNode* GetNode() const { return pNode;}
@@ -323,7 +320,6 @@ public:
 
 bool   DbgIsBuggy( EditDoc const & rDoc );
 
-EditPaM&operator = ( const EditPaM& rPaM );
 friend bool operator == ( const EditPaM& r1, const EditPaM& r2 );
 friend bool operator != ( const EditPaM& r1, const EditPaM& r2 );
 bool operator !() const { return !pNode && !nIndex; }
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index db5b4b28799d..8db5de5780d8 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1114,7 +1114,6 @@ void EditLineList::Insert(sal_Int32 nPos, EditLine* p)
 }
 
 EditPaM::EditPaM() : pNode(nullptr), nIndex(0) {}
-EditPaM::EditPaM(const EditPaM& r) : pNode(r.pNode), nIndex(r.nIndex) {}
 EditPaM::EditPaM(ContentNode* p, sal_Int32 n) : pNode(p), nIndex(n) {}
 
 
@@ -1190,13 +1189,6 @@ bool operator == ( const EditPaM& r1, const EditPaM& r2 )
( r1.GetIndex() == r2.GetIndex() );
 }
 
-EditPaM& EditPaM::operator = ( const EditPaM& rPaM )
-{
-nIndex = rPaM.nIndex;
-pNode = rPaM.pNode;
-return *this;
-}
-
 bool operator != ( const EditPaM& r1, const EditPaM& r2 )
 {
 return !( r1 == r2 );
@@ -1821,15 +1813,6 @@ ContentAttribs::ContentAttribs( SfxItemPool& rPool )
 {
 }
 
-ContentAttribs::ContentAttribs( const ContentAttribs& rRef )
-: pStyle(rRef.pStyle)
-, aAttribSet( rRef.aAttribSet )
-{
-}
-
-ContentAttribs::~ContentAttribs()
-{
-}
 
 SvxTabStop ContentAttribs::FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab )
 {
diff --git a/editeng/source/editeng/fieldupdater.cxx 
b/editeng/source/editeng/fieldupdater.cxx
index 318c057d3546..aab517773c41 100644
--- a/editeng/source/editeng/fieldupdater.cxx
+++ b/editeng/source/editeng/fieldupdater.cxx
@@ -24,7 +24,6 @@ class FieldUpdaterImpl
 EditTextObjectImpl& mrObj;
 public:
 explicit FieldUpdaterImpl(EditTextObject const & rObj) : 
mrObj(*rObj.mpImpl) {}
-FieldUpdaterImpl(const FieldUpdaterImpl& r) : mrObj(r.mrObj) {}
 
 void updateTableFields(int nTab)
 {
diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 41b8eae938a3..3005e3161827 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -399,30 +399,6 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( 
SvxBorderLineStyle nStyle )
 return aImpl;
 }
 
-
-SvxBorderLine::SvxBorderLine( const SvxBorderLine& r )
-{
-*this = r;
-}
-
-
-SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
-{
-aColor = r.aColor;
-m_nWidth = r.m_nWidth;
-m_aWidthImpl = r.m_aWidthImpl;
-m_bMirrorWidths = r.m_bMirrorWidths;
-m_nMult = r.m_nMult;
-m_nDiv = r.m_nDiv;
-m_nStyle = r.m_nStyle;
-m_bUseLeftTop = r.m_bUseLeftTop;
-m_pColorOutFn =

[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng

2017-11-05 Thread Noel Grandin 
 editeng/inc/edtspell.hxx|3 +--
 editeng/source/editeng/eertfpar.hxx |3 +--
 editeng/source/editeng/textconv.hxx |3 +--
 include/editeng/borderline.hxx  |3 +--
 include/editeng/unofield.hxx|5 +
 5 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 1ae5f7978788ac5192b19bb3da791bb27c7b2d89
Author: Noel Grandin 
Date:   Fri Nov 3 15:09:32 2017 +0200

loplugin:finalclasses in editeng

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

diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 1165e7a1f54d..82ed2f618e9d 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -113,7 +113,7 @@ public:
 const_iterator end() const;
 };
 
-class EdtAutoCorrDoc : public SvxAutoCorrDoc
+class EdtAutoCorrDoc final : public SvxAutoCorrDoc
 {
 EditEngine* mpEditEngine;
 ContentNode*pCurNode;
@@ -122,7 +122,6 @@ class EdtAutoCorrDoc : public SvxAutoCorrDoc
 boolbAllowUndoAction;
 boolbUndoAction;
 
-protected:
 voidImplStartUndoAction();
 
 public:
diff --git a/editeng/source/editeng/eertfpar.hxx 
b/editeng/source/editeng/eertfpar.hxx
index 2a7629e6b758..a308ff5ad3da 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -26,7 +26,7 @@
 
 class EditEngine;
 
-class EditRTFParser : public SvxRTFParser
+class EditRTFParser final : public SvxRTFParser
 {
 private:
 EditSelection   aCurSel;
@@ -37,7 +37,6 @@ private:
 sal_uInt16  nDefFont;
 boolbLastActionInsertParaBreak;
 
-protected:
 virtual voidInsertPara() override;
 virtual voidInsertText() override;
 virtual voidMovePos( bool bForward = true ) override;
diff --git a/editeng/source/editeng/textconv.hxx 
b/editeng/source/editeng/textconv.hxx
index 301fcf746f09..d7b6ff10ae8d 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -28,7 +28,7 @@
 
 class EditView;
 
-class TextConvWrapper : public editeng::HangulHanjaConversion
+class TextConvWrapper final : public editeng::HangulHanjaConversion
 {
 OUStringm_aConvText;  // convertible text part found last time
 LanguageTypem_nConvTextLang;  // language of aConvText
@@ -71,7 +71,6 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
 TextConvWrapper (const TextConvWrapper &) = delete;
 TextConvWrapper & operator= (const TextConvWrapper &) = delete;
 
-protected:
 virtual voidGetNextPortion( OUString& /* [out] */ rNextPortion,
 LanguageType& /* [out] */ rLangOfPortion,
 bool /* [in] */ 
_bAllowImplicitChangesForNotConvertibleText ) override;
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index fd356b489546..b873852fc7a0 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -137,9 +137,8 @@ double EDITENG_DLLPUBLIC 
ConvertBorderWidthToWord(SvxBorderLineStyle, double);
 double EDITENG_DLLPUBLIC ConvertBorderWidthFromWord(SvxBorderLineStyle,
 double, int);
 
-class EDITENG_DLLPUBLIC SvxBorderLine
+class EDITENG_DLLPUBLIC SvxBorderLine final
 {
-protected:
 Color  aColor;
 
 long m_nWidth;
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index 31594e91bb77..8e81da850f99 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -43,20 +43,17 @@ class SvxFieldData;
 css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL 
SvxUnoTextCreateTextField(
 const OUString& ServiceSpecifier );
 
-class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
+class EDITENG_DLLPUBLIC SvxUnoTextField final : public SvxMutexHelper,
 public ::cppu::OComponentHelper,
 public css::text::XTextField,
 public css::beans::XPropertySet,
 public css::lang::XServiceInfo,
 public css::lang::XUnoTunnel
 {
-private:
 css::uno::Reference< css::text::XTextRange > mxAnchor;
 const SfxItemPropertySet*   mpPropSet;
 sal_Int32   mnServiceId;
 std::unique_ptrmpImpl;
-
-protected:
 css::uno::Sequence< css::uno::Type > maTypeSequence;
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits