diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-12 12:54:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-12 13:10:23 +0100 |
| commit | ce577c94e7c4c53930a43ab0fd78fcacbf2eb01c (patch) | |
| tree | fb223633aa1a8092ae2dada67d3e8770995f4693 | |
| parent | 13ca751a69f1aed666eade43d464b357dbe3c1af (diff) | |
drop unused argument
Change-Id: Ibbf3d6cbf694b1ca693d53c9ac92076a85df125f
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 9787ad27cfaa..19b75d2662c1 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -3983,10 +3983,10 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr ) pStStrm->Seek( rSI.m_nFilePos ); - sal_uInt16 nSkip, cbStd; + sal_uInt16 nSkip; OUString sName; - std::unique_ptr<WW8_STD> xStd(Read1Style(nSkip, &sName, &cbStd));// read Style + std::unique_ptr<WW8_STD> xStd(Read1Style(nSkip, &sName));// read Style if (xStd) rSI.SetOrgWWIdent( sName, xStd->sti ); @@ -4079,7 +4079,7 @@ void WW8RStyle::ScanStyles() // investigate style dependencies rSI.m_nFilePos = pStStrm->Tell(); // remember FilePos sal_uInt16 nSkip; - WW8_STD* pStd = Read1Style( nSkip, nullptr, nullptr ); // read STD + WW8_STD* pStd = Read1Style(nSkip, nullptr); // read STD rSI.m_bValid = (nullptr != pStd); if (rSI.m_bValid) { diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 322f16c89876..4ce475c18952 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -6563,7 +6563,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) // so it has no empty slot, we should allocate memory and a pointer should // reference to STD (perhaps filled with 0). If the slot is empty, // it will return a null pointer. -WW8_STD* WW8Style::Read1STDFixed(sal_uInt16& rSkip, sal_uInt16* pcbStd) +WW8_STD* WW8Style::Read1STDFixed(sal_uInt16& rSkip) { WW8_STD* pStd = nullptr; @@ -6630,17 +6630,15 @@ WW8_STD* WW8Style::Read1STDFixed(sal_uInt16& rSkip, sal_uInt16* pcbStd) rSt.SeekRel( cbStd ); // skip leftovers rSkip = 0; } - if( pcbStd ) - *pcbStd = cbStd; return pStd; } -WW8_STD* WW8Style::Read1Style(sal_uInt16& rSkip, OUString* pString, sal_uInt16* pcbStd) +WW8_STD* WW8Style::Read1Style(sal_uInt16& rSkip, OUString* pString) { // Attention: MacWord-Documents have their Stylenames // always in ANSI, even if eStructCharSet == CHARSET_MAC !! - WW8_STD* pStd = Read1STDFixed(rSkip, pcbStd); // read STD + WW8_STD* pStd = Read1STDFixed(rSkip); // read STD // string desired? if( pString ) diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index c0ead8a7936e..c3b9cd284e0b 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1563,8 +1563,8 @@ protected: public: WW8Style( SvStream& rSt, WW8Fib& rFibPara ); - WW8_STD* Read1STDFixed(sal_uInt16& rSkip, sal_uInt16* pcbStd); - WW8_STD* Read1Style(sal_uInt16& rSkip, OUString* pString, sal_uInt16* pcbStd); + WW8_STD* Read1STDFixed(sal_uInt16& rSkip); + WW8_STD* Read1Style(sal_uInt16& rSkip, OUString* pString); sal_uInt16 GetCount() const { return cstd; } }; |