[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/ui/docshell/docsh.cxx |    4 +++-
 sc/source/ui/src/globstr.src    |    2 +-
 sc/source/ui/src/optdlg.src     |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e610e5f28e4b2b774a897ee7cf6d8098ade30a7f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 11 12:38:03 2013 +0000

    Resolves: fdo#58865 hard-coded LibreOffice strings
    
    Change-Id: Ie03106c3089f6d1bc0172a2e2c702b5725e55acf
    Reviewed-on: https://gerrit.libreoffice.org/1656
    Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 2c35c01..a2073b9 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -102,6 +102,7 @@
 #include <officecfg/Office/Calc.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
+#include <unotools/configmgr.hxx>
 #include "uiitems.hxx"
 #include "cellsuno.hxx"
 #include "dpobject.hxx"
@@ -438,7 +439,8 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un
     bool bHardRecalc = false;
     if (nRecalcMode == RECALC_ASK)
     {
-        if (aDocument.IsUserInteractionEnabled() && xDocProps->getGenerator().indexOf("LibreOffice") == -1)
+        OUString sProductName(utl::ConfigManager::getProductName());
+        if (aDocument.IsUserInteractionEnabled() && xDocProps->getGenerator().indexOf(sProductName) == -1)
         {
             // Generator is not LibreOffice.  Ask if the user wants to perform
             // full re-calculation.
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index a5ac8b2..9f9b259 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1953,7 +1953,7 @@ Resource RID_GLOBSTR
 
     String STR_QUERY_FORMULA_RECALC_ONLOAD_ODS
     {
-        Text [ en-US ] = "This document was last saved by application other than LibreOffice.  Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells in this document now?";
+        Text [ en-US ] = "This document was last saved by an application other than %PRODUCTNAME.  Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells in this document now?";
     };
 
     String STR_QUERY_FORMULA_RECALC_ONLOAD_XLS
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 4f6f5ab..9004396 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -317,7 +317,7 @@ TabPage RID_SCPAGE_FORMULA
     {
         Pos = MAP_APPFONT ( 21, 165 );
         Size = MAP_APPFONT ( 120, 8 );
-        Text [ en-US ] = "ODF Spreadsheet (not saved by LibreOffice)";
+        Text [ en-US ] = "ODF Spreadsheet (not saved by %PRODUCTNAME)";
     };
 
     ListBox LB_ODF_RECALC