diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2016-02-02 19:47:20 +0100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:57 -0400 |
commit | 32da3e000cec3a2045f1a33b7549d64c673a67da (patch) | |
tree | 3da3fbce823604bfb9ef2b772764385071aa7f19 /sc | |
parent | 4e779bffa2ae86ba2bf7d537b0f9b2c1c0e59b64 (diff) |
Fix typos
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3
Reviewed-on: https://gerrit.libreoffice.org/21797
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 534b2a4b58ba765dbc256d6297e33453524915e2)
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/table2.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xetable.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/sheetdatabuffer.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xlescher.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaworksheets.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5d43a3728844..3f0cc0177640 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2004,7 +2004,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO bool bHitOne = true; if ( nCol > nX2+1 ) { - // Does the rotated cell extend into the visable range? + // Does the rotated cell extend into the visible range? SCCOL nTouchedCol = nCol; long nWidth = static_cast<long>(mpRowHeights->getValue(nRow) * nFactor); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 3c36ffc9fd41..6c44e6b0f0eb 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -316,7 +316,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv ) // tdf#56036: Allow tabs/newlines in imported formulas (for now simply treat them as (and convert to) space) // TODO: tdf#76310: allow saving newlines as is (as per OpenFormula specification v.1.2, clause 5.14 "Whitespace") // This is compliant with the OASIS decision (see https://issues.oasis-open.org/browse/OFFICE-701) -// Also, this would enable correct roundtrip from/to OOXML without loosing tabs/newlines +// Also, this would enable correct roundtrip from/to OOXML without losing tabs/newlines // This requires saving actual space characters in ocSpaces token, using them in UI and saving /* tab */ t[ 9] = SC_COMPILER_C_CHAR_DONTCARE | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP; /* lf */ t[10] = SC_COMPILER_C_CHAR_DONTCARE | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 25e978c58d35..b05b3d31234b 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -1864,7 +1864,7 @@ void XclExpRow::Finalize( const ScfUInt16Vec& rColXFIndexes, bool bProgress ) // *** Fill gaps with BLANK/MULBLANK cell records *** --------------------- - /* This is needed because nonexistant cells in Calc are not formatted at all, + /* This is needed because nonexistent cells in Calc are not formatted at all, but in Excel they would have the column default format. Blank cells that are equal to the respective column default are removed later in this function. */ if( !mbAlwaysEmpty ) @@ -2196,7 +2196,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt if ( pPrev->IsDefaultable()) { // if the previous row we processed is not - // defaultable then afaict the rows inbetween are + // defaultable then afaict the rows in between are // not used ( and not repeatable ) sal_uInt32 nRpt = rRow->GetXclRow() - pPrev->GetXclRow(); if ( nRpt > 1 ) diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index a44db3431741..de9138d8af47 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -87,7 +87,7 @@ public: private: typedef ::std::map< sal_Int32, ValueRangeVector > ColSpanVectorMap; - ColSpanVectorMap maColSpans; /// Buffereed column spans, mapped by row index. + ColSpanVectorMap maColSpans; /// Buffered column spans, mapped by row index. sal_Int32 mnCurrRow; /// Current row index used for buffered cell import. }; diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index f235cf9fa7fd..07f7aa34f893 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -166,7 +166,7 @@ const sal_uInt16 EXC_OBJ_BUTTON_HELP = 0x0002; const sal_uInt16 EXC_OBJ_BUTTON_CANCEL = 0x0004; const sal_uInt16 EXC_OBJ_BUTTON_CLOSE = 0x0008; -// BIFF5 checkboxs, radio buttons +// BIFF5 checkboxes, radio buttons const sal_uInt16 EXC_OBJ_CHECKBOX_UNCHECKED = 0; const sal_uInt16 EXC_OBJ_CHECKBOX_CHECKED = 1; const sal_uInt16 EXC_OBJ_CHECKBOX_TRISTATE = 2; diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 5692bbc0b704..3166f7d3bea2 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -246,7 +246,7 @@ void ScFormulaDlg::dispose() ScFormEditData* pData = pScMod->GetFormEditData(); m_aHelper.dispose(); - if (pData) // close dosen't destroy; + if (pData) // close doesn't destroy; { //set back reference input handler pScMod->SetRefInputHdl(nullptr); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 2fb6e1843fd9..703eff323f9c 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -52,7 +52,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -// a map ( or hashmap ) wont do as we need also to preserve the order +// a map ( or hashmap ) won't do as we need also to preserve the order // (as added ) of the items typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; @@ -154,7 +154,7 @@ public: if ( !xIf.is() ) { // if the Sheet is in a document created by the api unfortunately ( at the - // moment, it actually wont have the special Document modules + // moment, it actually won't have the special Document modules uno::Reference< excel::XWorksheet > xNewSheet( new ScVbaWorksheet( m_xParent, m_xContext, xSheet, m_xModel ) ); aRet <<= xNewSheet; } @@ -201,7 +201,7 @@ ScVbaWorksheets::createCollectionObject( const uno::Any& aSource ) if ( !xIf.is() ) { // if the Sheet is in a document created by the api unfortunately ( at the - // moment, it actually wont have the special Document modules + // moment, it actually won't have the special Document modules uno::Reference< excel::XWorksheet > xNewSheet( new ScVbaWorksheet( getParent(), mxContext, xSheet, mxModel ) ); aRet <<= xNewSheet; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 081bd373e5e7..08b857509c45 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4764,7 +4764,7 @@ void ScGridWindow::UpdateFormulas() if ( nPaintCount ) { - // Do nto start, switched to paint + // Do not start, switched to paint // (then at least the MapMode would no longer be right) bNeedsRepaint = true; // -> at end of paint run Invalidate on all @@ -5105,7 +5105,7 @@ static void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, cons lcl_PaintOneRange( pDocSh, aOld, SCE_ALL ); } - else // Test all four corners seperately + else // Test all four corners separately { // upper part if ( nNewRow1 < nOldRow1 ) // only delete upper line diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index e8335c437f19..dbf146cae3d8 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -242,7 +242,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce ) // FIXME this shouldn't be necessary once we change the entire Calc to // work in the logic coordinates (ideally 100ths of mm - so that it is // the same as editeng and drawinglayer), and get rid of all the - // SetMapMode's and other unneccessary fun we have with pixels + // SetMapMode's and other unnecessary fun we have with pixels if (comphelper::LibreOfficeKit::isActive()) { return pViewData->GetLogicMode(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 80d5197aad19..cdca3947d20a 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -71,7 +71,7 @@ static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1; if ( rRect.Bottom() > rVisible.Bottom()+1 ) rRect.Bottom() = rVisible.Bottom()+1; - // The header row must be drawn also when the inner rectangle is not visable, + // The header row must be drawn also when the inner rectangle is not visible, // that is why there is no return value anymore. // When it is far away, then lcl_DrawOneFrame is not even called. } @@ -595,7 +595,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI // FIXME this shouldn't be necessary once we change the entire Calc to // work in the logic coordinates (ideally 100ths of mm - so that it is // the same as editeng and drawinglayer), and get rid of all the - // SetMapMode's and other unneccessary fun we have with pixels + // SetMapMode's and other unnecessary fun we have with pixels // See also ScGridWindow::GetDrawMapMode() for the rest of this hack aDrawMode.SetOrigin(PixelToLogic(Point(nScrX, nScrY), aDrawMode)); } diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index b56722ad6fbe..8f8a66f687dd 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -245,7 +245,7 @@ void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { rScrollBar.SetRange( Range( 0, nMaxVal ) ); rScrollBar.SetLineSize( 1 ); - rScrollBar.SetPageSize( 1 ); // is queried seperately + rScrollBar.SetPageSize( 1 ); // is queried separately rScrollBar.SetVisibleSize( 10 ); // is reset by Resize rScrollBar.SetScrollHdl( LINK(this, ScTabView, ScrollHdl) ); |