1 files changed, 11 insertions, 10 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index cd521b2ed892..f8882650fc12 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -110,23 +110,24 @@ public:
 
     // Iteration.
 
-    struct iterator_Impl;
-
     class iterator
     {
     friend class HierarchyEntry;
 
-        std::unique_ptr<iterator_Impl>  m_pImpl;
-
     public:
-        iterator();
-        ~iterator();
-
-        const HierarchyEntryData& operator*() const;
+        iterator() : pos( -1 /* before first */ ) {};
+
+        const HierarchyEntryData& operator*();
+    private:
+        HierarchyEntryData                                     entry;
+        css::uno::Reference< css::container::XHierarchicalNameAccess >   dir;
+        css::uno::Reference< css::util::XOfficeInstallationDirectories > officeDirs;
+        css::uno::Sequence< OUString>                          names;
+        sal_Int32                                              pos;
     };
 
-    bool first( iterator const & it );
-    bool next ( iterator const & it );
+    bool first( iterator& it );
+    bool next ( iterator& it );
 };
 
 } // namespace hierarchy_ucp