summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-05-13 11:08:48 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-05-13 15:10:52 +0200
commit2770d376474bae101a0607fb5d3c43f4add5f8b8 (patch)
tree90b5610001d94f2c8857a0544d819a6f703f77aa
parentacdbeb5e393a20636a57a4ed44df71a59698df19 (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.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index f490f811eb4a..84d1e31d89b4 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1686,7 +1686,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 72b6385c1a69..3125e343211e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1970,7 +1970,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