sc/inc/attrib.hxx | 2 ++
sc/source/core/data/attrib.cxx | 5 +++++
2 files changed, 7 insertions(+)
New commits:
commit 1215efbf616024bc262f94c38038d6de6d960b17
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Feb 18 11:31:09 2015 +0100
Missing ScMergeFlagAttr::Clone
Change-Id: Iaaad0b4130d99bb3aa9edd434a1fc105c59c4c99
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index cfcff75..0c210f5 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -80,6 +80,8 @@ public:
ScMergeFlagAttr(sal_Int16 nFlags);
virtual ~ScMergeFlagAttr();
+ SfxPoolItem * Clone(SfxItemPool * pPool) const SAL_OVERRIDE;
+
bool IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) !=
0; }
bool IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) !=
0; }
bool IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR |
SC_MF_VER ) ) != 0; }
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index c3885da..047bd1d 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -149,6 +149,11 @@ ScMergeFlagAttr::~ScMergeFlagAttr()
{
}
+SfxPoolItem * ScMergeFlagAttr::Clone(SfxItemPool *) const
+{
+ return new ScMergeFlagAttr(*this);
+}
+
bool ScMergeFlagAttr::HasPivotButton() const
{
return (GetValue() & SC_MF_BUTTON) != 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
