diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2013-12-22 18:51:41 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2013-12-22 18:51:41 +0100 |
commit | 151887a9550efed41c5a2709a4f56d768b441ce4 (patch) | |
tree | ff8034b8af3334626014e1bd4f61062551a587ba | |
parent | 98929ce4e8e161febd8fcc0a0a53e607c6681483 (diff) |
Fix other typos
Change-Id: I3f0a51c53efdd383d49d978a1e8531afe9dac896
29 files changed, 39 insertions, 39 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 06e0bccb1cd5..018e027a9db0 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2418,7 +2418,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn) } catch(const SQLException&) { - // here we know that the old table wasn't droped before + // here we know that the old table wasn't dropped before if(!bAlreadyDroped) xHold = pNewTable = NULL; diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index d92e71d4e396..77cd9b13c9c4 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -245,7 +245,7 @@ void Table::alterColumnByName( const Reference< XPropertySet >& descriptor ) throw (SQLException,NoSuchElementException,RuntimeException) { - Reference< com::sun::star::container::XNameAccess > colums = + Reference< com::sun::star::container::XNameAccess > columns = Reference< com::sun::star::container::XNameAccess > ( getColumns(), UNO_QUERY ); OUString newName = extractStringProperty(descriptor, getStatics().NAME ); @@ -254,7 +254,7 @@ void Table::alterColumnByName( extractStringProperty( this, getStatics().NAME ), m_pSettings, m_conn->createStatement(), - Reference< com::sun::star::beans::XPropertySet>( colums->getByName( colName ), UNO_QUERY) , + Reference< com::sun::star::beans::XPropertySet>( columns->getByName( colName ), UNO_QUERY) , descriptor ); if( colName != newName ) @@ -269,9 +269,9 @@ void Table::alterColumnByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (SQLException,IndexOutOfBoundsException,RuntimeException) { - Reference< com::sun::star::container::XIndexAccess > colums = + Reference< com::sun::star::container::XIndexAccess > columns = Reference< com::sun::star::container::XIndexAccess>( getColumns(), UNO_QUERY ); - Reference< com::sun::star::beans::XPropertySet> column(colums->getByIndex( index ), UNO_QUERY ); + Reference< com::sun::star::beans::XPropertySet> column(columns->getByIndex( index ), UNO_QUERY ); ::pq_sdbc_driver::alterColumnByDescriptor( extractStringProperty( this, getStatics().SCHEMA_NAME ), extractStringProperty( this, getStatics().NAME ), diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 3b8ca1ffc780..b07ae4d40459 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -88,7 +88,7 @@ OPasswordDialog::OPasswordDialog(Window* _pParent,const OUString& _sUserName) : aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) { - // hide until a help is avalable + // hide until a help is available aHelpBtn.Hide(); FreeResource(); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 593e055e73be..436eb66d7547 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -254,7 +254,7 @@ namespace dbaui @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The description of the specified object. */ diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 0d2ef02ec61a..d3b5c30fe988 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -166,7 +166,7 @@ namespace dbaui @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The name of the specified object. */ diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 0e6822da4d25..6156cd366c56 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1398,8 +1398,8 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) else { // Memo and Image fields cannot be primary keys - // or if the columne cannot be dropped and the Required flag is not set - // or if a ::com::sun::star::sdbcx::View is avalable and the Required flag is not set + // or if the column cannot be dropped and the Required flag is not set + // or if a ::com::sun::star::sdbcx::View is available and the Required flag is not set TOTypeInfoSP pTypeInfo = pFieldDescr->getTypeInfo(); if( pTypeInfo->nSearchType == ColumnSearch::NONE || (pFieldDescr->IsNullable() && pRow->IsReadOnly()) diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx index d823fd631587..07d3294a61aa 100644 --- a/dtrans/test/win32/dnd/sourcelistener.hxx +++ b/dtrans/test/win32/dnd/sourcelistener.hxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang; class DragSourceListener: public WeakImplHelper1<XDragSourceListener> { - // this is a window where droped data are shown as text (only text) + // this is a window where dropped data are shown as text (only text) public: DragSourceListener( ); ~DragSourceListener(); diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx index 69c98dd64066..fcca511ac978 100644 --- a/dtrans/test/win32/dnd/targetlistener.hxx +++ b/dtrans/test/win32/dnd/targetlistener.hxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang; class DropTargetListener: public WeakImplHelper1<XDropTargetListener> { - // this is a window where droped data are shown as text (only text) + // this is a window where dropped data are shown as text (only text) HWND m_hEdit; public: DropTargetListener( HWND hEdit); diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch index 2216d213d261..77742d139c1e 100644 --- a/external/libmariadb/mariadb-trunk-101.patch +++ b/external/libmariadb/mariadb-trunk-101.patch @@ -2795,7 +2795,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/include/mysql_com.h #define MYSQL_ERRMSG_SIZE 512 #define NET_READ_TIMEOUT 30 /* Timeout on read */ @@ -209,13 +221,22 @@ - #define MAX_CHAR_WIDTH 255 /* Max length for a CHAR colum */ + #define MAX_CHAR_WIDTH 255 /* Max length for a CHAR column */ #define MAX_BLOB_WIDTH 8192 /* Default width for blob */ +/* the following defines were added for PHP's mysqli and pdo extensions: diff --git a/filter/source/xslt/export/spreadsheetml/table.xsl b/filter/source/xslt/export/spreadsheetml/table.xsl index 65f8c9465de1..53387a71c8cb 100644 --- a/filter/source/xslt/export/spreadsheetml/table.xsl +++ b/filter/source/xslt/export/spreadsheetml/table.xsl @@ -212,7 +212,7 @@ <xsl:copy-of select="." /> </xsl:when> <xsl:otherwise> - <!-- repeated colums will be written explicit several times in the variable--> + <!-- repeated columns will be written explicit several times in the variable--> <xsl:call-template name="repeat-adding-table-column"> <xsl:with-param name="numberColumnsRepeated" select="@table:number-columns-repeated" /> </xsl:call-template> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl index 164a73aa94e1..6edec6fb1cff 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl @@ -59,7 +59,7 @@ <!-- matching cells to give out -> covered table cells are not written out --> <xsl:template match="table:table-cell"> <xsl:param name="globalData" /> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:param name="allTableColumns" /> <xsl:param name="maxRowLength" /> <xsl:param name="tableDataType" /> @@ -96,7 +96,7 @@ <xsl:choose> <xsl:when test="function-available('common:node-set')"> <xsl:call-template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:with-param name="allTableColumns" select="$allTableColumns" /> <xsl:with-param name="maxRowLength" select="$maxRowLength" /> <xsl:with-param name="precedingColumns" select="sum(common:node-set($precedingCells)/*)" /> @@ -106,7 +106,7 @@ </xsl:when> <xsl:when test="function-available('xalan:nodeset')"> <xsl:call-template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:with-param name="allTableColumns" select="$allTableColumns" /> <xsl:with-param name="maxRowLength" select="$maxRowLength" /> <xsl:with-param name="precedingColumns" select="sum(xalan:nodeset($precedingCells)/*)" /> @@ -116,7 +116,7 @@ </xsl:when> <xsl:when test="function-available('xt:node-set')"> <xsl:call-template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:with-param name="allTableColumns" select="$allTableColumns" /> <xsl:with-param name="maxRowLength" select="$maxRowLength" /> <xsl:with-param name="precedingColumns" select="sum(xt:node-set($precedingCells)/*)" /> @@ -133,7 +133,7 @@ <!-- current node is a table:table-cell --> <xsl:template name="create-table-cell"> - <!-- position of the current input cell to get the correct colum style (hidden are also counted)--> + <!-- position of the current input cell to get the correct column style (hidden are also counted)--> <xsl:param name="allTableColumns" /> <xsl:param name="globalData" /> <xsl:param name="maxRowLength" /> diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl index d310e941f6c8..852d9fd84598 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl @@ -154,7 +154,7 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> - <!-- repeated colums will be written explicit several times in the variable--> + <!-- repeated columns will be written explicit several times in the variable--> <xsl:call-template name="repeat-adding-table-column"> <xsl:with-param name="numberColumnsRepeated" select="@table:number-columns-repeated" /> </xsl:call-template> diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 627e5535c62d..44adab41a43f 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -1954,7 +1954,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt // if the DBColumn value changed, transfer it to the control if ( evt.PropertyName.equals( PROPERTY_VALUE ) ) { - OSL_ENSURE( evt.Source == getField(), "OBoundControlModel::propertyChange: value changes from components other than our database colum?" ); + OSL_ENSURE( evt.Source == getField(), "OBoundControlModel::propertyChange: value changes from components other than our database column?" ); osl::MutexGuard aGuard(m_aMutex); if ( m_bForwardValueChanges && m_xColumn.is() ) transferDbValueToControl(); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index ceaea4eec35a..a122dd8d226b 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -80,7 +80,7 @@ namespace drawinglayer { -------------------------------------------------------------------------- The number of columns must be either set with SetColCount() or - SetItemWidth(). If the number of colums is specified by SetColCount() + SetItemWidth(). If the number of columns is specified by SetColCount() the width of the items will be calculated by the visible range. If the items should have a static width, it has to be specified with SetItemWidth(). In this case the number of columns will be calculated diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index 8b89684571de..b0b4dbeb48a8 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -74,7 +74,7 @@ public: @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The description of the specified object. */ diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 23d517909f9a..8d172df324f4 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -757,7 +757,7 @@ public: @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The description of the specified object. */ diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 368e092c50df..9f925ba00647 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -102,7 +102,7 @@ WB_NO_DIRECTSELECT Cursor travelling doesn't call select immediately. To -------------------------------------------------------------------------- The number of columns must be either set with SetColCount() or -SetItemWidth(). If the number of colums is specified by SetColCount() +SetItemWidth(). If the number of columns is specified by SetColCount() the width of the items will be calculated by the visible range. If the items should have a static width, it has to be specified with SetItemWidth(). In this case the number of columns will be calculated diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 687f32c5bec8..306023cce240 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -134,7 +134,7 @@ public: @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The name of the specified object. */ @@ -144,7 +144,7 @@ public: @param eObjType The type to ask for @param _nPosition - The position of a tablecell (index position), header bar colum/row cell + The position of a tablecell (index position), header bar column/row cell @return The description of the specified object. */ diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index 7b7f2caad55c..8d9291dfd79a 100644 --- a/lotuswordpro/source/filter/lwpframelayout.cxx +++ b/lotuswordpro/source/filter/lwpframelayout.cxx @@ -352,7 +352,7 @@ void LwpFrame::ApplyBorders(XFFrameStyle *pFrameStyle) } } /** -* @descr: set frame colums style +* @descr: set frame columns style * @param: pFrameStyle - Frame Style object * */ diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index f3ebff6a0290..3ea1ab3b571f 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -1013,7 +1013,7 @@ sal_Bool LwpTableLayout::FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMar pCellMark[nRowLoop] = 0;//reset all cell mark to zero } - //find if other row has the same colum + //find if other row has the same column for (nRowLoop=1;nRowLoop<=nRowNum;nRowLoop++) { pTmpRow = pXFTable->GetRow(nRowLoop); diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index 336a25adf063..f0ca1a270b40 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -178,8 +178,8 @@ public: /** * @descr Set drop caption of the paragraph. - * @param nLength number of chars to be droped. - * @param nLines line of which the droped chars will occupy. + * @param nLength number of chars to be dropped. + * @param nLines line of which the dropped chars will occupy. */ void SetDropCap(sal_Int16 nLength = 1,sal_Int16 nLines = 3,double fDistance = 0); diff --git a/odk/examples/DevelopersGuide/Spreadsheet/DataPilotReadme.txt b/odk/examples/DevelopersGuide/Spreadsheet/DataPilotReadme.txt index a15996649bff..0dcd38420fbb 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/DataPilotReadme.txt +++ b/odk/examples/DevelopersGuide/Spreadsheet/DataPilotReadme.txt @@ -40,7 +40,7 @@ Simple usage scenario: - select the "thousands" field and drop it in the "Column Fields" area. -> press Ok -8. you see a matrix with rows and colums for the selected fields +8. you see a matrix with rows and columns for the selected fields and a value area with a sum up of all fields valid for this coordinate. For example cell F:21=1221 (ones=B:21=1, tens=c:21=2 hundreds=D:21=2 and thousands=F:3=1) diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 4a660c04dfaa..b3e0414b401e 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -700,7 +700,7 @@ static ScDPAggData* lcl_GetChildTotal( ScDPAggData* pFirst, long nMeasure ) ScDPAggData* pAgg = pFirst; long nSkip = nMeasure; - // subtotal settings are ignored - colum/row totals exist once per measure + // subtotal settings are ignored - column/row totals exist once per measure for ( long nPos=0; nPos<nSkip; nPos++ ) pAgg = pAgg->GetChild(); // column total is constructed empty - children need to be created diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 23f418dad9d0..47d5c01c6c0e 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -381,7 +381,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) // to be moved? if ( (sal_Int32)nItemPos != FrozenColCount()-1 ) { - // move to the leftmost scrollable colum + // move to the leftmost scrollable column sal_uInt16 nFirstScrollable = FrozenColCount(); BrowserColumn *pColumn = (*pCols)[ nItemPos ]; BrowserColumns::iterator it = pCols->begin(); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index a93d65bf12e0..0b16fef03147 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -965,7 +965,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ if ( aPos.X() >= _rRect.Right() ) break; - // skip invisible colums between frozen and scrollable area + // skip invisible columns between frozen and scrollable area if ( nCol < nFirstCol && !pCol->IsFrozen() ) { nCol = nFirstCol; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2865dbdd0b7f..66a67eec3a96 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2519,7 +2519,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn // mark the SdrObject (accelerates the treatment in OnFoundData) m_arrSearchedControls.push_back(pCurrent); - // the number of the colum (here a dummy, since it is only interesting for GridControls) + // the number of the column (here a dummy, since it is only interesting for GridControls) m_arrRelativeGridColumn.push_back(-1); // and for the formatted search... diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 80e6ae4123a2..eaaf59a1dfdb 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1649,7 +1649,7 @@ public: bool InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt = 1, bool bBehind = true ); - /// Delete Colums/Rows in table. + /// Delete Columns/Rows in table. sal_Bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false ); sal_Bool DeleteRow( const SwCursor& rCursor ); sal_Bool DeleteCol( const SwCursor& rCursor ); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 83c9caff651d..0c5375972c61 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -235,7 +235,7 @@ void SwAddressControl_Impl::SetCurrentDataSet(sal_uInt32 nSet) for(aEditIter = m_aEdits.begin(); aEditIter != m_aEdits.end(); ++aEditIter, ++nIndex) { OSL_ENSURE(nIndex < m_pData->aDBData[m_nCurrentDataSet].size(), - "number of colums doesn't match number of Edits"); + "number of columns doesn't match number of Edits"); (*aEditIter)->SetText(m_pData->aDBData[m_nCurrentDataSet][nIndex]); } } diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index bfea396f0117..2e10d58c194d 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -178,7 +178,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,sal_False )); - // Before the dialogue of the HTML mode will be droped at the Docshell. + // Before the dialogue of the HTML mode will be dropped at the Docshell. pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); |