diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 4 | ||||
-rw-r--r-- | vcl/inc/aqua/atsui/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/inc/coretext/salgdi2.h | 2 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/layout.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 35f8294900be..7b2394cfcc6a 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -156,7 +156,7 @@ namespace bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const { - // We dont' actually want to talk to Fontconfig at all for symbol fonts + // We don't actually want to talk to Fontconfig at all for symbol fonts if( rFontSelData.IsSymbolFont() ) return false; // StarSymbol is a unicode font, but it still deserves the symbol flag @@ -224,7 +224,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingCodes ) const { - // We dont' actually want to talk to Fontconfig at all for symbol fonts + // We don't actually want to talk to Fontconfig at all for symbol fonts if( rFontSelData.IsSymbolFont() ) return false; // StarSymbol is a unicode font, but it still deserves the symbol flag diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index 567d90c907a5..ea404d17ff6f 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -259,7 +259,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); // set the font virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); - // get the current font's etrics + // get the current font's metrics virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h index 158cf3cfae3b..df66c9d50d98 100644 --- a/vcl/inc/coretext/salgdi2.h +++ b/vcl/inc/coretext/salgdi2.h @@ -315,7 +315,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); // set the font virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); - // get the current font's etrics + // get the current font's metrics virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index f9fd488ee484..9f7ee7b05dbc 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -301,7 +301,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); // set the font virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); - // get the current font's etrics + // get the current font's metrics virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 4f049fb737e7..56b808ee6448 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1823,7 +1823,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) if (!sInternalChild.isEmpty()) pCurrentChild->Show(); - //Select the first page if its a notebook + //Select the first page if it's a notebook if (pCurrentChild->GetType() == WINDOW_TABCONTROL) { TabControl *pTabControl = static_cast<TabControl*>(pCurrentChild); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 8645bb90890f..e7f5e1b9c867 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1977,7 +1977,7 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) break; } //The default is to stick the focus into the first widget - //that accepts it, and if that happens and its a button + //that accepts it, and if that happens and it's a button //then that becomes the new default button, so explicitly //put the focus into the default button if (pChild->GetStyle() & WB_DEFBUTTON) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 8f24ac4a3cdc..c51d7e5a82ee 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1353,7 +1353,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) void Menu::InsertSeparator(const OString &rIdent, sal_uInt16 nPos) { - // do nothing if its a menu bar + // do nothing if it's a menu bar if ( bIsMenuBar ) return; @@ -6045,7 +6045,7 @@ Rectangle MenuBarWindow::GetMenuBarButtonRectPixel( sal_uInt16 nId ) aRect = pMenu->mpSalMenu->GetMenuBarButtonRectPixel( nId, ImplGetWindowImpl()->mpFrame ); if( aRect == Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) ) { - // system menu button is somehwere but location cannot be determined + // system menu button is somewhere but location cannot be determined return Rectangle(); } } diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 14fd5fc36e35..3348a4f026cb 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -522,7 +522,7 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) int nActualScore = 0; // check whether the XIM supports one of the desired styles - // only a single preedit and a single status style must occure + // only a single preedit and a single status style must occur // in a inpuut method style. Hideki said so, so i trust him for ( int nStyle = 0; nStyle < pIMStyles->count_styles; nStyle++ ) { diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 6fe079ccff43..d723f89eabe8 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3303,7 +3303,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) { if ( ! CallCallback(SALEVENT_KEYINPUT, &aKeyEvt) ) { - // independent layer doesnt want to handle key-event, so check + // independent layer doesn't want to handle key-event, so check // whether the keycode may have an alternate meaning KeyAlternate aAlternate = GetAlternateKeyCode( nKeyCode ); if ( aAlternate.nKeyCode != 0 ) @@ -3784,7 +3784,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) } // limit width and height if we are too large: #47757 - // olwm and fvwm need this, it doesnt harm the rest + // olwm and fvwm need this, it doesn't harm the rest // #i81311# do this only for sizable frames if( (nStyle_ & SAL_FRAME_STYLE_SIZEABLE) != 0 ) |