diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-13 11:08:48 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-13 13:02:01 +0200 |
| commit | a4422e1c976d4d3f030671da13b765175439acbd (patch) | |
| tree | 52a87c8c78a0f1476a0cdac5d67082c17c95e1c6 | |
| parent | 3c922c203efb19e095c1687c0047e27d89c18c83 (diff) | |
bnc#816603 SwWW8ImplReader::ParseTabPos: make this non-static
I'll need to access the non-static maSectionManager in this method soon.
(cherry picked from commit 1fd1ecd3451a39c837b42dd100aa5f154e01816b)
Change-Id: Ia056ec9c812020c4ac0f4a0f1460a0c9506b12fa
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 5655def6ad04..e259bf5483b3 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1677,7 +1677,7 @@ public: // eigentlich private, geht aber leider nur public void Read_TabRowEnd( sal_uInt16, const sal_uInt8* pData, short nLen ); void Read_TabCellEnd( sal_uInt16, const sal_uInt8* pData, short nLen ); - static bool ParseTabPos(WW8_TablePos *aTabPos, WW8PLCFx_Cp_FKP* pPap); + bool ParseTabPos(WW8_TablePos *aTabPos, WW8PLCFx_Cp_FKP* pPap); void Read_Shade( sal_uInt16, const sal_uInt8* pData, short nLen ); void Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short nLen ); void Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, short nLen ); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index fe0ee48a5365..0cbbec2fc36a 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1975,7 +1975,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : //Get the end of row new table positioning data WW8_CP nMyStartCp=nStartCp; if (pIo->SearchRowEnd(pPap, nMyStartCp, pIo->nInTable)) - if (SwWW8ImplReader::ParseTabPos(&aTabPos, pPap)) + if (pIo->ParseTabPos(&aTabPos, pPap)) pTabPos = &aTabPos; //Move back to this cell |