[Libreoffice-commits] .: xmloff/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Wed Jan 25 13:31:27 PST 2012
xmloff/source/chart/PropertyMaps.cxx | 6 -
xmloff/source/chart/SchXMLAutoStylePoolP.cxx | 2
xmloff/source/chart/SchXMLAxisContext.cxx | 8 -
xmloff/source/chart/SchXMLChartContext.cxx | 31 +++---
xmloff/source/chart/SchXMLExport.cxx | 53 +++++------
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 18 +--
xmloff/source/chart/SchXMLSeries2Context.cxx | 31 +++---
xmloff/source/chart/SchXMLTableContext.cxx | 14 +--
xmloff/source/chart/SchXMLTools.cxx | 14 +--
xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx | 2
xmloff/source/chart/XMLChartStyleContext.cxx | 2
xmloff/source/chart/XMLLabelSeparatorContext.cxx | 2
xmloff/source/chart/XMLSymbolImageContext.cxx | 6 -
xmloff/source/core/DocumentSettingsContext.cxx | 4
xmloff/source/core/DomExport.cxx | 2
xmloff/source/core/RDFaExportHelper.cxx | 6 -
xmloff/source/core/RDFaImportHelper.cxx | 16 +--
xmloff/source/core/SettingsExportHelper.cxx | 30 +++---
xmloff/source/core/XMLBase64ImportContext.cxx | 4
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 6 -
xmloff/source/core/nmspmap.cxx | 6 -
xmloff/source/core/unoatrcn.cxx | 10 +-
xmloff/source/core/xmlexp.cxx | 16 +--
xmloff/source/core/xmlimp.cxx | 22 ++--
xmloff/source/core/xmluconv.cxx | 2
xmloff/source/draw/XMLImageMapExport.cxx | 10 +-
xmloff/source/draw/XMLNumberStyles.cxx | 2
xmloff/source/draw/XMLReplacementImageContext.cxx | 4
xmloff/source/draw/XMLShapeStyleContext.cxx | 10 +-
xmloff/source/draw/animationexport.cxx | 18 +--
xmloff/source/draw/animationimport.cxx | 22 ++--
xmloff/source/draw/animexp.cxx | 2
xmloff/source/draw/animimp.cxx | 6 -
xmloff/source/draw/descriptionimp.cxx | 2
xmloff/source/draw/eventimp.cxx | 2
xmloff/source/draw/layerexp.cxx | 6 -
xmloff/source/draw/layerimp.cxx | 4
xmloff/source/draw/sdpropls.cxx | 8 -
xmloff/source/draw/sdxmlexp.cxx | 50 +++++-----
xmloff/source/draw/sdxmlimp.cxx | 6 -
xmloff/source/draw/shapeexport.cxx | 24 ++---
xmloff/source/draw/shapeexport2.cxx | 30 +++---
xmloff/source/draw/shapeexport4.cxx | 10 +-
xmloff/source/draw/xexptran.cxx | 6 -
xmloff/source/draw/ximp3dobject.cxx | 2
xmloff/source/draw/ximpbody.cxx | 11 +-
xmloff/source/draw/ximpcustomshape.cxx | 2
xmloff/source/draw/ximpnote.cxx | 2
xmloff/source/draw/ximppage.cxx | 16 +--
xmloff/source/draw/ximpshap.cxx | 84 +++++++++---------
xmloff/source/draw/ximpshow.cxx | 4
xmloff/source/draw/ximpstyl.cxx | 10 +-
52 files changed, 331 insertions(+), 335 deletions(-)
New commits:
commit 4228c5542b57b43064bbefb3cc79c4eb51e059d6
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Wed Jan 25 17:00:07 2012 -0200
Fix for fdo43460 Part XLVII getLength() to isEmpty()
Part XLVII
Modules
xmloff (part 1)
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index d8eb9aa..0856f0c 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -302,7 +302,7 @@ void XMLChartExportPropertyMapper::handleElementItem(
// export as XLink reference into the package
// if embedding is off
::rtl::OUString sTempURL( mrExport.AddEmbeddedGraphicObject( aURLStr ));
- if( sTempURL.getLength() )
+ if( !sTempURL.isEmpty() )
{
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sTempURL );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE,
@@ -321,7 +321,7 @@ void XMLChartExportPropertyMapper::handleElementItem(
// export as Base64 embedded graphic
// if embedding is on
- if( aURLStr.getLength())
+ if( !aURLStr.isEmpty())
mrExport.AddEmbeddedGraphicObjectAsBase64( aURLStr );
}
}
@@ -332,7 +332,7 @@ void XMLChartExportPropertyMapper::handleElementItem(
::rtl::OUString aSeparator;
rProperty.maValue >>= aSeparator;
- if( aSeparator.getLength() )
+ if( !aSeparator.isEmpty() )
{
sal_uInt32 nPropIndex = rProperty.mnIndex;
SvXMLElementExport aElem( mrExport,
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 969e812..5f59c34 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -76,7 +76,7 @@ void SchXMLAutoStylePoolP::exportStyleAttributes(
( nNumberFormat != -1 ))
{
rtl::OUString sAttrValue = mrSchXMLExport.getDataStyleName( nNumberFormat );
- if( sAttrValue.getLength() )
+ if( !sAttrValue.isEmpty() )
{
mrSchXMLExport.AddAttribute(
aPropMapper->GetEntryNameSpace( iter->mnIndex ),
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index e95fec4..35807f8 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -247,7 +247,7 @@ void SchXMLAxisContext::CreateGrid( OUString sAutoStyleName, bool bIsMajor )
// the line color is black as default, in the model it is a light gray
xGridProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
uno::makeAny( COL_BLACK ));
- if( sAutoStyleName.getLength())
+ if( !sAutoStyleName.isEmpty())
{
const SvXMLStylesContext* pStylesCtxt = m_rImportHelper.GetAutoStylesContext();
if( pStylesCtxt )
@@ -495,7 +495,7 @@ void SchXMLAxisContext::CreateAxis()
if( m_bAxisTypeImported )
m_xAxisProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AxisType" )), uno::makeAny(m_nAxisType) );
- if( m_aAutoStyleName.getLength())
+ if( !m_aAutoStyleName.isEmpty())
{
const SvXMLStylesContext* pStylesCtxt = m_rImportHelper.GetAutoStylesContext();
if( pStylesCtxt )
@@ -599,7 +599,7 @@ void SchXMLAxisContext::CreateAxis()
void SchXMLAxisContext::SetAxisTitle()
{
- if( !m_aCurrentAxis.aTitle.getLength() )
+ if( m_aCurrentAxis.aTitle.isEmpty() )
return;
Reference< chart::XAxis > xAxis( lcl_getChartAxis( m_aCurrentAxis, m_xDiagram ) );
@@ -766,7 +766,7 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
const OUString& rODFVersionOfFile,
bool bAxisPositionAttributeImported )
{
- if( ( !rODFVersionOfFile.getLength() || rODFVersionOfFile.equalsAscii("1.0")
+ if( ( rODFVersionOfFile.isEmpty() || rODFVersionOfFile.equalsAscii("1.0")
|| rODFVersionOfFile.equalsAscii("1.1")
|| ( rODFVersionOfFile.equalsAscii("1.2") && !bAxisPositionAttributeImported ) ) )
{
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 7e38b3e..20f1183 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -339,7 +339,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
}
}
- if( aOldChartTypeName.getLength()<= 0 )
+ if( aOldChartTypeName.isEmpty() )
{
OSL_FAIL( "need a charttype to create a diagram" );
//set a fallback value:
@@ -445,8 +445,8 @@ struct NewDonutSeries
{
aPointStyle.msSeriesStyleNameForDonuts = m_aSeriesStyles[nPointIndex];
}
- if( aPointStyle.msSeriesStyleNameForDonuts.getLength()
- || aPointStyle.msStyleName.getLength() )
+ if( !aPointStyle.msSeriesStyleNameForDonuts.isEmpty()
+ || !aPointStyle.msStyleName.isEmpty() )
aRet.push_back( aPointStyle );
++aPointIt;
++nPointIndex;
@@ -634,12 +634,12 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
-1, uno::makeAny( bFirstCellAsLabel ),
beans::PropertyState_DIRECT_VALUE );
- if( sColTrans.getLength() || sRowTrans.getLength() )
+ if( !sColTrans.isEmpty() || !sRowTrans.isEmpty() )
{
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SequenceMapping" )),
- -1, uno::makeAny( sColTrans.getLength()
+ -1, uno::makeAny( !sColTrans.isEmpty()
? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() )
: lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ),
beans::PropertyState_DIRECT_VALUE );
@@ -660,7 +660,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
aChartOleObjectName = (*aIt).second.get< ::rtl::OUString >();
}
}
- if( aChartOleObjectName.getLength() )
+ if( !aChartOleObjectName.isEmpty() )
{
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
@@ -695,7 +695,7 @@ void SchXMLChartContext::EndElement()
if( xProp.is())
{
- if( maMainTitle.getLength())
+ if( !maMainTitle.isEmpty())
{
uno::Reference< beans::XPropertySet > xTitleProp( xDoc->getTitle(), uno::UNO_QUERY );
if( xTitleProp.is())
@@ -712,7 +712,7 @@ void SchXMLChartContext::EndElement()
}
}
}
- if( maSubTitle.getLength())
+ if( !maSubTitle.isEmpty())
{
uno::Reference< beans::XPropertySet > xTitleProp( xDoc->getSubTitle(), uno::UNO_QUERY );
if( xTitleProp.is())
@@ -762,7 +762,7 @@ void SchXMLChartContext::EndElement()
bHasOwnData = true;
else if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".." ) ) ) //data comes from the parent application
bHasOwnData = false;
- else if( m_aXLinkHRefAttributeToIndicateDataProvider.getLength() ) //not supported so far to get the data by sibling objects -> fall back to chart itself if data are available
+ else if( !m_aXLinkHRefAttributeToIndicateDataProvider.isEmpty() ) //not supported so far to get the data by sibling objects -> fall back to chart itself if data are available
bHasOwnData = m_bHasTableElement;
else
bHasOwnData = !m_bHasRangeAtPlotArea;
@@ -792,7 +792,7 @@ void SchXMLChartContext::EndElement()
if( mbIsStockChart )
MergeSeriesForStockChart();
}
- else if( msChartAddress.getLength() )
+ else if( !msChartAddress.isEmpty() )
{
//own data or only rectangular range available
@@ -1066,17 +1066,17 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
// (which is required in the ODF spec)
// Note: For stock charts and donut charts with special handling
// the mapping must not be applied!
- if( !msChartAddress.getLength() && !mbIsStockChart &&
+ if( msChartAddress.isEmpty() && !mbIsStockChart &&
!lcl_SpecialHandlingForDonutChartNeeded(
maChartTypeServiceName, GetImport()))
{
- if( msColTrans.getLength() > 0 )
+ if( !msColTrans.isEmpty() )
{
- OSL_ASSERT( msRowTrans.getLength() == 0 );
+ OSL_ASSERT( msRowTrans.isEmpty() );
pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true ));
msColTrans = OUString();
}
- else if( msRowTrans.getLength() > 0 )
+ else if( !msRowTrans.isEmpty() )
{
pTableContext->setRowPermutation( lcl_getNumberSequenceFromString( msRowTrans, true ));
msRowTrans = OUString();
@@ -1135,8 +1135,7 @@ void SchXMLChartContext::InitChart(
}
// Set the chart type via setting the diagram.
- if( rChartTypeServiceName.getLength() &&
- xDoc.is())
+ if( !rChartTypeServiceName.isEmpty() && xDoc.is())
{
uno::Reference< lang::XMultiServiceFactory > xFact( xDoc, uno::UNO_QUERY );
if( xFact.is())
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 9059210..7d84fc5 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -572,7 +572,7 @@ OUString lcl_flattenStringSequence( const Sequence< OUString > & rSequence )
bool bPrecedeWithSpace = false;
for( sal_Int32 nIndex=0; nIndex<rSequence.getLength(); ++nIndex )
{
- if( rSequence[nIndex].getLength())
+ if( !rSequence[nIndex].isEmpty())
{
if( bPrecedeWithSpace )
aResult.append( static_cast< sal_Unicode >( ' ' ));
@@ -689,7 +689,7 @@ uno::Sequence< rtl::OUString > lcl_DataSequenceToStringSequence(
sal_Int32 nTextCount = aStrings.getLength();
for( sal_Int32 j = 0; j < nTextCount; ++j )
{
- if( aStrings[j].getLength() )
+ if( !aStrings[j].isEmpty() )
{
bHasText=true;
break;
@@ -874,7 +874,7 @@ lcl_TableData lcl_getDataForLocalTable(
//categories
lcl_SequenceToVector( aSimpleCategories, rCategories );
- if( rCategoriesRange.getLength() )
+ if( !rCategoriesRange.isEmpty() )
{
OUString aRange(rCategoriesRange);
if( xRangeConversion.is())
@@ -1018,14 +1018,14 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen
OUString aRange( lcl_ConvertRange( xValues->getSourceRangeRepresentation(), xNewDoc ) );
//work around error in OOo 2.0 (problems with multiple series having a domain element)
- if( !rFirstRangeForThisDomainIndex.getLength() || !aRange.equals(rFirstRangeForThisDomainIndex) )
+ if( rFirstRangeForThisDomainIndex.isEmpty() || !aRange.equals(rFirstRangeForThisDomainIndex) )
{
rExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, aRange);
SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, sal_True, sal_True );
bDomainExported = true;
}
- if( !rFirstRangeForThisDomainIndex.getLength() )
+ if( rFirstRangeForThisDomainIndex.isEmpty() )
rFirstRangeForThisDomainIndex = aRange;
}
return bDomainExported;
@@ -1319,7 +1319,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
// attributes
// determine class
- if( sChartType.getLength())
+ if( !sChartType.isEmpty())
{
enum XMLTokenEnum eXMLChartType = SchXMLTools::getTokenByChartType( sChartType, true /* bUseOldNames */ );
@@ -1794,7 +1794,7 @@ void SchXMLExportHelper_Impl::exportTable()
if( !bHasOwnData && aColumnDescriptions_RangeIter != aColumnDescriptions_RangeEnd )
{
// remind the original range to allow a correct re-association when copying via clipboard
- if ((*aColumnDescriptions_RangeIter).getLength())
+ if (!(*aColumnDescriptions_RangeIter).isEmpty())
SchXMLTools::exportRangeToSomewhere( mrExport, *aColumnDescriptions_RangeIter );
++aColumnDescriptions_RangeIter;
}
@@ -1871,7 +1871,7 @@ void SchXMLExportHelper_Impl::exportTable()
( mbRowSourceColumns || (aColIt == aRowIt->begin()) ) )
{
// remind the original range to allow a correct re-association when copying via clipboard
- if ((*aDataRangeIter).getLength())
+ if (!(*aDataRangeIter).isEmpty())
SchXMLTools::exportRangeToSomewhere( mrExport, *aDataRangeIter );
++aDataRangeIter;
}
@@ -1973,7 +1973,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// write style name
AddAutoStyleAttribute( aPropertyStates );
- if( msChartAddress.getLength() )
+ if( !msChartAddress.isEmpty() )
{
if( !bIncludeTable )
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, msChartAddress );
@@ -2017,8 +2017,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// #i72973#, #144135# only export table-number-list in OOo format (also for binary)
Reference< beans::XPropertySet > xExportInfo( mrExport.getExportInfo());
- if( msTableNumberList.getLength() &&
- xExportInfo.is())
+ if( !msTableNumberList.isEmpty() && xExportInfo.is())
{
try
{
@@ -2435,7 +2434,7 @@ void SchXMLExportHelper_Impl::exportAxis(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, eDimension );
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, eAxisName );
AddAutoStyleAttribute( aPropertyStates ); // write style name
- if( rCategoriesRange.getLength() )
+ if( !rCategoriesRange.isEmpty() )
bExportDateScale = lcl_exportAxisType( xChart2Axis, mrExport );
// open axis element
@@ -2466,7 +2465,7 @@ void SchXMLExportHelper_Impl::exportAxis(
exportAxisTitle( xTitleProps , bExportContent );
// categories if we have a categories chart
- if( bExportContent && rCategoriesRange.getLength() )
+ if( bExportContent && !rCategoriesRange.isEmpty() )
{
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, rCategoriesRange );
SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, sal_True, sal_True );
@@ -2664,7 +2663,7 @@ namespace
sal_Int32 nCount = aStrings.getLength();
for( sal_Int32 i = 0; i < nCount; ++i )
{
- if( aStrings[i].getLength() )
+ if( !aStrings[i].isEmpty() )
return true;//have text
}
}
@@ -2677,7 +2676,7 @@ namespace
sal_Int32 nCount = aData.getLength();
for( sal_Int32 i = 0; i < nCount; ++i )
{
- if( (aData[i]>>=aString) && aString.getLength() )
+ if( (aData[i]>>=aString) && !aString.isEmpty() )
return true;//have text
}
}
@@ -3213,9 +3212,9 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )), xNewDoc, m_aDataSequencesToExport ));
- if( aRanges.second.getLength())
+ if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
- if( aRanges.first.getLength())
+ if( !aRanges.first.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, aRanges.first );
if( nAttachedAxis == chart::ChartAxisAssign::SECONDARY_Y )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
@@ -3230,9 +3229,9 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )), xNewDoc, m_aDataSequencesToExport ));
- if( aRanges.second.getLength())
+ if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
- if( aRanges.first.getLength())
+ if( !aRanges.first.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, aRanges.first );
if( nAttachedAxis == chart::ChartAxisAssign::SECONDARY_Y )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
@@ -3247,9 +3246,9 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )), xNewDoc, m_aDataSequencesToExport ));
- if( aRanges.second.getLength())
+ if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
- if( aRanges.first.getLength())
+ if( !aRanges.first.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, aRanges.first );
if( nAttachedAxis == chart::ChartAxisAssign::SECONDARY_Y )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
@@ -3264,9 +3263,9 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )), xNewDoc, m_aDataSequencesToExport ));
- if( aRanges.second.getLength())
+ if( !aRanges.second.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
- if( aRanges.first.getLength())
+ if( !aRanges.first.isEmpty())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, aRanges.first );
if( nAttachedAxis == chart::ChartAxisAssign::SECONDARY_Y )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
@@ -3507,7 +3506,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
else if( aLastPoint.mnRepeat > 0 )
{
// write last element
- if( aLastPoint.maStyleName.getLength() )
+ if( !aLastPoint.maStyleName.isEmpty() )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_STYLE_NAME, aLastPoint.maStyleName );
if( aLastPoint.mnRepeat > 1 )
@@ -3521,7 +3520,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
// write last element if it hasn't been written in last iteration
if( aPoint.maStyleName == aLastPoint.maStyleName )
{
- if( aLastPoint.maStyleName.getLength() )
+ if( !aLastPoint.maStyleName.isEmpty() )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_STYLE_NAME, aLastPoint.maStyleName );
if( aLastPoint.mnRepeat > 1 )
@@ -3740,7 +3739,7 @@ void SchXMLExport::_ExportContent()
maExportHelper.m_pImpl->SetTableNumberList( sTableNumberList );
// do not include own table if there are external addresses
- bIncludeTable = (sChartAddress.getLength() == 0);
+ bIncludeTable = sChartAddress.isEmpty();
}
catch( const beans::UnknownPropertyException & )
{
@@ -3810,7 +3809,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
// range, where every row number is noe too large, so that older
// version can correctly read those files.
msChartAddress = (bBrokenRangeAvailable ? sBrokenRange : sCellRange);
- if( msChartAddress.getLength() > 0 )
+ if( !msChartAddress.isEmpty() )
{
// convert format to XML-conform one
Reference< chart2::data::XRangeXMLConversion > xConversion( xDataProvider, uno::UNO_QUERY );
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index ae1a274..5f8eae4 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -329,7 +329,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
// set properties
uno::Reference< beans::XPropertySet > xProp( mxDiagram, uno::UNO_QUERY );
- if( msAutoStyleName.getLength())
+ if( !msAutoStyleName.isEmpty())
{
if( xProp.is())
{
@@ -444,7 +444,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
bCreateInternalDataProvider = true;
else if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".." ) ) ) //data comes from the parent application
bCreateInternalDataProvider = false;
- else if( m_rXLinkHRefAttributeToIndicateDataProvider.getLength() ) //not supported so far to get the data by sibling objects -> fall back to chart itself
+ else if( !m_rXLinkHRefAttributeToIndicateDataProvider.isEmpty() ) //not supported so far to get the data by sibling objects -> fall back to chart itself
bCreateInternalDataProvider = true;
else if( !m_rbHasRangeAtPlotArea )
bCreateInternalDataProvider = true;
@@ -564,7 +564,7 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
void SchXMLPlotAreaContext::EndElement()
{
// set categories
- if( mrCategoriesAddress.getLength() && mxNewDoc.is())
+ if( !mrCategoriesAddress.isEmpty() && mxNewDoc.is())
{
uno::Reference< chart2::data::XDataProvider > xDataProvider(
mxNewDoc->getDataProvider() );
@@ -703,7 +703,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
}
}
- if( sAutoStyleName.getLength())
+ if( !sAutoStyleName.isEmpty())
{
DataRowPointStyle aStyle(
DataRowPointStyle::DATA_POINT,
@@ -893,7 +893,7 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
uno::UNO_QUERY );
if( xProp.is())
{
- if( sAutoStyleName.getLength())
+ if( !sAutoStyleName.isEmpty())
{
const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
if( pStylesCtxt )
@@ -949,7 +949,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
}
}
- if( sAutoStyleName.getLength())
+ if( !sAutoStyleName.isEmpty())
{
// set properties
uno::Reference< beans::XPropertySet > xProp;
@@ -1028,7 +1028,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
// note: regression-curves must get a style-object even if there is no
// auto-style set, because they can contain an equation
- if( sAutoStyleName.getLength() || meContextType == CONTEXT_TYPE_REGRESSION_CURVE )
+ if( !sAutoStyleName.isEmpty() || meContextType == CONTEXT_TYPE_REGRESSION_CURVE )
{
DataRowPointStyle::StyleType eType = DataRowPointStyle::MEAN_VALUE;
switch( meContextType )
@@ -1136,7 +1136,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
}
}
- if( sAutoStyleName.getLength() || bShowEquation || bShowRSquare )
+ if( !sAutoStyleName.isEmpty() || bShowEquation || bShowRSquare )
{
uno::Reference< beans::XPropertySet > xEqProp;
uno::Reference< lang::XMultiServiceFactory > xFact( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
@@ -1145,7 +1145,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.RegressionEquation" ))), uno::UNO_QUERY );
if( xEqProp.is())
{
- if( sAutoStyleName.getLength() )
+ if( !sAutoStyleName.isEmpty() )
{
const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
if( pStylesCtxt )
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index cdacb25..8aad943 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -227,7 +227,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createAndAddSequenceToSeries
Reference< chart2::data::XDataSource > xSeriesSource( xSeries,uno::UNO_QUERY );
Reference< chart2::data::XDataSink > xSeriesSink( xSeries, uno::UNO_QUERY );
- if( !(rRange.getLength() && xChartDoc.is() && xSeriesSource.is() && xSeriesSink.is()) )
+ if( !(!rRange.isEmpty() && xChartDoc.is() && xSeriesSource.is() && xSeriesSink.is()) )
return xLabeledSeq;
// create a new sequence
@@ -352,7 +352,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
if( XML_NAMESPACE_CHART == nClassPrefix )
maSeriesChartTypeName = SchXMLTools::GetChartTypeByClassName( aClassName, false /* bUseOldNames */ );
- if( ! maSeriesChartTypeName.getLength())
+ if( maSeriesChartTypeName.isEmpty())
maSeriesChartTypeName = aClassName;
}
break;
@@ -375,7 +375,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
m_rGlobalSeriesImportInfo.rbAllRangeAddressesAvailable = sal_False;
bool bIsCandleStick = maGlobalChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.CandleStickChartType"));
- if( maSeriesChartTypeName.getLength() )
+ if( !maSeriesChartTypeName.isEmpty() )
{
bIsCandleStick = maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.CandleStickChartType"));
}
@@ -420,7 +420,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
// values
Reference< chart2::data::XDataSequence > xSeq;
- if( bHasRange && m_aSeriesRange.getLength() )
+ if( bHasRange && !m_aSeriesRange.isEmpty() )
xSeq = SchXMLTools::CreateDataSequence( m_aSeriesRange, mxNewDoc );
Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
@@ -439,7 +439,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
tSchXMLIndexWithPart( m_rGlobalSeriesImportInfo.nCurrentDataIndex, SCH_XML_PART_VALUES ), xLabeledSeq ));
// label
- if( bHasLabelRange && m_aSeriesLabelRange.getLength() )
+ if( bHasLabelRange && !m_aSeriesLabelRange.isEmpty() )
{
Reference< chart2::data::XDataSequence > xLabelSequence =
SchXMLTools::CreateDataSequence( m_aSeriesLabelRange, mxNewDoc );
@@ -472,7 +472,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
//init mbSymbolSizeIsMissingInFile:
try
{
- if( msAutoStyleName.getLength() )
+ if( !msAutoStyleName.isEmpty() )
{
const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
if( pStylesCtxt )
@@ -521,7 +521,7 @@ void SchXMLSeries2Context::EndElement()
bool bCreateXValues = true;
if( !maDomainAddresses.empty() )
{
- if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() )
+ if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() )
{
m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front();
m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex = m_rGlobalSeriesImportInfo.nCurrentDataIndex;
@@ -530,7 +530,7 @@ void SchXMLSeries2Context::EndElement()
aDomainInfo.nIndexForLocalData = m_rGlobalSeriesImportInfo.nCurrentDataIndex;
m_rGlobalSeriesImportInfo.nCurrentDataIndex++;
}
- else if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() && !m_bHasDomainContext && mnSeriesIndex==0 )
+ else if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() && !m_bHasDomainContext && mnSeriesIndex==0 )
{
if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( GetImport().GetModel() ) ) //wrong old chart files:
{
@@ -551,7 +551,7 @@ void SchXMLSeries2Context::EndElement()
if( nDomainCount>1 )
{
DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
- if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
+ if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.isEmpty() )
{
//for bubble chart the second domain contains the x values which should become an index smaller than y values for own data table
//->so second first
@@ -561,7 +561,7 @@ void SchXMLSeries2Context::EndElement()
aDomainInfos.push_back( aDomainInfo );
m_rGlobalSeriesImportInfo.nCurrentDataIndex++;
}
- else if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
+ else if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.isEmpty() )
{
DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
aDomainInfos.push_back( aDomainInfo );
@@ -569,7 +569,7 @@ void SchXMLSeries2Context::EndElement()
if( nDomainCount>0)
{
DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
- if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() )
+ if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() )
{
m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front();
m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex = m_rGlobalSeriesImportInfo.nCurrentDataIndex;
@@ -577,7 +577,7 @@ void SchXMLSeries2Context::EndElement()
aDomainInfos.push_back( aDomainInfo );
m_rGlobalSeriesImportInfo.nCurrentDataIndex++;
}
- else if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() )
+ else if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() )
{
DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM("values-y")), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
aDomainInfos.push_back( aDomainInfo );
@@ -593,8 +593,7 @@ void SchXMLSeries2Context::EndElement()
else
{
//add style
- if( msAutoStyleName.getLength() ||
- mnAttachedAxis != 1 )
+ if( !msAutoStyleName.isEmpty() || mnAttachedAxis != 1 )
{
DataRowPointStyle aStyle(
DataRowPointStyle::DATA_SERIES,
@@ -800,7 +799,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
, uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) );
}
- if( (iStyle->msStyleName).getLength())
+ if( !(iStyle->msStyleName).isEmpty())
{
if( ! rCurrStyleName.equals( iStyle->msStyleName ))
{
@@ -885,7 +884,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
if( !xSeriesProp.is() )
continue;
- if( (iStyle->msStyleName).getLength())
+ if( !(iStyle->msStyleName).isEmpty())
{
if( ! rCurrStyleName.equals( iStyle->msStyleName ))
{
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index bce21c7..6b2e988 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -125,7 +125,7 @@ void lcl_fillRangeMapping(
for( size_t nCol = 0; nCol < nTableColCount; ++nCol )
{
OUString aRangeId( rRow[nCol].aRangeId );
- if( aRangeId.getLength())
+ if( !aRangeId.isEmpty())
{
if( eDataRowSource == chart::ChartDataRowSource_COLUMNS )
{
@@ -203,8 +203,8 @@ bool lcl_tableOfRangeMatches(
const ::rtl::OUString & rTableName )
{
// both strings are non-empty and the table name is part of the range
- return ( (rRange.getLength() > 0) &&
- (rTableName.getLength() > 0) &&
+ return ( !rRange.isEmpty() &&
+ !rTableName.isEmpty() &&
(rRange.indexOf( rTableName ) != -1 ));
}
@@ -491,7 +491,7 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt
IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
{
rtl::OUString aValue = xAttrList->getValueByIndex( i );
- if( aValue.getLength())
+ if( !aValue.isEmpty())
nRepeated = aValue.toInt32();
}
else if( nPrefix == XML_NAMESPACE_TABLE &&
@@ -756,9 +756,9 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
void SchXMLTableCellContext::EndElement()
{
- if( mbReadText && maCellContent.getLength() ) //apply text from <text:p> element
+ if( mbReadText && !maCellContent.isEmpty() ) //apply text from <text:p> element
mrTable.aData[ mrTable.nRowIndex ][ mrTable.nColumnIndex ].aString = maCellContent;
- if( maRangeId.getLength())
+ if( !maRangeId.isEmpty())
mrTable.aData[ mrTable.nRowIndex ][ mrTable.nColumnIndex ].aRangeId = maRangeId;
}
@@ -1097,7 +1097,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
aRange = xLabel->getSourceRangeRepresentation();
sal_Int32 nSearchIndex = 0;
OUString aSecondToken = aRange.getToken( 1, ' ', nSearchIndex );
- if( aSecondToken.getLength() )
+ if( !aSecondToken.isEmpty() )
aUsageMap[aSecondToken.toInt32()] = true;
}
}
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index ee7cf46..106afea 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -104,7 +104,7 @@ rtl::OUString lcl_getGeneratorFromModel( const uno::Reference< frame::XModel >&
rtl::OUString lcl_getGeneratorFromModelOrItsParent( const uno::Reference< frame::XModel >& xChartModel )
{
::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) );
- if( !aGenerator.getLength() ) //try to get the missing info from the parent document
+ if( aGenerator.isEmpty() ) //try to get the missing info from the parent document
{
uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY );
if( xChild.is() )
@@ -367,7 +367,7 @@ XMLTokenEnum getTokenByChartType(
}
}
- if( eResult == XML_TOKEN_INVALID && rChartTypeService.getLength() > 0 )
+ if( eResult == XML_TOKEN_INVALID && !rChartTypeService.isEmpty() )
eResult = XML_ADD_IN;
return eResult;
@@ -414,7 +414,7 @@ Reference< chart2::data::XDataSequence > CreateDataSequence(
OSL_FAIL( "could not create data sequence" );
}
- if( !xRet.is() && !xChartDoc->hasInternalDataProvider() && rRange.getLength() )
+ if( !xRet.is() && !xChartDoc->hasInternalDataProvider() && !rRange.isEmpty() )
{
//#i103911# switch to internal data in case the parent cannot provide the requested data
xChartDoc->createInternalDataProvider( sal_True /* bCloneExistingData */ );
@@ -442,7 +442,7 @@ void CreateCategories(
{
try
{
- if( xNewDoc.is() && rRangeAddress.getLength())
+ if( xNewDoc.is() && !rRangeAddress.isEmpty())
{
if( xDataProvider.is())
{
@@ -690,7 +690,7 @@ bool getXMLRangePropertyFromDataSequence(
bResult =
( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName ) &&
( xProp->getPropertyValue( aXMLRangePropName ) >>= rOutXMLRange ) &&
- rOutXMLRange.getLength());
+ !rOutXMLRange.isEmpty());
// clear the property after usage
if( bClearProp && bResult )
xProp->setPropertyValue( aXMLRangePropName, uno::Any( OUString()));
@@ -771,7 +771,7 @@ bool switchBackToDataProviderFromParent( const Reference< chart2::XChartDocument
void setBuildIDAtImportInfo( uno::Reference< frame::XModel > xModel, Reference< beans::XPropertySet > xImportInfo )
{
::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xModel) );
- if( aGenerator.getLength() )
+ if( !aGenerator.isEmpty() )
SvXMLMetaDocumentContext::setBuildId( aGenerator, xImportInfo );
}
@@ -829,7 +829,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
bool bResult = false;
::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) );
//if there is a meta stream at the chart object it was not written with an older OpenOffice version < 2.3
- if( !aGenerator.getLength() )
+ if( aGenerator.isEmpty() )
{
//if there is no meta stream at the chart object we need to check whether the parent document is OpenOffice at all
uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY );
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
index 13852c0..4e26b89 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
@@ -99,7 +99,7 @@ sal_Bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue,
rtl::OUStringBuffer sValueBuffer;
if( m_bCrossingValue )
{
- if(rStrExpValue.getLength() == 0)
+ if(rStrExpValue.isEmpty())
{
double fValue = 0.0;
rValue >>= fValue;
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index a1a7b26..a9675a2 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -91,7 +91,7 @@ namespace
const SvXMLStylesContext& rStylesContext,
const uno::Reference< beans::XPropertySet >& rPropSet )
{
- if( rStyleName.getLength())
+ if( !rStyleName.isEmpty())
{
SvXMLNumFormatContext* pStyle = (SvXMLNumFormatContext *)rStylesContext.FindStyleChildContext(
XML_STYLE_FAMILY_DATA_STYLE, rStyleName, sal_True );
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 8011a13..eab5167 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -75,7 +75,7 @@ SvXMLImportContext* XMLLabelSeparatorContext::CreateChildContext(
void XMLLabelSeparatorContext::EndElement()
{
- if( m_aSeparator.getLength() )
+ if( !m_aSeparator.isEmpty() )
{
// aProp is a member of XMLElementPropertyContext
aProp.maValue <<= m_aSeparator;
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 7148c49..dc9b042 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -107,7 +107,7 @@ SvXMLImportContext* XMLSymbolImageContext::CreateChildContext(
if( xmloff::token::IsXMLToken( rLocalName,
xmloff::token::XML_BINARY_DATA ) )
{
- if( ! msURL.getLength() && ! mxBase64Stream.is() )
+ if( msURL.isEmpty() && ! mxBase64Stream.is() )
{
mxBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( mxBase64Stream.is() )
@@ -128,7 +128,7 @@ void XMLSymbolImageContext::EndElement()
{
::rtl::OUString sResolvedURL;
- if( msURL.getLength() )
+ if( !msURL.isEmpty() )
{
sResolvedURL = GetImport().ResolveGraphicObjectURL( msURL, sal_False );
}
@@ -138,7 +138,7 @@ void XMLSymbolImageContext::EndElement()
mxBase64Stream = 0;
}
- if( sResolvedURL.getLength())
+ if( !sResolvedURL.isEmpty())
{
// aProp is a member of XMLElementPropertyContext
aProp.maValue <<= sResolvedURL;
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index cfc3015..c8b78d5 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -603,10 +603,10 @@ void XMLConfigItemContext::Characters( const ::rtl::OUString& rChars )
if (IsXMLToken(msType, XML_BASE64BINARY))
{
rtl::OUString sTrimmedChars( rChars.trim() );
- if( sTrimmedChars.getLength() )
+ if( !sTrimmedChars.isEmpty() )
{
rtl::OUString sChars;
- if( msValue.getLength() )
+ if( !msValue.isEmpty() )
{
sChars = msValue;
sChars += sTrimmedChars;
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index cb9a4c9..eff5c49 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -227,7 +227,7 @@ OUString DomExport::qualifiedName( const OUString& sPrefix,
const OUString& sLocalName )
{
OUStringBuffer sBuffer;
- if( ( sPrefix.getLength() > 0 ) && ( sURI.getLength() > 0 ) )
+ if( !sPrefix.isEmpty() && !sURI.isEmpty() )
{
addNamespace( sPrefix, sURI );
sBuffer.append( sPrefix );
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index b8873af..4527dab 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -75,8 +75,8 @@ makeCURIE(SvXMLExport * i_pExport,
if (!i_xURI.is()) throw uno::RuntimeException();
const ::rtl::OUString Namespace( i_xURI->getNamespace() );
- OSL_ENSURE(Namespace.getLength(), "makeCURIE: no namespace");
- if (!Namespace.getLength()) throw uno::RuntimeException();
+ OSL_ENSURE(!Namespace.isEmpty(), "makeCURIE: no namespace");
+ if (Namespace.isEmpty()) throw uno::RuntimeException();
::rtl::OUStringBuffer buf;
buf.append( i_pExport->EnsureNamespace(Namespace) );
@@ -140,7 +140,7 @@ RDFaExportHelper::LookupBlankNode(
if (!i_xBlankNode.is()) throw uno::RuntimeException();
::rtl::OUString & rEntry(
m_BlankNodeMap[ i_xBlankNode->getStringValue() ] );
- if (!rEntry.getLength())
+ if (rEntry.isEmpty())
{
::rtl::OUStringBuffer buf;
buf.appendAscii(s_prefix);
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 028782e..ff625d8 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -71,7 +71,7 @@ class SAL_DLLPRIVATE RDFaReader
//FIXME: this is an ugly hack to workaround buggy SvXMLImport::GetAbsolute
::rtl::OUString GetAbsoluteReference(::rtl::OUString const & i_rURI) const
{
- if (!i_rURI.getLength() || i_rURI[0] == '#')
+ if (i_rURI.isEmpty() || i_rURI[0] == '#')
{
return GetImport().GetBaseURL() + i_rURI;
}
@@ -228,16 +228,16 @@ RDFaReader::ReadCURIEs(::rtl::OUString const & i_rCURIEs) const
::rtl::OUString CURIEs(i_rCURIEs);
do {
::rtl::OUString curie( splitAtWS(CURIEs) );
- if (curie.getLength())
+ if (!curie.isEmpty())
{
const ::rtl::OUString uri(ReadCURIE(curie));
- if (uri.getLength())
+ if (!uri.isEmpty())
{
vec.push_back(uri);
}
}
}
- while (CURIEs.getLength());
+ while (!CURIEs.isEmpty());
if (!vec.size())
{
OSL_TRACE( "ReadCURIEs: invalid CURIEs" );
@@ -383,7 +383,7 @@ void RDFaInserter::InsertRDFaEntry(
}
uno::Reference<rdf::XURI> xDatatype;
- if (i_rEntry.m_pRDFaAttributes->m_Datatype.getLength())
+ if (!i_rEntry.m_pRDFaAttributes->m_Datatype.isEmpty())
{
xDatatype = MakeURI( i_rEntry.m_pRDFaAttributes->m_Datatype );
}
@@ -421,7 +421,7 @@ RDFaImportHelper::ParseRDFa(
::rtl::OUString const & i_rContent,
::rtl::OUString const & i_rDatatype)
{
- if (!i_rProperty.getLength())
+ if (i_rProperty.isEmpty())
{
OSL_TRACE("AddRDFa: invalid input: xhtml:property empty");
return ::boost::shared_ptr<ParsedRDFaAttributes>();
@@ -429,7 +429,7 @@ RDFaImportHelper::ParseRDFa(
// must parse CURIEs here: need namespace declaration context
RDFaReader reader(GetImport());
const ::rtl::OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) );
- if (!about.getLength()) {
+ if (about.isEmpty()) {
return ::boost::shared_ptr<ParsedRDFaAttributes>();
}
const ::std::vector< ::rtl::OUString > properties(
@@ -437,7 +437,7 @@ RDFaImportHelper::ParseRDFa(
if (!properties.size()) {
return ::boost::shared_ptr<ParsedRDFaAttributes>();
}
- const ::rtl::OUString datatype( i_rDatatype.getLength()
+ const ::rtl::OUString datatype( !i_rDatatype.isEmpty()
? reader.ReadCURIE(i_rDatatype)
: ::rtl::OUString() );
return ::boost::shared_ptr<ParsedRDFaAttributes>(
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index a99d6e4..27182d3 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -189,7 +189,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_BOOLEAN );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
@@ -205,7 +205,7 @@ void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUStr
void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const
{
#if 0
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_BYTE );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
@@ -223,7 +223,7 @@ void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUStr
}
void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_SHORT );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
@@ -235,7 +235,7 @@ void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUS
void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_INT );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
@@ -247,7 +247,7 @@ void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const rtl::OUStr
void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_LONG );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
@@ -258,7 +258,7 @@ void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const rtl::OUSt
void XMLSettingsExportHelper::exportDouble(const double fValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
@@ -270,18 +270,18 @@ void XMLSettingsExportHelper::exportDouble(const double fValue, const rtl::OUStr
void XMLSettingsExportHelper::exportString(const rtl::OUString& sValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_STRING );
m_rContext.StartElement( XML_CONFIG_ITEM, sal_True );
- if (sValue.getLength())
+ if (!sValue.isEmpty())
m_rContext.Characters( sValue );
m_rContext.EndElement( sal_False );
}
void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_DATETIME );
rtl::OUStringBuffer sBuffer;
@@ -295,7 +295,7 @@ void XMLSettingsExportHelper::exportSequencePropertyValue(
const uno::Sequence<beans::PropertyValue>& aProps,
const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
sal_Int32 nLength(aProps.getLength());
if(nLength)
{
@@ -372,7 +372,7 @@ void XMLSettingsExportHelper::exportbase64Binary(
const uno::Sequence<sal_Int8>& aProps,
const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
sal_Int32 nLength(aProps.getLength());
m_rContext.AddAttribute( XML_NAME, rName );
m_rContext.AddAttribute( XML_TYPE, XML_BASE64BINARY );
@@ -390,7 +390,7 @@ void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny,
const rtl::OUString& rName,
const sal_Bool bNameAccess) const
{
- DBG_ASSERT((bNameAccess && rName.getLength()) || !bNameAccess, "no name");
+ DBG_ASSERT((bNameAccess && !rName.isEmpty()) || !bNameAccess, "no name");
uno::Sequence<beans::PropertyValue> aProps;
rAny >>= aProps;
sal_Int32 nLength = aProps.getLength();
@@ -409,7 +409,7 @@ void XMLSettingsExportHelper::exportNameAccess(
const uno::Reference<container::XNameAccess>& aNamed,
const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
DBG_ASSERT(aNamed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ),
"wrong NameAccess" );
if(aNamed->hasElements())
@@ -427,7 +427,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
const uno::Reference<container::XIndexAccess> aIndexed,
const rtl::OUString rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
DBG_ASSERT(aIndexed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ),
"wrong IndexAccess" );
rtl::OUString sEmpty;
@@ -515,7 +515,7 @@ void XMLSettingsExportHelper::exportAllSettings(
const uno::Sequence<beans::PropertyValue>& aProps,
const rtl::OUString& rName) const
{
- DBG_ASSERT(rName.getLength(), "no name");
+ DBG_ASSERT(!rName.isEmpty(), "no name");
exportSequencePropertyValue(aProps, rName);
}
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index e8bffff..41f17ae 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -68,10 +68,10 @@ void XMLBase64ImportContext::EndElement()
void XMLBase64ImportContext::Characters( const ::rtl::OUString& rChars )
{
OUString sTrimmedChars( rChars. trim() );
- if( sTrimmedChars.getLength() )
+ if( !sTrimmedChars.isEmpty() )
{
OUString sChars;
- if( sBase64CharsLeft.getLength() )
+ if( !sBase64CharsLeft.isEmpty() )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 65432b8..a7db987 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -155,7 +155,7 @@ TYPEINIT1( XMLEmbeddedObjectImportContext, SvXMLImportContext );
sal_Bool XMLEmbeddedObjectImportContext::SetComponent(
Reference< XComponent >& rComp )
{
- if( !rComp.is() || !sFilterService.getLength() )
+ if( !rComp.is() || sFilterService.isEmpty() )
return sal_False;
@@ -238,7 +238,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
}
}
- if( sClass.getLength() )
+ if( !sClass.isEmpty() )
{
const XMLServiceMapEntry_Impl *pEntry = aServiceMap;
while( pEntry->eClass != XML_TOKEN_INVALID )
@@ -303,7 +303,7 @@ void XMLEmbeddedObjectImportContext::StartElement(
while( USHRT_MAX != nPos )
{
OUString aAttrName( rNamespaceMap.GetAttrNameByKey( nPos ) );
- if( 0 == xAttrList->getValueByName( aAttrName ).getLength() )
+ if( xAttrList->getValueByName( aAttrName ).isEmpty() )
{
pAttrList->AddAttribute( aAttrName,
rNamespaceMap.GetNameByKey( nPos ) );
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 24605ce..383df82 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -194,7 +194,7 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
{
sAttrName.append( sXMLNS );
const ::rtl::OUString & prefix( (*aIter).second->sPrefix );
- if (prefix.getLength()) // not default namespace
+ if (!prefix.isEmpty()) // not default namespace
{
sAttrName.append( sal_Unicode(':') );
sAttrName.append( prefix );
@@ -223,7 +223,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
// don't bother caching this, it rarely happens
OUStringBuffer sQName;
sQName.append ( sXMLNS );
- if (rLocalName.getLength()) // not default namespace
+ if (!rLocalName.isEmpty()) // not default namespace
{
sQName.append ( sal_Unicode(':') );
sQName.append ( rLocalName );
@@ -256,7 +256,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
OUStringBuffer sQName;
// ...if it's in our map, make the prefix
const OUString & prefix( (*aIter).second->sPrefix );
- if (prefix.getLength()) // not default namespace
+ if (!prefix.isEmpty()) // not default namespace
{
sQName.append( prefix );
sQName.append( sal_Unicode(':') );
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index b3f62c2..8fe03e4 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -87,7 +87,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const
for( sal_uInt16 nAttr = 0; nAttr < nAttrCount; nAttr++ )
{
if( mpContainer->GetAttrLName(nAttr) == aName &&
- mpContainer->GetAttrPrefix(nAttr).getLength() == 0L )
+ mpContainer->GetAttrPrefix(nAttr).isEmpty() )
return nAttr;
}
}
@@ -202,7 +202,7 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons
const OUString aPrefix( aName.copy( 0L, nPos ));
const OUString aLName( aName.copy( nPos+1L ));
- if( pData->Namespace.getLength() == 0L )
+ if( pData->Namespace.isEmpty() )
{
if( mpContainer->SetAt( nAttr, aPrefix, aLName, pData->Value ) )
return;
@@ -215,7 +215,7 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons
}
else
{
- if( pData->Namespace.getLength() == 0L )
+ if( pData->Namespace.isEmpty() )
{
if( mpContainer->SetAt( nAttr, aName, pData->Value ) )
return;
@@ -245,7 +245,7 @@ throw( lang::IllegalArgumentException, container::ElementExistException, lang::W
const OUString aPrefix( aName.copy( 0L, nPos ));
const OUString aLName( aName.copy( nPos+1L ));
- if( pData->Namespace.getLength() == 0L )
+ if( pData->Namespace.isEmpty() )
{
if( mpContainer->AddAttr( aPrefix, aLName, pData->Value ) )
return;
@@ -258,7 +258,7 @@ throw( lang::IllegalArgumentException, container::ElementExistException, lang::W
}
else
{
- if( pData->Namespace.getLength() == 0L )
+ if( pData->Namespace.isEmpty() )
{
if( mpContainer->AddAttr( aName, pData->Value ) )
return;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 10d8dcc..ce04302 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -827,10 +827,10 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
uno::Any aAny = mxExportInfo->getPropertyValue(sPropName);
aAny >>= sName;
}
- if( msOrigFileName.getLength() && sName.getLength() )
+ if( !msOrigFileName.isEmpty() && !sName.isEmpty() )
{
INetURLObject aBaseURL( msOrigFileName );
- if( sRelPath.getLength() )
+ if( !sRelPath.isEmpty() )
aBaseURL.insertName( sRelPath );
aBaseURL.insertName( sName );
msOrigFileName = aBaseURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
@@ -875,7 +875,7 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
{
const sal_uInt32 nTest =
EXPORT_META|EXPORT_STYLES|EXPORT_CONTENT|EXPORT_SETTINGS;
- if( (mnExportFlags & nTest) == nTest && !msOrigFileName.getLength() )
+ if( (mnExportFlags & nTest) == nTest && msOrigFileName.isEmpty() )
{
// evaluate descriptor only for flat files and if a base URI
// has not been provided already
@@ -2180,7 +2180,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
OSL_ENSURE( sFilterService.getLength(), "no export filter for own object" );
- if( !sFilterService.getLength() )
+ if( sFilterService.isEmpty() )
return sal_False;
Reference < XDocumentHandler > xHdl =
@@ -2239,7 +2239,7 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue)
// #i65474# handling of fragment URLs ("#....") is undefined
// they are stored 'as is'
uno::Reference< uri::XUriReference > xUriRef;
- if(sValue.getLength() && sValue.getStr()[0] != '#')
+ if(!sValue.isEmpty() && sValue.getStr()[0] != '#')
{
try
{
@@ -2514,10 +2514,10 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
if ( xMeta.is() )
{
const beans::StringPair mdref( xMeta->getMetadataReference() );
- if ( mdref.Second.getLength() )
+ if ( !mdref.Second.isEmpty() )
{
const ::rtl::OUString streamName( GetStreamName() );
- if ( streamName.getLength() )
+ if ( !streamName.isEmpty() )
{
if ( streamName.equals(mdref.First) )
{
@@ -2564,7 +2564,7 @@ SvXMLExport::AddAttributesRDFa(
const uno::Reference<rdf::XMetadatable> xMeta(
i_xTextContent, uno::UNO_QUERY);
- if (!xMeta.is() || !xMeta->getMetadataReference().Second.getLength())
+ if (!xMeta.is() || xMeta->getMetadataReference().Second.isEmpty())
{
return; // no xml:id => no RDFa
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2af9a83..6213ad9 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -905,9 +905,9 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
uno::Any aAny = mxImportInfo->getPropertyValue(sPropName);
aAny >>= sName;
}
- if( sBaseURI.getLength() && sName.getLength() )
+ if( !sBaseURI.isEmpty() && !sName.isEmpty() )
{
- if( sRelPath.getLength() )
+ if( !sRelPath.isEmpty() )
mpImpl->aBaseURL.insertName( sRelPath );
mpImpl->aBaseURL.insertName( sName );
}
@@ -1191,14 +1191,14 @@ sal_Bool SvXMLImport::IsPackageURL( const ::rtl::OUString& rURL ) const
sRet = mxGraphicResolver->resolveGraphicObjectURL( aTmp );
}
- if( !sRet.getLength() )
+ if( sRet.isEmpty() )
{
sRet = msPackageProtocol;
sRet += rURL;
}
}
- if( !sRet.getLength() )
+ if( sRet.isEmpty() )
sRet = GetAbsoluteReference( rURL );
return sRet;
@@ -1237,7 +1237,7 @@ Reference< XOutputStream > SvXMLImport::GetStreamForGraphicObjectURLFromBase64()
if ( mxEmbeddedResolver.is() )
{
OUString sURL( rURL );
- if( rClassId.getLength() )
+ if( !rClassId.isEmpty() )
{
sURL += OUString( sal_Unicode('!') );
sURL += rClassId;
@@ -1325,7 +1325,7 @@ OUString SvXMLImport::GetStyleDisplayName( sal_uInt16 nFamily,
const OUString& rName ) const
{
OUString sName( rName );
- if( mpStyleMap && rName.getLength() )
+ if( mpStyleMap && !rName.isEmpty() )
{
StyleMap::key_type aKey( nFamily, rName );
StyleMap::const_iterator aIter = mpStyleMap->find( aKey );
@@ -1526,7 +1526,7 @@ const SvXMLStylesContext *SvXMLImport::GetAutoStyles() const
OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const
{
- if( rValue.getLength() == 0 || rValue[0] == '#' )
+ if( rValue.isEmpty() || rValue[0] == '#' )
return rValue;
INetURLObject aAbsURL;
@@ -1541,7 +1541,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion
// the check returns sal_False only if the storage version could be retrieved
sal_Bool bResult = sal_True;
- if ( aODFVersion.getLength() && aODFVersion.compareTo( ODFVER_012_TEXT ) >= 0 )
+ if ( !aODFVersion.isEmpty() && aODFVersion.compareTo( ODFVER_012_TEXT ) >= 0 )
{
// check the consistency only for the ODF1.2 and later ( according to content.xml )
// manifest.xml might have no version, it should be checked here and the correct version should be set
@@ -1575,7 +1575,7 @@ sal_Bool SvXMLImport::IsODFVersionConsistent( const ::rtl::OUString& aODFVersion
// if not, set it explicitly to be used further ( it will work even for readonly storage )
// This workaround is not nice, but I see no other way to handle it, since there are
// ODF1.2 documents without version in manifest.xml
- if ( aStorVersion.getLength() )
+ if ( !aStorVersion.isEmpty() )
bResult = aODFVersion.equals( aStorVersion );
else
xStorProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ),
@@ -1821,7 +1821,7 @@ bool SvXMLImport::getBuildIds( sal_Int32& rUPD, sal_Int32& rBuild ) const
{
OUString aBuildId;
mxImportInfo->getPropertyValue( aPropName ) >>= aBuildId;
- if( aBuildId.getLength() )
+ if( !aBuildId.isEmpty() )
{
sal_Int32 nIndex = aBuildId.indexOf('$');
if( nIndex != -1 )
@@ -1869,7 +1869,7 @@ bool SvXMLImport::isGraphicLoadOnDemandSupported() const
void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc,
::rtl::OUString const & i_rXmlId)
{
- if (i_rXmlId.getLength() > 0) {
+ if (!i_rXmlId.isEmpty()) {
try {
const uno::Reference<rdf::XMetadatable> xMeta(i_xIfc,
uno::UNO_QUERY);
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 3ec1a49..1109eb5 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -543,7 +543,7 @@ sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken )
bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUString& _rContentY,OUString& _rContentZ)
{
- if(!_sValue.getLength() || _sValue[0] != '(')
+ if(_sValue.isEmpty() || _sValue[0] != '(')
return false;
sal_Int32 nPos(1L);
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 9c8347b..0f90d88 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -188,7 +188,7 @@ void XMLImageMapExport::ExportMapEntry(
Any aAny = rPropertySet->getPropertyValue(msURL);
OUString sHref;
aAny >>= sHref;
- if (sHref.getLength() > 0)
+ if (!sHref.isEmpty())
{
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference(sHref));
}
@@ -198,7 +198,7 @@ void XMLImageMapExport::ExportMapEntry(
aAny = rPropertySet->getPropertyValue(msTarget);
OUString sTargt;
aAny >>= sTargt;
- if (sTargt.getLength() > 0)
+ if (!sTargt.isEmpty())
{
mrExport.AddAttribute(
XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, sTargt);
@@ -213,7 +213,7 @@ void XMLImageMapExport::ExportMapEntry(
aAny = rPropertySet->getPropertyValue(msName);
OUString sItemName;
aAny >>= sItemName;
- if (sItemName.getLength() > 0)
+ if (!sItemName.isEmpty())
{
mrExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, sItemName);
}
@@ -251,7 +251,7 @@ void XMLImageMapExport::ExportMapEntry(
// title property (as <svg:title> element)
OUString sTitle;
rPropertySet->getPropertyValue(msTitle) >>= sTitle;
- if(sTitle.getLength())
+ if(!sTitle.isEmpty())
{
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, mbWhiteSpace, sal_False);
mrExport.Characters(sTitle);
@@ -260,7 +260,7 @@ void XMLImageMapExport::ExportMapEntry(
// description property (as <svg:desc> element)
OUString sDescription;
rPropertySet->getPropertyValue(msDescription) >>= sDescription;
- if (sDescription.getLength() > 0)
+ if (!sDescription.isEmpty())
{
SvXMLElementExport aDesc(mrExport, XML_NAMESPACE_SVG, XML_DESC, mbWhiteSpace, sal_False);
mrExport.Characters(sDescription);
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 6f9b3b5..6ef4815 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -644,7 +644,7 @@ void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, sal_Bool bLong
(pStyleMember->mbLong == bLong) &&
(pStyleMember->mbTextual == bTextual) &&
(pStyleMember->mbDecimal02 == bDecimal02) &&
- ( ( (pStyleMember->mpText == NULL) && (rText.getLength() == 0) ) ||
+ ( ( (pStyleMember->mpText == NULL) && (rText.isEmpty()) ) ||
( pStyleMember->mpText && (rText.compareToAscii( pStyleMember->mpText ) == 0 )) ) ) )
{
mnElements[mnIndex++] = nIndex + 1;
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 0043bee..1486554 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -82,12 +82,12 @@ XMLReplacementImageContext::~XMLReplacementImageContext()
void XMLReplacementImageContext::EndElement()
{
- OSL_ENSURE( m_sHRef.getLength() > 0 || m_xBase64Stream.is(),
+ OSL_ENSURE( !m_sHRef.isEmpty() || m_xBase64Stream.is(),
"neither URL nor base64 image data given" );
UniReference < XMLTextImportHelper > xTxtImport =
GetImport().GetTextImport();
OUString sHRef;
- if( m_sHRef.getLength() )
+ if( !m_sHRef.isEmpty() )
{
sal_Bool bForceLoad = xTxtImport->IsInsertMode() ||
xTxtImport->IsBlockMode() ||
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 6a8c847..200f67f 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -76,7 +76,7 @@ XMLShapeStyleContext::~XMLShapeStyleContext()
void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
{
- if ((0 == m_sControlDataStyleName.getLength()) && (::xmloff::token::GetXMLToken(::xmloff::token::XML_DATA_STYLE_NAME) == rLocalName))
+ if (m_sControlDataStyleName.isEmpty() && (::xmloff::token::GetXMLToken(::xmloff::token::XML_DATA_STYLE_NAME) == rLocalName))
{
m_sControlDataStyleName = rValue;
}
@@ -91,7 +91,7 @@ void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const ::rtl::OUS
if( (XML_NAMESPACE_STYLE == nPrefixKey) &&
( IsXMLToken( rLocalName, ::xmloff::token::XML_NAME ) || IsXMLToken( rLocalName, ::xmloff::token::XML_DISPLAY_NAME ) ) )
{
- if( GetName().getLength() && GetDisplayName().getLength() && GetName() != GetDisplayName() )
+ if( !GetName().isEmpty() && !GetDisplayName().isEmpty() && GetName() != GetDisplayName() )
{
const_cast< SvXMLImport&>( GetImport() ).
AddStyleDisplayName( GetFamily(), GetName(), GetDisplayName() );
@@ -162,7 +162,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
// if we did not find an old list-style-name in the properties, and we need one
// because we got a style:list-style attribute in the style-style element
// we generate one
- if( (property == end) && ( 0 != m_sListStyleName.getLength() ) )
+ if( (property == end) && ( !m_sListStyleName.isEmpty() ) )
{
sal_Int32 nIndex = rMapper->FindEntryIndex( CTF_SD_NUMBERINGRULES_NAME );
DBG_ASSERT( -1 != nIndex, "can't find numbering rules property entry, can't set numbering rule!" );
@@ -177,7 +177,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
// a numbering rule
if( property != end )
{
- if( 0 == m_sListStyleName.getLength() )
+ if( m_sListStyleName.isEmpty() )
{
property->maValue >>= m_sListStyleName;
}
@@ -301,7 +301,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
}
}
- if (m_sControlDataStyleName.getLength())
+ if (!m_sControlDataStyleName.isEmpty())
{ // we had a data-style-name attribute
// set the formatting on the control model of the control shape
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 36bb889..8d893d0 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -594,7 +594,7 @@ void AnimationsExporterImpl::exportTransitionNode()
OUStringBuffer sTmp;
- if( (nTransition != 0) || (sSoundURL.getLength() != 0) || bStopSound )
+ if( (nTransition != 0) || !sSoundURL.isEmpty() || bStopSound )
{
Reference< XInterface > xSource( mxPageProps.get() );
Event aEvent;
@@ -647,7 +647,7 @@ void AnimationsExporterImpl::exportTransitionNode()
mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, XML_STOP_AUDIO );
SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, sal_True, sal_True );
}
- else if( sSoundURL.getLength() != 0)
+ else if( !sSoundURL.isEmpty())
{
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sSoundURL ) );
@@ -681,7 +681,7 @@ void AnimationsExporterImpl::prepareTransitionNode()
bStopSound = sal_False;
}
- if( (nTransition != 0) || (sSoundURL.getLength() != 0) || bStopSound )
+ if( (nTransition != 0) || !sSoundURL.isEmpty() || bStopSound )
{
mbHasTransition = true;
Reference< XInterface > xInt( mxPageProps.get() );
@@ -782,7 +782,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
OUStringBuffer sTmp;
const OUString& rExportIdentifier = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xNode );
- if( rExportIdentifier.getLength() )
+ if( !rExportIdentifier.isEmpty() )
{
mrExport.AddAttributeIdLegacy(
XML_NAMESPACE_ANIMATION, rExportIdentifier);
@@ -958,7 +958,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
if( xMaster.is() )
{
const OUString& rIdentifier = mrExport.getInterfaceToIdentifierMapper().getIdentifier(xMaster);
- if( rIdentifier.getLength() )
+ if( !rIdentifier.isEmpty() )
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_MASTER_ELEMENT, rIdentifier );
}
}
@@ -1147,7 +1147,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
else
{
OUString sTemp( xAnimate->getAttributeName() );
- if( sTemp.getLength() )
+ if( !sTemp.isEmpty() )
{
ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
while( p->mpAPIName )
@@ -1221,7 +1221,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
}
OUString sTemp( xAnimate->getFormula() );
- if( sTemp.getLength() )
+ if( !sTemp.isEmpty() )
mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_FORMULA, sTemp );
if( (nNodeType != AnimationNodeType::TRANSITIONFILTER) &&
@@ -1376,7 +1376,7 @@ void AnimationsExporterImpl::exportAudio( const Reference< XAudio >& xAudio )
{
OUString aSourceURL;
xAudio->getSource() >>= aSourceURL;
- if( aSourceURL.getLength() )
+ if( !aSourceURL.isEmpty() )
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( aSourceURL ) );
const double fVolume = xAudio->getVolume();
@@ -1645,7 +1645,7 @@ void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTa
if( xRef.is() )
{
const OUString& rIdentifier = mrExport.getInterfaceToIdentifierMapper().getIdentifier(xRef);
- if( rIdentifier.getLength() )
+ if( !rIdentifier.isEmpty() )
sTmp.append( rIdentifier );
}
}
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 90387a4..929d8ad 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -470,7 +470,7 @@ Any AnimationsImportHelperImpl::convertValue( XMLTokenEnum eAttributeName, const
case XML_VISIBILITY: nType = XML_SD_TYPE_PRESPAGE_VISIBILITY; break;
default:
- if( rValue.getLength() )
+ if( !rValue.isEmpty() )
aAny <<= rValue;
return aAny;
}
@@ -488,7 +488,7 @@ Sequence< Any > AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e
Sequence< Any > aValues;
// do we have any value at all?
- if( rValue.getLength() )
+ if( !rValue.isEmpty() )
{
sal_Int32 nElements = count_codes( rValue, (sal_Unicode)';') + 1; // a non empty string has at least one value
@@ -512,7 +512,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue )
Any aAny;
// do we have any value at all?
- if( rValue.getLength() )
+ if( !rValue.isEmpty() )
{
// count the values
sal_Int32 nElements = count_codes( rValue, (sal_Unicode)';' ) + 1; // a non empty string has at least one value
@@ -591,7 +591,7 @@ Sequence< double > AnimationsImportHelperImpl::convertKeyTimes( const OUString&
{
sal_Int32 nElements = 0;
- if( rValue.getLength() )
+ if( !rValue.isEmpty() )
nElements = count_codes( rValue, (sal_Unicode)';' ) + 1; // a non empty string has at least one value
Sequence< double > aKeyTimes( nElements );
@@ -611,7 +611,7 @@ Sequence< TimeFilterPair > AnimationsImportHelperImpl::convertTimeFilter( const
{
sal_Int32 nElements = 0;
- if( rValue.getLength() )
+ if( !rValue.isEmpty() )
nElements = count_codes( rValue, (sal_Unicode)';' ) + 1; // a non empty string has at least one value
Sequence< TimeFilterPair > aTimeFilter( nElements );
@@ -1221,7 +1221,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
}
}
- if (sXmlId.getLength())
+ if (!sXmlId.isEmpty())
{
Reference< XInterface > const xRef( mxNode, UNO_QUERY );
GetImport().getInterfaceToIdentifierMapper().registerReference(
@@ -1244,16 +1244,16 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
// convert values
if( xAnimate.is() )
{
- if( aFrom.getLength() )
+ if( !aFrom.isEmpty() )
xAnimate->setFrom( mpHelper->convertValue( meAttributeName, aFrom ) );
- if( aBy.getLength() )
+ if( !aBy.isEmpty() )
xAnimate->setBy( mpHelper->convertValue( meAttributeName, aBy ) );
- if( aTo.getLength() )
+ if( !aTo.isEmpty() )
xAnimate->setTo( mpHelper->convertValue( meAttributeName, aTo ) );
- if( aValues.getLength() )
+ if( !aValues.isEmpty() )
xAnimate->setValues( mpHelper->convertValueSequence( meAttributeName, aValues ) );
}
}
@@ -1424,7 +1424,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
{
Reference< XAudio > xAudio( xChildNode, UNO_QUERY_THROW );
OUString sSoundURL;
- if( (xAudio->getSource() >>= sSoundURL) && (sSoundURL.getLength() != 0) )
+ if( (xAudio->getSource() >>= sSoundURL) && !sSoundURL.isEmpty() )
{
xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ), Any(sSoundURL) );
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index f0c2bc3..86ae42c 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -527,7 +527,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
}
SvXMLElementExport aEle( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, sal_True, sal_True );
- if( rEffect.maSoundURL.getLength() != 0 )
+ if( !rEffect.maSoundURL.isEmpty() )
{
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(rEffect.maSoundURL) );
rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 7ba3002..1411017 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -579,7 +579,7 @@ void XMLAnimationsEffectContext::EndElement()
UniReference< XMLShapeImportHelper > xShapeImport( GetImport().GetShapeImport() );
Any aAny;
- if( maShapeId.getLength() )
+ if( !maShapeId.isEmpty() )
{
Reference< XPropertySet > xSet;
if( mpImpl->maLastShapeId != maShapeId )
@@ -635,7 +635,7 @@ void XMLAnimationsEffectContext::EndElement()
xSet->setPropertyValue( mbTextEffect ? mpImpl->msTextEffect : mpImpl->msEffect, makeAny( eEffect ) );
xSet->setPropertyValue( mpImpl->msSpeed, makeAny( meSpeed ) );
- if( eEffect == AnimationEffect_PATH && maPathShapeId.getLength() )
+ if( eEffect == AnimationEffect_PATH && !maPathShapeId.isEmpty() )
{
Reference< XShape > xPath( GetImport().getInterfaceToIdentifierMapper().getReference( maPathShapeId ), UNO_QUERY );
if( xPath.is() )
@@ -644,7 +644,7 @@ void XMLAnimationsEffectContext::EndElement()
}
}
}
- if( maSoundURL.getLength() != 0 )
+ if( !maSoundURL.isEmpty() )
{
if( xSet.is() )
{
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index de7f866..7b26315 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -65,7 +65,7 @@ SdXMLDescriptionContext::~SdXMLDescriptionContext()
void SdXMLDescriptionContext::EndElement()
{
- if( msText.getLength() ) try
+ if( !msText.isEmpty() ) try
{
uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY_THROW);
if(IsXMLToken(GetLocalName(),XML_TITLE))
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 423e223..202b5c7 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -286,7 +286,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
}
if( mbValid )
- mbValid = sEventName.getLength() != 0;
+ mbValid = !sEventName.isEmpty();
}
SdXMLEventContext::~SdXMLEventContext()
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index d768624..c049de9 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -78,14 +78,14 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
{
Reference< XPropertySet> xLayer( xLayerManager->getByIndex( nIndex ), UNO_QUERY_THROW );
xLayer->getPropertyValue( strName ) >>= sTmp;
- if(sTmp.getLength())
+ if(!sTmp.isEmpty())
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, sTmp );
SvXMLElementExport aEle( rExport, XML_NAMESPACE_DRAW, XML_LAYER, sal_True, sal_True );
// title property (as <svg:title> element)
xLayer->getPropertyValue(strTitle) >>= sTmp;
- if(sTmp.getLength())
+ if(!sTmp.isEmpty())
{
SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SVG, XML_TITLE, sal_True, sal_False);
rExport.Characters(sTmp);
@@ -93,7 +93,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
// description property (as <svg:desc> element)
xLayer->getPropertyValue(strDescription) >>= sTmp;
- if(sTmp.getLength() > 0)
+ if(!sTmp.isEmpty())
{
SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC, sal_True, sal_False);
rExport.Characters(sTmp);
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 7b6feb5..1ab2901 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -122,8 +122,8 @@ SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix,
void SdXMLLayerContext::EndElement()
{
- DBG_ASSERT( msName.getLength(), "xmloff::SdXMLLayerContext::EndElement(), draw:layer element without draw:name!" );
- if( msName.getLength() ) try
+ DBG_ASSERT( !msName.isEmpty(), "xmloff::SdXMLLayerContext::EndElement(), draw:layer element without draw:name!" );
+ if( !msName.isEmpty() ) try
{
Reference< XPropertySet > xLayer;
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 88ffa2e..448d921 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -797,7 +797,7 @@ sal_Bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rV
if( bValue )
{
- if( rStrExpValue.getLength() )
+ if( !rStrExpValue.isEmpty() )
rStrExpValue += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) );
rStrExpValue += GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE );
@@ -1288,7 +1288,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
case CTF_FILLBITMAPNAME:
{
OUString aStr;
- if( (property->maValue >>= aStr) && 0 == aStr.getLength() )
+ if( (property->maValue >>= aStr) && aStr.isEmpty() )
property->mnIndex = -1;
}
break;
@@ -1671,7 +1671,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
{
OUString aValue;
(*property).maValue >>= aValue;
- if( aValue.getLength() == 0 )
+ if( aValue.isEmpty() )
(*property).mnIndex = -1;
}
break;
@@ -1735,7 +1735,7 @@ void XMLPageExportPropertyMapper::handleElementItem(
case CTF_PAGE_SOUND_URL:
{
OUString aSoundURL;
- if( (rProperty.maValue >>= aSoundURL) && aSoundURL.getLength() != 0 )
+ if( (rProperty.maValue >>= aSoundURL) && !aSoundURL.isEmpty() )
{
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference(aSoundURL) );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 9a79cf7..9768c5d 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1432,14 +1432,14 @@ void SdXMLExport::ImpWritePageMasterInfos()
ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString& rName)
{
- if(rName.getLength() && !mpPageMasterInfoList->empty())
+ if(!rName.isEmpty() && !mpPageMasterInfoList->empty())
{
for( size_t nCnt = 0; nCnt < mpPageMasterInfoList->size(); nCnt++)
{
ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterInfoList->at(nCnt);
if(pInfo)
{
- if(pInfo->GetMasterPageName().getLength() && rName.equals(pInfo->GetMasterPageName()))
+ if(!pInfo->GetMasterPageName().isEmpty() && rName.equals(pInfo->GetMasterPageName()))
{
return pInfo;
}
@@ -1550,7 +1550,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
if( xInfo->hasPropertyByName( aStrHeaderTextProp ) )
{
xSet->getPropertyValue( aStrHeaderTextProp ) >>= aStrText;
- if( aStrText.getLength() )
+ if( !aStrText.isEmpty() )
aSettings.maStrHeaderDeclName = findOrAppendImpl( maHeaderDeclsVector, aStrText, gpStrHeaderTextPrefix );
}
@@ -1558,7 +1558,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
if( xInfo->hasPropertyByName( aStrFooterTextProp ) )
{
xSet->getPropertyValue( aStrFooterTextProp ) >>= aStrText;
- if( aStrText.getLength() )
+ if( !aStrText.isEmpty() )
aSettings.maStrFooterDeclName = findOrAppendImpl( maFooterDeclsVector, aStrText, gpStrFooterTextPrefix );
}
@@ -1571,7 +1571,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDateTimeFixed" ) ) ) >>= bFixed;
xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DateTimeFormat" ) ) ) >>= nFormat;
- if( !bFixed || aStrText.getLength() )
+ if( !bFixed || !aStrText.isEmpty() )
{
aSettings.maStrDateTimeDeclName = findOrAppendImpl( maDateTimeDeclsVector, aStrText, bFixed, nFormat, gpStrDateTimeTextPrefix );
if( !bFixed )
@@ -1655,13 +1655,13 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
void SdXMLExport::ImplExportHeaderFooterDeclAttributes( const HeaderFooterPageSettingsImpl& aSettings )
{
- if( aSettings.maStrHeaderDeclName.getLength() )
+ if( !aSettings.maStrHeaderDeclName.isEmpty() )
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_USE_HEADER_NAME, aSettings.maStrHeaderDeclName );
- if( aSettings.maStrFooterDeclName.getLength() )
+ if( !aSettings.maStrFooterDeclName.isEmpty() )
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_USE_FOOTER_NAME, aSettings.maStrFooterDeclName );
- if( aSettings.maStrDateTimeDeclName.getLength() )
+ if( !aSettings.maStrDateTimeDeclName.isEmpty() )
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_USE_DATE_TIME_NAME, aSettings.maStrDateTimeDeclName );
}
@@ -1714,7 +1714,7 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( Reference<XDrawPage> xDrawPage
// try to find this style in AutoStylePool
sStyleName = GetAutoStylePool()->Find(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, xPropStates);
- if(!sStyleName.getLength())
+ if(sStyleName.isEmpty())
{
// Style did not exist, add it to AutoStalePool
sStyleName = GetAutoStylePool()->Add(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, xPropStates);
@@ -1840,7 +1840,7 @@ void SdXMLExport::_ExportContent()
AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, xNamed->getName());
// draw:style-name (presentation page attributes AND background attributes)
- if( maDrawPagesStyleNames[nPageInd].getLength() )
+ if( !maDrawPagesStyleNames[nPageInd].isEmpty() )
AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME,
maDrawPagesStyleNames[nPageInd]);
@@ -1861,7 +1861,7 @@ void SdXMLExport::_ExportContent()
}
// presentation:page-layout-name
- if( IsImpress() && maDrawPagesAutoLayoutNames[nPageInd+1].getLength())
+ if( IsImpress() && !maDrawPagesAutoLayoutNames[nPageInd+1].isEmpty())
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PRESENTATION_PAGE_LAYOUT_NAME, maDrawPagesAutoLayoutNames[nPageInd+1] );
}
@@ -1874,7 +1874,7 @@ void SdXMLExport::_ExportContent()
OUString aBookmarkURL;
xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "BookmarkURL" ) ) ) >>= aBookmarkURL;
- if( aBookmarkURL.getLength() )
+ if( !aBookmarkURL.isEmpty() )
{
sal_Int32 nIndex = aBookmarkURL.lastIndexOf( (sal_Unicode)'#' );
if( nIndex != -1 )
@@ -1904,7 +1904,7 @@ void SdXMLExport::_ExportContent()
OUString sNavigationOrder( getNavigationOrder( xDrawPage ) );
- if( sNavigationOrder.getLength() != 0 )
+ if( !sNavigationOrder.isEmpty() )
AddAttribute ( XML_NAMESPACE_DRAW, XML_NAV_ORDER, sNavigationOrder );
UniReference< xmloff::AnimationsExporter > xAnimationsExporter;
@@ -1935,7 +1935,7 @@ void SdXMLExport::_ExportContent()
// write draw:id
const OUString aPageId = getInterfaceToIdentifierMapper().getIdentifier( xDrawPage );
- if( aPageId.getLength() != 0 )
+ if( !aPageId.isEmpty() )
{
AddAttributeIdLegacy(XML_NAMESPACE_DRAW, aPageId);
}
@@ -1979,7 +1979,7 @@ void SdXMLExport::_ExportContent()
Reference< drawing::XShapes > xShapes(xNotesPage, UNO_QUERY);
if(xShapes.is())
{
- if( maDrawNotesPagesStyleNames[nPageInd].getLength() )
+ if( !maDrawNotesPagesStyleNames[nPageInd].isEmpty() )
AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME, maDrawNotesPagesStyleNames[nPageInd]);
ImplExportHeaderFooterDeclAttributes( maDrawNotesPagesHeaderFooterSettings[nPageInd] );
@@ -2029,7 +2029,7 @@ void SdXMLExport::exportPresentationSettings()
{
OUString aFirstPage;
xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ) ) >>= aFirstPage;
- if( aFirstPage.getLength() )
+ if( !aFirstPage.isEmpty() )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_PAGE, aFirstPage );
bHasAttr = sal_True;
@@ -2038,7 +2038,7 @@ void SdXMLExport::exportPresentationSettings()
{
OUString aCustomShow;
xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomShow" ) ) ) >>= aCustomShow;
- if( aCustomShow.getLength() )
+ if( !aCustomShow.isEmpty() )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW, aCustomShow );
bHasAttr = sal_True;
@@ -2310,7 +2310,7 @@ void SdXMLExport::_ExportAutoStyles()
{
aMasterPageNamePrefix = xNamed->getName();
}
- if(aMasterPageNamePrefix.getLength())
+ if(!aMasterPageNamePrefix.isEmpty())
{
aMasterPageNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
}
@@ -2375,7 +2375,7 @@ void SdXMLExport::_ExportAutoStyles()
}
}
}
- if(aMasterPageNamePrefix.getLength())
+ if(!aMasterPageNamePrefix.isEmpty())
{
aMasterPageNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
}
@@ -2445,7 +2445,7 @@ void SdXMLExport::_ExportMasterStyles()
if( xHandoutPage.is() )
{
// presentation:page-layout-name
- if( IsImpress() && maDrawPagesAutoLayoutNames[0].getLength())
+ if( IsImpress() && !maDrawPagesAutoLayoutNames[0].isEmpty())
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PRESENTATION_PAGE_LAYOUT_NAME, EncodeStyleName( maDrawPagesAutoLayoutNames[0] ));
}
@@ -2458,7 +2458,7 @@ void SdXMLExport::_ExportMasterStyles()
}
// draw:style-name
- if( maHandoutMasterStyleName.getLength() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list