summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/README6
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/source/gdi/pngread.cxx2
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/source/gdi/regionband.cxx2
-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
8 files changed, 18 insertions, 18 deletions
diff --git a/vcl/README b/vcl/README
index 72f02e08e351..bebb9e1787bf 100644
--- a/vcl/README
+++ b/vcl/README
@@ -92,7 +92,7 @@ documentation
parsing:
- wmf/emf filter --> GDI metafile with emf+ in commments --> cppcanvas metafile renderer
+ wmf/emf filter --> GDI metafile with emf+ in comments --> cppcanvas metafile renderer
lately the GDIMetafile rendering path changed which also influenced
emf+ rendering. now many things happen in drawing layer, where
@@ -101,7 +101,7 @@ metafiles with emf+ we let the mtfrenderer render them into bitmap
(with transparency) and use this bitmap in drawinlayer. cleaner
solution for current state would be to extend the drawing layer for
missing features and move parsing into drawing layer (might be quite
-a lot of work). intemediary enhancement would be to know better the
+a lot of work). intermediary enhancement would be to know better the
needed size/resolution of the bitmap, before we render emf+ into
bitmap in drawing layer. Thorsten is working on the same problem with
svg rendering, so hopefully his approach could be extended for emf+ as
@@ -111,7 +111,7 @@ look at vcl/source/gdi/gdimetafile.cxx where you can look for
UseCanvas again. moving the parsing into drawinglayer might also have
nice side effect for emf+-dual metafiles. in case the emf+ records
are broken, it would be easier to use the duplicit emf
-rendering. fortunatelly we didn't run into such a broken emf+ file
+rendering. fortunately we didn't run into such a broken emf+ file
yet. but there were already few cases where we first though that the
problem might be because of broken emf+ part. so far it always turned
out to be another problem.
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 828daee2e0d7..5eff5bf7ee26 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -703,7 +703,7 @@ void PrintFontManager::deinitFontconfig()
bool PrintFontManager::addFontconfigDir( const OString& rDirName )
{
// workaround for a stability problems in older FC versions
- // when handling application specifc fonts
+ // when handling application specific fonts
const int nVersion = FcGetVersion();
if( nVersion <= 20400 )
return false;
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1dc4f4d7f782..ac63fe7878c5 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -90,7 +90,7 @@ private:
sal_Int32 mnChunkLen; // Length of current PNG chunk
Size maOrigSize; // pixel size of the full image
Size maTargetSize; // pixel size of the result image
- Size maPhysSize; // prefered size in MAP_100TH_MM units
+ Size maPhysSize; // preferred size in MAP_100TH_MM units
sal_uInt32 mnBPP; // number of bytes per pixel
sal_uInt32 mnScansize; // max size of scanline
sal_uInt32 mnYpos; // latest y position in full image
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index ad2329c1108e..26c5d13e01e7 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -173,7 +173,7 @@ public:
// 1. default tray
// 2. tray set for a concrete page by an application, e.g., writer
// allows setting a printer tray (for the default printer) for a
- // page style. This setting can be overriden by user by selecting
+ // page style. This setting can be overridden by user by selecting
// "Use only paper tray from printer preferences" on the Options
// page in the print dialog, in which case the default tray is
// used for all pages.
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 7dd4f2d7d2a1..1dbfd349384e 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -756,7 +756,7 @@ void RegionBand::InsertBands(long nTop, long nBottom)
break;
}
- // insert bands between two bands if neccessary
+ // insert bands between two bands if necessary
if ( pBand->mpNextBand )
{
if ( (pBand->mnYBottom + 1) < pBand->mpNextBand->mnYTop )
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 ) ) );
generated by cgit (git 2.34.1) at 2024-08-05 18:54:18 +0000