fdo#82577: Handle Font

Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.

Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537

30 files changed, 62 insertions, 62 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index f860224ef900..f23a91bba5e5 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -308,7 +308,7 @@ static inline void lcl_FillProperty( PropertyValue& rVal, const OUString& rPropN
 }
 
 /** Fills the sequence with all font attributes of rFont. */
-static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font& rFont )
+static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const vcl::Font& rFont )
 {
     SvxFontItem aFontItem( rFont.GetFamily(), rFont.GetName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT );
     SvxFontHeightItem aHeightItem( rFont.GetSize().Height(), 100, ATTR_FONT_HEIGHT );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index ee993c14ce70..7c78b001c6d1 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1451,7 +1451,7 @@ ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh )
     bIsRTL = GetSettings().GetLayoutRTL();
 
     //  always use application font, so a font with cjk chars can be installed
-    Font aAppFont = GetFont();
+    vcl::Font aAppFont = GetFont();
     aTextFont = aAppFont;
     aTextFont.SetSize( PixelToLogic( aAppFont.GetSize(), MAP_TWIP ) );  // AppFont is in pixels
 
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 6cb40c185ed4..74caa07088af 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -119,11 +119,11 @@ void ScDPFieldButton::draw()
 
         // Field name.
         // Get the font and size the same way as in scenario selection (lcl_DrawOneFrame in gridwin4.cxx)
-        Font aTextFont( mpStyle->GetAppFont() );
+        vcl::Font aTextFont( mpStyle->GetAppFont() );
         if ( mpDoc )
         {
             //  use ScPatternAttr::GetFont only for font size
-            Font aAttrFont;
+            vcl::Font aAttrFont;
             static_cast<const ScPatternAttr&>(mpDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).
                 GetFont( aAttrFont, SC_AUTOCOL_BLACK, mpOutDev, &maZoomY );
             aTextFont.SetSize( aAttrFont.GetSize() );
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8424ef566172..4a81000ea5e0 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -356,10 +356,10 @@ void ScDocShell::CalcOutputFactor()
     const ScPatternAttr* pPattern = (const ScPatternAttr*)&aDocument.GetPool()->
                                             GetDefaultItem(ATTR_PATTERN);
 
-    Font aDefFont;
+    vcl::Font aDefFont;
     OutputDevice* pRefDev = GetRefDevice();
     MapMode aOldMode = pRefDev->GetMapMode();
-    Font    aOldFont = pRefDev->GetFont();
+    vcl::Font aOldFont = pRefDev->GetFont();
 
     pRefDev->SetMapMode(MAP_PIXEL);
     pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pRefDev); // font color doesn't matter here
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 85f1d069dceb..83bb2c0ad6bf 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -229,7 +229,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
                     if ( pFontItem )
                     {
                         OUString aFontName(pFontItem->GetValue());
-                        Font aFont(aFontName, Size(1,1)); // Size nur wg. CTOR
+                        vcl::Font aFont(aFontName, Size(1,1)); // Size nur wg. CTOR
                         aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetName(),
                                     aFont.GetStyleName(), aFont.GetPitch(),
                                     aFont.GetCharSet(), ATTR_FONT  );
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index cfa8ee599ceb..2951cae85d51 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -119,7 +119,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
     nDockMode=0;
     bSizeFlag=false;
     aCatBox.SetDropDownLineCount(9);
-    Font aFont=aFiFuncDesc.GetFont();
+    vcl::Font aFont=aFiFuncDesc.GetFont();
     aFont.SetColor(Color(COL_BLACK));
     aFiFuncDesc.SetFont(aFont);
     aFiFuncDesc.SetBackground( GetBackground() );       //! never transparent?
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index b61c2af24842..6bdfa3b022a5 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -341,7 +341,7 @@ void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr
 
     if ( bFont )
     {
-        Font aFont = rStyleSettings.GetAppFont();
+        vcl::Font aFont = rStyleSettings.GetAppFont();
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
         SetFont( aFont );
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index e0903ee60fdf..291681c7b5ea 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -94,9 +94,9 @@ private:
     SAL_DLLPRIVATE void                DrawBackground();
 
     SAL_DLLPRIVATE void    MakeFonts       ( sal_uInt16 nIndex,
-                              Font& rFont,
-                              Font& rCJKFont,
-                              Font& rCTLFont );
+                              vcl::Font& rFont,
+                              vcl::Font& rCJKFont,
+                              vcl::Font& rCTLFont );
 
     SAL_DLLPRIVATE void CheckPriority    ( sal_uInt16            nCurLine,
                               AutoFmtLine       eLine,
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index d319d86f7d67..744c9bffea76 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -81,7 +81,7 @@ protected:
     void drawMenuItem(size_t nPos);
     void drawSeparator(size_t nPos);
     void drawAllMenuItems();
-    const Font& getLabelFont() const { return maLabelFont;}
+    const vcl::Font& getLabelFont() const { return maLabelFont;}
 
     void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu);
     void queueCloseSubMenu();
