summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-12-20 11:25:37 +0100
committerAndras Timar <andras.timar@collabora.com>2013-12-20 15:55:00 +0100
commitb55259eeb549482477c57d854f3de72aff345edb (patch)
tree35e474b8458ae776a8455f4f78e73ae28c611180 /vcl/win
parent377ec698afc98a9a098b456f4ae3c694498df6a2 (diff)
typo fixes
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx18
-rw-r--r--vcl/win/source/gdi/salgdi_gdiplus.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx2
3 files changed, 11 insertions, 11 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 4c804fa6d86c..7669b241d61a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -380,7 +380,7 @@ static Unicode2LangType aLangFromCodeChart[]= {
// get language matching to the missing char
LanguageType MapCharToLanguage( sal_UCS4 uChar )
{
- // entries marked with default-CJK get replaced with the prefered CJK language
+ // entries marked with default-CJK get replaced with the preferred CJK language
static bool bFirst = true;
if( bFirst )
{
@@ -408,7 +408,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar )
LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ? nDefaultLang : LANGUAGE_CHINESE;
- // change the marked entries to prefered language
+ // change the marked entries to preferred language
static const int nCount = SAL_N_ELEMENTS(aLangFromCodeChart);
for( int i = 0; i < nCount; ++i )
{
@@ -519,7 +519,7 @@ namespace
}
// find a fallback font for missing characters
-// TODO: should stylistic matches be searched and prefered?
+// TODO: should stylistic matches be searched and preferred?
bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingChars ) const
{
// guess a locale matching to the missing chars
@@ -603,7 +603,7 @@ struct ImplEnumInfo
OUString* mpName;
LOGFONTA* mpLogFontA;
LOGFONTW* mpLogFontW;
- UINT mnPreferedCharSet;
+ UINT mnPreferredCharSet;
bool mbCourier;
bool mbImplSalCourierScalable;
bool mbImplSalCourierNew;
@@ -1826,7 +1826,7 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont,
// prefer the system character set, so that we get as much as
// possible important characters. In the other case we could only
// display a limited set of characters (#87309#)
- if ( pInfo->mnPreferedCharSet == pLogFont->elfLogFont.lfCharSet )
+ if ( pInfo->mnPreferredCharSet == pLogFont->elfLogFont.lfCharSet )
pData->mnQuality += 100;
// knowing Courier to be scalable is nice
@@ -2127,7 +2127,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
if( !ImplAddTempFont( *GetSalData(), rFontFileURL ) )
return false;
- UINT nPreferedCharSet = DEFAULT_CHARSET;
+ UINT nPreferredCharSet = DEFAULT_CHARSET;
// create matching FontData struct
aDFA.SetSymbolFlag(false); // TODO: how to know it without accessing the font?
@@ -2147,7 +2147,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
*/
ImplWinFontData* pFontData = new ImplWinFontData( aDFA, 0,
- sal::static_int_cast<BYTE>(nPreferedCharSet),
+ sal::static_int_cast<BYTE>(nPreferredCharSet),
sal::static_int_cast<BYTE>(TMPF_VECTOR|TMPF_TRUETYPE) );
pFontData->SetFontId( reinterpret_cast<sal_IntPtr>(pFontData) );
pFontList->Add( pFontData );
@@ -2225,11 +2225,11 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
aInfo.mbImplSalCourierNew = true;
}
- aInfo.mnPreferedCharSet = DEFAULT_CHARSET;
+ aInfo.mnPreferredCharSet = DEFAULT_CHARSET;
DWORD nCP = GetACP();
CHARSETINFO aCharSetInfo;
if ( TranslateCharsetInfo( (DWORD*)(sal_IntPtr)nCP, &aCharSetInfo, TCI_SRCCODEPAGE ) )
- aInfo.mnPreferedCharSet = aCharSetInfo.ciCharset;
+ aInfo.mnPreferredCharSet = aCharSetInfo.ciCharset;
LOGFONTW aLogFont;
memset( &aLogFont, 0, sizeof( aLogFont ) );
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 608228efed74..aee96e196b3f 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -193,7 +193,7 @@ bool WinSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
// Normally GdiPlus should not be used for printing at all since printers cannot
// print transparent filled polygon geometry and normally this does not happen
// since OutputDevice::RemoveTransparenciesFromMetaFile is used as preparation
- // and no transparent parts should remain for printing. But this can be overriden
+ // and no transparent parts should remain for printing. But this can be overridden
// by the user and thus happens. This call can only come (currently) from
// OutputDevice::DrawTransparent, see comments there with the same TaskID.
// If it is used, the mapping for the printer is wrong and needs to be corrected. I
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index c342b7f0527d..db91127e7df2 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2817,7 +2817,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetMenuColor( ImplWinColorToSal( GetSysColor( COLOR_MENU ) ) );
aStyleSettings.SetMenuBarColor( aStyleSettings.GetMenuColor() );
aStyleSettings.SetMenuBarRolloverColor( aStyleSettings.GetHighlightColor() );
- aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overriden below for flat menus
+ aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overridden below for flat menus
aStyleSettings.SetUseFlatBorders( FALSE );
aStyleSettings.SetUseFlatMenus( FALSE );
aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );