From da40cac540e7d735edbe9069b3c8ec6af4530208 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Mon, 10 Nov 2014 15:05:25 +0100 Subject: Fix common typos. No automatic tools. Handmade… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 2 +- svx/source/accessibility/AccessibleShape.cxx | 2 +- svx/source/core/extedit.cxx | 2 +- svx/source/fmcomp/fmgridcl.cxx | 2 +- svx/source/fmcomp/fmgridif.cxx | 2 +- svx/source/fmcomp/gridcell.cxx | 4 ++-- svx/source/form/fmobj.cxx | 2 +- svx/source/form/fmshell.cxx | 2 +- svx/source/form/fmshimp.cxx | 4 ++-- svx/source/form/fmundo.cxx | 2 +- svx/source/form/fmview.cxx | 2 +- svx/source/inc/docrecovery.hxx | 2 +- svx/source/inc/svxrectctaccessiblecontext.hxx | 2 +- svx/source/sdr/contact/objectcontactofpageview.cxx | 2 +- svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2 +- svx/source/svdraw/svdedtv.cxx | 2 +- svx/source/svdraw/svdedtv2.cxx | 2 +- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/svdraw/svdoedge.cxx | 4 ++-- svx/source/svdraw/svdotext.cxx | 2 +- svx/source/svdraw/svdundo.cxx | 2 +- svx/source/table/svdotable.cxx | 2 +- svx/source/tbxctrls/fillctrl.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 2 +- svx/source/tbxctrls/tbxalign.cxx | 2 +- svx/source/unodraw/unoshap4.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) (limited to 'svx') diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index fa8a13f1c381..6f401aa7213b 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -43,7 +43,7 @@ namespace drawinglayer class SdrTextPrimitive2D : public BufferedDecompositionPrimitive2D { private: - // The text model data; this sould later just be the OutlinerParaObject or + // The text model data; this should later just be the OutlinerParaObject or // something equal ::tools::WeakReference< SdrText > mrSdrText; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 01cfa5538ba1..2cecce0f1668 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1489,7 +1489,7 @@ throw (uno::RuntimeException, std::exception) std::sort( vXShapes.begin(), vXShapes.end(), XShapePosCompareHelper() ); - //get the the index of the selected object in the group + //get the index of the selected object in the group std::vector< uno::Reference >::iterator aIter; //we start counting position from 1 sal_Int32 nPos = 1; diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index c5e6eaf84179..78f5bd0bfc41 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -111,7 +111,7 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject ) // Write the Graphic to the file now XOutBitmap::WriteGraphic(aGraphic, aTempFileName, aFilter, XOUTBMP_USE_NATIVE_IF_POSSIBLE | XOUTBMP_DONT_EXPAND_FILENAME); - // There is a possiblity that sPath extension might have been changed if the + // There is a possibility that sPath extension might have been changed if the // provided extension is not writable m_aFileName = aTempFileName; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 6213effb9c6c..b0b477c6ec1b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -467,7 +467,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) aPossibleTypes.push_back(SID_FM_FORMATTEDFIELD); break; } - // if it's a currency field, a a "currency field" option + // if it's a currency field, a "currency field" option try { if ( ::comphelper::hasProperty(FM_PROP_ISCURRENCY, xField) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index c6c1c504bb50..64b78c5d5948 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2478,7 +2478,7 @@ Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(cons { m_bInterceptingDispatch = true; // safety against recursion : as we are master of the first chain element and slave of the last one we would - // have an infinite loop without this if no dispatcher can fullfill the request + // have an infinite loop without this if no dispatcher can fulfill the request xResult = m_xFirstDispatchInterceptor->queryDispatch(aURL, aTargetFrameName, nSearchFlags); m_bInterceptingDispatch = false; } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index f9514e7dec4a..bd51defa89d3 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -232,7 +232,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s impl_toggleScriptManager_nothrow( true ); - // only if we use have a bound field, we use a a controller for displaying the + // only if we use have a bound field, we use a controller for displaying the // window in the grid if (m_xField.is()) m_xController = pCellControl->CreateController(); @@ -664,7 +664,7 @@ void DbCellControl::implValuePropertyChanged( ) void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet >& /*_rxModel*/ ) { - // nothing to to here + // nothing to do here } diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 483c12cf85e6..80c508aeb8ce 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -355,7 +355,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) ensureModelEnv(xSourceContainer, m_xEnvironmentHistory); m_aEventsHistory = aEvts; - // if we we're clone there was a call to operator=, so aEvts are exactly the events we need here ... + // if we were clone there was a call to operator=, so aEvts are exactly the events we need here... } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index c9f95466cdd0..62d08808055b 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -805,7 +805,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( bReopenNavigator ) // we closed the navigator only to implicitly commit it (as we do not have another - // direct wire to it), but to the user, it should look it it was always open + // direct wire to it), but to the user, it should look as it was always open GetViewShell()->GetViewFrame()->ToggleChildWindow( SID_FM_FILTER_NAVIGATOR ); } break; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index faf0daeb9904..b12779cf8882 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1556,7 +1556,7 @@ void FmXFormShell::ExecuteSearch() Reference< XGrid> xGrid(xActiveControl, UNO_QUERY); if (xGrid.is()) { - // fuer strActiveField brauche ich die die ControlSource der Column, dafuer den Columns-Container, dafuer die + // fuer strActiveField brauche ich die ControlSource der Column, dafuer den Columns-Container, dafuer die // GridPeer Reference< XGridPeer> xGridPeer(xActiveControl->getPeer(), UNO_QUERY); Reference< XIndexAccess> xColumns; @@ -2850,7 +2850,7 @@ void FmXFormShell::SetDesignMode(bool bDesign) // 67506 - 15.07.99 - FS if (bDesign && m_bHadPropertyBrowserInDesignMode) { - // The UIFeatureChanged performes an update (a check of the available features) asynchronously. + // The UIFeatureChanged performs an update (a check of the available features) asynchronously. // So we can't call ShowSelectionProperties directly as the according feature isn't enabled yet. // That's why we use an asynchron execution on the dispatcher. // (And that's why this has to be done AFTER the UIFeatureChanged.) diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 4c641587962f..24edb9239218 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -566,7 +566,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) } // no Undo for transient and readonly props. But unfortunately "transient" is not only that the - // "transient" flag is set for the property in question, instead is is somewhat more complex + // "transient" flag is set for the property in question, instead it is somewhat more complex // Transience criterions are: // - the "transient" flag is set for the property // - OR the control has a non-empty COntrolSource property, i.e. is intended to be bound diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 5926389c48eb..b7331257feb9 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -114,7 +114,7 @@ void FmFormView::Init() // mode by default (though a newly created model returns true for GetOpenInDesignMode). // We _want_ to have this because it makes a lot of hacks following the original fix DBG_ASSERT( !bInitDesignMode, "FmFormView::Init: doesn't the model default to FALSE anymore?" ); - // if this asserts, either the on-contruction default in the model has changed (then this here + // if this asserts, either the on-construction default in the model has changed (then this here // may not be necessary anymore), or we're not dealing with a new document .... bInitDesignMode = true; } diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index c29d1397d9a5..174774fdc906 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -100,7 +100,7 @@ enum EDocStates /// the Auto/Emergency saved document isn't useable any longer E_DAMAGED = 64, - /// the Auto/Emergency saved document isnt really up-to-date (some changes can be missing) + /// the Auto/Emergency saved document is not really up-to-date (some changes can be missing) E_INCOMPLETE = 128, /// the Auto/Emergency saved document was processed successfully E_SUCCEDED = 512 diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 0ade59b50584..84f1aad9dc01 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -486,7 +486,7 @@ protected: private: /** Description of this object. This is not a constant because it can - be set from the outside. Furthermore, it changes according the the + be set from the outside. Furthermore, it changes according to the draw page's display mode. */ OUString msDescription; diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 390c5bd2d602..1d2c154bf33a 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -253,7 +253,7 @@ namespace sdr // more than just the shapes, and then it fails. // // This is good enough for the tiled rendering for the moment, but - // we need to come up with with the real solution shortly. + // we need to come up with the real solution shortly. // Only get the expensive hierarchy if we can be sure that the // returned sequence won't be empty anyway. diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 1bc65c29f519..7ab63888fc60 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -1044,7 +1044,7 @@ namespace sdr { namespace contact { // Somebody requested a control for a new device, which means either of // - our PageView's paint window changed since we were last here // - we don't belong to a page view, and are simply painted onto different devices - // The first sounds strange (doens't it?), the second means we could perhaps + // The first sounds strange (doesn't it?), the second means we could perhaps // optimize this in the future - there is no need to re-create the control every time, // is it? // #i74523# / 2007-02-15 / frank.schoenheit@sun.com diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 8c6ca5d58ece..3bb3f12bbcb4 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -706,7 +706,7 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark) SdrMark* pM = rMark.GetMark(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); - // extra undo actions for changed connector which now may hold its layed out path (SJ) + // extra undo actions for changed connector which now may hold its laid out path (SJ) std::vector< SdrUndoAction* > vConnectorUndoActions( CreateConnectorUndo( *pObj ) ); AddUndoActions( vConnectorUndoActions ); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 5ff10660e2c1..93eadf8d5070 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1111,7 +1111,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) } case SDR_MERGE_SUBSTRACT: { - // Substract B from A + // Subtract B from A aMergePolyPolygonA = basegfx::tools::solvePolygonOperationDiff(aMergePolyPolygonA, aMergePolyPolygonB); break; } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index b40a57829948..ba3c477202fb 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3220,7 +3220,7 @@ bool SdrObject::HasLineStyle() const // #i52224# // on import of OLE object from MS documents the BLIP size might be retrieved, // the following four methods are used to control it; -// usually this data makes no sence after the import is finished, since the object +// usually this data makes no sense after the import is finished, since the object // might be resized diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 564d07c8b0cf..d2122907422f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1172,7 +1172,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec . . . . . . . . . . only in . . . _|__|_ _|__|_ . . . . . . . . . . . . . * . * . _|_ _|_ . * . * part: * . * _|_ * * _|_ * . * * . * . * * . * . * - 3.3: The line exits point away from the other object or or miss its back (52+4). + 3.3: The line exits point away from the other object or miss its back (52+4). _|__|__|__|_ * * _|__|__|__|_ * . . . * * . * . * these 4 * . * . * * . * . * _|__|__|__|_ . . _|__|__|__|_ T T T . . . . T T T constellations . . . T . . T . . . _|__|_ |- . * * . -| _|__|_ T T |- . * * . -| T T are covered * . |- . * * . -| . * @@ -1520,7 +1520,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } /* -There could be a maximum of 64 different developments with with 5 lines, a +There could be a maximum of 64 different developments with 5 lines, a maximum of 32 developments with 4 lines, a maximum of 16 developments with 3 lines, a maximum of 8 developments with 2 lines. This gives us a total of 124 possibilities. diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 727211f13240..4ef80f611d27 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -938,7 +938,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS long nX=(nWantWdt*100) /nIsWdt; // calculate X stretching long nY=(nWantHgt*100) /nIsHgt; // calculate Y stretching bool bChkX = true; - if (bNoStretching) { // might only be be possible proportionally + if (bNoStretching) { // might only be possible proportionally if (nX>nY) { nX=nY; bChkX=false; } else { nY=nX; } } diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index c88d2c303a93..bde9c51b4085 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -372,7 +372,7 @@ void SdrUndoAttrObj::Undo() // Since ClearItem sets back everything to normal // it also sets fit-to-size text to non-fit-to-size text and // switches on autogrowheight (the default). That may lead to - // loosing the geometry size info for the object when it is + // losing the geometry size info for the object when it is // laid out again from AdjustTextFrameWidthAndHeight(). This makes // rescuing the size of the object necessary. const Rectangle aSnapRect = pObj->GetSnapRect(); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index fe67817d1a27..71d6f3e386c5 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -511,7 +511,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset fixes fdo#59889 and resizing of table in edge dragging Total vertical edges in a NxN table is N+1, indexed from 0 to N and total Columns is N, indexed from 0 to N-1 In LTR table vertical edge responsible for dragging of column x(x=0 to N-1) is, Edge x+1 - But in RTL table vertical edge responisble for dragging of column x(x=0 to N-1, but from right to left)is, Edge x + But in RTL table vertical edge responsible for dragging of column x(x=0 to N-1, but from right to left)is, Edge x In LTR table dragging of edge 0(for RTL table edge N) does nothing. */ //Todo: Implement Dragging functionality for leftmost edge of table. diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 5b4aa1aaf5d5..ea0d91d7fa8c 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -826,7 +826,7 @@ IMPL_LINK(FillControl, SelectFillAttrHdl, ListBox *, pBox) // two undo entries. Reason for this is that indeed two actions are executed, the fill style // and the fill attribute change. The sidebar already handles both separately, so // changing the fill style already changes the object and adds a default fill attribute for - // the newly choosen fill style. + // the newly chosen fill style. // This control uses the older user's two-step action to select a fill style and a fill attribute. In // this case a lot of things may go wrong (e.g. the user stops that action and does something // different), thus the solution of the sidebar should be preferred from my POV in the future diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index a0a9649e171d..8216a9f7d3c3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -688,7 +688,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) //TODO Draw the other background styles: gradient, hatching and bitmap } - // when the font- and background-color are too similiar, adjust the Font-Color + // when the font and background color are too similar, adjust the Font-Color if( (aFontCol != COL_AUTO) || (aBackCol != COL_AUTO) ) aFontCol = TestColorsVisible(aFontCol, (aBackCol != COL_AUTO) ? aBackCol : pDevice->GetBackground().GetColor()); diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 14d15b25fde6..9236c25d271c 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -75,7 +75,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow() sal_Bool SAL_CALL SvxTbxCtlAlign::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) { - // We control a sub-toolbar therefor, we have to return true. + // We control a sub-toolbar therefore, we have to return true. return sal_True; } diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index d3b96039e9f7..0f93277ee927 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -92,7 +92,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro { case OWN_ATTR_OLE_VISAREA: { - // TODO/LATER: seems to make no sence for iconified object + // TODO/LATER: seems to make no sense for iconified object awt::Rectangle aVisArea; if( (rValue >>= aVisArea) && mpObj->ISA(SdrOle2Obj)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 9c6df3a99b0b..9d0abd5388de 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1226,7 +1226,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) } else { - //aRect.SetSize(aLocalSize); // this call substract 1 // http://www.openoffice.org/issues/show_bug.cgi?id=83193 + //aRect.SetSize(aLocalSize); // this call subtract 1 // http://www.openoffice.org/issues/show_bug.cgi?id=83193 if ( !aLocalSize.Width() ) { aRect.Right() = RECT_EMPTY; -- cgit