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

[Joren De Cuyper]

 sc/source/ui/src/globstr.src   |   18 +++++-------------
 sc/source/ui/view/viewfun2.cxx |   12 +++++-------
 2 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit af4a947174aafe669c129c54c304caa43d90eac7
Author: Joren De Cuyper <joren.libreoffice at telenet.be>
Date:   Thu Apr 11 15:43:20 2013 +0200

    fdo#63290 - UI: Goal Seek - incorrect term "current cell"
    
    Previous patch was a review patch I submitted to send to the UX advice
    mailinglist. Cor proposed a better wording for the label name,
    see https://bugs.freedesktop.org/show_bug.cgi?id=63290#c4 and has been
    revised a bit more since then.
    
    Change-Id: I0cd1fac43ba3fed55fbb16e4f9bbf6836c1436b2
    Reviewed-on: https://gerrit.libreoffice.org/3338
    Reviewed-by: Joren De Cuyper <joren.libreoffice at telenet.be>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 54001c4..a545d40 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -443,31 +443,23 @@ Resource RID_GLOBSTR
     };
     String STR_MSSG_SOLVE_0
     {
-        Text [ en-US ] = "Goal Seek successful.\n" ;
+        Text [ en-US ] = "Goal Seek succeeded. Result: " ;
     };
     String STR_MSSG_SOLVE_1
     {
-        Text [ en-US ] = "Result (" ;
+        Text [ en-US ] = "\n\nInsert the result into the variable cell?" ;
     };
     String STR_MSSG_SOLVE_2
     {
-        Text [ en-US ] = "). Apply setting to spreadsheet?" ;
+        Text [ en-US ] = "Goal Seek failed.\n\n" ;
     };
     String STR_MSSG_SOLVE_3
     {
-        Text [ en-US ] = "Goal Seek not successful.\n" ;
+        Text [ en-US ] = "Insert the closest value (" ;
     };
     String STR_MSSG_SOLVE_4
     {
-        Text [ en-US ] = "No exact value found. \n" ;
-    };
-    String STR_MSSG_SOLVE_5
-    {
-        Text [ en-US ] = "Insert closest value (" ;
-    };
-    String STR_MSSG_SOLVE_6
-    {
-        Text [ en-US ] = ")?" ;
+        Text [ en-US ] = ") into the variable cell anyway?" ;
     };
     String STR_TABLE_GESAMTERGEBNIS
     {
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index a097ca6..b61d3ab 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1854,18 +1854,16 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
 
         if ( bExact )
         {
-            aMsgStr  = ScGlobal::GetRscString( STR_MSSG_SOLVE_0 );
-            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_1 );
+            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_0 );
             aMsgStr += String( aResStr );
-            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_2 );
+            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_1 );
         }
         else
         {
-            aMsgStr  = ScGlobal::GetRscString( STR_MSSG_SOLVE_3 );
-            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_4 );
-            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_5 );
+            aMsgStr  = ScGlobal::GetRscString( STR_MSSG_SOLVE_2 );
+            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_3 );
             aMsgStr += String( aResStr );
-            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_6 );
+            aMsgStr += ScGlobal::GetRscString( STR_MSSG_SOLVE_4 );
         }
 
         MessBox aBox( GetViewData()->GetDialogParent(),