@@ -171,7 +171,7 @@ private:
     SubMenuItemData   maOpenTimer;
     SubMenuItemData   maCloseTimer;
 
-    Font    maLabelFont;
+    vcl::Font         maLabelFont;
 
     // Name of this menu window, taken from the menu item of the parent window
     // that launches it (if this is a sub menu).  If this is a top-level menu
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index d01f5f0a0b37..1b6024872806 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -91,8 +91,8 @@ private:
     Color                       maSelectColor;      /// Header color of selected columns.
 
     ScEditEnginePtr             mpEditEngine;       /// For drawing cell texts.
-    Font                        maHeaderFont;       /// Font for column and row headers.
-    Font                        maMonoFont;         /// Monospace font for data cells.
+    vcl::Font                  maHeaderFont;       /// Font for column and row headers.
+    vcl::Font                   maMonoFont;         /// Monospace font for data cells.
     Size                        maWinSize;          /// Size of the control.
     Size                        maEdEngSize;        /// Paper size for edit engine.
 
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 745367e57136..f4ebde0e210b 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -33,8 +33,8 @@ class ScHeaderControl : public Window
 {
 private:
     SelectionEngine*    pSelEngine;
-    Font                aNormFont;
-    Font                aBoldFont;
+    vcl::Font           aNormFont;
+    vcl::Font           aBoldFont;
     bool                bBoldSet;
 
     bool            bVertical;              // Vertical = Row header
diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx
index 4b30e7e9e85d..89ab1eeb0337 100644
--- a/sc/source/ui/inc/hintwin.hxx
+++ b/sc/source/ui/inc/hintwin.hxx
@@ -29,8 +29,8 @@ private:
     OUString  aMessage;
     Point     aTextStart;
     long      nTextHeight;
-    Font      aTextFont;
-    Font      aHeadFont;
+    vcl::Font aTextFont;
+    vcl::Font aHeadFont;
 
 protected:
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 0463eb3bc21f..bfce54fed442 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -112,7 +112,7 @@ protected:
     typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector;
 
     OUString    aString;
-    Font        aTextFont;
+    vcl::Font   aTextFont;
     ScEditEngineDefaulter*  pEditEngine;            // only created when needed
     EditView*   pEditView;
     AccTextDataVector maAccTextDatas;   // #i105267# text datas may be cloned, remember all copies
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index ffb0e1504fa0..e7dd3d526886 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -36,7 +36,7 @@ namespace editeng {
 }
 
 class Rectangle;
-class Font;
+namespace vcl { class Font; }
 class OutputDevice;
 class EditEngine;
 class ScDocument;
@@ -233,7 +233,7 @@ private:
                                     long& rEngineWidth, long& rEngineHeight, long& rNeededPixel,
                                     bool& rLeftClip, bool& rRightClip );
 
-    void SetSyntaxColor( Font* pFont, const ScRefCellValue& rCell );
+    void SetSyntaxColor( vcl::Font* pFont, const ScRefCellValue& rCell );
     void SetEditSyntaxColor( EditEngine& rEngine, ScRefCellValue& rCell );
 
     double          GetStretch();
diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx
index d50e6539a97d..fb326f60cd8c 100644
--- a/sc/source/ui/inc/spellparam.hxx
+++ b/sc/source/ui/inc/spellparam.hxx
@@ -48,14 +48,14 @@ public:
                             ScConversionType eConvType,
                             LanguageType eSourceLang,
                             LanguageType eTargetLang,
-                            const Font& rTargetFont,
+                            const vcl::Font& rTargetFont,
                             sal_Int32 nOptions,
                             bool bIsInteractive );
 
     inline ScConversionType GetType() const     { return meConvType; }
     inline LanguageType GetSourceLang() const   { return meSourceLang; }
     inline LanguageType GetTargetLang() const   { return meTargetLang; }
-    inline const Font*  GetTargetFont() const   { return mbUseTargetFont ? &maTargetFont : 0; }
+    inline const vcl::Font*  GetTargetFont() const   { return mbUseTargetFont ? &maTargetFont : 0; }
     inline sal_Int32    GetOptions() const      { return mnOptions; }
     inline bool         IsInteractive() const   { return mbIsInteractive; }
 
