diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-19 13:45:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-20 09:51:52 +0200 |
| commit | 30d7feeb88ea77632fede1b20cd8610b22e3773c (patch) | |
| tree | 2ed8c913ccdd634c8e1ff717cd33a2666d31a707 /sw/source | |
| parent | 9f0fdb491cb128d3a5afb9c1f5907dfc31f6b197 (diff) | |
MungeTextIntoDrawBox 1st arg is member of 2nd arg
Change-Id: I43a443af6b208f3ac100cd689bd2c24c3a080b75
Reviewed-on: https://gerrit.libreoffice.org/53163
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index a57ccc46b3ac..d16d16cfa4af 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2759,7 +2759,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) pRecord = it->get(); if (pRecord->pObj && pRecord->aTextId.nTxBxS) { // #i52825# pRetFrameFormat can be NULL - pRetFrameFormat = MungeTextIntoDrawBox(pRecord->pObj, + pRetFrameFormat = MungeTextIntoDrawBox( pRecord, nGrafAnchorCp, pRetFrameFormat); } } @@ -2796,9 +2796,11 @@ SwFrameFormat *SwWW8ImplReader::AddAutoAnchor(SwFrameFormat *pFormat) return pFormat; } -SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, - SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat* pRetFrameFormat) +SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SvxMSDffImportRec *pRecord, + long nGrafAnchorCp, SwFrameFormat* pRetFrameFormat) { + SdrObject* pTrueObject = pRecord->pObj; + SdrTextObj* pSdrTextObj; // check for group object (e.g. two parentheses) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 7092131a87ea..68e4063217a1 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1606,8 +1606,8 @@ private: SwFlyFrameFormat *ConvertDrawTextToFly( SdrObject* &rpObject, SdrObject* &rpOurNewObject, SvxMSDffImportRec const * pRecord, RndStdIds eAnchor, WW8_FSPA const *pF, SfxItemSet &rFlySet ); - SwFrameFormat* MungeTextIntoDrawBox(SdrObject* pTrueObject, - SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrameFormat *pRetFrameFormat); + SwFrameFormat* MungeTextIntoDrawBox(SvxMSDffImportRec *pRecord, + long nGrafAnchorCp, SwFrameFormat *pRetFrameFormat); void GrafikCtor(); void GrafikDtor(); |