tdf#145834 Consistency for "Fontwork"
Change-Id: I5f660fac8576d96bf2d2363106be56a4d4fb4f64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157545
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 19cdd2f..112d468 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3452,7 +3452,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
AddOpt(DFF_Prop_gtextAlign,gTextAlign);
}
}
if((nTextPathFlags & 0x4000) != 0) // Is Font work
if((nTextPathFlags & 0x4000) != 0) // Is Fontwork
{
OutlinerParaObject* pOutlinerParaObject(rSdrObjCustomShape.GetOutlinerParaObject());
if ( pOutlinerParaObject && pOutlinerParaObject->IsEffectivelyVertical() )
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index f17b76c..223ee37 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -534,7 +534,7 @@
#define STR_TABLE_STYLE_SETTINGS NC_("STR_TABLE_STYLE_SETTINGS", "Table style settings")
#define STR_ObjNameSingulTable NC_("STR_ObjNameSingulTable", "Table")
#define STR_ObjNamePluralTable NC_("STR_ObjNamePluralTable", "Tables")
#define STR_ObjNameSingulFONTWORK NC_("STR_ObjNameSingulFONTWORK", "Font work")
#define STR_ObjNameSingulFONTWORK NC_("STR_ObjNameSingulFONTWORK", "Fontwork")
// Strings for the Draw-Dialog --------------------------------------------
#define RID_SVXSTR_SOLID NC_("RID_SVXSTR_SOLID", "Continuous")
#define RID_SVXSTR_GRADIENT NC_("RID_SVXSTR_GRADIENT", "Gradient")
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index 8860f3d..0de00fb 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -150,7 +150,7 @@ XMLTransformerActionInit const aGraphicPropertyOASISAttrActionTable[] =
{ XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
XML_FAMILY_TYPE_FILL_IMAGE, 0, 0 },
// Font work properties
// Fontwork properties
{ XML_NAMESPACE_DRAW, XML_FONTWORK_DISTANCE, XML_ATACTION_IN2INCH, NO_PARAMS },
{ XML_NAMESPACE_DRAW, XML_FONTWORK_START, XML_ATACTION_IN2INCH, NO_PARAMS },
{ XML_NAMESPACE_DRAW, XML_FONTWORK_SHADOW_OFFSET_X, XML_ATACTION_IN2INCH, NO_PARAMS },
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index cc6fc0e..abcd790 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -350,7 +350,7 @@ XMLTransformerActionInit const aGraphicPropertyOOoAttrActionTable[] =
{ XML_NAMESPACE_DRAW, XML_SIZE_PROTECT, XML_ATACTION_SIZE_PROTECT, NO_PARAMS },
{ XML_NAMESPACE_DRAW, XML_FIT_TO_CONTOUR, XML_ATACTION_COPY, NO_PARAMS },
// Font work properties
// Fontwork properties
{ XML_NAMESPACE_DRAW, XML_FONTWORK_STYLE, XML_ATACTION_COPY, NO_PARAMS },
{ XML_NAMESPACE_DRAW, XML_FONTWORK_ADJUST, XML_ATACTION_COPY, NO_PARAMS },
{ XML_NAMESPACE_DRAW, XML_FONTWORK_DISTANCE, XML_ATACTION_INCH2IN, NO_PARAMS },
