Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1656

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/1656/1

Resolves: fdo#58865 hard-coded LibreOffice strings

Change-Id: Ie03106c3089f6d1bc0172a2e2c702b5725e55acf
---
M sc/source/ui/docshell/docsh.cxx
M sc/source/ui/src/globstr.src
M sc/source/ui/src/optdlg.src
3 files changed, 5 insertions(+), 3 deletions(-)



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 @@
     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 @@
 
     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 @@
     {
         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

-- 
To view, visit https://gerrit.libreoffice.org/1656
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie03106c3089f6d1bc0172a2e2c702b5725e55acf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Caolán McNamara <caolanm@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.