[Libreoffice-commits] .: 3 commits - mysqlc/source oox/inc oox/source package/source padmin/source pyuno/source rdbmaker/source regexp/source registry/source registry/tools rsc/source sal/osl sal/qa sal/rtl
Lubos Lunak
llunak at kemper.freedesktop.org
Mon Jan 2 10:17:33 PST 2012
mysqlc/source/mysqlc_connection.cxx | 8 -
oox/inc/oox/dump/dumperbase.hxx | 2
oox/source/core/contexthandler2.cxx | 2
oox/source/core/filterbase.cxx | 16 +--
oox/source/core/filterdetect.cxx | 2
oox/source/core/relations.cxx | 6 -
oox/source/core/relationshandler.cxx | 2
oox/source/core/xmlfilterbase.cxx | 10 +-
oox/source/docprop/docprophandler.cxx | 8 -
oox/source/drawingml/chart/chartconverter.cxx | 2
oox/source/drawingml/chart/chartspaceconverter.cxx | 6 -
oox/source/drawingml/chart/objectformatter.cxx | 2
oox/source/drawingml/chart/seriesconverter.cxx | 4
oox/source/drawingml/chart/titleconverter.cxx | 4
oox/source/drawingml/customshapegeometry.cxx | 6 -
oox/source/drawingml/diagram/diagram.cxx | 32 +++----
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 2
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 2
oox/source/drawingml/fillproperties.cxx | 4
oox/source/drawingml/fillpropertiesgroupcontext.cxx | 2
oox/source/drawingml/graphicshapecontext.cxx | 4
oox/source/drawingml/hyperlinkcontext.cxx | 12 +-
oox/source/drawingml/lineproperties.cxx | 2
oox/source/drawingml/shape.cxx | 14 +--
oox/source/drawingml/shapepropertymap.cxx | 10 +-
oox/source/drawingml/table/tableproperties.cxx | 2
oox/source/drawingml/textbodypropertiescontext.cxx | 16 +--
oox/source/drawingml/textcharacterproperties.cxx | 2
oox/source/drawingml/textfont.cxx | 4
oox/source/drawingml/textparagraphpropertiescontext.cxx | 6 -
oox/source/drawingml/textrun.cxx | 2
oox/source/drawingml/texttabstoplistcontext.cxx | 2
oox/source/dump/biffdumper.cxx | 4
oox/source/dump/dumperbase.cxx | 54 ++++++------
oox/source/dump/oledumper.cxx | 8 -
oox/source/export/chartexport.cxx | 8 -
oox/source/export/drawingml.cxx | 14 +--
oox/source/helper/attributelist.cxx | 14 +--
oox/source/helper/graphichelper.cxx | 4
oox/source/helper/modelobjecthelper.cxx | 4
oox/source/helper/storagebase.cxx | 18 ++--
oox/source/helper/textinputstream.cxx | 2
oox/source/mathml/importutils.cxx | 2
oox/source/ole/axcontrol.cxx | 12 +-
oox/source/ole/axcontrolfragment.cxx | 6 -
oox/source/ole/olehelper.cxx | 2
oox/source/ole/oleobjecthelper.cxx | 4
oox/source/ole/olestorage.cxx | 4
oox/source/ole/vbacontrol.cxx | 14 +--
oox/source/ole/vbahelper.cxx | 8 -
oox/source/ole/vbamodule.cxx | 8 -
oox/source/ole/vbaproject.cxx | 14 +--
oox/source/ppt/pptgraphicshapecontext.cxx | 2
oox/source/ppt/pptimport.cxx | 2
oox/source/ppt/pptshape.cxx | 8 -
oox/source/ppt/presentationfragmenthandler.cxx | 10 +-
oox/source/ppt/slidefragmenthandler.cxx | 4
oox/source/ppt/soundactioncontext.cxx | 4
oox/source/ppt/timenode.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 10 +-
oox/source/ppt/timetargetelementcontext.cxx | 2
oox/source/vml/vmldrawing.cxx | 10 +-
oox/source/vml/vmlformatting.cxx | 10 +-
oox/source/vml/vmlinputstream.cxx | 2
oox/source/vml/vmlshape.cxx | 14 +--
oox/source/vml/vmlshapecontainer.cxx | 4
oox/source/vml/vmlshapecontext.cxx | 6 -
oox/source/xls/addressconverter.cxx | 2
oox/source/xls/autofilterbuffer.cxx | 16 +--
oox/source/xls/condformatbuffer.cxx | 12 +-
oox/source/xls/connectionsbuffer.cxx | 6 -
oox/source/xls/defnamesbuffer.cxx | 4
oox/source/xls/drawingfragment.cxx | 16 +--
oox/source/xls/drawingmanager.cxx | 4
oox/source/xls/excelchartconverter.cxx | 4
oox/source/xls/excelfilter.cxx | 2
oox/source/xls/excelhandlers.cxx | 2
oox/source/xls/excelvbaproject.cxx | 2
oox/source/xls/externallinkbuffer.cxx | 32 +++----
oox/source/xls/formulabase.cxx | 32 +++----
oox/source/xls/formulaparser.cxx | 20 ++--
oox/source/xls/numberformatsbuffer.cxx | 4
oox/source/xls/pagesettings.cxx | 18 ++--
oox/source/xls/pivotcachebuffer.cxx | 30 +++----
oox/source/xls/pivotcachefragment.cxx | 2
oox/source/xls/pivottablebuffer.cxx | 14 +--
oox/source/xls/querytablebuffer.cxx | 6 -
oox/source/xls/richstring.cxx | 12 +-
oox/source/xls/scenariobuffer.cxx | 2
oox/source/xls/sheetdatabuffer.cxx | 2
oox/source/xls/sheetdatacontext.cxx | 4
oox/source/xls/stylesbuffer.cxx | 20 ++--
oox/source/xls/tablebuffer.cxx | 4
oox/source/xls/workbookfragment.cxx | 16 +--
oox/source/xls/workbookhelper.cxx | 6 -
oox/source/xls/worksheetbuffer.cxx | 2
oox/source/xls/worksheetfragment.cxx | 4
oox/source/xls/worksheethelper.cxx | 14 +--
package/source/manifest/ManifestExport.cxx | 6 -
package/source/xstor/ohierarchyholder.cxx | 2
package/source/xstor/owriteablestream.cxx | 46 +++++-----
package/source/xstor/xfactory.cxx | 4
package/source/xstor/xstorage.cxx | 60 +++++++-------
package/source/zippackage/ZipPackage.cxx | 10 +-
package/source/zippackage/ZipPackageEntry.cxx | 6 -
package/source/zippackage/ZipPackageFolder.cxx | 8 -
package/source/zippackage/ZipPackageStream.cxx | 2
package/source/zippackage/zipfileaccess.cxx | 8 -
padmin/source/adddlg.cxx | 4
padmin/source/cmddlg.cxx | 2
padmin/source/padialog.cxx | 4
pyuno/source/loader/pyuno_loader.cxx | 4
pyuno/source/module/pyuno_module.cxx | 2
pyuno/source/module/pyuno_runtime.cxx | 4
rdbmaker/source/codemaker/dependency.cxx | 8 -
rdbmaker/source/codemaker/global.cxx | 2
rdbmaker/source/rdbmaker/rdbmaker.cxx | 8 -
regexp/source/reclass.cxx | 2
registry/source/keyimpl.cxx | 14 +--
registry/source/reflwrit.cxx | 28 +++---
registry/source/regimpl.cxx | 18 ++--
registry/tools/checksingleton.cxx | 2
registry/tools/regcompare.cxx | 28 +++---
rsc/source/parser/rscdb.cxx | 12 +-
rsc/source/parser/rscibas.cxx | 4
rsc/source/rsc/rsc.cxx | 46 +++++-----
sal/osl/unx/file_path_helper.cxx | 2
sal/osl/unx/file_stat.cxx | 4
sal/osl/unx/file_url.cxx | 4
sal/qa/osl/file/osl_File.cxx | 2
sal/qa/osl/security/osl_Security.cxx | 2
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 2
sal/rtl/source/bootstrap.cxx | 10 +-
133 files changed, 588 insertions(+), 588 deletions(-)
New commits:
commit 85d1ce27ad9ce7a3740bd8bbbaf1d3abe643ba10
Author: Olivier Hallot <olivier.hallot at documentfoundation.org>
Date: Mon Jan 2 15:58:10 2012 -0200
Fix for fdo43460 Part XXVII getLength() to isEmpty()
Please find attached a partial fix for Easy Hack FDO43460
Part XXVII
Modules
padmin, pyuno, rdbmaker, regexp, registry, rsc, sal
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 62a4f14..d23f426 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -165,7 +165,7 @@ void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString& rSel
for( std::list< rtl::OUString >::const_iterator it = aDrivers.begin(); it != aDrivers.end(); ++it )
{
rtl::OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) );
- if( aDriver.getLength() )
+ if( !aDriver.isEmpty() )
{
int nPos = m_aDriverBox.InsertEntry( aDriver );
m_aDriverBox.SetEntryData( nPos, new String( *it ) );
@@ -567,7 +567,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
aValue = aConfig.ReadKey( "PageSize", aDefPageSize );
int nLeft, nRight, nTop, nBottom;
- if( aValue.getLength() &&
+ if( !aValue.isEmpty() &&
aInfo.m_pParser->getMargins( rtl::OStringToOUString(aValue, aEncoding),
nLeft, nRight, nTop, nBottom ) )
{
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 5dc0864..6ab1dfc 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -344,7 +344,7 @@ void RTSCommandPage::save()
aToken.compareToAscii( "external_dialog" )
)
{
- if( aToken.getLength() )
+ if( !aToken.isEmpty() )
{
if( aFeatures.Len() )
aFeatures += ',';
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 51e996e..1aeab2c 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -278,7 +278,7 @@ void PADialog::UpdateDefPrt()
void PADialog::UpdateText()
{
OUString aDev( getSelectedDevice() );
- if( aDev.getLength() )
+ if( !aDev.isEmpty() )
{
const PrinterInfo& rInfo = m_rPIManager.getPrinterInfo( aDev );
String aDriver( rInfo.m_aPrinterName );
@@ -722,7 +722,7 @@ void PADialog::UpdateDevice()
while( nIndex != -1 && ! bAutoQueue )
{
OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
- if( aToken.getLength() )
+ if( !aToken.isEmpty() )
{
if( aToken.compareToAscii( "autoqueue" ) == 0 )
bAutoQueue = true;
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 9e93e19..dced100 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -191,10 +191,10 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
// pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console
// sadly, there is no api for setting the pythonpath, we have to use the environment variable
- if( pythonHome.getLength() )
+ if( !pythonHome.isEmpty() )
setPythonHome( pythonHome );
- if( pythonPath.getLength() )
+ if( !pythonPath.isEmpty() )
prependPythonPath( pythonPath );
#if WNT
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index f02cec8..0382259 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -270,7 +270,7 @@ static PyObject* getComponentContext (PyObject*, PyObject*)
else
{
OUString iniFile;
- if( !path.getLength() )
+ if( path.isEmpty() )
{
PyErr_SetString(
PyExc_RuntimeError, "osl_getUrlFromAddress fails, that's why I cannot find ini "
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 21b6389..9dc5b52 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -955,7 +955,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
else
{
str = OUString(RTL_CONSTASCII_USTRINGPARAM("Could not load uno.py, no stacktrace available"));
- if ( e.Message.getLength() > 0 )
+ if ( !e.Message.isEmpty() )
{
str += OUString (RTL_CONSTASCII_USTRINGPARAM(" (Error loading uno.py: "));
str += e.Message;
@@ -997,7 +997,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
buf.appendAscii( "Couldn't convert exception value to a string" );
}
buf.appendAscii( ", traceback follows\n" );
- if( str.getLength() > 0 )
+ if( !str.isEmpty() )
{
buf.append( str );
buf.appendAscii( "\n" );
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index 8df5fd4..0ca56c3 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -60,7 +60,7 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
{
sal_Bool ret = sal_False;
- if (type.getLength() > 0 && depend.getLength() > 0)
+ if (!type.isEmpty() && !depend.isEmpty())
{
if (m_pImpl->m_dependencies.count(type) > 0)
{
@@ -87,7 +87,7 @@ sal_Bool TypeDependency::insert(const OString& type, const OString& depend, sal_
TypeUsingSet TypeDependency::getDependencies(const OString& type)
{
- if (type.getLength() > 0)
+ if (!type.isEmpty())
{
if (m_pImpl->m_dependencies.count(type) > 0)
{
@@ -100,7 +100,7 @@ TypeUsingSet TypeDependency::getDependencies(const OString& type)
sal_Bool TypeDependency::hasDependencies(const OString& type)
{
- if (type.getLength() > 0)
+ if (!type.isEmpty())
{
if (m_pImpl->m_dependencies.count(type) > 0)
{
@@ -150,7 +150,7 @@ static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dep
{
fieldType = reader.getFieldType(i);
- if (fieldType.getLength() > 0)
+ if (!fieldType.isEmpty())
{
dependencies.insert(type, fieldType, TYPEUSE_MEMBER);
checkTypeDependencies(typeMgr, dependencies, fieldType);
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 6cf6544..0f4e2ab 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -130,7 +130,7 @@ sal_Bool FileStream::isValid()
void FileStream::open(const OString& name, FileAccessMode mode)
{
- if ( name.getLength() > 0 )
+ if ( !name.isEmpty() )
{
m_name = name;
m_pFile = fopen(m_name.getStr(), checkAccessMode(mode));
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 4a4e8ae..a383346 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -335,7 +335,7 @@ int __cdecl main( int argc, char * argv[] )
}
}
- if ( bootReg.getLength() )
+ if ( !bootReg.isEmpty() )
{
pTypeMgr = new SpecialTypeManager();
useSpecial = sal_True;
@@ -429,7 +429,7 @@ int __cdecl main( int argc, char * argv[] )
tmpName = typeName.copy( lastIndex+1 );
if (tmpName == "*")
{
- if (bootReg.getLength())
+ if (!bootReg.isEmpty())
{
fprintf(stderr, "%s ERROR: %s\n",
options.getProgramName().getStr(),
@@ -443,7 +443,7 @@ int __cdecl main( int argc, char * argv[] )
} else
{
tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/');
- if (tmpName.getLength() == 0)
+ if (tmpName.isEmpty())
tmpName = "/";
else
tmpName.replace('.', '/');
@@ -476,7 +476,7 @@ int __cdecl main( int argc, char * argv[] )
{
} else
{
- if (!bootReg.getLength())
+ if (bootReg.isEmpty())
{
// produce all types
if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True,
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index ea717b9..7e051fa 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -755,7 +755,7 @@ Regexpr::Regexpr( const ::com::sun::star::util::SearchOptions & rOptions,
}
if ( rOptions.searchString == NULL ||
- rOptions.searchString.getLength() <= 0) {
+ rOptions.searchString.isEmpty()) {
return;
}
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 6657cb3..c48ae9c 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -105,7 +105,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
*pnSubKeys = 0;
ORegKey* pKey = this;
- if ( keyName.getLength() )
+ if ( !keyName.isEmpty() )
{
_ret = openKey(keyName, (RegKeyHandle*)&pKey);
if (_ret != REG_NO_ERROR)
@@ -148,7 +148,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
}
*phOpenSubKeys = (RegKeyHandle*)pSubKeys;
- if (keyName.getLength())
+ if (!keyName.isEmpty())
{
(void) releaseKey(pKey);
}
@@ -169,7 +169,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName,
*pnSubKeys = 0;
ORegKey* pKey = this;
- if (keyName.getLength())
+ if (!keyName.isEmpty())
{
_ret = openKey(keyName, (RegKeyHandle*)&pKey);
if (_ret != REG_NO_ERROR)
@@ -208,7 +208,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName,
}
*pSubKeyNames = pSubKeys;
- if (keyName.getLength())
+ if (!keyName.isEmpty())
{
releaseKey(pKey);
}
@@ -982,7 +982,7 @@ RegError ORegKey::getKeyType(const OUString& name, RegKeyType* pKeyType) const
REG_GUARD(m_pRegistry->m_mutex);
- if ( name.getLength() )
+ if ( !name.isEmpty() )
{
ORegKey* pThis = const_cast< ORegKey* >(this);
@@ -999,7 +999,7 @@ RegError ORegKey::getKeyType(const OUString& name, RegKeyType* pKeyType) const
RegError ORegKey::getResolvedKeyName(const OUString& keyName,
OUString& resolvedName)
{
- if (keyName.getLength() == 0)
+ if (keyName.isEmpty())
return REG_INVALID_KEYNAME;
resolvedName = getFullPath(keyName);
@@ -1059,7 +1059,7 @@ OStoreDirectory ORegKey::getStoreDir()
}
OUString ORegKey::getFullPath(OUString const & path) const {
- OSL_ASSERT(m_name.getLength() != 0 && path.getLength() != 0);
+ OSL_ASSERT(!m_name.isEmpty() && !path.isEmpty());
OUStringBuffer b(m_name);
if (b.getLength() > 0 && b[b.getLength() - 1] == '/') {
if (path[0] == '/') {
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 3f19d00..9fb415a 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -838,7 +838,7 @@ void TypeWriter::createBlop()
}
// create CP entry for doku
- if (m_doku.getLength())
+ if (!m_doku.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_doku.getStr();
@@ -846,7 +846,7 @@ void TypeWriter::createBlop()
}
// create CP entry for idl source filename
- if (m_fileName.getLength())
+ if (!m_fileName.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_fileName.getStr();
@@ -884,7 +884,7 @@ void TypeWriter::createBlop()
pBuffer += writeUINT16(pBuffer, m_fields[i].m_access);
- if (m_fields[i].m_name.getLength())
+ if (!m_fields[i].m_name.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_fields[i].m_name.getStr();
@@ -892,7 +892,7 @@ void TypeWriter::createBlop()
}
pBuffer += writeUINT16(pBuffer, cpIndexName);
- if (m_fields[i].m_typeName.getLength())
+ if (!m_fields[i].m_typeName.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_fields[i].m_typeName.getStr();
@@ -908,7 +908,7 @@ void TypeWriter::createBlop()
}
pBuffer += writeUINT16(pBuffer, cpIndexValue);
- if (m_fields[i].m_doku.getLength())
+ if (!m_fields[i].m_doku.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_fields[i].m_doku.getStr();
@@ -916,7 +916,7 @@ void TypeWriter::createBlop()
}
pBuffer += writeUINT16(pBuffer, cpIndexDoku2);
- if (m_fields[i].m_fileName.getLength())
+ if (!m_fields[i].m_fileName.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_fields[i].m_fileName.getStr();
@@ -970,7 +970,7 @@ void TypeWriter::createBlop()
pBuffer,
sal::static_int_cast< sal_uInt16 >(m_methods[i].m_mode));
- if (m_methods[i].m_name.getLength())
+ if (!m_methods[i].m_name.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_methods[i].m_name.getStr();
@@ -979,7 +979,7 @@ void TypeWriter::createBlop()
pBuffer += writeUINT16(pBuffer, cpIndexName);
cpIndexName = 0;
- if (m_methods[i].m_returnTypeName.getLength())
+ if (!m_methods[i].m_returnTypeName.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_methods[i].m_returnTypeName.getStr();
@@ -987,7 +987,7 @@ void TypeWriter::createBlop()
}
pBuffer += writeUINT16(pBuffer, cpIndexReturn);
- if (m_methods[i].m_doku.getLength())
+ if (!m_methods[i].m_doku.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_methods[i].m_doku.getStr();
@@ -1001,7 +1001,7 @@ void TypeWriter::createBlop()
for (j = 0; j < m_methods[i].m_paramCount; j++)
{
- if (m_methods[i].m_params[j].m_typeName.getLength())
+ if (!m_methods[i].m_params[j].m_typeName.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_methods[i].m_params[j].m_typeName.getStr();
@@ -1015,7 +1015,7 @@ void TypeWriter::createBlop()
sal::static_int_cast< sal_uInt16 >(
m_methods[i].m_params[j].m_mode));
- if (m_methods[i].m_params[j].m_name.getLength())
+ if (!m_methods[i].m_params[j].m_name.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_methods[i].m_params[j].m_name.getStr();
@@ -1029,7 +1029,7 @@ void TypeWriter::createBlop()
for (j = 0; j < m_methods[i].m_excCount; j++)
{
- if (m_methods[i].m_excNames[j].getLength())
+ if (!m_methods[i].m_excNames[j].isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_methods[i].m_excNames[j].getStr();
@@ -1070,7 +1070,7 @@ void TypeWriter::createBlop()
cpIndexName = 0;
cpIndexDoku2 = 0;
- if (m_references[i].m_name.getLength())
+ if (!m_references[i].m_name.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_references[i].m_name.getStr();
@@ -1078,7 +1078,7 @@ void TypeWriter::createBlop()
}
pBuffer += writeUINT16(pBuffer, cpIndexName);
- if (m_references[i].m_doku.getLength())
+ if (!m_references[i].m_doku.isEmpty())
{
pInfo = new CPInfo(CP_TAG_UTF8_NAME, pInfo);
pInfo->m_value.aUtf8 = m_references[i].m_doku.getStr();
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 027f6c2..5eb88c7 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -481,7 +481,7 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
m_readOnly = sal_True;
}
- if (0 == regName.getLength() &&
+ if (regName.isEmpty() &&
store_AccessCreate == sAccessMode)
{
errCode = rRegFile.createInMemory();
@@ -555,7 +555,7 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
{
REG_GUARD(m_mutex);
- if (regName.getLength())
+ if (!regName.isEmpty())
{
ORegistry* pReg = new ORegistry();
@@ -589,7 +589,7 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
m_file.close();
m_isOpen = sal_False;
- if (m_name.getLength())
+ if (!m_name.isEmpty())
{
OUString systemName;
if ( FileBase::getSystemPathFromFileURL(m_name, systemName) != FileBase::E_None )
@@ -653,7 +653,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
*phNewKey = NULL;
- if ( !keyName.getLength() )
+ if ( keyName.isEmpty() )
return REG_INVALID_KEYNAME;
REG_GUARD(m_mutex);
@@ -683,7 +683,7 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName,
do
{
token = sFullKeyName.getToken( 0, '/', nIndex );
- if (token.getLength())
+ if (!token.isEmpty())
{
if (rStoreDir.create(pKey->getStoreFile(), sFullPath.getStr(), token, KEY_MODE_CREATE))
{
@@ -714,7 +714,7 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
*phOpenKey = NULL;
- if ( !keyName.getLength() )
+ if ( keyName.isEmpty() )
{
return REG_INVALID_KEYNAME;
}
@@ -795,7 +795,7 @@ RegError ORegistry::closeKey(RegKeyHandle hKey)
RegError ORegistry::deleteKey(RegKeyHandle hKey, const OUString& keyName)
{
ORegKey* pKey = static_cast< ORegKey* >(hKey);
- if ( !keyName.getLength() )
+ if ( keyName.isEmpty() )
return REG_INVALID_KEYNAME;
REG_GUARD(m_mutex);
@@ -811,7 +811,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
{
RegError _ret = REG_NO_ERROR;
- if ( !keyName.getLength() )
+ if ( keyName.isEmpty() )
{
return REG_INVALID_KEYNAME;
}
@@ -1361,7 +1361,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
if(pTargetKey->getName().getLength() > 1)
sFullPath += pTargetKey->getName();
sFullPath += sRelPath;
- if (sRelPath.getLength() > 1 || sFullPath.getLength() == 0)
+ if (sRelPath.getLength() > 1 || sFullPath.isEmpty())
sFullPath += ROOT;
OUString sFullKeyName = sFullPath;
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index ed5924b..998bc62 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -61,7 +61,7 @@ public:
std::string const & getTypeReg() const
{ return m_typeRegName; }
bool hasBase() const
- { return (m_base.getLength() > 0); }
+ { return (!m_base.isEmpty()); }
const OString & getBase() const
{ return m_base; }
bool forceOutput() const
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index f3dfe6b..c12e1c1 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -62,7 +62,7 @@ public:
std::string const & getRegName1() const { return m_regName1; }
std::string const & getRegName2() const { return m_regName2; }
- bool isStartKeyValid() const { return (m_startKey.getLength() > 0); }
+ bool isStartKeyValid() const { return (!m_startKey.isEmpty()); }
OUString const & getStartKey() const { return m_startKey; }
bool matchedWithExcludeKey( const OUString& keyName) const;
@@ -323,55 +323,55 @@ static OString getFieldAccess(RTFieldAccess fieldAccess)
}
if ( (fieldAccess & RT_ACCESS_READONLY) == RT_ACCESS_READONLY )
{
- ret += OString(ret.getLength() > 0 ? ",READONLY" : "READONLY");
+ ret += OString(ret.isEmpty() ? "READONLY" : ",READONLY");
}
if ( (fieldAccess & RT_ACCESS_OPTIONAL) == RT_ACCESS_OPTIONAL )
{
- ret += OString(ret.getLength() > 0 ? ",OPTIONAL" : "OPTIONAL");
+ ret += OString(ret.isEmpty() ? "OPTIONAL" : ",OPTIONAL");
}
if ( (fieldAccess & RT_ACCESS_MAYBEVOID) == RT_ACCESS_MAYBEVOID )
{
- ret += OString(ret.getLength() > 0 ? ",MAYBEVOID" : "MAYBEVOID");
+ ret += OString(ret.isEmpty() ? "MAYBEVOID" : ",MAYBEVOID");
}
if ( (fieldAccess & RT_ACCESS_BOUND) == RT_ACCESS_BOUND )
{
- ret += OString(ret.getLength() > 0 ? ",BOUND" : "BOUND");
+ ret += OString(ret.isEmpty() ? "BOUND" : ",BOUND");
}
if ( (fieldAccess & RT_ACCESS_CONSTRAINED) == RT_ACCESS_CONSTRAINED )
{
- ret += OString(ret.getLength() > 0 ? ",CONSTRAINED" : "CONSTRAINED");
+ ret += OString(ret.isEmpty() ? "CONSTRAINED" : ",CONSTRAINED");
}
if ( (fieldAccess & RT_ACCESS_TRANSIENT) == RT_ACCESS_TRANSIENT )
{
- ret += OString(ret.getLength() > 0 ? ",TRANSIENT" : "TRANSIENT");
+ ret += OString(ret.isEmpty() ? "TRANSIENT" : ",TRANSIENT");
}
if ( (fieldAccess & RT_ACCESS_MAYBEAMBIGUOUS) == RT_ACCESS_MAYBEAMBIGUOUS )
{
- ret += OString(ret.getLength() > 0 ? ",MAYBEAMBIGUOUS" : "MAYBEAMBIGUOUS");
+ ret += OString(ret.isEmpty() ? "MAYBEAMBIGUOUS" : ",MAYBEAMBIGUOUS");
}
if ( (fieldAccess & RT_ACCESS_MAYBEDEFAULT) == RT_ACCESS_MAYBEDEFAULT )
{
- ret += OString(ret.getLength() > 0 ? ",MAYBEDEFAULT" : "MAYBEDEFAULT");
+ ret += OString(ret.isEmpty() ? "MAYBEDEFAULT" : ",MAYBEDEFAULT");
}
if ( (fieldAccess & RT_ACCESS_REMOVEABLE) == RT_ACCESS_REMOVEABLE )
{
- ret += OString(ret.getLength() > 0 ? ",REMOVEABLE" : "REMOVEABLE");
+ ret += OString(ret.isEmpty() ? "REMOVEABLE" : ",REMOVEABLE");
}
if ( (fieldAccess & RT_ACCESS_ATTRIBUTE) == RT_ACCESS_ATTRIBUTE )
{
- ret += OString(ret.getLength() > 0 ? ",ATTRIBUTE" : "ATTRIBUTE");
+ ret += OString(ret.isEmpty() ? "ATTRIBUTE" : ",ATTRIBUTE");
}
if ( (fieldAccess & RT_ACCESS_PROPERTY) == RT_ACCESS_PROPERTY )
{
- ret += OString(ret.getLength() > 0 ? ",PROPERTY" : "PROPERTY");
+ ret += OString(ret.isEmpty() ? "PROPERTY" : ",PROPERTY");
}
if ( (fieldAccess & RT_ACCESS_CONST) == RT_ACCESS_CONST )
{
- ret += OString(ret.getLength() > 0 ? ",CONST" : "CONST");
+ ret += OString(ret.isEmpty() ? "CONST" : ",CONST");
}
if ( (fieldAccess & RT_ACCESS_READWRITE) == RT_ACCESS_READWRITE )
{
- ret += OString(ret.getLength() > 0 ? ",READWRITE" : "READWRITE");
+ ret += OString(ret.isEmpty() ? "READWRITE" : ",READWRITE");
}
return ret;
}
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 00ec27b..2a36f69 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -99,12 +99,12 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
{
rtl::OStringBuffer aLangStr( 64 );
aLangStr.append( rLang.toAsciiLowerCase() );
- if( rCountry.getLength() )
+ if( !rCountry.isEmpty() )
{
aLangStr.append( '-' );
aLangStr.append( rCountry.toAsciiUpperCase() );
}
- if( rVariant.getLength() )
+ if( !rVariant.isEmpty() )
{
aLangStr.append( '-' );
aLangStr.append( rVariant );
@@ -116,9 +116,9 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
pTypCont->AddLanguage( aL.getStr() );
nRet = GetLangId( aL );
}
- if( rVariant.getLength() )
+ if( !rVariant.isEmpty() )
rVariant = rtl::OString();
- else if( rCountry.getLength() )
+ else if( !rCountry.isEmpty() )
rCountry = rtl::OString();
else
rLang = rtl::OString();
@@ -154,7 +154,7 @@ rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang)
do
{
aLangFallbacks.push_back(getLangIdAndShortenLocale( this, aLg, aCountry, aVariant ) );
- } while( aLg.getLength() );
+ } while( !aLg.isEmpty() );
if( bAppendEnUsFallback )
{
@@ -838,7 +838,7 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey,
ERRTYPE aError;
fprintf( fOutput, "#include <string.h>\n" );
WriteInc( fOutput, nFileKey );
- if( rHxxName.getLength() )
+ if( !rHxxName.isEmpty() )
fprintf( fOutput, "#include \"%s\"\n", rHxxName.getStr() );
fprintf( fOutput, "\n\n" );
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index e4cc72a..40ee8dd 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -145,7 +145,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
}
rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" );
- if ( aEnvIsoTokens.getLength() )
+ if ( !aEnvIsoTokens.isEmpty() )
{
rtl::OString aIsoToken;
sal_uInt16 nTokenCounter = 0;
@@ -153,7 +153,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
while ( bOneMore )
{
aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' ');
- if ( aIsoToken.getLength() )
+ if ( !aIsoToken.isEmpty() )
{
SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId );
if ( ! GetLangId( aIsoToken ))
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e8ececa..93dc64e 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -223,13 +223,13 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
const rtl::OString aSysSearchDir( (*ppStr)+5 );
// ignore empty -lip= arguments that we get lots of these days
- if (aSysSearchDir.getLength())
+ if (!aSysSearchDir.isEmpty())
{
DirEntry aSysDir(rtl::OStringToOUString(aSysSearchDir, RTL_TEXTENCODING_ASCII_US));
m_aOutputFiles.back().aSysSearchDirs.push_back(
rtl::OUStringToOString(aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US) );
rtl::OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath;
- if( aLangSearchPath.getLength() )
+ if( !aLangSearchPath.isEmpty() )
{
aLangSearchPath = aLangSearchPath +
rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US);
@@ -290,7 +290,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
}
else if( !rsc_strnicmp( (*ppStr) + 1, "lg", 2 ) )
{
- if( m_aOutputFiles.back().aLangName.getLength() )
+ if( !m_aOutputFiles.back().aLangName.isEmpty() )
m_aOutputFiles.push_back( OutputFile() );
m_aOutputFiles.back().aLangName = rtl::OString((*ppStr)+3);
}
@@ -314,7 +314,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
::std::list<OutputFile>::iterator it;
for( it = m_aOutputFiles.begin(); it != m_aOutputFiles.end(); ++it )
{
- if( ! it->aOutputRc.getLength() )
+ if( it->aOutputRc.isEmpty() )
it->aOutputRc = ::OutputFile( *aInputList.front(), "rc" );
}
if( ! bOutputSrsIsSet )
@@ -396,7 +396,7 @@ RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont )
pCL = pLine;
pTC = pTypCont;
- if( pCL->aOutputLst.getLength() )
+ if( !pCL->aOutputLst.isEmpty() )
{
if ( NULL == (fListing = fopen( pCL->aOutputLst.getStr(), "w" )) )
pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputLst.getStr() );
@@ -418,13 +418,13 @@ RscCompiler::~RscCompiler()
if( fExitFile )
fclose( fExitFile );
- if( aTmpOutputHxx.getLength() )
+ if( !aTmpOutputHxx.isEmpty() )
unlink( aTmpOutputHxx.getStr() );
- if( aTmpOutputCxx.getLength() )
+ if( !aTmpOutputCxx.isEmpty() )
unlink( aTmpOutputCxx.getStr() );
- if( aTmpOutputRcCtor.getLength() )
+ if( !aTmpOutputRcCtor.isEmpty() )
unlink( aTmpOutputRcCtor.getStr() );
- if( aTmpOutputSrc.getLength() )
+ if( !aTmpOutputSrc.isEmpty() )
unlink( aTmpOutputSrc.getStr() );
}
@@ -512,7 +512,7 @@ ERRTYPE RscCompiler::Start()
*************************************************************************/
void RscCompiler::EndCompile()
{
- if( pCL->aOutputSrs.getLength() && (pCL->nCommands & NOLINK_FLAG) )
+ if( !pCL->aOutputSrs.isEmpty() && (pCL->nCommands & NOLINK_FLAG) )
{
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputSrs.getStr(), RscVerbosityVerbose );
@@ -546,7 +546,7 @@ void RscCompiler::EndCompile()
};
}
- if ( aTmpOutputHxx.getLength() )
+ if ( !aTmpOutputHxx.isEmpty() )
{
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputHxx.getStr(), RscVerbosityVerbose );
@@ -559,7 +559,7 @@ void RscCompiler::EndCompile()
aTmpOutputHxx = rtl::OString();
}
- if( aTmpOutputCxx.getLength() )
+ if( !aTmpOutputCxx.isEmpty() )
{
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputCxx.getStr(), RscVerbosityVerbose );
@@ -572,7 +572,7 @@ void RscCompiler::EndCompile()
aTmpOutputCxx = rtl::OString();
}
- if( aTmpOutputRcCtor.getLength() )
+ if( !aTmpOutputRcCtor.isEmpty() )
{
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputRcCtor.getStr(), RscVerbosityVerbose );
@@ -585,7 +585,7 @@ void RscCompiler::EndCompile()
aTmpOutputRcCtor = rtl::OString();
}
- if( aTmpOutputSrc.getLength() )
+ if( !aTmpOutputSrc.isEmpty() )
{
// kopiere von TMP auf richtigen Namen
unlink( pCL->aOutputSrc.getStr() ); // Zieldatei loeschen
@@ -594,7 +594,7 @@ void RscCompiler::EndCompile()
aTmpOutputSrc = rtl::OString();
}
- if( pCL->aTouchFile.getLength() )
+ if( !pCL->aTouchFile.isEmpty() )
{
FILE* fp = fopen( pCL->aTouchFile.getStr(), "w" );
if( fp )
@@ -823,7 +823,7 @@ ERRTYPE RscCompiler::Link()
OSL_TRACE("temporary rc file: %s", aRcTmp.getStr());
OUString sOilDirUrl;
- if(pCL->aILDir.getLength())
+ if(!pCL->aILDir.isEmpty())
sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir);
else
sOilDirUrl = sTempDirUrl;
@@ -884,7 +884,7 @@ ERRTYPE RscCompiler::Link()
aContext.pCmdLine = pCL;
// create empty sys list
- if( aContext.aOutputSysList.getLength() )
+ if( !aContext.aOutputSysList.isEmpty() )
{
FILE* pSysListFile = fopen( aContext.aOutputSysList.getStr(), "wb" );
@@ -955,7 +955,7 @@ ERRTYPE RscCompiler::Link()
}
// hxx-Datei schreiben
- if( pCL->aOutputHxx.getLength() && aError.IsOk() )
+ if( !pCL->aOutputHxx.isEmpty() && aError.IsOk() )
{
aTmpOutputHxx = ::GetTmpFileName();
if ( NULL == (fExitFile = foutput = fopen( aTmpOutputHxx.getStr(), "w" )) )
@@ -971,7 +971,7 @@ ERRTYPE RscCompiler::Link()
}
// cxx-Datei schreiben
- if( pCL->aOutputCxx.getLength() && aError.IsOk() )
+ if( !pCL->aOutputCxx.isEmpty() && aError.IsOk() )
{
aTmpOutputCxx = ::GetTmpFileName();
if ( NULL == (fExitFile = foutput = fopen( aTmpOutputCxx.getStr(), "w" )) )
@@ -980,7 +980,7 @@ ERRTYPE RscCompiler::Link()
pTC->pEH->StdOut( "Generating .cxx file\n" );
rtl::OString aHxx = pCL->aOutputHxx;
- if( !aHxx.getLength() )
+ if( aHxx.isEmpty() )
{
UniString aUniOutputCxx( pCL->aOutputCxx, RTL_TEXTENCODING_ASCII_US );
aHxx = rtl::OStringBuffer(rtl::OUStringToOString(DirEntry(aUniOutputCxx).GetBase(),
@@ -995,7 +995,7 @@ ERRTYPE RscCompiler::Link()
}
// RcCtor-Datei schreiben
- if( pCL->aOutputRcCtor.getLength() && aError.IsOk() )
+ if( !pCL->aOutputRcCtor.isEmpty() && aError.IsOk() )
{
aTmpOutputRcCtor = ::GetTmpFileName();
if ( NULL == (fExitFile = foutput = fopen( aTmpOutputRcCtor.getStr(), "w" )) )
@@ -1011,7 +1011,7 @@ ERRTYPE RscCompiler::Link()
}
// src-Datei schreiben
- if( pCL->aOutputSrc.getLength() && aError.IsOk() )
+ if( !pCL->aOutputSrc.isEmpty() && aError.IsOk() )
{
aTmpOutputSrc = ::GetTmpFileName();
if ( NULL == (fExitFile = foutput = fopen( aTmpOutputSrc.getStr(), "w" )) )
@@ -1145,7 +1145,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ );
SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
::std::vector< rtl::OString > aMissingImages;
- FILE* pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
+ FILE* pSysListFile = rContext.aOutputSysList.isEmpty() ? NULL : fopen( rContext.aOutputSysList.getStr(), "ab" );
if( !aIStm.GetError() && !aOStm.GetError() )
{
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index d0b79a9..1aaf0e4 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -135,7 +135,7 @@
rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath)));
rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath));
- if (base.getLength() > 0)
+ if (!base.isEmpty())
osl_systemPathEnsureSeparator(&base.pData);
base += rel;
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 949121f..ffeb885 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -199,8 +199,8 @@ namespace /* private */
return osl_File_E_INVAL;
file_path = rtl::OUString(pImpl->m_ustrFilePath);
- OSL_ASSERT(file_path.getLength() > 0);
- if (file_path.getLength() <= 0)
+ OSL_ASSERT(!file_path.isEmpty());
+ if (file_path.isEmpty())
return osl_File_E_INVAL;
pStat->uValidFields = 0;
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 6be4eb1..7addb8e 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -151,7 +151,7 @@ namespace {
oslFileError getSystemPathFromFileUrl(
rtl::OUString const & url, rtl::OUString * path, bool homeAbbreviation)
{
- OSL_ASSERT(path != 0 && path->getLength() == 0);
+ OSL_ASSERT(path != 0 && path->isEmpty());
sal_Unicode const * p = url.getStr();
sal_Unicode const * end = p + url.getLength();
@@ -677,7 +677,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString* ustrBaseDirURL, rtl_uString* u
rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
- if (base.getLength() > 0)
+ if (!base.isEmpty())
{
resolved_path += rtl::OUString( UNICHAR_SLASH );
resolved_path += base;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index bb1939c..02ca76f 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -953,7 +953,7 @@ namespace osl_FileBase
// sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
// printf("UTF8: %s\n", sStr.getStr() );
- if (_sAssumeResultStr.getLength() > 0)
+ if (!_sAssumeResultStr.isEmpty())
{
sal_Bool bStrAreEqual = _sAssumeResultStr.equals(sStr);
CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong",
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 38f8130..fd04ae5 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -193,7 +193,7 @@ namespace osl_Security
bRes = aSec.getUserName( strGetName );
sal_Int32 nPos = -1;
- if (strName.getLength() > 0)
+ if (!strName.isEmpty())
{
nPos = strGetName.indexOf(strName);
}
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index a5b5ae3..646a222 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -181,7 +181,7 @@ namespace rtl_DoubleLocking
CPPUNIT_ASSERT_MESSAGE(
"Gregorian::get() failed, wrong value expected.",
- aStr.getLength() != 0
+ !aStr.isEmpty()
);
}
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 9792bfb..4c3034c 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -275,7 +275,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
#endif /* OSL_DEBUG_LEVEL > 1 */
oslFileHandle handle;
- if (_iniName.getLength() &&
+ if (!_iniName.isEmpty() &&
osl_File_E_None == osl_openFile(_iniName.pData, &handle, osl_File_OpenFlag_Read))
{
rtl::ByteSequence seq;
@@ -379,9 +379,9 @@ Bootstrap_Impl * BootstrapMap::getIni(
}
void BootstrapMap::setBaseIniUri(rtl::OUString const & uri) {
- OSL_ASSERT(uri.getLength() != 0);
+ OSL_ASSERT(!uri.isEmpty());
osl::MutexGuard g(mutex_);
- OSL_ASSERT(baseIniUri_.getLength() == 0 && baseIni_ == 0);
+ OSL_ASSERT(baseIniUri_.isEmpty() && baseIni_ == 0);
baseIniUri_ = uri;
}
@@ -389,7 +389,7 @@ Bootstrap_Impl * BootstrapMap::getBaseIni() {
osl::MutexGuard g(mutex_);
if (baseIni_ == 0) {
rtl::OUString uri;
- if (baseIniUri_.getLength() == 0) {
+ if (baseIniUri_.isEmpty()) {
if (CommandLineParameters::get().get(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INIFILENAME")),
&uri))
@@ -779,7 +779,7 @@ rtl::OUString expandMacros(
for (int j = 0; j < n; ++j) {
seg[j] = expandMacros(file, seg[j], mode, requestStack);
}
- if (n == 3 && seg[1].getLength() == 0) {
+ if (n == 3 && seg[1].isEmpty()) {
// For backward compatibility, treat ${file::key} the same
// as just ${file:key}:
seg[1] = seg[2];
commit 829db12d7e3e93b4a44f79b39a0a9f0630439109
Author: Olivier Hallot <olivier.hallot at documentfoundation.org>
Date: Sun Jan 1 19:03:17 2012 -0200
Fix for fdo43460 Part XXVI getLength() to isEmpty()
Please find attached a partial fix for Easy Hack FDO43460
Part XXVI
Module
package
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index a9e9f45..7490508 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -127,7 +127,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
pValue->Value >>= aVersion;
}
- if ( aPath.getLength() && aMediaType.getLength() && aVersion.getLength() )
+ if ( !aPath.isEmpty() && !aMediaType.isEmpty() && !aVersion.isEmpty() )
break;
}
@@ -142,7 +142,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
sal_Bool bProvideDTD = sal_False;
sal_Bool bAcceptNonemptyVersion = sal_False;
sal_Bool bStoreStartKeyGeneration = sal_False;
- if ( aDocMediaType.getLength() )
+ if ( !aDocMediaType.isEmpty() )
{
if ( aDocMediaType.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) ) )
|| aDocMediaType.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) ) )
@@ -215,7 +215,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
{
pValue->Value >>= aString;
// the version is stored only if it is not empty
- if ( bAcceptNonemptyVersion && aString.getLength() )
+ if ( bAcceptNonemptyVersion && !aString.isEmpty() )
pAttrList->AddAttribute ( sVersionAttribute, sCdataAttribute, aString );
}
else if (pValue->Name.equals (sFullPathProperty) )
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index 9ab6b15..c910e51 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -72,7 +72,7 @@ OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const ::rtl::OUSt
do
{
::rtl::OUString aName = aPath.getToken( 0, '/', nIndex );
- if ( !aName.getLength() )
+ if ( aName.isEmpty() )
throw lang::IllegalArgumentException();
aResult.push_back( aName );
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index b7de9df..dd02293 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -266,7 +266,7 @@ const sal_Int32 n_ConstBufferSize = 32000;
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception") ) );
}
- if ( !aTempURL.getLength() )
+ if ( aTempURL.isEmpty() )
throw uno::RuntimeException(); // TODO: can not create tempfile
return aTempURL;
@@ -323,7 +323,7 @@ OWriteStream_Impl::~OWriteStream_Impl()
{
DisposeWrappers();
- if ( m_aTempURL.getLength() )
+ if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, GetServiceFactory() );
m_aTempURL = ::rtl::OUString();
@@ -411,7 +411,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
if ( m_bForceEncrypted || m_bHasCachedEncryptionData )
return sal_True;
- if ( m_aTempURL.getLength() || m_xCacheStream.is() )
+ if ( !m_aTempURL.isEmpty() || m_xCacheStream.is() )
return sal_False;
GetStreamProperties();
@@ -568,7 +568,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() );
try {
- if ( aTempURL.getLength() && xStream.is() )
+ if ( !aTempURL.isEmpty() && xStream.is() )
{
uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
GetServiceFactory()->createInstance (
@@ -607,7 +607,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
throw;
}
- if ( aTempURL.getLength() )
+ if ( !aTempURL.isEmpty() )
CleanCacheStream();
m_aTempURL = aTempURL;
@@ -620,7 +620,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
::rtl::OUString OWriteStream_Impl::FillTempGetFileName()
{
// should try to create cache first, if the amount of contents is too big, the temp file should be taken
- if ( !m_xCacheStream.is() && !m_aTempURL.getLength() )
+ if ( !m_xCacheStream.is() && m_aTempURL.isEmpty() )
{
uno::Reference< io::XInputStream > xOrigStream = m_xPackageStream->getDataStream();
if ( !xOrigStream.is() )
@@ -653,12 +653,12 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
m_xCacheStream = xCacheStream;
m_xCacheSeek->seek( 0 );
}
- else if ( !m_aTempURL.getLength() )
+ else if ( m_aTempURL.isEmpty() )
{
m_aTempURL = GetNewTempFileURL( GetServiceFactory() );
try {
- if ( m_aTempURL.getLength() )
+ if ( !m_aTempURL.isEmpty() )
{
uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
GetServiceFactory()->createInstance (
@@ -710,10 +710,10 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream()
if ( !m_xCacheStream.is() )
{
- if ( !m_aTempURL.getLength() )
+ if ( m_aTempURL.isEmpty() )
m_aTempURL = FillTempGetFileName();
- if ( m_aTempURL.getLength() )
+ if ( !m_aTempURL.isEmpty() )
{
// the temporary file is not used if the cache is used
uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
@@ -755,10 +755,10 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream()
if ( !m_xCacheStream.is() )
{
- if ( !m_aTempURL.getLength() )
+ if ( m_aTempURL.isEmpty() )
m_aTempURL = FillTempGetFileName();
- if ( m_aTempURL.getLength() )
+ if ( !m_aTempURL.isEmpty() )
{
// the temporary file is not used if the cache is used
uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
@@ -810,7 +810,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
if ( m_bHasDataToFlush )
throw io::IOException();
- OSL_ENSURE( !m_aTempURL.getLength() && !m_xCacheStream.is(), "The temporary must not exist!\n" );
+ OSL_ENSURE( m_aTempURL.isEmpty() && !m_xCacheStream.is(), "The temporary must not exist!\n" );
// use new file as current persistent representation
// the new file will be removed after it's stream is closed
@@ -912,7 +912,7 @@ void OWriteStream_Impl::Commit()
m_xCacheSeek = uno::Reference< io::XSeekable >();
}
- else if ( m_aTempURL.getLength() )
+ else if ( !m_aTempURL.isEmpty() )
{
if ( m_pAntiImpl )
m_pAntiImpl->DeInit();
@@ -999,7 +999,7 @@ void OWriteStream_Impl::Revert()
if ( !m_bHasDataToFlush )
return; // nothing to do
- OSL_ENSURE( m_aTempURL.getLength() || m_xCacheStream.is(), "The temporary must exist!\n" );
+ OSL_ENSURE( !m_aTempURL.isEmpty() || m_xCacheStream.is(), "The temporary must exist!\n" );
if ( m_xCacheStream.is() )
{
@@ -1007,7 +1007,7 @@ void OWriteStream_Impl::Revert()
m_xCacheSeek = uno::Reference< io::XSeekable >();
}
- if ( m_aTempURL.getLength() )
+ if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, GetServiceFactory() );
m_aTempURL = ::rtl::OUString();
@@ -1391,7 +1391,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
if ( ( nStreamMode & embed::ElementModes::READWRITE ) == embed::ElementModes::READ )
{
uno::Reference< io::XInputStream > xInStream;
- if ( m_xCacheStream.is() || m_aTempURL.getLength() )
+ if ( m_xCacheStream.is() || !m_aTempURL.isEmpty() )
xInStream = GetTempFileAsInputStream(); //TODO:
else
xInStream = m_xPackageStream->getDataStream();
@@ -1412,7 +1412,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
}
else if ( ( nStreamMode & embed::ElementModes::READWRITE ) == embed::ElementModes::SEEKABLEREAD )
{
- if ( !m_xCacheStream.is() && !m_aTempURL.getLength() && !( m_xPackageStream->getDataStream().is() ) )
+ if ( !m_xCacheStream.is() && m_aTempURL.isEmpty() && !( m_xPackageStream->getDataStream().is() ) )
{
// The stream does not exist in the storage
throw io::IOException();
@@ -1443,7 +1443,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
uno::Reference< io::XStream > xStream;
if ( ( nStreamMode & embed::ElementModes::TRUNCATE ) == embed::ElementModes::TRUNCATE )
{
- if ( m_aTempURL.getLength() )
+ if ( !m_aTempURL.isEmpty() )
{
KillFile( m_aTempURL, GetServiceFactory() );
m_aTempURL = ::rtl::OUString();
@@ -1463,7 +1463,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
}
else if ( !m_bHasInsertedStreamOptimization )
{
- if ( !m_aTempURL.getLength() && !m_xCacheStream.is() && !( m_xPackageStream->getDataStream().is() ) )
+ if ( m_aTempURL.isEmpty() && !m_xCacheStream.is() && !( m_xPackageStream->getDataStream().is() ) )
{
// The stream does not exist in the storage
m_bHasDataToFlush = sal_True;
@@ -1698,10 +1698,10 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
if ( m_nStorageType == embed::StorageFormats::OFOPXML )
{
- OSL_ENSURE( aOrigStreamName.getLength() && aNewStreamName.getLength() && xRelStorage.is(),
+ OSL_ENSURE( !aOrigStreamName.isEmpty() && !aNewStreamName.isEmpty() && xRelStorage.is(),
"Wrong relation persistence information is provided!\n" );
- if ( !xRelStorage.is() || !aOrigStreamName.getLength() || !aNewStreamName.getLength() )
+ if ( !xRelStorage.is() || aOrigStreamName.isEmpty() || aNewStreamName.isEmpty() )
throw uno::RuntimeException();
if ( m_nRelInfoStatus == RELINFO_BROKEN || m_nRelInfoStatus == RELINFO_CHANGED_BROKEN )
@@ -2370,7 +2370,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
m_xSeekable->seek( 0 );
// it is enough to copy the cached stream, the cache should already contain everything
- if ( m_pImpl->GetFilledTempFileIfNo( m_xInStream ).getLength() )
+ if ( !m_pImpl->GetFilledTempFileIfNo( m_xInStream ).isEmpty() )
{
DeInit();
// the last position is known and it is differs from the current stream position
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 1a0938c..3602ab0 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -150,7 +150,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
if ( aArguments[0] >>= aURL )
{
- if ( !aURL.getLength() )
+ if ( aURL.isEmpty() )
{
OSL_FAIL( "Empty URL is provided!\n" );
throw lang::IllegalArgumentException(); // TODO:
@@ -191,7 +191,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
{
if( aArguments[2] >>= aDescr )
{
- if ( aURL.getLength() )
+ if ( !aURL.isEmpty() )
{
aPropsToSet.realloc(1);
aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") );
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index f5a3fdb..3845d9c 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -659,7 +659,7 @@ void OStorage_Impl::ReadContents()
}
::rtl::OUString aName = xNamed->getName();
- OSL_ENSURE( aName.getLength(), "Empty name!\n" );
+ OSL_ENSURE( !aName.isEmpty(), "Empty name!\n" );
uno::Reference< container::XNameContainer > xNameContainer( xNamed, uno::UNO_QUERY );
@@ -802,7 +802,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
sal_Bool bDirect )
{
OSL_ENSURE( xDest.is(), "No destination storage!\n" );
- OSL_ENSURE( aName.getLength(), "Empty element name!\n" );
+ OSL_ENSURE( !aName.isEmpty(), "Empty element name!\n" );
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1398,7 +1398,7 @@ void OStorage_Impl::Revert()
//-----------------------------------------------
SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName )
{
- OSL_ENSURE( rName.getLength(), "Name is empty!" );
+ OSL_ENSURE( !rName.isEmpty(), "Name is empty!" );
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1786,7 +1786,7 @@ void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement )
if ( m_nStorageType == embed::StorageFormats::OFOPXML && pStreamElement->m_pStream )
{
- OSL_ENSURE( pStreamElement->m_aName.getLength(), "The name must not be empty!\n" );
+ OSL_ENSURE( !pStreamElement->m_aName.isEmpty(), "The name must not be empty!\n" );
if ( !m_xRelStorage.is() )
{
@@ -2494,7 +2494,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
+ if ( aStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -2612,7 +2612,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStorName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStorName, sal_False ) )
+ if ( aStorName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStorName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -2767,7 +2767,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
+ if ( aStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -2933,7 +2933,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStorName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStorName, sal_False ) )
+ if ( aStorName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStorName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -3027,7 +3027,7 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -3096,7 +3096,7 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementNam
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -3169,7 +3169,7 @@ void SAL_CALL OStorage::removeElement( const ::rtl::OUString& aElementName )
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -3263,8 +3263,8 @@ void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, cons
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
- || !aNewName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
+ || aNewName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -3370,8 +3370,8 @@ void SAL_CALL OStorage::copyElementTo( const ::rtl::OUString& aElementName,
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
- || !aNewName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
+ || aNewName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !xDest.is() )
@@ -3475,8 +3475,8 @@ void SAL_CALL OStorage::moveElementTo( const ::rtl::OUString& aElementName,
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
- || !aNewName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
+ || aNewName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !xDest.is() || xDest == uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ) )
@@ -3799,7 +3799,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // the interface is not supported and must not be accessible
- if ( !sStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( sStreamName, sal_False ) )
+ if ( sStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( sStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
uno::Reference < io::XInputStream > xTempIn;
@@ -3909,7 +3909,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
throw packages::NoEncryptionException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
- if ( !sStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( sStreamName, sal_False ) )
+ if ( sStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( sStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
uno::Reference < io::XInputStream > xTempIn;
@@ -4029,7 +4029,7 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const ::rtl::OUString& aStre
if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
throw packages::NoEncryptionException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
- if ( !aStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
+ if ( aStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !xInStream.is() )
@@ -4384,7 +4384,7 @@ uno::Any SAL_CALL OStorage::getByName( const ::rtl::OUString& aName )
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aName, sal_False ) )
+ if ( aName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -4489,7 +4489,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const ::rtl::OUString& aName )
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aName.getLength() )
+ if ( aName.isEmpty() )
return sal_False;
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -5704,7 +5704,7 @@ void SAL_CALL OStorage::insertStreamElementDirect(
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
+ if ( aStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -5797,8 +5797,8 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
- || !aNewName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False )
+ || aNewName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aNewName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !xDest.is() || xDest == uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ) )
@@ -6057,7 +6057,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aElementName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
+ if ( aElementName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aElementName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -6160,7 +6160,7 @@ void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamNam
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStreamName.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
+ if ( aStreamName.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamName, sal_False ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML
@@ -6250,7 +6250,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStreamPath.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
+ if ( aStreamPath.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE )
@@ -6322,7 +6322,7 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUSt
throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
- if ( !aStreamPath.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
+ if ( aStreamPath.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE ) )
@@ -6362,7 +6362,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
throw packages::NoEncryptionException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
- if ( !aStreamPath.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
+ if ( aStreamPath.isEmpty() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
if ( !aEncryptionData.getLength() )
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index c07e7a1..776ccbc 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -135,7 +135,7 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL )
}
}
- return ( aSystemPath.getLength() != 0 );
+ return ( !aSystemPath.isEmpty() );
}
}
@@ -292,7 +292,7 @@ void ZipPackage::parseManifest()
pDerivedKeySize = &( pValue[j].Value );
}
- if ( sPath.getLength() && hasByHierarchicalName ( sPath ) )
+ if ( !sPath.isEmpty() && hasByHierarchicalName ( sPath ) )
{
aAny = getByHierarchicalName( sPath );
uno::Reference < XUnoTunnel > xUnoTunnel;
@@ -505,7 +505,7 @@ void ZipPackage::parseContentType()
else
aPath = aContentTypeInfo[1][nInd].First;
- if ( aPath.getLength() && hasByHierarchicalName( aPath ) )
+ if ( !aPath.isEmpty() && hasByHierarchicalName( aPath ) )
{
uno::Any aIterAny = getByHierarchicalName( aPath );
uno::Reference < lang::XUnoTunnel > xIterTunnel;
@@ -583,7 +583,7 @@ void ZipPackage::getZipFileContents()
pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
nOldIndex = nIndex+1;
}
- if ( nStreamIndex != -1 && sDirName.getLength() )
+ if ( nStreamIndex != -1 && !sDirName.isEmpty() )
m_aRecent [ sDirName ] = pCurrent;
}
if ( rName.getLength() -1 != nStreamIndex )
@@ -1112,7 +1112,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name.equals( sMediaType ) && ( *aIter )[PKG_MNFST_FULLPATH].Name.equals( sFullPath ),
"The mediatype sequence format is wrong!\n" );
( *aIter )[PKG_MNFST_MEDIATYPE].Value >>= aType;
- if ( aType.getLength() )
+ if ( !aType.isEmpty() )
{
// only nonempty type makes sence here
nSeqLength++;
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 9a0e62c..1740f2e 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -67,7 +67,7 @@ OUString SAL_CALL ZipPackageEntry::getName( )
void SAL_CALL ZipPackageEntry::setName( const OUString& aName )
throw(RuntimeException)
{
- if ( pParent && msName.getLength() && pParent->hasByName ( msName ) )
+ if ( pParent && !msName.isEmpty() && pParent->hasByName ( msName ) )
pParent->removeByName ( msName );
// unfortunately no other exception than RuntimeException can be thrown here
@@ -91,7 +91,7 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bIns
{
// xParent = pParent = pNewParent;
pParent = pNewParent;
- if ( bInsert && msName.getLength() && !pNewParent->hasByName ( msName ) )
+ if ( bInsert && !msName.isEmpty() && !pNewParent->hasByName ( msName ) )
pNewParent->doInsertByName ( this, sal_False );
}
@@ -107,7 +107,7 @@ void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xN
if ( pNewParent != pParent )
{
- if ( pParent && msName.getLength() && pParent->hasByName ( msName ) && mbAllowRemoveOnInsert )
+ if ( pParent && !msName.isEmpty() && pParent->hasByName ( msName ) && mbAllowRemoveOnInsert )
pParent->removeByName( msName );
doSetParent ( pNewParent, sal_True );
}
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index daee0f4..48c51b4 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -129,7 +129,7 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const ::rtl::OUString&
{
// the stream is not in META-INF and ist notregistered in manifest.xml,
// check whether it is an internal part of the package format
- if ( aPath.getLength()
+ if ( !aPath.isEmpty()
|| !rShortName.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "mimetype" ) ) ) )
{
// if it is not "mimetype" from the root it is not a part of the package
@@ -326,7 +326,7 @@ bool ZipPackageFolder::saveChild( const ::rtl::OUString &rShortName, const Conte
{
::rtl::OUString sTempName = rPath + rShortName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "/" ) );
- if ( rInfo.pFolder->GetMediaType().getLength() )
+ if ( !rInfo.pFolder->GetMediaType().isEmpty() )
{
aPropSet[PKG_MNFST_MEDIATYPE].Name = sMediaTypeProperty;
aPropSet[PKG_MNFST_MEDIATYPE].Value <<= rInfo.pFolder->GetMediaType();
@@ -688,7 +688,7 @@ void ZipPackageFolder::saveContents( ::rtl::OUString &rPath, std::vector < uno::
{
bool bWritingFailed = false;
- if ( maContents.begin() == maContents.end() && rPath.getLength() && m_nFormat != embed::StorageFormats::OFOPXML )
+ if ( maContents.begin() == maContents.end() && !rPath.isEmpty() && m_nFormat != embed::StorageFormats::OFOPXML )
{
// it is an empty subfolder, use workaround to store it
ZipEntry* pTempEntry = new ZipEntry();
@@ -714,7 +714,7 @@ void ZipPackageFolder::saveContents( ::rtl::OUString &rPath, std::vector < uno::
bool bMimeTypeStreamStored = false;
::rtl::OUString aMimeTypeStreamName( RTL_CONSTASCII_USTRINGPARAM( "mimetype" ) );
- if ( m_nFormat == embed::StorageFormats::ZIP && !rPath.getLength() )
+ if ( m_nFormat == embed::StorageFormats::ZIP && rPath.isEmpty() )
{
// let the "mimtype" stream in root folder be stored as the first stream if it is zip format
ContentHash::iterator aIter = maContents.find ( aMimeTypeStreamName );
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index c201642..b3db1c6 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -721,7 +721,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
if ( aValue >>= sMediaType )
{
- if ( sMediaType.getLength() > 0 )
+ if ( !sMediaType.isEmpty() )
{
if ( sMediaType.indexOf ( OUString( RTL_CONSTASCII_USTRINGPARAM ( "text" ) ) ) != -1
|| sMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM ( "application/vnd.sun.star.oleobject" ) ) ) )
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 35a0bb6..af6ba18 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -77,7 +77,7 @@ OZipFileAccess::~OZipFileAccess()
// ----------------------------------------------------------------
uno::Sequence< ::rtl::OUString > OZipFileAccess::GetPatternsFromString_Impl( const ::rtl::OUString& aString )
{
- if ( !aString.getLength() )
+ if ( aString.isEmpty() )
return uno::Sequence< ::rtl::OUString >();
uno::Sequence< ::rtl::OUString > aPattern( 1 );
@@ -131,7 +131,7 @@ sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const ::rtl::OUString& aStri
if ( nInd == 0 )
{
- if ( !aPattern[0].getLength() )
+ if ( aPattern[0].isEmpty() )
return sal_True;
return aString.equals( aPattern[0] );
@@ -145,7 +145,7 @@ sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const ::rtl::OUString& aStri
{
for ( sal_Int32 nCurInd = aPattern.getLength() - 2; nCurInd > 0; nCurInd-- )
{
- if ( !aPattern[nCurInd].getLength() )
+ if ( aPattern[nCurInd].isEmpty() )
continue;
if ( nEndInd == nBeginInd )
@@ -186,7 +186,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
if ( !aArguments.getLength() )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 );
- OSL_ENSURE( aArguments.getLength() == 1, "Too meny arguments are provided, only the first one will be used!\n" );
+ OSL_ENSURE( aArguments.getLength() == 1, "Too many arguments are provided, only the first one will be used!\n" );
::rtl::OUString aParamURL;
uno::Reference< io::XStream > xStream;
commit 6af59644d6508049409a03d1c4a598ea2bef521e
Author: Olivier Hallot <olivier.hallot at documentfoundation.org>
Date: Sun Jan 1 12:55:53 2012 -0200
Fix for fdo43460 Part XXV getLength() to isEmpty()
Please find attached a partial fix for Easy Hack FDO43460
Part XXI
Module
oox
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 7ef4678..9d9f1cc 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -139,17 +139,17 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
}
token = url.getToken(0, '/', nIndex);
- if (token.getLength()) {
+ if (!token.isEmpty()) {
sal_Int32 nIndex1 = 0;
OUString hostandport = token.getToken(0,':', nIndex1);
- if (hostandport.getLength()) {
+ if (!hostandport.isEmpty()) {
aHostName = hostandport;
hostandport = token.getToken(0, ':', nIndex1);
- if (hostandport.getLength() && nIndex1) {
+ if (!hostandport.isEmpty() && nIndex1) {
nPort = hostandport.toInt32();
}
token = url.getToken(0, '/', nIndex);
- if (token.getLength() && nIndex) {
+ if (!token.isEmpty() && nIndex) {
aDbName = token;
}
}
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 18207cf..8debfa5 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -955,7 +955,7 @@ template< typename ListType >
::boost::shared_ptr< ListType > SharedConfigData::createNameList( const ::rtl::OUString& rListName )
{
::boost::shared_ptr< ListType > xList;
- if( rListName.getLength() > 0 )
+ if( !rListName.isEmpty() )
{
xList.reset( new ListType( *this ) );
setNameList( rListName, xList );
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index fc79afc..20c62f6 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -183,7 +183,7 @@ void ContextHandler2Helper::processCollectedChars()
OUString aChars = rInfo.maChars.makeStringAndClear();
if( mbEnableTrimSpace && rInfo.mbTrimSpaces )
aChars = aChars.trim();
- if( aChars.getLength() > 0 )
+ if( !aChars.isEmpty() )
onCharacters( aChars );
}
}
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 5e37d06..c8acd4d 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -102,8 +102,8 @@ DocumentOpenedGuard::DocumentOpenedGuard( const OUString& rUrl )
{
UrlPool& rUrlPool = StaticUrlPool::get();
::osl::MutexGuard aGuard( rUrlPool.maMutex );
- mbValid = (rUrl.getLength() == 0) || (rUrlPool.maUrls.count( rUrl ) == 0);
- if( mbValid && (rUrl.getLength() > 0) )
+ mbValid = rUrl.isEmpty() || (rUrlPool.maUrls.count( rUrl ) == 0);
+ if( mbValid && !rUrl.isEmpty() )
{
rUrlPool.maUrls.insert( rUrl );
maUrl = rUrl;
@@ -114,7 +114,7 @@ DocumentOpenedGuard::~DocumentOpenedGuard()
{
UrlPool& rUrlPool = StaticUrlPool::get();
::osl::MutexGuard aGuard( rUrlPool.maMutex );
- if( maUrl.getLength() > 0 )
+ if( !maUrl.isEmpty() )
rUrlPool.maUrls.erase( maUrl );
}
@@ -334,7 +334,7 @@ OUString FilterBase::getAbsoluteUrl( const OUString& rUrl ) const
/* (1) convert all backslashes to slashes, and check that passed URL is
not empty. */
OUString aUrl = rUrl.replace( '\\', '/' );
- if( aUrl.getLength() == 0 )
+ if( aUrl.isEmpty() )
return aUrl;
/* (2) add 'file:///' to absolute Windows paths, e.g. convert
@@ -359,7 +359,7 @@ OUString FilterBase::getAbsoluteUrl( const OUString& rUrl ) const
/* (5) handle URLs relative to current drive, e.g. the URL '/path1/file1'
relative to the base URL 'file:///C:/path2/file2' does not result in
the expected 'file:///C:/path1/file1', but in 'file:///path1/file1'. */
- if( (aUrl.getLength() >= 1) && (aUrl[ 0 ] == '/') &&
+ if( !aUrl.isEmpty() && (aUrl[ 0 ] == '/') &&
mxImpl->maFileUrl.match( aFilePrefix ) &&
lclIsDosDrive( mxImpl->maFileUrl, nFilePrefixLen ) )
{
@@ -441,8 +441,8 @@ Sequence< NamedValue > FilterBase::requestEncryptionData( ::comphelper::IDocPass
bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName )
{
- OSL_ENSURE( rStreamName.getLength() > 0, "FilterBase::importBinaryData - empty stream name" );
- if( rStreamName.getLength() == 0 )
+ OSL_ENSURE( !rStreamName.isEmpty(), "FilterBase::importBinaryData - empty stream name" );
+ if( rStreamName.isEmpty() )
return false;
// try to open the stream (this may fail - do not assert)
@@ -517,7 +517,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDes
sal_Bool bRet = sal_False;
setMediaDescriptor( rMediaDescSeq );
DocumentOpenedGuard aOpenedGuard( mxImpl->maFileUrl );
- if( aOpenedGuard.isValid() || !mxImpl->maFileUrl.getLength() )
+ if( aOpenedGuard.isValid() || mxImpl->maFileUrl.isEmpty() )
{
mxImpl->initializeFilter();
switch( mxImpl->meDirection )
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c0bde4d..259b5c1 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -223,7 +223,7 @@ OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r
void FilterDetectDocHandler::parseContentTypesDefault( const AttributeList& rAttribs )
{
// only if no overridden part name found
- if( mrFilterName.getLength() == 0 )
+ if( mrFilterName.isEmpty() )
{
// check if target path ends with extension
OUString aExtension = rAttribs.getString( XML_Extension, OUString() );
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 3030ef4..f1e39d4 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -50,7 +50,7 @@ OUString lclRemoveFileName( const OUString& rPath )
OUString lclAppendFileName( const OUString& rPath, const OUString& rFileName )
{
- return (rPath.getLength() == 0) ? rFileName :
+ return rPath.isEmpty() ? rFileName :
OUStringBuffer( rPath ).append( sal_Unicode( '/' ) ).append( rFileName ).makeStringAndClear();
}
@@ -101,7 +101,7 @@ OUString Relations::getExternalTargetFromFirstType( const OUString& rType ) cons
OUString Relations::getFragmentPathFromRelation( const Relation& rRelation ) const
{
// no target, no fragment path
- if( rRelation.mbExternal || (rRelation.maTarget.getLength() == 0) )
+ if( rRelation.mbExternal || rRelation.maTarget.isEmpty() )
return OUString();
// absolute target: return it without leading slash (#i100978)
@@ -109,7 +109,7 @@ OUString Relations::getFragmentPathFromRelation( const Relation& rRelation ) con
return rRelation.maTarget.copy( 1 );
// empty fragment path: return target
- if( maFragmentPath.getLength() == 0 )
+ if( maFragmentPath.isEmpty() )
return rRelation.maTarget;
// resolve relative target path according to base path
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index 021b73a..d64ec71 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -85,7 +85,7 @@ Reference< XFastContextHandler > RelationsFragment::createFastChildContext(
aRelation.maId = aAttribs.getString( XML_Id, OUString() );
aRelation.maType = aAttribs.getString( XML_Type, OUString() );
aRelation.maTarget = aAttribs.getString( XML_Target, OUString() );
- if( (aRelation.maId.getLength() > 0) && (aRelation.maType.getLength() > 0) && (aRelation.maTarget.getLength() > 0) )
+ if( !aRelation.maId.isEmpty() && !aRelation.maType.isEmpty() && !aRelation.maTarget.isEmpty() )
{
sal_Int32 nTargetMode = aAttribs.getToken( XML_TargetMode, XML_Internal );
OSL_ENSURE( (nTargetMode == XML_Internal) || (nTargetMode == XML_External),
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index cf93e14..f5868bf 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -266,8 +266,8 @@ bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& r
// fragment handler must contain path to fragment stream
OUString aFragmentPath = rxHandler->getFragmentPath();
- OSL_ENSURE( aFragmentPath.getLength() > 0, "XmlFilterBase::importFragment - missing fragment path" );
- if( aFragmentPath.getLength() == 0 )
+ OSL_ENSURE( !aFragmentPath.isEmpty(), "XmlFilterBase::importFragment - missing fragment path" );
+ if( aFragmentPath.isEmpty() )
return false;
// try to import binary streams (fragment extension must be '.bin')
@@ -343,8 +343,8 @@ Reference<XDocument> XmlFilterBase::importFragment( const ::rtl::OUString& aFrag
Reference<XDocument> xRet;
// path to fragment stream valid?
- OSL_ENSURE( aFragmentPath.getLength() > 0, "XmlFilterBase::importFragment - empty fragment path" );
- if( aFragmentPath.getLength() == 0 )
+ OSL_ENSURE( !aFragmentPath.isEmpty(), "XmlFilterBase::importFragment - empty fragment path" );
+ if( aFragmentPath.isEmpty() )
return xRet;
// try to open the fragment stream (this may fail - do not assert)
@@ -488,7 +488,7 @@ OUString XmlFilterBase::addRelation( const Reference< XOutputStream > xOutputStr
static void
writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const OUString& sValue )
{
- if( sValue.getLength() == 0 )
+ if( sValue.isEmpty() )
return;
pDoc->startElement( nXmlElement, FSEND );
pDoc->write( sValue );
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 242d83b..264ea9f 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -72,7 +72,7 @@ void OOXMLDocPropHandler::InitNew()
// ------------------------------------------------
void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny )
{
- if ( m_aCustomPropertyName.getLength() )
+ if ( !m_aCustomPropertyName.isEmpty() )
{
const uno::Reference< beans::XPropertyContainer > xUserProps =
m_xDocProp->getUserDefinedProperties();
@@ -164,7 +164,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const ::rtl::OUString
// ------------------------------------------------
uno::Sequence< ::rtl::OUString > OOXMLDocPropHandler::GetKeywordsSet( const ::rtl::OUString& aChars )
{
- if ( aChars.getLength() )
+ if ( !aChars.isEmpty() )
{
uno::Sequence< ::rtl::OUString > aResult( 20 );
sal_Int32 nCounter = 0;
@@ -181,7 +181,7 @@ uno::Sequence< ::rtl::OUString > OOXMLDocPropHandler::GetKeywordsSet( const ::rt
case (sal_Unicode)'\t':
// this is a delimiter
// unfortunately I did not find any specification for the possible delimiters
- if ( aResult[nCounter].getLength() )
+ if ( !aResult[nCounter].isEmpty() )
{
if ( nCounter >= aResult.getLength() )
aResult.realloc( nCounter + 10 );
@@ -246,7 +246,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const ::rtl::OUString& aChars )
break;
}
- if ( aName.getLength() )
+ if ( !aName.isEmpty() )
{
sal_Bool bFound = sal_False;
sal_Int32 nLen = aSet.getLength();
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index 2614943..12d4812 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -148,7 +148,7 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference<
aRangeRep = lclGenerateApiArray( aMatrix );
}
- if( aRangeRep.getLength() > 0 ) try
+ if( !aRangeRep.isEmpty() ) try
{
// create the data sequence
xDataSeq = rxDataProvider->createDataSequenceByRangeRepresentation( aRangeRep );
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 822ac52..bee3d7c 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -129,9 +129,9 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
/* If the title model is missing, but the chart shows exactly one
series, the series title is shown as chart title. */
OUString aAutoTitle = aPlotAreaConv.getAutomaticTitle();
- if( mrModel.mxTitle.is() || (aAutoTitle.getLength() > 0) )
+ if( mrModel.mxTitle.is() || !aAutoTitle.isEmpty() )
{
- if( aAutoTitle.getLength() == 0 )
+ if( aAutoTitle.isEmpty() )
aAutoTitle = CREATE_OUSTRING( "Chart Title" );
Reference< XTitled > xTitled( getChartDocument(), UNO_QUERY_THROW );
TitleConverter aTitleConv( *this, mrModel.mxTitle.getOrCreate() );
@@ -184,7 +184,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
}
// embedded drawing shapes
- if( mrModel.maDrawingPath.getLength() > 0 ) try
+ if( !mrModel.maDrawingPath.isEmpty() ) try
{
/* Get the internal draw page of the chart document, if no external
drawing page has been passed. */
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 1b07ae3..7aca5b8 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1141,7 +1141,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
if( mxData->mxNumFmts.is() )
{
sal_Int32 nPropId = bPercentFormat ? PROP_PercentageNumberFormat : PROP_NumberFormat;
- if( rNumberFormat.mbSourceLinked || (rNumberFormat.maFormatCode.getLength() == 0) )
+ if( rNumberFormat.mbSourceLinked || rNumberFormat.maFormatCode.isEmpty() )
{
rPropSet.setAnyProperty( nPropId, Any() );
}
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 3ed07e6..0522376 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -374,7 +374,7 @@ Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence(
}
break;
}
- OSL_ENSURE( aRole.getLength() > 0, "ErrorBarConverter::createLabeledDataSequence - invalid error bar direction" );
+ OSL_ENSURE( !aRole.isEmpty(), "ErrorBarConverter::createLabeledDataSequence - invalid error bar direction" );
return lclCreateLabeledDataSequence( *this, mrModel.maSources.get( eSourceType ).get(), aRole );
}
@@ -422,7 +422,7 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
case XML_power: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PotentialRegressionCurve" ); break;
default: OSL_FAIL( "TrendlineConverter::convertFromModel - unknown trendline type" );
}
- if( aServiceName.getLength() > 0 )
+ if( !aServiceName.isEmpty() )
{
Reference< XRegressionCurve > xRegCurve( createInstance( aServiceName ), UNO_QUERY_THROW );
PropertySet aPropSet( xRegCurve );
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 5699a0d..9ed69fe 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -109,11 +109,11 @@ Sequence< Reference< XFormattedString > > TextConverter::createStringSequence(
if( mrModel.mxDataSeq.is() && !mrModel.mxDataSeq->maData.empty() )
mrModel.mxDataSeq->maData.begin()->second >>= aString;
// no linked string -> fall back to default string
- if( aString.getLength() == 0 )
+ if( aString.isEmpty() )
aString = rDefaultText;
// create formatted string object
- if( aString.getLength() > 0 )
+ if( !aString.isEmpty() )
{
Reference< XFormattedString > xFmtStr = appendFormattedString( aStringVec, aString, false );
PropertySet aPropSet( xFmtStr );
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index cd75285..b5c7290 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -236,7 +236,7 @@ rtl::OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParamete
static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const::rtl::OUString& rValue, sal_Bool bNoSymbols = sal_True )
{
com::sun::star::drawing::EnhancedCustomShapeParameter aRet;
- if ( rValue.getLength() )
+ if ( !rValue.isEmpty() )
{
sal_Bool bConstant = sal_True;
sal_Int32 nConstant = -1;
@@ -412,7 +412,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
sal_Unicode n = rValue[ 0 ];
if ( ( n == '+' ) || ( n == '-' ) )
{
- if ( rValue.getLength() > 0 )
+ if ( !rValue.isEmpty() )
n = rValue[ 1 ];
}
if ( ( n >= '0' ) && ( n <= '9' ) )
@@ -483,7 +483,7 @@ static rtl::OUString convertToOOEquation( CustomShapeProperties& rCustomShapePro
do
{
rtl::OUString aToken( rSource.getToken( 0, ' ', nIndex ) );
- if ( aToken.getLength() )
+ if ( !aToken.isEmpty() )
aTokens.push_back( aToken );
}
while ( nIndex >= 0 );
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index ad53443..91a475f 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -138,10 +138,10 @@ static sal_Int32 calcDepth( const rtl::OUString& rNodeName,
const dgm::Connections::const_iterator aEndCxn( rCnx.end() );
while( aCurrCxn != aEndCxn )
{
- if( aCurrCxn->msParTransId.getLength() &&
- aCurrCxn->msSibTransId.getLength() &&
- aCurrCxn->msSourceId.getLength() &&
- aCurrCxn->msDestId.getLength() &&
+ if( !aCurrCxn->msParTransId.isEmpty() &&
+ !aCurrCxn->msSibTransId.isEmpty() &&
+ !aCurrCxn->msSourceId.isEmpty() &&
+ !aCurrCxn->msDestId.isEmpty() &&
aCurrCxn->mnType != XML_presOf &&
aCurrCxn->mnType != XML_presParOf &&
rNodeName == aCurrCxn->msDestId )
@@ -176,7 +176,7 @@ void Diagram::build( )
<< normalizeDotName(aCurrPoint->msModelId).getStr()
<< "[";
- if( aCurrPoint->msPresentationLayoutName.getLength() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list