[Libreoffice-commits] core.git: package/source

[Stephan Bergmann]

 package/source/zippackage/ZipPackage.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 2d30d16e1314883fdd02f0dda0a1115799320299
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 11 10:05:41 2013 +0200

    -Werror,-Wunused-variable
    
    Change-Id: I682b5d72c1785e8d8cb9c8bb42d4a0bab6db263e

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 669a802..3f6a0f5 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1030,9 +1030,6 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq
 
 void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno::Sequence < PropertyValue > >& aManList )
 {
-    const OUString sFullPath ("FullPath");
-    const OUString sMediaType ("MediaType");
-
     ZipEntry* pEntry = new ZipEntry;
     ZipPackageBuffer *pBuffer = new ZipPackageBuffer( n_ConstBufferSize );
     uno::Reference< io::XOutputStream > xConTypeOutStream( *pBuffer, UNO_QUERY );
@@ -1055,7 +1052,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
     {
         OUString aPath;
         OUString aType;
-        OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name.equals( sMediaType ) && ( *aIter )[PKG_MNFST_FULLPATH].Name.equals( sFullPath ),
+        OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name == "MediaType" && ( *aIter )[PKG_MNFST_FULLPATH].Name == "FullPath",
                     "The mediatype sequence format is wrong!\n" );
         ( *aIter )[PKG_MNFST_MEDIATYPE].Value >>= aType;
         if ( !aType.isEmpty() )