@@ -63,7 +63,7 @@ private:
     ScConversionType    meConvType;         /// Type of the conversion.
     LanguageType        meSourceLang;       /// Source language for conversion.
     LanguageType        meTargetLang;       /// Target language for conversion.
-    Font                maTargetFont;       /// Target font to be used if language has to be changed.
+    vcl::Font          maTargetFont;       /// Target font to be used if language has to be changed.
     sal_Int32           mnOptions;          /// Conversion options.
     bool                mbUseTargetFont;    /// True = Use maTargetFont to change font during conversion.
     bool                mbIsInteractive;    /// True = Text conversion has (specific) dialog that may be raised.
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 17ae3d6c5227..a764bf2129bc 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -285,7 +285,7 @@ public:
     void            ExtendScenario();
     void            UseScenario( const OUString& rName );
 
-    void            InsertSpecialChar( const OUString& rStr, const Font& rFont );
+    void            InsertSpecialChar( const OUString& rStr, const vcl::Font& rFont );
 
     void            InsertDummyObject();
     void            InsertOleObject();
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index a66eb9ad6fcc..ec571cec12e4 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -94,7 +94,7 @@ ScAutoFmtPreview::~ScAutoFmtPreview()
 }
 
 static void lcl_SetFontProperties(
-        Font& rFont,
+        vcl::Font& rFont,
         const SvxFontItem& rFontItem,
         const SvxWeightItem& rWeightItem,
         const SvxPostureItem& rPostureItem )
@@ -108,7 +108,7 @@ static void lcl_SetFontProperties(
     rFont.SetItalic     ( (FontItalic)rPostureItem.GetValue() );
 }
 
