[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 4d4205311709450e378a2672b9d58ed2f430634d
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Tue Oct 8 16:44:09 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Tue Oct 8 16:24:09 2019 +0200

    lok: Avoid accidental removal of filter options
    
    Change-Id: I178bcb19aa3073ea72a3bc8712e5e904665b1510
    Reviewed-on: https://gerrit.libreoffice.org/80462
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1707cad91d5c..cf59037fcb3f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2175,15 +2175,9 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
         {
             int bIndex = aFilterOptions.indexOf("WATERMARKEND");
             watermarkText = aFilterOptions.copy(aIndex+11, bIndex-(aIndex+11));
-            if(aIndex > 0)
-            {
-                OUString temp = aFilterOptions.copy(0, aIndex);
-                aFilterOptions = temp + aFilterOptions.copy(bIndex+12);
-            }
-            else
-            {
-                aFilterOptions.clear();
-            }
+
+            OUString temp = aFilterOptions.copy(0, aIndex);
+            aFilterOptions = temp + aFilterOptions.copy(bIndex+12);
         }
 
         aIndex = -1;