[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/filter/html/wrthtml.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c221a1b93dd70a14b897c3a96b8e032cd97b9593
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sun Jan 25 14:12:22 2015 +0000

    coverity#1266508 Useless call (gold)
    
    regression from
    
    commit 832e5aadbff006ec24959162c29756fe2b1982be
    Author: Caolán McNamara <caol...@redhat.com>
    Date:   Tue Oct 8 10:06:59 2013 +0100
        Related: fdo#38838 remove UniString::SearchAndReplaceAll
    
    (cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a)
    
    Conflicts:
        sw/source/filter/html/wrthtml.cxx
    
    Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c
    Reviewed-on: https://gerrit.libreoffice.org/14171
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index 13add63..f9d60e5 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1170,8 +1170,7 @@ void SwHTMLWriter::OutImplicitMark( const OUString& rMark,
 {
     if( !rMark.isEmpty() && !aImplicitMarks.empty() )
     {
-        OUString sMark( rMark );
-        sMark + OUString(cMarkSeparator) + 
OUString::createFromAscii(pMarkType);
+        OUString sMark(rMark + OUString(cMarkSeparator) + 
OUString::createFromAscii(pMarkType));
         if( 0 != aImplicitMarks.erase( sMark ) )
         {
             OutAnchor(sMark.replace('?', '_')); // '?' causes problems in 
IE/Netscape 5

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits