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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 1 17:18:01 UTC 2020


 sax/source/fastparser/fastparser.cxx                        |   28 ++++++------
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |    2 
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit ebe25a18c4d2aa3fc5e1c8c57f14d71ce50cb15c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 1 13:16:16 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Dec 1 18:17:14 2020 +0100

    cid#1470375 Unrecoverable parse warning
    
    and
    
    cid#1470366 Unrecoverable parse warning
    cid#1470365 Unrecoverable parse warning
    cid#1470361 Unrecoverable parse warning
    cid#1470360 Unrecoverable parse warning
    cid#1470367 Unrecoverable parse warning
    
    Change-Id: Ib0b5167de65d1a16438ba8f8c564b0b89d52e6d5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106982
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 79ac533f72b6..662991ff91ba 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1495,20 +1495,20 @@ static void NormalizeURI( OUString& rName )
         bSuccess = NormalizeW3URI( rName );
 }
 
-const OUStringLiteral XML_URI_W3_PREFIX(u"http://www.w3.org/");
-const OUStringLiteral XML_URI_XFORMS_SUFFIX(u"/xforms");
-const OUStringLiteral XML_N_XFORMS_1_0(u"http://www.w3.org/2002/xforms");
-const OUStringLiteral XML_N_SVG(u"http://www.w3.org/2000/svg");
-const OUStringLiteral XML_N_SVG_COMPAT(u"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
-const OUStringLiteral XML_N_FO(u"http://www.w3.org/1999/XSL/Format");
-const OUStringLiteral XML_N_FO_COMPAT(u"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
-const OUStringLiteral XML_N_SMIL(u"http://www.w3.org/2001/SMIL20/");
-const OUStringLiteral XML_N_SMIL_OLD(u"http://www.w3.org/2001/SMIL20");
-const OUStringLiteral XML_N_SMIL_COMPAT(u"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0");
-const OUStringLiteral XML_URN_OASIS_NAMES_TC(u"urn:oasis:names:tc");
-const OUStringLiteral XML_XMLNS(u"xmlns");
-const OUStringLiteral XML_OPENDOCUMENT(u"opendocument");
-const OUStringLiteral XML_1_0(u"1.0");
+constexpr OUStringLiteral XML_URI_W3_PREFIX(u"http://www.w3.org/");
+constexpr OUStringLiteral XML_URI_XFORMS_SUFFIX(u"/xforms");
+constexpr OUStringLiteral XML_N_XFORMS_1_0(u"http://www.w3.org/2002/xforms");
+constexpr OUStringLiteral XML_N_SVG(u"http://www.w3.org/2000/svg");
+constexpr OUStringLiteral XML_N_SVG_COMPAT(u"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+constexpr OUStringLiteral XML_N_FO(u"http://www.w3.org/1999/XSL/Format");
+constexpr OUStringLiteral XML_N_FO_COMPAT(u"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+constexpr OUStringLiteral XML_N_SMIL(u"http://www.w3.org/2001/SMIL20/");
+constexpr OUStringLiteral XML_N_SMIL_OLD(u"http://www.w3.org/2001/SMIL20");
+constexpr OUStringLiteral XML_N_SMIL_COMPAT(u"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0");
+constexpr OUStringLiteral XML_URN_OASIS_NAMES_TC(u"urn:oasis:names:tc");
+constexpr OUStringLiteral XML_XMLNS(u"xmlns");
+constexpr OUStringLiteral XML_OPENDOCUMENT(u"opendocument");
+constexpr OUStringLiteral XML_1_0(u"1.0");
 
 static bool NormalizeW3URI( OUString& rName )
 {
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index b48af4241a9b..f2e0155b578b 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -49,7 +49,7 @@ const char* lclAnovaLabels[] =
     nullptr
 };
 
-const OUStringLiteral strWildcardRange = u"%RANGE%";
+constexpr OUStringLiteral strWildcardRange = u"%RANGE%";
 
 OUString lclCreateMultiParameterFormula(
             ScRangeList&        aRangeList, const OUString& aFormulaTemplate,


More information about the Libreoffice-commits mailing list