summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx2
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx3
-rw-r--r--sc/source/core/data/colorscale.cxx45
-rw-r--r--sc/source/filter/excel/xlroot.cxx2
-rw-r--r--sc/source/filter/excel/xltools.cxx5
-rw-r--r--sc/source/filter/inc/xlroot.hxx4
-rw-r--r--sc/source/filter/oox/defnamesbuffer.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/RegressionDialog.cxx11
-rw-r--r--sc/source/ui/navipi/content.cxx6
-rw-r--r--sc/source/ui/unoobj/targuno.cxx6
-rw-r--r--sc/source/ui/unoobj/textuno.cxx2
-rw-r--r--sc/source/ui/vba/vbadialog.cxx7
-rw-r--r--sc/source/ui/view/olinewin.cxx6
13 files changed, 63 insertions, 38 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 3e68d6691609..64ddcd550ef5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3530,7 +3530,7 @@ void ScExportTest::testSupBookVirtualPathXLS()
#ifdef _WIN32
aFormula = aFormula.copy(0, 9) + aFormula.copy(12); // strip drive letter, e.g. 'C:/'
#endif
- OUString aExpectedFormula = OUStringLiteral(u"'file:///home/timar/Documents/external.xls'#$Sheet1.A1");
+ OUString aExpectedFormula = "'file:///home/timar/Documents/external.xls'#$Sheet1.A1";
if (aFormula != aExpectedFormula)
{
CppUnit::Asserter::failNotEqual(to_std_string(aExpectedFormula),
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 3595b568b105..9c3d7ad3a5ab 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -8,6 +8,7 @@
*/
#include <memory>
+#include <string_view>
#include "ucalc.hxx"
#include "helper/debughelper.hxx"
#include "helper/qahelper.hxx"
@@ -2601,7 +2602,7 @@ void Test::testSharedFormulaCutCopyMoveWithRef()
}
// Check formulas in C1:C4 after Paste.
- const OUStringLiteral sForm[] = { u"=SUM(A1:B1)", u"=SUM(A2:B2)", u"=SUM(A1:B1)", u"=SUM(A4:B4)" };
+ const std::u16string_view sForm[] = { u"=SUM(A1:B1)", u"=SUM(A2:B2)", u"=SUM(A1:B1)", u"=SUM(A4:B4)" };
for (SCROW i=0; i < 4; ++i)
{
OUString aFormula;
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 16386a16370e..5287ecfdf397 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -22,6 +22,7 @@
#include <algorithm>
#include <cassert>
+#include <string_view>
ScFormulaListener::ScFormulaListener(ScFormulaCell* pCell):
mbDirty(false),
@@ -1228,102 +1229,102 @@ size_t ScIconSetFormat::size() const
namespace {
-const OUStringLiteral a3TrafficLights1[] = {
+const std::u16string_view a3TrafficLights1[] = {
u"" BMP_ICON_SET_CIRCLES1_RED, u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
};
-const OUStringLiteral a3TrafficLights2[] = {
+const std::u16string_view a3TrafficLights2[] = {
u"" BMP_ICON_SET_TRAFFICLIGHTS_RED, u"" BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, u"" BMP_ICON_SET_TRAFFICLIGHTS_GREEN
};
-const OUStringLiteral a3Arrows[] = {
+const std::u16string_view a3Arrows[] = {
u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SAME, u"" BMP_ICON_SET_COLORARROWS_UP
};
-const OUStringLiteral a3ArrowsGray[] = {
+const std::u16string_view a3ArrowsGray[] = {
u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" BMP_ICON_SET_GRAYARROWS_UP
};
-const OUStringLiteral a3Flags[] = {
+const std::u16string_view a3Flags[] = {
u"" BMP_ICON_SET_FLAGS_RED, u"" BMP_ICON_SET_FLAGS_YELLOW, u"" BMP_ICON_SET_FLAGS_GREEN
};
-const OUStringLiteral a3Smilies[] = {
+const std::u16string_view a3Smilies[] = {
u"" BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, u"" BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
};
-const OUStringLiteral a3ColorSmilies[] = {
+const std::u16string_view a3ColorSmilies[] = {
u"" BMP_ICON_SET_POSITIVE_GREEN_SMILIE, u"" BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_RED_SMILIE
};
-const OUStringLiteral a3Stars[] = {
+const std::u16string_view a3Stars[] = {
u"" BMP_ICON_SET_STARS_EMPTY, u"" BMP_ICON_SET_STARS_HALF, u"" BMP_ICON_SET_STARS_FULL
};
-const OUStringLiteral a3Triangles[] = {
+const std::u16string_view a3Triangles[] = {
u"" BMP_ICON_SET_TRIANGLES_DOWN, u"" BMP_ICON_SET_TRIANGLES_SAME, u"" BMP_ICON_SET_TRIANGLES_UP
};
-const OUStringLiteral a4Arrows[] = {
+const std::u16string_view a4Arrows[] = {
u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_COLORARROWS_UP
};
-const OUStringLiteral a4ArrowsGray[] = {
+const std::u16string_view a4ArrowsGray[] = {
u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_GRAYARROWS_UP
};
-const OUStringLiteral a5Arrows[] = {
+const std::u16string_view a5Arrows[] = {
u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
u"" BMP_ICON_SET_COLORARROWS_SAME, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_COLORARROWS_UP
};
-const OUStringLiteral a5ArrowsGray[] = {
+const std::u16string_view a5ArrowsGray[] = {
u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_GRAYARROWS_UP
};
-const OUStringLiteral a4TrafficLights[] = {
+const std::u16string_view a4TrafficLights[] = {
u"" BMP_ICON_SET_CIRCLES1_GRAY, u"" BMP_ICON_SET_CIRCLES1_RED,
u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
};
-const OUStringLiteral a5Quarters[] = {
+const std::u16string_view a5Quarters[] = {
u"" BMP_ICON_SET_PIES_EMPTY, u"" BMP_ICON_SET_PIES_ONE_QUARTER, u"" BMP_ICON_SET_PIES_HALF,
u"" BMP_ICON_SET_PIES_THREE_QUARTER, u"" BMP_ICON_SET_PIES_FULL,
};
-const OUStringLiteral a5Boxes[] = {
+const std::u16string_view a5Boxes[] = {
u"" BMP_ICON_SET_SQUARES_EMPTY, u"" BMP_ICON_SET_SQUARES_ONE_QUARTER,
u"" BMP_ICON_SET_SQUARES_HALF, u"" BMP_ICON_SET_SQUARES_THREE_QUARTER,
u"" BMP_ICON_SET_SQUARES_FULL
};
-const OUStringLiteral a3Symbols1[] = {
+const std::u16string_view a3Symbols1[] = {
u"" BMP_ICON_SET_SYMBOLS1_CROSS, u"" BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, u"" BMP_ICON_SET_SYMBOLS1_CHECK
};
-const OUStringLiteral a3Signs[] = {
+const std::u16string_view a3Signs[] = {
u"" BMP_ICON_SET_SHAPES_DIAMOND, u"" BMP_ICON_SET_SHAPES_TRIANGLE, u"" BMP_ICON_SET_SHAPES_CIRCLE
};
-const OUStringLiteral a4RedToBlack[] = {
+const std::u16string_view a4RedToBlack[] = {
u"" BMP_ICON_SET_CIRCLES2_DARK_GRAY, u"" BMP_ICON_SET_CIRCLES2_LIGHT_GRAY,
u"" BMP_ICON_SET_CIRCLES2_LIGHT_RED, u"" BMP_ICON_SET_CIRCLES2_DARK_RED
};
-const OUStringLiteral a4Ratings[] = {
+const std::u16string_view a4Ratings[] = {
u"" BMP_ICON_SET_BARS_ONE_QUARTER, u"" BMP_ICON_SET_BARS_HALF,
u"" BMP_ICON_SET_BARS_THREE_QUARTER, u"" BMP_ICON_SET_BARS_FULL
};
-const OUStringLiteral a5Ratings[] = {
+const std::u16string_view a5Ratings[] = {
u"" BMP_ICON_SET_BARS_EMPTY, u"" BMP_ICON_SET_BARS_ONE_QUARTER, u"" BMP_ICON_SET_BARS_HALF,
u"" BMP_ICON_SET_BARS_THREE_QUARTER, u"" BMP_ICON_SET_BARS_FULL
};
struct ScIconSetBitmapMap {
ScIconSetType eType;
- const OUStringLiteral* pBitmaps;
+ const std::u16string_view* pBitmaps;
};
const ScIconSetBitmapMap aBitmapMap[] = {
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 32f04f61ed40..7bc880988549 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -79,8 +79,6 @@ XclDebugObjCounter::~XclDebugObjCounter()
}
#endif
-const OUStringLiteral XclRootData::gaDefPassword( u"VelvetSweatshop" );
-
XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
tools::SvRef<SotStorage> const & xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) :
meBiff( eBiff ),
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 83983bb6bc4b..454de576b7bf 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -19,6 +19,8 @@
#include <algorithm>
#include <math.h>
+#include <string_view>
+
#include <sal/mathconf.h>
#include <sal/macros.h>
#include <sal/log.hxx>
@@ -632,7 +634,8 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons
{
OUString aLevel = rStyleName.copy(nNextChar);
sal_Int32 nLevel = aLevel.toInt32();
- if (OUString::number(nLevel) == aLevel && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT)
+ if (std::u16string_view(OUString::number(nLevel)) == aLevel
+ && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT)
{
rnStyleId = nStyleId;
rnLevel = static_cast< sal_uInt8 >( nLevel - 1 );
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index fce08df5b0f6..781a9b6dfb07 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -80,7 +80,7 @@ struct XclRootData
OUString maDocUrl; /// Document URL of imported/exported file.
OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl).
OUString maUserName; /// Current user name.
- static const OUStringLiteral gaDefPassword; /// The default password used for stream encryption.
+ static constexpr OUStringLiteral gaDefPassword = u"VelvetSweatshop"; /// The default password used for stream encryption.
rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings.
LanguageType meSysLang; /// System language.
LanguageType meDocLang; /// Document language (import: from file, export: from system).
@@ -174,7 +174,7 @@ public:
const OUString& GetUserName() const { return mrData.maUserName; }
/** Returns the default password used for stream encryption. */
- static const OUStringLiteral& GetDefaultPassword() { return XclRootData::gaDefPassword; }
+ static OUString GetDefaultPassword() { return XclRootData::gaDefPassword; }
/** Requests and verifies a password from the medium or the user. */
css::uno::Sequence< css::beans::NamedValue >
RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 6106a413aa57..467fba66e804 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -98,7 +98,7 @@ sal_Unicode lclGetBuiltinIdFromPrefixedName( const OUString& rModelName )
{
OUString aBaseName = lclGetBaseName( cBuiltinId );
sal_Int32 nBaseNameLen = aBaseName.getLength();
- if( (rModelName.getLength() == spcOoxPrefix.size + nBaseNameLen) && rModelName.matchIgnoreAsciiCase( aBaseName, spcOoxPrefix.size ) )
+ if( (rModelName.getLength() == spcOoxPrefix.getLength() + nBaseNameLen) && rModelName.matchIgnoreAsciiCase( aBaseName, spcOoxPrefix.getLength() ) )
return cBuiltinId;
}
}
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index ef5cd8f28a76..401ddf41201d 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -8,6 +8,10 @@
*
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <document.hxx>
#include <reffact.hxx>
#include <TableFillingAndNavigationTools.hxx>
@@ -362,7 +366,7 @@ void ScRegressionDialog::WriteRawRegressionResults(AddressWalkerWriter& rOutput,
rTemplate.setTemplate(constTemplateLINEST[nRegressionIndex].
replaceFirst("%CALC_INTERCEPT%",
- mbCalcIntercept ? OUStringLiteral(u"TRUE") : OUStringLiteral(u"FALSE")));
+ mbCalcIntercept ? std::u16string_view(u"TRUE") : std::u16string_view(u"FALSE")));
rOutput.writeMatrixFormula(rTemplate.getTemplate(), 1 + mnNumIndependentVars, 5);
// Add LINEST result components to template
// 1. Add ranges for coefficients and standard errors for indep. vars and the intercept.
@@ -407,8 +411,9 @@ void ScRegressionDialog::WriteRegressionStatistics(AddressWalkerWriter& rOutput,
"=%SERRORY_ADDR%",
"=" + OUString::number(mnNumIndependentVars),
"=" + OUString::number(mnNumObservations),
- "=1 - (1 - %RSQUARED_ADDR%)*(%NUMOBS_ADDR% - 1)/(%NUMOBS_ADDR% - %NUMXVARS_ADDR%" +
- (mbCalcIntercept ? OUStringLiteral(u" - 1)") : OUStringLiteral(u")"))
+ OUString::Concat(
+ "=1 - (1 - %RSQUARED_ADDR%)*(%NUMOBS_ADDR% - 1)/(%NUMOBS_ADDR% - %NUMXVARS_ADDR%") +
+ (mbCalcIntercept ? std::u16string_view(u" - 1)") : std::u16string_view(u")"))
};
rTemplate.autoReplaceAddress("%NUMXVARS_ADDR%", rOutput.current(1, 2));
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 6d45aed39a95..8b7d7d7d442b 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <svx/svditer.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdview.hxx>
@@ -71,7 +75,7 @@ const ScContentId pTypeList[int(ScContentId::LAST) + 1] =
ScContentId::DRAWING
};
-const OUStringLiteral aContentBmps[]=
+const std::u16string_view aContentBmps[]=
{
u"" RID_BMP_CONTENT_TABLE,
u"" RID_BMP_CONTENT_RANGENAME,
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 4446f0fab2b1..339f3b10d60b 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <toolkit/helper/vclunohelper.hxx>
#include <svl/itemprop.hxx>
#include <svl/hint.hxx>
@@ -199,7 +203,7 @@ void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aProperty
//! exception?
}
-const OUStringLiteral aContentBmps[]=
+const std::u16string_view aContentBmps[]=
{
u"" RID_BMP_CONTENT_TABLE,
u"" RID_BMP_CONTENT_RANGENAME,
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 9eea1bdb0b1f..ec41bfc8953a 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -67,7 +67,7 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
// (headers/footers are in twips)
SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl;
- while (pEntry->aName.getLength())
+ while (!pEntry->aName.empty())
{
if ( ( pEntry->nWID == EE_CHAR_FONTHEIGHT ||
pEntry->nWID == EE_CHAR_FONTHEIGHT_CJK ||
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index dbb4bc543af6..afd0a561f446 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -16,6 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/config.h>
+
+#include <string_view>
+
#include "vbadialog.hxx"
#include <sal/macros.h>
@@ -23,7 +28,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-const OUStringLiteral aStringList[]=
+const std::u16string_view aStringList[]=
{
u".uno:Open",
u".uno:FormatCellDialog",
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index c99dffe9f4fe..2925f2ded4d3 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <vcl/taskpanelist.hxx>
#include <vcl/settings.hxx>
@@ -597,7 +601,7 @@ void ScOutlineWindow::HideFocus()
}
}
-const OUStringLiteral aLevelBmps[]=
+const std::u16string_view aLevelBmps[]=
{
u"" RID_BMP_LEVEL1,
u"" RID_BMP_LEVEL2,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 04:12:07 +0000