ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

use more string_view in svx

Browse Source 
Change-Id: I672f6cc93f3f00c54eb2be7fa490d656bb5f0b02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140407
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-09-22 15:41:08 +02:00
parent d6a1408ca7
commit eaedd8f968
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/controller/inc/ChartController.hxx
+1 -1
View File
@@ -504,7 +504,7 @@ private:
void executeDispatch_LOKSetTextSelection(int nType, int nX, int nY);
void executeDispatch_LOKPieSegmentDragging(int nOffset);
void executeDispatch_FillColor(sal_uInt32 nColor);
void executeDispatch_FillGradient(OUString sJSONGradient);
void executeDispatch_FillGradient(std::u16string_view sJSONGradient);
void executeDispatch_LineColor(sal_uInt32 nColor);
void executeDispatch_LineWidth(sal_uInt32 nWidth);
chart2/source/controller/main/ChartController.cxx
+1 -1
View File
@@ -1124,7 +1124,7 @@ void SAL_CALL ChartController::dispatch(
}
else if(aCommand.startsWith("FillGradient"))
{
this->executeDispatch_FillGradient(aCommand.copy(aCommand.indexOf('=') + 1));
this->executeDispatch_FillGradient(aCommand.subView(aCommand.indexOf('=') + 1));
}
else if(aCommand == "Paste")
this->executeDispatch_Paste();
chart2/source/controller/main/ChartController_Tools.cxx
+1 -1
View File
@@ -955,7 +955,7 @@ void ChartController::executeDispatch_FillColor(sal_uInt32 nColor)
}
}
void ChartController::executeDispatch_FillGradient(OUString sJSONGradient)
void ChartController::executeDispatch_FillGradient(std::u16string_view sJSONGradient)
{
XGradient aXGradient = XGradient::fromJSON(sJSONGradient);
css::awt::Gradient aGradient = aXGradient.toGradientUNO();
include/svx/SvxColorValueSet.hxx
+1 -1
View File
@@ -39,7 +39,7 @@ public:
static sal_uInt32 getColumnCount();
void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1);
void addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix);
void addEntriesForColorSet(const std::set<Color>& rColorSet, std::u16string_view rNamePrefix);
Size layoutAllVisible(sal_uInt32 nEntryCount);
void layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount);
include/svx/svdotext.hxx
+1 -1
View File
@@ -259,7 +259,7 @@ private:
static void AppendFamilyToStyleName(OUString& styleName, SfxStyleFamily family);
/** Reads the style family from a style name to which the family has been appended. */
static SfxStyleFamily ReadFamilyFromStyleName(const OUString& styleName);
static SfxStyleFamily ReadFamilyFromStyleName(std::u16string_view styleName);
protected:
bool ImpCanConvTextToCurve() const;
include/svx/xgrad.hxx
+1 -1
View File
@@ -77,7 +77,7 @@ public:
sal_uInt16 GetSteps() const { return nStepCount; }
boost::property_tree::ptree dumpAsJSON() const;
static XGradient fromJSON(const OUString& rJSON);
static XGradient fromJSON(std::u16string_view rJSON);
css::awt::Gradient toGradientUNO() const;
};
include/svx/xmlgrhlp.hxx
+1 -1
View File
@@ -70,7 +70,7 @@ private:
SVX_DLLPRIVATE SvxGraphicHelperStream_Impl
ImplGetGraphicStream( const OUString& rPictureStorageName,
const OUString& rPictureStreamName );
SVX_DLLPRIVATE static OUString ImplGetGraphicMimeType( const OUString& rFileName );
SVX_DLLPRIVATE static OUString ImplGetGraphicMimeType( std::u16string_view rFileName );
SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName,
const OUString& rPictureStreamName );
svx/source/svdraw/svdotxat.cxx
+2 -2
View File
@@ -444,9 +444,9 @@ void SdrTextObj::AppendFamilyToStyleName(OUString& styleName, SfxStyleFamily fam
styleName += "|" + aFam;
}
SfxStyleFamily SdrTextObj::ReadFamilyFromStyleName(const OUString& styleName)
SfxStyleFamily SdrTextObj::ReadFamilyFromStyleName(std::u16string_view styleName)
{
std::u16string_view familyString = styleName.subView(styleName.getLength() - PADDING_LENGTH_FOR_STYLE_FAMILY);
std::u16string_view familyString = styleName.substr(styleName.size() - PADDING_LENGTH_FOR_STYLE_FAMILY);
familyString = comphelper::string::stripEnd(familyString, PADDING_CHARACTER_FOR_STYLE_FAMILY);
sal_uInt16 nFam = static_cast<sal_uInt16>(o3tl::toInt32(familyString));
assert(nFam != 0);
svx/source/tbxctrls/PaletteManager.cxx
+1 -1
View File
@@ -226,7 +226,7 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet)
std::set<Color> aColors = pDocSh->GetDocColors();
mnColorCount = aColors.size();
rColorSet.Clear();
rColorSet.addEntriesForColorSet(aColors, SvxResId( RID_SVXSTR_DOC_COLOR_PREFIX ) + " " );
rColorSet.addEntriesForColorSet(aColors, OUStringConcatenation(SvxResId( RID_SVXSTR_DOC_COLOR_PREFIX ) + " ") );
}
}
else
svx/source/tbxctrls/SvxColorValueSet.cxx
+2 -2
View File
@@ -69,10 +69,10 @@ void SvxColorValueSet::addEntriesForXColorList(const XColorList& rXColorList, sa
}
}
void SvxColorValueSet::addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix)
void SvxColorValueSet::addEntriesForColorSet(const std::set<Color>& rColorSet, std::u16string_view rNamePrefix)
{
sal_uInt32 nStartIndex = 1;
if(rNamePrefix.getLength() != 0)
if(rNamePrefix.size() != 0)
{
for(const auto& rColor : rColorSet)
{
svx/source/xml/xmlgrhlp.cxx
+3 -3
View File
@@ -483,11 +483,11 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt
return aRet;
}
OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName )
OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( std::u16string_view rFileName )
{
if( ( rFileName.getLength() >= 4 ) && ( rFileName[ rFileName.getLength() - 4 ] == '.' ) )
if( ( rFileName.size() >= 4 ) && ( rFileName[ rFileName.size() - 4 ] == '.' ) )
{
const OString aExt(OUStringToOString(rFileName.subView(rFileName.getLength() - 3),
const OString aExt(OUStringToOString(rFileName.substr(rFileName.size() - 3),
RTL_TEXTENCODING_ASCII_US));
return comphelper::GraphicMimeTypeHelper::GetMimeTypeForExtension( aExt );
}
svx/source/xoutdev/xattr.cxx
+3 -3
View File
@@ -2066,10 +2066,10 @@ namespace
return css::awt::GradientStyle_LINEAR;
}
StringMap lcl_jsonToStringMap(const OUString& rJSON)
StringMap lcl_jsonToStringMap(std::u16string_view rJSON)
{
StringMap aArgs;
if (rJSON.getLength() && rJSON[0] != '\0')
if (rJSON.size() && rJSON[0] != '\0')
{
std::stringstream aStream(OUStringToOString(rJSON, RTL_TEXTENCODING_ASCII_US).getStr());
boost::property_tree::ptree aTree;
@@ -2096,7 +2096,7 @@ namespace
}
}
XGradient XGradient::fromJSON(const OUString& rJSON)
XGradient XGradient::fromJSON(std::u16string_view rJSON)
{
StringMap aMap(lcl_jsonToStringMap(rJSON));
return lcl_buildGradientFromStringMap(aMap);