[Libreoffice-commits] core.git: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/feature.pm  |    1 +
 solenv/bin/modules/installer/windows/shortcut.pm |    1 +
 solenv/bin/modules/pre2par/language.pm           |    1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3f29153ab6535d5e2fd975540dd39f4f61e211fc
Author: Andras Timar <atimar at suse.com>
Date:   Mon Aug 26 11:10:47 2013 -0700

    fdo#68158 fix quote escaping problems
    
    It was not clear, why pre2par escaped quote, because it was already
    escaped in .ulf file. I think that the Tooltip/Description cases were
    simply overlooked, because at other places other kind of strings
    were processed, i.e. \" was replaced to ".
    
    Change-Id: Idcd8c8cb627dbfd0e3cc9961b19cae236de3e25f

diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 602beaf..d023a74 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -387,6 +387,7 @@ sub create_feature_table
             $feature{'feature_parent'} = get_feature_parent($onefeature);
             $feature{'Title'} = $onefeature->{'Name'};
             $feature{'Description'} = $onefeature->{'Description'};
+            $feature{'Description'} =~ s/\\\"/\"/g;  # no more masquerading of '"'
             $feature{'Display'} = get_feature_display($onefeature);
             $feature{'Level'} = get_feature_level($onefeature);
             $feature{'Directory_'} = get_feature_directory($onefeature);
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index 4a8526e..b32c772 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -199,6 +199,7 @@ sub get_shortcut_description
 
     my $description = "";
     if ( $shortcut->{'Tooltip'} ) { $description = $shortcut->{'Tooltip'}; }
+    $description =~ s/\\\"/\"/g;  # no more masquerading of '"'
 
     return $description;
 }
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index e38ef80..842c86d 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -37,7 +37,6 @@ sub get_language_string_from_language_block
         if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
         {
             $newstring = $1;
-            $newstring =~ s/\"/\\\"/g;  # masquerading all '"' in the string
             $newstring = "\"" . $newstring . "\"";
             last;
         }