diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-06 14:51:42 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-04-06 14:51:42 +0200 |
commit | 0c6ebe5d225d6a655f078977455cec6d0a3afa6e (patch) | |
tree | becc109d0f2684ebf50afc783e089b49dd469661 /package/source/zippackage/ZipPackageFolder.cxx | |
parent | 7545dbbf64e959cfb166556935946f442199e92b (diff) | |
parent | 8a01ee624318ac08800af89d988971114637a04e (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'package/source/zippackage/ZipPackageFolder.cxx')
-rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 48c51b42d364..5fabbab1e973 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -798,7 +798,7 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const ::rtl::OUString& aProper uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, uno::RuntimeException) { - if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + if ( PropertyName == "MediaType" ) { // TODO/LATER: activate when zip ucp is ready // if ( m_nFormat != embed::StorageFormats::PACKAGE ) @@ -806,9 +806,9 @@ uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const ::rtl::OUString& Pro return uno::makeAny ( sMediaType ); } - else if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Version" ) ) ) + else if ( PropertyName == "Version" ) return uno::makeAny( m_sVersion ); - else if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Size" ) ) ) + else if ( PropertyName == "Size" ) return uno::makeAny ( aEntry.nSize ); else throw UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); |