summaryrefslogtreecommitdiff
path: root/vcl/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/filter')
-rw-r--r--vcl/source/filter/eps/eps.cxx8
-rw-r--r--vcl/source/filter/idxf/dxf2mtf.cxx2
-rw-r--r--vcl/source/filter/imet/ios2met.cxx2
-rw-r--r--vcl/source/filter/ipict/ipict.cxx2
-rw-r--r--vcl/source/filter/wmf/emfwr.cxx12
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx22
6 files changed, 30 insertions, 18 deletions
diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx
index 2da28338c97c..61ea92e0269b 100644
--- a/vcl/source/filter/eps/eps.cxx
+++ b/vcl/source/filter/eps/eps.cxx
@@ -408,7 +408,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
eLineCap = SvtGraphicStroke::capButt;
eJoinType = SvtGraphicStroke::joinMiter;
aBackgroundColor = COL_WHITE;
- eTextAlign = ALIGN_BASELINE;
+ eTextAlign = TextAlign::Baseline;
if( pMTF->GetActionSize() )
{
@@ -2075,11 +2075,11 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint )
ImplWriteDouble( aSize.Height() );
mpPS->WriteCharPtr( "sf " );
}
- if ( eTextAlign != ALIGN_BASELINE )
+ if ( eTextAlign != TextAlign::Baseline )
{ // PostScript does not know about FontAlignment
- if ( eTextAlign == ALIGN_TOP ) // -> so I assume that
+ if ( eTextAlign == TextAlign::Top ) // -> so I assume that
aPoint.AdjustY( aSize.Height() * 4 / 5 ); // the area under the baseline
- else if ( eTextAlign == ALIGN_BOTTOM ) // is about 20% of the font size
+ else if ( eTextAlign == TextAlign::Bottom ) // is about 20% of the font size
aPoint.AdjustY( -( aSize.Height() / 5 ) );
}
ImplMoveTo( aPoint );
diff --git a/vcl/source/filter/idxf/dxf2mtf.cxx b/vcl/source/filter/idxf/dxf2mtf.cxx
index 06aebc3da16b..1b470c63cc7f 100644
--- a/vcl/source/filter/idxf/dxf2mtf.cxx
+++ b/vcl/source/filter/idxf/dxf2mtf.cxx
@@ -205,7 +205,7 @@ bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAngle,
aFont.SetTransparent(true);
aFont.SetFamily(FAMILY_SWISS);
aFont.SetFontSize(Size(0,nHeight));
- aFont.SetAlignment(ALIGN_BASELINE);
+ aFont.SetAlignment(TextAlign::Baseline);
aFont.SetOrientation(Degree10(nAngle));
if (aActFont!=aFont) {
aActFont=aFont;
diff --git a/vcl/source/filter/imet/ios2met.cxx b/vcl/source/filter/imet/ios2met.cxx
index 1d0b83ba1fb3..f1a6057bc8bc 100644
--- a/vcl/source/filter/imet/ios2met.cxx
+++ b/vcl/source/filter/imet/ios2met.cxx
@@ -2348,7 +2348,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize)
pF->pSucc=pFontList; pFontList=pF;
pF->nID=0;
pF->aFont.SetTransparent(true);
- pF->aFont.SetAlignment(ALIGN_BASELINE);
+ pF->aFont.SetAlignment(TextAlign::Baseline);
auto nPos=pOS2MET->Tell();
auto nMaxPos = nPos + nFieldSize;
diff --git a/vcl/source/filter/ipict/ipict.cxx b/vcl/source/filter/ipict/ipict.cxx
index 1d22137d0fcf..0c5adf8cfcb7 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -1914,7 +1914,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
aActFont.SetCharSet( GetTextEncoding());
aActFont.SetFamily(FAMILY_SWISS);
aActFont.SetFontSize(Size(0,12));
- aActFont.SetAlignment(ALIGN_BASELINE);
+ aActFont.SetAlignment(TextAlign::Baseline);
aHRes = aVRes = Fraction( 1, 1 );
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 9776de87e182..6c6428959652 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -562,9 +562,15 @@ void EMFWriter::ImplCheckTextAttr()
switch( rFont.GetAlignment() )
{
- case ALIGN_TOP: nTextAlign = TA_TOP; break;
- case ALIGN_BOTTOM: nTextAlign = TA_BOTTOM; break;
- default: nTextAlign = TA_BASELINE; break;
+ case TextAlign::Top:
+ nTextAlign = TA_TOP;
+ break;
+ case TextAlign::Bottom:
+ nTextAlign = TA_BOTTOM;
+ break;
+ case TextAlign::Baseline:
+ nTextAlign = TA_BASELINE;
+ break;
}
nTextAlign |= mnHorTextAlign;
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 9b3751b9cea9..90e51a4ca93b 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -144,11 +144,11 @@ WMFWriter::WMFWriter()
, nMaxRecordSize(0)
, nActRecordPos(0)
, eSrcRasterOp(RasterOp::OverPaint)
- , eSrcTextAlign(ALIGN_BASELINE)
+ , eSrcTextAlign(TextAlign::Baseline)
, pAttrStack(nullptr)
, eSrcHorTextAlign(W_TA_LEFT)
, eDstROP2(RasterOp::OverPaint)
- , eDstTextAlign(ALIGN_BASELINE)
+ , eDstTextAlign(TextAlign::Baseline)
, eDstHorTextAlign(W_TA_LEFT)
, bHandleAllocated{}
, nDstPenHandle(0)
@@ -740,9 +740,15 @@ void WMFWriter::WMFRecord_SetTextAlign(TextAlign eFontAlign, sal_uInt16 eHorText
sal_uInt16 nAlign;
switch (eFontAlign) {
- case ALIGN_TOP: nAlign=W_TA_TOP; break;
- case ALIGN_BOTTOM: nAlign=W_TA_BOTTOM; break;
- default: nAlign=W_TA_BASELINE;
+ case TextAlign::Top:
+ nAlign=W_TA_TOP;
+ break;
+ case TextAlign::Bottom:
+ nAlign=W_TA_BOTTOM;
+ break;
+ case TextAlign::Baseline:
+ nAlign=W_TA_BASELINE;
+ break;
}
nAlign|=eHorTextAlign;
nAlign|=W_TA_NOUPDATECP;
@@ -1453,7 +1459,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
}
eSrcTextAlign = aSrcFont.GetAlignment();
aSrcTextColor = aSrcFont.GetColor();
- aSrcFont.SetAlignment( ALIGN_BASELINE );
+ aSrcFont.SetAlignment( TextAlign::Baseline );
aSrcFont.SetColor( COL_WHITE );
}
break;
@@ -1770,11 +1776,11 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
vcl::Font aFont;
aFont.SetCharSet( GetExtendedTextEncoding( RTL_TEXTENCODING_MS_1252 ) );
aFont.SetColor( COL_WHITE );
- aFont.SetAlignment( ALIGN_BASELINE );
+ aFont.SetAlignment( TextAlign::Baseline );
aDstFont = aSrcFont = aFont;
CreateSelectDeleteFont(aDstFont);
- eDstTextAlign = eSrcTextAlign = ALIGN_BASELINE;
+ eDstTextAlign = eSrcTextAlign = TextAlign::Baseline;
eDstHorTextAlign = eSrcHorTextAlign = W_TA_LEFT;
WMFRecord_SetTextAlign( eDstTextAlign, eDstHorTextAlign );
generated by cgit (git 2.34.1) at 2024-07-26 22:48:33 +0000