-void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont )
+void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont )
 {
     if ( pCurData )
     {
@@ -259,7 +259,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
 
             if ( pCurData->GetIncludeFont() )
             {
-                Font aFont, aCJKFont, aCTLFont;
+                vcl::Font aFont, aCJKFont, aCTLFont;
                 Size theMaxStrSize;
 
                 MakeFonts( nFmtIndex, aFont, aCJKFont, aCTLFont );
@@ -486,7 +486,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
     sal_uInt32 nOldDrawMode = aVD.GetDrawMode();
 
     Size aWndSize( GetSizePixel() );
-    Font aFont( aVD.GetFont() );
+    vcl::Font aFont( aVD.GetFont() );
     Color aBackCol( GetSettings().GetStyleSettings().GetWindowColor() );
     Point aTmpPoint;
     Rectangle aRect( aTmpPoint, aWndSize );
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 7a25b5aeed62..177bc5fd5f0c 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -84,8 +84,8 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const
 
     Point aNewPos( rPos );
     aNewPos.X() += rDev.GetTextWidth( aNormalStr );
-    Font aOldFont( rDev.GetFont() );
-    Font aFont( aOldFont );
+    vcl::Font aOldFont( rDev.GetFont() );
+    vcl::Font aFont( aOldFont );
     aFont.SetWeight( WEIGHT_BOLD );
 
     OUString sTxt( ' ' );
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index d17c24be4f73..850c0b3840ca 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -37,7 +37,7 @@ ScScenarioListBox::ScScenarioListBox( ScScenarioWindow& rParent ) :
     ListBox( &rParent, WB_BORDER | WB_TABSTOP ),
     mrParent( rParent )
 {
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetTransparent( true );
     aFont.SetWeight( WEIGHT_LIGHT );
     SetFont( aFont );
@@ -200,7 +200,7 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List,
         aLbScenario ( *this ),
         aEdComment  ( this,  WB_BORDER | WB_LEFT | WB_READONLY | WB_VSCROLL | WB_TABSTOP )
 {
-    Font aFont( GetFont() );
+    vcl::Font aFont( GetFont() );
     aFont.SetTransparent( true );
     aFont.SetWeight( WEIGHT_LIGHT );
     aEdComment.SetFont( aFont );
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 7a433dfe3a5b..7682e20011c8 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -52,8 +52,8 @@ void OptionString::InitViewData(
     OUString aDesc = maDesc + ": ";
     Size aDescSize(pView->GetTextWidth(aDesc), pView->GetTextHeight());
 
-    Font aOldFont = pView->GetFont();
-    Font aFont = aOldFont;
+    vcl::Font aOldFont = pView->GetFont();
+    vcl::Font aFont = aOldFont;
     aFont.SetWeight(WEIGHT_BOLD);
     //To not make the SvTreeListBox try and recalculate all rows, call the
     //underlying SetFont, we just want to know what size this text will be
@@ -72,8 +72,8 @@ void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDat
     rDev.DrawText(aPos, aDesc);
 
     aPos.X() += rDev.GetTextWidth(aDesc);
-    Font aOldFont = rDev.GetFont();
-    Font aFont = aOldFont;
+    vcl::Font aOldFont = rDev.GetFont();
+    vcl::Font aFont = aOldFont;
     aFont.SetWeight(WEIGHT_BOLD);
 
     //To not make the SvTreeListBox try and recalculate all rows, call the
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index b2075c4bccf9..ee2b9a7ec514 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -70,11 +70,11 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     long nRectWidth = aRect.GetWidth();
     Point aBLPos = aRect.TopLeft();
 
-    Font aOldFont = pDev->GetFont();
+    vcl::Font aOldFont = pDev->GetFont();
     Color aOldColor = pDev->GetLineColor();
     Color aOldFillColor = pDev->GetFillColor();
 
-    Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
+    vcl::Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
     Size aSize = aFont.GetSize();
     aSize.Height() = nRectHeight*3/5;
     aFont.SetSize( aSize );
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index a314da25041d..2d0a52b8d133 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3758,7 +3758,7 @@ double getDefaultCharWidth( ScDocShell* pDocShell )
     ScDocument& rDoc = pDocShell->GetDocument();
     OutputDevice* pRefDevice = rDoc.GetRefDevice();
     ScPatternAttr* pAttr = rDoc.GetDefPattern();
-    ::Font aDefFont;
+    vcl::Font aDefFont;
     pAttr->GetFont( aDefFont, SC_AUTOCOL_BLACK, pRefDevice );
     pRefDevice->SetFont( aDefFont );
     long nCharWidth = pRefDevice->GetTextWidth( OUString( '0' ) );        // 1/100th mm
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 04e5401b36ff..93439bf32d11 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1738,7 +1738,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                 if( !bCommonTerms )
                                     nOptions |= i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
 
-                                Font aTargetFont = OutputDevice::GetDefaultFont(
+                                vcl::Font aTargetFont = OutputDevice::GetDefaultFont(
                                                     DEFAULTFONT_CJK_SPREADSHEET,
                                                     eTargetLang, DEFAULTFONT_FLAGS_ONLYONE );
                                 ScConversionParam aConvParam( SC_CONVERSION_CHINESE_TRANSL,
@@ -2261,11 +2261,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                 if ( !aChars.isEmpty() )
                 {
-                    Font aFont;
+                    vcl::Font aFont;
                     pTabViewShell->GetSelectionPattern()->GetFont( aFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL,
                                                                 pTabViewShell->GetSelectionScriptType() );
                     if ( !aFontName.isEmpty() )
-                        aFont = Font( aFontName, Size(1,1) );
+                        aFont = vcl::Font( aFontName, Size(1,1) );
                     pTabViewShell->InsertSpecialChar( aChars, aFont );
                     if( ! rReq.IsAPI() )
                         rReq.Done();
@@ -2276,7 +2276,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 
                 // font color doesn't matter here
-                Font             aCurFont;
+                vcl::Font         aCurFont;
                 pTabViewShell->GetSelectionPattern()->GetFont( aCurFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL,
                                                                 pTabViewShell->GetSelectionScriptType() );
 
@@ -2294,7 +2294,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                     if ( pItem && pFontItem )
                     {
-                        Font aNewFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), Size(1,1) );
+                        vcl::Font aNewFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), Size(1,1) );
                         aNewFont.SetCharSet( pFontItem->GetCharSet() );
                         aNewFont.SetPitch( pFontItem->GetPitch() );
                         pTabViewShell->InsertSpecialChar( pItem->GetValue(), aNewFont );
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 1c2d6dddb12e..e2f22472ba23 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -357,7 +357,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                     if ( pFontItem )
                     {
                         OUString aFontName(pFontItem->GetValue());
-                        Font aFont(aFontName, Size(1,1)); // Size nur wg. CTOR
+                        vcl::Font aFont(aFontName, Size(1,1)); // Size nur wg. CTOR
                         aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetName(),
                                     aFont.GetStyleName(), aFont.GetPitch(),
                                     aFont.GetCharSet(), ATTR_FONT  );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 74219599323e..059d766099f9 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -979,8 +979,8 @@ void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
     nSizeX += 1;
 
     {
-        Font    aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
-        MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
+        vcl::Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
+        MapMode   aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
 
         nHeight  = GetTextHeight();
         nHeight *= SC_FILTERLISTBOX_LINES;
@@ -1102,8 +1102,8 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec
     nSizeX += 1;
 
     {
-        Font    aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
-        MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
+        vcl::Font  aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
+        MapMode    aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
 
         nHeight  = GetTextHeight();
         nHeight *= SC_FILTERLISTBOX_LINES;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a60fb82812f7..4a2ecd02cc74 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -102,12 +102,12 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
     aOuter.Bottom() += nVer;
 
     //  use ScPatternAttr::GetFont only for font size
-    Font aAttrFont;
+    vcl::Font aAttrFont;
     ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).
                                     GetFont(aAttrFont,SC_AUTOCOL_BLACK,pDev,&rZoomY);
 
     //  everything else from application font
-    Font aAppFont = pDev->GetSettings().GetStyleSettings().GetAppFont();
+    vcl::Font aAppFont = pDev->GetSettings().GetStyleSettings().GetAppFont();
     aAppFont.SetSize( aAttrFont.GetSize() );
 
     aAppFont.SetAlign( ALIGN_TOP );
@@ -928,7 +928,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                 nPageScript = ScGlobal::GetDefaultScriptType();
         }
 
-        Font aFont;
+        vcl::Font aFont;
         boost::scoped_ptr<ScEditEngineDefaulter> pEditEng;
         const ScPatternAttr& rDefPattern = ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN));
         if ( nPageScript == SCRIPTTYPE_LATIN )
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index a52e4f738eec..5bca67950889 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -89,7 +89,7 @@ class ScDrawStringsVars
     const ScPatternAttr* pPattern;              // Attribute
     const SfxItemSet*   pCondSet;               // aus bedingter Formatierung
 
-    Font                aFont;                  // aus Attributen erzeugt
+    vcl::Font           aFont;                  // aus Attributen erzeugt
     FontMetric          aMetric;
     long                nAscentPixel;           // always pixels
     SvxCellOrientation  eAttrOrient;
@@ -234,7 +234,7 @@ void ScDrawStringsVars::SetShrinkScale( long nScale, sal_uInt8 nScript )
     Fraction aFraction( nScale, 100 );
     if ( !bPixelToLogic )
         aFraction *= pOutput->aZoomY;
-    Font aTmpFont;
+    vcl::Font aTmpFont;
     pPattern->GetFont( aTmpFont, SC_AUTOCOL_RAW, pFmtDevice, &aFraction, pCondSet, nScript );
     long nNewHeight = aTmpFont.GetHeight();
     if ( nNewHeight > 0 )
@@ -844,7 +844,7 @@ static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, S
     }
 }
 
-void ScOutputData::SetSyntaxColor( Font* pFont, const ScRefCellValue& rCell )
+void ScOutputData::SetSyntaxColor( vcl::Font* pFont, const ScRefCellValue& rCell )
 {
     switch (rCell.meType)
     {
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 7160b05019cd..48697023ecad 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1847,7 +1847,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, bool bDoPrint, ScPreviewLocationData
     pEditDefaults->Put( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) );
     pEditEngine->SetDefaults( *pEditDefaults );
 
-    Font aMarkFont;
+    vcl::Font aMarkFont;
     ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT;
     ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode );
     pDev->SetFont( aMarkFont );
@@ -2263,7 +2263,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
         }
 
         ScPatternAttr aPattern( pDoc->GetPool() );
-        Font aFont;
+        vcl::Font aFont;
         ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT;
         aPattern.GetFont( aFont, eColorMode, pDev );
         pDev->SetFont( aFont );
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 0bd7d90c9561..4d5a2e352da8 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -356,7 +356,7 @@ ScConversionParam::ScConversionParam( ScConversionType eConvType,
 }
 
 ScConversionParam::ScConversionParam( ScConversionType eConvType,
-        LanguageType eSourceLang, LanguageType eTargetLang, const Font& rTargetFont,
+        LanguageType eSourceLang, LanguageType eTargetLang, const vcl::Font& rTargetFont,
         sal_Int32 nOptions, bool bIsInteractive ) :
     meConvType( eConvType ),
     meSourceLang( eSourceLang ),
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 50c517debd04..2e60bfacdf3f 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2755,7 +2755,7 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
     }
 }
 
-void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont )
+void ScViewFunc::InsertSpecialChar( const OUString& rStr, const vcl::Font& rFont )
 {
     ScEditableTester aTester( this );
     if (!aTester.IsEditable())