sw/source/core/inc/txttypes.hxx | 3 +++
sw/source/core/text/porlin.hxx | 3 ++-
sw/source/core/text/portxt.hxx | 5 ++++-
sw/source/core/text/xmldump.cxx | 2 ++
4 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit c3f746281f6ba4cbff95509c4791e203f260ec3d
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Oct 1 16:40:53 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Oct 4 12:08:26 2019 +0200
sw: add PortionType for fieldmarks for debugging
Change-Id: Ie263b09ac499cf30e294300b9ad609461f6ba0ac
Reviewed-on: https://gerrit.libreoffice.org/80049
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 442b997a0884..2030fff25cc5 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
+/// @see PORGRP_* masks in porlin.hxx for meaning of bits!
enum class PortionType
{
NONE = 0x0000,
@@ -38,6 +39,8 @@ enum class PortionType
Para = 0x8002,
Hanging = 0x8004,
InputField = 0x8005,
+ FieldMark = 0x8006,
+ FieldFormCheckbox = 0x8007,
Drop = 0x8080,
Tox = 0x8089,
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 6de5a619f32f..3fe08cbacba4 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -29,7 +29,8 @@ class SwTextPaintInfo;
class SwTextFormatInfo;
class SwPortionHandler;
-// Portion groups
+/// Portion groups
+/// @see enum PortionType in txttypes.hxx
#define PORGRP_TXT 0x8000
#define PORGRP_EXP 0x4000
#define PORGRP_FLD 0x2000
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 8bf0a0d46bf7..7ae5cef12f0f 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -80,7 +80,9 @@ class SwFieldMarkPortion : public SwTextPortion
{
public:
SwFieldMarkPortion() : SwTextPortion()
- { }
+ {
+ SetWhichPor(PortionType::FieldMark);
+ }
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
};
@@ -90,6 +92,7 @@ class SwFieldFormCheckboxPortion : public SwTextPortion
public:
SwFieldFormCheckboxPortion() : SwTextPortion()
{
+ SetWhichPor(PortionType::FieldFormCheckbox);
}
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 6dfeacad09f4..20f61111126a 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -65,6 +65,8 @@ class XmlPortionDumper:public SwPortionHandler
case PortionType::Ref: return "PortionType::Ref";
case PortionType::IsoRef: return "PortionType::IsoRef";
case PortionType::Meta: return "PortionType::Meta";
+ case PortionType::FieldMark: return "PortionType::FieldMark";
+ case PortionType::FieldFormCheckbox: return
"PortionType::FieldFormCheckbox";
case PortionType::Expand: return "PortionType::Expand";
case PortionType::Blank: return "PortionType::Blank";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
