diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-21 16:53:30 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-01 08:44:44 +0100 |
| commit | 23b008ee75e22cbd3c2b08b7a7968dec22257791 (patch) | |
| tree | 7ba8284a8c67e04cc97ac2f6d1edc2623e865272 /sw/qa | |
| parent | a4165e1b08c82b667b209ee38b4d2a2c534c1def (diff) | |
sw_redlinehide_4a: finish conversions guess.cxx,itrcrsr.cxx,porfld.cxx
... and tests.
Change-Id: I847a9441b73cdfc9bd826fad2c9075a9aa1d7d2d
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index f72dc90664fc..b49e1e75e7cd 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -4186,7 +4186,7 @@ void SwUiWriterTest::testTdf87922() SwNodeIndex aNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1); const OUString& rText = aNodeIndex.GetNode().GetTextNode()->GetText(); sal_Int32 nLength = rText.getLength(); - SwDrawTextInfo aDrawTextInfo(pWrtShell, *pWrtShell->GetOut(), pScriptInfo, rText, 0, nLength); + SwDrawTextInfo aDrawTextInfo(pWrtShell, *pWrtShell->GetOut(), pScriptInfo, rText, TextFrameIndex(0), TextFrameIndex(nLength)); // Root -> page -> body -> text. SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pWrtShell->GetLayout()->GetLower()->GetLower()->GetLower()); aDrawTextInfo.SetFrame(pTextFrame); @@ -4230,17 +4230,17 @@ class PortionHandler : public SwPortionHandler mPortionItems.clear(); } - virtual void Text(sal_Int32 nLength, sal_uInt16 nType, + virtual void Text(TextFrameIndex nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/) override { - mPortionItems.emplace_back("text", nLength, nType); + mPortionItems.emplace_back("text", sal_Int32(nLength), nType); } - virtual void Special(sal_Int32 nLength, const OUString & /*rText*/, + virtual void Special(TextFrameIndex nLength, const OUString & /*rText*/, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/) override { - mPortionItems.emplace_back("special", nLength, nType); + mPortionItems.emplace_back("special", sal_Int32(nLength), nType); } virtual void LineBreak(sal_Int32 /*nWidth*/) override @@ -4248,9 +4248,9 @@ class PortionHandler : public SwPortionHandler mPortionItems.emplace_back("line_break", 0, 0); } - virtual void Skip(sal_Int32 nLength) override + virtual void Skip(TextFrameIndex nLength) override { - mPortionItems.emplace_back("skip", nLength, 0); + mPortionItems.emplace_back("skip", sal_Int32(nLength), 0); } virtual void Finish() override |