From 985fde0fa91498cf165d482ed306740adfb9a5e8 Mon Sep 17 00:00:00 2001
From: Joachim Lingner <jl@openoffice.org>
Date: Wed, 29 Sep 2010 09:11:20 +0200
Subject: jl160 #i114794# registration data folder of bundled extensions in the
 user installation references PREREG registration data in
 brand/share/prereg/bundled folder

---
 .../source/deployment/manager/dp_extensionmanager.hxx   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'desktop/source/deployment/manager/dp_extensionmanager.hxx')

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 64cada7da3ac..b3570e311828 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -205,6 +205,12 @@ public:
                css::lang::IllegalArgumentException,
                css::uno::RuntimeException);
 
+    virtual void SAL_CALL synchronizeBundledPrereg(
+        css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
+        throw (css::deployment::DeploymentException,
+               css::uno::RuntimeException);
+
     virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
     getExtensionsWithUnacceptedLicenses(
         ::rtl::OUString const & repository,
@@ -229,11 +235,7 @@ private:
     };
 
     css::uno::Reference< css::uno::XComponentContext> m_xContext;
-
-    css::uno::Reference<css::deployment::XPackageManager> m_userRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_sharedRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_bundledRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_tmpRepository;
+    css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory;
 
     /* contains the names of all repositories (except tmp) in order of there
        priority. That is, the first element is "user" follod by "shared" and
@@ -241,6 +243,11 @@ private:
      */
     ::std::list< ::rtl::OUString > m_repositoryNames;
 
+    css::uno::Reference<css::deployment::XPackageManager> getUserRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getBundledRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getTmpRepository();
+
     bool isUserDisabled(::rtl::OUString const & identifier,
                         ::rtl::OUString const & filename);
 
-- 
cgit v1.2.3