Subversion Repositories tpanel

Rev

Rev 163 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 163 Rev 164
Line 282... Line 282...
282
 
282
 
283
                if (len > 0 && *sepIt != '\n')
283
                if (len > 0 && *sepIt != '\n')
284
                    parts.push_back(str.substr(mark, len));
284
                    parts.push_back(str.substr(mark, len));
285
                else if (len > 0)
285
                else if (len > 0)
286
                    parts.push_back(str.substr(mark, len) + "\n");
286
                    parts.push_back(str.substr(mark, len) + "\n");
-
 
287
                else if (*sepIt == '\n')
-
 
288
                    parts.push_back("\n");
287
                else
289
                else
288
                    parts.push_back(string());
290
                    parts.push_back(string());
289
 
291
 
290
                mark = pos + 1;
292
                mark = pos + 1;
291
                break;
293
                break;
Line 614... Line 616...
614
        bool lineBreak = false;
616
        bool lineBreak = false;
615
 
617
 
616
        if ((pos = iter->find("\n")) != string::npos)
618
        if ((pos = iter->find("\n")) != string::npos)
617
        {
619
        {
618
            if (pos > 0)
620
            if (pos > 0)
619
                *iter = iter->substr(0, pos - 1);
621
                *iter = iter->substr(0, pos);
620
            else
622
            else
621
                *iter = "";
623
                *iter = "";
622
 
624
 
623
            lineBreak = true;
625
            lineBreak = true;
624
        }
626
        }