strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

createFromAscii -> OUString literals in AnimationsExporter

Browse source 
Change-Id: I20c35e06fb98df5ffb9d9fd521459e267e4a2fa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167559
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-05-09 11:51:59 +02:00
parent d9d6997561
commit 7a110585d9
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xmloff/inc/animations.hxx
View file

@ -45,7 +45,7 @@ extern const SvXMLEnumMapEntry<sal_Int16> aAnimations_EnumMap_Command[];
struct ImplAttributeNameConversion
{
token::XMLTokenEnum meXMLToken;
const char* mpAPIName;
OUString maAPIName;
};
extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList();

48
xmloff/source/draw/animationexport.cxx
View file

@ -396,29 +396,29 @@ const SvXMLEnumMapEntry<sal_Int16> aAnimations_EnumMap_Command[] =
const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList()
{
static const struct ImplAttributeNameConversion gImplConversionList[] =
static constexpr struct ImplAttributeNameConversion gImplConversionList[]
{
{ XML_X, "X" },
{ XML_Y, "Y" },
{ XML_WIDTH, "Width" },
{ XML_HEIGHT, "Height" },
{ XML_ROTATE, "Rotate" },
{ XML_SKEWX, "SkewX" },
{ XML_FILL_COLOR, "FillColor" },
{ XML_FILL, "FillStyle" },
{ XML_STROKE_COLOR, "LineColor" },
{ XML_STROKE, "LineStyle" },
{ XML_COLOR, "CharColor" },
{ XML_TEXT_ROTATION_ANGLE, "CharRotation" },
{ XML_FONT_WEIGHT, "CharWeight" },
{ XML_TEXT_UNDERLINE, "CharUnderline" },
{ XML_FONT_FAMILY, "CharFontName" },
{ XML_FONT_SIZE, "CharHeight" },
{ XML_FONT_STYLE, "CharPosture" },
{ XML_VISIBILITY, "Visibility" },
{ XML_OPACITY, "Opacity" },
{ XML_DIM, "DimColor" },
{ XML_TOKEN_INVALID, nullptr }
{ XML_X, u"X"_ustr },
{ XML_Y, u"Y"_ustr },
{ XML_WIDTH, u"Width"_ustr },
{ XML_HEIGHT, u"Height"_ustr },
{ XML_ROTATE, u"Rotate"_ustr },
{ XML_SKEWX, u"SkewX"_ustr },
{ XML_FILL_COLOR, u"FillColor"_ustr },
{ XML_FILL, u"FillStyle"_ustr },
{ XML_STROKE_COLOR, u"LineColor"_ustr },
{ XML_STROKE, u"LineStyle"_ustr },
{ XML_COLOR, u"CharColor"_ustr },
{ XML_TEXT_ROTATION_ANGLE, u"CharRotation"_ustr },
{ XML_FONT_WEIGHT, u"CharWeight"_ustr },
{ XML_TEXT_UNDERLINE, u"CharUnderline"_ustr },
{ XML_FONT_FAMILY, u"CharFontName"_ustr },
{ XML_FONT_SIZE, u"CharHeight"_ustr },
{ XML_FONT_STYLE, u"CharPosture"_ustr },
{ XML_VISIBILITY, u"Visibility"_ustr },
{ XML_OPACITY, u"Opacity"_ustr },
{ XML_DIM, u"DimColor"_ustr },
{ XML_TOKEN_INVALID, u""_ustr }
};
return gImplConversionList;
@ -1104,9 +1104,9 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
if( !sTemp.isEmpty() )
{
const struct ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
while( p->mpAPIName )
while( !p->maAPIName.isEmpty() )
{
if( sTemp.equalsAscii( p->mpAPIName ) )
if( sTemp == p->maAPIName )
{
sTemp = GetXMLToken( p->meXMLToken );
eAttributeName = p->meXMLToken;

4
xmloff/source/draw/animationimport.cxx
View file

@ -787,11 +787,11 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
OUString aName( aIter.toString() );
const struct ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
while( p->mpAPIName )
while( !p->maAPIName.isEmpty() )
{
if( IsXMLToken( aIter, p->meXMLToken ) )
{
aName = OUString::createFromAscii( p->mpAPIName );
aName = p->maAPIName;
meAttributeName = p->meXMLToken;
break;
}