mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtl-string-changes

Browse Source
This commit is contained in:
th
2001-05-11 09:03:31 +00:00
parent a853bb9278
commit a4848ac889
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
forms/source/component/ListBox.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ListBox.cxx,v $ * $RCSfile: ListBox.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: fs $ $Date: 2001-04-26 12:36:28 $ * last change: $Author: th $ $Date: 2001-05-11 09:46:00 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -526,9 +526,20 @@ void SAL_CALL OListBoxModel::read(const Reference<stario::XObjectInputStream>& _
::rtl::OUString sListSource; ::rtl::OUString sListSource;
_rxInStream >> sListSource; _rxInStream >> sListSource;
aListSourceSeq.realloc( sListSource.getTokenCount() ); sal_int32 nTokens = 1;
for (sal_uInt16 i=0; i<sListSource.getTokenCount(); ++i) const sal_Unicode* pStr = sListSource.getStr();
aListSourceSeq.getArray()[i] = sListSource.getToken(i); while ( *pStr )
{
if ( *pStr == ';' )
nTokens++;
pStr++;
}
aListSourceSeq.realloc( nTokens );
for (sal_uInt16 i=0; i<nTokens; ++i)
{
sal_Int32 nTmp = 0;
aListSourceSeq.getArray()[i] = sListSource.getToken(i,';',nTmp);
}
} }
else else
_rxInStream >> aListSourceSeq; _rxInStream >> aListSourceSeq;
@@ -620,7 +631,7 @@ void OListBoxModel::loadData()
sal_Int32 i; sal_Int32 i;
for (i=0; i<m_aListSourceSeq.getLength(); ++i) for (i=0; i<m_aListSourceSeq.getLength(); ++i)
sListSource = sListSource + pustrListSouceStrings[i]; sListSource = sListSource + pustrListSouceStrings[i];
if (!sListSource.len()) if (!sListSource.getLength())
return; return;
sal_Int16 nBoundColumn = 0; sal_Int16 nBoundColumn = 0;
@@ -698,7 +709,7 @@ void OListBoxModel::loadData()
disposeComponent(xComposer); disposeComponent(xComposer);
} }
} }
if (!aFieldName.len()) if (!aFieldName.getLength())
break; break;
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
@@ -708,7 +719,7 @@ void OListBoxModel::loadData()
aStatement += ::rtl::OUString::createFromAscii("DISTINCT "); aStatement += ::rtl::OUString::createFromAscii("DISTINCT ");
aStatement += quoteName(aQuote,aFieldName); aStatement += quoteName(aQuote,aFieldName);
if (aBoundFieldName.len()) if (aBoundFieldName.getLength())
{ {
aStatement += ::rtl::OUString::createFromAscii(", "); aStatement += ::rtl::OUString::createFromAscii(", ");
aStatement += quoteName(aQuote, aBoundFieldName); aStatement += quoteName(aQuote, aBoundFieldName);
@@ -875,7 +886,7 @@ void OListBoxModel::loadData()
aValueList.push_back(aStr); aValueList.push_back(aStr);
} }
if (bUseNULL && (m_nNULLPos == -1) && !aStr.len()) if (bUseNULL && (m_nNULLPos == -1) && !aStr.getLength())
m_nNULLPos = (sal_Int16)aStringList.size() - 1; m_nNULLPos = (sal_Int16)aStringList.size() - 1;
} }
} }

6
forms/source/component/Pattern.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: Pattern.cxx,v $ * $RCSfile: Pattern.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: fs $ $Date: 2001-04-02 10:28:06 $ * last change: $Author: th $ $Date: 2001-05-11 09:46:33 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -210,7 +210,7 @@ sal_Bool OPatternModel::_commit()
::rtl::OUString aNewValue = getString(m_xAggregateFastSet->getFastPropertyValue( OPatternModel::nTextHandle )); ::rtl::OUString aNewValue = getString(m_xAggregateFastSet->getFastPropertyValue( OPatternModel::nTextHandle ));
if (aNewValue != m_aSaveValue) if (aNewValue != m_aSaveValue)
{ {
if (!aNewValue.len() && !m_bRequired && m_bEmptyIsNull) if (!aNewValue.getLength() && !m_bRequired && m_bEmptyIsNull)
m_xColumnUpdate->updateNull(); m_xColumnUpdate->updateNull();
else else
{ {