This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push: new ebe15e473f misc: fix spelling (#186) ebe15e473f is described below commit ebe15e473f7a0452515204663bcd8b3f8a06763e Author: John Bampton <jbamp...@users.noreply.github.com> AuthorDate: Tue Nov 28 20:11:32 2023 +1000 misc: fix spelling (#186) * misc: fix spelling * Update cmdid.h * Update svdopath.cxx * Update RowSetCache.cxx --------- Co-authored-by: Matthias Seidel <msei...@apache.org> (cherry picked from commit 300d4866462a073a2285741ed956e98ff5957a82) --- main/dbaccess/qa/complex/dbaccess/RowSet.java | 2 +- main/dbaccess/source/core/api/CacheSet.cxx | 4 ++-- main/dbaccess/source/core/api/RowSetCache.cxx | 4 ++-- main/dbaccess/source/ui/misc/UITools.cxx | 2 +- main/dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 +- main/editeng/source/editeng/impedit.hxx | 2 +- main/editeng/source/editeng/impedit2.cxx | 2 +- main/filter/source/xslt/export/wordml/ooo2wordml_path.xsl | 4 ++-- main/filter/source/xslt/import/wordml/wordml2ooo_path.xsl | 4 ++-- .../source/xslt/odf2xhtml/export/common/table_of_content.xsl | 2 +- main/forms/source/component/GroupManager.hxx | 2 +- main/offapi/com/sun/star/text/Text.idl | 2 +- main/sc/source/core/tool/interpr5.cxx | 2 +- .../source/win32/customactions/shellextensions/iconcache.cxx | 4 ++-- main/sfx2/source/appl/appmain.cxx | 2 +- main/svtools/source/edit/texteng.cxx | 2 +- main/svx/source/svdraw/svdoashp.cxx | 2 +- main/svx/source/svdraw/svdobj.cxx | 2 +- main/svx/source/svdraw/svdomeas.cxx | 2 +- main/svx/source/svdraw/svdopath.cxx | 6 +++--- main/svx/source/svdraw/svdotext.cxx | 2 +- main/sw/inc/anchoreddrawobject.hxx | 2 +- main/sw/inc/cmdid.h | 8 ++++---- main/sw/source/core/access/accpara.cxx | 2 +- main/sw/source/core/edit/edlingu.cxx | 2 +- main/sw/source/core/layout/paintfrm.cxx | 8 ++++---- main/sw/source/core/text/itrcrsr.cxx | 2 +- main/sw/source/core/text/txtfly.cxx | 2 +- main/sw/source/core/undo/untbl.cxx | 2 +- main/sw/source/core/unocore/unodraw.cxx | 4 ++-- main/sw/source/filter/ww8/ww8par.cxx | 2 +- main/sw/source/ui/index/cnttab.cxx | 2 +- main/sw/source/ui/vba/vbarangehelper.cxx | 2 +- test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java | 2 +- 34 files changed, 48 insertions(+), 48 deletions(-) diff --git a/main/dbaccess/qa/complex/dbaccess/RowSet.java b/main/dbaccess/qa/complex/dbaccess/RowSet.java index 75ee2b5e3d..cb89468e9f 100644 --- a/main/dbaccess/qa/complex/dbaccess/RowSet.java +++ b/main/dbaccess/qa/complex/dbaccess/RowSet.java @@ -209,7 +209,7 @@ public class RowSet extends TestCase System.out.println("testing testRowSet"); createTestCase(true); - // sequential postioning + // sequential positioning m_resultSet.beforeFirst(); testSequentialPositining(m_resultSet, m_row); diff --git a/main/dbaccess/source/core/api/CacheSet.cxx b/main/dbaccess/source/core/api/CacheSet.cxx index 18dabfa291..5424b45083 100644 --- a/main/dbaccess/source/core/api/CacheSet.cxx +++ b/main/dbaccess/source/core/api/CacheSet.cxx @@ -266,7 +266,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow ,::std::list< sal_Int32>& _rOrgValues) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", "OCacheSet::fillParameters" ); - // use keys and indexes for excat postioning + // use keys and indexes for exact positioning // first the keys Reference<XPropertySet> xSet(_xTable,UNO_QUERY); const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet); @@ -407,7 +407,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); - // use keys and indexes for excat postioning + // use keys and indexes for exact positioning // first the keys const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet); // second the indexes diff --git a/main/dbaccess/source/core/api/RowSetCache.cxx b/main/dbaccess/source/core/api/RowSetCache.cxx index 20dbf59fcd..d019f9a441 100644 --- a/main/dbaccess/source/core/api/RowSetCache.cxx +++ b/main/dbaccess/source/core/api/RowSetCache.cxx @@ -1064,7 +1064,7 @@ sal_Bool ORowSetCache::first( ) { // first move to the first row // then check if the cache window is at the beginning - // when not postionize the window and fill it with data + // when not, position the window and fill it with data // smart moving of the window -> clear only the rows whom are out of range sal_Bool bRet = m_pCacheSet->first(); if(bRet) @@ -1513,7 +1513,7 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung: pNode->count() == 3) { - // nur AND Verkn�pfung zulassen + // nur AND Verknüpfung zulassen if ( SQL_ISTOKEN(pNode->getChild(1),AND) ) bOk = checkInnerJoin(pNode->getChild(0),_xConnection,_sUpdateTableName) && checkInnerJoin(pNode->getChild(2),_xConnection,_sUpdateTableName); diff --git a/main/dbaccess/source/ui/misc/UITools.cxx b/main/dbaccess/source/ui/misc/UITools.cxx index 95d17d060d..492ac5d2d9 100644 --- a/main/dbaccess/source/ui/misc/UITools.cxx +++ b/main/dbaccess/source/ui/misc/UITools.cxx @@ -486,7 +486,7 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< ::std::vector< Reference<XNameAccess> > getKeyColumns(const Reference<XIndexAccess >& _rxKeys, sal_Int32 _nKeyType) { - // use keys and indexes for excat postioning + // use keys and indexes for exact positioning // first the keys ::std::vector< Reference<XNameAccess> > vRet; if(_rxKeys.is()) diff --git a/main/dbaccess/source/ui/tabledesign/TEditControl.hxx b/main/dbaccess/source/ui/tabledesign/TEditControl.hxx index 5c79cf4b27..cfc60cec3c 100644 --- a/main/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/main/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -205,7 +205,7 @@ namespace dbaui sal_Bool SaveData(long nRow, sal_uInt16 nColumnId); /** AdjustFieldDescription set the needed values for the description @param _pFieldDesc the field description where to set the values - @param _rMultiSel contains the postions which changed for undo/redo + @param _rMultiSel contains the positions which changed for undo/redo @param _nPos the current position @param _bSet should a key be set @param _bPrimaryKey which value should the pkey have diff --git a/main/editeng/source/editeng/impedit.hxx b/main/editeng/source/editeng/impedit.hxx index 1170f7ef72..8b74d8a233 100644 --- a/main/editeng/source/editeng/impedit.hxx +++ b/main/editeng/source/editeng/impedit.hxx @@ -152,7 +152,7 @@ struct ImplIMEInfos void DestroyAttribs(); }; -// #i18881# to be able to identify the postions of changed words +// #i18881# to be able to identify the positions of changed words // the positions of each portion need to be saved typedef std::vector<EditSelection> SpellContentSelections; diff --git a/main/editeng/source/editeng/impedit2.cxx b/main/editeng/source/editeng/impedit2.cxx index 920649ecff..18e9c6d541 100644 --- a/main/editeng/source/editeng/impedit2.cxx +++ b/main/editeng/source/editeng/impedit2.cxx @@ -4164,7 +4164,7 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLin } if ( bR2LPara ) { - // Switch X postions... + // Switch X positions... DBG_ASSERT( GetTextRanger() || GetPaperSize().Width(), "GetPortionXOffset - paper size?!" ); DBG_ASSERT( GetTextRanger() || (nX <= GetPaperSize().Width()), "GetPortionXOffset - position out of paper size!" ); nX = GetPaperSize().Width() - nX; diff --git a/main/filter/source/xslt/export/wordml/ooo2wordml_path.xsl b/main/filter/source/xslt/export/wordml/ooo2wordml_path.xsl index c6d3608b53..6dba1f8e84 100644 --- a/main/filter/source/xslt/export/wordml/ooo2wordml_path.xsl +++ b/main/filter/source/xslt/export/wordml/ooo2wordml_path.xsl @@ -424,7 +424,7 @@ </xsl:choose> </xsl:template> <xsl:template name="get-number-before"> - <!-- get $count number of number before current position , output format:number1 number2 ... numberN:newpostion + <!-- get $count number of number before current position , output format:number1 number2 ... numberN:newposition skip $skipcount of numbers --> <xsl:param name="svg-path"/> @@ -478,7 +478,7 @@ </xsl:choose> </xsl:template> <xsl:template name="get-number-after"> - <!-- get $count number of number after current position, output format:number1 number2 ... numberN:newpostion + <!-- get $count number of number after current position, output format:number1 number2 ... numberN:newposition skip $skipcount of numbers --> <xsl:param name="svg-path"/> diff --git a/main/filter/source/xslt/import/wordml/wordml2ooo_path.xsl b/main/filter/source/xslt/import/wordml/wordml2ooo_path.xsl index 4c9d1da103..cec237b9dd 100644 --- a/main/filter/source/xslt/import/wordml/wordml2ooo_path.xsl +++ b/main/filter/source/xslt/import/wordml/wordml2ooo_path.xsl @@ -1162,7 +1162,7 @@ </xsl:choose> </xsl:template> <xsl:template name="get-number-before"> - <!-- get $count number of number before current position , output format:number1 number2 ... numberN:newpostion + <!-- get $count number of number before current position , output format:number1 number2 ... numberN:newposition skip $skipcount of numbers --> <xsl:param name="vml-path"/> @@ -1216,7 +1216,7 @@ </xsl:choose> </xsl:template> <xsl:template name="get-number-after"> - <!-- get $count number of number after current position, output format:number1 number2 ... numberN:newpostion + <!-- get $count number of number after current position, output format:number1 number2 ... numberN:newposition skip $skipcount of numbers --> <xsl:param name="vml-path"/> diff --git a/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl b/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl index acfd4ee220..1c33903350 100644 --- a/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl +++ b/main/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl @@ -302,7 +302,7 @@ Scenarios tabstops Scenarios unmatched: - text:styleposition 'center' will not be matched in our case (effort for nothing), there will be only 'right' and not 'right' -- If the last tabStop is not from text:stylepostion 'right', the length of the last cell is undefined and a document length must be found. +- If the last tabStop is not from text:styleposition 'right', the length of the last cell is undefined and a document length must be found. Not happens in our master document case. Also the algorithm below would have to be expanded (cp. scenario 5). --> diff --git a/main/forms/source/component/GroupManager.hxx b/main/forms/source/component/GroupManager.hxx index 1eacd9e8ec..3b952fa0ad 100644 --- a/main/forms/source/component/GroupManager.hxx +++ b/main/forms/source/component/GroupManager.hxx @@ -50,7 +50,7 @@ Die einzelnen Gruppen werden ueber eine Map aktiviert, wenn sie mehr als ein Element besitzen. Die Gruppen verwalten intern die FormComponents in zwei Arrays. In dem -GroupCompArray werden die Components nach TabIndex und Einfuegepostion +GroupCompArray werden die Components nach TabIndex und Einfuegeposition sortiert. Da auf dieses Array ueber die FormComponent zugegriffen wird, gibt es noch das GroupCompAccessArray, in dem die FormComponents nach ihrer Speicheradresse sortiert sind. Jedes Element des diff --git a/main/offapi/com/sun/star/text/Text.idl b/main/offapi/com/sun/star/text/Text.idl index 0cfca01100..b3ac543bd8 100644 --- a/main/offapi/com/sun/star/text/Text.idl +++ b/main/offapi/com/sun/star/text/Text.idl @@ -71,7 +71,7 @@ published service Text //============================================================================= - /** optional interface to compare postions of <type>TextRange</type> + /** optional interface to compare positions of <type>TextRange</type> instances within this text. */ [optional] interface XTextRangeCompare; diff --git a/main/sc/source/core/tool/interpr5.cxx b/main/sc/source/core/tool/interpr5.cxx index 87a0d578d1..22f7c11319 100644 --- a/main/sc/source/core/tool/interpr5.cxx +++ b/main/sc/source/core/tool/interpr5.cxx @@ -2118,7 +2118,7 @@ void lcl_SolveWithLowerLeftTriangle(ScMatrixRef pMatA, /* Calculates Z = R * B * R is given in matrix A and vector VecR as obtained from the QR - * decompostion in lcl_CalculateQRdecomposition. B and Z are column vectors + * decomposition in lcl_CalculateQRdecomposition. B and Z are column vectors * given as matrix with at least index 0 to K-1; elements on index>=K are * not used. */ diff --git a/main/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/main/setup_native/source/win32/customactions/shellextensions/iconcache.cxx index dd6f6ec49e..790d6a93dd 100644 --- a/main/setup_native/source/win32/customactions/shellextensions/iconcache.cxx +++ b/main/setup_native/source/win32/customactions/shellextensions/iconcache.cxx @@ -54,8 +54,8 @@ extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE) } HKEY hKey; - DWORD dwDispostion; - LONG lError = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, &hKey, &dwDispostion ); + DWORD dwDisposition; + LONG lError = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, &hKey, &dwDisposition ); if ( ERROR_SUCCESS == lError ) { diff --git a/main/sfx2/source/appl/appmain.cxx b/main/sfx2/source/appl/appmain.cxx index 85a83f4aec..67d9e0383a 100644 --- a/main/sfx2/source/appl/appmain.cxx +++ b/main/sfx2/source/appl/appmain.cxx @@ -123,7 +123,7 @@ void SfxApplication::Exit() Diese virtuelle Methode wird vom SFx aus Application::Main() gerufen, nachdem Execute() beendet ist und - die Konfiguration (SfxConfigManager) bereits gespeichert wurde, - - die Fensterpostionen etc. in den SfxIniManager geschrieben wurden, + - die Fensterpositionen etc. in den SfxIniManager geschrieben wurden, - das Applikationsfenster noch existiert, aber hidden ist - s"amtliche Dokumente und deren Views bereits geschlossen sind. - Dispatcher, Bindings etc. bereits zerst"ort sind diff --git a/main/svtools/source/edit/texteng.cxx b/main/svtools/source/edit/texteng.cxx index e9d9ef6a2a..3c0a414f8d 100644 --- a/main/svtools/source/edit/texteng.cxx +++ b/main/svtools/source/edit/texteng.cxx @@ -3221,7 +3221,7 @@ long TextEngine::ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uIn /* if ( IsRightToLeft() ) { - // Switch X postions... + // Switch X positions... DBG_ASSERT( GetMaxTextWidth(), "GetPortionXOffset - max text width?!" ); DBG_ASSERT( nX <= (long)GetMaxTextWidth(), "GetPortionXOffset - position out of paper size!" ); nX = GetMaxTextWidth() - nX; diff --git a/main/svx/source/svdraw/svdoashp.cxx b/main/svx/source/svdraw/svdoashp.cxx index b0e3d4618d..be78958738 100644 --- a/main/svx/source/svdraw/svdoashp.cxx +++ b/main/svx/source/svdraw/svdoashp.cxx @@ -3464,7 +3464,7 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba { case SFX_MAPUNIT_TWIP : { - // postion + // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); aTranslate.setY(ImplTwipsToMM(aTranslate.getY())); diff --git a/main/svx/source/svdraw/svdobj.cxx b/main/svx/source/svdraw/svdobj.cxx index bc4944ef4d..5b318c1a84 100644 --- a/main/svx/source/svdraw/svdobj.cxx +++ b/main/svx/source/svdraw/svdobj.cxx @@ -3052,7 +3052,7 @@ sal_Bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B { case SFX_MAPUNIT_TWIP : { - // postion + // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); aTranslate.setY(ImplTwipsToMM(aTranslate.getY())); diff --git a/main/svx/source/svdraw/svdomeas.cxx b/main/svx/source/svdraw/svdomeas.cxx index 0bcaf71674..83dd5ba533 100644 --- a/main/svx/source/svdraw/svdomeas.cxx +++ b/main/svx/source/svdraw/svdomeas.cxx @@ -1410,7 +1410,7 @@ sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf { case SFX_MAPUNIT_TWIP : { - // postion + // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); aTranslate.setY(ImplTwipsToMM(aTranslate.getY())); diff --git a/main/svx/source/svdraw/svdopath.cxx b/main/svx/source/svdraw/svdopath.cxx index 036048e29a..7f559cd433 100644 --- a/main/svx/source/svdraw/svdopath.cxx +++ b/main/svx/source/svdraw/svdopath.cxx @@ -1038,8 +1038,8 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) } // dx=0.00 dy=0.00 // Beide Seiten Bezier - // dx=0.00 dy=0.00 l=0.00 0.00� // Anfang oder Ende oder eine Seite Bezier bzw. Hebel - // dx=0.00 dy=0.00 l=0.00 0.00� / l=0.00 0.00� // Mittendrin + // dx=0.00 dy=0.00 l=0.00 0.00° // Anfang oder Ende oder eine Seite Bezier bzw. Hebel + // dx=0.00 dy=0.00 l=0.00 0.00° / l=0.00 0.00° // Mittendrin XubString aMetr; Point aBeg(rDrag.GetStart()); Point aNow(rDrag.GetNow()); @@ -2969,7 +2969,7 @@ sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: { case SFX_MAPUNIT_TWIP : { - // postion + // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); aTranslate.setY(ImplTwipsToMM(aTranslate.getY())); diff --git a/main/svx/source/svdraw/svdotext.cxx b/main/svx/source/svdraw/svdotext.cxx index 68daac1ee8..2949b60511 100644 --- a/main/svx/source/svdraw/svdotext.cxx +++ b/main/svx/source/svdraw/svdotext.cxx @@ -1730,7 +1730,7 @@ sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: { case SFX_MAPUNIT_TWIP : { - // postion + // position aTranslate.setX(ImplTwipsToMM(aTranslate.getX())); aTranslate.setY(ImplTwipsToMM(aTranslate.getY())); diff --git a/main/sw/inc/anchoreddrawobject.hxx b/main/sw/inc/anchoreddrawobject.hxx index 7e474d87bc..8a26482cb1 100644 --- a/main/sw/inc/anchoreddrawobject.hxx +++ b/main/sw/inc/anchoreddrawobject.hxx @@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject // and that a positioning has to be performed. bool mbValidPos; - // rectangle, keeping the last object rectangle after the postioning + // rectangle, keeping the last object rectangle after the positioning // --> OD 2004-09-29 #i34748# - change <maLastObjRect> to a pointer Rectangle* mpLastObjRect; diff --git a/main/sw/inc/cmdid.h b/main/sw/inc/cmdid.h index e85e6d4ed6..e32ba70adb 100644 --- a/main/sw/inc/cmdid.h +++ b/main/sw/inc/cmdid.h @@ -464,14 +464,14 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_SET_LANGUAGE (FN_FORMAT + 15) /* Sprache */ #define FN_SET_KERNING (FN_FORMAT + 16) /* Kerning */ -#define FN_INDENT_TO_TABSTOP (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */ +#define FN_INDENT_TO_TABSTOP (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabposition */ //schon in svxids.hrc //#define FN_SET_JUSTIFY_PARA (FN_FORMAT + 21) /* Ausrichtung Absatz */ #define FN_SET_LINE_SPACE (FN_FORMAT + 27) /* Zeilenabstand parametrisiert */ #define FN_SET_ADJUST (FN_FORMAT + 28) /* Ausrichtung parametrisiert */ #define FN_SET_LRMARGIN (FN_FORMAT + 29) /* linker/rechter Rand */ #define FN_SET_ULMARGIN (FN_FORMAT + 30) /* oberer/unterer Rand */ -#define FN_UNINDENT_TO_TABSTOP (FN_FORMAT + 31) /* Einrueckung auf die vorgige Tabpostion */ +#define FN_UNINDENT_TO_TABSTOP (FN_FORMAT + 31) /* Einrueckung auf die vorige Tabposition */ #define FN_SET_HYPHEN_ZONE (FN_FORMAT + 32) /* Silbentrennung */ #define FN_SET_KEEP_TOGETHER (FN_FORMAT + 34) /* nicht trennen */ @@ -943,7 +943,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_SHIFT_BACKSPACE (FN_SELECTION + 42) /* wie Backspace */ #define FN_SELECT_WORD (FN_SELECTION + 43) /* Wort selektieren */ -#define FN_GOTO_NEXT_OBJ (FN_SELECTION + 44) /* N�chstes Objekt anspringen */ +#define FN_GOTO_NEXT_OBJ (FN_SELECTION + 44) /* Nächstes Objekt anspringen */ #define FN_GOTO_PREV_OBJ (FN_SELECTION + 45) /* Vorhergehendes Objekt anspringen */ #define FN_START_TABLE (FN_SELECTION + 47) /* an den Anfang der Tabelle */ @@ -977,7 +977,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_PREV_PARA (FN_SELECTION + 74) #define FN_NEXT_PARA (FN_SELECTION + 75) -#define FN_GOTO_NEXT_MARK (FN_SELECTION + 76) /* N�chsten Platzhalter anspringen */ +#define FN_GOTO_NEXT_MARK (FN_SELECTION + 76) /* Nächsten Platzhalter anspringen */ #define FN_GOTO_PREV_MARK (FN_SELECTION + 77) /* Vorhergehenden Platzhalter anspringen */ // schon im SVX unter der gleichen Id diff --git a/main/sw/source/core/access/accpara.cxx b/main/sw/source/core/access/accpara.cxx index ea0bc7ebe6..f018612f07 100644 --- a/main/sw/source/core/access/accpara.cxx +++ b/main/sw/source/core/access/accpara.cxx @@ -1593,7 +1593,7 @@ vos::OGuard aGuard(Application::GetSolarMutex()); SwPosition aPosition( *pNode, aIndex ); GetFrm()->GetCharRect( aCoreRect, aPosition, &aMoveState ); - // already get the caret postion + // already get the caret position /*SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm()); com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs = diff --git a/main/sw/source/core/edit/edlingu.cxx b/main/sw/source/core/edit/edlingu.cxx index 082feb56a8..a1fdb35aa9 100644 --- a/main/sw/source/core/edit/edlingu.cxx +++ b/main/sw/source/core/edit/edlingu.cxx @@ -112,7 +112,7 @@ public: * class SwSpellIter *************************************************************************/ -// #i18881# to be able to identify the postions of the changed words +// #i18881# to be able to identify the positions of the changed words // the content positions of each portion need to be saved struct SpellContentPosition { diff --git a/main/sw/source/core/layout/paintfrm.cxx b/main/sw/source/core/layout/paintfrm.cxx index 4522f2a7a8..6ea08d5d09 100644 --- a/main/sw/source/core/layout/paintfrm.cxx +++ b/main/sw/source/core/layout/paintfrm.cxx @@ -4448,7 +4448,7 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, SwRect aPaintRect( aRect ); ::SwAlignRect( aPaintRect, _rFrm.getRootFrm()->GetCurrShell() ); // if <SwAlignRect> reveals rectangle with no width, adjust rectangle - // to the prior left postion with width of one twip. + // to the prior left position with width of one twip. if ( (aPaintRect.*_rRectFn->fnGetWidth)() == 0 ) { if ( _bLeft ) @@ -4488,7 +4488,7 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, SwRect aPaintRect( aRect ); ::SwAlignRect( aPaintRect, _rFrm.getRootFrm()->GetCurrShell() ); // if <SwAlignRect> reveals rectangle with no width, adjust - // rectangle to the prior left postion with width of one twip. + // rectangle to the prior left position with width of one twip. if ( (aPaintRect.*_rRectFn->fnGetWidth)() == 0 ) { if ( _bLeft ) @@ -4552,7 +4552,7 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop, SwRect aPaintRect( aRect ); ::SwAlignRect( aPaintRect, _rFrm.getRootFrm()->GetCurrShell() ); // if <SwAlignRect> reveals rectangle with no width, adjust rectangle - // to the prior top postion with width of one twip. + // to the prior top position with width of one twip. if ( (aPaintRect.*_rRectFn->fnGetHeight)() == 0 ) { if ( _bTop ) @@ -4591,7 +4591,7 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop, SwRect aPaintRect( aRect ); ::SwAlignRect( aPaintRect, _rFrm.getRootFrm()->GetCurrShell() ); // if <SwAlignRect> reveals rectangle with no width, adjust - // rectangle to the prior top postion with width of one twip. + // rectangle to the prior top position with width of one twip. if ( (aPaintRect.*_rRectFn->fnGetHeight)() == 0 ) { if ( _bTop ) diff --git a/main/sw/source/core/text/itrcrsr.cxx b/main/sw/source/core/text/itrcrsr.cxx index b00b5ca2e9..8a55485286 100644 --- a/main/sw/source/core/text/itrcrsr.cxx +++ b/main/sw/source/core/text/itrcrsr.cxx @@ -340,7 +340,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf ) // --> OD 2008-01-31 #newlistlevelattrs# // Note: <SwTxtFrm::GetAdditionalFirstLineOffset()> returns a negative - // value for the new list label postion and space mode LABEL_ALIGNMENT + // value for the new list label position and space mode LABEL_ALIGNMENT // and label alignment CENTER and RIGHT in L2R layout respectively // label alignment LEFT and CENTER in R2L layout nFirst += pFrm->GetAdditionalFirstLineOffset(); diff --git a/main/sw/source/core/text/txtfly.cxx b/main/sw/source/core/text/txtfly.cxx index 84c5d84d48..68f38bdd23 100644 --- a/main/sw/source/core/text/txtfly.cxx +++ b/main/sw/source/core/text/txtfly.cxx @@ -1309,7 +1309,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // if wrapping style is considered on object positioning. // Thus, text will wrap around negative positioned objects. // --> OD 2004-08-25 #i3317# - remove condition on checking, - // if wrappings style is considered on object postioning. + // if wrappings style is considered on object positioning. // Thus, text is wrapping around negative positioned objects. // --> OD 2004-10-20 #i35640# - no consideration of negative // positioned objects, if wrapping style isn't considered on diff --git a/main/sw/source/core/undo/untbl.cxx b/main/sw/source/core/undo/untbl.cxx index 89af8eac53..7ac91dc670 100644 --- a/main/sw/source/core/undo/untbl.cxx +++ b/main/sw/source/core/undo/untbl.cxx @@ -2599,7 +2599,7 @@ void SwUndoTblCpyTbl::UndoImpl(::sw::UndoRedoContext & rContext) if( bShiftPam ) { // The aPam.Point is at the moment at the last position of the new content and has to be - // moved to the first postion of the old content for the SwUndoDelete operation + // moved to the first position of the old content for the SwUndoDelete operation SwNodeIndex aTmpIdx( aPam.GetPoint()->nNode, 1 ); SwTxtNode *pTxt = aTmpIdx.GetNode().GetTxtNode(); if( pTxt ) diff --git a/main/sw/source/core/unocore/unodraw.cxx b/main/sw/source/core/unocore/unodraw.cxx index 42bd519c31..a1a9d5f25e 100644 --- a/main/sw/source/core/unocore/unodraw.cxx +++ b/main/sw/source/core/unocore/unodraw.cxx @@ -2620,7 +2620,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) if ( eTextAnchorType != text::TextContentAnchorType_AS_CHARACTER ) // <-- { - // determine current x-postion + // determine current x-position rtl::OUString aHoriPosPropStr( RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition") ); uno::Any aHoriPos( getPropertyValue( aHoriPosPropStr ) ); sal_Int32 dCurrX = 0; @@ -2650,7 +2650,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition ) // handle y-position { - // determine current y-postion + // determine current y-position rtl::OUString aVertPosPropStr( RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition") ); uno::Any aVertPos( getPropertyValue( aVertPosPropStr ) ); sal_Int32 dCurrY = 0; diff --git a/main/sw/source/filter/ww8/ww8par.cxx b/main/sw/source/filter/ww8/ww8par.cxx index aeee3f23c6..9521519702 100644 --- a/main/sw/source/filter/ww8/ww8par.cxx +++ b/main/sw/source/filter/ww8/ww8par.cxx @@ -2476,7 +2476,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) if ( pPaM && pPaM->GetPoint() ) idcur = pPaM->GetPoint()->nNode.GetIndex(); - // Memory first table postion info + // Memory first table position info if ( !pFirstTablePap && idstart + 1 == idcur ) pFirstTablePap = pPap; diff --git a/main/sw/source/ui/index/cnttab.cxx b/main/sw/source/ui/index/cnttab.cxx index 4d8cc0b38a..cc3c59b4e2 100644 --- a/main/sw/source/ui/index/cnttab.cxx +++ b/main/sw/source/ui/index/cnttab.cxx @@ -3708,7 +3708,7 @@ void SwTokenWindow::AdjustScrolling() { if(pFirstCtrl) { - //if the control fits into the space then the first control must be at postion 0 + //if the control fits into the space then the first control must be at position 0 long nFirstPos = pFirstCtrl->GetPosPixel().X(); if(nFirstPos != 0) MoveControls(-nFirstPos); diff --git a/main/sw/source/ui/vba/vbarangehelper.cxx b/main/sw/source/ui/vba/vbarangehelper.cxx index 38b131a32f..0eace807b2 100644 --- a/main/sw/source/ui/vba/vbarangehelper.cxx +++ b/main/sw/source/ui/vba/vbarangehelper.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; * position has to be adjusted. * @param xText a text where a range position is searched * @param position a position inside o the text - * @return a range for the postion; null is returned if no range can be + * @return a range for the position; null is returned if no range can be * constructed. */ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) throw ( uno::RuntimeException ) diff --git a/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java b/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java index e97570a08d..c0a5ef7903 100644 --- a/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java +++ b/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java @@ -104,7 +104,7 @@ public class SortDialogSetting { * * @throws Exception */ - @Ignore("Bug #119035 - Redo is not work when sort result to other postion") + @Ignore("Bug #119035 - Redo is not work when sort result to other position") public void testSortOptionsCopyResultTo() throws Exception { String[][] expectedSortedResult = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };