[Libreoffice-commits] core.git: sfx2/source

[Andras Timar]

 sfx2/source/appl/app.src      |    2 +-
 sfx2/source/appl/lnkbase2.cxx |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d4484f726a78f1c2839ac0b4d0181e3e4357396c
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Oct 27 11:40:09 2015 +0100

    better i18n of STR_DDE_ERROR string
    
    Change-Id: I23db46dddae093a85dc4dcb0f7b12630a1e7aa3f
    Reviewed-on: https://gerrit.libreoffice.org/19624
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index e7e1cb5..27597ce 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -318,7 +318,7 @@ String STR_QUERY_UPDATE_LINKS
 
 String STR_DDE_ERROR
 {
-    Text [ en-US ] = "DDE link to % for % area % are not available." ;
+    Text [ en-US ] = "DDE link to %1 for %2 area %3 are not available." ;
 };
 
 String STR_SECURITY_WARNING_NO_HYPERLINKS
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index b956625..a613da9 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -521,19 +521,19 @@ bool SvBaseLink::ExecuteEdit( const OUString& _rNewName )
             {
                 sError = SFX2_RESSTR(STR_DDE_ERROR);
 
-                sal_Int32 nFndPos = sError.indexOf( '%' );
+                sal_Int32 nFndPos = sError.indexOf( "%1" );
                 if( -1 != nFndPos )
                 {
-                    sError = sError.replaceAt( nFndPos, 1, sApp );
+                    sError = sError.replaceAt( nFndPos, 2, sApp );
                     nFndPos = nFndPos + sApp.getLength();
 
-                    if( -1 != ( nFndPos = sError.indexOf( '%', nFndPos )))
+                    if( -1 != ( nFndPos = sError.indexOf( "%2", nFndPos )))
                     {
-                        sError = sError.replaceAt( nFndPos, 1, sTopic );
+                        sError = sError.replaceAt( nFndPos, 2, sTopic );
                         nFndPos = nFndPos + sTopic.getLength();
 
-                        if( -1 != ( nFndPos = sError.indexOf( '%', nFndPos )))
-                            sError = sError.replaceAt( nFndPos, 1, sItem );
+                        if( -1 != ( nFndPos = sError.indexOf( "%3", nFndPos )))
+                            sError = sError.replaceAt( nFndPos, 2, sItem );
                     }
                 }
             }