summaryrefslogtreecommitdiff
path: root/editeng/inc
diff options
context:
space:
mode:
authorCao Cuong Ngo <cao.cuong.ngo@gmail.com>2013-04-12 18:42:46 +0200
committerEike Rathke <erack@redhat.com>2013-04-18 14:54:30 +0000
commita95cce27295f9cd255fa72eaded00972e3efb69b (patch)
treedd8304a77d7de8a3f9c686cf1fba741a82e88e21 /editeng/inc
parentfe9237785a21aa12438aafa66a7264a4220e29c7 (diff)
fix fdo#47018 Impress paste destroy bullet
Currently the copy function stores the paragraph attributes to SvStream but the restoration in paste isn't implemented yet! This patch implements the attributes loading from SvStream. Change-Id: I58928ca66a83b3fe3c3894a28ccf1e7fe5f661b3 Reviewed-on: https://gerrit.libreoffice.org/3369 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'editeng/inc')
-rw-r--r--editeng/inc/editeng/numitem.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 86f4aef59503..f17e9cf56026 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -157,10 +157,12 @@ public:
explicit SvxNumberFormat( sal_Int16 nNumberingType,
SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
SvxNumberFormat(const SvxNumberFormat& rFormat);
+ SvxNumberFormat( SvStream & rStream );
virtual ~SvxNumberFormat();
SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
+ SvxNumberFormat* Create(SvStream& rStream );
SvxNumberFormat& operator=( const SvxNumberFormat& );
sal_Bool operator==( const SvxNumberFormat& ) const;
@@ -252,6 +254,7 @@ public:
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SvxNumRule(const SvxNumRule& rCopy);
+ SvxNumRule(SvStream &rStream);
virtual ~SvxNumRule();
int operator==( const SvxNumRule& ) const;
@@ -260,7 +263,7 @@ public:
SvxNumRule& operator=( const SvxNumRule& );
SvStream& Store(SvStream &rStream);
-
+ SvxNumRule* Create(SvStream &rStream);
const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
const SvxNumberFormat& GetLevel(sal_uInt16 nLevel)const;
void SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, sal_Bool bIsValid = sal_True);
@@ -294,9 +297,9 @@ public:
virtual ~SvxNumBulletItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const;
sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
+ virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const;
virtual int operator==( const SfxPoolItem& ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}