summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/aqua/source/dtrans/test_aquacb.cxx2
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx6
-rw-r--r--vcl/inc/vcl/print.hxx2
-rw-r--r--vcl/inc/vcl/strhelper.hxx2
-rw-r--r--vcl/source/control/ilstbox.cxx4
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx2
-rw-r--r--vcl/unx/inc/saldisp.hxx4
-rw-r--r--vcl/unx/kde/kdedata.cxx2
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx2
-rw-r--r--vcl/unx/source/app/saldata.cxx4
-rw-r--r--vcl/unx/source/app/saldisp.cxx4
-rw-r--r--vcl/unx/source/app/wmadaptor.cxx4
-rw-r--r--vcl/unx/source/gdi/salbmp.cxx2
-rw-r--r--vcl/unx/source/window/FWS.cxx2
-rw-r--r--vcl/unx/source/window/salframe.cxx6
-rw-r--r--vcl/unx/source/window/salobj.cxx4
-rw-r--r--vcl/win/source/window/salframe.cxx4
17 files changed, 28 insertions, 28 deletions
diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
index dbcd0c94c784..e3b3d7cc3af2 100644
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ b/vcl/aqua/source/dtrans/test_aquacb.cxx
@@ -144,7 +144,7 @@ int SAL_CALL main( int argc, char** argv )
OUString rdbName = OUString::createFromAscii( argv[1] );
Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
- // Print a message if an error occured.
+ // Print a message if an error occurred.
if ( !g_xFactory.is() )
{
OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory");
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 4ea221e5ff54..f87ef312c8de 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -215,7 +215,7 @@ public:
// PDF/A does not allow transparency
Warning_Transparency_Omitted_PDFA,
- // transparent object occured but is only supported since
+ // transparent object occurred but is only supported since
// PDF 1.4
Warning_Transparency_Omitted_PDF13,
@@ -657,9 +657,9 @@ The following structure describes the permissions used in PDF security
bool Emit();
/*
- * Get a list of errors that occured during processing
+ * Get a list of errors that occurred during processing
* this should enable the producer to give feedback about
- * any anomalies that might have occured
+ * any anomalies that might have occurred
*/
std::set< ErrorCode > GetErrors();
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 85f41d564686..cdc414741271 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -552,7 +552,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
{}
/* process a new set of properties
- * merges changed properties and returns "true" if any occured
+ * merges changed properties and returns "true" if any occurred
* if the optional output set is not NULL then the names of the changed properties are returned
**/
bool processProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp,
diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index 3cb88ea14bdc..cf433beadea6 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.hxx
@@ -49,7 +49,7 @@ int VCL_DLLPUBLIC GetCommandLineTokenCount( const ByteString& );
String VCL_DLLPUBLIC WhitespaceToSpace( const String&, BOOL bProtect = TRUE );
ByteString VCL_DLLPUBLIC WhitespaceToSpace( const ByteString&, BOOL bProtect = TRUE );
-// returns a string with multiple adjacent occurences of whitespace
+// returns a string with multiple adjacent occurrences of whitespace
// converted to a single space. if bProtect is TRUE (nonzero), then
// doublequote, singlequote and singleleftquote protect their respective
// contents
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 9d4958abfd88..b0ad4efe50ca 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -233,8 +233,8 @@ USHORT ImplEntryList::InsertEntry( USHORT nPos, ImplEntryType* pNewEntry, BOOL b
}
catch (uno::RuntimeException& )
{
- // XXX this is arguable, if the exception occured because pNewEntry is
- // garbage you wouldn't insert it. If the exception occured because the
+ // XXX this is arguable, if the exception occurred because pNewEntry is
+ // garbage you wouldn't insert it. If the exception occurred because the
// Collator implementation is garbage then give the user a chance to see
// his stuff
Insert( pNewEntry, (ULONG)0 );
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 95cc936df35f..13b8e889d177 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -686,7 +686,7 @@ void GtkXLib::Init()
SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp );
XSync( pDisp, False );
- pKbdExtension->UseExtension( ! HasXErrorOccured() );
+ pKbdExtension->UseExtension( ! HasXErrorOccurred() );
PopXErrorLevel();
m_pGtkSalDisplay->SetKbdExtension( pKbdExtension );
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index 1c120491b1d9..5b4fd62a2f5e 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -245,9 +245,9 @@ public:
virtual void Remove( int fd );
void XError( Display *pDisp, XErrorEvent *pEvent );
- bool HasXErrorOccured() const { return m_aXErrorHandlerStack.back().m_bWas; }
+ bool HasXErrorOccurred() const { return m_aXErrorHandlerStack.back().m_bWas; }
unsigned int GetLastXErrorRequestCode() const { return m_aXErrorHandlerStack.back().m_nLastErrorRequest; }
- void ResetXErrorOccured() { m_aXErrorHandlerStack.back().m_bWas = false; }
+ void ResetXErrorOccurred() { m_aXErrorHandlerStack.back().m_bWas = false; }
void PushXErrorLevel( bool bIgnore );
void PopXErrorLevel();
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index a9be7668e6b9..9f07786212ee 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -187,7 +187,7 @@ void KDEXLib::Init()
SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp );
XSync( pDisp, False );
- pKbdExtension->UseExtension( ! HasXErrorOccured() );
+ pKbdExtension->UseExtension( ! HasXErrorOccurred() );
PopXErrorLevel();
pSalDisplay->SetKbdExtension( pKbdExtension );
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index ea7c7fd64cac..cc168a2fe3be 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -184,7 +184,7 @@ void KDEXLib::Init()
SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp );
XSync( pDisp, False );
- pKbdExtension->UseExtension( ! HasXErrorOccured() );
+ pKbdExtension->UseExtension( ! HasXErrorOccurred() );
PopXErrorLevel();
pSalDisplay->SetKbdExtension( pKbdExtension );
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index 609ae471ceaa..2d27ec497ec9 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.cxx
@@ -465,7 +465,7 @@ void SalXLib::Init()
SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp );
XSync( pDisp, False );
- pKbdExtension->UseExtension( ! HasXErrorOccured() );
+ pKbdExtension->UseExtension( ! HasXErrorOccurred() );
PopXErrorLevel();
pSalDisplay->SetKbdExtension( pKbdExtension );
@@ -535,7 +535,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/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index c85c44cb2b61..c24a4f3956eb 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -2365,13 +2365,13 @@ void SalX11Display::Yield()
Dispatch( &aEvent );
#ifdef DBG_UTIL
- if( pXLib_->HasXErrorOccured() )
+ if( pXLib_->HasXErrorOccurred() )
{
XFlush( pDisp_ );
PrintEvent( "SalDisplay::Yield (WasXError)", &aEvent );
}
#endif
- pXLib_->ResetXErrorOccured();
+ pXLib_->ResetXErrorOccurred();
}
long SalX11Display::Dispatch( XEvent *pEvent )
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx
index d0680b599615..725ec7d65733 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/source/app/wmadaptor.cxx
@@ -669,7 +669,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) :
&& aRealType == XA_CARDINAL
&& nFormat == 32
&& nItems != 0
- && ! m_pSalDisplay->GetXLib()->HasXErrorOccured()
+ && ! m_pSalDisplay->GetXLib()->HasXErrorOccurred()
)
{
aCheckWindow = *(XLIB_Window*)pProperty;
@@ -872,7 +872,7 @@ bool WMAdaptor::getNetWmName()
&& aRealType == XA_WINDOW
&& nFormat == 32
&& nItems != 0
- && ! m_pSalDisplay->GetXLib()->HasXErrorOccured()
+ && ! m_pSalDisplay->GetXLib()->HasXErrorOccurred()
)
{
aCheckWindow = *(XLIB_Window*)pProperty;
diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx
index ec00e0e1fc2e..2ad9f51d92a9 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/source/gdi/salbmp.cxx
@@ -211,7 +211,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
// so better catch the XError
pXLib->PushXErrorLevel( true );
XImage* pImage = XGetImage( pXDisp, aDrawable, nX, nY, nWidth, nHeight, AllPlanes, ZPixmap );
- bool bWasError = pXLib->HasXErrorOccured() && pXLib->GetLastXErrorRequestCode() == X_GetImage;
+ bool bWasError = pXLib->HasXErrorOccurred() && pXLib->GetLastXErrorRequestCode() == X_GetImage;
pXLib->PopXErrorLevel();
if( ! bWasError && pImage && pImage->data )
diff --git a/vcl/unx/source/window/FWS.cxx b/vcl/unx/source/window/FWS.cxx
index 1c08cd6ed42d..a90f76af90c2 100644
--- a/vcl/unx/source/window/FWS.cxx
+++ b/vcl/unx/source/window/FWS.cxx
@@ -191,7 +191,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/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index e751c04218c6..977c0ecdf93f 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -3753,7 +3753,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
&hDummy,
&Children,
&nChildren );
- if( GetDisplay()->GetXLib()->HasXErrorOccured() )
+ if( GetDisplay()->GetXLib()->HasXErrorOccurred() )
{
hWM_Parent = GetShellWindow();
break;
@@ -3843,7 +3843,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
* so need real geometries here
* (this will fail with virtual roots ?)
*/
- GetDisplay()->GetXLib()->ResetXErrorOccured();
+ GetDisplay()->GetXLib()->ResetXErrorOccurred();
int xp, yp, x, y;
unsigned int wp, w, hp, h, bw, d;
XGetGeometry( GetXDisplay(),
@@ -3855,7 +3855,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
&hRoot,
&xp, &yp, &wp, &hp, &bw, &d );
bool bResized = false;
- if( ! GetDisplay()->GetXLib()->HasXErrorOccured() )
+ if( ! GetDisplay()->GetXLib()->HasXErrorOccurred() )
{
maGeometry.nRightDecoration = wp - w - maGeometry.nLeftDecoration;
maGeometry.nBottomDecoration = hp - h - maGeometry.nTopDecoration;
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index 65a53ed8ac12..6704077b1ec4 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.cxx
@@ -149,7 +149,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
pVisual,
CWEventMask|CWColormap, &aAttribs );
XSync( pDisp, False );
- BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
+ BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccurred();
pSalDisp->GetXLib()->PopXErrorLevel();
if( bWasXError )
{
@@ -176,7 +176,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
pObjData->pAppContext = NULL;
XSync(pDisp, False);
- BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
+ BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccurred();
pSalDisp->GetXLib()->PopXErrorLevel();
if( bWasXError )
{
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 7e378cf7e58a..445cdf5c76f2 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4935,7 +4935,7 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM lParam )
if( nFound == 1 )
nRet = MAKELRESULT( idxFound, MNC_EXECUTE );
else
- // duplicate mnemonics, just select the next occurence
+ // duplicate mnemonics, just select the next occurrence
nRet = MAKELRESULT( idxFound, MNC_SELECT );
return nRet;
@@ -5205,7 +5205,7 @@ static int ImplHandleMenuSelect( HWND hWnd, WPARAM wParam, LPARAM lParam )
long nRet = 0;
if ( hMenu && !pFrame->mLastActivatedhMenu )
{
- // we never activated a menu (ie, no WM_INITMENUPOPUP has occured yet)
+ // we never activated a menu (ie, no WM_INITMENUPOPUP has occurred yet)
// which means this must be the menubar -> send activation/deactivation
SalMenuEvent aMenuEvt;
WinSalMenuItem *pSalMenuItem = ImplGetSalMenuItem( hMenu, nId, bByPosition );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 16:33:30 +0000