[Libreoffice-commits] core.git: dbaccess/source reportdesign/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 15 06:15:46 UTC 2020
dbaccess/source/core/api/TableDeco.cxx | 6 +++---
dbaccess/source/core/api/definitioncolumn.cxx | 6 +++---
dbaccess/source/core/api/table.cxx | 6 +++---
dbaccess/source/core/api/tablecontainer.cxx | 6 +++---
dbaccess/source/core/inc/definitioncolumn.hxx | 2 +-
reportdesign/source/core/api/ReportVisitor.cxx | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 0e27b1f364d9b36cb5f8431d9df36b5953237424
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 16:55:29 2020 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Sep 15 08:15:03 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: Ibb705ac92365b7f71e8e5561bd150142a65a50ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101807
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index b8a8da27371e..702723676c97 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -571,11 +571,11 @@ OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const
{
Reference<XPropertySet> xProp(xNames->getByName(_rName),UNO_QUERY);
- Reference<XPropertySet> xColumnDefintion;
+ Reference<XPropertySet> xColumnDefinition;
if ( m_xColumnDefinitions.is() && m_xColumnDefinitions->hasByName(_rName))
- xColumnDefintion.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
+ xColumnDefinition.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
- pReturn = new OTableColumnWrapper( xProp, xColumnDefintion, false );
+ pReturn = new OTableColumnWrapper( xProp, xColumnDefinition, false );
}
}
return pReturn;
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 84d1197bda20..7854a97f1816 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -559,16 +559,16 @@ void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast(
}
// OTableColumnWrapper
-OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol, const Reference< XPropertySet >& _xColDefintion,
+OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol, const Reference< XPropertySet >& _xColDefinition,
const bool _bPureWrap )
:OTableColumnDescriptorWrapper( rCol, _bPureWrap, false )
{
osl_atomic_increment( &m_refCount );
- if ( _xColDefintion.is() )
+ if ( _xColDefinition.is() )
{
try
{
- ::comphelper::copyProperties( _xColDefintion, this );
+ ::comphelper::copyProperties( _xColDefinition, this );
}
catch( const Exception& )
{
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index d9b8f4484f5e..1fb27cd87fea 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -100,10 +100,10 @@ OColumn* ODBTable::createColumn(const OUString& _rName) const
xProp.set(pColumns->createBaseObject(_rName),UNO_QUERY);
}
- Reference<XPropertySet> xColumnDefintion;
+ Reference<XPropertySet> xColumnDefinition;
if ( m_xColumnDefinitions.is() && m_xColumnDefinitions->hasByName(_rName) )
- xColumnDefintion.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
- pReturn = new OTableColumnWrapper( xProp, xColumnDefintion, false );
+ xColumnDefinition.set(m_xColumnDefinitions->getByName(_rName),UNO_QUERY);
+ pReturn = new OTableColumnWrapper( xProp, xColumnDefinition, false );
return pReturn;
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index bc32774fd891..61405b41e464 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -128,7 +128,7 @@ IMPLEMENT_SERVICE_INFO2(OTableContainer, "com.sun.star.sdb.dbaccess.OTableContai
namespace
{
-void lcl_createDefintionObject(const OUString& _rName
+void lcl_createDefinitionObject(const OUString& _rName
,const Reference< XNameContainer >& _xTableDefinitions
,Reference<XPropertySet>& _xTableDefinition
,Reference<XNameAccess>& _xColumnDefinitions)
@@ -162,7 +162,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _r
{
Reference<XPropertySet> xTableDefinition;
Reference<XNameAccess> xColumnDefinitions;
- lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
+ lcl_createDefinitionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
if ( xSup.is() )
{
@@ -288,7 +288,7 @@ ObjectType OTableContainer::appendObject( const OUString& _rForName, const Refer
Reference<XPropertySet> xTableDefinition;
Reference<XNameAccess> xColumnDefinitions;
- lcl_createDefintionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
+ lcl_createDefinitionObject(getNameForObject(descriptor),m_xTableDefinitions,xTableDefinition,xColumnDefinitions);
Reference<XColumnsSupplier> xSup(descriptor,UNO_QUERY);
Reference<XDataDescriptorFactory> xFac(xColumnDefinitions,UNO_QUERY);
Reference<XAppend> xAppend(xColumnDefinitions,UNO_QUERY);
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index d2372670378f..4d7ff3e170e0 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.hxx
@@ -272,7 +272,7 @@ namespace dbaccess
public:
OTableColumnWrapper( const css::uno::Reference< css::beans::XPropertySet >& rCol,
- const css::uno::Reference< css::beans::XPropertySet >& rColDefintion,
+ const css::uno::Reference< css::beans::XPropertySet >& rColDefinition,
const bool _bPureWrap );
// css::lang::XTypeProvider
diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx
index 0ef59043d132..f8129ed673be 100644
--- a/reportdesign/source/core/api/ReportVisitor.cxx
+++ b/reportdesign/source/core/api/ReportVisitor.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star;
OReportVisitor::OReportVisitor(ITraverseReport* _pTraverseReport)
:m_pTraverseReport(_pTraverseReport)
{
- OSL_ENSURE(m_pTraverseReport,"ReportDefintion must be not NULL!");
+ OSL_ENSURE(m_pTraverseReport,"ReportDefinition must be not NULL!");
}
void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xReportDefinition)
More information about the Libreoffice-commits
mailing list