[Libreoffice-commits] core.git: 2 commits - dbaccess/source filter/source include/vbahelper include/xmloff sc/source sw/source vbahelper/source wizards/com
Julien Nabet
serval2412 at yahoo.fr
Sat Jan 7 10:09:02 UTC 2017
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 4 -
dbaccess/source/ui/browser/unodatbr.cxx | 18 ++++----
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 4 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 10 ++--
filter/source/xslt/export/wordml/ooo2wordml_path.xsl | 4 -
filter/source/xslt/import/wordml/wordml2ooo_path.xsl | 4 -
filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl | 2
include/vbahelper/vbacollectionimpl.hxx | 2
include/xmloff/XMLEventExport.hxx | 4 -
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xistyle.cxx | 2
sc/source/ui/vba/vbaoleobjects.cxx | 2
sc/source/ui/vba/vbapalette.cxx | 2
sc/source/ui/vba/vbaworksheets.cxx | 2
sw/source/core/access/acccell.hxx | 2
sw/source/core/access/accdoc.hxx | 2
sw/source/core/access/accnotextframe.hxx | 2
sw/source/core/access/accpara.hxx | 2
sw/source/core/access/acctable.hxx | 2
sw/source/ui/vba/vbabookmarks.cxx | 2
sw/source/ui/vba/vbapalette.cxx | 2
sw/source/ui/vba/vbastyles.cxx | 2
sw/source/ui/vba/vbatables.cxx | 2
vbahelper/source/msforms/vbacontrols.cxx | 2
vbahelper/source/vbahelper/vbashape.cxx | 4 -
wizards/com/sun/star/wizards/form/FormControlArranger.java | 22 +++++-----
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 6 +-
wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java | 10 ++--
33 files changed, 67 insertions(+), 67 deletions(-)
New commits:
commit d911663f0fa919fc66e10328482948a730e9c2e8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Jan 7 08:59:09 2017 +0100
Typo: Acess->Access
Found thanks to Buovjaga
Change-Id: I73e36f50a1fd393859ba775ab084a488047864a3
Reviewed-on: https://gerrit.libreoffice.org/32810
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 95dd290..51221cc 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -66,7 +66,7 @@ namespace dbaui
try
{
OUString aName = GetEntryText( _pApplyTo );
- OUString aDSName = getDataSourceAcessor( m_pTreeView->getListBox().GetRootLevelParent( _pApplyTo ) );
+ OUString aDSName = getDataSourceAccessor( m_pTreeView->getListBox().GetRootLevelParent( _pApplyTo ) );
ODataClipboard* pData = nullptr;
SharedConnection xConnection;
@@ -227,7 +227,7 @@ namespace dbaui
if ( ensureConnection( m_aAsyncDrop.pDroppedAt, xDestConnection ) && xDestConnection.is() )
{
SvTreeListEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(m_aAsyncDrop.pDroppedAt);
- m_aTableCopyHelper.asyncCopyTagTable( m_aAsyncDrop, getDataSourceAcessor( pDataSourceEntry ), xDestConnection );
+ m_aTableCopyHelper.asyncCopyTagTable( m_aAsyncDrop, getDataSourceAccessor( pDataSourceEntry ), xDestConnection );
}
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index e442beb..7c05f3e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1108,13 +1108,13 @@ namespace
}
}
-OUString SbaTableQueryBrowser::getDataSourceAcessor( SvTreeListEntry* _pDataSourceEntry ) const
+OUString SbaTableQueryBrowser::getDataSourceAccessor( SvTreeListEntry* _pDataSourceEntry ) const
{
- OSL_ENSURE( _pDataSourceEntry, "SbaTableQueryBrowser::getDataSourceAcessor: invalid entry!" );
+ OSL_ENSURE( _pDataSourceEntry, "SbaTableQueryBrowser::getDataSourceAccessor: invalid entry!" );
DBTreeListUserData* pData = static_cast< DBTreeListUserData* >( _pDataSourceEntry->GetUserData() );
- OSL_ENSURE( pData, "SbaTableQueryBrowser::getDataSourceAcessor: invalid entry data!" );
- OSL_ENSURE( pData->eType == etDatasource, "SbaTableQueryBrowser::getDataSourceAcessor: entry does not denote a data source!" );
+ OSL_ENSURE( pData, "SbaTableQueryBrowser::getDataSourceAccessor: invalid entry data!" );
+ OSL_ENSURE( pData->eType == etDatasource, "SbaTableQueryBrowser::getDataSourceAccessor: entry does not denote a data source!" );
return !pData->sAccessor.isEmpty() ? OUString(pData->sAccessor) : GetEntryText( _pDataSourceEntry );
}
@@ -2304,7 +2304,7 @@ bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
try
{
Reference< XQueryDefinitionsSupplier > xQuerySup;
- m_xDatabaseContext->getByName( getDataSourceAcessor( pDataSourceEntry ) ) >>= xQuerySup;
+ m_xDatabaseContext->getByName( getDataSourceAccessor( pDataSourceEntry ) ) >>= xQuerySup;
if (xQuerySup.is())
{
Reference< XNameAccess > xQueryDefs = xQuerySup->getQueryDefinitions();
@@ -2676,7 +2676,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
}
}
- OUString sDataSourceName( getDataSourceAcessor( pConnection ) );
+ OUString sDataSourceName( getDataSourceAccessor( pConnection ) );
bSuccess = implLoadAnything( sDataSourceName, aName, nCommandType, bEscapeProcessing, pConData->xConnection );
if ( !bSuccess )
{ // clean up
@@ -3331,7 +3331,7 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p
// connect
_rConnection.reset(
- connect( getDataSourceAcessor( _pDSEntry ), sConnectingContext, nullptr ),
+ connect( getDataSourceAccessor( _pDSEntry ), sConnectingContext, nullptr ),
SharedConnection::TakeOwnership
);
@@ -3425,7 +3425,7 @@ void SbaTableQueryBrowser::implAdministrate( SvTreeListEntry* _pApplyTo )
pTopLevelSelected = m_pTreeView->getListBox().GetParent(pTopLevelSelected);
OUString sInitialSelection;
if (pTopLevelSelected)
- sInitialSelection = getDataSourceAcessor( pTopLevelSelected );
+ sInitialSelection = getDataSourceAccessor( pTopLevelSelected );
Reference< XDataSource > xDataSource( getDataSourceByName( sInitialSelection, getView(), getORB(), nullptr ) );
Reference< XModel > xDocumentModel( getDataSourceOrModel( xDataSource ), UNO_QUERY );
@@ -3522,7 +3522,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
case DatabaseObjectContainer::DATA_SOURCE:
case DatabaseObjectContainer::QUERIES:
case DatabaseObjectContainer::TABLES:
- aSelectedObject.Name = getDataSourceAcessor( pSelected );
+ aSelectedObject.Name = getDataSourceAccessor( pSelected );
break;
default:
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 93118a4..1befdf3 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -428,7 +428,7 @@ namespace dbaui
bool impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const;
/// retrieves the data source URL/name for the given entry representing a data source
- OUString getDataSourceAcessor( SvTreeListEntry* _pDataSourceEntry ) const;
+ OUString getDataSourceAccessor( SvTreeListEntry* _pDataSourceEntry ) const;
/** get the signature (command/escape processing) of the query the form is based on
<p>If the for is not based on a query or not even loaded, nothing happens and <FALSE/> is returned.</p>
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 60d48c2..8ec064d 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -179,7 +179,7 @@ public:
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return cppu::UnoType< OneIfc >::get(); }
virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override { return ( mXNamedVec.size() > 0 ); }
- // XNameAcess
+ // XNameAccess
virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
{
if ( !hasByName(aName) )
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index a411e6d..6a3d48a 100644
--- a/include/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
@@ -82,11 +82,11 @@ public:
/// register additional event names
void AddTranslationTable( const XMLEventNameTranslation* pTransTable );
- /// export the events (calls EventExport::Export(Reference<XNameAcess>) )
+ /// export the events (calls EventExport::Export(Reference<XNameAccess>) )
void Export( css::uno::Reference<css::document::XEventsSupplier> & xAccess,
bool bUseWhitespace = true);
- /// export the events (calls EventExport::Export(Reference<XNameAcess>) )
+ /// export the events (calls EventExport::Export(Reference<XNameAccess>) )
void Export( css::uno::Reference<css::container::XNameReplace> & xAccess,
bool bUseWhitespace = true);
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 4619146..5b50659 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -124,7 +124,7 @@ public:
::osl::MutexGuard aGuard( m_aMutex );
return ( !IdToOleNameHash.empty() );
}
- // XNameAcess
+ // XNameAccess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 6c7287a..e815cba 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -90,7 +90,7 @@ public:
return uno::makeAny( sal_Int32( maColorData[ Index ] ) );
}
- // Methods XElementAcess
+ // Methods XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
{
return ::cppu::UnoType<sal_Int32>::get();
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index 4989570..5ea0dfe 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -61,7 +61,7 @@ public:
return uno::makeAny( vObjects[ Index ] );
}
- // Methods XElementAcess
+ // Methods XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
{
return cppu::UnoType<drawing::XControlShape>::get();
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index f59727e..e6b577f 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -66,7 +66,7 @@ public:
return uno::makeAny( sal_Int32( spnDefColorTable8[ Index ] ) );
}
- // Methods XElementAcess
+ // Methods XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
{
return ::cppu::UnoType<sal_Int32>::get();
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 7340fc2..7c7dad2 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -90,7 +90,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<sheet::XSpreadsheet>::get(); }
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return ( !mSheetMap.empty() ); }
- // XNameAcess
+ // XNameAccess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
if ( !hasByName(aName) )
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index ab95afd..45551dc 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -90,7 +90,7 @@ public:
// XInterface
// (XInterface methods need to be implemented to disambiguate
- // between those inherited through SwAcessibleContext and
+ // between those inherited through SwAccessibleContext and
// XAccessibleValue).
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 6075e5b..342676a 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -143,7 +143,7 @@ public:
// XInterface
- // XInterface is inherited through SwAcessibleContext and
+ // XInterface is inherited through SwAccessibleContext and
// XAccessibleSelection. These methods are needed to avoid
// ambiguities.
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index d4b3528..ba7c9ec 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -68,7 +68,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
// XInterface methods need to be implemented to disambiguate
- // between those inherited through SwAcessibleContext and
+ // between those inherited through SwAccessibleContext and
// XAccessibleImage.
virtual css::uno::Any SAL_CALL queryInterface(
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 4843175..95f941b 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -296,7 +296,7 @@ public:
// XInterface
// (XInterface methods need to be implemented to disambiguate
- // between those inherited through SwAcessibleContext and
+ // between those inherited through SwAccessibleContext and
// XAccessibleEditableText).
virtual css::uno::Any SAL_CALL queryInterface(
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 73c3b2a..830798c 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -91,7 +91,7 @@ public:
// XInterface
// (XInterface methods need to be implemented to disambigouate
- // between those inherited through SwAcessibleContext and
+ // between those inherited through SwAccessibleContext and
// XAccessibleTable).
virtual css::uno::Any SAL_CALL queryInterface(
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 0b5a1e3..585a03e 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -62,7 +62,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->getElementType(); }
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->hasElements(); }
- // XNameAcess
+ // XNameAccess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
if ( !hasByName(aName) )
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index 919feea..2c7f72a 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -70,7 +70,7 @@ public:
return uno::makeAny( sal_Int32( ColorTable[ Index ] ) );
}
- // Methods XElementAcess
+ // Methods XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
{
return ::cppu::UnoType<sal_Int32>::get();
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index bc88f89..b50a247 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -176,7 +176,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<style::XStyle>::get(); }
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0; }
- // XNameAcess
+ // XNameAccess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
if ( !hasByName(aName) )
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index ea80422..3c0e834 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -97,7 +97,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextTable>::get(); }
virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0 ; }
- // XNameAcess
+ // XNameAccess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
if ( !hasByName(aName) )
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index fe62c1b..cfe9f06 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -121,7 +121,7 @@ public:
return ( !mControls.empty() );
}
- // XNameAcess
+ // XNameAccess
virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
if ( !hasByName( aName ) )
commit 471b58e19048419592a87e27860019ae02feca15
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Jan 7 08:44:44 2017 +0100
Typo: Postion->Position
Found thanks to Buovjaga
Change-Id: Iacf09325cdb58e0dbdcc9bf0570b2e02ed275132
Reviewed-on: https://gerrit.libreoffice.org/32808
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index f0963c1..b5de851 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 ea8f22f..8d421ee 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 14e9d3f..d07e6d9d 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 10c189f..336fc5c 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 a9db7f9..1f70abc 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 a7dcee0..d562a4f 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 afeedd4..bfe66e9 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 d553d24..d0c0398 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 2d5b618..eb6fdb7 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 8ae01e9..fd113495 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 5fea096..6facdaa 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 acc05d7..d246e37 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 ed676f1..bdb5e33 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;
More information about the Libreoffice-commits
mailing list