commit 584d55178d2e390e60355b18bbac4be16fe750dd
author Matteo Casalin <matteo.casalin@yahoo.com> Sun Sep 13 17:41:04 2015 +0200
committer Matteo Casalin <matteo.casalin@yahoo.com> Mon Sep 14 22:40:33 2015 +0200
tree fa85c9ffbe2a5c9f0df9f83627e410aca74caf1a
parent 90059da96a91dd2271aeba4101cee8ce827e3c4e

String tokens do not include token separator

Change-Id: I03ab73e5f53b2068efc3c4cdaed15f2ec3854c76

starmath/source/view.cxx

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index b10981b..8627f37 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1006,8 +1006,6 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const OUString& rText, long
    {
        OUString aLine = rText.getToken(i, '\n');
        aLine = comphelper::string::remove(aLine, '\r');
        aLine = comphelper::string::stripStart(aLine, '\n');
        aLine = comphelper::string::stripEnd(aLine, '\n');

        aSize = GetTextLineSize(rDevice, aLine);

@@ -1071,8 +1069,6 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co
                aPoint.X() = ((aPoint.X() / nTabPos) + 1) * nTabPos;

            OUString aText = rLine.getToken(i, '\t');
            aText = comphelper::string::stripStart(aText, '\t');
            aText = comphelper::string::stripEnd(aText, '\t');
            rDevice.DrawText(aPoint, aText);
            aPoint.X() += rDevice.GetTextWidth(aText);
        }
@@ -1092,8 +1088,6 @@ void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const 
    {
        OUString aLine = rText.getToken(i, '\n');
        aLine = comphelper::string::remove(aLine, '\r');
        aLine = comphelper::string::stripEnd(aLine, '\n');
        aLine = comphelper::string::stripEnd(aLine, '\n');
        aSize = GetTextLineSize(rDevice, aLine);
        if (aSize.Width() > MaxWidth)
        {