[Libreoffice-commits] core.git: sc/source sd/inc sd/source starmath/inc starmath/source sw/inc sw/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Aug 22 01:52:00 UTC 2017
sc/source/filter/xml/xmlwrap.cxx | 4 +++-
sd/inc/strings.hrc | 1 -
sd/source/filter/xml/sdxmlwrp.cxx | 4 +++-
starmath/inc/strings.hrc | 1 -
starmath/source/mathmlimport.cxx | 5 +++--
sw/inc/strings.hrc | 1 -
sw/source/filter/xml/swxml.cxx | 5 +++--
7 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 508957dbf49be577188fb4c112405717957b2734
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Aug 19 23:58:53 2017 +0900
tdf#108706 Unify loading document progress bar label
This also reduces the number of strings to be translated.
Change-Id: I032ba12c1e762ee3851658d439dfe2c81c6bd34f
Reviewed-on: https://gerrit.libreoffice.org/41329
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 392f420ca8a6..530f08b5ab0e 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -26,6 +26,8 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
#include <unotools/streamwrap.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <svx/xmlgrhlp.hxx>
#include <svtools/sfxecode.hxx>
#include <sfx2/frame.hxx>
@@ -342,7 +344,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError )
if (xStatusIndicator.is())
{
sal_Int32 nProgressRange(1000000);
- xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange);
+ xStatusIndicator->start(SvxResId(RID_SVXSTR_DOC_LOAD), nProgressRange);
xInfoSet->setPropertyValue("ProgressRange", uno::makeAny(nProgressRange));
}
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 7d049670373f..a47b808609e3 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -334,7 +334,6 @@
#define STR_PSEUDOSHEET_BACKGROUND NC_("STR_PSEUDOSHEET_BACKGROUND", "Background" )
#define STR_PSEUDOSHEET_NOTES NC_("STR_PSEUDOSHEET_NOTES", "Notes" )
#define STR_POWERPOINT_IMPORT NC_("STR_POWERPOINT_IMPORT", "PowerPoint Import")
-#define STR_LOAD_DOC NC_("STR_LOAD_DOC", "Load Document" )
#define STR_SAVE_DOC NC_("STR_SAVE_DOC", "Save Document" )
#define STR_POOLSHEET_BANDED_CELL NC_("STR_POOLSHEET_BANDED_CELL", "Banding cell" )
#define STR_POOLSHEET_HEADER NC_("STR_POOLSHEET_HEADER", "Header" )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 56a1368d78aa..fa3bcfa10cdf 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -30,6 +30,8 @@
#include "drawdoc.hxx"
#include "Outliner.hxx"
#include <unotools/streamwrap.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <svx/xmlgrhlp.hxx>
#include "DrawDocShell.hxx"
@@ -524,7 +526,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
if(mxStatusIndicator.is())
{
sal_Int32 nProgressRange(1000000);
- OUString aMsg(SdResId(STR_LOAD_DOC));
+ OUString aMsg(SvxResId(RID_SVXSTR_DOC_LOAD));
mxStatusIndicator->start(aMsg, nProgressRange);
// set ProgressRange
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index b000bfe62ca9..8ef050ec8a56 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -308,7 +308,6 @@
#define STR_ALIGN_RIGHT NC_("STR_ALIGN_RIGHT", "right" )
#define STR_CMDBOXWINDOW NC_("STR_CMDBOXWINDOW", "Commands" )
#define RID_DOCUMENTSTR NC_("RID_DOCUMENTSTR", "Formula" )
-#define STR_STATSTR_READING NC_("STR_STATSTR_READING", "Loading document..." )
#define STR_STATSTR_WRITING NC_("STR_STATSTR_WRITING", "Saving document..." )
#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT NC_("STR_MATH_DOCUMENT_FULLTYPE_CURRENT", "%PRODUCTNAME %PRODUCTVERSION Formula")
#define RID_ERR_IDENT NC_("RID_ERR_IDENT", "ERROR : " )
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 5eac14f28977..97193e119172 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -54,13 +54,14 @@ one go*/
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmlmetai.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <memory>
#include "mathmlattr.hxx"
#include "mathmlimport.hxx"
#include "register.hxx"
-#include <strings.hrc>
#include <unomodel.hxx>
#include <document.hxx>
#include <utility.hxx>
@@ -161,7 +162,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium)
sal_Int32 nProgressRange(nSteps);
if (xStatusIndicator.is())
{
- xStatusIndicator->start(SmResId(STR_STATSTR_READING), nProgressRange);
+ xStatusIndicator->start(SvxResId(RID_SVXSTR_DOC_LOAD), nProgressRange);
}
nSteps=0;
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index bbd31e3318f5..9c42670f24e0 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -262,7 +262,6 @@
// Statusbar-titles
#define STR_STATSTR_W4WREAD NC_("STR_STATSTR_W4WREAD", "Importing document...")
#define STR_STATSTR_W4WWRITE NC_("STR_STATSTR_W4WWRITE", "Exporting document...")
-#define STR_STATSTR_SWGREAD NC_("STR_STATSTR_SWGREAD", "Loading document...")
#define STR_STATSTR_SWGWRITE NC_("STR_STATSTR_SWGWRITE", "Saving document...")
#define STR_STATSTR_REFORMAT NC_("STR_STATSTR_REFORMAT", "Repagination...")
#define STR_STATSTR_AUTOFORMAT NC_("STR_STATSTR_AUTOFORMAT", "Formatting document automatically...")
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 0de368498c3f..515d3a6b2dfa 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -40,6 +40,8 @@
#include <svtools/sfxecode.hxx>
#include <svl/stritem.hxx>
#include <unotools/streamwrap.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <svx/xmlgrhlp.hxx>
#include <svx/xmleohlp.hxx>
#include <comphelper/genericpropertyset.hxx>
@@ -59,7 +61,6 @@
#include <unotextrange.hxx>
#include <swmodule.hxx>
#include <SwXMLSectionList.hxx>
-#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
#include <poolfmt.hxx>
@@ -633,7 +634,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
sal_Int32 nProgressRange(1000000);
if (xStatusIndicator.is())
{
- xStatusIndicator->start(SwResId(STR_STATSTR_SWGREAD), nProgressRange);
+ xStatusIndicator->start(SvxResId(RID_SVXSTR_DOC_LOAD), nProgressRange);
}
uno::Any aProgRange;
aProgRange <<= nProgressRange;
More information about the Libreoffice-commits
mailing list