Rename css::packages::ContentInfo to just ZipContentInfo.

And use std::unique_ptr not rtl::Reference.  This is not a UNO object
anyway...

Change-Id: If43da4f7e0f478b9ad8d62e5f43f04f035c31717
Reviewed-on: https://gerrit.libreoffice.org/32828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>

2 files changed, 5 insertions, 6 deletions

diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index f3d0c65a6bb7..e83a9483524f 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -23,6 +23,8 @@
 #include <rtl/ref.hxx>
 #include <unordered_map>
 
+#include <memory>
+
 struct eqFunc
 {
     bool operator()( const OUString &r1,
@@ -33,9 +35,7 @@ struct eqFunc
 };
 
 class ZipPackageFolder;
-namespace com { namespace sun { namespace star { namespace packages {
-class ContentInfo;
-} } } }
+struct ZipContentInfo;
 
 typedef std::unordered_map < OUString,
                         ZipPackageFolder *,
@@ -43,7 +43,7 @@ typedef std::unordered_map < OUString,
                         eqFunc > FolderHash;
 
 typedef std::unordered_map < OUString,
-                        rtl::Reference < css::packages::ContentInfo >,
+                        std::unique_ptr<ZipContentInfo>,
                         OUStringHash,
                         eqFunc > ContentHash;
 
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 916c82477d9d..1b0cee329853 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -59,8 +59,7 @@ public:
     void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
         throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-    css::packages::ContentInfo & doGetByName( const OUString& aName )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    ZipContentInfo& doGetByName( const OUString& aName );
 
     static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
     static css::uno::Sequence < sal_Int8 > static_getImplementationId();