summaryrefslogtreecommitdiff
path: root/include/editeng
diff options
context:
space:
mode:
Diffstat (limited to 'include/editeng')
-rw-r--r--include/editeng/borderline.hxx16
-rw-r--r--include/editeng/boxitem.hxx1
-rw-r--r--include/editeng/formatbreakitem.hxx2
-rw-r--r--include/editeng/langitem.hxx4
-rw-r--r--include/editeng/protitem.hxx2
5 files changed, 21 insertions, 4 deletions
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 851c16156dee..86c6be8161be 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -28,6 +28,7 @@
#include <editeng/editengdllapi.h>
#include <svtools/borderline.hxx>
#include <docmodel/color/ComplexColor.hxx>
+#include <o3tl/hash_combine.hxx>
class IntlWrapper;
@@ -253,6 +254,21 @@ public:
static Color threeDDarkColor( Color aMain );
static BorderWidthImpl getWidthImpl( SvxBorderLineStyle nStyle );
+
+ std::size_t getHash() const
+ {
+ std::size_t seed = 0;
+ o3tl::hash_combine(seed, m_nWidth);
+ o3tl::hash_combine(seed, m_nMult);
+ o3tl::hash_combine(seed, m_nDiv);
+ o3tl::hash_combine(seed, m_aWidthImpl.getHash());
+ o3tl::hash_combine(seed, m_aColor.operator::sal_uInt32());
+ o3tl::hash_combine(seed, m_aComplexColor.getHash());
+ o3tl::hash_combine(seed, m_nStyle);
+ o3tl::hash_combine(seed, m_bMirrorWidths);
+ o3tl::hash_combine(seed, m_bUseLeftTop);
+ return seed;
+ }
};
EDITENG_DLLPUBLIC bool operator!=( const SvxBorderLine& rLeft, const SvxBorderLine& rRight );
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 6ceff99268c3..0d9ee80281ef 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -138,6 +138,7 @@ public:
sal_uInt16 GetSmallestDistance() const;
bool IsRemoveAdjacentCellBorder() const { return mbRemoveAdjCellBorder; }
+ const std::array<model::ComplexColor, 4>& GetTempComplexColors() const {return maTempComplexColors;}
void SetDistance( sal_Int16 nNew, SvxBoxItemLine nLine );
void SetAllDistances(sal_Int16 nNew)
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 71f33176990f..7e9b0b27661e 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -62,7 +62,7 @@ public:
inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
const sal_uInt16 _nWhich ) :
- SfxEnumItem( _nWhich, eBreak )
+ SfxEnumItem( _nWhich, SfxItemType::SvxFormatBreakItemType, eBreak )
{}
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 4d3852141666..c84aebf3b33c 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -33,8 +33,8 @@
// MSVC hack:
class SAL_DLLPUBLIC_RTTI SvxLanguageItem_Base: public SfxEnumItem<LanguageType> {
protected:
- explicit SvxLanguageItem_Base(sal_uInt16 nWhich, LanguageType nValue):
- SfxEnumItem(nWhich, nValue)
+ explicit SvxLanguageItem_Base(sal_uInt16 nWhich, SfxItemType eItemType, LanguageType nValue):
+ SfxEnumItem(nWhich, eItemType, nValue)
{}
};
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 4f3f1c4acd22..0c3b473700d1 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -66,7 +66,7 @@ public:
};
inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
- : SfxPoolItem( nId )
+ : SfxPoolItem( nId, SfxItemType::SvxProtectItemType )
{
bCntnt = bSize = bPos = false;
}