diff options
13 files changed, 37 insertions, 37 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index f0963c10f1ec..b5de8518dd59 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -40,9 +40,9 @@ namespace dbaui OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID); virtual ~OQueryDesignFieldUndoAct() override; - inline void SetColumnPosition(sal_uInt16 _nColumnPostion) + inline void SetColumnPosition(sal_uInt16 _nColumnPosition) { - m_nColumnPosition = _nColumnPostion; + m_nColumnPosition = _nColumnPosition; OSL_ENSURE(m_nColumnPosition != BROWSER_INVALIDID,"Column position was not set add the undo action!"); OSL_ENSURE(m_nColumnPosition < pOwner->GetColumnCount(),"Position outside the column count!"); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index ea8f22f0976e..8d421eefe09c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -742,15 +742,15 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ { if ( i > 0 ) // may we have to append more than one field { - sal_uInt16 nColumnPostion; - aSelEntry = FindFirstFreeCol(nColumnPostion); + sal_uInt16 nColumnPosition; + aSelEntry = FindFirstFreeCol(nColumnPosition); if ( !aSelEntry.is() ) { AppendNewCol(); - aSelEntry = FindFirstFreeCol(nColumnPostion); + aSelEntry = FindFirstFreeCol(nColumnPosition); } - ++nColumnPostion; - nColumnId = GetColumnId(nColumnPostion); + ++nColumnPosition; + nColumnId = GetColumnId(nColumnPosition); } ::connectivity::OSQLParseNode* pChild = pSelection->getChild( i ); diff --git a/filter/source/xslt/export/wordml/ooo2wordml_path.xsl b/filter/source/xslt/export/wordml/ooo2wordml_path.xsl index 14e9d3fbe8e8..d07e6d9d2fa5 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_path.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_path.xsl @@ -419,7 +419,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"/> @@ -473,7 +473,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/filter/source/xslt/import/wordml/wordml2ooo_path.xsl b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl index 10c189fd243c..336fc5cf65b9 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_path.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_path.xsl @@ -1157,7 +1157,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"/> @@ -1211,7 +1211,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/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl index a9db7f922af7..1f70abc18ed1 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl @@ -297,7 +297,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/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index a7dcee0e8fdb..d562a4f44235 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -373,8 +373,8 @@ void SAL_CALL ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exception) { sal_Int32 nOrderPosition; - uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( "ZOrder" ); - aOrderPostion >>= nOrderPosition; + uno::Any aOrderPosition = m_xPropertySet->getPropertyValue( "ZOrder" ); + aOrderPosition >>= nOrderPosition; switch( ZOrderCmd ) { case office::MsoZOrderCmd::msoBringToFront: diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index afeedd433e10..bfe66e9e1178 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -71,7 +71,7 @@ public class FormControlArranger private int nFormHeight; private int m_currentMaxRowHeight; private int nSecMaxRowY; - private int m_maxPostionX; + private int m_maxPositionX; private int a; private int StartA; private int m_controlMaxPosY = 0; //the maximum YPosition of a DBControl in the form @@ -169,7 +169,7 @@ public class FormControlArranger private void checkJustifiedPosition(int a) { int nBaseWidth = nFormWidth + cXOffset; - int nLeftDist = m_maxPostionX - nBaseWidth; + int nLeftDist = m_maxPositionX - nBaseWidth; int nRightDist = nBaseWidth - (DBControlList[a].getPosition().X - cHoriDistance); if (nLeftDist < 0.5 * nRightDist) { @@ -202,7 +202,7 @@ public class FormControlArranger DBControlList[a].setPosition(new Point(cXOffset, m_currentControlPosY)); bIsFirstRun = true; checkOuterPoints(m_currentControlPosX, m_dbControlWidth > m_LabelWidth ? m_dbControlWidth : m_LabelWidth, m_currentControlPosY, m_dbControlHeight, true); - m_currentLabelPosX = m_maxPostionX + cHoriDistance; + m_currentLabelPosX = m_maxPositionX + cHoriDistance; m_currentControlPosX = m_currentLabelPosX; adjustLineWidth(StartA, a - 1, nRightDist, 1); StartA = a; @@ -317,15 +317,15 @@ public class FormControlArranger // Find the outer right point if (bIsFirstRun) { - m_maxPostionX = i_nXPos + i_nWidth; + m_maxPositionX = i_nXPos + i_nWidth; bIsFirstRun = false; } else { int nColRightX = i_nXPos + i_nWidth; - if (nColRightX > m_maxPostionX) + if (nColRightX > m_maxPositionX) { - m_maxPostionX = nColRightX; + m_maxPositionX = nColRightX; } } } @@ -342,7 +342,7 @@ public class FormControlArranger bIsVeryFirstRun = true; m_currentMaxRowHeight = 0; nSecMaxRowY = 0; - m_maxPostionX = 0; + m_maxPositionX = 0; xProgressBar.start(PropertyNames.EMPTY_STRING, FieldColumns.length); for (int i = 0; i < FieldColumns.length; i++) { @@ -398,7 +398,7 @@ public class FormControlArranger if ((m_currentControlPosY > cYOffset + nFormHeight) || (LastIndex == (FieldColumns.length - 1))) { repositionColumnarLeftControls(LastIndex); - m_currentLabelPosX = m_maxPostionX + 2 * cHoriDistance; + m_currentLabelPosX = m_maxPositionX + 2 * cHoriDistance; m_currentControlPosX = m_currentLabelPosX + cLabelGap + m_MaxLabelWidth; m_currentControlPosY = cYOffset; nYRefPos = m_currentControlPosY; @@ -422,7 +422,7 @@ public class FormControlArranger if ((m_currentLabelPosY > cYOffset + nFormHeight) || (LastIndex == (FieldColumns.length - 1))) { - m_currentControlPosX = m_maxPostionX + cHoriDistance; + m_currentControlPosX = m_maxPositionX + cHoriDistance; m_currentLabelPosX = m_currentControlPosX; nYRefPos = m_currentControlPosY; m_currentControlPosY = cYOffset + m_LabelHeight + cVertDistance; @@ -444,14 +444,14 @@ public class FormControlArranger { ++iReduceWidth; } - if (m_maxPostionX > cXOffset + nFormWidth) + if (m_maxPositionX > cXOffset + nFormWidth) { checkJustifiedPosition(a); nYRefPos = m_currentControlPosY; } else { - m_currentLabelPosX = m_maxPostionX + cHoriDistance; + m_currentLabelPosX = m_maxPositionX + cHoriDistance; } if (a == FieldColumns.length - 1) { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java index d553d24d7600..d0c03988ba9f 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java @@ -84,7 +84,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter } @Override - protected void insertDetailFieldTitles(int lastGroupPostion) + protected void insertDetailFieldTitles(int lastGroupPosition) { // we won't extra field titles } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java index 2d5b618e7abd..eb6fdb7fcdbd 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java @@ -116,7 +116,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter } @Override - protected void insertDetailFieldTitles(int lastGroupPostion) + protected void insertDetailFieldTitles(int lastGroupPosition) { // we won't extra field titles } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index 8ae01e978542..fd1134954f51 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java @@ -141,7 +141,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns } @Override - protected void insertDetailFieldTitles(int lastGroupPostion) + protected void insertDetailFieldTitles(int lastGroupPosition) { // we won't extra field titles } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java index 5fea096e9989..6facdaa3c062 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java @@ -112,7 +112,7 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns } @Override - protected void insertDetailFieldTitles(int lastGroupPostion) + protected void insertDetailFieldTitles(int lastGroupPosition) { // we won't extra field titles } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index acc05d767c3a..d246e379b4ca 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -140,10 +140,10 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter insertPageFooter(); clearGroups(); - int lastGroupPostion = insertGroups(); + int lastGroupPosition = insertGroups(); clearDetails(); - insertDetailFieldTitles(lastGroupPostion); + insertDetailFieldTitles(lastGroupPosition); insertDetailFields(); } catch (java.lang.ArrayIndexOutOfBoundsException e) @@ -576,7 +576,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - abstract protected void insertDetailFieldTitles(int lastGroupPostion); + abstract protected void insertDetailFieldTitles(int lastGroupPosition); /** diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java index ed676f1aa3c6..bdb5e33154f2 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java @@ -78,7 +78,7 @@ public class Tabular extends ReportBuilderLayouter } @Override - protected void insertDetailFieldTitles(int lastGroupPostion) + protected void insertDetailFieldTitles(int lastGroupPosition) { final String[] aFieldTitleNames = getFieldTitleNames(); if (aFieldTitleNames == null || aFieldTitleNames.length == 0) @@ -90,7 +90,7 @@ public class Tabular extends ReportBuilderLayouter SectionObject aSO = null; final XGroups xGroups = getReportDefinition().getGroups(); final XGroup xGroup; - if (lastGroupPostion == -1) + if (lastGroupPosition == -1) { // Spezial case, there is no Group. xGroup = xGroups.createGroup(); @@ -104,17 +104,17 @@ public class Tabular extends ReportBuilderLayouter else { // we insert the titles in the last group - xGroup = UnoRuntime.queryInterface(XGroup.class, xGroups.getByIndex(lastGroupPostion)); + xGroup = UnoRuntime.queryInterface(XGroup.class, xGroups.getByIndex(lastGroupPosition)); // We don't need to copy the GroupProperties, because this is done in the insertGroup() member function // copyGroupProperties(0); - aSO = getDesignTemplate().getGroupLabel(lastGroupPostion); + aSO = getDesignTemplate().getGroupLabel(lastGroupPosition); } XSection xSection = xGroup.getHeader(); Rectangle aRect = new Rectangle(); aRect.X = getLeftPageIndent() + getLeftGroupIndent(getCountOfGroups()); - if (lastGroupPostion == -1) + if (lastGroupPosition == -1) { xSection.setHeight(0); // group height + a little empty line) aRect.Y = 0; |