Fix some escaping bug in l10ntools

1. A typo in export.cxx makes not working replacing
2. EscapeAll() ignored single backlash characters

Change-Id: I1a5309778acdd601391f643ebf3c66d04a6601d4

l10ntools/source/export.cxx

@@ -1201,7 +1201,7 @@ void Export::ConvertMergeContent( OString &rText )
     sal_Bool bNoClose = !rText.endsWith("\\\"");
 
 
-    rText = rText.replaceAll("\\\"'","\'"); // Temporary: until PO files contain escaped single quotes
+    rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes
                                             // (Maybe next PO update solve this)
     rText =
         helper::escapeAll(

l10ntools/source/helper.cxx

@@ -46,6 +46,10 @@ OString unEscapeAll(
                 sReturn.append(rUnEscaped[nEscapedOne/2]);
                 ++nIndex;
             }
+            else
+            {
+                sReturn.append(rText[nIndex]);
+            }
         }
         else
             sReturn.append(rText[nIndex]);