diff options
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/parseAFM.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/parseAFM.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/FWS.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/FWS.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwrapper.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 2 |
18 files changed, 24 insertions, 24 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 06a75dc27319..e663180f61f0 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -562,7 +562,7 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) if ( pIMStyles != NULL ) { // 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/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 24780e0c043f..6e0315c90dcb 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -533,7 +533,7 @@ void SalXLib::XError( Display *pDisplay, XErrorEvent *pEvent ) static Bool bOnce = False; if ( !bOnce ) { - std::fprintf(stderr, "X-Error occured in a request for X_OpenFont\n"); + std::fprintf(stderr, "X-Error occurred in a request for X_OpenFont\n"); EmitFontpathWarning(); bOnce = True ; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index d94e4fda4d3a..1d44250b17b4 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1408,8 +1408,8 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const break; // - - - - - Sun X-Server Tastatur ??? - - - - - - - - - - - - case XK_L1: // XK_F11: - nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop, - // but VCL doesn't have a key defintion for that + nKey = KEY_F11; // on a sun keyboard this actually is usually SunXK_Stop, + // but VCL doesn't have a key definition for that break; case XK_L2: // XK_F12: if ( GetServerVendor() == vendor_sun ) @@ -1714,7 +1714,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent *pEvent, case XLookupBoth: case XLookupChars: - /* nothing to, char allready in pPrintable */ + /* nothing to, char already in pPrintable */ break; } } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index ac12545291b0..ffa244ae14e3 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1493,7 +1493,7 @@ void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eTy // set transientFor hint /* #91030# dtwm will not map a dialogue if the transient - * window is iconified. This is deemed undesireable because + * window is iconified. This is deemed undesirable because * message boxes do not get mapped, so use the root as transient * instead. */ diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 430a6eb14937..4e6346f0bf9d 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1024,7 +1024,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In } #if OSL_DEBUG_LEVEL > 1 else - fprintf( stderr, "conversion unsuccessfull\n" ); + fprintf( stderr, "conversion unsuccessful\n" ); #endif return bSuccess; } @@ -3830,7 +3830,7 @@ void SelectionManager::shutdown() throw() osl_terminateThread( m_aThread ); /* * Allow thread to finish before app exits to avoid pulling the carpet - * out from under it if pasting is occuring during shutdown + * out from under it if pasting is occurring during shutdown * * a) allow it to have the Mutex and * b) reschedule to allow it to complete callbacks to any diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 5076d18075fc..6ecfbad8b0dc 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -67,7 +67,7 @@ namespace x11 { virtual void fireContentsChanged() = 0; virtual com::sun::star::uno::Reference< XInterface > getReference() = 0; // returns a reference that will keep the SelectionAdaptor alive until the - // refernce is released + // reference is released }; class DropTarget : diff --git a/vcl/unx/generic/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx index e1a33b4d1b5d..d1c59ce1f597 100644 --- a/vcl/unx/generic/fontmanager/parseAFM.cxx +++ b/vcl/unx/generic/fontmanager/parseAFM.cxx @@ -47,7 +47,7 @@ /* parseAFM.c * - * This file is used in conjuction with the parseAFM.h header file. + * This file is used in conjunction with the parseAFM.h header file. * This file contains several procedures that are used to parse AFM * files. It is intended to work with an application program that needs * font metric information. The program can be used as is by making a diff --git a/vcl/unx/generic/fontmanager/parseAFM.hxx b/vcl/unx/generic/fontmanager/parseAFM.hxx index cfebde696c14..2ab1c6451339 100644 --- a/vcl/unx/generic/fontmanager/parseAFM.hxx +++ b/vcl/unx/generic/fontmanager/parseAFM.hxx @@ -36,7 +36,7 @@ /* ParseAFM.h * - * This header file is used in conjuction with the parseAFM.c file. + * This header file is used in conjunction with the parseAFM.c file. * Together these files provide the functionality to parse Adobe Font * Metrics files and store the information in predefined data structures. * It is intended to work with an application program that needs font metric @@ -316,7 +316,7 @@ typedef struct * * "fp" should be a valid file pointer to an AFM file. * - * "fi" is a pointer to a pointer to a FontInfo record sturcture + * "fi" is a pointer to a pointer to a FontInfo record structure * (defined above). Storage for the FontInfo structure will be * allocated in parseFile and the structure will be filled in * with the requested data from the AFM File. diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 462dbca48b5f..9db26c99eb31 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -330,7 +330,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile ) } else { - // compression successfull, can get rid of file stream + // compression successful, can get rid of file stream delete mpFileStream, mpFileStream = NULL; mpMemStream->Seek( 0 ); } diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index 82f7a0c1d58b..7497e8300b60 100644 --- a/vcl/unx/generic/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx @@ -186,7 +186,7 @@ WMSupportsFWS (Display *display, int screen) * * newHandler() - * - * Handle X errors (temporarily) to record the occurance of BadWindow + * Handle X errors (temporarily) to record the occurrence of BadWindow * errors without crashing. Used to detect the FWS_COMM_WINDOW root window * property containing an old or obsolete window id. * diff --git a/vcl/unx/generic/window/FWS.hxx b/vcl/unx/generic/window/FWS.hxx index c6936215e747..946b41189fd7 100644 --- a/vcl/unx/generic/window/FWS.hxx +++ b/vcl/unx/generic/window/FWS.hxx @@ -37,7 +37,7 @@ extern "C" { Bool WMSupportsFWS (Display *display, int screen); -/* Send a client message to the FWS_COMM_WINDOW indicating the existance +/* Send a client message to the FWS_COMM_WINDOW indicating the existence * of a new FWS client window. Be careful to avoid BadWindow errors on * the XSendEvent in case the FWS_COMM_WINDOW root window property had * old/obsolete junk in it. diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 7cc5eeedf855..8d9d4a2668a2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3519,7 +3519,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 ) @@ -3958,7 +3958,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 ) diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index 0e7d9ee30b76..acfa7fd12043 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -190,7 +190,7 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data) Reference< XAccessible > xAccessible( pWindow->GetAccessible(true) ); /* We need the wrapper object for the top-level XAccessible to be - * in the wrapper registry when atk traverses the hierachy up on + * in the wrapper registry when atk traverses the hierarchy up on * focus events */ if( WINDOW_BORDERWINDOW == pWindow->GetType() ) diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 1ef4757e88df..9ae041484c03 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -864,9 +864,9 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star else { /* gail_focus_tracker remembers the focused object at the first - * parent in the hierachy that is a Gtk+ widget, but at the time the + * parent in the hierarchy that is a Gtk+ widget, but at the time the * event gets processed (at idle), it may be too late to create the - * hierachy, so doing it now .. + * hierarchy, so doing it now .. */ uno::Reference< accessibility::XAccessible > xParent( xContext->getAccessibleParent() ); diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index e591348e189f..eb1d3e6d7d1c 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -633,7 +633,7 @@ void GtkXLib::Init() g_set_application_name(X11SalData::getFrameClassName()); - // Set consistant name of the root accessible + // Set consistent name of the root accessible rtl::OUString aAppName = Application::GetAppName(); if( aAppName.getLength() > 0 ) { diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 6dbe23fc5cd7..bf5065be3937 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -449,7 +449,7 @@ void GtkData::deInitNWF( void ) { // free up global widgets // gtk_widget_destroy will in turn destroy the child hierarchy - // so only destroy disjunct hierachies + // so only destroy disjunct hierarchies if( gWidgetData[i].gCacheWindow ) gtk_widget_destroy( gWidgetData[i].gCacheWindow ); if( gWidgetData[i].gMenuWidget ) diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index d5cb5270744d..972f24b63148 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -3515,7 +3515,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) /* FIXME: * #122282# still more hacking: some IMEs never start a preedit but simply commit * in this case we cannot commit a single character. Workaround: do not do the -* single key hack for enter or space if the unicode commited does not match +* single key hack for enter or space if the unicode committed does not match */ static bool checkSingleKeyCommitHack( guint keyval, sal_Unicode cCode ) diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index dedf0b32ea2f..eac77cc5942f 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -795,7 +795,7 @@ QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, // Workaround for broken styles which do not add // QStyle::PM_ButtonDefaultIndicator to the size of the default button // (for example Keramik) - // FIXME Fix Keramik style to be consistant with Qt built-in styles. Aargh! + // FIXME Fix Keramik style to be consistent with Qt built-in styles. Aargh! if ( bDefault ) { QSize qContentsSize( 50, 50 ); |