Kaydet (Commit) 5dfae3f6 authored tarafından Caolán McNamara's avatar Caolán McNamara

ooo#59101 word 6 graphic anchors should work like word 97 ones

With the missing documentation filled in from the rtf spec we can remove the
crack and replace with to-char anchoring and set equivalent relative
positioning attributes. Which stops us having the odd page anchoring
which triggers an assert on exporting ooo59101-1.doc to odt and gives
ooo59101-1.doc the same object positioning as seen in MSWord

Change-Id: I7574f32c9df0aac4a15efdb8ebf5d7835f5c6103
üst 80968fd2
......@@ -1574,17 +1574,12 @@ private:
// GrafikLayer
bool ReadGrafStart(void* pData, short nDataSiz, WW8_DPHEAD* pHd,
const WW8_DO* pDo, SfxAllItemSet &rSet);
SdrObject *ReadLine(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadRect(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadElipse(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadArc(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadPolyLine(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadRect(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadElipse(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadArc(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadPolyLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
ESelection GetESelection( long nCpStart, long nCpEnd );
void InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl );
void InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, ManTypes eType, bool bONLYnPicLocFc=false);
......@@ -1602,14 +1597,10 @@ private:
bool TxbxChainContainsRealText( sal_uInt16 nTxBxS,
long& rStartCp,
long& rEndCp );
SdrObject *ReadTxtBox(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadCaptionBox(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadGroup(WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadGrafPrimitive(short& rLeft, const WW8_DO* pDo,
SfxAllItemSet &rSet);
SdrObject *ReadTxtBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadGroup(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadGrafPrimitive(short& rLeft, SfxAllItemSet &rSet);
void ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp );
SdrObject* CreateContactObject(SwFrmFmt* pFlyFmt);
RndStdIds ProcessEscherAlign(SvxMSDffImportRec* pRecord, WW8_FSPA *pFSPA,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment