summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/font.hxx5
-rw-r--r--svx/source/svdraw/svdfmtf.cxx2
-rw-r--r--svx/source/svdraw/svdpdf.cxx2
-rw-r--r--sw/source/core/inc/swfont.hxx8
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx2
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx6
-rw-r--r--vcl/source/font/font.cxx4
-rw-r--r--vcl/source/gdi/svmconverter.cxx2
8 files changed, 15 insertions, 16 deletions
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 3147f57aba14..ddc98c0223b9 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -34,7 +34,6 @@
class Size;
class LanguageTag;
class SvStream;
-#define FontAlign TextAlign
class ImplFont;
class FontAttributes;
@@ -69,7 +68,7 @@ public:
FontPitch GetPitch() const;
FontWidth GetWidthType();
FontWidth GetWidthType() const;
- FontAlign GetAlignment() const;
+ TextAlign GetAlignment() const;
rtl_TextEncoding GetCharSet() const;
bool IsSymbolFont() const;
@@ -82,7 +81,7 @@ public:
void SetItalic( FontItalic );
void SetWeight( FontWeight );
void SetWidthType( FontWidth );
- void SetAlignment( FontAlign );
+ void SetAlignment( TextAlign );
void SetCharSet( rtl_TextEncoding );
void SetSymbolFlag( bool );
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 66d2acc86b9b..de91990ccde8 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1006,7 +1006,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
FontMetric aFontMetric( mpVD->GetFontMetric() );
vcl::Font aFnt( mpVD->GetFont() );
- FontAlign eAlg( aFnt.GetAlignment() );
+ TextAlign eAlg( aFnt.GetAlignment() );
sal_Int32 nTextWidth = static_cast<sal_Int32>( mpVD->GetTextWidth( rStr ) * mfScaleX );
sal_Int32 nTextHeight = static_cast<sal_Int32>( mpVD->GetTextHeight() * mfScaleY );
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 9605a4dfeb42..471aa47375c3 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -790,7 +790,7 @@ void ImpSdrPdfImport::InsertTextObject(const Point& rPos, const Size& rSize, con
FontMetric aFontMetric(mpVD->GetFontMetric());
vcl::Font aFont(mpVD->GetFont());
- FontAlign eAlignment(aFont.GetAlignment());
+ TextAlign eAlignment(aFont.GetAlignment());
// sal_Int32 nTextWidth = static_cast<sal_Int32>(mpVD->GetTextWidth(rStr) * mfScaleX);
sal_Int32 nTextHeight = static_cast<sal_Int32>(mpVD->GetTextHeight() * mfScaleY);
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 59b31a3946a6..a2eedaca5f64 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -86,7 +86,7 @@ class SwSubFont final : public SvxFont
inline void SetFillColor( const Color& rColor );
inline void SetCharSet( const rtl_TextEncoding eCharSet );
inline void SetPitch( const FontPitch ePitch );
- inline void SetAlign( const FontAlign eAlign );
+ inline void SetAlign( const TextAlign eAlign );
inline void SetUnderline( const FontLineStyle eUnderline );
inline void SetOverline( const FontLineStyle eOverline );
inline void SetStrikeout( const FontStrikeout eStrikeout );
@@ -209,7 +209,7 @@ public:
// the encapsulated SV-Font-methods (set bFntChg to true)
inline void SetColor( const Color& rColor );
inline void SetFillColor( const Color& rColor );
- inline void SetAlign( const FontAlign eAlign );
+ inline void SetAlign( const TextAlign eAlign );
inline void SetUnderline( const FontLineStyle eUnderline );
void SetUnderColor( const Color &rColor ) { m_aUnderColor = rColor; }
inline void SetOverline( const FontLineStyle eOverline );
@@ -505,13 +505,13 @@ inline void SwFont::SetPitch( const FontPitch ePitch, const SwFontScript nWhich
}
// encapsulated SV-Font-method
-inline void SwSubFont::SetAlign( const FontAlign eAlign )
+inline void SwSubFont::SetAlign( const TextAlign eAlign )
{
m_nFontCacheId = nullptr;
Font::SetAlignment( eAlign );
}
-inline void SwFont::SetAlign( const FontAlign eAlign )
+inline void SwFont::SetAlign( const TextAlign eAlign )
{
m_bFontChg = true;
m_aSub[SwFontScript::Latin].SetAlign( eAlign );
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 2fa1a0839d38..9b3751b9cea9 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -735,7 +735,7 @@ void WMFWriter::WMFRecord_SetROP2(RasterOp eROP)
pWMF->WriteUInt16( nROP2 );
}
-void WMFWriter::WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt16 eHorTextAlign)
+void WMFWriter::WMFRecord_SetTextAlign(TextAlign eFontAlign, sal_uInt16 eHorTextAlign)
{
sal_uInt16 nAlign;
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 725872aa97dd..36239dd73ae8 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -73,7 +73,7 @@ private:
Color aSrcTextColor;
LineInfo aSrcLineInfo;
RasterOp eSrcRasterOp;
- FontAlign eSrcTextAlign;
+ TextAlign eSrcTextAlign;
vcl::Font aSrcFont;
MapMode aSrcMapMode;
vcl::Region aSrcClipRegion;
@@ -87,7 +87,7 @@ private:
Color aDstTextColor;
LineInfo aDstLineInfo;
RasterOp eDstROP2;
- FontAlign eDstTextAlign;
+ TextAlign eDstTextAlign;
vcl::Font aDstFont;
sal_uInt16 eDstHorTextAlign;
@@ -163,7 +163,7 @@ private:
void WMFRecord_SetStretchBltMode();
void WMFRecord_SetPixel(const Point & rPoint, const Color & rColor);
void WMFRecord_SetROP2(RasterOp eROP);
- void WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt16 eHorTextAlign);
+ void WMFRecord_SetTextAlign(TextAlign eFontAlign, sal_uInt16 eHorTextAlign);
void WMFRecord_SetTextColor(const Color & rColor);
void WMFRecord_SetWindowExt(const Size & rSize);
void WMFRecord_SetWindowOrg(const Point & rPoint);
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 5da80236aec5..cc5042fc9506 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -108,7 +108,7 @@ void Font::SetTransparent( bool bTransparent )
mpImplFont->mbTransparent = bTransparent;
}
-void Font::SetAlignment( FontAlign eAlign )
+void Font::SetAlignment( TextAlign eAlign )
{
if (const_cast<const ImplType&>(mpImplFont)->meAlign != eAlign)
mpImplFont->SetAlignment(eAlign);
@@ -824,7 +824,7 @@ const Color& Font::GetColor() const { return mpImplFont->maColor; }
const Color& Font::GetFillColor() const { return mpImplFont->maFillColor; }
bool Font::IsTransparent() const { return mpImplFont->mbTransparent; }
-FontAlign Font::GetAlignment() const { return mpImplFont->GetAlignment(); }
+TextAlign Font::GetAlignment() const { return mpImplFont->GetAlignment(); }
const OUString& Font::GetFamilyName() const { return mpImplFont->GetFamilyName(); }
const OUString& Font::GetStyleName() const { return mpImplFont->maStyleName; }
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 75f9482b1208..5da460b8174f 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -649,7 +649,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
aFont.SetCharSet( static_cast<rtl_TextEncoding>(nCharSet) );
aFont.SetFamily( static_cast<FontFamily>(nFamily) );
aFont.SetPitch( static_cast<FontPitch>(nPitch) );
- aFont.SetAlignment( static_cast<FontAlign>(nAlign) );
+ aFont.SetAlignment( static_cast<TextAlign>(nAlign) );
aFont.SetWeight( ( nWeight == 1 ) ? WEIGHT_LIGHT : ( nWeight == 2 ) ? WEIGHT_NORMAL :
( nWeight == 3 ) ? WEIGHT_BOLD : WEIGHT_DONTKNOW );
aFont.SetUnderline( static_cast<FontLineStyle>(nUnderline) );
generated by cgit (git 2.34.1) at 2025-02-15 02:25:09 +0000