strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Typo: aCatlog->aCatalog

Browse source 
Change-Id: I875e94e47d44101a840b711de174f38ad4b85b4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152357
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
This commit is contained in:
Julien Nabet 2023-05-28 17:45:26 +02:00
parent 27bf610d31
commit 3070091c9e
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
connectivity/source/commontools/dbtools.cxx
View file

@ -815,13 +815,13 @@ static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _
OUStringBuffer aComposedName; OUStringBuffer aComposedName;
OUString sCatalogSep; OUString sCatalogSep;
bool bCatlogAtStart = true; bool bCatalogAtStart = true;
if ( !_rCatalog.isEmpty() && aNameComps.bCatalogs ) if ( !_rCatalog.isEmpty() && aNameComps.bCatalogs )
{ {
sCatalogSep = _rxMetaData->getCatalogSeparator(); sCatalogSep = _rxMetaData->getCatalogSeparator();
bCatlogAtStart = _rxMetaData->isCatalogAtStart(); bCatalogAtStart = _rxMetaData->isCatalogAtStart();
if ( bCatlogAtStart && !sCatalogSep.isEmpty()) if ( bCatalogAtStart && !sCatalogSep.isEmpty())
{ {
aComposedName.append( _bQuote ? quoteName( sQuoteString, _rCatalog ) : _rCatalog ); aComposedName.append( _bQuote ? quoteName( sQuoteString, _rCatalog ) : _rCatalog );
aComposedName.append( sCatalogSep ); aComposedName.append( sCatalogSep );
@ -838,7 +838,7 @@ static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _
aComposedName.append( _bQuote ? quoteName( sQuoteString, _rName ) : _rName ); aComposedName.append( _bQuote ? quoteName( sQuoteString, _rName ) : _rName );
if ( !_rCatalog.isEmpty() if ( !_rCatalog.isEmpty()
&& !bCatlogAtStart && !bCatalogAtStart
&& !sCatalogSep.isEmpty() && !sCatalogSep.isEmpty()
&& aNameComps.bCatalogs && aNameComps.bCatalogs
) )

12
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View file

@ -511,9 +511,9 @@ OUString OSingleSelectQueryComposer::impl_getColumnRealName_throw(const Referenc
{ {
if(sTableName.indexOf('.') != -1) if(sTableName.indexOf('.') != -1)
{ {
OUString aCatlog,aSchema,aTable; OUString aCatalog,aSchema,aTable;
::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::EComposeRule::InDataManipulation); ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatalog,aSchema,aTable,::dbtools::EComposeRule::InDataManipulation);
sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation ); sTableName = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation );
} }
else if (!sTableName.isEmpty()) else if (!sTableName.isEmpty())
sTableName = ::dbtools::quoteName(aQuote,sTableName); sTableName = ::dbtools::quoteName(aQuote,sTableName);
@ -1660,9 +1660,9 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
if(sTableName.indexOf('.') != -1) if(sTableName.indexOf('.') != -1)
{ {
OUString aCatlog,aSchema,aTable; OUString aCatalog,aSchema,aTable;
::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatlog,aSchema,aTable,::dbtools::EComposeRule::InDataManipulation); ::dbtools::qualifiedNameComponents(m_xMetaData,sTableName,aCatalog,aSchema,aTable,::dbtools::EComposeRule::InDataManipulation);
sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation ); sTableName = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation );
} }
else else
sTableName = ::dbtools::quoteName(aQuote,sTableName); sTableName = ::dbtools::quoteName(aQuote,sTableName);

6
dbaccess/source/ui/dlg/queryfilter.cxx
View file

@ -295,9 +295,9 @@ bool DlgFilterCrit::getCondition(const weld::ComboBox& _rField,const weld::Combo
{ {
// properly quote all parts of the table name, so // properly quote all parts of the table name, so
// e.g. <schema>.<table> becomes "<schema>"."<table>" // e.g. <schema>.<table> becomes "<schema>"."<table>"
OUString aCatlog,aSchema,aTable; OUString aCatalog,aSchema,aTable;
::dbtools::qualifiedNameComponents( m_xMetaData, sTableName, aCatlog, aSchema, aTable, ::dbtools::EComposeRule::InDataManipulation ); ::dbtools::qualifiedNameComponents( m_xMetaData, sTableName, aCatalog, aSchema, aTable, ::dbtools::EComposeRule::InDataManipulation );
sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation ); sTableName = ::dbtools::composeTableName( m_xMetaData, aCatalog, aSchema, aTable, true, ::dbtools::EComposeRule::InDataManipulation );
} }
} }
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name;