summaryrefslogtreecommitdiff
path: root/writerperfect
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 19:49:53 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 20:03:42 +0200
commitd6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (patch)
treeb5a12df1fcae025715633469b75ab4c9b6f6d279 /writerperfect
parent0e1c0587617e0a6e4295a13599e97cdf6d1d2ea9 (diff)
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Diffstat (limited to 'writerperfect')
-rw-r--r--writerperfect/source/cdrimp/CDRImportFilter.cxx13
-rw-r--r--writerperfect/source/vsdimp/VisioImportFilter.cxx13
-rw-r--r--writerperfect/source/wpdimp/WordPerfectImportFilter.cxx17
-rw-r--r--writerperfect/source/wpgimp/WPGImportFilter.cxx13
-rw-r--r--writerperfect/source/wpsimp/MSWorksImportFilter.cxx15
5 files changed, 33 insertions, 38 deletions
diff --git a/writerperfect/source/cdrimp/CDRImportFilter.cxx b/writerperfect/source/cdrimp/CDRImportFilter.cxx
index 8e17102b157f..91876898b974 100644
--- a/writerperfect/source/cdrimp/CDRImportFilter.cxx
+++ b/writerperfect/source/cdrimp/CDRImportFilter.cxx
@@ -92,9 +92,9 @@ throw (RuntimeException)
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
@@ -157,9 +157,9 @@ throw( com::sun::star::uno::RuntimeException )
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+ if ( pValue[i].Name == "TypeName" )
location=i;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
}
@@ -197,7 +197,7 @@ throw (Exception, RuntimeException)
nLength = aAnySeq.getLength();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
break;
@@ -222,8 +222,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "CDRImportFilter_supportsService" << std::endl;
#endif
- return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
}
Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames( )
throw (RuntimeException)
diff --git a/writerperfect/source/vsdimp/VisioImportFilter.cxx b/writerperfect/source/vsdimp/VisioImportFilter.cxx
index b731769a1a66..c06076c0ea16 100644
--- a/writerperfect/source/vsdimp/VisioImportFilter.cxx
+++ b/writerperfect/source/vsdimp/VisioImportFilter.cxx
@@ -92,9 +92,9 @@ throw (RuntimeException)
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
@@ -157,9 +157,9 @@ throw( com::sun::star::uno::RuntimeException )
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+ if ( pValue[i].Name == "TypeName" )
location=i;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
}
@@ -197,7 +197,7 @@ throw (Exception, RuntimeException)
nLength = aAnySeq.getLength();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
break;
@@ -222,8 +222,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "VisioImportFilter_supportsService" << std::endl;
#endif
- return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
}
Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames( )
throw (RuntimeException)
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
index 26226ff2d1fa..a82338f6727e 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
@@ -108,9 +108,9 @@ throw (RuntimeException)
uno::Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
@@ -201,11 +201,11 @@ throw( com::sun::star::uno::RuntimeException )
uno::Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+ if ( pValue[i].Name == "TypeName" )
location=i;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
@@ -264,7 +264,7 @@ throw (Exception, RuntimeException)
nLength = aAnySeq.getLength();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
break;
@@ -283,8 +283,7 @@ throw (RuntimeException)
sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString &ServiceName )
throw (RuntimeException)
{
- return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
}
Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames( )
throw (RuntimeException)
@@ -424,7 +423,7 @@ throw (RuntimeException)
sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const OUString &ServiceName )
throw (RuntimeException)
{
- return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) );
+ return ( ServiceName == SERVICE_NAME );
}
Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames( )
diff --git a/writerperfect/source/wpgimp/WPGImportFilter.cxx b/writerperfect/source/wpgimp/WPGImportFilter.cxx
index 478879e04285..5ce55996141f 100644
--- a/writerperfect/source/wpgimp/WPGImportFilter.cxx
+++ b/writerperfect/source/wpgimp/WPGImportFilter.cxx
@@ -91,9 +91,9 @@ throw (RuntimeException)
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
@@ -156,9 +156,9 @@ throw( com::sun::star::uno::RuntimeException )
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+ if ( pValue[i].Name == "TypeName" )
location=i;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
}
@@ -196,7 +196,7 @@ throw (Exception, RuntimeException)
nLength = aAnySeq.getLength();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
break;
@@ -221,8 +221,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "WPGImportFilter_supportsService" << std::endl;
#endif
- return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
}
Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames( )
throw (RuntimeException)
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
index 55aa72966de6..cb9b0561e05c 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
@@ -87,9 +87,9 @@ throw (RuntimeException)
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
@@ -156,11 +156,11 @@ throw( com::sun::star::uno::RuntimeException )
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
+ if ( pValue[i].Name == "TypeName" )
location=i;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
+ else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
- else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
+ else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
@@ -219,7 +219,7 @@ throw (Exception, RuntimeException)
nLength = aAnySeq.getLength();
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
+ if ( pValue[i].Name == "Type" )
{
pValue[i].Value >>= msFilterName;
break;
@@ -238,8 +238,7 @@ throw (RuntimeException)
sal_Bool SAL_CALL MSWorksImportFilter_supportsService( const OUString &ServiceName )
throw (RuntimeException)
{
- return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
- ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
+ return ( ServiceName == SERVICE_NAME1 || ServiceName == SERVICE_NAME2 );
}
Sequence< OUString > SAL_CALL MSWorksImportFilter_getSupportedServiceNames( )
throw (RuntimeException)