diff options
Diffstat (limited to 'sw/source')
64 files changed, 152 insertions, 152 deletions
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 1dae48015cb1..2cc04cc5612b 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -117,7 +117,7 @@ namespace { sal_uInt16 nLng = ((SvxLanguageItem&)rSet.GetPool()->GetDefaultItem( aArr[n].nResLngId )).GetLanguage(); - Font aFnt( OutputDevice::GetDefaultFont( nFntType, + vcl::Font aFnt( OutputDevice::GetDefaultFont( nFntType, nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), @@ -146,7 +146,7 @@ namespace { sal_uInt16 nLng = ((SvxLanguageItem&)rSet.GetPool()->GetDefaultItem( aArr[n].nResLngId )).GetLanguage(); - Font aFnt( OutputDevice::GetDefaultFont( aArr[n].nFntType, + vcl::Font aFnt( OutputDevice::GetDefaultFont( aArr[n].nFntType, nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), @@ -441,7 +441,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool if( LANGUAGE_DONTKNOW == nLng ) nLng = *(pArr+3); - Font aFnt( OutputDevice::GetDefaultFont( *pArr, + vcl::Font aFnt( OutputDevice::GetDefaultFont( *pArr, nLng, DEFAULTFONT_FLAGS_ONLYONE ) ); aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), @@ -1171,7 +1171,7 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId ) case RES_POOLCHR_BUL_LEVEL: // Bullet character { - const Font& rBulletFont = numfunc::GetDefBulletFont(); + const vcl::Font& rBulletFont = numfunc::GetDefBulletFont(); SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamily(), rBulletFont.GetName(), rBulletFont.GetStyleName(), rBulletFont.GetPitch(), rBulletFont.GetCharSet(), RES_CHRATR_FONT )); diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 82d653a25006..4045abfa8fff 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -97,10 +97,10 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText, const SwViewShell &rSh, const SwNoTxtFrm *pFrm, bool bDefect ) { - static Font *pFont = 0; + static vcl::Font *pFont = 0; if ( !pFont ) { - pFont = new Font(); + pFont = new vcl::Font(); pFont->SetWeight( WEIGHT_BOLD ); pFont->SetStyleName( OUString() ); pFont->SetName(OUString("Arial Unicode")); diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 0b0ccc7c7291..fce040d6ca9c 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1074,7 +1074,7 @@ namespace numfunc return mbUserDefinedFontname; } - inline const Font& GetFont() const + inline const vcl::Font& GetFont() const { return *mpFont; } @@ -1118,7 +1118,7 @@ namespace numfunc sal_Unicode mnLevelChars[MAXLEVEL]; // default bullet list font instance - Font* mpFont; + vcl::Font* mpFont; }; namespace @@ -1256,7 +1256,7 @@ namespace numfunc { delete mpFont; - mpFont = new Font( msFontname, OUString(), Size( 0, 14 ) ); + mpFont = new vcl::Font( msFontname, OUString(), Size( 0, 14 ) ); mpFont->SetWeight( meFontWeight ); mpFont->SetItalic( meFontItalic ); mpFont->SetCharSet( RTL_TEXTENCODING_SYMBOL ); @@ -1283,7 +1283,7 @@ namespace numfunc return SwDefBulletConfig::getInstance().IsFontnameUserDefined(); } - const Font& GetDefBulletFont() + const vcl::Font& GetDefBulletFont() { return SwDefBulletConfig::getInstance().GetFont(); } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index c1088a245897..c3542b9b0c51 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1410,7 +1410,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) { int nBulletPos = pFndBulletChr - pBulletChar; sal_Unicode cBullChar; - const Font* pBullFnt( 0 ); + const vcl::Font* pBullFnt( 0 ); if( nBulletPos < cnPosEnDash ) { cBullChar = m_aFlags.cBullet; diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index db58a47571dd..0e300929aa05 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -31,7 +31,7 @@ class Point; class SwWrongList; class Size; class SwFont; -class Font; +namespace vcl { class Font; } class SwUnderlineFont; // encapsulates information for drawing text @@ -607,7 +607,7 @@ public: // sets a new color at the output device if necessary if a font is passed // as argument, the change if made to the font otherwise the font at the // output device is changed returns if the font has been changed - bool ApplyAutoColor( Font* pFnt = 0 ); + bool ApplyAutoColor( vcl::Font* pFnt = 0 ); }; #endif diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 10a7112320b3..8a1c812cb9dd 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -61,9 +61,9 @@ class SwFntObj : public SwCacheObj friend void _InitCore(); friend void _FinitCore(); - Font aFont; - Font *pScrFont; - Font *pPrtFont; + vcl::Font aFont; + vcl::Font *pScrFont; + vcl::Font *pPrtFont; OutputDevice* pPrinter; sal_uInt16 nGuessedLeading; sal_uInt16 nExtLeading; @@ -92,9 +92,9 @@ public: virtual ~SwFntObj(); - inline Font *GetScrFont() { return pScrFont; } - inline Font& GetFont() { return aFont; } - inline const Font& GetFont() const { return aFont; } + inline vcl::Font *GetScrFont() { return pScrFont; } + inline vcl::Font& GetFont() { return aFont; } + inline const vcl::Font& GetFont() const { return aFont; } inline sal_uInt16 GetGuessedLeading() const { return nGuessedLeading; } inline sal_uInt16 GetExtLeading() const { return nExtLeading; } diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 4469bd72cb98..b0c4a3dc0eb6 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -32,7 +32,7 @@ class SwCntntFrm; struct SwPosition; struct SwCrsrMoveState; class SwAttrSetChg; -class Font; +namespace vcl { class Font; } class SwSortedObjs; class SwAnchoredObject; @@ -327,7 +327,7 @@ public: bool IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rControl ) const; // return font used to paint the "empty page" string - static const Font& GetEmptyPageFont(); + static const vcl::Font& GetEmptyPageFont(); static SwTwips GetSidebarBorderWidth( const SwViewShell* ); }; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4196995663a0..ec6189ba5560 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2240,7 +2240,7 @@ void DrawGraphic( if( bReplaceGrfNum ) { const BitmapEx& rBmp = SwViewShell::GetReplacementBitmap( false ); - Font aTmp( pOutDev->GetFont() ); + vcl::Font aTmp( pOutDev->GetFont() ); Graphic::DrawEx( pOutDev, aEmptyOUStr, aTmp, rBmp, rOrg.Pos(), rOrg.SSize() ); } } @@ -3413,8 +3413,8 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c pSh->GetOut()->DrawRect( aEmptyPageRect.SVRect() ); // paint empty page text - const Font& rEmptyPageFont = SwPageFrm::GetEmptyPageFont(); - const Font aOldFont( pSh->GetOut()->GetFont() ); + const vcl::Font& rEmptyPageFont = SwPageFrm::GetEmptyPageFont(); + const vcl::Font aOldFont( pSh->GetOut()->GetFont() ); pSh->GetOut()->SetFont( rEmptyPageFont ); pSh->GetOut()->DrawText( aEmptyPageRect.SVRect(), SW_RESSTR( STR_EMPTYPAGE ), @@ -3767,7 +3767,7 @@ void SwColumnFrm::PaintBreak( ) const basegfx::B2DVector aFontSize; OutputDevice* pOut = pGlobalShell->GetOut(); - Font aFont = pOut->GetSettings().GetStyleSettings().GetToolFont(); + vcl::Font aFont = pOut->GetSettings().GetStyleSettings().GetToolFont(); aFont.SetHeight( 8 * 20 ); pOut->SetFont( aFont ); drawinglayer::attribute::FontAttribute aFontAttr = drawinglayer::primitive2d::getFontAttributeFromVclFont( @@ -7264,12 +7264,12 @@ const Color SwPageFrm::GetDrawBackgrdColor() const } /// create/return font used to paint the "empty page" string -const Font& SwPageFrm::GetEmptyPageFont() +const vcl::Font& SwPageFrm::GetEmptyPageFont() { - static Font* pEmptyPgFont = 0; + static vcl::Font* pEmptyPgFont = 0; if ( 0 == pEmptyPgFont ) { - pEmptyPgFont = new Font; + pEmptyPgFont = new vcl::Font; pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt pEmptyPgFont->SetWeight( WEIGHT_BOLD ); pEmptyPgFont->SetStyleName( aEmptyOUStr ); diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 2307627a7c6d..32a43b8cb505 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -32,7 +32,7 @@ #include "ndtxt.hxx" #include <editeng/paravertalignitem.hxx> -class Font; +namespace vcl { class Font; } class OutputDevice; class SvxBrushItem; class SvxLineSpacingItem; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 6866cada566d..1cd6a83fd9b1 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -965,7 +965,7 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf ) CalcAscent( rInf, pPor ); const SwFont* pTmpFnt = rInf.GetFont(); - sal_Int32 nExpect = std::min( sal_Int32( ((Font *)pTmpFnt)->GetSize().Height() ), + sal_Int32 nExpect = std::min( sal_Int32( ((vcl::Font *)pTmpFnt)->GetSize().Height() ), sal_Int32( pPor->GetAscent() ) ) / 8; if ( !nExpect ) nExpect = 1; diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 27e713aa6a9d..af6417b4c762 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -736,7 +736,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) #endif bool bWinUsed = false; - Font aOldFnt; + vcl::Font aOldFnt; MapMode aOldMap( MAP_TWIP ); OutputDevice* pOut = rInf.GetOut(); OutputDevice* pWin; diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index c8d7fbda5572..b42397e9feea 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -485,7 +485,7 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const if( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() ) { - const Font *pFmtFnt = rNumFmt.GetBulletFont(); + const vcl::Font *pFmtFnt = rNumFmt.GetBulletFont(); // Build a new bullet font basing on the current paragraph font: diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index fc7aeb00bece..d2951ff0958f 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2238,7 +2238,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) } else { - Font aOldFont = pOut->GetFont(); + vcl::Font aOldFont = pOut->GetFont(); aFont.SetFntChg( true ); aFont.ChgPhysFnt( pVsh, *pOut ); mnHeightOfLastLine = aFont.GetHeight( pVsh, *pOut ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 78366095a735..0e88feb0f1ce 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -143,7 +143,7 @@ void SwFntObj::CreatePrtFont( const OutputDevice& rPrt ) if( pPrtFont != &aFont ) delete pPrtFont; - const Font aOldFnt( rPrt.GetFont() ); + const vcl::Font aOldFnt( rPrt.GetFont() ); ((OutputDevice&)rPrt).SetFont( aFont ); const FontMetric aWinMet( rPrt.GetFontMetric() ); ((OutputDevice&)rPrt).SetFont( aOldFnt ); @@ -151,7 +151,7 @@ void SwFntObj::CreatePrtFont( const OutputDevice& rPrt ) if( !nWidth ) ++nWidth; - pPrtFont = new Font( aFont ); + pPrtFont = new vcl::Font( aFont ); pPrtFont->SetSize( Size( nWidth, aFont.GetSize().Height() ) ); pScrFont = NULL; } @@ -179,7 +179,7 @@ static bool lcl_IsFontAdjustNecessary( const OutputDevice& rOutDev, struct CalcLinePosData { SwDrawTextInfo& rInf; - Font& rFont; + vcl::Font& rFont; sal_Int32 nCnt; const bool bSwitchH2V; const bool bSwitchL2R; @@ -187,7 +187,7 @@ struct CalcLinePosData long* pKernArray; const bool bBidiPor; - CalcLinePosData( SwDrawTextInfo& _rInf, Font& _rFont, + CalcLinePosData( SwDrawTextInfo& _rInf, vcl::Font& _rFont, sal_Int32 _nCnt, const bool _bSwitchH2V, const bool _bSwitchL2R, long _nHalfSpace, long* _pKernArray, const bool _bBidiPor) : rInf( _rInf ), @@ -282,7 +282,7 @@ sal_uInt16 SwFntObj::GetFontAscent( const SwViewShell *pSh, const OutputDevice& if (nPrtAscent == USHRT_MAX) // printer ascent unknown? { CreatePrtFont( rOut ); - const Font aOldFnt( rRefDev.GetFont() ); + const vcl::Font aOldFnt( rRefDev.GetFont() ); ((OutputDevice&)rRefDev).SetFont( *pPrtFont ); const FontMetric aOutMet( rRefDev.GetFontMetric() ); nPrtAscent = (sal_uInt16) aOutMet.GetAscent(); @@ -319,7 +319,7 @@ sal_uInt16 SwFntObj::GetFontHeight( const SwViewShell* pSh, const OutputDevice& if (nPrtHeight == USHRT_MAX) // printer height unknown? { CreatePrtFont( rOut ); - const Font aOldFnt( rRefDev.GetFont() ); + const vcl::Font aOldFnt( rRefDev.GetFont() ); ((OutputDevice&)rRefDev).SetFont( *pPrtFont ); nPrtHeight = static_cast<sal_uInt16>(rRefDev.GetTextHeight()); @@ -353,7 +353,7 @@ sal_uInt16 SwFntObj::GetFontLeading( const SwViewShell *pSh, const OutputDevice& { SolarMutexGuard aGuard; - const Font aOldFnt( rOut.GetFont() ); + const vcl::Font aOldFnt( rOut.GetFont() ); ((OutputDevice&)rOut).SetFont( *pPrtFont ); const FontMetric aMet( rOut.GetFontMetric() ); ((OutputDevice&)rOut).SetFont( aOldFnt ); @@ -404,7 +404,7 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) OutputDevice* pOut = (OutputDevice*)&rOut; // Save old font - Font aOldOutFont( pOut->GetFont() ); + vcl::Font aOldOutFont( pOut->GetFont() ); nScrHeight = USHRT_MAX; @@ -421,7 +421,7 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) pPrinter = pPrt; // save old reference device font - Font aOldPrtFnt( pPrt->GetFont() ); + vcl::Font aOldPrtFnt( pPrt->GetFont() ); // set the font used at the reference device at the reference device // and the output device @@ -511,7 +511,7 @@ void SwFntObj::GuessLeading( const SwViewShell& MapMode aTmpMap( MAP_TWIP ); MapMode aOldMap = pWin->GetMapMode( ); pWin->SetMapMode( aTmpMap ); - const Font aOldFnt( pWin->GetFont() ); + const vcl::Font aOldFnt( pWin->GetFont() ); pWin->SetFont( *pPrtFont ); const FontMetric aWinMet( pWin->GetFontMetric() ); const sal_uInt16 nWinHeight = sal_uInt16( aWinMet.GetSize().Height() ); @@ -775,7 +775,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) const bool bUseScrFont = lcl_IsFontAdjustNecessary( rInf.GetOut(), rRefDev ); - Font* pTmpFont = bUseScrFont ? pScrFont : pPrtFont; + vcl::Font* pTmpFont = bUseScrFont ? pScrFont : pPrtFont; // bDirectPrint and bUseScrFont should have these values: @@ -2215,7 +2215,7 @@ SwFntAccess::SwFntAccess( const void* &rMagic, // Search by font comparison, quite expensive! // Look for same font and same printer pFntObj = pFntCache->First(); - while ( pFntObj && !( pFntObj->aFont == *(Font *)pOwn && + while ( pFntObj && !( pFntObj->aFont == *(vcl::Font *)pOwn && pFntObj->GetZoom() == nZoom && pFntObj->GetPropWidth() == ((SwSubFont*)pOwn)->GetPropWidth() && @@ -2227,7 +2227,7 @@ SwFntAccess::SwFntAccess( const void* &rMagic, // found one without printer, let's see if there is one with // the same printer as well SwFntObj *pTmpObj = pFntObj; - while( pTmpObj && !( pTmpObj->aFont == *(Font *)pOwn && + while( pTmpObj && !( pTmpObj->aFont == *(vcl::Font *)pOwn && pTmpObj->GetZoom()==nZoom && pTmpObj->pPrinter==pOut && pTmpObj->GetPropWidth() == ((SwSubFont*)pOwn)->GetPropWidth() ) ) @@ -2463,9 +2463,9 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth ) extern Color aGlobalRetoucheColor; -bool SwDrawTextInfo::ApplyAutoColor( Font* pFont ) +bool SwDrawTextInfo::ApplyAutoColor( vcl::Font* pFont ) { - const Font& rFnt = pFont ? *pFont : GetOut().GetFont(); + const vcl::Font& rFnt = pFont ? *pFont : GetOut().GetFont(); bool bPrt = GetShell() && ! GetShell()->GetWin(); ColorData nNewColor = COL_BLACK; bool bChgFntColor = false; @@ -2565,7 +2565,7 @@ bool SwDrawTextInfo::ApplyAutoColor( Font* pFont ) else if ( aNewColor != GetOut().GetFont().GetColor() ) { // set new font with new color at output device - Font aFont( rFnt ); + vcl::Font aFont( rFnt ); aFont.SetColor( aNewColor ); GetOut().SetFont( aFont ); } diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index e38abb92a43c..24afd66d7d7c 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1541,7 +1541,7 @@ long AttrSetToLineHeight( const IDocumentSettingAccess& rIDocumentSettingAccess, aFont.SetActual(nActual); OutputDevice &rMutableOut = const_cast<OutputDevice &>(rOut); - const Font aOldFont(rMutableOut.GetFont()); + const vcl::Font aOldFont(rMutableOut.GetFont()); rMutableOut.SetFont(aFont.GetActualFont()); long nHeight = rMutableOut.GetTextHeight(); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 4788055aa38e..c0832459cd9f 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1056,7 +1056,7 @@ bool SwTxtNode::Spell(SwSpellArgs* pArgs) void SwTxtNode::SetLanguageAndFont( const SwPaM &rPaM, LanguageType nLang, sal_uInt16 nLangWhichId, - const Font *pFont, sal_uInt16 nFontWhichId ) + const vcl::Font *pFont, sal_uInt16 nFontWhichId ) { sal_uInt16 aRanges[] = { nLangWhichId, nLangWhichId, diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 75203aa24cb9..b4ef13186791 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -827,7 +827,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam) vcl::FontInfo aInfo = pList->Get( pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE); - Font aFont(aInfo); + vcl::Font aFont(aInfo); aFmt.SetBulletFont(&aFont); } aRule.Set( i, aFmt ); diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index ca92aaab3d3c..0b63cef133b1 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1461,7 +1461,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( pData = new PropValData((void*)&nINT16, "BulletId", ::cppu::UnoType<sal_Int16>::get()); aPropertyValues.push_back(pData); - const Font* pFont = rFmt.GetBulletFont(); + const vcl::Font* pFont = rFmt.GetBulletFont(); //BulletChar aUString = OUString(rFmt.GetBulletChar()); @@ -1921,7 +1921,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( // do not accept "empty" font if ( !pDesc->Name.isEmpty() ) { - Font aFont; + vcl::Font aFont; SvxUnoFontDescriptor::ConvertToFont( *pDesc, aFont ); aFmt.SetBulletFont(&aFont); } @@ -1944,7 +1944,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( const FontList* pList = pFontListItem->GetFontList(); vcl::FontInfo aInfo = pList->Get( sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE); - Font aFont(aInfo); + vcl::Font aFont(aInfo); aFmt.SetBulletFont(&aFont); } else diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 705911d53b05..6a719c6c907c 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1881,7 +1881,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const FontList* pList = pFontListItem->GetFontList(); vcl::FontInfo aInfo = pList->Get( pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE); - Font aFont(aInfo); + vcl::Font aFont(aInfo); aFmt.SetBulletFont(&aFont); } aSetRule.Set( i, &aFmt ); diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 94e98d1aa57a..65e70589d036 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -1048,7 +1048,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const MapMode aMapMode( pOutputDev->GetMapMode() ); MapMode aSavedMapMode = aMapMode; - const Font& rEmptyPgFont = SwPageFrm::GetEmptyPageFont(); + const vcl::Font& rEmptyPgFont = SwPageFrm::GetEmptyPageFont(); for ( std::vector<PreviewPage*>::const_iterator aPageIter = maPreviewPages.begin(); aPageIter != maPreviewPages.end(); @@ -1078,7 +1078,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const pOutputDev->DrawRect( aPageRect ); // paint empty page text - Font aOldFont( pOutputDev->GetFont() ); + vcl::Font aOldFont( pOutputDev->GetFont() ); pOutputDev->SetFont( rEmptyPgFont ); pOutputDev->DrawText( aPageRect, SW_RESSTR( STR_EMPTYPAGE ), TEXT_DRAW_VCENTER | diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 43ae47367356..4ee7141d8440 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -113,7 +113,7 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, } if( !rOpt.GetFontName().isEmpty() ) { - Font aTextFont( rOpt.GetFontName(), Size( 0, 10 ) ); + vcl::Font aTextFont( rOpt.GetFontName(), Size( 0, 10 ) ); if( pDoc->getIDocumentDeviceAccess().getPrinter( false ) ) aTextFont = pDoc->getIDocumentDeviceAccess().getPrinter( false )->GetFontMetric( aTextFont ); SvxFontItem aFont( aTextFont.GetFamily(), aTextFont.GetName(), diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 24b17f0298d5..e198c739bbf6 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -608,7 +608,7 @@ void SwHTMLParser::DeleteFormImpl() static void lcl_html_setFixedFontProperty( const uno::Reference< beans::XPropertySet >& rPropSet ) { - Font aFixedFont( OutputDevice::GetDefaultFont( + vcl::Font aFixedFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ) ); Any aTmp; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index ad1c8ae074fa..47d6f1793c62 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1086,7 +1086,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() && !((OUString*)aTmp.getValue())->isEmpty() ) { - Font aFixedFont( OutputDevice::GetDefaultFont( + vcl::Font aFixedFont( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ) ); OUString aFName( *(OUString*)aTmp.getValue() ); diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index a85db796b131..700d18b193fb 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -310,8 +310,8 @@ void Writer::PutNumFmtFontsInAttrPool() const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl(); const SwNumRule* pRule; const SwNumFmt* pFmt; - const Font* pFont; - const Font* pDefFont = &numfunc::GetDefBulletFont(); + const vcl::Font* pFont; + const vcl::Font* pDefFont = &numfunc::GetDefBulletFont(); bool bCheck = false; for( sal_uInt16 nGet = rListTbl.size(); nGet; ) diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 0f1896284b9f..6b38e79c051d 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -365,7 +365,7 @@ void MSWordExportBase::AbstractNumberingDefinitions() OUString sNumStr; OUString sFontName; bool bWriteBullet = false; - const Font* pBulletFont=0; + const vcl::Font* pBulletFont=0; rtl_TextEncoding eChrSet=0; FontFamily eFamily=FAMILY_DECORATIVE; if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() || @@ -631,7 +631,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh, if (1 < rCharLen) { - const Font& rFont = rFmt.GetBulletFont() + const vcl::Font& rFont = rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : numfunc::GetDefBulletFont(); OUString sNumStr = OUString(rFmt.GetBulletChar()); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 41407d2afd9b..2ec213d99695 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -930,7 +930,7 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc) } } -sal_uInt16 wwFontHelper::GetId(const Font& rFont) +sal_uInt16 wwFontHelper::GetId(const vcl::Font& rFont) { wwFont aFont(rFont.GetName(), rFont.GetPitch(), rFont.GetFamily(), rFont.GetCharSet(), mbWrtWW8); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index a1621ac12946..3d44e4ca973a 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -58,7 +58,7 @@ class RtfAttributeOutput; class BitmapPalette; class SwEscherEx; class DateTime; -class Font; +namespace vcl { class Font; } class MSWordExportBase; class SdrObject; class SfxItemSet; @@ -322,7 +322,7 @@ public: wwFontHelper() : mbWrtWW8(false), bLoadAllFonts(false) {} /// rDoc used only to get the initial standard font(s) in use. void InitFontTable(bool bWrtWW8, const SwDoc& rDoc); - sal_uInt16 GetId(const Font& rFont); + sal_uInt16 GetId(const vcl::Font& rFont); sal_uInt16 GetId(const SvxFontItem& rFont); sal_uInt16 GetId(const wwFont& rFont); void WriteFontTable( SvStream *pTableStream, WW8Fib& pFib ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 552104f2c5d1..d6e75319ff3d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5342,7 +5342,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) { Graphic aGraphic = vecBulletGrf[nGrfBulletCP]->GetGrf(); SvxBrushItem aBrush(aGraphic, GPOS_AREA, SID_ATTR_BRUSH); - Font aFont = numfunc::GetDefBulletFont(); + vcl::Font aFont = numfunc::GetDefBulletFont(); int nHeight = aFont.GetHeight() * 12; Size aPrefSize( aGraphic.GetPrefSize()); if (aPrefSize.Height() * aPrefSize.Width() != 0 ) diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 90d7add71af3..5c9487633109 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -647,7 +647,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV, if( GetFontParams( SVBT16ToShort( rAV.ftc ), eFamily, aName, ePitch, eCharSet ) ){ - Font aFont; + vcl::Font aFont; aFont.SetName( aName ); aFont.SetFamily( eFamily ); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index c81eb9c57cb1..f2fd82ff963d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1043,7 +1043,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() ) { SwCharFmt* pFmt = aNumFmt.GetCharFmt(); - Font aFont; + vcl::Font aFont; if( !pFmt ) { aFont = numfunc::GetDefBulletFont(); @@ -2252,7 +2252,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, { 0, 0 } }; - Font aFont; + vcl::Font aFont; uno::Reference< beans::XPropertySetInfo > xPropSetInfo = rPropSet->getPropertySetInfo(); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index cb3bbe40050f..8a6b14a84a26 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -95,7 +95,7 @@ class SwDropCapsPict : public Control Size CalcTextSize( void ); inline void InitPrinter( void ); void _InitPrinter( void ); - void GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, sal_uInt16 _nWhich ); + void GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich ); void GetFirstScriptSegment(sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType); bool GetNextScriptSegment(size_t &nIdx, sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType); @@ -188,7 +188,7 @@ OUString GetDefaultString(sal_uInt16 nChars) return aStr; } -static void calcFontHeightAnyAscent( OutputDevice* _pWin, Font& _rFont, long& _nHeight, long& _nAscent ) +static void calcFontHeightAnyAscent( OutputDevice* _pWin, vcl::Font& _rFont, long& _nHeight, long& _nAscent ) { if ( !_nHeight ) { @@ -243,7 +243,7 @@ bool SwDropCapsPict::GetNextScriptSegment(size_t &nIdx, sal_Int32 &start, sal_In #define LINES 10 #define BORDER 2 -void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, Font& _rFont, sal_uInt16 _nWhich ) +void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich ) { SfxItemSet aSet( _rPage.rSh.GetAttrPool(), _nWhich, _nWhich); _rPage.rSh.GetCurAttr(aSet); @@ -264,7 +264,7 @@ void SwDropCapsPict::UpdatePaintSettings( void ) mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES; mnLineH = mnTotLineH - 2; - Font aFont; + vcl::Font aFont; if (mpPage) { if (!mpPage->m_pTemplateBox->GetSelectEntryPos()) @@ -380,7 +380,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt ) Point aPt(rPt); InitPrinter(); - Font aOldFont = mpPrinter->GetFont(); + vcl::Font aOldFont = mpPrinter->GetFont(); sal_uInt16 nScript; size_t nIdx = 0; sal_Int32 nStart; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 4444efccbdb5..564ed0aeab88 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -382,7 +382,7 @@ void SwCaptionPreview::Init() SetFillColor( aBack.GetColor() ); SetLineColor( aBack.GetColor() ); SetBorderStyle( WINDOW_BORDER_MONO ); - Font aFont(GetFont()); + vcl::Font aFont(GetFont()); aFont.SetHeight(aFont.GetHeight() * 120 / 100 ); SetFont(aFont); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index b642e6a5228f..5507ebf11137 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -597,7 +597,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, SfxPrinter* pPrt, const OUString& rStyle, sal_uInt16 nFontWhich) { - Font aFont( rStyle, Size( 0, 10 ) ); + vcl::Font aFont( rStyle, Size( 0, 10 ) ); if( pPrt ) aFont = pPrt->GetFontMetric( aFont ); SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType); @@ -676,7 +676,7 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) FONT_GROUP_CJK == nFontGroup ? RES_CHRATR_CJK_FONTSIZE : RES_CHRATR_CTL_FONTSIZE); if(sStandard != sShellStd) { - Font aFont( sStandard, Size( 0, 10 ) ); + vcl::Font aFont( sStandard, Size( 0, 10 ) ); if( pPrinter ) aFont = pPrinter->GetFontMetric( aFont ); pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(), aFont.GetName(), @@ -2169,11 +2169,11 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) SvxFont& rCJKFont = rExampleWin.GetCJKFont(); SvxFont& rCTLFont = rExampleWin.GetCTLFont(); - Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, + vcl::Font aFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, + vcl::Font aCJKFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); - Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, + vcl::Font aCTLFont( OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, eLangType, DEFAULTFONT_FLAGS_ONLYONE, &rExampleWin ) ); const Size aDefSize( 0, 12 ); aFont.SetSize( aDefSize ); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 2e18bf360a19..5c498d4f1b3f 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -204,7 +204,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, if( aOpt.GetFontName().isEmpty() ) { LanguageType eLang = aOpt.GetLanguage(); - Font aTmpFont(OutputDevice::GetDefaultFont(DEFAULTFONT_FIXED, eLang, DEFAULTFONT_FLAGS_ONLYONE, pPrt)); + vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DEFAULTFONT_FIXED, eLang, DEFAULTFONT_FLAGS_ONLYONE, pPrt)); aOpt.SetFontName(aTmpFont.GetName()); } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index dda067144928..94d61202645a 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -62,7 +62,7 @@ SwLabPreview::SwLabPreview(Window* pParent) const Color& rWinColor = rStyleSettings.GetWindowColor(); SetBackground(Wallpaper(rWinColor)); - Font aFont = GetFont(); + vcl::Font aFont = GetFont(); aFont.SetTransparent(true); aFont.SetWeight (WEIGHT_NORMAL); SetFont(aFont); @@ -106,7 +106,7 @@ void SwLabPreview::Paint(const Rectangle &) const Color& rWinColor = rStyleSettings.GetWindowColor(); const Color& rFieldTextColor = SwViewOption::GetFontColor(); - Font aFont = GetFont(); + vcl::Font aFont = GetFont(); aFont.SetFillColor( rWinColor ); aFont.SetColor(rFieldTextColor); SetFont(aFont); @@ -115,7 +115,7 @@ void SwLabPreview::Paint(const Rectangle &) SetLineColor(rWinColor); SetFillColor(aGrayColor); - Font aPaintFont(GetFont()); + vcl::Font aPaintFont(GetFont()); aPaintFont.SetTransparent(false); SetFont(aPaintFont); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 958748a9051f..df9f54a66968 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -46,7 +46,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, get(m_pNextBT, "next"); get(m_pOKBT, "ok"); // switch font for Edit - Font aFont(m_pEditED->GetFont()); + vcl::Font aFont(m_pEditED->GetFont()); aFont.SetWeight(WEIGHT_LIGHT); m_pEditED->SetFont(aFont); diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index c9f5bc90a174..5a2c8891a7fb 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -69,7 +69,7 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : m_pEditRB->SetClickHdl(aLk); m_pUrlPB->SetClickHdl(LINK(this, SwJavaEditDialog, InsertFileHdl)); - Font aFont( m_pEditED->GetFont() ); + vcl::Font aFont( m_pEditED->GetFont() ); aFont.SetWeight( WEIGHT_LIGHT ); m_pEditED->SetFont( aFont ); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index c96807725bff..9e9dd470d5b2 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -133,7 +133,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) { m_aFontName = pFontItem->GetFamilyName(); eCharSet = pFontItem->GetCharSet(); - Font aFont( m_aFontName, pFontItem->GetStyleName(), m_pNumberCharEdit->GetFont().GetSize() ); + vcl::Font aFont( m_aFontName, pFontItem->GetStyleName(), m_pNumberCharEdit->GetFont().GetSize() ); aFont.SetCharSet( pFontItem->GetCharSet() ); aFont.SetPitch( pFontItem->GetPitch() ); m_pNumberCharEdit->SetFont( aFont ); @@ -214,7 +214,7 @@ void SwInsFootNoteDlg::Init() { SwFmtFtn aFtnNote; OUString sNumStr; - Font aFont; + vcl::Font aFont; bExtCharAvailable = false; rSh.StartAction(); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 62df032ad4e7..042e0c8ea1a0 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -847,9 +847,9 @@ static long lcl_DrawBullet(VirtualDevice* pVDev, const SwNumFmt& rFmt, long nXStart, long nYStart, const Size& rSize) { - Font aTmpFont(pVDev->GetFont()); + vcl::Font aTmpFont(pVDev->GetFont()); - Font aFont(*rFmt.GetBulletFont()); + vcl::Font aFont(*rFmt.GetBulletFont()); aFont.SetSize(rSize); aFont.SetTransparent(true); pVDev->SetFont( aFont ); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 063a37786ac2..981cc7ddbfdf 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -87,14 +87,14 @@ private: void CalcLineMap (); void PaintCells (); - sal_uInt8 GetFormatIndex( size_t nCol, size_t nRow ) const; + sal_uInt8 GetFormatIndex( size_t nCol, size_t nRow ) const; const SvxBoxItem& GetBoxItem( size_t nCol, size_t nRow ) const; void DrawString( size_t nCol, size_t nRow ); void DrawStrings(); void DrawBackground(); - void MakeFonts ( sal_uInt8 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont ); + void MakeFonts( sal_uInt8 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); }; class SwStringInputDlg : public ModalDialog @@ -537,7 +537,7 @@ AutoFmtPreview::~AutoFmtPreview() } static void lcl_SetFontProperties( - Font& rFont, + vcl::Font& rFont, const SvxFontItem& rFontItem, const SvxWeightItem& rWeightItem, const SvxPostureItem& rPostureItem ) @@ -556,7 +556,7 @@ rFont.MethodName( Value ); \ rCJKFont.MethodName( Value ); \ rCTLFont.MethodName( Value ); -void AutoFmtPreview::MakeFonts( sal_uInt8 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont ) +void AutoFmtPreview::MakeFonts( sal_uInt8 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ) { const SwBoxAutoFmt& rBoxFmt = aCurData.GetBoxFmt( nIndex ); @@ -670,7 +670,7 @@ MAKENUMSTR: cellRect.GetHeight() - FRAME_OFFSET ); if( aCurData.IsFont() ) { - Font aFont, aCJKFont, aCTLFont; + vcl::Font aFont, aCJKFont, aCTLFont; MakeFonts( nFmtIndex, aFont, aCJKFont, aCTLFont ); aScriptedText.SetFonts( &aFont, &aCJKFont, &aCTLFont ); } @@ -855,7 +855,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) Point aCenterPos; Size theWndSize = GetSizePixel(); Color oldColor; - Font aFont; + vcl::Font aFont; aFont = aVD.GetFont(); aFont.SetTransparent( true ); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index a04d1ff949c0..04013c7ac4a2 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -182,7 +182,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { sEntry = pStdFont->GetFontFor(nFontId); - Font aFont( sEntry, Size( 0, 10 ) ); + vcl::Font aFont( sEntry, Size( 0, 10 ) ); if( pPrt ) { aFont = pPrt->GetFontMetric( aFont ); @@ -201,7 +201,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) eLanguage = eUiLanguage; } - Font aLangDefFont = OutputDevice::GetDefaultFont( + vcl::Font aLangDefFont = OutputDevice::GetDefaultFont( nFontTypes[i], eLanguage, DEFAULTFONT_FLAGS_ONLYONE ); @@ -264,7 +264,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { sEntry = pStdFont->GetFontFor(aFontIdPoolId[nIdx]); - Font aFont( sEntry, Size( 0, 10 ) ); + vcl::Font aFont( sEntry, Size( 0, 10 ) ); if( pPrt ) aFont = pPrt->GetFontMetric( aFont ); diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx index 20ebfdec70c4..7fbd5270f209 100644 --- a/sw/source/uibase/config/fontcfg.cxx +++ b/sw/source/uibase/config/fontcfg.cxx @@ -253,7 +253,7 @@ OUString SwStdFontConfig::GetDefaultFor(sal_uInt16 nFontType, LanguageType eLan default: nFontId = DEFAULTFONT_LATIN_TEXT; } - Font aFont = OutputDevice::GetDefaultFont(nFontId, eLang, DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aFont = OutputDevice::GetDefaultFont(nFontId, eLang, DEFAULTFONT_FLAGS_ONLYONE); return aFont.GetName(); } diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index f6ea5cfecf44..5daedfaeb299 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -370,7 +370,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, if( !aName.isEmpty() ) { - Font aFont( static_cast<FontFamily>(nFamily), Size( nWidth, nHeight ) ); + vcl::Font aFont( static_cast<FontFamily>(nFamily), Size( nWidth, nHeight ) ); aFont.SetName( aName ); aFont.SetCharSet( (rtl_TextEncoding)nCharSet ); aFont.SetPitch( (FontPitch)nPitch ); @@ -451,7 +451,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) sal_uInt16 nFamily = FAMILY_DONTKNOW, nCharSet = 0, nPitch = 0; short nWidth = 0, nHeight = 0; - const Font* pFnt = aFmt.GetBulletFont(); + const vcl::Font* pFnt = aFmt.GetBulletFont(); if( pFnt ) { aName = pFnt->GetName(); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 88f702afcadd..6f769d4d3233 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -312,7 +312,7 @@ void SwAddressPreview::Paint(const Rectangle&) DrawRect( Rectangle(Point(0, 0), GetOutputSizePixel()) ); Color aPaintColor(IsEnabled() ? rSettings.GetWindowTextColor() : rSettings.GetDisableColor()); SetLineColor(aPaintColor); - Font aFont(GetFont()); + vcl::Font aFont(GetFont()); aFont.SetColor(aPaintColor); SetFont(aFont); diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index a7ba9954ba3d..f34325a82518 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -152,8 +152,8 @@ void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ ) if ( mrSidebarWin.IsPreview() ) { - Font aOldFont( mrSidebarWin.GetFont() ); - Font aFont(aOldFont); + vcl::Font aOldFont( mrSidebarWin.GetFont() ); + vcl::Font aFont(aOldFont); Color aCol( COL_BLACK); aFont.SetColor( aCol ); aFont.SetHeight(200); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 6bb20f076d42..818d5e8342d8 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -136,7 +136,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwPageFrm* pPag m_aFadeTimer( ) { // Get the font and configure it - Font aFont = GetSettings().GetStyleSettings().GetToolFont(); + vcl::Font aFont = GetSettings().GetStyleSettings().GetToolFont(); SetZoomedPointFont( aFont ); // Use pixels for the rest of the drawing diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index a284a7918d6f..454eb71815e9 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -240,11 +240,11 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s if (mpMetadataAuthor->IsVisible()) { - Font aOrigFont(mpMetadataAuthor->GetControlFont()); + vcl::Font aOrigFont(mpMetadataAuthor->GetControlFont()); Size aSize(PixelToLogic(mpMetadataAuthor->GetSizePixel())); Point aPos(PixelToLogic(mpMetadataAuthor->GetPosPixel())); aPos += rPt; - Font aFont( mpMetadataAuthor->GetSettings().GetStyleSettings().GetFieldFont() ); + vcl::Font aFont( mpMetadataAuthor->GetSettings().GetStyleSettings().GetFieldFont() ); mpMetadataAuthor->SetControlFont( aFont ); mpMetadataAuthor->Draw(pDev, aPos, aSize, nInFlags); mpMetadataAuthor->SetControlFont( aOrigFont ); @@ -252,11 +252,11 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s if (mpMetadataDate->IsVisible()) { - Font aOrigFont(mpMetadataDate->GetControlFont()); + vcl::Font aOrigFont(mpMetadataDate->GetControlFont()); Size aSize(PixelToLogic(mpMetadataDate->GetSizePixel())); Point aPos(PixelToLogic(mpMetadataDate->GetPosPixel())); aPos += rPt; - Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() ); + vcl::Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() ); mpMetadataDate->SetControlFont( aFont ); mpMetadataDate->Draw(pDev, aPos, aSize, nInFlags); mpMetadataDate->SetControlFont( aOrigFont ); @@ -277,7 +277,7 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s if (mpVScrollbar->IsVisible()) { - Font aOrigFont(mpMetadataDate->GetControlFont()); + vcl::Font aOrigFont(mpMetadataDate->GetControlFont()); Color aOrigBg( mpMetadataDate->GetControlBackground() ); OUString sOrigText(mpMetadataDate->GetText()); @@ -285,7 +285,7 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s Point aPos(PixelToLogic(mpMenuButton->GetPosPixel())); aPos += rPt; - Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() ); + vcl::Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() ); mpMetadataDate->SetControlFont( aFont ); mpMetadataDate->SetControlBackground( 0xFFFFFF ); mpMetadataDate->SetText("..."); @@ -369,7 +369,7 @@ void SwSidebarWin::InitControls() { AllSettings aSettings = mpMetadataAuthor->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - Font aFont = aStyleSettings.GetFieldFont(); + vcl::Font aFont = aStyleSettings.GetFieldFont(); aFont.SetHeight(8); aStyleSettings.SetFieldFont(aFont); aSettings.SetStyleSettings(aStyleSettings); @@ -388,7 +388,7 @@ void SwSidebarWin::InitControls() { AllSettings aSettings = mpMetadataDate->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - Font aFont = aStyleSettings.GetFieldFont(); + vcl::Font aFont = aStyleSettings.GetFieldFont(); aFont.SetHeight(8); aStyleSettings.SetFieldFont(aFont); aSettings.SetStyleSettings(aStyleSettings); @@ -506,7 +506,7 @@ void SwSidebarWin::Rescale() mpSidebarTxtControl->SetMapMode( aMode ); if ( mpMetadataAuthor ) { - Font aFont( mpMetadataAuthor->GetSettings().GetStyleSettings().GetFieldFont() ); + vcl::Font aFont( mpMetadataAuthor->GetSettings().GetStyleSettings().GetFieldFont() ); sal_Int32 nHeight = aFont.GetHeight(); nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator(); aFont.SetHeight( nHeight ); @@ -514,7 +514,7 @@ void SwSidebarWin::Rescale() } if ( mpMetadataDate ) { - Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() ); + vcl::Font aFont( mpMetadataDate->GetSettings().GetStyleSettings().GetFieldFont() ); sal_Int32 nHeight = aFont.GetHeight(); nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator(); aFont.SetHeight( nHeight ); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index debc067ebbb3..21fb6c8be67a 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5003,7 +5003,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView): // insert position at every curor movement! if( !rMyView.GetDocShell()->IsReadOnly() ) { - Font aFont; + vcl::Font aFont; SetInputContext( InputContext( aFont, INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT ) ); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 6a97983a234b..f8c3fc33e418 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -374,7 +374,7 @@ void TextViewOutWin::DataChanged( const DataChangedEvent& rDCEvt ) { const Color &rCol = GetSettings().GetStyleSettings().GetWindowColor(); SetBackground( rCol ); - Font aFont( pTextView->GetTextEngine()->GetFont() ); + vcl::Font aFont( pTextView->GetTextEngine()->GetFont() ); aFont.SetFillColor( rCol ); pTextView->GetTextEngine()->SetFont( aFont ); } @@ -505,7 +505,7 @@ void SwSrcEditWindow::CreateTextEngine() pTextEngine->SetUpdateMode( false ); pTextEngine->InsertView( pTextView ); - Font aFont; + vcl::Font aFont; aFont.SetTransparent( false ); aFont.SetFillColor( rCol ); SetPointFont( aFont ); @@ -956,7 +956,7 @@ void SwSrcEditWindow::SetFont() { LANGUAGE_SYSTEM, LANGUAGE_SYSTEM, LANGUAGE_SYSTEM, LANGUAGE_SYSTEM, LANGUAGE_SYSTEM }; - Font aFont; + vcl::Font aFont; if(lcl_GetLanguagesForEncoding(eSourceEncoding, aLanguages)) { //TODO: check for multiple languages @@ -972,8 +972,8 @@ void SwSrcEditWindow::SetFont() const FontList* pList = pFontListItem->GetFontList(); vcl::FontInfo aInfo = pList->Get(sFontName,WEIGHT_NORMAL, ITALIC_NONE); - const Font& rFont = GetTextEngine()->GetFont(); - Font aFont(aInfo); + const vcl::Font& rFont = GetTextEngine()->GetFont(); + vcl::Font aFont(aInfo); Size aSize(rFont.GetSize()); //font height is stored in point and set in twip aSize.Height() = diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index f70b9bc1cb9a..cf1ef8d1e5a6 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -28,11 +28,11 @@ namespace rtl { class OUString; } class NumberingPreview : public Window { const SwNumRule* pActNum; - Font aStdFont; + vcl::Font aStdFont; long nPageWidth; const OUString* pOutlineNames; bool bPosition; - sal_uInt16 nActLevel; + sal_uInt16 nActLevel; protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 627b02292d80..efbbc74b606c 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -318,7 +318,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void StartThesaurus(); // text conversion - SAL_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + SAL_DLLPRIVATE void StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); // used for spell checking and text conversion SAL_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, bool bStartDone, diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 7bc308468315..bdd6c4aa3b02 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -85,7 +85,7 @@ SwHHCWrapper::SwHHCWrapper( const uno::Reference< uno::XComponentContext >& rxContext, LanguageType nSourceLanguage, LanguageType nTargetLanguage, - const Font *pTargetFont, + const vcl::Font *pTargetFont, sal_Int32 nConvOptions, bool bIsInteractive, bool bStart, bool bOther, bool bSelection ) @@ -148,7 +148,7 @@ SwHHCWrapper::~SwHHCWrapper() //!! Note: This also effects the default language of text boxes (EditEngine/EditView) !! pDoc->SetDefault( SvxLanguageItem( nTargetLang, RES_CHRATR_CJK_LANGUAGE ) ); - const Font *pFont = GetTargetFont(); + const vcl::Font *pFont = GetTargetFont(); if (pFont) { SvxFontItem aFontItem( pFont->GetFamily(), pFont->GetName(), @@ -499,7 +499,7 @@ void SwHHCWrapper::ReplaceUnit( aSet.Put( SvxLanguageItem( *pNewUnitLanguage, RES_CHRATR_CJK_LANGUAGE ) ); } - const Font *pTargetFont = GetTargetFont(); + const vcl::Font *pTargetFont = GetTargetFont(); OSL_ENSURE( pTargetFont, "target font missing?" ); if (pTargetFont && pNewUnitLanguage) { diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index 0e801238545d..007218a213d5 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, LanguageType nSourceLanguage, LanguageType nTargetLanguage, - const Font* pTargetFnt, + const vcl::Font* pTargetFnt, sal_Int32 nConvOptions, bool bInteractive ) : SdrOutliner(pVw->GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()-> diff --git a/sw/source/uibase/lingu/sdrhhcwrap.hxx b/sw/source/uibase/lingu/sdrhhcwrap.hxx index 5c977da8966b..88f4ed742431 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.hxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.hxx @@ -36,13 +36,13 @@ class SdrHHCWrapper : public SdrOutliner sal_uInt16 nDocIndex; LanguageType nSourceLang; LanguageType nTargetLang; - const Font* pTargetFont; + const vcl::Font* pTargetFont; bool bIsInteractive; public: SdrHHCWrapper( SwView* pVw, LanguageType nSourceLanguage, LanguageType nTargetLanguage, - const Font* pTargetFnt, + const vcl::Font* pTargetFnt, sal_Int32 nConvOptions, bool bInteractive ); virtual ~SdrHHCWrapper(); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 29016e619d9a..65c25cc0fa3b 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1279,7 +1279,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, + vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false ); @@ -1671,7 +1671,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) sFontName = aSetDlgFont.GetFamilyName(); } - Font aFont(sFontName, Size(1,1)); + vcl::Font aFont(sFontName, Size(1,1)); if( sSym.isEmpty() ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index d531e7209acb..91d9c7e9ec88 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2099,7 +2099,7 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet ) // Set input context of the SwEditWin according to the selected font and script type if(RES_CHRATR_FONT == nWhich) { - Font aFont; + vcl::Font aFont; if(pI && pI->ISA(SvxFontItem)) { aFont.SetName( ((const SvxFontItem*)pI)->GetFamilyName()); diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 3088248459e8..fd6dff6ffa5f 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -355,7 +355,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) if(!bCommonTerms) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE); + vcl::Font aTargetFont = OutputDevice::GetDefaultFont(DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE); pOutlinerView->StartTextConversion(nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false); } @@ -724,7 +724,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) sFontName = aSetDlgFont.GetFamilyName(); } - Font aFont(sFontName, Size(1,1)); + vcl::Font aFont(sFontName, Size(1,1)); if(sSym.isEmpty()) { SfxAllItemSet aAllSet( GetPool() ); diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 2a8210002f33..3ffbba4a9253 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -1004,7 +1004,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) aFontName = aFont.GetFamilyName(); } - Font aNewFont(aFontName, Size(1,1)); // Size only because CTOR. + vcl::Font aNewFont(aFontName, Size(1,1)); // Size only because CTOR. if( aChars.isEmpty() ) { // Set selected font as default. diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index af86372e7e39..0743753b7440 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -136,11 +136,11 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_Int32 nPages, sal_Int32 short nBorder = BORDERPRN; Color aOldFillColor( rOutDev.GetFillColor() ); - Font aOldFont( rOutDev.GetFont() ); + vcl::Font aOldFont( rOutDev.GetFont() ); rOutDev.SetFillColor( Color(COL_TRANSPARENT) ); - Font aFont( aOldFont ); + vcl::Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); aFont.SetAlign( ALIGN_BOTTOM ); rOutDev.SetFont( aFont ); @@ -704,7 +704,7 @@ sal_Int32 SwSrcView::PrintSource( TextEngine* pTextEngine = aEditWin.GetTextEngine(); pOutDev->SetMapMode( MAP_100TH_MM ); - Font aFont( aEditWin.GetOutWin()->GetFont() ); + vcl::Font aFont( aEditWin.GetOutWin()->GetFont() ); Size aSize( aFont.GetSize() ); aSize = aEditWin.GetOutWin()->PixelToLogic( aSize, MAP_100TH_MM ); aFont.SetSize( aSize ); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 42653d05a59b..68ff90b860c3 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -164,7 +164,7 @@ void SwView::ExecLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, + vcl::Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); // disallow formatting, updating the view, ... while @@ -223,7 +223,7 @@ void SwView::ExecLingu(SfxRequest &rReq) void SwView::StartTextConversion( LanguageType nSourceLang, LanguageType nTargetLang, - const Font *pTargetFont, + const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 87bf12066949..2019065ac48e 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3447,8 +3447,8 @@ void SwContentLBoxString::Paint( if(lcl_IsContent(pEntry) && ((SwContent *)pEntry->GetUserData())->IsInvisible()) { - Font aOldFont( rDev.GetFont()); - Font aFont(aOldFont); + vcl::Font aOldFont( rDev.GetFont()); + vcl::Font aFont(aOldFont); Color aCol( COL_LIGHTGRAY ); aFont.SetColor( aCol ); rDev.SetFont( aFont ); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 994cd538afdb..ba20939edcb3 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1232,8 +1232,8 @@ void SwLBoxString::Paint( if(pCont->GetType() == GLBLDOC_SECTION && !(pCont->GetSection())->IsConnectFlag() ) { - Font aOldFont( rDev.GetFont()); - Font aFont(aOldFont); + vcl::Font aOldFont( rDev.GetFont()); + vcl::Font aFont(aOldFont); Color aCol( COL_LIGHTRED ); aFont.SetColor( aCol ); rDev.SetFont( aFont ); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index d6f60cd96530..a28a3646b3b4 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -802,7 +802,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aGlobalToolBox.SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) ); aGlobalToolBox.CheckItem(FN_GLOBAL_SWITCH, true); - Font aFont(GetFont()); + vcl::Font aFont(GetFont()); aFont.SetWeight(WEIGHT_NORMAL); GetPageEdit().SetFont(aFont); aFont = aContentTree.GetFont(); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 1284f10a9d7a..905733694300 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1160,7 +1160,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum) // #i63395# Only apply user defined default bullet font if ( numfunc::IsDefBulletFontUserDefined() ) { - const Font* pFnt = &numfunc::GetDefBulletFont(); + const vcl::Font* pFnt = &numfunc::GetDefBulletFont(); aFmt.SetBulletFont( pFnt ); } aFmt.SetBulletChar( numfunc::GetBulletChar(static_cast<sal_uInt8>(nLevel))); @@ -1187,7 +1187,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum) SwDocShell* pDocSh = GetView().GetDocShell(); // #i63395# // Only apply user defined default bullet font - const Font* pFnt = numfunc::IsDefBulletFontUserDefined() + const vcl::Font* pFnt = numfunc::IsDefBulletFontUserDefined() ? &numfunc::GetDefBulletFont() : 0; |