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

Thorsten Behrens Thorsten.Behrens at CIB.de
Thu Jan 12 09:49:27 UTC 2017


 package/inc/ZipFile.hxx           |    2 +-
 package/source/zipapi/ZipFile.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e442b7666761b4e38de2e3eb2b1ed04f54b095a8
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Thu Jan 12 10:48:22 2017 +0100

    package: fixup SAL_CALL removal
    
    Change-Id: I3b688b660ef4374442b616cb5c8bb4cee9ef7cb7

diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index eac5f0b..9d1a6da 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -103,7 +103,7 @@ public:
     EntryHash& GetEntryHash() { return aEntries; }
 
     void setInputStream ( const css::uno::Reference < css::io::XInputStream >& xNewStream );
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData(
+    css::uno::Reference< css::io::XInputStream > getRawData(
             ZipEntry& rEntry,
             const ::rtl::Reference < EncryptionData > &rData,
             bool bDecrypt,
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index e27b911..08d862a 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -598,7 +598,7 @@ uno::Reference< XInputStream > ZipFile::getRawData( ZipEntry& rEntry,
     return createUnbufferedStream ( aMutexHolder, rEntry, rData, UNBUFF_STREAM_RAW, bIsEncrypted );
 }
 
-uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
+uno::Reference< XInputStream > ZipFile::getWrappedRawStream(
         ZipEntry& rEntry,
         const ::rtl::Reference< EncryptionData >& rData,
         const OUString& aMediaType,


More information about the Libreoffice-commits mailing list