writerfilter/source/dmapper/DomainMapper.cxx | 16
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4
writerfilter/source/dmapper/TDefTableHandler.cxx | 416
+++++-----
writerfilter/source/dmapper/TblStylePrHandler.cxx | 26
writerfilter/source/dmapper/TextEffectsHandler.cxx | 404
++++-----
writerfilter/source/dmapper/ThemeTable.cxx | 86 +-
writerfilter/source/filter/RtfFilter.cxx | 2
writerfilter/source/filter/WriterFilter.cxx | 2
writerperfect/inc/DocumentHandlerForOdg.hxx | 2
writerperfect/inc/DocumentHandlerForOdp.hxx | 2
writerperfect/inc/DocumentHandlerForOds.hxx | 2
writerperfect/inc/DocumentHandlerForOdt.hxx | 2
writerperfect/qa/unit/DrawingImportTest.cxx | 2
writerperfect/qa/unit/PresentationImportTest.cxx | 2
writerperfect/qa/unit/SpreadsheetImportTest.cxx | 2
writerperfect/qa/unit/TextImportTest.cxx | 2
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 2
writerperfect/source/calc/MWAWCalcImportFilter.cxx | 2
writerperfect/source/calc/NumbersImportFilter.cxx | 2
writerperfect/source/calc/StarOfficeCalcImportFilter.cxx | 2
writerperfect/source/draw/CDRImportFilter.cxx | 2
writerperfect/source/draw/CMXImportFilter.cxx | 2
writerperfect/source/draw/FreehandImportFilter.cxx | 2
writerperfect/source/draw/MSPUBImportFilter.cxx | 2
writerperfect/source/draw/MWAWDrawImportFilter.cxx | 2
writerperfect/source/draw/PageMakerImportFilter.cxx | 2
writerperfect/source/draw/QXPImportFilter.cxx | 2
writerperfect/source/draw/StarOfficeDrawImportFilter.cxx | 2
writerperfect/source/draw/VisioImportFilter.cxx | 2
writerperfect/source/draw/WPGImportFilter.cxx | 2
writerperfect/source/draw/ZMFImportFilter.cxx | 2
writerperfect/source/impress/KeynoteImportFilter.cxx | 2
writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 2
writerperfect/source/impress/StarOfficePresentationImportFilter.cxx | 2
writerperfect/source/writer/AbiWordImportFilter.cxx | 2
writerperfect/source/writer/EBookImportFilter.cxx | 2
writerperfect/source/writer/EPUBExportFilter.cxx | 2
writerperfect/source/writer/EPUBExportUIComponent.cxx | 2
writerperfect/source/writer/MSWorksImportFilter.cxx | 2
writerperfect/source/writer/MWAWImportFilter.cxx | 2
writerperfect/source/writer/PagesImportFilter.cxx | 2
writerperfect/source/writer/StarOfficeWriterImportFilter.cxx | 2
writerperfect/source/writer/WordPerfectImportFilter.cxx | 2
xmlhelp/source/cxxhelp/provider/content.cxx | 4
xmlhelp/source/cxxhelp/provider/provider.cxx | 2
xmlhelp/source/treeview/tvfactory.cxx | 2
46 files changed, 517 insertions(+), 517 deletions(-)
New commits:
commit 8b9f2959419a382fec85cdc25b8c49f59b6d85fc
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:44:20 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:52:27 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): writerfilter
Change-Id: I79a920d7f2d46f17fa14394120a7cb872013eec9
Reviewed-on: https://gerrit.libreoffice.org/76626
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 483d567dcafc..b70ac1c86073 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3645,23 +3645,23 @@ OUString DomainMapper::getBracketStringFromEnum(const
sal_Int32 nIntValue, const
{
case NS_ooxml::LN_Value_ST_CombineBrackets_round:
if (bIsPrefix)
- return OUString( "(" );
- return OUString( ")" );
+ return "(";
+ return ")";
case NS_ooxml::LN_Value_ST_CombineBrackets_square:
if (bIsPrefix)
- return OUString( "[" );
- return OUString( "]" );
+ return "[";
+ return "]";
case NS_ooxml::LN_Value_ST_CombineBrackets_angle:
if (bIsPrefix)
- return OUString( "<" );
- return OUString( ">" );
+ return "<";
+ return ">";
case NS_ooxml::LN_Value_ST_CombineBrackets_curly:
if (bIsPrefix)
- return OUString( "{" );
- return OUString( "}" );
+ return "{";
+ return "}";
case NS_ooxml::LN_Value_ST_CombineBrackets_none:
default:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2e1b7c710980..215a5c6f0c65 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -705,7 +705,7 @@ const OUString DomainMapper_Impl::GetDefaultParaStyleName()
return pEntry->sConvertedStyleName;
}
else
- return OUString( "Standard");
+ return "Standard";
}
return m_sDefaultParaStyleName;
}
@@ -2788,7 +2788,7 @@ static OUString lcl_ExtractToken(OUString const& rCommand,
{
rHaveToken = true;
++rIndex;
- return OUString("FORMULA");
+ return "FORMULA";
}
break;
default:
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx
b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 68f8494f586f..2c235e678c6d 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -50,197 +50,197 @@ OUString TDefTableHandler::getBorderTypeString(sal_Int32
nType)
{
switch (nType)
{
- case NS_ooxml::LN_Value_ST_Border_nil: return OUString("nil");
- case NS_ooxml::LN_Value_ST_Border_none: return OUString("none");
- case NS_ooxml::LN_Value_ST_Border_single: return OUString("single");
- case NS_ooxml::LN_Value_ST_Border_thick: return OUString("thick");
- case NS_ooxml::LN_Value_ST_Border_double: return OUString("double");
- case NS_ooxml::LN_Value_ST_Border_dotted: return OUString("dotted");
- case NS_ooxml::LN_Value_ST_Border_dashed: return OUString("dashed");
- case NS_ooxml::LN_Value_ST_Border_dotDash: return OUString("dotDash");
- case NS_ooxml::LN_Value_ST_Border_dotDotDash: return
OUString("dotDotDash");
- case NS_ooxml::LN_Value_ST_Border_triple: return OUString("triple");
- case NS_ooxml::LN_Value_ST_Border_thinThickSmallGap: return
OUString("thinThickSmallGap");
- case NS_ooxml::LN_Value_ST_Border_thickThinSmallGap: return
OUString("thickThinSmallGap");
- case NS_ooxml::LN_Value_ST_Border_thinThickThinSmallGap: return
OUString("thinThickThinSmallGap");
- case NS_ooxml::LN_Value_ST_Border_thinThickMediumGap: return
OUString("thinThickMediumGap");
- case NS_ooxml::LN_Value_ST_Border_thickThinMediumGap: return
OUString("thickThinMediumGap");
- case NS_ooxml::LN_Value_ST_Border_thinThickThinMediumGap: return
OUString("thinThickThinMediumGap");
- case NS_ooxml::LN_Value_ST_Border_thinThickLargeGap: return
OUString("thinThickLargeGap");
- case NS_ooxml::LN_Value_ST_Border_thickThinLargeGap: return
OUString("thickThinLargeGap");
- case NS_ooxml::LN_Value_ST_Border_thinThickThinLargeGap: return
OUString("thinThickThinLargeGap");
- case NS_ooxml::LN_Value_ST_Border_wave: return OUString("wave");
- case NS_ooxml::LN_Value_ST_Border_doubleWave: return
OUString("doubleWave");
- case NS_ooxml::LN_Value_ST_Border_dashSmallGap: return
OUString("dashSmallGap");
- case NS_ooxml::LN_Value_ST_Border_dashDotStroked: return
OUString("dashDotStroked");
- case NS_ooxml::LN_Value_ST_Border_threeDEmboss: return
OUString("threeDEmboss");
- case NS_ooxml::LN_Value_ST_Border_threeDEngrave: return
OUString("threeDEngrave");
- case NS_ooxml::LN_Value_ST_Border_outset: return OUString("outset");
- case NS_ooxml::LN_Value_ST_Border_inset: return OUString("inset");
- case NS_ooxml::LN_Value_ST_Border_apples: return OUString("apples");
- case NS_ooxml::LN_Value_ST_Border_archedScallops: return
OUString("archedScallops");
- case NS_ooxml::LN_Value_ST_Border_babyPacifier: return
OUString("babyPacifier");
- case NS_ooxml::LN_Value_ST_Border_babyRattle: return
OUString("babyRattle");
- case NS_ooxml::LN_Value_ST_Border_balloons3Colors: return
OUString("balloons3Colors");
- case NS_ooxml::LN_Value_ST_Border_balloonsHotAir: return
OUString("balloonsHotAir");
- case NS_ooxml::LN_Value_ST_Border_basicBlackDashes: return
OUString("basicBlackDashes");
- case NS_ooxml::LN_Value_ST_Border_basicBlackDots: return
OUString("basicBlackDots");
- case NS_ooxml::LN_Value_ST_Border_basicBlackSquares: return
OUString("basicBlackSquares");
- case NS_ooxml::LN_Value_ST_Border_basicThinLines: return
OUString("basicThinLines");
- case NS_ooxml::LN_Value_ST_Border_basicWhiteDashes: return
OUString("basicWhiteDashes");
- case NS_ooxml::LN_Value_ST_Border_basicWhiteDots: return
OUString("basicWhiteDots");
- case NS_ooxml::LN_Value_ST_Border_basicWhiteSquares: return
OUString("basicWhiteSquares");
- case NS_ooxml::LN_Value_ST_Border_basicWideInline: return
OUString("basicWideInline");
- case NS_ooxml::LN_Value_ST_Border_basicWideMidline: return
OUString("basicWideMidline");
- case NS_ooxml::LN_Value_ST_Border_basicWideOutline: return
OUString("basicWideOutline");
- case NS_ooxml::LN_Value_ST_Border_bats: return OUString("bats");
- case NS_ooxml::LN_Value_ST_Border_birds: return OUString("birds");
- case NS_ooxml::LN_Value_ST_Border_birdsFlight: return
OUString("birdsFlight");
- case NS_ooxml::LN_Value_ST_Border_cabins: return OUString("cabins");
- case NS_ooxml::LN_Value_ST_Border_cakeSlice: return
OUString("cakeSlice");
- case NS_ooxml::LN_Value_ST_Border_candyCorn: return
OUString("candyCorn");
- case NS_ooxml::LN_Value_ST_Border_celticKnotwork: return
OUString("celticKnotwork");
- case NS_ooxml::LN_Value_ST_Border_certificateBanner: return
OUString("certificateBanner");
- case NS_ooxml::LN_Value_ST_Border_chainLink: return
OUString("chainLink");
- case NS_ooxml::LN_Value_ST_Border_champagneBottle: return
OUString("champagneBottle");
- case NS_ooxml::LN_Value_ST_Border_checkedBarBlack: return
OUString("checkedBarBlack");
- case NS_ooxml::LN_Value_ST_Border_checkedBarColor: return
OUString("checkedBarColor");
- case NS_ooxml::LN_Value_ST_Border_checkered: return
OUString("checkered");
- case NS_ooxml::LN_Value_ST_Border_christmasTree: return
OUString("christmasTree");
- case NS_ooxml::LN_Value_ST_Border_circlesLines: return
OUString("circlesLines");
- case NS_ooxml::LN_Value_ST_Border_circlesRectangles: return
OUString("circlesRectangles");
- case NS_ooxml::LN_Value_ST_Border_classicalWave: return
OUString("classicalWave");
- case NS_ooxml::LN_Value_ST_Border_clocks: return OUString("clocks");
- case NS_ooxml::LN_Value_ST_Border_compass: return OUString("compass");
- case NS_ooxml::LN_Value_ST_Border_confetti: return
OUString("confetti");
- case NS_ooxml::LN_Value_ST_Border_confettiGrays: return
OUString("confettiGrays");
- case NS_ooxml::LN_Value_ST_Border_confettiOutline: return
OUString("confettiOutline");
- case NS_ooxml::LN_Value_ST_Border_confettiStreamers: return
OUString("confettiStreamers");
- case NS_ooxml::LN_Value_ST_Border_confettiWhite: return
OUString("confettiWhite");
- case NS_ooxml::LN_Value_ST_Border_cornerTriangles: return
OUString("cornerTriangles");
- case NS_ooxml::LN_Value_ST_Border_couponCutoutDashes: return
OUString("couponCutoutDashes");
- case NS_ooxml::LN_Value_ST_Border_couponCutoutDots: return
OUString("couponCutoutDots");
- case NS_ooxml::LN_Value_ST_Border_crazyMaze: return
OUString("crazyMaze");
- case NS_ooxml::LN_Value_ST_Border_creaturesButterfly: return
OUString("creaturesButterfly");
- case NS_ooxml::LN_Value_ST_Border_creaturesFish: return
OUString("creaturesFish");
- case NS_ooxml::LN_Value_ST_Border_creaturesInsects: return
OUString("creaturesInsects");
- case NS_ooxml::LN_Value_ST_Border_creaturesLadyBug: return
OUString("creaturesLadyBug");
- case NS_ooxml::LN_Value_ST_Border_crossStitch: return
OUString("crossStitch");
- case NS_ooxml::LN_Value_ST_Border_cup: return OUString("cup");
- case NS_ooxml::LN_Value_ST_Border_decoArch: return
OUString("decoArch");
- case NS_ooxml::LN_Value_ST_Border_decoArchColor: return
OUString("decoArchColor");
- case NS_ooxml::LN_Value_ST_Border_decoBlocks: return
OUString("decoBlocks");
- case NS_ooxml::LN_Value_ST_Border_diamondsGray: return
OUString("diamondsGray");
- case NS_ooxml::LN_Value_ST_Border_doubleD: return OUString("doubleD");
- case NS_ooxml::LN_Value_ST_Border_doubleDiamonds: return
OUString("doubleDiamonds");
- case NS_ooxml::LN_Value_ST_Border_earth1: return OUString("earth1");
- case NS_ooxml::LN_Value_ST_Border_earth2: return OUString("earth2");
- case NS_ooxml::LN_Value_ST_Border_eclipsingSquares1: return
OUString("eclipsingSquares1");
- case NS_ooxml::LN_Value_ST_Border_eclipsingSquares2: return
OUString("eclipsingSquares2");
- case NS_ooxml::LN_Value_ST_Border_eggsBlack: return
OUString("eggsBlack");
- case NS_ooxml::LN_Value_ST_Border_fans: return OUString("fans");
- case NS_ooxml::LN_Value_ST_Border_film: return OUString("film");
- case NS_ooxml::LN_Value_ST_Border_firecrackers: return
OUString("firecrackers");
- case NS_ooxml::LN_Value_ST_Border_flowersBlockPrint: return
OUString("flowersBlockPrint");
- case NS_ooxml::LN_Value_ST_Border_flowersDaisies: return
OUString("flowersDaisies");
- case NS_ooxml::LN_Value_ST_Border_flowersModern1: return
OUString("flowersModern1");
- case NS_ooxml::LN_Value_ST_Border_flowersModern2: return
OUString("flowersModern2");
- case NS_ooxml::LN_Value_ST_Border_flowersPansy: return
OUString("flowersPansy");
- case NS_ooxml::LN_Value_ST_Border_flowersRedRose: return
OUString("flowersRedRose");
- case NS_ooxml::LN_Value_ST_Border_flowersRoses: return
OUString("flowersRoses");
- case NS_ooxml::LN_Value_ST_Border_flowersTeacup: return
OUString("flowersTeacup");
- case NS_ooxml::LN_Value_ST_Border_flowersTiny: return
OUString("flowersTiny");
- case NS_ooxml::LN_Value_ST_Border_gems: return OUString("gems");
- case NS_ooxml::LN_Value_ST_Border_gingerbreadMan: return
OUString("gingerbreadMan");
- case NS_ooxml::LN_Value_ST_Border_gradient: return
OUString("gradient");
- case NS_ooxml::LN_Value_ST_Border_handmade1: return
OUString("handmade1");
- case NS_ooxml::LN_Value_ST_Border_handmade2: return
OUString("handmade2");
- case NS_ooxml::LN_Value_ST_Border_heartBalloon: return
OUString("heartBalloon");
- case NS_ooxml::LN_Value_ST_Border_heartGray: return
OUString("heartGray");
- case NS_ooxml::LN_Value_ST_Border_hearts: return OUString("hearts");
- case NS_ooxml::LN_Value_ST_Border_heebieJeebies: return
OUString("heebieJeebies");
- case NS_ooxml::LN_Value_ST_Border_holly: return OUString("holly");
- case NS_ooxml::LN_Value_ST_Border_houseFunky: return
OUString("houseFunky");
- case NS_ooxml::LN_Value_ST_Border_hypnotic: return
OUString("hypnotic");
- case NS_ooxml::LN_Value_ST_Border_iceCreamCones: return
OUString("iceCreamCones");
- case NS_ooxml::LN_Value_ST_Border_lightBulb: return
OUString("lightBulb");
- case NS_ooxml::LN_Value_ST_Border_lightning1: return
OUString("lightning1");
- case NS_ooxml::LN_Value_ST_Border_lightning2: return
OUString("lightning2");
- case NS_ooxml::LN_Value_ST_Border_mapPins: return OUString("mapPins");
- case NS_ooxml::LN_Value_ST_Border_mapleLeaf: return
OUString("mapleLeaf");
- case NS_ooxml::LN_Value_ST_Border_mapleMuffins: return
OUString("mapleMuffins");
- case NS_ooxml::LN_Value_ST_Border_marquee: return OUString("marquee");
- case NS_ooxml::LN_Value_ST_Border_marqueeToothed: return
OUString("marqueeToothed");
- case NS_ooxml::LN_Value_ST_Border_moons: return OUString("moons");
- case NS_ooxml::LN_Value_ST_Border_mosaic: return OUString("mosaic");
- case NS_ooxml::LN_Value_ST_Border_musicNotes: return
OUString("musicNotes");
- case NS_ooxml::LN_Value_ST_Border_northwest: return
OUString("northwest");
- case NS_ooxml::LN_Value_ST_Border_ovals: return OUString("ovals");
- case NS_ooxml::LN_Value_ST_Border_packages: return
OUString("packages");
- case NS_ooxml::LN_Value_ST_Border_palmsBlack: return
OUString("palmsBlack");
- case NS_ooxml::LN_Value_ST_Border_palmsColor: return
OUString("palmsColor");
- case NS_ooxml::LN_Value_ST_Border_paperClips: return
OUString("paperClips");
- case NS_ooxml::LN_Value_ST_Border_papyrus: return OUString("papyrus");
- case NS_ooxml::LN_Value_ST_Border_partyFavor: return
OUString("partyFavor");
- case NS_ooxml::LN_Value_ST_Border_partyGlass: return
OUString("partyGlass");
- case NS_ooxml::LN_Value_ST_Border_pencils: return OUString("pencils");
- case NS_ooxml::LN_Value_ST_Border_people: return OUString("people");
- case NS_ooxml::LN_Value_ST_Border_peopleWaving: return
OUString("peopleWaving");
- case NS_ooxml::LN_Value_ST_Border_peopleHats: return
OUString("peopleHats");
- case NS_ooxml::LN_Value_ST_Border_poinsettias: return
OUString("poinsettias");
- case NS_ooxml::LN_Value_ST_Border_postageStamp: return
OUString("postageStamp");
- case NS_ooxml::LN_Value_ST_Border_pumpkin1: return
OUString("pumpkin1");
- case NS_ooxml::LN_Value_ST_Border_pushPinNote2: return
OUString("pushPinNote2");
- case NS_ooxml::LN_Value_ST_Border_pushPinNote1: return
OUString("pushPinNote1");
- case NS_ooxml::LN_Value_ST_Border_pyramids: return
OUString("pyramids");
- case NS_ooxml::LN_Value_ST_Border_pyramidsAbove: return
OUString("pyramidsAbove");
- case NS_ooxml::LN_Value_ST_Border_quadrants: return
OUString("quadrants");
- case NS_ooxml::LN_Value_ST_Border_rings: return OUString("rings");
- case NS_ooxml::LN_Value_ST_Border_safari: return OUString("safari");
- case NS_ooxml::LN_Value_ST_Border_sawtooth: return
OUString("sawtooth");
- case NS_ooxml::LN_Value_ST_Border_sawtoothGray: return
OUString("sawtoothGray");
- case NS_ooxml::LN_Value_ST_Border_scaredCat: return
OUString("scaredCat");
- case NS_ooxml::LN_Value_ST_Border_seattle: return OUString("seattle");
- case NS_ooxml::LN_Value_ST_Border_shadowedSquares: return
OUString("shadowedSquares");
- case NS_ooxml::LN_Value_ST_Border_sharksTeeth: return
OUString("sharksTeeth");
- case NS_ooxml::LN_Value_ST_Border_shorebirdTracks: return
OUString("shorebirdTracks");
- case NS_ooxml::LN_Value_ST_Border_skyrocket: return
OUString("skyrocket");
- case NS_ooxml::LN_Value_ST_Border_snowflakeFancy: return
OUString("snowflakeFancy");
- case NS_ooxml::LN_Value_ST_Border_snowflakes: return
OUString("snowflakes");
- case NS_ooxml::LN_Value_ST_Border_sombrero: return
OUString("sombrero");
- case NS_ooxml::LN_Value_ST_Border_southwest: return
OUString("southwest");
- case NS_ooxml::LN_Value_ST_Border_stars: return OUString("stars");
- case NS_ooxml::LN_Value_ST_Border_starsTop: return
OUString("starsTop");
- case NS_ooxml::LN_Value_ST_Border_stars3d: return OUString("stars3d");
- case NS_ooxml::LN_Value_ST_Border_starsBlack: return
OUString("starsBlack");
- case NS_ooxml::LN_Value_ST_Border_starsShadowed: return
OUString("starsShadowed");
- case NS_ooxml::LN_Value_ST_Border_sun: return OUString("sun");
- case NS_ooxml::LN_Value_ST_Border_swirligig: return
OUString("swirligig");
- case NS_ooxml::LN_Value_ST_Border_tornPaper: return
OUString("tornPaper");
- case NS_ooxml::LN_Value_ST_Border_tornPaperBlack: return
OUString("tornPaperBlack");
- case NS_ooxml::LN_Value_ST_Border_trees: return OUString("trees");
- case NS_ooxml::LN_Value_ST_Border_triangleParty: return
OUString("triangleParty");
- case NS_ooxml::LN_Value_ST_Border_triangles: return
OUString("triangles");
- case NS_ooxml::LN_Value_ST_Border_tribal1: return OUString("tribal1");
- case NS_ooxml::LN_Value_ST_Border_tribal2: return OUString("tribal2");
- case NS_ooxml::LN_Value_ST_Border_tribal3: return OUString("tribal3");
- case NS_ooxml::LN_Value_ST_Border_tribal4: return OUString("tribal4");
- case NS_ooxml::LN_Value_ST_Border_tribal5: return OUString("tribal5");
- case NS_ooxml::LN_Value_ST_Border_tribal6: return OUString("tribal6");
- case NS_ooxml::LN_Value_ST_Border_twistedLines1: return
OUString("twistedLines1");
- case NS_ooxml::LN_Value_ST_Border_twistedLines2: return
OUString("twistedLines2");
- case NS_ooxml::LN_Value_ST_Border_vine: return OUString("vine");
- case NS_ooxml::LN_Value_ST_Border_waveline: return
OUString("waveline");
- case NS_ooxml::LN_Value_ST_Border_weavingAngles: return
OUString("weavingAngles");
- case NS_ooxml::LN_Value_ST_Border_weavingBraid: return
OUString("weavingBraid");
- case NS_ooxml::LN_Value_ST_Border_weavingRibbon: return
OUString("weavingRibbon");
- case NS_ooxml::LN_Value_ST_Border_weavingStrips: return
OUString("weavingStrips");
- case NS_ooxml::LN_Value_ST_Border_whiteFlowers: return
OUString("whiteFlowers");
- case NS_ooxml::LN_Value_ST_Border_woodwork: return
OUString("woodwork");
- case NS_ooxml::LN_Value_ST_Border_xIllusions: return
OUString("xIllusions");
- case NS_ooxml::LN_Value_ST_Border_zanyTriangles: return
OUString("zanyTriangles");
- case NS_ooxml::LN_Value_ST_Border_zigZag: return OUString("zigZag");
- case NS_ooxml::LN_Value_ST_Border_zigZagStitch: return
OUString("zigZagStitch");
+ case NS_ooxml::LN_Value_ST_Border_nil: return "nil";
+ case NS_ooxml::LN_Value_ST_Border_none: return "none";
+ case NS_ooxml::LN_Value_ST_Border_single: return "single";
+ case NS_ooxml::LN_Value_ST_Border_thick: return "thick";
+ case NS_ooxml::LN_Value_ST_Border_double: return "double";
+ case NS_ooxml::LN_Value_ST_Border_dotted: return "dotted";
+ case NS_ooxml::LN_Value_ST_Border_dashed: return "dashed";
+ case NS_ooxml::LN_Value_ST_Border_dotDash: return "dotDash";
+ case NS_ooxml::LN_Value_ST_Border_dotDotDash: return "dotDotDash";
+ case NS_ooxml::LN_Value_ST_Border_triple: return "triple";
+ case NS_ooxml::LN_Value_ST_Border_thinThickSmallGap: return
"thinThickSmallGap";
+ case NS_ooxml::LN_Value_ST_Border_thickThinSmallGap: return
"thickThinSmallGap";
+ case NS_ooxml::LN_Value_ST_Border_thinThickThinSmallGap: return
"thinThickThinSmallGap";
+ case NS_ooxml::LN_Value_ST_Border_thinThickMediumGap: return
"thinThickMediumGap";
+ case NS_ooxml::LN_Value_ST_Border_thickThinMediumGap: return
"thickThinMediumGap";
+ case NS_ooxml::LN_Value_ST_Border_thinThickThinMediumGap: return
"thinThickThinMediumGap";
+ case NS_ooxml::LN_Value_ST_Border_thinThickLargeGap: return
"thinThickLargeGap";
+ case NS_ooxml::LN_Value_ST_Border_thickThinLargeGap: return
"thickThinLargeGap";
+ case NS_ooxml::LN_Value_ST_Border_thinThickThinLargeGap: return
"thinThickThinLargeGap";
+ case NS_ooxml::LN_Value_ST_Border_wave: return "wave";
+ case NS_ooxml::LN_Value_ST_Border_doubleWave: return "doubleWave";
+ case NS_ooxml::LN_Value_ST_Border_dashSmallGap: return "dashSmallGap";
+ case NS_ooxml::LN_Value_ST_Border_dashDotStroked: return
"dashDotStroked";
+ case NS_ooxml::LN_Value_ST_Border_threeDEmboss: return "threeDEmboss";
+ case NS_ooxml::LN_Value_ST_Border_threeDEngrave: return
"threeDEngrave";
+ case NS_ooxml::LN_Value_ST_Border_outset: return "outset";
+ case NS_ooxml::LN_Value_ST_Border_inset: return "inset";
+ case NS_ooxml::LN_Value_ST_Border_apples: return "apples";
+ case NS_ooxml::LN_Value_ST_Border_archedScallops: return
"archedScallops";
+ case NS_ooxml::LN_Value_ST_Border_babyPacifier: return "babyPacifier";
+ case NS_ooxml::LN_Value_ST_Border_babyRattle: return "babyRattle";
+ case NS_ooxml::LN_Value_ST_Border_balloons3Colors: return
"balloons3Colors";
+ case NS_ooxml::LN_Value_ST_Border_balloonsHotAir: return
"balloonsHotAir";
+ case NS_ooxml::LN_Value_ST_Border_basicBlackDashes: return
"basicBlackDashes";
+ case NS_ooxml::LN_Value_ST_Border_basicBlackDots: return
"basicBlackDots";
+ case NS_ooxml::LN_Value_ST_Border_basicBlackSquares: return
"basicBlackSquares";
+ case NS_ooxml::LN_Value_ST_Border_basicThinLines: return
"basicThinLines";
+ case NS_ooxml::LN_Value_ST_Border_basicWhiteDashes: return
"basicWhiteDashes";
+ case NS_ooxml::LN_Value_ST_Border_basicWhiteDots: return
"basicWhiteDots";
+ case NS_ooxml::LN_Value_ST_Border_basicWhiteSquares: return
"basicWhiteSquares";
+ case NS_ooxml::LN_Value_ST_Border_basicWideInline: return
"basicWideInline";
+ case NS_ooxml::LN_Value_ST_Border_basicWideMidline: return
"basicWideMidline";
+ case NS_ooxml::LN_Value_ST_Border_basicWideOutline: return
"basicWideOutline";
+ case NS_ooxml::LN_Value_ST_Border_bats: return "bats";
+ case NS_ooxml::LN_Value_ST_Border_birds: return "birds";
+ case NS_ooxml::LN_Value_ST_Border_birdsFlight: return "birdsFlight";
+ case NS_ooxml::LN_Value_ST_Border_cabins: return "cabins";
+ case NS_ooxml::LN_Value_ST_Border_cakeSlice: return "cakeSlice";
+ case NS_ooxml::LN_Value_ST_Border_candyCorn: return "candyCorn";
+ case NS_ooxml::LN_Value_ST_Border_celticKnotwork: return
"celticKnotwork";
+ case NS_ooxml::LN_Value_ST_Border_certificateBanner: return
"certificateBanner";
+ case NS_ooxml::LN_Value_ST_Border_chainLink: return "chainLink";
+ case NS_ooxml::LN_Value_ST_Border_champagneBottle: return
"champagneBottle";
+ case NS_ooxml::LN_Value_ST_Border_checkedBarBlack: return
"checkedBarBlack";
+ case NS_ooxml::LN_Value_ST_Border_checkedBarColor: return
"checkedBarColor";
+ case NS_ooxml::LN_Value_ST_Border_checkered: return "checkered";
+ case NS_ooxml::LN_Value_ST_Border_christmasTree: return
"christmasTree";
+ case NS_ooxml::LN_Value_ST_Border_circlesLines: return "circlesLines";
+ case NS_ooxml::LN_Value_ST_Border_circlesRectangles: return
"circlesRectangles";
+ case NS_ooxml::LN_Value_ST_Border_classicalWave: return
"classicalWave";
+ case NS_ooxml::LN_Value_ST_Border_clocks: return "clocks";
+ case NS_ooxml::LN_Value_ST_Border_compass: return "compass";
+ case NS_ooxml::LN_Value_ST_Border_confetti: return "confetti";
+ case NS_ooxml::LN_Value_ST_Border_confettiGrays: return
"confettiGrays";
+ case NS_ooxml::LN_Value_ST_Border_confettiOutline: return
"confettiOutline";
+ case NS_ooxml::LN_Value_ST_Border_confettiStreamers: return
"confettiStreamers";
+ case NS_ooxml::LN_Value_ST_Border_confettiWhite: return
"confettiWhite";
+ case NS_ooxml::LN_Value_ST_Border_cornerTriangles: return
"cornerTriangles";
+ case NS_ooxml::LN_Value_ST_Border_couponCutoutDashes: return
"couponCutoutDashes";
+ case NS_ooxml::LN_Value_ST_Border_couponCutoutDots: return
"couponCutoutDots";
+ case NS_ooxml::LN_Value_ST_Border_crazyMaze: return "crazyMaze";
+ case NS_ooxml::LN_Value_ST_Border_creaturesButterfly: return
"creaturesButterfly";
+ case NS_ooxml::LN_Value_ST_Border_creaturesFish: return
"creaturesFish";
+ case NS_ooxml::LN_Value_ST_Border_creaturesInsects: return
"creaturesInsects";
+ case NS_ooxml::LN_Value_ST_Border_creaturesLadyBug: return
"creaturesLadyBug";
+ case NS_ooxml::LN_Value_ST_Border_crossStitch: return "crossStitch";
+ case NS_ooxml::LN_Value_ST_Border_cup: return "cup";
+ case NS_ooxml::LN_Value_ST_Border_decoArch: return "decoArch";
+ case NS_ooxml::LN_Value_ST_Border_decoArchColor: return
"decoArchColor";
+ case NS_ooxml::LN_Value_ST_Border_decoBlocks: return "decoBlocks";
+ case NS_ooxml::LN_Value_ST_Border_diamondsGray: return "diamondsGray";
+ case NS_ooxml::LN_Value_ST_Border_doubleD: return "doubleD";
+ case NS_ooxml::LN_Value_ST_Border_doubleDiamonds: return
"doubleDiamonds";
+ case NS_ooxml::LN_Value_ST_Border_earth1: return "earth1";
+ case NS_ooxml::LN_Value_ST_Border_earth2: return "earth2";
+ case NS_ooxml::LN_Value_ST_Border_eclipsingSquares1: return
"eclipsingSquares1";
+ case NS_ooxml::LN_Value_ST_Border_eclipsingSquares2: return
"eclipsingSquares2";
+ case NS_ooxml::LN_Value_ST_Border_eggsBlack: return "eggsBlack";
+ case NS_ooxml::LN_Value_ST_Border_fans: return "fans";
+ case NS_ooxml::LN_Value_ST_Border_film: return "film";
+ case NS_ooxml::LN_Value_ST_Border_firecrackers: return "firecrackers";
+ case NS_ooxml::LN_Value_ST_Border_flowersBlockPrint: return
"flowersBlockPrint";
+ case NS_ooxml::LN_Value_ST_Border_flowersDaisies: return
"flowersDaisies";
+ case NS_ooxml::LN_Value_ST_Border_flowersModern1: return
"flowersModern1";
+ case NS_ooxml::LN_Value_ST_Border_flowersModern2: return
"flowersModern2";
+ case NS_ooxml::LN_Value_ST_Border_flowersPansy: return "flowersPansy";
+ case NS_ooxml::LN_Value_ST_Border_flowersRedRose: return
"flowersRedRose";
+ case NS_ooxml::LN_Value_ST_Border_flowersRoses: return "flowersRoses";
+ case NS_ooxml::LN_Value_ST_Border_flowersTeacup: return
"flowersTeacup";
+ case NS_ooxml::LN_Value_ST_Border_flowersTiny: return "flowersTiny";
+ case NS_ooxml::LN_Value_ST_Border_gems: return "gems";
+ case NS_ooxml::LN_Value_ST_Border_gingerbreadMan: return
"gingerbreadMan";
+ case NS_ooxml::LN_Value_ST_Border_gradient: return "gradient";
+ case NS_ooxml::LN_Value_ST_Border_handmade1: return "handmade1";
+ case NS_ooxml::LN_Value_ST_Border_handmade2: return "handmade2";
+ case NS_ooxml::LN_Value_ST_Border_heartBalloon: return "heartBalloon";
+ case NS_ooxml::LN_Value_ST_Border_heartGray: return "heartGray";
+ case NS_ooxml::LN_Value_ST_Border_hearts: return "hearts";
+ case NS_ooxml::LN_Value_ST_Border_heebieJeebies: return
"heebieJeebies";
+ case NS_ooxml::LN_Value_ST_Border_holly: return "holly";
+ case NS_ooxml::LN_Value_ST_Border_houseFunky: return "houseFunky";
+ case NS_ooxml::LN_Value_ST_Border_hypnotic: return "hypnotic";
+ case NS_ooxml::LN_Value_ST_Border_iceCreamCones: return
"iceCreamCones";
+ case NS_ooxml::LN_Value_ST_Border_lightBulb: return "lightBulb";
+ case NS_ooxml::LN_Value_ST_Border_lightning1: return "lightning1";
+ case NS_ooxml::LN_Value_ST_Border_lightning2: return "lightning2";
+ case NS_ooxml::LN_Value_ST_Border_mapPins: return "mapPins";
+ case NS_ooxml::LN_Value_ST_Border_mapleLeaf: return "mapleLeaf";
+ case NS_ooxml::LN_Value_ST_Border_mapleMuffins: return "mapleMuffins";
+ case NS_ooxml::LN_Value_ST_Border_marquee: return "marquee";
+ case NS_ooxml::LN_Value_ST_Border_marqueeToothed: return
"marqueeToothed";
+ case NS_ooxml::LN_Value_ST_Border_moons: return "moons";
+ case NS_ooxml::LN_Value_ST_Border_mosaic: return "mosaic";
+ case NS_ooxml::LN_Value_ST_Border_musicNotes: return "musicNotes";
+ case NS_ooxml::LN_Value_ST_Border_northwest: return "northwest";
+ case NS_ooxml::LN_Value_ST_Border_ovals: return "ovals";
+ case NS_ooxml::LN_Value_ST_Border_packages: return "packages";
+ case NS_ooxml::LN_Value_ST_Border_palmsBlack: return "palmsBlack";
+ case NS_ooxml::LN_Value_ST_Border_palmsColor: return "palmsColor";
+ case NS_ooxml::LN_Value_ST_Border_paperClips: return "paperClips";
+ case NS_ooxml::LN_Value_ST_Border_papyrus: return "papyrus";
+ case NS_ooxml::LN_Value_ST_Border_partyFavor: return "partyFavor";
+ case NS_ooxml::LN_Value_ST_Border_partyGlass: return "partyGlass";
+ case NS_ooxml::LN_Value_ST_Border_pencils: return "pencils";
+ case NS_ooxml::LN_Value_ST_Border_people: return "people";
+ case NS_ooxml::LN_Value_ST_Border_peopleWaving: return "peopleWaving";
+ case NS_ooxml::LN_Value_ST_Border_peopleHats: return "peopleHats";
+ case NS_ooxml::LN_Value_ST_Border_poinsettias: return "poinsettias";
+ case NS_ooxml::LN_Value_ST_Border_postageStamp: return "postageStamp";
+ case NS_ooxml::LN_Value_ST_Border_pumpkin1: return "pumpkin1";
+ case NS_ooxml::LN_Value_ST_Border_pushPinNote2: return "pushPinNote2";
+ case NS_ooxml::LN_Value_ST_Border_pushPinNote1: return "pushPinNote1";
+ case NS_ooxml::LN_Value_ST_Border_pyramids: return "pyramids";
+ case NS_ooxml::LN_Value_ST_Border_pyramidsAbove: return
"pyramidsAbove";
+ case NS_ooxml::LN_Value_ST_Border_quadrants: return "quadrants";
+ case NS_ooxml::LN_Value_ST_Border_rings: return "rings";
+ case NS_ooxml::LN_Value_ST_Border_safari: return "safari";
+ case NS_ooxml::LN_Value_ST_Border_sawtooth: return "sawtooth";
+ case NS_ooxml::LN_Value_ST_Border_sawtoothGray: return "sawtoothGray";
+ case NS_ooxml::LN_Value_ST_Border_scaredCat: return "scaredCat";
+ case NS_ooxml::LN_Value_ST_Border_seattle: return "seattle";
+ case NS_ooxml::LN_Value_ST_Border_shadowedSquares: return
"shadowedSquares";
+ case NS_ooxml::LN_Value_ST_Border_sharksTeeth: return "sharksTeeth";
+ case NS_ooxml::LN_Value_ST_Border_shorebirdTracks: return
"shorebirdTracks";
+ case NS_ooxml::LN_Value_ST_Border_skyrocket: return "skyrocket";
+ case NS_ooxml::LN_Value_ST_Border_snowflakeFancy: return
"snowflakeFancy";
+ case NS_ooxml::LN_Value_ST_Border_snowflakes: return "snowflakes";
+ case NS_ooxml::LN_Value_ST_Border_sombrero: return "sombrero";
+ case NS_ooxml::LN_Value_ST_Border_southwest: return "southwest";
+ case NS_ooxml::LN_Value_ST_Border_stars: return "stars";
+ case NS_ooxml::LN_Value_ST_Border_starsTop: return "starsTop";
+ case NS_ooxml::LN_Value_ST_Border_stars3d: return "stars3d";
+ case NS_ooxml::LN_Value_ST_Border_starsBlack: return "starsBlack";
+ case NS_ooxml::LN_Value_ST_Border_starsShadowed: return
"starsShadowed";
+ case NS_ooxml::LN_Value_ST_Border_sun: return "sun";
+ case NS_ooxml::LN_Value_ST_Border_swirligig: return "swirligig";
+ case NS_ooxml::LN_Value_ST_Border_tornPaper: return "tornPaper";
+ case NS_ooxml::LN_Value_ST_Border_tornPaperBlack: return
"tornPaperBlack";
+ case NS_ooxml::LN_Value_ST_Border_trees: return "trees";
+ case NS_ooxml::LN_Value_ST_Border_triangleParty: return
"triangleParty";
+ case NS_ooxml::LN_Value_ST_Border_triangles: return "triangles";
+ case NS_ooxml::LN_Value_ST_Border_tribal1: return "tribal1";
+ case NS_ooxml::LN_Value_ST_Border_tribal2: return "tribal2";
+ case NS_ooxml::LN_Value_ST_Border_tribal3: return "tribal3";
+ case NS_ooxml::LN_Value_ST_Border_tribal4: return "tribal4";
+ case NS_ooxml::LN_Value_ST_Border_tribal5: return "tribal5";
+ case NS_ooxml::LN_Value_ST_Border_tribal6: return "tribal6";
+ case NS_ooxml::LN_Value_ST_Border_twistedLines1: return
"twistedLines1";
+ case NS_ooxml::LN_Value_ST_Border_twistedLines2: return
"twistedLines2";
+ case NS_ooxml::LN_Value_ST_Border_vine: return "vine";
+ case NS_ooxml::LN_Value_ST_Border_waveline: return "waveline";
+ case NS_ooxml::LN_Value_ST_Border_weavingAngles: return
"weavingAngles";
+ case NS_ooxml::LN_Value_ST_Border_weavingBraid: return "weavingBraid";
+ case NS_ooxml::LN_Value_ST_Border_weavingRibbon: return
"weavingRibbon";
+ case NS_ooxml::LN_Value_ST_Border_weavingStrips: return
"weavingStrips";
+ case NS_ooxml::LN_Value_ST_Border_whiteFlowers: return "whiteFlowers";
+ case NS_ooxml::LN_Value_ST_Border_woodwork: return "woodwork";
+ case NS_ooxml::LN_Value_ST_Border_xIllusions: return "xIllusions";
+ case NS_ooxml::LN_Value_ST_Border_zanyTriangles: return
"zanyTriangles";
+ case NS_ooxml::LN_Value_ST_Border_zigZag: return "zigZag";
+ case NS_ooxml::LN_Value_ST_Border_zigZagStitch: return "zigZagStitch";
default: break;
}
return OUString();
@@ -250,23 +250,23 @@ OUString
TDefTableHandler::getThemeColorTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_Value_St_ThemeColor_dark1: return OUString("dark1");
- case NS_ooxml::LN_Value_St_ThemeColor_light1: return
OUString("light1");
- case NS_ooxml::LN_Value_St_ThemeColor_dark2: return OUString("dark2");
- case NS_ooxml::LN_Value_St_ThemeColor_light2: return
OUString("light2");
- case NS_ooxml::LN_Value_St_ThemeColor_accent1: return
OUString("accent1");
- case NS_ooxml::LN_Value_St_ThemeColor_accent2: return
OUString("accent2");
- case NS_ooxml::LN_Value_St_ThemeColor_accent3: return
OUString("accent3");
- case NS_ooxml::LN_Value_St_ThemeColor_accent4: return
OUString("accent4");
- case NS_ooxml::LN_Value_St_ThemeColor_accent5: return
OUString("accent5");
- case NS_ooxml::LN_Value_St_ThemeColor_accent6: return
OUString("accent6");
- case NS_ooxml::LN_Value_St_ThemeColor_hyperlink: return
OUString("hyperlink");
- case NS_ooxml::LN_Value_St_ThemeColor_followedHyperlink: return
OUString("followedHyperlink");
- case NS_ooxml::LN_Value_St_ThemeColor_none: return OUString("none");
- case NS_ooxml::LN_Value_St_ThemeColor_background1: return
OUString("background1");
- case NS_ooxml::LN_Value_St_ThemeColor_text1: return OUString("text1");
- case NS_ooxml::LN_Value_St_ThemeColor_background2: return
OUString("background2");
- case NS_ooxml::LN_Value_St_ThemeColor_text2: return OUString("text2");
+ case NS_ooxml::LN_Value_St_ThemeColor_dark1: return "dark1";
+ case NS_ooxml::LN_Value_St_ThemeColor_light1: return "light1";
+ case NS_ooxml::LN_Value_St_ThemeColor_dark2: return "dark2";
+ case NS_ooxml::LN_Value_St_ThemeColor_light2: return "light2";
+ case NS_ooxml::LN_Value_St_ThemeColor_accent1: return "accent1";
+ case NS_ooxml::LN_Value_St_ThemeColor_accent2: return "accent2";
+ case NS_ooxml::LN_Value_St_ThemeColor_accent3: return "accent3";
+ case NS_ooxml::LN_Value_St_ThemeColor_accent4: return "accent4";
+ case NS_ooxml::LN_Value_St_ThemeColor_accent5: return "accent5";
+ case NS_ooxml::LN_Value_St_ThemeColor_accent6: return "accent6";
+ case NS_ooxml::LN_Value_St_ThemeColor_hyperlink: return "hyperlink";
+ case NS_ooxml::LN_Value_St_ThemeColor_followedHyperlink: return
"followedHyperlink";
+ case NS_ooxml::LN_Value_St_ThemeColor_none: return "none";
+ case NS_ooxml::LN_Value_St_ThemeColor_background1: return
"background1";
+ case NS_ooxml::LN_Value_St_ThemeColor_text1: return "text1";
+ case NS_ooxml::LN_Value_St_ThemeColor_background2: return
"background2";
+ case NS_ooxml::LN_Value_St_ThemeColor_text2: return "text2";
default: break;
}
return OUString();
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index f7b1c901119c..f36624965e66 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -45,19 +45,19 @@ OUString TblStylePrHandler::getTypeString()
{
switch (m_nType)
{
- case TBL_STYLE_WHOLETABLE: return OUString("wholeTable");
- case TBL_STYLE_FIRSTROW: return OUString("firstRow");
- case TBL_STYLE_LASTROW: return OUString("lastRow");
- case TBL_STYLE_FIRSTCOL: return OUString("firstCol");
- case TBL_STYLE_LASTCOL: return OUString("lastCol");
- case TBL_STYLE_BAND1VERT: return OUString("band1Vert");
- case TBL_STYLE_BAND2VERT: return OUString("band2Vert");
- case TBL_STYLE_BAND1HORZ: return OUString("band1Horz");
- case TBL_STYLE_BAND2HORZ: return OUString("band2Horz");
- case TBL_STYLE_NECELL: return OUString("neCell");
- case TBL_STYLE_NWCELL: return OUString("nwCell");
- case TBL_STYLE_SECELL: return OUString("seCell");
- case TBL_STYLE_SWCELL: return OUString("swCell");
+ case TBL_STYLE_WHOLETABLE: return "wholeTable";
+ case TBL_STYLE_FIRSTROW: return "firstRow";
+ case TBL_STYLE_LASTROW: return "lastRow";
+ case TBL_STYLE_FIRSTCOL: return "firstCol";
+ case TBL_STYLE_LASTCOL: return "lastCol";
+ case TBL_STYLE_BAND1VERT: return "band1Vert";
+ case TBL_STYLE_BAND2VERT: return "band2Vert";
+ case TBL_STYLE_BAND1HORZ: return "band1Horz";
+ case TBL_STYLE_BAND2HORZ: return "band2Horz";
+ case TBL_STYLE_NECELL: return "neCell";
+ case TBL_STYLE_NWCELL: return "nwCell";
+ case TBL_STYLE_SECELL: return "seCell";
+ case TBL_STYLE_SWCELL: return "swCell";
default: break;
}
return OUString();
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx
b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 7626fb133762..6d870a975fbc 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -77,23 +77,23 @@ OUString
TextEffectsHandler::getSchemeColorValTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_SchemeColorVal_bg1: return OUString("bg1");
- case NS_ooxml::LN_ST_SchemeColorVal_tx1: return OUString("tx1");
- case NS_ooxml::LN_ST_SchemeColorVal_bg2: return OUString("bg2");
- case NS_ooxml::LN_ST_SchemeColorVal_tx2: return OUString("tx2");
- case NS_ooxml::LN_ST_SchemeColorVal_accent1: return
OUString("accent1");
- case NS_ooxml::LN_ST_SchemeColorVal_accent2: return
OUString("accent2");
- case NS_ooxml::LN_ST_SchemeColorVal_accent3: return
OUString("accent3");
- case NS_ooxml::LN_ST_SchemeColorVal_accent4: return
OUString("accent4");
- case NS_ooxml::LN_ST_SchemeColorVal_accent5: return
OUString("accent5");
- case NS_ooxml::LN_ST_SchemeColorVal_accent6: return
OUString("accent6");
- case NS_ooxml::LN_ST_SchemeColorVal_hlink: return OUString("hlink");
- case NS_ooxml::LN_ST_SchemeColorVal_folHlink: return
OUString("folHlink");
- case NS_ooxml::LN_ST_SchemeColorVal_dk1: return OUString("dk1");
- case NS_ooxml::LN_ST_SchemeColorVal_lt1: return OUString("lt1");
- case NS_ooxml::LN_ST_SchemeColorVal_dk2: return OUString("dk2");
- case NS_ooxml::LN_ST_SchemeColorVal_lt2: return OUString("lt2");
- case NS_ooxml::LN_ST_SchemeColorVal_phClr: return OUString("phClr");
+ case NS_ooxml::LN_ST_SchemeColorVal_bg1: return "bg1";
+ case NS_ooxml::LN_ST_SchemeColorVal_tx1: return "tx1";
+ case NS_ooxml::LN_ST_SchemeColorVal_bg2: return "bg2";
+ case NS_ooxml::LN_ST_SchemeColorVal_tx2: return "tx2";
+ case NS_ooxml::LN_ST_SchemeColorVal_accent1: return "accent1";
+ case NS_ooxml::LN_ST_SchemeColorVal_accent2: return "accent2";
+ case NS_ooxml::LN_ST_SchemeColorVal_accent3: return "accent3";
+ case NS_ooxml::LN_ST_SchemeColorVal_accent4: return "accent4";
+ case NS_ooxml::LN_ST_SchemeColorVal_accent5: return "accent5";
+ case NS_ooxml::LN_ST_SchemeColorVal_accent6: return "accent6";
+ case NS_ooxml::LN_ST_SchemeColorVal_hlink: return "hlink";
+ case NS_ooxml::LN_ST_SchemeColorVal_folHlink: return "folHlink";
+ case NS_ooxml::LN_ST_SchemeColorVal_dk1: return "dk1";
+ case NS_ooxml::LN_ST_SchemeColorVal_lt1: return "lt1";
+ case NS_ooxml::LN_ST_SchemeColorVal_dk2: return "dk2";
+ case NS_ooxml::LN_ST_SchemeColorVal_lt2: return "lt2";
+ case NS_ooxml::LN_ST_SchemeColorVal_phClr: return "phClr";
default: break;
}
return OUString();
@@ -103,16 +103,16 @@ OUString
TextEffectsHandler::getRectAlignmentString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_RectAlignment_none: return OUString("none");
- case NS_ooxml::LN_ST_RectAlignment_tl: return OUString("tl");
- case NS_ooxml::LN_ST_RectAlignment_t: return OUString("t");
- case NS_ooxml::LN_ST_RectAlignment_tr: return OUString("tr");
- case NS_ooxml::LN_ST_RectAlignment_l: return OUString("l");
- case NS_ooxml::LN_ST_RectAlignment_ctr: return OUString("ctr");
- case NS_ooxml::LN_ST_RectAlignment_r: return OUString("r");
- case NS_ooxml::LN_ST_RectAlignment_bl: return OUString("bl");
- case NS_ooxml::LN_ST_RectAlignment_b: return OUString("b");
- case NS_ooxml::LN_ST_RectAlignment_br: return OUString("br");
+ case NS_ooxml::LN_ST_RectAlignment_none: return "none";
+ case NS_ooxml::LN_ST_RectAlignment_tl: return "tl";
+ case NS_ooxml::LN_ST_RectAlignment_t: return "t";
+ case NS_ooxml::LN_ST_RectAlignment_tr: return "tr";
+ case NS_ooxml::LN_ST_RectAlignment_l: return "l";
+ case NS_ooxml::LN_ST_RectAlignment_ctr: return "ctr";
+ case NS_ooxml::LN_ST_RectAlignment_r: return "r";
+ case NS_ooxml::LN_ST_RectAlignment_bl: return "bl";
+ case NS_ooxml::LN_ST_RectAlignment_b: return "b";
+ case NS_ooxml::LN_ST_RectAlignment_br: return "br";
default: break;
}
@@ -123,9 +123,9 @@ OUString TextEffectsHandler::getLineCapString(sal_Int32
nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_LineCap_rnd: return OUString("rnd");
- case NS_ooxml::LN_ST_LineCap_sq: return OUString("sq");
- case NS_ooxml::LN_ST_LineCap_flat: return OUString("flat");
+ case NS_ooxml::LN_ST_LineCap_rnd: return "rnd";
+ case NS_ooxml::LN_ST_LineCap_sq: return "sq";
+ case NS_ooxml::LN_ST_LineCap_flat: return "flat";
default: break;
}
return OUString();
@@ -135,11 +135,11 @@ OUString
TextEffectsHandler::getCompoundLineString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_CompoundLine_sng: return OUString("sng");
- case NS_ooxml::LN_ST_CompoundLine_dbl: return OUString("dbl");
- case NS_ooxml::LN_ST_CompoundLine_thickThin: return
OUString("thickThin");
- case NS_ooxml::LN_ST_CompoundLine_thinThick: return
OUString("thinThick");
- case NS_ooxml::LN_ST_CompoundLine_tri: return OUString("tri");
+ case NS_ooxml::LN_ST_CompoundLine_sng: return "sng";
+ case NS_ooxml::LN_ST_CompoundLine_dbl: return "dbl";
+ case NS_ooxml::LN_ST_CompoundLine_thickThin: return "thickThin";
+ case NS_ooxml::LN_ST_CompoundLine_thinThick: return "thinThick";
+ case NS_ooxml::LN_ST_CompoundLine_tri: return "tri";
default: break;
}
return OUString();
@@ -149,8 +149,8 @@ OUString
TextEffectsHandler::getPenAlignmentString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_PenAlignment_ctr: return OUString("ctr");
- case NS_ooxml::LN_ST_PenAlignment_in: return OUString("in");
+ case NS_ooxml::LN_ST_PenAlignment_ctr: return "ctr";
+ case NS_ooxml::LN_ST_PenAlignment_in: return "in";
default: break;
}
return OUString();
@@ -160,10 +160,10 @@ OUString TextEffectsHandler::getOnOffString(sal_Int32
nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_OnOff_true: return OUString("true");
- case NS_ooxml::LN_ST_OnOff_false: return OUString("false");
- case NS_ooxml::LN_ST_OnOff_1: return OUString("1");
- case NS_ooxml::LN_ST_OnOff_0: return OUString("0");
+ case NS_ooxml::LN_ST_OnOff_true: return "true";
+ case NS_ooxml::LN_ST_OnOff_false: return "false";
+ case NS_ooxml::LN_ST_OnOff_1: return "1";
+ case NS_ooxml::LN_ST_OnOff_0: return "0";
default: break;
}
return OUString();
@@ -173,9 +173,9 @@ OUString
TextEffectsHandler::getPathShadeTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_PathShadeType_shape: return OUString("shape");
- case NS_ooxml::LN_ST_PathShadeType_circle: return OUString("circle");
- case NS_ooxml::LN_ST_PathShadeType_rect: return OUString("rect");
+ case NS_ooxml::LN_ST_PathShadeType_shape: return "shape";
+ case NS_ooxml::LN_ST_PathShadeType_circle: return "circle";
+ case NS_ooxml::LN_ST_PathShadeType_rect: return "rect";
default: break;
}
return OUString();
@@ -185,17 +185,17 @@ OUString
TextEffectsHandler::getPresetLineDashValString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_PresetLineDashVal_solid: return OUString("solid");
- case NS_ooxml::LN_ST_PresetLineDashVal_dot: return OUString("dot");
- case NS_ooxml::LN_ST_PresetLineDashVal_sysDot: return
OUString("sysDot");
- case NS_ooxml::LN_ST_PresetLineDashVal_dash: return OUString("dash");
- case NS_ooxml::LN_ST_PresetLineDashVal_sysDash: return
OUString("sysDash");
- case NS_ooxml::LN_ST_PresetLineDashVal_lgDash: return
OUString("lgDash");
- case NS_ooxml::LN_ST_PresetLineDashVal_dashDot: return
OUString("dashDot");
- case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDot: return
OUString("sysDashDot");
- case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDot: return
OUString("lgDashDot");
- case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDotDot: return
OUString("lgDashDotDot");
- case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDotDot: return
OUString("sysDashDotDot");
+ case NS_ooxml::LN_ST_PresetLineDashVal_solid: return "solid";
+ case NS_ooxml::LN_ST_PresetLineDashVal_dot: return "dot";
+ case NS_ooxml::LN_ST_PresetLineDashVal_sysDot: return "sysDot";
+ case NS_ooxml::LN_ST_PresetLineDashVal_dash: return "dash";
+ case NS_ooxml::LN_ST_PresetLineDashVal_sysDash: return "sysDash";
+ case NS_ooxml::LN_ST_PresetLineDashVal_lgDash: return "lgDash";
+ case NS_ooxml::LN_ST_PresetLineDashVal_dashDot: return "dashDot";
+ case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDot: return "sysDashDot";
+ case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDot: return "lgDashDot";
+ case NS_ooxml::LN_ST_PresetLineDashVal_lgDashDotDot: return
"lgDashDotDot";
+ case NS_ooxml::LN_ST_PresetLineDashVal_sysDashDotDot: return
"sysDashDotDot";
default: break;
}
return OUString();
@@ -205,68 +205,68 @@ OUString
TextEffectsHandler::getPresetCameraTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopLeft: return
OUString("legacyObliqueTopLeft");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTop: return
OUString("legacyObliqueTop");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopRight: return
OUString("legacyObliqueTopRight");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueLeft: return
OUString("legacyObliqueLeft");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueFront: return
OUString("legacyObliqueFront");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueRight: return
OUString("legacyObliqueRight");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomLeft: return
OUString("legacyObliqueBottomLeft");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottom: return
OUString("legacyObliqueBottom");
- case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomRight: return
OUString("legacyObliqueBottomRight");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopLeft: return
OUString("legacyPerspectiveTopLeft");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTop: return
OUString("legacyPerspectiveTop");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopRight:
return OUString("legacyPerspectiveTopRight");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveLeft: return
OUString("legacyPerspectiveLeft");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveFront: return
OUString("legacyPerspectiveFront");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveRight: return
OUString("legacyPerspectiveRight");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomLeft:
return OUString("legacyPerspectiveBottomLeft");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottom: return
OUString("legacyPerspectiveBottom");
- case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomRight:
return OUString("legacyPerspectiveBottomRight");
- case NS_ooxml::LN_ST_PresetCameraType_orthographicFront: return
OUString("orthographicFront");
- case NS_ooxml::LN_ST_PresetCameraType_isometricTopUp: return
OUString("isometricTopUp");
- case NS_ooxml::LN_ST_PresetCameraType_isometricTopDown: return
OUString("isometricTopDown");
- case NS_ooxml::LN_ST_PresetCameraType_isometricBottomUp: return
OUString("isometricBottomUp");
- case NS_ooxml::LN_ST_PresetCameraType_isometricBottomDown: return
OUString("isometricBottomDown");
- case NS_ooxml::LN_ST_PresetCameraType_isometricLeftUp: return
OUString("isometricLeftUp");
- case NS_ooxml::LN_ST_PresetCameraType_isometricLeftDown: return
OUString("isometricLeftDown");
- case NS_ooxml::LN_ST_PresetCameraType_isometricRightUp: return
OUString("isometricRightUp");
- case NS_ooxml::LN_ST_PresetCameraType_isometricRightDown: return
OUString("isometricRightDown");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Left: return
OUString("isometricOffAxis1Left");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Right: return
OUString("isometricOffAxis1Right");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Top: return
OUString("isometricOffAxis1Top");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Left: return
OUString("isometricOffAxis2Left");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Right: return
OUString("isometricOffAxis2Right");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Top: return
OUString("isometricOffAxis2Top");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Left: return
OUString("isometricOffAxis3Left");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Right: return
OUString("isometricOffAxis3Right");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Bottom: return
OUString("isometricOffAxis3Bottom");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Left: return
OUString("isometricOffAxis4Left");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Right: return
OUString("isometricOffAxis4Right");
- case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Bottom: return
OUString("isometricOffAxis4Bottom");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueTopLeft: return
OUString("obliqueTopLeft");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueTop: return
OUString("obliqueTop");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueTopRight: return
OUString("obliqueTopRight");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueLeft: return
OUString("obliqueLeft");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueRight: return
OUString("obliqueRight");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomLeft: return
OUString("obliqueBottomLeft");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueBottom: return
OUString("obliqueBottom");
- case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomRight: return
OUString("obliqueBottomRight");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveFront: return
OUString("perspectiveFront");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveLeft: return
OUString("perspectiveLeft");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveRight: return
OUString("perspectiveRight");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveAbove: return
OUString("perspectiveAbove");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveBelow: return
OUString("perspectiveBelow");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveLeftFacing:
return OUString("perspectiveAboveLeftFacing");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveRightFacing:
return OUString("perspectiveAboveRightFacing");
- case
NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingLeftFacing: return
OUString("perspectiveContrastingLeftFacing");
- case
NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingRightFacing: return
OUString("perspectiveContrastingRightFacing");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicLeftFacing:
return OUString("perspectiveHeroicLeftFacing");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicRightFacing:
return OUString("perspectiveHeroicRightFacing");
- case
NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeLeftFacing: return
OUString("perspectiveHeroicExtremeLeftFacing");
- case
NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeRightFacing: return
OUString("perspectiveHeroicExtremeRightFacing");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxed: return
OUString("perspectiveRelaxed");
- case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxedModerately:
return OUString("perspectiveRelaxedModerately");
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopLeft: return
"legacyObliqueTopLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTop: return
"legacyObliqueTop";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueTopRight: return
"legacyObliqueTopRight";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueLeft: return
"legacyObliqueLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueFront: return
"legacyObliqueFront";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueRight: return
"legacyObliqueRight";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomLeft: return
"legacyObliqueBottomLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottom: return
"legacyObliqueBottom";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyObliqueBottomRight: return
"legacyObliqueBottomRight";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopLeft: return
"legacyPerspectiveTopLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTop: return
"legacyPerspectiveTop";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveTopRight:
return "legacyPerspectiveTopRight";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveLeft: return
"legacyPerspectiveLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveFront: return
"legacyPerspectiveFront";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveRight: return
"legacyPerspectiveRight";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomLeft:
return "legacyPerspectiveBottomLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottom: return
"legacyPerspectiveBottom";
+ case NS_ooxml::LN_ST_PresetCameraType_legacyPerspectiveBottomRight:
return "legacyPerspectiveBottomRight";
+ case NS_ooxml::LN_ST_PresetCameraType_orthographicFront: return
"orthographicFront";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricTopUp: return
"isometricTopUp";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricTopDown: return
"isometricTopDown";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricBottomUp: return
"isometricBottomUp";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricBottomDown: return
"isometricBottomDown";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricLeftUp: return
"isometricLeftUp";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricLeftDown: return
"isometricLeftDown";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricRightUp: return
"isometricRightUp";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricRightDown: return
"isometricRightDown";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Left: return
"isometricOffAxis1Left";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Right: return
"isometricOffAxis1Right";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis1Top: return
"isometricOffAxis1Top";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Left: return
"isometricOffAxis2Left";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Right: return
"isometricOffAxis2Right";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis2Top: return
"isometricOffAxis2Top";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Left: return
"isometricOffAxis3Left";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Right: return
"isometricOffAxis3Right";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis3Bottom: return
"isometricOffAxis3Bottom";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Left: return
"isometricOffAxis4Left";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Right: return
"isometricOffAxis4Right";
+ case NS_ooxml::LN_ST_PresetCameraType_isometricOffAxis4Bottom: return
"isometricOffAxis4Bottom";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueTopLeft: return
"obliqueTopLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueTop: return "obliqueTop";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueTopRight: return
"obliqueTopRight";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueLeft: return
"obliqueLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueRight: return
"obliqueRight";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomLeft: return
"obliqueBottomLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueBottom: return
"obliqueBottom";
+ case NS_ooxml::LN_ST_PresetCameraType_obliqueBottomRight: return
"obliqueBottomRight";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveFront: return
"perspectiveFront";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveLeft: return
"perspectiveLeft";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveRight: return
"perspectiveRight";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveAbove: return
"perspectiveAbove";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveBelow: return
"perspectiveBelow";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveLeftFacing:
return "perspectiveAboveLeftFacing";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveAboveRightFacing:
return "perspectiveAboveRightFacing";
+ case
NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingLeftFacing: return
"perspectiveContrastingLeftFacing";
+ case
NS_ooxml::LN_ST_PresetCameraType_perspectiveContrastingRightFacing: return
"perspectiveContrastingRightFacing";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicLeftFacing:
return "perspectiveHeroicLeftFacing";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicRightFacing:
return "perspectiveHeroicRightFacing";
+ case
NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeLeftFacing: return
"perspectiveHeroicExtremeLeftFacing";
+ case
NS_ooxml::LN_ST_PresetCameraType_perspectiveHeroicExtremeRightFacing: return
"perspectiveHeroicExtremeRightFacing";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxed: return
"perspectiveRelaxed";
+ case NS_ooxml::LN_ST_PresetCameraType_perspectiveRelaxedModerately:
return "perspectiveRelaxedModerately";
default: break;
}
return OUString();
@@ -277,33 +277,33 @@ OUString
TextEffectsHandler::getLightRigTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_LightRigType_legacyFlat1: return
OUString("legacyFlat1");
- case NS_ooxml::LN_ST_LightRigType_legacyFlat2: return
OUString("legacyFlat2");
- case NS_ooxml::LN_ST_LightRigType_legacyFlat3: return
OUString("legacyFlat3");
- case NS_ooxml::LN_ST_LightRigType_legacyFlat4: return
OUString("legacyFlat4");
- case NS_ooxml::LN_ST_LightRigType_legacyNormal1: return
OUString("legacyNormal1");
- case NS_ooxml::LN_ST_LightRigType_legacyNormal2: return
OUString("legacyNormal2");
- case NS_ooxml::LN_ST_LightRigType_legacyNormal3: return
OUString("legacyNormal3");
- case NS_ooxml::LN_ST_LightRigType_legacyNormal4: return
OUString("legacyNormal4");
- case NS_ooxml::LN_ST_LightRigType_legacyHarsh1: return
OUString("legacyHarsh1");
- case NS_ooxml::LN_ST_LightRigType_legacyHarsh2: return
OUString("legacyHarsh2");
- case NS_ooxml::LN_ST_LightRigType_legacyHarsh3: return
OUString("legacyHarsh3");
- case NS_ooxml::LN_ST_LightRigType_legacyHarsh4: return
OUString("legacyHarsh4");
- case NS_ooxml::LN_ST_LightRigType_threePt: return OUString("threePt");
- case NS_ooxml::LN_ST_LightRigType_balanced: return
OUString("balanced");
- case NS_ooxml::LN_ST_LightRigType_soft: return OUString("soft");
- case NS_ooxml::LN_ST_LightRigType_harsh: return OUString("harsh");
- case NS_ooxml::LN_ST_LightRigType_flood: return OUString("flood");
- case NS_ooxml::LN_ST_LightRigType_contrasting: return
OUString("contrasting");
- case NS_ooxml::LN_ST_LightRigType_morning: return OUString("morning");
- case NS_ooxml::LN_ST_LightRigType_sunrise: return OUString("sunrise");
- case NS_ooxml::LN_ST_LightRigType_sunset: return OUString("sunset");
- case NS_ooxml::LN_ST_LightRigType_chilly: return OUString("chilly");
- case NS_ooxml::LN_ST_LightRigType_freezing: return
OUString("freezing");
- case NS_ooxml::LN_ST_LightRigType_flat: return OUString("flat");
- case NS_ooxml::LN_ST_LightRigType_twoPt: return OUString("twoPt");
- case NS_ooxml::LN_ST_LightRigType_glow: return OUString("glow");
- case NS_ooxml::LN_ST_LightRigType_brightRoom: return
OUString("brightRoom");
+ case NS_ooxml::LN_ST_LightRigType_legacyFlat1: return "legacyFlat1";
+ case NS_ooxml::LN_ST_LightRigType_legacyFlat2: return "legacyFlat2";
+ case NS_ooxml::LN_ST_LightRigType_legacyFlat3: return "legacyFlat3";
+ case NS_ooxml::LN_ST_LightRigType_legacyFlat4: return "legacyFlat4";
+ case NS_ooxml::LN_ST_LightRigType_legacyNormal1: return
"legacyNormal1";
+ case NS_ooxml::LN_ST_LightRigType_legacyNormal2: return
"legacyNormal2";
+ case NS_ooxml::LN_ST_LightRigType_legacyNormal3: return
"legacyNormal3";
+ case NS_ooxml::LN_ST_LightRigType_legacyNormal4: return
"legacyNormal4";
+ case NS_ooxml::LN_ST_LightRigType_legacyHarsh1: return "legacyHarsh1";
+ case NS_ooxml::LN_ST_LightRigType_legacyHarsh2: return "legacyHarsh2";
+ case NS_ooxml::LN_ST_LightRigType_legacyHarsh3: return "legacyHarsh3";
+ case NS_ooxml::LN_ST_LightRigType_legacyHarsh4: return "legacyHarsh4";
+ case NS_ooxml::LN_ST_LightRigType_threePt: return "threePt";
+ case NS_ooxml::LN_ST_LightRigType_balanced: return "balanced";
+ case NS_ooxml::LN_ST_LightRigType_soft: return "soft";
+ case NS_ooxml::LN_ST_LightRigType_harsh: return "harsh";
+ case NS_ooxml::LN_ST_LightRigType_flood: return "flood";
+ case NS_ooxml::LN_ST_LightRigType_contrasting: return "contrasting";
+ case NS_ooxml::LN_ST_LightRigType_morning: return "morning";
+ case NS_ooxml::LN_ST_LightRigType_sunrise: return "sunrise";
+ case NS_ooxml::LN_ST_LightRigType_sunset: return "sunset";
+ case NS_ooxml::LN_ST_LightRigType_chilly: return "chilly";
+ case NS_ooxml::LN_ST_LightRigType_freezing: return "freezing";
+ case NS_ooxml::LN_ST_LightRigType_flat: return "flat";
+ case NS_ooxml::LN_ST_LightRigType_twoPt: return "twoPt";
+ case NS_ooxml::LN_ST_LightRigType_glow: return "glow";
+ case NS_ooxml::LN_ST_LightRigType_brightRoom: return "brightRoom";
default: break;
}
return OUString();
@@ -313,14 +313,14 @@ OUString
TextEffectsHandler::getLightRigDirectionString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_LightRigDirection_tl: return OUString("tl");
- case NS_ooxml::LN_ST_LightRigDirection_t: return OUString("t");
- case NS_ooxml::LN_ST_LightRigDirection_tr: return OUString("tr");
- case NS_ooxml::LN_ST_LightRigDirection_l: return OUString("l");
- case NS_ooxml::LN_ST_LightRigDirection_r: return OUString("r");
- case NS_ooxml::LN_ST_LightRigDirection_bl: return OUString("bl");
- case NS_ooxml::LN_ST_LightRigDirection_b: return OUString("b");
- case NS_ooxml::LN_ST_LightRigDirection_br: return OUString("br");
+ case NS_ooxml::LN_ST_LightRigDirection_tl: return "tl";
+ case NS_ooxml::LN_ST_LightRigDirection_t: return "t";
+ case NS_ooxml::LN_ST_LightRigDirection_tr: return "tr";
+ case NS_ooxml::LN_ST_LightRigDirection_l: return "l";
+ case NS_ooxml::LN_ST_LightRigDirection_r: return "r";
+ case NS_ooxml::LN_ST_LightRigDirection_bl: return "bl";
+ case NS_ooxml::LN_ST_LightRigDirection_b: return "b";
+ case NS_ooxml::LN_ST_LightRigDirection_br: return "br";
default: break;
}
@@ -331,18 +331,18 @@ OUString
TextEffectsHandler::getBevelPresetTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_BevelPresetType_relaxedInset: return
OUString("relaxedInset");
- case NS_ooxml::LN_ST_BevelPresetType_circle: return OUString("circle");
- case NS_ooxml::LN_ST_BevelPresetType_slope: return OUString("slope");
- case NS_ooxml::LN_ST_BevelPresetType_cross: return OUString("cross");
- case NS_ooxml::LN_ST_BevelPresetType_angle: return OUString("angle");
- case NS_ooxml::LN_ST_BevelPresetType_softRound: return
OUString("softRound");
- case NS_ooxml::LN_ST_BevelPresetType_convex: return OUString("convex");
- case NS_ooxml::LN_ST_BevelPresetType_coolSlant: return
OUString("coolSlant");
- case NS_ooxml::LN_ST_BevelPresetType_divot: return OUString("divot");
- case NS_ooxml::LN_ST_BevelPresetType_riblet: return OUString("riblet");
- case NS_ooxml::LN_ST_BevelPresetType_hardEdge: return
OUString("hardEdge");
- case NS_ooxml::LN_ST_BevelPresetType_artDeco: return
OUString("artDeco");
+ case NS_ooxml::LN_ST_BevelPresetType_relaxedInset: return
"relaxedInset";
+ case NS_ooxml::LN_ST_BevelPresetType_circle: return "circle";
+ case NS_ooxml::LN_ST_BevelPresetType_slope: return "slope";
+ case NS_ooxml::LN_ST_BevelPresetType_cross: return "cross";
+ case NS_ooxml::LN_ST_BevelPresetType_angle: return "angle";
+ case NS_ooxml::LN_ST_BevelPresetType_softRound: return "softRound";
+ case NS_ooxml::LN_ST_BevelPresetType_convex: return "convex";
+ case NS_ooxml::LN_ST_BevelPresetType_coolSlant: return "coolSlant";
+ case NS_ooxml::LN_ST_BevelPresetType_divot: return "divot";
+ case NS_ooxml::LN_ST_BevelPresetType_riblet: return "riblet";
+ case NS_ooxml::LN_ST_BevelPresetType_hardEdge: return "hardEdge";
+ case NS_ooxml::LN_ST_BevelPresetType_artDeco: return "artDeco";
default: break;
}
return OUString();
@@ -352,22 +352,22 @@ OUString
TextEffectsHandler::getPresetMaterialTypeString(sal_Int32 nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_PresetMaterialType_legacyMatte: return
OUString("legacyMatte");
- case NS_ooxml::LN_ST_PresetMaterialType_legacyPlastic: return
OUString("legacyPlastic");
- case NS_ooxml::LN_ST_PresetMaterialType_legacyMetal: return
OUString("legacyMetal");
- case NS_ooxml::LN_ST_PresetMaterialType_legacyWireframe: return
OUString("legacyWireframe");
- case NS_ooxml::LN_ST_PresetMaterialType_matte: return
OUString("matte");
- case NS_ooxml::LN_ST_PresetMaterialType_plastic: return
OUString("plastic");
- case NS_ooxml::LN_ST_PresetMaterialType_metal: return
OUString("metal");
- case NS_ooxml::LN_ST_PresetMaterialType_warmMatte: return
OUString("warmMatte");
- case NS_ooxml::LN_ST_PresetMaterialType_translucentPowder: return
OUString("translucentPowder");
- case NS_ooxml::LN_ST_PresetMaterialType_powder: return
OUString("powder");
- case NS_ooxml::LN_ST_PresetMaterialType_dkEdge: return
OUString("dkEdge");
- case NS_ooxml::LN_ST_PresetMaterialType_softEdge: return
OUString("softEdge");
- case NS_ooxml::LN_ST_PresetMaterialType_clear: return
OUString("clear");
- case NS_ooxml::LN_ST_PresetMaterialType_flat: return OUString("flat");
- case NS_ooxml::LN_ST_PresetMaterialType_softmetal: return
OUString("softmetal");
- case NS_ooxml::LN_ST_PresetMaterialType_none: return OUString("none");
+ case NS_ooxml::LN_ST_PresetMaterialType_legacyMatte: return
"legacyMatte";
+ case NS_ooxml::LN_ST_PresetMaterialType_legacyPlastic: return
"legacyPlastic";
+ case NS_ooxml::LN_ST_PresetMaterialType_legacyMetal: return
"legacyMetal";
+ case NS_ooxml::LN_ST_PresetMaterialType_legacyWireframe: return
"legacyWireframe";
+ case NS_ooxml::LN_ST_PresetMaterialType_matte: return "matte";
+ case NS_ooxml::LN_ST_PresetMaterialType_plastic: return "plastic";
+ case NS_ooxml::LN_ST_PresetMaterialType_metal: return "metal";
+ case NS_ooxml::LN_ST_PresetMaterialType_warmMatte: return "warmMatte";
+ case NS_ooxml::LN_ST_PresetMaterialType_translucentPowder: return
"translucentPowder";
+ case NS_ooxml::LN_ST_PresetMaterialType_powder: return "powder";
+ case NS_ooxml::LN_ST_PresetMaterialType_dkEdge: return "dkEdge";
+ case NS_ooxml::LN_ST_PresetMaterialType_softEdge: return "softEdge";
+ case NS_ooxml::LN_ST_PresetMaterialType_clear: return "clear";
+ case NS_ooxml::LN_ST_PresetMaterialType_flat: return "flat";
+ case NS_ooxml::LN_ST_PresetMaterialType_softmetal: return "softmetal";
+ case NS_ooxml::LN_ST_PresetMaterialType_none: return "none";
default: break;
}
return OUString();
@@ -377,22 +377,22 @@ OUString TextEffectsHandler::getLigaturesString(sal_Int32
nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_Ligatures_none: return OUString("none");
- case NS_ooxml::LN_ST_Ligatures_standard: return OUString("standard");
- case NS_ooxml::LN_ST_Ligatures_contextual: return
OUString("contextual");
- case NS_ooxml::LN_ST_Ligatures_historical: return
OUString("historical");
- case NS_ooxml::LN_ST_Ligatures_discretional: return
OUString("discretional");
- case NS_ooxml::LN_ST_Ligatures_standardContextual: return
OUString("standardContextual");
- case NS_ooxml::LN_ST_Ligatures_standardHistorical: return
OUString("standardHistorical");
- case NS_ooxml::LN_ST_Ligatures_contextualHistorical: return
OUString("contextualHistorical");
- case NS_ooxml::LN_ST_Ligatures_standardDiscretional: return
OUString("standardDiscretional");
- case NS_ooxml::LN_ST_Ligatures_contextualDiscretional: return
OUString("contextualDiscretional");
- case NS_ooxml::LN_ST_Ligatures_historicalDiscretional: return
OUString("historicalDiscretional");
- case NS_ooxml::LN_ST_Ligatures_standardContextualHistorical: return
OUString("standardContextualHistorical");
- case NS_ooxml::LN_ST_Ligatures_standardContextualDiscretional: return
OUString("standardContextualDiscretional");
- case NS_ooxml::LN_ST_Ligatures_standardHistoricalDiscretional: return
OUString("standardHistoricalDiscretional");
- case NS_ooxml::LN_ST_Ligatures_contextualHistoricalDiscretional:
return OUString("contextualHistoricalDiscretional");
- case NS_ooxml::LN_ST_Ligatures_all: return OUString("all");
+ case NS_ooxml::LN_ST_Ligatures_none: return "none";
+ case NS_ooxml::LN_ST_Ligatures_standard: return "standard";
+ case NS_ooxml::LN_ST_Ligatures_contextual: return "contextual";
+ case NS_ooxml::LN_ST_Ligatures_historical: return "historical";
+ case NS_ooxml::LN_ST_Ligatures_discretional: return "discretional";
+ case NS_ooxml::LN_ST_Ligatures_standardContextual: return
"standardContextual";
+ case NS_ooxml::LN_ST_Ligatures_standardHistorical: return
"standardHistorical";
+ case NS_ooxml::LN_ST_Ligatures_contextualHistorical: return
"contextualHistorical";
+ case NS_ooxml::LN_ST_Ligatures_standardDiscretional: return
"standardDiscretional";
+ case NS_ooxml::LN_ST_Ligatures_contextualDiscretional: return
"contextualDiscretional";
+ case NS_ooxml::LN_ST_Ligatures_historicalDiscretional: return
"historicalDiscretional";
+ case NS_ooxml::LN_ST_Ligatures_standardContextualHistorical: return
"standardContextualHistorical";
+ case NS_ooxml::LN_ST_Ligatures_standardContextualDiscretional: return
"standardContextualDiscretional";
+ case NS_ooxml::LN_ST_Ligatures_standardHistoricalDiscretional: return
"standardHistoricalDiscretional";
+ case NS_ooxml::LN_ST_Ligatures_contextualHistoricalDiscretional:
return "contextualHistoricalDiscretional";
+ case NS_ooxml::LN_ST_Ligatures_all: return "all";
default: break;
}
return OUString();
@@ -402,9 +402,9 @@ OUString TextEffectsHandler::getNumFormString(sal_Int32
nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_NumForm_default: return OUString("default");
- case NS_ooxml::LN_ST_NumForm_lining: return OUString("lining");
- case NS_ooxml::LN_ST_NumForm_oldStyle: return OUString("oldStyle");
+ case NS_ooxml::LN_ST_NumForm_default: return "default";
+ case NS_ooxml::LN_ST_NumForm_lining: return "lining";
+ case NS_ooxml::LN_ST_NumForm_oldStyle: return "oldStyle";
default: break;
}
return OUString();
@@ -414,9 +414,9 @@ OUString TextEffectsHandler::getNumSpacingString(sal_Int32
nType)
{
switch (nType)
{
- case NS_ooxml::LN_ST_NumSpacing_default: return OUString("default");
- case NS_ooxml::LN_ST_NumSpacing_proportional: return
OUString("proportional");
- case NS_ooxml::LN_ST_NumSpacing_tabular: return OUString("tabular");
+ case NS_ooxml::LN_ST_NumSpacing_default: return "default";
+ case NS_ooxml::LN_ST_NumSpacing_proportional: return "proportional";
+ case NS_ooxml::LN_ST_NumSpacing_tabular: return "tabular";
default: break;
}
return OUString();
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx
b/writerfilter/source/dmapper/ThemeTable.cxx
index 754a278ea082..13fdbe0187d1 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -169,21 +169,21 @@ OUString ThemeTable::getStringForTheme(const Id id)
switch (id)
{
case NS_ooxml::LN_Value_ST_Theme_majorEastAsia:
- return OUString("majorEastAsia");
+ return "majorEastAsia";
case NS_ooxml::LN_Value_ST_Theme_majorBidi:
- return OUString("majorBidi");
+ return "majorBidi";
case NS_ooxml::LN_Value_ST_Theme_majorAscii:
- return OUString("majorAscii");
+ return "majorAscii";
case NS_ooxml::LN_Value_ST_Theme_majorHAnsi:
- return OUString("majorHAnsi");
+ return "majorHAnsi";
case NS_ooxml::LN_Value_ST_Theme_minorEastAsia:
- return OUString("minorEastAsia");
+ return "minorEastAsia";
case NS_ooxml::LN_Value_ST_Theme_minorBidi:
- return OUString("minorBidi");
+ return "minorBidi";
case NS_ooxml::LN_Value_ST_Theme_minorAscii:
- return OUString("minorAscii");
+ return "minorAscii";
case NS_ooxml::LN_Value_ST_Theme_minorHAnsi:
- return OUString("minorHAnsi");
+ return "minorHAnsi";
}
return OUString();
}
@@ -290,18 +290,18 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType
lang)
case 0x460 : // lidKashmiri
case 0x463 : // lidPashto
case 0x48c : // lidDari
- return OUString("Arab");
+ return "Arab";
case 0x42b : // lidArmenian
- return OUString("Armn");
+ return "Armn";
case 0x445 : // lidBengali
case 0x845 : // lidBengaliBangladesh
case 0x44d : // lidAssamese
case 0x458 : // lidManipuri
- return OUString("Beng");
+ return "Beng";
case 0x45d : // lidInuktitut
- return OUString("Cans");
+ return "Cans";
case 0x45c : // lidCherokee
- return OUString("Cher");
+ return "Cher";
case 0x419 : // lidRussian
case 0x402 : // lidBulgarian
case 0x281a : // lidSerbianCyrillic
@@ -322,7 +322,7 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType lang)
case 0x450 : // lidMongolian
case 0x46d : // lidBashkir
case 0x485 : // lidSakha
- return OUString("Cyrl");
+ return "Cyrl";
case 0x439 : // lidHindi
case 0x44e : // lidMarathi
case 0x44f : // lidSanskrit
@@ -331,39 +331,39 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType
lang)
case 0x860 : // lidKashmiriIndia
case 0x461 : // lidNepali
case 0x861 : // lidNepaliIndia
- return OUString("Deva");
+ return "Deva";
case 0x45e : // lidAmharic
case 0x473 : // lidTigrignaEthiopic
case 0x873 : // lidTigrignaEritrea
- return OUString("Ethi");
+ return "Ethi";
case 0x437 : // lidGeorgian
- return OUString("Geor");
+ return "Geor";
case 0x408 : // lidGreek
- return OUString("Grek");
+ return "Grek";
case 0x447 : // lidGujarati
- return OUString("Gujr");
+ return "Gujr";
case 0x446 : // lidPunjabi
- return OUString("Guru");
+ return "Guru";
case 0x412 : // lidKoreanExtWansung
- return OUString("Hang");
+ return "Hang";
case 0x804 : // lidChineseSimp
case 0x1004 : // lidSingapore
- return OUString("Hans");
+ return "Hans";
case 0x404 : // lidChineseTrad
case 0xc04 : // lidHongkong
case 0x1404 : // lidMacau
- return OUString("Hant");
+ return "Hant";
case 0x40d : // lidHebrew
case 0x43d : // lidYiddish
- return OUString("Hebr");
+ return "Hebr";
case 0x411 : // lidJapanese
- return OUString("Jpan");
+ return "Jpan";
case 0x453 : // lidKhmer
- return OUString("Khmr");
+ return "Khmr";
case 0x44b : // lidKannada
- return OUString("Knda");
+ return "Knda";
case 0x454 : // lidLao
- return OUString("Laoo");
+ return "Laoo";
case 0x409 : // lidAmerican
case 0xc09 : // lidAustralian
case 0x809 : // lidBritish
@@ -522,36 +522,36 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType
lang)
case 0x486 : // lidKiche
case 0x487 : // lidKinyarwanda
case 0x488 : // lidWolof
- return OUString("Latn");
+ return "Latn";
case 0x44c : // lidMalayalam
- return OUString("Mlym");
+ return "Mlym";
case 0x850 : // lidMongolianMongo
- return OUString("Mong");
+ return "Mong";
case 0x455 : // lidBurmese
- return OUString("Mymr");
+ return "Mymr";
case 0x448 : // lidOriya
- return OUString("Orya");
+ return "Orya";
case 0x45b : // lidSinhalese
- return OUString("Sinh");
+ return "Sinh";
case 0x45a : // lidSyriac
- return OUString("Syrc");
+ return "Syrc";
case 0x449 : // lidTamil
- return OUString("Taml");
+ return "Taml";
case 0x44a : // lidTelugu
- return OUString("Telu");
+ return "Telu";
case 0x465 : // lidMaldivian
- return OUString("Thaa");
+ return "Thaa";
case 0x41e : // lidThai
- return OUString("Thai");
+ return "Thai";
case 0x451 : // lidTibetan
case 0x851 : // lidBhutanese
- return OUString("Tibt");
+ return "Tibt";
case 0x480 : // lidUighur
- return OUString("Uigh");
+ return "Uigh";
case 0x42a : // lidVietnamese
- return OUString("Viet");
+ return "Viet";
case 0x478 : // lidYi
- return OUString("Yiii");
+ return "Yiii";
default:
return OUString();
}
diff --git a/writerfilter/source/filter/RtfFilter.cxx
b/writerfilter/source/filter/RtfFilter.cxx
index 3c1e975d8ad7..3cb4b3579d65 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -186,7 +186,7 @@ void RtfFilter::initialize(const uno::Sequence< uno::Any >&
/*aArguments*/)
OUString RtfFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Writer.RtfFilter");
+ return "com.sun.star.comp.Writer.RtfFilter";
}
sal_Bool RtfFilter::supportsService(const OUString& rServiceName)
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index 826c2a0a516b..89b4b3e57b5f 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -320,7 +320,7 @@ void WriterFilter::initialize(const uno::Sequence< uno::Any
>& rArguments)
OUString WriterFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Writer.WriterFilter");
+ return "com.sun.star.comp.Writer.WriterFilter";
}
commit ec5ad2a7dc682bc27bcbf7733a5b36bc06676b8b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:44:10 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:52:19 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): writerperfect
Change-Id: Ic6518d6441d81e286e69ea4be11d12c42d61d459
Reviewed-on: https://gerrit.libreoffice.org/76625
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/writerperfect/inc/DocumentHandlerForOdg.hxx
b/writerperfect/inc/DocumentHandlerForOdg.hxx
index 1fba93194948..72968edc14f1 100644
--- a/writerperfect/inc/DocumentHandlerForOdg.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdg.hxx
@@ -16,7 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdgGenerator>
{
- static const OUString name() { return
OUString("com.sun.star.comp.Draw.XMLOasisImporter"); }
+ static const OUString name() { return
"com.sun.star.comp.Draw.XMLOasisImporter"; }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdp.hxx
b/writerperfect/inc/DocumentHandlerForOdp.hxx
index d7a3aaf9f28b..c919514b80cb 100644
--- a/writerperfect/inc/DocumentHandlerForOdp.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdp.hxx
@@ -16,7 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdpGenerator>
{
- static const OUString name() { return
OUString("com.sun.star.comp.Impress.XMLOasisImporter"); }
+ static const OUString name() { return
"com.sun.star.comp.Impress.XMLOasisImporter"; }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOds.hxx
b/writerperfect/inc/DocumentHandlerForOds.hxx
index 9b789d628e11..4ee268176d32 100644
--- a/writerperfect/inc/DocumentHandlerForOds.hxx
+++ b/writerperfect/inc/DocumentHandlerForOds.hxx
@@ -16,7 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdsGenerator>
{
- static const OUString name() { return
OUString("com.sun.star.comp.Calc.XMLOasisImporter"); }
+ static const OUString name() { return
"com.sun.star.comp.Calc.XMLOasisImporter"; }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdt.hxx
b/writerperfect/inc/DocumentHandlerForOdt.hxx
index d1abe81d9bb6..ea3742a27dfd 100644
--- a/writerperfect/inc/DocumentHandlerForOdt.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdt.hxx
@@ -16,7 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdtGenerator>
{
- static const OUString name() { return
OUString("com.sun.star.comp.Writer.XMLOasisImporter"); }
+ static const OUString name() { return
"com.sun.star.comp.Writer.XMLOasisImporter"; }
};
}
diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx
b/writerperfect/qa/unit/DrawingImportTest.cxx
index a33a3409eeec..a56007bcd7e9 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -68,7 +68,7 @@ bool
DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString&
// XServiceInfo
OUString SAL_CALL DrawingImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Wpft.QA.DrawingImportFilter");
+ return "org.libreoffice.comp.Wpft.QA.DrawingImportFilter";
}
sal_Bool SAL_CALL DrawingImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx
b/writerperfect/qa/unit/PresentationImportTest.cxx
index 934d7d0013d3..11a61d80d32c 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -68,7 +68,7 @@ bool
PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUSt
// XServiceInfo
OUString SAL_CALL PresentationImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Wpft.QA.PresentationImportFilter");
+ return "org.libreoffice.comp.Wpft.QA.PresentationImportFilter";
}
sal_Bool SAL_CALL PresentationImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index 4951fb0ad9a7..06ac09ad8365 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -67,7 +67,7 @@ bool
SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUStr
// XServiceInfo
OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter");
+ return "org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter";
}
sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/qa/unit/TextImportTest.cxx
b/writerperfect/qa/unit/TextImportTest.cxx
index b9a3953fc8d2..0b482a75c9a3 100644
--- a/writerperfect/qa/unit/TextImportTest.cxx
+++ b/writerperfect/qa/unit/TextImportTest.cxx
@@ -65,7 +65,7 @@ bool
TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rT
// XServiceInfo
OUString SAL_CALL TextImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Wpft.QA.TextImportFilter");
+ return "org.libreoffice.comp.Wpft.QA.TextImportFilter";
}
sal_Bool SAL_CALL TextImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 5f81dc44769a..8b9a40bd5f61 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -427,7 +427,7 @@ void
MSWorksCalcImportFilter::doRegisterHandlers(OdsGenerator&) {}
// XServiceInfo
OUString SAL_CALL MSWorksCalcImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Calc.MSWorksCalcImportFilter");
+ return "com.sun.star.comp.Calc.MSWorksCalcImportFilter";
}
sal_Bool SAL_CALL MSWorksCalcImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index 43486d3cd2af..ce9834bdf8ec 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -108,7 +108,7 @@ void MWAWCalcImportFilter::doRegisterHandlers(OdsGenerator&
rGenerator)
// XServiceInfo
OUString SAL_CALL MWAWCalcImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Calc.MWAWCalcImportFilter");
+ return "com.sun.star.comp.Calc.MWAWCalcImportFilter";
}
sal_Bool SAL_CALL MWAWCalcImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx
b/writerperfect/source/calc/NumbersImportFilter.cxx
index a24bf7dbc605..8cf18b492b9e 100644
--- a/writerperfect/source/calc/NumbersImportFilter.cxx
+++ b/writerperfect/source/calc/NumbersImportFilter.cxx
@@ -48,7 +48,7 @@ void NumbersImportFilter::doRegisterHandlers(OdsGenerator&) {}
// XServiceInfo
OUString SAL_CALL NumbersImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Calc.NumbersImportFilter");
+ return "org.libreoffice.comp.Calc.NumbersImportFilter";
}
sal_Bool SAL_CALL NumbersImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
index fe3407944f4b..9e8a1ba18d7d 100644
--- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
+++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
@@ -79,7 +79,7 @@ void
StarOfficeCalcImportFilter::doRegisterHandlers(OdsGenerator& rGenerator)
// XServiceInfo
OUString SAL_CALL StarOfficeCalcImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter");
+ return "org.libreoffice.comp.Calc.StarOfficeCalcImportFilter";
}
sal_Bool SAL_CALL StarOfficeCalcImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx
b/writerperfect/source/draw/CDRImportFilter.cxx
index c9b63a677145..fd317ec26bac 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -45,7 +45,7 @@ bool
CDRImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL CDRImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.CDRImportFilter");
+ return "com.sun.star.comp.Draw.CDRImportFilter";
}
sal_Bool SAL_CALL CDRImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx
b/writerperfect/source/draw/CMXImportFilter.cxx
index 2bc5e7175569..117da40e3540 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -45,7 +45,7 @@ bool
CMXImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL CMXImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.CMXImportFilter");
+ return "com.sun.star.comp.Draw.CMXImportFilter";
}
sal_Bool SAL_CALL CMXImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx
b/writerperfect/source/draw/FreehandImportFilter.cxx
index b873232792fb..432532647fd2 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -41,7 +41,7 @@ bool
FreehandImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, O
// XServiceInfo
OUString SAL_CALL FreehandImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.FreehandImportFilter");
+ return "com.sun.star.comp.Draw.FreehandImportFilter";
}
sal_Bool SAL_CALL FreehandImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx
b/writerperfect/source/draw/MSPUBImportFilter.cxx
index c755dc816da7..7ed175efcb85 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -41,7 +41,7 @@ bool
MSPUBImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUSt
// XServiceInfo
OUString SAL_CALL MSPUBImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.MSPUBImportFilter");
+ return "com.sun.star.comp.Draw.MSPUBImportFilter";
}
sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index 6d38af9e17d0..72495b7b24a2 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -100,7 +100,7 @@ void MWAWDrawImportFilter::doRegisterHandlers(OdgGenerator&
rGenerator)
// XServiceInfo
OUString SAL_CALL MWAWDrawImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.MWAWDrawImportFilter");
+ return "com.sun.star.comp.Draw.MWAWDrawImportFilter";
}
sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx
b/writerperfect/source/draw/PageMakerImportFilter.cxx
index 1d4c5762d42e..49409141cd59 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -42,7 +42,7 @@ bool
PageMakerImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput,
// XServiceInfo
OUString SAL_CALL PageMakerImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Draw.PageMakerImportFilter");
+ return "org.libreoffice.comp.Draw.PageMakerImportFilter";
}
sal_Bool SAL_CALL PageMakerImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/QXPImportFilter.cxx
b/writerperfect/source/draw/QXPImportFilter.cxx
index 4b74b73167dc..a14402c49bba 100644
--- a/writerperfect/source/draw/QXPImportFilter.cxx
+++ b/writerperfect/source/draw/QXPImportFilter.cxx
@@ -42,7 +42,7 @@ bool
QXPImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL QXPImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Draw.QXPImportFilter");
+ return "org.libreoffice.comp.Draw.QXPImportFilter";
}
sal_Bool SAL_CALL QXPImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
index 2250bb54abc0..406a9887287b 100644
--- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
+++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
@@ -81,7 +81,7 @@ void
StarOfficeDrawImportFilter::doRegisterHandlers(OdgGenerator& rGenerator)
// XServiceInfo
OUString SAL_CALL StarOfficeDrawImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Draw.StarOfficeDrawImportFilter");
+ return "org.libreoffice.comp.Draw.StarOfficeDrawImportFilter";
}
sal_Bool SAL_CALL StarOfficeDrawImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx
b/writerperfect/source/draw/VisioImportFilter.cxx
index c49fed230c4e..7338f930450a 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -41,7 +41,7 @@ bool
VisioImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUSt
// XServiceInfo
OUString SAL_CALL VisioImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.VisioImportFilter");
+ return "com.sun.star.comp.Draw.VisioImportFilter";
}
sal_Bool SAL_CALL VisioImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx
b/writerperfect/source/draw/WPGImportFilter.cxx
index a7fb552deeba..e11badb7ac9d 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -48,7 +48,7 @@ bool
WPGImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL WPGImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.WPGImportFilter");
+ return "com.sun.star.comp.Draw.WPGImportFilter";
}
sal_Bool SAL_CALL WPGImportFilter::supportsService(const OUString&
rServiceName)
diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx
b/writerperfect/source/draw/ZMFImportFilter.cxx
index 84914ecc2682..14a47c6ca04f 100644
--- a/writerperfect/source/draw/ZMFImportFilter.cxx
+++ b/writerperfect/source/draw/ZMFImportFilter.cxx
@@ -42,7 +42,7 @@ bool
ZMFImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL ZMFImportFilter::getImplementationName()
{
- return OUString("org.libreoffice.comp.Draw.ZMFImportFilter");
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
