summaryrefslogtreecommitdiff
path: root/xmloff/source/text/txtparae.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-28 17:50:00 +0200
committerNoel Grandin <noel@peralex.com>2015-01-06 10:59:42 +0200
commit64cccf36f26f6398906a0cc6fc48e76defbe057d (patch)
tree9359c64efccfc85a298a54859c7279a3a2a1467e /xmloff/source/text/txtparae.cxx
parent8447eeb192acf7e3255f7fdf92977470b28a18f9 (diff)
fdo#84938: convert SEF_EXPORT_ #defines to 'enum class'
Change-Id: I7165d0f1b6b4af4de5e5b39a21f36d726a1b0e30
Diffstat (limited to 'xmloff/source/text/txtparae.cxx')
-rw-r--r--xmloff/source/text/txtparae.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index f23a34051430..542591f6f6b2 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2561,13 +2561,13 @@ static bool lcl_txtpara_isBoundAsChar(
return bIsBoundAsChar;
}
-sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
+XMLShapeExportFlags XMLTextParagraphExport::addTextFrameAttributes(
const Reference < XPropertySet >& rPropSet,
bool bShape,
OUString *pMinHeightValue,
OUString *pMinWidthValue)
{
- sal_Int32 nShapeFeatures = SEF_DEFAULT;
+ XMLShapeExportFlags nShapeFeatures = SEF_DEFAULT;
// draw:name (#97662#: not for shapes, since those names will be
// treated in the shape export)
@@ -2610,7 +2610,7 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
else
{
// #92210#
- nShapeFeatures |= SEF_EXPORT_NO_WS;
+ nShapeFeatures |= XMLShapeExportFlags::NO_WS;
}
// OD 2004-06-01 #i27691# - correction: no export of svg:x, if object
@@ -2632,7 +2632,7 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
}
}
else if( TextContentAnchorType_AS_CHARACTER == eAnchor )
- nShapeFeatures = (nShapeFeatures & ~SEF_EXPORT_X);
+ nShapeFeatures = (nShapeFeatures & ~XMLShapeExportFlags::X);
if( !bShape || TextContentAnchorType_AS_CHARACTER == eAnchor )
{
@@ -2649,7 +2649,7 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
sValue.makeStringAndClear() );
}
if( bShape )
- nShapeFeatures = (nShapeFeatures & ~SEF_EXPORT_Y);
+ nShapeFeatures = (nShapeFeatures & ~XMLShapeExportFlags::Y);
}
Reference< XPropertySetInfo > xPropSetInfo(rPropSet->getPropertySetInfo());
@@ -2871,7 +2871,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
case FT_SHAPE:
{
Reference < XShape > xShape( rTxtCntnt, UNO_QUERY );
- sal_Int32 nFeatures =
+ XMLShapeExportFlags nFeatures =
addTextFrameAttributes( xPropSet, true );
GetExport().GetShapeExport()
->exportShape( xShape, -1, nFeatures );