summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/paint.cxx2
-rw-r--r--vcl/source/window/settings.cxx4
-rw-r--r--vcl/source/window/status.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx10
-rw-r--r--vcl/source/window/window.cxx18
-rw-r--r--vcl/source/window/window2.cxx28
7 files changed, 33 insertions, 33 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d38c56bf86c8..b5cd7a57dd85 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2057,7 +2057,7 @@ void MessageDialog::SetMessagesWidths(Window *pParent,
if (pSecondaryMessage)
{
assert(pPrimaryMessage);
- Font aFont = pParent->GetSettings().GetStyleSettings().GetLabelFont();
+ vcl::Font aFont = pParent->GetSettings().GetStyleSettings().GetLabelFont();
aFont.SetSize(Size(0, aFont.GetSize().Height() * 1.2));
aFont.SetWeight(WEIGHT_BOLD);
pPrimaryMessage->SetControlFont(aFont);
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 9255cc61c279..2da3ed9a0d91 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1021,7 +1021,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
// put a push action to metafile
Push();
// copy graphics state to metafile
- Font aCopyFont = GetFont();
+ vcl::Font aCopyFont = GetFont();
if( nOldDPIX != mnDPIX || nOldDPIY != mnDPIY )
{
aCopyFont.SetHeight( aCopyFont.GetHeight() * mnDPIY / nOldDPIY );
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 66935d787063..2fabec97ccb2 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -192,7 +192,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
if ( !bUseSystemFont && !aUserInterfaceFont.isEmpty() )
{
StyleSettings aStyleSettings = rSettings.GetStyleSettings();
- Font aFont = aStyleSettings.GetAppFont();
+ vcl::Font aFont = aStyleSettings.GetAppFont();
aFont.SetName( aUserInterfaceFont );
aStyleSettings.SetAppFont( aFont );
aFont = aStyleSettings.GetHelpFont();
@@ -243,7 +243,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
if( GetDesktopRectPixel().getHeight() > 600 )
maxFontheight = (int) ((( 8.0 * (double) GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
- Font aFont = aStyleSettings.GetMenuFont();
+ vcl::Font aFont = aStyleSettings.GetMenuFont();
int defFontheight = aFont.GetHeight();
if( defFontheight > maxFontheight )
defFontheight = maxFontheight;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index c19d9e471c19..6425ed4d8a9c 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -168,7 +168,7 @@ void StatusBar::ImplInitSettings( bool bFont,
if ( bFont )
{
- Font aFont = rStyleSettings.GetToolFont();
+ vcl::Font aFont = rStyleSettings.GetToolFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index a477e304ae16..91059ff9fe5c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1436,7 +1436,7 @@ void ToolBox::ImplInitSettings( bool bFont,
if ( bFont )
{
- Font aFont = rStyleSettings.GetToolFont();
+ vcl::Font aFont = rStyleSettings.GetToolFont();
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
@@ -3008,8 +3008,8 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
// during configuration mode visible windows will be drawn in a special way
if ( mbCustomizeMode && pItem->mbShowWindow )
{
- Font aOldFont = GetFont();
- Color aOldTextColor = GetTextColor();
+ vcl::Font aOldFont = GetFont();
+ Color aOldTextColor = GetTextColor();
SetZoomedPointFont( rStyleSettings.GetAppFont() );
SetLineColor( Color( COL_BLACK ) );
@@ -3160,13 +3160,13 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
long nTextOffY = nOffY;
// rotate text when vertically docked
- Font aOldFont = GetFont();
+ vcl::Font aOldFont = GetFont();
if( pItem->mbVisibleText && !ImplIsFloatingMode() &&
((meAlign == WINDOWALIGN_LEFT) || (meAlign == WINDOWALIGN_RIGHT)) )
{
bRotate = true;
- Font aRotateFont = aOldFont;
+ vcl::Font aRotateFont = aOldFont;
aRotateFont.SetOrientation( 2700 );
// center horizontally
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 00d4c8c5598d..da309e446b8a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1237,7 +1237,7 @@ void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags )
OutputDevice::CopyDeviceArea(aPosAry, nFlags);
}
-bool Window::ImplCheckUIFont( const Font& rFont )
+bool Window::ImplCheckUIFont( const vcl::Font& rFont )
{
if( ImplGetSVData()->maGDIData.mbNativeFontConfig )
return true;
@@ -1403,7 +1403,7 @@ void Window::ImplInitResolutionSettings()
}
}
-void Window::ImplPointToLogic( Font& rFont ) const
+void Window::ImplPointToLogic( vcl::Font& rFont ) const
{
Size aSize = rFont.GetSize();
sal_uInt16 nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
@@ -1428,7 +1428,7 @@ void Window::ImplPointToLogic( Font& rFont ) const
rFont.SetSize( aSize );
}
-void Window::ImplLogicToPoint( Font& rFont ) const
+void Window::ImplLogicToPoint( vcl::Font& rFont ) const
{
Size aSize = rFont.GetSize();
sal_uInt16 nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
@@ -1816,7 +1816,7 @@ void Window::ImplNewInputContext()
pFocusWin->mpWindowImpl->mpFrameData->maOldInputContext = rInputContext;
SalInputContext aNewContext;
- const Font& rFont = rInputContext.GetFont();
+ const vcl::Font& rFont = rInputContext.GetFont();
const OUString& rFontName = rFont.GetName();
ImplFontEntry* pFontEntry = NULL;
aNewContext.mpFont = NULL;
@@ -2127,7 +2127,7 @@ long Window::CalcTitleWidth() const
// we guess the width for frame windows as we do not know the
// border of external dialogs
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Font aFont = GetFont();
+ vcl::Font aFont = GetFont();
((Window*)this)->SetPointFont( rStyleSettings.GetTitleFont() );
long nTitleWidth = GetTextWidth( GetText() );
((Window*)this)->SetFont( aFont );
@@ -2220,18 +2220,18 @@ void Window::CollectChildren(::std::vector<Window *>& rAllChildren )
}
}
-void Window::SetPointFont( const Font& rFont )
+void Window::SetPointFont( const vcl::Font& rFont )
{
- Font aFont = rFont;
+ vcl::Font aFont = rFont;
ImplPointToLogic( aFont );
SetFont( aFont );
}
-Font Window::GetPointFont() const
+vcl::Font Window::GetPointFont() const
{
- Font aFont = GetFont();
+ vcl::Font aFont = GetFont();
ImplLogicToPoint( aFont );
return aFont;
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e8126f4afc35..9b42b5763660 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -519,12 +519,12 @@ inline long WinFloatRound( double fVal )
return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
}
-void Window::SetZoomedPointFont( const Font& rFont )
+void Window::SetZoomedPointFont( const vcl::Font& rFont )
{
const Fraction& rZoom = GetZoom();
if ( rZoom.GetNumerator() != rZoom.GetDenominator() )
{
- Font aFont( rFont );
+ vcl::Font aFont( rFont );
Size aSize = aFont.GetSize();
double n = (double)aSize.Width();
n *= (double)rZoom.GetNumerator();
@@ -548,7 +548,7 @@ void Window::SetZoomedPointFont( const Font& rFont )
nType = DEFAULTFONT_FIXED;
else
nType = DEFAULTFONT_UI_SANS;
- Font aTempFont = GetDefaultFont( nType, GetSettings().GetLanguageTag().getLanguageType(), 0 );
+ vcl::Font aTempFont = GetDefaultFont( nType, GetSettings().GetLanguageTag().getLanguageType(), 0 );
aFont.SetName( aTempFont.GetName() );
SetPointFont( aFont );
}
@@ -581,9 +581,9 @@ void Window::SetControlFont()
}
}
-void Window::SetControlFont( const Font& rFont )
+void Window::SetControlFont( const vcl::Font& rFont )
{
- if ( rFont == Font() )
+ if ( rFont == vcl::Font() )
{
SetControlFont();
return;
@@ -596,18 +596,18 @@ void Window::SetControlFont( const Font& rFont )
*mpWindowImpl->mpControlFont = rFont;
}
else
- mpWindowImpl->mpControlFont = new Font( rFont );
+ mpWindowImpl->mpControlFont = new vcl::Font( rFont );
StateChanged( STATE_CHANGE_CONTROLFONT );
}
-Font Window::GetControlFont() const
+vcl::Font Window::GetControlFont() const
{
if ( mpWindowImpl->mpControlFont )
return *mpWindowImpl->mpControlFont;
else
{
- Font aFont;
+ vcl::Font aFont;
return aFont;
}
}
@@ -692,9 +692,9 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
return aSz;
}
-Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
+vcl::Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
{
- Font aFont = GetPointFont();
+ vcl::Font aFont = GetPointFont();
Size aFontSize = aFont.GetSize();
MapMode aPtMapMode( MAP_POINT );
aFontSize = pDev->LogicToPixel( aFontSize, aPtMapMode );
@@ -1478,7 +1478,7 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
{
if (rKey == "weight")
{
- Font aFont(GetControlFont());
+ vcl::Font aFont(GetControlFont());
if (rValue == "thin")
aFont.SetWeight(WEIGHT_THIN);
else if (rValue == "ultralight")
@@ -1503,7 +1503,7 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
}
else if (rKey == "style")
{
- Font aFont(GetControlFont());
+ vcl::Font aFont(GetControlFont());
if (rValue == "normal")
aFont.SetItalic(ITALIC_NONE);
else if (rValue == "oblique")
@@ -1514,13 +1514,13 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
}
else if (rKey == "underline" && toBool(rValue) == true)
{
- Font aFont(GetControlFont());
+ vcl::Font aFont(GetControlFont());
aFont.SetUnderline(UNDERLINE_SINGLE);
SetControlFont(aFont);
}
else if (rKey == "size")
{
- Font aFont(GetControlFont());
+ vcl::Font aFont(GetControlFont());
sal_Int32 nHeight = rValue.toInt32() / 1000;
aFont.SetHeight(nHeight);
SetControlFont(aFont);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 05:56:50 +0000