From f94399ef8023ad3b21528ecdc00e44366d4c3fe5 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Mon, 23 Jan 2012 17:15:58 -0200 Subject: Fix for fdo43460 Part XLV getLength() to isEmpty() Part XLV Modules writerfilter, writerperfect --- writerperfect/source/vsdimp/VisioImportFilter.cxx | 2 +- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx | 4 ++-- writerperfect/source/wpgimp/WPGImportFilter.cxx | 2 +- writerperfect/source/wpsimp/MSWorksImportFilter.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'writerperfect') diff --git a/writerperfect/source/vsdimp/VisioImportFilter.cxx b/writerperfect/source/vsdimp/VisioImportFilter.cxx index ba56087589d4..3c7cf51ba9f4 100644 --- a/writerperfect/source/vsdimp/VisioImportFilter.cxx +++ b/writerperfect/source/vsdimp/VisioImportFilter.cxx @@ -170,7 +170,7 @@ throw( com::sun::star::uno::RuntimeException ) if (libvisio::VisioDocument::isSupported(&input)) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Visio_Document" ) ); - if (sTypeName.getLength()) + if (!sTypeName.isEmpty()) { if ( location == Descriptor.getLength() ) { diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx index 534a0610fe77..7114168486b8 100644 --- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx +++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx @@ -160,7 +160,7 @@ throw (RuntimeException) OdtGenerator collector(&xHandler, ODF_FLAT_XML); collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPG); - if (WPD_OK == WPDocument::parse(&input, &collector, aUtf8Passwd.getLength() ? aUtf8Passwd.getStr() : 0)) + if (WPD_OK == WPDocument::parse(&input, &collector, aUtf8Passwd.isEmpty() ? 0 : aUtf8Passwd.getStr())) return sal_True; return sal_False; } @@ -236,7 +236,7 @@ throw( com::sun::star::uno::RuntimeException ) if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_WordPerfect_Document" ) ); - if (sTypeName.getLength()) + if (!sTypeName.isEmpty()) { if ( location == Descriptor.getLength() ) { diff --git a/writerperfect/source/wpgimp/WPGImportFilter.cxx b/writerperfect/source/wpgimp/WPGImportFilter.cxx index e338b86f467a..97948803e9de 100644 --- a/writerperfect/source/wpgimp/WPGImportFilter.cxx +++ b/writerperfect/source/wpgimp/WPGImportFilter.cxx @@ -169,7 +169,7 @@ throw( com::sun::star::uno::RuntimeException ) if (libwpg::WPGraphics::isSupported(&input)) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) ); - if (sTypeName.getLength()) + if (!sTypeName.isEmpty()) { if ( location == Descriptor.getLength() ) { diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx index 10daff676a5a..55aa72966de6 100644 --- a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx +++ b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx @@ -191,7 +191,7 @@ throw( com::sun::star::uno::RuntimeException ) if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD)) sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) ); - if (sTypeName.getLength()) + if (!sTypeName.isEmpty()) { if ( location == Descriptor.getLength() ) { -- cgit