summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/querydesign
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2011-12-19 18:10:37 -0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2011-12-21 09:52:48 +0100
commit545921f914ec172bcd6712cce54847131a49afb6 (patch)
tree92dde2ebc7c4d70240e4967b11526e73fef10b16 /dbaccess/source/ui/querydesign
parent1835d0599e3d8984c7dfa2bbef2be5747596716a (diff)
Fix for fdo43460 Part XII getLength() to isEmpty()
Part XII Module dbaccess
Diffstat (limited to 'dbaccess/source/ui/querydesign')
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx78
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx18
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowData.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx36
8 files changed, 75 insertions, 75 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 39d0fa294450..60e8e7cfae40 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -336,7 +336,7 @@ OTableWindowData* OJoinTableView::CreateImpl(const ::rtl::OUString& _rComposedNa
void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/)
{
DBG_CHKTHIS(OJoinTableView,NULL);
- OSL_ENSURE(_rComposedName.getLength(),"There must be a table name supplied!");
+ OSL_ENSURE(!_rComposedName.isEmpty(),"There must be a table name supplied!");
TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 027cac12444f..f77aba68a657 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -100,7 +100,7 @@ sal_Bool OQueryTableWindow::Init()
TTableWindowData::value_type pWinData = GetData();
- if (m_strInitialAlias.getLength() )
+ if (!m_strInitialAlias.isEmpty() )
// Der Alias wurde explizit mit angegeben
sAliasName = m_strInitialAlias;
else if ( GetTable().is() )
@@ -125,7 +125,7 @@ sal_Bool OQueryTableWindow::Init()
if (!bSuccess)
{ // es soll nur ein Dummy-Window aufgemacht werden ...
- OSL_ENSURE(GetAliasName().getLength(), "OQueryTableWindow::Init : kein Alias- UND kein Tabellenname geht nicht !");
+ OSL_ENSURE(!GetAliasName().isEmpty(), "OQueryTableWindow::Init : kein Alias- UND kein Tabellenname geht nicht !");
// .. aber das braucht wenigstens einen Alias
// ::com::sun::star::form::ListBox anlegen
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 3f500b75a859..d253d134be69 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -113,7 +113,7 @@ namespace
::rtl::OUString quoteTableAlias(sal_Bool _bQuote, const ::rtl::OUString& _sAliasName, const ::rtl::OUString& _sQuote)
{
::rtl::OUString sRet;
- if ( _bQuote && _sAliasName.getLength() )
+ if ( _bQuote && !_sAliasName.isEmpty() )
{
sRet = ::dbtools::quoteName(_sQuote,_sAliasName);
const static ::rtl::OUString sTableSeparater('.');
@@ -129,7 +129,7 @@ namespace
if ( _pTableRef )
{
sTableRange = ::connectivity::OSQLParseNode::getTableRange(_pTableRef);
- if ( !sTableRange.getLength() )
+ if ( sTableRange.isEmpty() )
_pTableRef->parseNodeToStr(sTableRange,xConnection,NULL,sal_False,sal_False);
}
return sTableRange;
@@ -266,7 +266,7 @@ namespace
::connectivity::OSQLParseTreeIterator& rParseIter = static_cast<OQueryController&>(_pView->getController()).getParseIterator();
rParseIter.getColumnRange( pColumnRef, aColumnName, aTableRange );
- if ( aTableRange.getLength() )
+ if ( !aTableRange.isEmpty() )
{
OQueryTableWindow* pSTW = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( aTableRange );
bErg = (pSTW && pSTW->ExistsField( aColumnName, _rDragInfo ) );
@@ -351,7 +351,7 @@ namespace
if ( pData->GetJoinType() != INNER_JOIN && _pEntryTabTo->ExistsAVisitedConn() )
{
sal_Bool bBrace = sal_False;
- if(_rJoin.getLength() && _rJoin.lastIndexOf(')') == (_rJoin.getLength()-1))
+ if(!_rJoin.isEmpty() && _rJoin.lastIndexOf(')') == (_rJoin.getLength()-1))
{
bBrace = sal_True;
_rJoin = _rJoin.replaceAt(_rJoin.getLength()-1,1,::rtl::OUString(' '));
@@ -475,7 +475,7 @@ namespace
if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() )
return;
- if(!aJoin.getLength())
+ if(aJoin.isEmpty())
{
OQueryTableWindow* pEntryTabFrom = static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin());
aJoin = BuildJoin(_xConnection,pEntryTabFrom,pEntryTabTo,pEntryConnData);
@@ -544,7 +544,7 @@ namespace
else if (SQL_ISRULEOR2(pNode,search_condition,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))
eErrorCode = eIllegalJoinCondition;
else if ( eOk == (eErrorCode = InsertJoinConnection(_pView,pNode->getChild(0), _eJoinType,pLeftTable,pRightTable)) )
@@ -633,7 +633,7 @@ namespace
{
OTableFieldDescRef pEntryField = *aIter;
::rtl::OUString rFieldName = pEntryField->GetField();
- if ( rFieldName.getLength() && pEntryField->IsVisible() )
+ if ( !rFieldName.isEmpty() && pEntryField->IsVisible() )
{
aTmpStr = ::rtl::OUString();
const ::rtl::OUString rAlias = pEntryField->GetAlias();
@@ -661,7 +661,7 @@ namespace
}
if ( ( rFieldName.toChar() != '*' ) && ( rFieldName.indexOf( aQuote ) == -1 ) )
{
- OSL_ENSURE(pEntryField->GetTable().getLength(),"No table field name!");
+ OSL_ENSURE(!pEntryField->GetTable().isEmpty(),"No table field name!");
aTmpStr.append(::dbtools::quoteName(aQuote, rFieldName));
}
else
@@ -672,7 +672,7 @@ namespace
if ( pEntryField->isAggreateFunction() )
{
- OSL_ENSURE(pEntryField->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-(");
+ OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"Functionname darf hier nicht leer sein! ;-(");
::rtl::OUStringBuffer aTmpStr2( pEntryField->GetFunction());
aTmpStr2.appendAscii("(");
aTmpStr2.append(aTmpStr.makeStringAndClear());
@@ -680,7 +680,7 @@ namespace
aTmpStr = aTmpStr2;
}
- if (rFieldAlias.getLength() &&
+ if (!rFieldAlias.isEmpty() &&
(rFieldName.toChar() != '*' ||
pEntryField->isNumericOrAggreateFunction() ||
pEntryField->isOtherFunction()))
@@ -738,10 +738,10 @@ namespace
OTableFieldDescRef pEntryField = *aIter;
aFieldName = pEntryField->GetField();
- if (!aFieldName.getLength())
+ if (aFieldName.isEmpty())
continue;
aCriteria = pEntryField->GetCriteria( i );
- if ( aCriteria.getLength() )
+ if ( !aCriteria.isEmpty() )
{
// * is not allowed to contain any filter, only when used in combination an aggregate function
if ( aFieldName.toChar() == '*' && pEntryField->isNoneFunction() )
@@ -764,14 +764,14 @@ namespace
if ( pEntryField->isAggreateFunction() || pEntryField->IsGroupBy() )
{
- if (!aHavingStr.getLength()) // noch keine Kriterien
+ if (aHavingStr.isEmpty()) // noch keine Kriterien
aHavingStr += ::rtl::OUString('('); // Klammern
else
aHavingStr += C_AND;
if ( pEntryField->isAggreateFunction() )
{
- OSL_ENSURE(pEntryField->GetFunction().getLength(),"No function name for aggregate given!");
+ OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"No function name for aggregate given!");
aHavingStr += pEntryField->GetFunction();
aHavingStr += ::rtl::OUString('('); // Klammern
aHavingStr += aWork;
@@ -806,7 +806,7 @@ namespace
}
else
{
- if ( !aWhereStr.getLength() ) // noch keine Kriterien
+ if ( aWhereStr.isEmpty() ) // noch keine Kriterien
aWhereStr += ::rtl::OUString('('); // Klammern
else
aWhereStr += C_AND;
@@ -839,17 +839,17 @@ namespace
}
}
}
- // nur einmal für jedes Feld
+ // nur einmal f�r jedes Feld
else if ( !i && pEntryField->isCondition() )
{
- if (!aWhereStr.getLength()) // noch keine Kriterien
+ if (aWhereStr.isEmpty()) // noch keine Kriterien
aWhereStr += ::rtl::OUString('('); // Klammern
else
aWhereStr += C_AND;
aWhereStr += pEntryField->GetField();
}
}
- if (aWhereStr.getLength())
+ if (!aWhereStr.isEmpty())
{
aWhereStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig
if (rRetStr.getLength()) // schon Feldbedingungen ?
@@ -858,7 +858,7 @@ namespace
rRetStr.append(sal_Unicode('('));
rRetStr.append(aWhereStr);
}
- if (aHavingStr.getLength())
+ if (!aHavingStr.isEmpty())
{
aHavingStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig
if (rHavingStr.getLength()) // schon Feldbedingungen ?
@@ -923,13 +923,13 @@ namespace
continue;
}
- if ( bColumnAliasInOrderBy && pEntryField->GetFieldAlias().getLength() )
+ if ( bColumnAliasInOrderBy && !pEntryField->GetFieldAlias().isEmpty() )
{
aWorkStr += ::dbtools::quoteName(aQuote, pEntryField->GetFieldAlias());
}
else if ( pEntryField->isNumericOrAggreateFunction() )
{
- OSL_ENSURE(pEntryField->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-(");
+ OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"Functionname darf hier nicht leer sein! ;-(");
aWorkStr += pEntryField->GetFunction();
aWorkStr += ::rtl::OUString('(');
aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
@@ -962,7 +962,7 @@ namespace
aWorkStr = sTemp;
}
- if ( aWorkStr.getLength() )
+ if ( !aWorkStr.isEmpty() )
{
const sal_Int32 nMaxOrder = xMetaData->getMaxColumnsInOrderBy();
String sToken(aWorkStr);
@@ -996,7 +996,7 @@ namespace
OQueryTableConnectionData* pEntryConnData = static_cast<OQueryTableConnectionData*>(pEntryConn->GetData().get());
if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() )
{
- if(_rJoinCrit.getLength())
+ if(!_rJoinCrit.isEmpty())
_rJoinCrit += C_AND;
_rJoinCrit += BuildJoinCriteria(_xConnection,pEntryConnData->GetConnLineDataList(),pEntryConnData);
}
@@ -1069,7 +1069,7 @@ namespace
::rtl::OUString aJoin;
GetNextJoin(_xConnection,pEntryConn,static_cast<OQueryTableWindow*>(pEntryConn->GetDestWin()),aJoin);
- if(aJoin.getLength())
+ if(!aJoin.isEmpty())
{
// insert tables into table list to avoid double entries
OQueryTableWindow* pEntryTabFrom = static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin());
@@ -1140,7 +1140,7 @@ namespace
}
}
- if(aTableListStr.getLength())
+ if(!aTableListStr.isEmpty())
aTableListStr = aTableListStr.replaceAt(aTableListStr.getLength()-1,1, ::rtl::OUString() );
return aTableListStr;
}
@@ -1167,7 +1167,7 @@ namespace
OTableFieldDescRef pEntryField = *aIter;
if ( pEntryField->IsGroupBy() )
{
- OSL_ENSURE(pEntryField->GetField().getLength(),"Kein FieldName vorhanden!;-(");
+ OSL_ENSURE(!pEntryField->GetField().isEmpty(),"Kein FieldName vorhanden!;-(");
::rtl::OUString sGroupByPart = quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
// only quote the field name when it isn't calculated
@@ -1204,7 +1204,7 @@ namespace
}
}
}
- if ( aGroupByStr.getLength() )
+ if ( !aGroupByStr.isEmpty() )
{
aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, ::rtl::OUString(' ') );
::rtl::OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "));
@@ -1797,8 +1797,8 @@ namespace
rParseIter.getColumnRange( pColumnRef, aColumnName, aTableRange );
sal_Bool bFound(sal_False);
- OSL_ENSURE(aColumnName.getLength(),"Columnname darf nicht leer sein");
- if (!aTableRange.getLength())
+ OSL_ENSURE(!aColumnName.isEmpty(),"Columnname darf nicht leer sein");
+ if (aTableRange.isEmpty())
{
// SELECT column, ...
bFound = NULL != lcl_findColumnInTables( aColumnName, *pTabList, _raInfo );
@@ -1864,7 +1864,7 @@ namespace
if ( !checkJoinConditions(_pView,pNode->getChild(0)) || !checkJoinConditions(_pView,pRightTableRef))
return sal_False;
- // named column join wird später vieleicht noch implementiert
+ // named column join wird sp�ter vieleicht noch implementiert
// SQL_ISRULE(pNode->getChild(4),named_columns_join)
EJoinType eJoinType = INNER_JOIN;
bool bNatural = false;
@@ -2143,7 +2143,7 @@ namespace
return eNoSelectStatement;
::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection
- sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden
+ sal_Bool bFirstField = sal_True; // bei der Initialisierung mu� auf alle Faelle das erste Feld neu aktiviert werden
SqlParseError eErrorCode = eOk;
@@ -2767,7 +2767,7 @@ void OQueryDesignView::fillValidFields(const ::rtl::OUString& sAliasName, ComboB
OSL_ENSURE(pFieldList != NULL, "OQueryDesignView::FillValidFields : What the hell do you think I can do with a NULL-ptr ? This will crash !");
pFieldList->Clear();
- sal_Bool bAllTables = sAliasName.getLength() == 0;
+ sal_Bool bAllTables = sAliasName.isEmpty();
OJoinTableView::OTableWindowMap* pTabWins = m_pTableView->GetTabWinMap();
::rtl::OUString strCurrentPrefix;
@@ -2852,14 +2852,14 @@ sal_Bool OQueryDesignView::checkStatement()
for(;aIter != aEnd;++aIter)
{
OTableFieldDescRef pEntryField = *aIter;
- if ( pEntryField->GetField().getLength() && pEntryField->IsVisible() )
+ if (!pEntryField->GetField().isEmpty() && pEntryField->IsVisible() )
++nFieldcount;
- else if (pEntryField->GetField().getLength() &&
+ else if (!pEntryField->GetField().isEmpty() &&
!pEntryField->HasCriteria() &&
pEntryField->isNoneFunction() &&
pEntryField->GetOrderDir() == ORDER_NONE &&
!pEntryField->IsGroupBy() &&
- !pEntryField->GetFunction().getLength() )
+ pEntryField->GetFunction().isEmpty() )
rUnUsedFields.push_back(pEntryField);
}
if ( !nFieldcount ) // keine Felder sichtbar also zur"uck
@@ -2872,7 +2872,7 @@ sal_Bool OQueryDesignView::checkStatement()
sal_uInt32 nTabcount = pTabList->size();
::rtl::OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1));
- if( !aFieldListStr.getLength() )
+ if( aFieldListStr.isEmpty() )
return ::rtl::OUString();
// Ausnahmebehandlung, wenn keine Felder angegeben worden sind
// Dann darf die Tabpage nicht gewechselt werden
@@ -2883,7 +2883,7 @@ sal_Bool OQueryDesignView::checkStatement()
const ::std::vector<OTableConnection*>* pConnList = m_pTableView->getTableConnections();
Reference< XConnection> xConnection = rController.getConnection();
::rtl::OUString aTableListStr(GenerateFromClause(xConnection,pTabList,pConnList));
- OSL_ENSURE(aTableListStr.getLength(), "OQueryDesignView::getStatement() : unerwartet : habe Felder, aber keine Tabellen !");
+ OSL_ENSURE(!aTableListStr.isEmpty(), "OQueryDesignView::getStatement() : unerwartet : habe Felder, aber keine Tabellen !");
// wenn es Felder gibt, koennen die nur durch Einfuegen aus einer schon existenten Tabelle entstanden sein; wenn andererseits
// eine Tabelle geloescht wird, verschwinden auch die zugehoerigen Felder -> ergo KANN es das nicht geben, dass Felder
// existieren, aber keine Tabellen (und aFieldListStr hat schon eine Laenge, das stelle ich oben sicher)
@@ -2894,7 +2894,7 @@ sal_Bool OQueryDesignView::checkStatement()
::rtl::OUString aJoinCrit;
GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList);
- if(aJoinCrit.getLength())
+ if(!aJoinCrit.isEmpty())
{
::rtl::OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( "));
aTmp += aJoinCrit;
@@ -3455,7 +3455,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p
pFunctionName = pFunctionName->getChild(0);
::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
- if ( !sFunctionName.getLength() )
+ if ( sFunctionName.isEmpty() )
sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8);
nDataType = OSQLParser::getFunctionReturnType(
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 5266418cf720..0d9b4c784869 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -429,7 +429,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rTableName, const ::rtl:
sTable,
::dbtools::eInDataManipulation);
::rtl::OUString sRealName(sSchema);
- if (sRealName.getLength())
+ if (!sRealName.isEmpty())
sRealName+= ::rtl::OUString('.');
sRealName += sTable;
@@ -474,7 +474,7 @@ Reference<XPropertySet> getKeyReferencedTo(const Reference<XIndexAccess>& _rxKey
void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& _rTableName, const ::rtl::OUString& strAlias, sal_Bool bNewTable)
{
DBG_CHKTHIS(OQueryTableView,NULL);
- OSL_ENSURE(_rTableName.getLength() || strAlias.getLength(), "OQueryTableView::AddTabWin : kein Tabellen- und kein Aliasname !");
+ OSL_ENSURE(!_rTableName.isEmpty() || !strAlias.isEmpty(), "OQueryTableView::AddTabWin : kein Tabellen- und kein Aliasname !");
// wenn der Tabellenname nicht gesetzt ist, steht das fuer ein Dummy-Fenster, das braucht aber wenigstens einen Alias-Namen
// neue Datenstruktur erzeugen
@@ -516,7 +516,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r
// Relationen zwischen den einzelnen Tabellen anzeigen
OTableWindowMap* pTabWins = GetTabWinMap();
- if(bNewTable && !pTabWins->empty() && _rTableName.getLength())
+ if(bNewTable && !pTabWins->empty() && !_rTableName.isEmpty())
{
modified();
if ( m_pAccessible )
@@ -558,7 +558,7 @@ void OQueryTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::r
{ // our new table has a foreign key
// so look if the referenced table is already in our list
xProp->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= aReferencedTable;
- OSL_ENSURE(aReferencedTable.getLength(),"Foreign key without referencedTableName");
+ OSL_ENSURE(!aReferencedTable.isEmpty(),"Foreign key without referencedTableName");
OTableWindowMap::const_iterator aIter = pTabWins->find(aReferencedTable);
OTableWindowMap::const_iterator aEnd = pTabWins->end();
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index ff46e8159228..8aefc3d402f8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -74,7 +74,7 @@ namespace
{
sal_Bool isFieldNameAsterix(const ::rtl::OUString& _sFieldName )
{
- sal_Bool bAsterix = !(_sFieldName.getLength() && _sFieldName.toChar() != '*');
+ sal_Bool bAsterix = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*');
if ( !bAsterix )
{
String sName = _sFieldName;
@@ -520,7 +520,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
m_pTableCell->InsertEntry(static_cast<OQueryTableWindow*>(aIter->second)->GetAliasName());
m_pTableCell->InsertEntry(String(ModuleRes(STR_QUERY_NOTABLE)), 0);
- if (pEntry->GetAlias().getLength())
+ if (!pEntry->GetAlias().isEmpty())
m_pTableCell->SelectEntry(pEntry->GetAlias());
else
m_pTableCell->SelectEntry(String(ModuleRes(STR_QUERY_NOTABLE)));
@@ -613,7 +613,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName,
sal_Bool bError = sal_False;
::comphelper::UStringMixEqual bCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
// check if the table name is the same
- if ( _sTableRange.getLength() && (bCase(_pEntry->GetTable(),_sTableRange) || bCase(_pEntry->GetAlias(),_sTableRange)) )
+ if ( !_sTableRange.isEmpty() && (bCase(_pEntry->GetTable(),_sTableRange) || bCase(_pEntry->GetAlias(),_sTableRange)) )
{ // a table was already inserted and the tables contains that column name
if ( !_pEntry->GetTabWindow() )
@@ -705,7 +705,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
if ( _pEntry->isAggreateFunction() )
{
- OSL_ENSURE(_pEntry->GetFunction().getLength(),"Functionname darf hier nicht leer sein! ;-(");
+ OSL_ENSURE(!_pEntry->GetFunction().isEmpty(),"Functionname darf hier nicht leer sein! ;-(");
::rtl::OUStringBuffer aTmpStr2( _pEntry->GetFunction());
aTmpStr2.appendAscii("(");
aTmpStr2.append(sSql);
@@ -714,7 +714,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
}
sSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) + sSql;
- if ( sFieldAlias.getLength() )
+ if ( !sFieldAlias.isEmpty() )
{ // always quote the alias name there canbe no function in it
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
sSql += ::dbtools::quoteName( xMetaData->getIdentifierQuoteString(), sFieldAlias );
@@ -769,7 +769,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
OSL_ENSURE(SQL_ISRULE(pChild,derived_column), "No derived column found!");
// get the column alias
::rtl::OUString sColumnAlias = OSQLParseTreeIterator::getColumnAlias(pChild);
- if ( sColumnAlias.getLength() ) // we found an as clause
+ if ( !sColumnAlias.isEmpty() ) // we found an as clause
{
String aSelectionAlias = aSelEntry->GetFieldAlias();
aSelEntry->SetFieldAlias( sColumnAlias );
@@ -1175,7 +1175,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
strOldCellContents = pEntry->GetCriteria(nIdx);
pEntry->SetCriteria(nIdx, aCrit);
sNewValue = pEntry->GetCriteria(nIdx);
- if(aCrit.getLength() && nRow >= (GetRowCount()-1))
+ if(!aCrit.isEmpty() && nRow >= (GetRowCount()-1))
bAppendRow = sal_True;
}
}
@@ -1764,7 +1764,7 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel)
OTableFieldDescRef pEntry = *aIter;
::rtl::OUString sValue = pEntry->GetCriteria(nLevel);
- if ( sValue.getLength() )
+ if ( !sValue.isEmpty() )
{
pEntry->SetCriteria( nNewLevel, sValue);
if ( nNewLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1) )
@@ -1812,7 +1812,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
if(!m_bGroupByUnRelated && pEntry->IsGroupBy())
pEntry->SetVisible(sal_True);
}
- if (!pEntry->GetCriteria(nLevel).getLength() )
+ if (pEntry->GetCriteria(nLevel).isEmpty() )
{
pEntry->SetCriteria( nLevel, rValue);
if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index f7d0a50b6f63..539c2e4e2207 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -177,7 +177,7 @@ void OTableConnectionData::normalizeLines()
sal_Int32 nCount = m_vConnLineData.size();
for(sal_Int32 i=0;i<nCount;)
{
- if(!m_vConnLineData[i]->GetSourceFieldName().getLength() || !m_vConnLineData[i]->GetDestFieldName().getLength())
+ if(m_vConnLineData[i]->GetSourceFieldName().isEmpty() || m_vConnLineData[i]->GetDestFieldName().isEmpty())
{
OConnectionLineDataRef pData = m_vConnLineData[i];
m_vConnLineData.erase(m_vConnLineData.begin()+i);
diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx
index db85e36af4f6..c6a4face620a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx
@@ -64,7 +64,7 @@ OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable
,m_bIsValid(true)
{
DBG_CTOR(OTableWindowData,NULL);
- if( !m_aWinName.getLength() )
+ if( m_aWinName.isEmpty() )
m_aWinName = m_aTableName;
listen();
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 53082cda5435..ddf8636612ca 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -532,7 +532,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
aReturn.bChecked = m_bGraphicalDesign;
break;
case SID_BROWSER_CLEAR_QUERY:
- aReturn.bEnabled = isEditable() && (m_sStatement.getLength() || !m_vTableData.empty());
+ aReturn.bEnabled = isEditable() && (!m_sStatement.isEmpty() || !m_vTableData.empty());
break;
case SID_QUERY_VIEW_FUNCTIONS:
case SID_QUERY_VIEW_TABLES:
@@ -612,7 +612,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
{
::rtl::OUString aErrorMsg;
setStatement_fireEvent( getContainer()->getStatement() );
- if(!m_sStatement.getLength() && m_pSqlIterator)
+ if(m_sStatement.isEmpty() && m_pSqlIterator)
{
// change the view of the data
delete m_pSqlIterator->getParseTree();
@@ -856,9 +856,9 @@ void OQueryController::impl_initialize()
::rtl::OUString sCommand;
m_nCommandType = CommandType::QUERY;
- // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
- // ° reading parameters
- // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
+ // �����������������������������������������������������������������������������������������������������������������
+ // � reading parameters
+ // �����������������������������������������������������������������������������������������������������������������
// legacy parameters first (later overwritten by regular parameters)
::rtl::OUString sIndependentSQLCommand;
if ( rArguments.get_ensureType( "IndependentSQLCommand", sIndependentSQLCommand ) )
@@ -958,7 +958,7 @@ void OQueryController::impl_initialize()
bForceInitialDesign = true;
}
- // °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
+ // �����������������������������������������������������������������������������������������������������������������
if ( !ensureConnected( sal_False ) )
{ // we have no connection so what else should we do
m_bGraphicalDesign = sal_False;
@@ -993,7 +993,7 @@ void OQueryController::impl_initialize()
}
// now if we are to edit an existing view, check whether this is possible
- if ( m_sName.getLength() )
+ if ( !m_sName.isEmpty() )
{
Any aView( xViews->getByName( m_sName ) );
// will throw if there is no such view
@@ -1040,8 +1040,8 @@ void OQueryController::impl_initialize()
ClearUndoManager();
if ( ( m_bGraphicalDesign )
- && ( ( !m_sName.getLength() && !editingCommand() )
- || ( !m_sStatement.getLength() && editingCommand() )
+ && ( ( m_sName.isEmpty() && !editingCommand() )
+ || ( m_sStatement.isEmpty() && editingCommand() )
)
)
{
@@ -1074,7 +1074,7 @@ void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XL
::rtl::OUString OQueryController::getPrivateTitle( ) const
{
::rtl::OUString sName = m_sName;
- if ( !sName.getLength() )
+ if ( sName.isEmpty() )
{
if ( !editingCommand() )
{
@@ -1281,7 +1281,7 @@ void OQueryController::executeQuery()
::rtl::OUString sTranslatedStmt = translateStatement( false );
::rtl::OUString sDataSourceName = getDataSourceName();
- if ( sDataSourceName.getLength() && sTranslatedStmt.getLength() )
+ if ( !(sDataSourceName.isEmpty() || sTranslatedStmt.isEmpty()) )
{
try
{
@@ -1375,7 +1375,7 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElement
if(bNew)
{
String aDefaultName;
- if ( ( _bSaveAs && !bNew ) || ( bNew && m_sName.getLength() ) )
+ if ( ( _bSaveAs && !bNew ) || ( bNew && !m_sName.isEmpty() ) )
aDefaultName = String( m_sName );
else
{
@@ -1434,13 +1434,13 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
return true;
}
- if ( !sTranslatedStmt.getLength() )
+ if ( sTranslatedStmt.isEmpty() )
return false;
// first we need a name for our query so ask the user
// did we get a name
::rtl::OUString sOriginalName( m_sName );
- if ( !askForNewName( xElements, _bSaveAs ) || !m_sName.getLength() )
+ if ( !askForNewName( xElements, _bSaveAs ) || m_sName.isEmpty() )
return false;
SQLExceptionInfo aInfo;
@@ -1738,7 +1738,7 @@ static ::rtl::OUString concatComment( const ::rtl::OUString& rQuery, const ::std
// now set the properties
setStatement_fireEvent( getContainer()->getStatement(), _bFireStatementChange );
::rtl::OUString sTranslatedStmt;
- if(m_sStatement.getLength() && m_xComposer.is() && m_bEscapeProcessing)
+ if(!m_sStatement.isEmpty() && m_xComposer.is() && m_bEscapeProcessing)
{
try
{
@@ -1765,7 +1765,7 @@ static ::rtl::OUString concatComment( const ::rtl::OUString& rQuery, const ::std
sTranslatedStmt = ::rtl::OUString();
}
}
- else if(!m_sStatement.getLength())
+ else if(m_sStatement.isEmpty())
{
ModuleRes aModuleRes(STR_QRY_NOSELECT);
String sTmpStr(aModuleRes);
@@ -1814,7 +1814,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings
// get command from the query if a query name was supplied
if ( !i_bForceCurrentControllerSettings && !editingCommand() )
{
- if ( m_sName.getLength() )
+ if ( !m_sName.isEmpty() )
{
Reference< XNameAccess > xQueries = getObjectContainer();
if ( xQueries.is() )
@@ -1870,7 +1870,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings
}
}
- if ( m_sStatement.getLength() )
+ if ( !m_sStatement.isEmpty() )
{
setQueryComposer();