summaryrefslogtreecommitdiff
path: root/include/editeng
diff options
context:
space:
mode:
Diffstat (limited to 'include/editeng')
-rw-r--r--include/editeng/bulletitem.hxx10
-rw-r--r--include/editeng/editeng.hxx8
-rw-r--r--include/editeng/editview.hxx4
-rw-r--r--include/editeng/hangulhanja.hxx4
-rw-r--r--include/editeng/numitem.hxx8
-rw-r--r--include/editeng/outliner.hxx4
-rw-r--r--include/editeng/svxfont.hxx6
-rw-r--r--include/editeng/svxrtf.hxx8
-rw-r--r--include/editeng/swafopt.hxx4
-rw-r--r--include/editeng/unofdesc.hxx4
10 files changed, 30 insertions, 30 deletions
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 1dbb47388ed7..5af465bde828 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -61,7 +61,7 @@
class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
{
- Font aFont;
+ vcl::Font aFont;
GraphicObject* pGraphicObject;
OUString aPrevText;
OUString aFollowText;
@@ -98,7 +98,7 @@ public:
long GetWidth() const { return nWidth; }
sal_uInt16 GetStyle() const { return nStyle; }
sal_uInt8 GetJustification() const { return nJustify; }
- Font GetFont() const { return aFont; }
+ vcl::Font GetFont() const { return aFont; }
sal_uInt16 GetScale() const { return nScale; }
const GraphicObject& GetGraphicObject() const;
@@ -112,7 +112,7 @@ public:
void SetWidth( long nNew ) { nWidth = nNew; }
void SetStyle( sal_uInt16 nNew ) { nStyle = nNew; }
void SetJustification( sal_uInt8 nNew ) { nJustify = nNew; }
- void SetFont( const Font& rNew) { aFont = rNew; }
+ void SetFont( const vcl::Font& rNew) { aFont = rNew; }
void SetScale( sal_uInt16 nNew ) { nScale = nNew; }
virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const SAL_OVERRIDE;
@@ -122,8 +122,8 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
- static void StoreFont( SvStream&, const Font& );
- static Font CreateFont( SvStream&, sal_uInt16 nVer );
+ static void StoreFont( SvStream&, const vcl::Font& );
+ static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer );
sal_uInt16& GetValidMask() { return nValidMask; }
sal_uInt16 GetValidMask() const { return nValidMask; }
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index c9f73e80959c..715d519ec2ae 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -74,7 +74,7 @@ class SvxCharSetColorItem;
class SfxUndoAction;
class MapMode;
class Color;
-class Font;
+namespace vcl { class Font; }
class KeyEvent;
class PolyPolygon;
class Size;
@@ -308,7 +308,7 @@ public:
bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
const SfxPoolItem& GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich );
- Font GetStandardFont( sal_Int32 nPara );
+ vcl::Font GetStandardFont( sal_Int32 nPara );
SvxFont GetStandardSvxFont( sal_Int32 nPara );
void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
@@ -502,9 +502,9 @@ public:
static bool DoesKeyChangeText( const KeyEvent& rKeyEvent );
static bool DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
static bool IsSimpleCharInput( const KeyEvent& rKeyEvent );
- static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont );
+ static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const vcl::Font& rFont );
static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont );
- static Font CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType );
+ static vcl::Font CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType );
static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet );
static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index a6842dd67d3b..62c37d942cca 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -47,7 +47,7 @@ class Range;
class SvStream;
class SvKeyValueIterator;
class SfxStyleSheet;
-class Font;
+namespace vcl { class Font; }
class FontList;
class OutputDevice;
@@ -194,7 +194,7 @@ public:
sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem );
// for text conversion
- void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
+ void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
bool HasConvertibleTextPortion( LanguageType nLang );
void TransliterateText( sal_Int32 nTransliterationMode );
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 8c7c2db50f0a..178e6be93cd8 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -114,7 +114,7 @@ namespace editeng
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::lang::Locale& _rSourceLocale,
const ::com::sun::star::lang::Locale& _rTargetLocale,
- const Font* _pTargetFont,
+ const vcl::Font* _pTargetFont,
sal_Int32 nOptions,
bool _bIsInteractive
);
@@ -126,7 +126,7 @@ namespace editeng
LanguageType GetSourceLanguage() const;
LanguageType GetTargetLanguage() const;
- const Font * GetTargetFont() const;
+ const vcl::Font* GetTargetFont() const;
sal_Int32 GetConversionOptions() const;
bool IsInteractive() const;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 8f6882f3d463..3b24d564736d 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -34,7 +34,7 @@
#include <editeng/editengdllapi.h>
class SvxBrushItem;
-class Font;
+namespace vcl { class Font; }
class Graphic;
class SvxNodeNum;
namespace com{namespace sun{ namespace star{
@@ -147,7 +147,7 @@ private:
sal_Int16 eVertOrient; // vertical alignment of a bitmap
Size aGraphicSize; // Always! in 1/100 mm
- Font* pBulletFont; // Pointer to the bullet font
+ vcl::Font* pBulletFont; // Pointer to the bullet font
OUString sCharStyleName; // Character Style
@@ -177,8 +177,8 @@ public:
void SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; }
virtual OUString GetCharFmtName()const;
- void SetBulletFont(const Font* pFont);
- const Font* GetBulletFont() const {return pBulletFont;}
+ void SetBulletFont(const vcl::Font* pFont);
+ const vcl::Font* GetBulletFont() const {return pBulletFont;}
void SetBulletChar(sal_Unicode cSet){cBullet = cSet;}
sal_Unicode GetBulletChar()const {return cBullet;}
void SetBulletRelSize(sal_uInt16 nSet) {nBulletRelSize = nSet;}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 1b47f6f1ab70..18ac8316d799 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -283,7 +283,7 @@ public:
sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem );
// for text conversion
- void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
+ void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc );
void TransliterateText( sal_Int32 nTransliterationMode );
@@ -633,7 +633,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount );
long ImpCalcMaxBulletWidth( sal_Int32 nPara, const SvxBulletItem& rBullet );
- Font ImpCalcBulletFont( sal_Int32 nPara ) const;
+ vcl::Font ImpCalcBulletFont( sal_Int32 nPara ) const;
Rectangle ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bReturnPaperPos );
long ImpGetTextIndent( sal_Int32 nPara );
bool ImpCanIndentSelectedPages( OutlinerView* pCurView );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index e9487b5ee0c7..51a0c0dcdde6 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -36,7 +36,7 @@ class Point;
class Rectangle;
class Size;
-class EDITENG_DLLPUBLIC SvxFont : public Font
+class EDITENG_DLLPUBLIC SvxFont : public vcl::Font
{
SvxCaseMap eCaseMap; // Text Markup
short nEsc; // Degree of Superscript/Subscript
@@ -45,7 +45,7 @@ class EDITENG_DLLPUBLIC SvxFont : public Font
public:
SvxFont();
- SvxFont( const Font &rFont );
+ SvxFont( const vcl::Font &rFont );
SvxFont( const SvxFont &rFont );
// Methods for Superscript/Subscript
@@ -77,7 +77,7 @@ public:
void DoOnCapitals(SvxDoCapitals &rDo) const;
void SetPhysFont( OutputDevice *pOut ) const;
- Font ChgPhysFont( OutputDevice *pOut ) const;
+ vcl::Font ChgPhysFont( OutputDevice *pOut ) const;
Size GetCapitalSize( const OutputDevice *pOut, const OUString &rTxt,
const sal_Int32 nIdx, const sal_Int32 nLen) const;
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 33a8339c0423..9e516cdc4ad3 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -32,7 +32,7 @@
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-class Font;
+namespace vcl { class Font; }
class Color;
class Graphic;
class DateTime;
@@ -78,7 +78,7 @@ public:
typedef Color* ColorPtr;
typedef std::deque< ColorPtr > SvxRTFColorTbl;
-typedef boost::ptr_map<short, Font> SvxRTFFontTbl;
+typedef boost::ptr_map<short, vcl::Font> SvxRTFFontTbl;
typedef boost::ptr_map<sal_uInt16, SvxRTFStyleType> SvxRTFStyleTbl;
// SvxRTFItemStack can't be "std::stack< SvxRTFItemStackType* >" type, because
@@ -190,7 +190,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
SvxPosition* pInsPos;
SfxItemPool* pAttrPool;
Color* pDfltColor;
- Font* pDfltFont;
+ vcl::Font* pDfltFont;
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> m_xDocProps;
SfxItemSet *pRTFDefaults;
@@ -326,7 +326,7 @@ public:
virtual SvParserState CallParser() SAL_OVERRIDE;
inline const Color& GetColor( size_t nId ) const;
- const Font& GetFont( sal_uInt16 nId ); // Changes the default Font
+ const vcl::Font& GetFont( sal_uInt16 nId ); // Changes the default Font
virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const = 0;
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 25e1017df56a..7bfcb353f3e5 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -61,8 +61,8 @@ public:
// Class of options for AutoFormat
struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
{
- Font aBulletFont;
- Font aByInputBulletFont;
+ vcl::Font aBulletFont;
+ vcl::Font aByInputBulletFont;
/// only valid inside the Dialog!!!
const editeng::SortedAutoCompleteStrings * m_pAutoCompleteList;
SmartTagMgr* pSmartTagMgr;
diff --git a/include/editeng/unofdesc.hxx b/include/editeng/unofdesc.hxx
index 6d644170abbd..79fd8bb36050 100644
--- a/include/editeng/unofdesc.hxx
+++ b/include/editeng/unofdesc.hxx
@@ -29,8 +29,8 @@
class EDITENG_DLLPUBLIC SvxUnoFontDescriptor
{
public:
- static void ConvertToFont( const ::com::sun::star::awt::FontDescriptor& rDesc, Font& rFont );
- static void ConvertFromFont( const Font& rFont, ::com::sun::star::awt::FontDescriptor& rDesc );
+ static void ConvertToFont( const ::com::sun::star::awt::FontDescriptor& rDesc, vcl::Font& rFont );
+ static void ConvertFromFont( const vcl::Font& rFont, ::com::sun::star::awt::FontDescriptor& rDesc );
static void FillItemSet( const ::com::sun::star::awt::FontDescriptor& rDesc, SfxItemSet& rSet );
static void FillFromItemSet( const SfxItemSet& rSet, ::com::sun::star::awt::FontDescriptor& rDesc );
generated by cgit (git 2.34.1) at 2025-03-04 20:31:51 +0000