INTEGRATION: CWS cfglooseends (1.3.28); FILE MERGED

2004/11/04 10:24:06 jb 1.3.28.1: #i32495# Make resource backend use a different base-url (so a different entity)

2 files changed, 25 insertions, 5 deletions

diff --git a/configmgr/source/localbe/localsinglestratum.cxx b/configmgr/source/localbe/localsinglestratum.cxx
index 3b8a8033cdae..7fcba50e4bd9 100644
--- a/configmgr/source/localbe/localsinglestratum.cxx
+++ b/configmgr/source/localbe/localsinglestratum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: localsinglestratum.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-07-05 13:24:07 $
+ *  last change: $Author: obo $ $Date: 2004-11-15 13:36:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,6 +149,10 @@ void SAL_CALL LocalSingleStratumBase::initialize(
     //OSL_TRACE ( " Url is %s " ,rtl::OUStringToOString(mStrataDataUrl, RTL_TEXTENCODING_ASCII_US).getStr());
     //validate DefaultDataUrls
     bool bOptional = checkOptionalArg(mStrataDataUrl);
+
+    // get modified base for special layer implementations (e.g. resources)
+    this->adjustBaseURL(mStrataDataUrl);
+
     validateFileURL(mStrataDataUrl, *this);
     //NormalizeURL
     implEnsureAbsoluteURL(mStrataDataUrl);
@@ -162,6 +166,11 @@ void SAL_CALL LocalSingleStratumBase::initialize(
 
 //------------------------------------------------------------------------------
 
+void LocalSingleStratumBase::adjustBaseURL(rtl::OUString& )
+{
+}
+//------------------------------------------------------------------------------
+
 sal_Bool LocalSingleStratumBase::isMoreRecent(const rtl::OUString& aFileUrl,
                                               const rtl::OUString& aTimestamp) {
     rtl::OUString layerUrl ;
@@ -341,11 +350,18 @@ void LocalReadonlyStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
 }
 //------------------------------------------------------------------------------
 
+void LocalResourceStratum::adjustBaseURL(rtl::OUString& aBaseUrl)
+{
+    impl_getLayerResDirectory(aBaseUrl,aBaseUrl);
+}
+//------------------------------------------------------------------------------
+
 void LocalResourceStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
                                              rtl::OUString& aSubLayerUrl) const
 {
    aLayerUrl = OUString();
-   impl_getLayerResDirectory(getBaseUrl(),aSubLayerUrl);
+   aSubLayerUrl = getBaseUrl();
+   // impl_getLayerResDirectory(getBaseUrl(),aSubLayerUrl);
 }
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
diff --git a/configmgr/source/localbe/localsinglestratum.hxx b/configmgr/source/localbe/localsinglestratum.hxx
index ffda90a7d5fc..5f524c61e3c9 100644
--- a/configmgr/source/localbe/localsinglestratum.hxx
+++ b/configmgr/source/localbe/localsinglestratum.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: localsinglestratum.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-07-05 13:24:22 $
+ *  last change: $Author: obo $ $Date: 2004-11-15 13:36:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,6 +188,9 @@ class LocalSingleStratumBase : public SingleBackendBase {
         { return mStrataDataUrl; }
 
     protected:
+        /// Parses and adjusts the passed base URL
+        virtual void adjustBaseURL(rtl::OUString& aBaseURL);
+
         /**
           Retrieves the appropriate layer and sublayers base directories.
 
@@ -313,6 +316,7 @@ public:
                     uno::RuntimeException) ;
 
 private:
+    virtual void adjustBaseURL(rtl::OUString& aBaseURL);
     virtual void getLayerDirectories(rtl::OUString& aLayerUrl, rtl::OUString& aSubLayerUrl) const;
     virtual const ServiceImplementationInfo * getServiceInfoData() const;
 };