summaryrefslogtreecommitdiff
path: root/filter/inc
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2010-10-06 23:29:18 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-10-06 23:29:18 +0200
commit8f90fdf25623164326d4573de4c8798109dcac69 (patch)
tree9d08af35193caa4e683ac2fe656ceaa0f5126fab /filter/inc
parent7d5fc9037287286857aa8506df1c661667ca0b41 (diff)
n#532920: Fixed some text position bug in ww8 import
Diffstat (limited to 'filter/inc')
-rw-r--r--filter/inc/filter/msfilter/msdffimp.hxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 7acd4c4d53cd..4fcc8f711686 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -257,6 +257,8 @@ struct MSDffTxId
struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
{
+ static const int RELTO_DEFAULT = 2;
+
SdrObject* pObj;
Polygon* pWrapPolygon;
char* pClientAnchorBuffer;
@@ -264,9 +266,9 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
char* pClientDataBuffer;
UINT32 nClientDataLen;
UINT32 nXAlign;
- UINT32 nXRelTo;
+ UINT32 *pXRelTo;
UINT32 nYAlign;
- UINT32 nYRelTo;
+ UINT32 *pYRelTo;
UINT32 nLayoutInTableCell;
UINT32 nFlags;
long nTextRotationAngle;
@@ -303,6 +305,8 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
{ return nShapeId == rEntry.nShapeId; }
BOOL operator<( const SvxMSDffImportRec& rEntry ) const
{ return nShapeId < rEntry.nShapeId; }
+private:
+ SvxMSDffImportRec &operator=(const SvxMSDffImportRec&);
};
typedef SvxMSDffImportRec* MSDffImportRec_Ptr;