diff options
author | Chris Laplante <mostthingsweb@gmail.com> | 2014-05-14 14:15:38 -0400 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-17 12:38:38 +0000 |
commit | 3c1e30b77df4f34c4954bff37a08439ace7f2434 (patch) | |
tree | a5231657e37e3b2efb2ba438c43561bf5f27649c /vcl | |
parent | f62de9113a4866f7152acbe0e8221c594b7a7b68 (diff) |
Correct common misspellings, and remove some ASCII art along the way.
Change-Id: I42787db31769e8bde984c5f4f0aa90335e889b1c
Reviewed-on: https://gerrit.libreoffice.org/9356
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/generic/fontmanager/helper.cxx | 2 | ||||
-rw-r--r-- | vcl/inc/osx/saldata.hxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/canvasbitmaptest.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/ctrl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/igif/gifread.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/sgvspln.cxx | 60 | ||||
-rw-r--r-- | vcl/source/filter/sgvspln.hxx | 45 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/window/FWS.cxx | 48 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 4 |
11 files changed, 39 insertions, 134 deletions
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index 7250964deb6b..bf65e32423f6 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -202,7 +202,7 @@ OUString psp::getFontPath() // replace net and user paths if the path exists aPathBuffer.append(aConfigPath); aPathBuffer.appendAscii("/" LIBO_SHARE_FOLDER "/fonts"); - // check existance of config path + // check existence of config path struct stat aStat; if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat ) || ! S_ISDIR( aStat.st_mode ) ) diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index fa7280e574e1..c07fe8a46840 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -70,7 +70,7 @@ public: SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance std::list<AquaSalFrame*> maFrames; // list of all frames - boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance + boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existence std::list<AquaSalFrame*> maPresentationFrames; // list of frames in presentation mode SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 0f0a52a88f73..10118a7a42e4 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -123,7 +123,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, CPPUNIT_ASSERT_MESSAGE( "Color space not there", aLayout.ColorSpace.is()); - CPPUNIT_ASSERT_MESSAGE( "Palette existance does not conform to bitmap", + CPPUNIT_ASSERT_MESSAGE( "Palette existence does not conform to bitmap", aLayout.Palette.is() == (nDepth <= 8)); uno::Sequence<sal_Int8> aPixelData2 = xBmp->getPixel( aLayout, geometry::IntegerPoint2D(0,0) ); diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 331bb0b2aa34..6baf5ae8ad9e 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -370,7 +370,7 @@ void Control::ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ) void Control::DataChanged( const DataChangedEvent& rDCEvt) { - // we don't want to loose some style settings for controls created with the + // we don't want to lose some style settings for controls created with the // toolkit if ( IsCreatedWithToolkit() && (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 94f1a7258d32..a3633cd1eedf 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -738,7 +738,7 @@ bool GIFReader::ProcessGIF() } break; - // an error occured + // an error occurred case( ABORT_READING ): { bEnd = true; diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 4d8e86d05c07..2a710b5cf6c4 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -385,15 +385,7 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, } // extern "C" -/************************************************************************* -|* -|* NaturalSpline() -|* -|* Description calculates the coefficients of natural -|* cubic splines with n intervals. -|* -*************************************************************************/ - +// Calculates the coefficients of natural cubic splines with n intervals. sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, double Marg0, double MargN, sal_uInt8 MargCond, @@ -488,15 +480,7 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, return 0; } -/************************************************************************* -|* -|* PeriodicSpline() -|* -|* Description calculates the coefficients of periodical -|* cubic splines with n intervals. -|* -*************************************************************************/ - +// calculates the coefficients of periodical cubic splines with n intervals. sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, double* b, double* c, double* d) { // array dimensions should range from [0..n]! @@ -555,15 +539,8 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, return 0; } -/************************************************************************* -|* -|* ParaSpline() -|* -|* Description calculate the coefficients of parametric -|* natural of periodical cubic splines with n intervals -|* -*************************************************************************/ - +// calculate the coefficients of parametric natural of periodical cubic splines +// with n intervals sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, double Marg01, double Marg02, double MargN1, double MargN2, @@ -629,20 +606,6 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, return 0; } -/************************************************************************* -|* -|* CalcSpline() -|* -|* Description Calculates the coefficients of parametrised -|* natural or periodic cubic polynom-splines. -|* The corner points of the polygon passed are used -|* as support points. n returns the number of partial polynoms. -|* This function returns TRUE if no error occured. -|* Only in this case memory for the coefficient array -|* has been allocated, which can be freed by the caller -|* using a delete. -*************************************************************************/ - bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, double*& ax, double*& ay, double*& bx, double*& by, double*& cx, double*& cy, double*& dx, double*& dy, double*& T) @@ -712,21 +675,6 @@ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, return bRet; } -/************************************************************************* -|* -|* Spline2Poly() -|* -|* Description converts a parametrised cubic spline (natural -|* or periodic) to an approximate polygon. -|* The function returns false, if an error occured -|* during the calculation of the coefficients or -|* the polygon became too large (>PolyMax=16380). -|* In the first case the polygon has 0, in the -|* second case PolyMax points. -|* To prevent coordinate overflows we limit -|* them to +/-32000. -|* -*************************************************************************/ bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly) { short MinKoord=-32000; // to prevent diff --git a/vcl/source/filter/sgvspln.hxx b/vcl/source/filter/sgvspln.hxx index f58891639ad3..4eb822e854a4 100644 --- a/vcl/source/filter/sgvspln.hxx +++ b/vcl/source/filter/sgvspln.hxx @@ -20,40 +20,25 @@ #ifndef INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX #define INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX -/************************************************************************* -|* -|* CalcSpline() -|* -|* Description Calculates the coefficients of parametrised -|* natural or periodic cubic polynom-splines. -|* The corner points of the polygon passed are used -|* as support points. n returns the number of partial polynoms. -|* This function returns TRUE if no error occured. -|* Only in this case memory for the coefficient array -|* has been allocated, which can be freed by the caller -|* using a delete. -|* -*************************************************************************/ - +/* + * Calculates the coefficients of parametrised natural or periodic cubic + * polynom-splines. The corner points of the polygon passed are used as + * support points. n returns the number of partial polynoms. This function + * returns TRUE if no error occurred. Only in this case memory for the + * coefficient array has been allocated, which can be freed by the caller + * using a delete. + */ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, double*& ax, double*& ay, double*& bx, double*& by, double*& cx, double*& cy, double*& dx, double*& dy, double*& T); -/************************************************************************* -|* -|* Spline2Poly() -|* -|* Description converts a parametrised cubic spline (natural -|* or periodic) to an approximate polygon. -|* The function returns false, if an error occured -|* during the calculation of the coefficients or -|* the polygon became too large (>PolyMax=16380). -|* In the first case the polygon has 0, in the -|* second case PolyMax points. -|* To prevent coordinate overflows we limit -|* them to +/-32000. -|* -*************************************************************************/ +/* + * Converts a parametrised cubic spline (natural or periodic) to an approximate + * polygon. The function returns false, if an error occurred during the + * calculation of the coefficients or the polygon became too large (>PolyMax=16380). + * In the first case the polygon has 0, in the second case PolyMax points. + * To prevent coordinate overflows we limit them to +/-32000. + */ bool Spline2Poly(Polygon& rSpln, bool Periodic, Polygon& rPoly); #endif // INCLUDED_VCL_SOURCE_FILTER_SGVSPLN_HXX diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 5f825e04f6fc..2906bb2690c9 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -5987,7 +5987,7 @@ bool PDFWriterImpl::finalizeSignature() if (!cert) { - SAL_WARN("vcl.gdi", "PDF Signing: Error occured, certificate cannot be reconstructed."); + SAL_WARN("vcl.gdi", "PDF Signing: Error occurred, certificate cannot be reconstructed."); return false; } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a12de7b6eeb4..51491368e059 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4897,7 +4897,7 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) if( pToolItem && pToolItem->mpWindow && HasFocus() ) { ImplHideFocus(); - mbChangingHighlight = true; // avoid focus change due to loose focus + mbChangingHighlight = true; // avoid focus change due to loss of focus pToolItem->mpWindow->ImplControlFocus( GETFOCUS_TAB ); mbChangingHighlight = false; } @@ -5153,7 +5153,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) { Window *pFocusWindow = Application::GetFocusWindow(); ImplHideFocus(); - mbChangingHighlight = true; // avoid focus change due to loose focus + mbChangingHighlight = true; // avoid focus change due to loss of focus pItem->mpWindow->ImplControlFocus( GETFOCUS_TAB ); mbChangingHighlight = false; if( pFocusWindow != Application::GetFocusWindow() ) diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index b6887dae7a67..a2dbdae3da16 100644 --- a/vcl/unx/generic/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx @@ -52,15 +52,8 @@ static Bool fwsHandlesFocus; static Window fwsCommWindow; -/*************************************<->*********************************** - * - * WMSupportsFWS() - - * - * Initialize our atoms and determine if the current window manager is - * providing FWS extension support. - * - *************************************<->***********************************/ - +// Initialize our atoms and determine if the current window manager is +// providing FWS extension support. Bool WMSupportsFWS (Display *display, int screen) { @@ -174,16 +167,9 @@ WMSupportsFWS (Display *display, int screen) return True; } -/*************************************<->*********************************** - * - * newHandler() - - * - * 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. - * - *************************************<->***********************************/ - +// 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. extern "C" { static Bool badWindowFound; @@ -202,17 +188,10 @@ newHandler (Display *display, XErrorEvent *xerror) } -/*************************************<->*********************************** - * - * RegisterFwsWindow() - - * - * Send a client message to the FWS_COMM_WINDOW indicating the existance - * 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. - * - *************************************<->***********************************/ - +// 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. Bool RegisterFwsWindow (Display *display, Window window) { @@ -241,14 +220,7 @@ RegisterFwsWindow (Display *display, Window window) return !badWindowFound; } -/*************************************<->*********************************** - * - * AddFwsProtocols - - * - * Add the FWS protocol atoms to the WMProtocols property for the window. - * - *************************************<->***********************************/ - +// Add the FWS protocol atoms to the WMProtocols property for the window. void AddFwsProtocols (Display *display, Window window) { diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a504baa2837e..55d45552d8fd 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -4017,7 +4017,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) break; case ButtonPress: - // if we loose the focus in presentation mode + // if we lose the focus in presentation mode // there are good chances that we never get it back // since the WM ignores us if( IsOverrideRedirect() ) @@ -4072,7 +4072,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) if( ! (nStyle_ & SAL_FRAME_STYLE_FLOAT ) && mbInShow && GetDisplay()->getWMAdaptor()->getWindowManagerName().equalsAscii( "Sawfish" ) ) { // don't set the focus into the IME status window - // since this will lead to a parent loose-focus, close status, + // since this will lead to a parent loss of focus, close status, // reget focus, open status, .... flicker loop if ( (I18NStatus::get().getStatusFrame() != this) ) bSetFocus = true; |