INTEGRATION: CWS aquavcl04 (1.2.48); FILE MERGED

2007/12/10 14:00:53 pl 1.2.48.1: #i77588# add user document path

4 files changed, 44 insertions, 15 deletions

diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index 963b513a047b..d07b888bc7c2 100644
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: macbackend.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ihi $ $Date: 2007-04-16 11:52:18 $
+ *  last change: $Author: ihi $ $Date: 2008-01-14 15:56:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -47,6 +47,9 @@
 #include <uno/current_context.hxx>
 #endif
 
+#define MACBE_INET_COMPONENT    "org.openoffice.Inet"
+#define MACBE_PATHS_COMPONENT   "org.openoffice.Office.Paths"
+
 MacOSXBackend::MacOSXBackend(const uno::Reference<uno::XComponentContext>& xContext)
         throw (backend::BackendAccessException) :
         ::cppu::WeakImplHelper2 < backend::XSingleLayerStratum, lang::XServiceInfo > (),
@@ -72,13 +75,19 @@ MacOSXBackend* MacOSXBackend::createInstance(const uno::Reference<uno::XComponen
 uno::Reference<backend::XLayer> SAL_CALL MacOSXBackend::getLayer(const rtl::OUString& aComponent, const rtl::OUString& /*aTimestamp*/)
     throw (backend::BackendAccessException, lang::IllegalArgumentException)
 {
-    if( aComponent.equals( getSupportedComponents()[0]) )
+    if( aComponent.equalsAscii( MACBE_INET_COMPONENT ) )
     {
         if( ! m_xSystemLayer.is() )
-            m_xSystemLayer = new MacOSXLayer(m_xContext);
+            m_xSystemLayer = new MacOSXLayer( m_xContext );
 
         return m_xSystemLayer;
     }
+    else if( aComponent.equalsAscii( MACBE_PATHS_COMPONENT ) )
+    {
+        if( ! m_xPathLayer.is() )
+            m_xPathLayer = new MacOSXPathLayer( m_xContext );
+        return m_xPathLayer;
+    }
 
     return uno::Reference<backend::XLayer>();
 }
@@ -150,8 +159,9 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(vo
 
 uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedComponents(void)
 {
-    uno::Sequence<rtl::OUString> aSupportedComponentList(1);
-    aSupportedComponentList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet" ));
+    uno::Sequence<rtl::OUString> aSupportedComponentList(2);
+    aSupportedComponentList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MACBE_INET_COMPONENT ) );
+    aSupportedComponentList[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MACBE_PATHS_COMPONENT ) );
 
     return aSupportedComponentList;
 }
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index b17306c27807..ea87e8bfe5bd 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: macbackend.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ihi $ $Date: 2007-04-16 11:52:45 $
+ *  last change: $Author: ihi $ $Date: 2008-01-14 15:56:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -134,6 +134,7 @@ private:
 
     uno::Reference<uno::XComponentContext> m_xContext;
     uno::Reference<backend::XLayer> m_xSystemLayer;
+    uno::Reference<backend::XLayer> m_xPathLayer;
 
 };
 
diff --git a/shell/source/backends/macbe/macbelayer.hxx b/shell/source/backends/macbe/macbelayer.hxx
index 2bc6df3365f9..cc191bc4af6a 100644
--- a/shell/source/backends/macbe/macbelayer.hxx
+++ b/shell/source/backends/macbe/macbelayer.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: macbelayer.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ihi $ $Date: 2007-04-16 11:54:02 $
+ *  last change: $Author: ihi $ $Date: 2008-01-14 15:57:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -90,7 +90,7 @@ public:
     MacOSXLayer(const uno::Reference<uno::XComponentContext>& xContext);
 
     /** Destructor */
-    ~MacOSXLayer(void) {}
+    virtual ~MacOSXLayer(void) {}
 
     // XLayer
     virtual void SAL_CALL readData(const uno::Reference<backend::XLayerHandler>& xHandler)
@@ -103,7 +103,7 @@ public:
     virtual rtl::OUString SAL_CALL getTimestamp(void)
         throw (uno::RuntimeException);
 
-private:
+protected:
 
     rtl::OUString m_aComponent;
 
@@ -111,4 +111,19 @@ private:
 
 };
 
+class MacOSXPathLayer : public MacOSXLayer
+{
+    public:
+    MacOSXPathLayer(const uno::Reference<uno::XComponentContext>& i_xContext) :
+        MacOSXLayer( i_xContext ) {}
+    virtual ~MacOSXPathLayer() {}
+
+    // XLayer
+    virtual void SAL_CALL readData(const uno::Reference<backend::XLayerHandler>& i_xHandler)
+        throw ( backend::MalformedDataException,
+                lang::NullPointerException,
+                lang::WrappedTargetException,
+                uno::RuntimeException);
+};
+
 #endif // _MACBELAYER_HXX_
diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk
index eaa25e91606c..f8c6230354a7 100644
--- a/shell/source/backends/macbe/makefile.mk
+++ b/shell/source/backends/macbe/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ihi $ $Date: 2007-04-16 11:54:20 $
+#   last change: $Author: ihi $ $Date: 2008-01-14 15:57:15 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -58,6 +58,9 @@ dummy:
 
 .ELSE
 
+OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
+CFLAGSCXX+=$(OBJCXXFLAGS)
+
 SLOFILES= \
     $(SLO)$/macbecdef.obj \
     $(SLO)$/macbackend.obj \
@@ -72,7 +75,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB) \
         $(CPPULIB) \
         $(SALLIB) \
-    -framework Carbon -framework SystemConfiguration
+    -framework Cocoa -framework SystemConfiguration
 
 SHL1VERSIONMAP=exports.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def