diff options
| author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2015-07-07 23:14:45 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-06 17:19:11 -0500 |
| commit | 5140c18944c5c288a5c2efdeabb3087ccdb86528 (patch) | |
| tree | 842f56b9522c5d2546cc25c88cb3fc277050f62e /vcl | |
| parent | 055b46b595bd3561c0293809369150b267d43792 (diff) | |
Fix typos
Change-Id: I020c7ce4d9aa93cb0292378a410cdb9f7788e920
Signed-off-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e544f449eded2738b45de4be13c72b128a16bafe)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontcache.cxx | 2 | ||||
| -rw-r--r-- | vcl/qa/complex/memCheck/CheckMemoryUsage.java | 4 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index f7735d1e4264..7289b5bf1014 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -145,7 +145,7 @@ void FontCache::flush() /* * for each font entry write: * name[;name[;name]] - * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverrride;embed;antialias[;{metricfile,typeflags}][;stylename] + * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverride;embed;antialias[;{metricfile,typeflags}][;stylename] */ if( nEntrySize > 1 ) nSubEntry = static_cast<const PrintFontManager::TrueTypeFontFile*>(*it)->m_nCollectionEntry; diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index 06d49dc89ce2..12e6c9bdf143 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -226,9 +226,9 @@ public class CheckMemoryUsage } /** - * Checks how much memory should consum + * Checks how much memory should consume * @param storageBefore - * @return 1 if consum is ok, else 0 + * @return 1 if consume is ok, else 0 */ private int checkMemory(int nConsumMore) { diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 74260fddb1da..13bb41e4d14e 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1017,7 +1017,7 @@ void Dialog::SetModalInputMode( bool bModal ) { pSVData->maAppData.mnModalDialog++; - // Diable the prev Modal Dialog, because our dialog must close at first, + // Disable the prev Modal Dialog, because our dialog must close at first, // before the other dialog can be closed (because the other dialog // is on stack since our dialog returns) if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) ) diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index f188527a8a23..fc4e97b10d5a 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1074,7 +1074,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ else if( rType == "image/bmp" ) { // #i83376# try if someone has the data in image/bmp already before - // doing the PIXMAP stuff (e.g. the gimp has this) + // doing the PIXMAP stuff (e.g. the Gimp has this) bSuccess = getPasteData( selection, m_nImageBmpAtom, rData ); #if OSL_DEBUG_LEVEL > 1 if( bSuccess ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 9ef4077f3b78..7c6000c5e5a7 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3473,7 +3473,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) else { /* - * do not unset the IC focuse here because would kill + * do not unset the IC focus here because would kill * a lookup choice windows that might have the focus now * mpInputContext->UnsetICFocus( this ); */ |