summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-07 08:07:01 +0200
committerNoel Grandin <noel@peralex.com>2013-05-08 08:06:45 +0200
commitae0cb395d8e2b887054e5cfd4fc5525a94fab240 (patch)
tree447facca919631537422f8fae621a9efec1beb07 /package
parent782bbfc65666272497f9c36a9c59d8b32231aa06 (diff)
fdo#46808, Convert ZipFileAccess service to new style
Dropped XComponent from merged interface because noone is using it. Change-Id: Id22c49e63679f42d86f617a919fdfd7cea4d5381
Diffstat (limited to 'package')
-rw-r--r--package/inc/zipfileaccess.hxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 8b1fc0d962f7..e84d7aca86ed 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -20,7 +20,7 @@
#ifndef _ZIPFILEACCESS_HXX_
#define _ZIPFILEACCESS_HXX_
-#include <com/sun/star/packages/zip/XZipFileAccess.hpp>
+#include <com/sun/star/packages/zip/XZipFileAccess2.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -28,16 +28,15 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase4.hxx>
#include <mutexholder.hxx>
#include <ZipFile.hxx>
#include <HashMaps.hxx>
-class OZipFileAccess : public ::cppu::WeakImplHelper5<
- ::com::sun::star::packages::zip::XZipFileAccess,
- ::com::sun::star::container::XNameAccess,
+class OZipFileAccess : public ::cppu::WeakImplHelper4<
+ ::com::sun::star::packages::zip::XZipFileAccess2,
::com::sun::star::lang::XInitialization,
::com::sun::star::lang::XComponent,
::com::sun::star::lang::XServiceInfo >