#89829# updated and reactivated

5 files changed, 192 insertions, 334 deletions

diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index b0149d4b95f1..7b5dbab1a759 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: clipboardmanager.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mh $ $Date: 2001-01-31 15:36:59 $
+ *  last change: $Author: obr $ $Date: 2001-07-27 10:03:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,28 +72,29 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 using namespace std;
 
+using ::dtrans::ClipboardManager;
+using ::rtl::OUString;
 
 // ------------------------------------------------------------------------
 
-OClipboardManager::OClipboardManager():
+ClipboardManager::ClipboardManager():
     m_aMutex(),
     WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
-    m_defaultName(OUString::createFromAscii("default"))
+    m_aDefaultName(OUString::createFromAscii("default"))
 {
 }
 
 // ------------------------------------------------------------------------
 
-OClipboardManager::~OClipboardManager()
+ClipboardManager::~ClipboardManager()
 {
 }
 
 // ------------------------------------------------------------------------
 
-OUString SAL_CALL OClipboardManager::getImplementationName(  )
+OUString SAL_CALL ClipboardManager::getImplementationName(  )
     throw(RuntimeException)
 {
     return OUString::createFromAscii(CLIPBOARDMANAGER_IMPLEMENTATION_NAME);
@@ -101,7 +102,7 @@ OUString SAL_CALL OClipboardManager::getImplementationName(  )
 
 // ------------------------------------------------------------------------
 
-sal_Bool SAL_CALL OClipboardManager::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName )
     throw(RuntimeException)
 {
     Sequence < OUString > SupportedServicesNames = ClipboardManager_getSupportedServiceNames();
@@ -115,7 +116,7 @@ sal_Bool SAL_CALL OClipboardManager::supportsService( const OUString& ServiceNam
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL OClipboardManager::getSupportedServiceNames(  )
+Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  )
     throw(RuntimeException)
 {
     return ClipboardManager_getSupportedServiceNames();
@@ -123,7 +124,7 @@ Sequence< OUString > SAL_CALL OClipboardManager::getSupportedServiceNames(  )
 
 // ------------------------------------------------------------------------
 
-Reference< XClipboard > SAL_CALL OClipboardManager::getClipboard( const OUString& aName )
+Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName )
     throw(NoSuchElementException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -134,7 +135,7 @@ Reference< XClipboard > SAL_CALL OClipboardManager::getClipboard( const OUString
                                 static_cast < XClipboardManager * > (this));
 
     ClipboardMap::iterator iter =
-        m_aClipboardMap.find(aName.getLength() ? aName : m_defaultName);
+        m_aClipboardMap.find(aName.getLength() ? aName : m_aDefaultName);
 
     if (iter != m_aClipboardMap.end())
         return iter->second;
@@ -144,7 +145,7 @@ Reference< XClipboard > SAL_CALL OClipboardManager::getClipboard( const OUString
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard )
+void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard )
     throw(IllegalArgumentException, ElementExistException, RuntimeException)
 {
     OSL_ASSERT(xClipboard.is());
@@ -156,7 +157,7 @@ void SAL_CALL OClipboardManager::addClipboard( const Reference< XClipboard >& xC
 
     // the name "default" is reserved for internal use
     OUString aName = xClipboard->getName();
-    if (m_defaultName.compareTo(aName) == 0)
+    if (m_aDefaultName.compareTo(aName) == 0)
         throw IllegalArgumentException(OUString::createFromAscii("name reserved"),
                                        static_cast < XClipboardManager * > (this), 1);
 
@@ -165,7 +166,7 @@ void SAL_CALL OClipboardManager::addClipboard( const Reference< XClipboard >& xC
     if (!rBHelper.bDisposed && !rBHelper.bInDispose)
     {
         pair< const OUString, Reference< XClipboard > > value (
-            aName.getLength() ? aName : m_defaultName,
+            aName.getLength() ? aName : m_aDefaultName,
             xClipboard );
 
         pair< ClipboardMap::iterator, bool > p = m_aClipboardMap.insert(value);
@@ -184,17 +185,17 @@ void SAL_CALL OClipboardManager::addClipboard( const Reference< XClipboard >& xC
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboardManager::removeClipboard( const OUString& aName )
+void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
      throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     if (!rBHelper.bDisposed)
-        m_aClipboardMap.erase(aName.getLength() ? aName : m_defaultName );
+        m_aClipboardMap.erase(aName.getLength() ? aName : m_aDefaultName );
 }
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL OClipboardManager::listClipboardNames()
+Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
     throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -218,7 +219,7 @@ Sequence< OUString > SAL_CALL OClipboardManager::listClipboardNames()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboardManager::dispose()
+void SAL_CALL ClipboardManager::dispose()
     throw(RuntimeException)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
@@ -267,7 +268,7 @@ void SAL_CALL OClipboardManager::dispose()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL  OClipboardManager::disposing( const EventObject& event )
+void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
     throw(RuntimeException)
 {
     Reference < XClipboard > xClipboard(event.Source, UNO_QUERY);
@@ -281,7 +282,7 @@ void SAL_CALL  OClipboardManager::disposing( const EventObject& event )
 Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
     const Reference< XMultiServiceFactory > & xMultiServiceFactory)
 {
-    return Reference < XInterface >( ( OWeakObject * ) new OClipboardManager());
+    return Reference < XInterface >( ( OWeakObject * ) new ClipboardManager());
 }
 
 // ------------------------------------------------------------------------
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index f711619fb837..2fa6250b3b45 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: clipboardmanager.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 12:08:30 $
+ *  last change: $Author: obr $ $Date: 2001-07-27 10:03:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,68 +86,73 @@ typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::su
 
 // ------------------------------------------------------------------------
 
-class OClipboardManager : public ::cppu::WeakComponentImplHelper3 < \
-::com::sun::star::datatransfer::clipboard::XClipboardManager, \
-::com::sun::star::lang::XEventListener, \
-::com::sun::star::lang::XServiceInfo >
+namespace dtrans
 {
-    ClipboardMap m_aClipboardMap;
-    ::osl::Mutex m_aMutex;
 
-    const ::rtl::OUString m_defaultName;
+    class ClipboardManager : public ::cppu::WeakComponentImplHelper3 < \
+    ::com::sun::star::datatransfer::clipboard::XClipboardManager, \
+    ::com::sun::star::lang::XEventListener, \
+    ::com::sun::star::lang::XServiceInfo >
+    {
+        ClipboardMap m_aClipboardMap;
+        ::osl::Mutex m_aMutex;
 
-    virtual ~OClipboardManager();
+        const ::rtl::OUString m_aDefaultName;
 
-public:
+        virtual ~ClipboardManager();
 
-    OClipboardManager();
+    public:
 
-    /*
-     * XServiceInfo
-     */
+        ClipboardManager();
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XServiceInfo
+         */
 
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    /*
-     * XComponent
-     */
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL dispose()
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XComponent
+         */
 
-    /*
-     * XEventListener
-     */
+        virtual void SAL_CALL dispose()
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XEventListener
+         */
 
-    /*
-     * XClipboardManager
-     */
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& aName )
-        throw(::com::sun::star::container::NoSuchElementException,
-              ::com::sun::star::uno::RuntimeException);
+        /*
+         * XClipboardManager
+         */
 
-    virtual void SAL_CALL addClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::container::ElementExistException,
-              ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& aName )
+            throw(::com::sun::star::container::NoSuchElementException,
+                  ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL removeClipboard( const ::rtl::OUString& aName )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard )
+            throw(::com::sun::star::lang::IllegalArgumentException,
+                  ::com::sun::star::container::ElementExistException,
+                  ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL listClipboardNames(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeClipboard( const ::rtl::OUString& aName )
+            throw(::com::sun::star::uno::RuntimeException);
 
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL listClipboardNames(  )
+            throw(::com::sun::star::uno::RuntimeException);
+
+
+    };
 
 };
 
@@ -157,74 +162,4 @@ public:
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
-
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dtrans/source/generic/dtrans.xml b/dtrans/source/generic/dtrans.xml
index b42b29fdf992..2540df20b192 100644
--- a/dtrans/source/generic/dtrans.xml
+++ b/dtrans/source/generic/dtrans.xml
@@ -1,58 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Oliver Braun </Author>
-
-<Name>  com.sun.star.comp.datatransfer.generic </Name>
-
-<Description>
-    This component covers
-    the generic part of data transfer concept.
-</Description>
-
-<ModuleName>    dtrans  </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="experimental"/>
-
-<SupportedService>  com.sun.star.datatransfer.clipboard.ClipboardManager    </SupportedService>
-<SupportedService>  com.sun.star.datatransfer.clipboard.GenericClipboard    </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal     </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.datatransfer.clipboard.RenderingCapabilities  </Type>
-<Type>   com.sun.star.datatransfer.clipboard.XClipboardEx       </Type>
-<Type>   com.sun.star.datatransfer.clipboard.XClipboardManager      </Type>
-<Type>   com.sun.star.datatransfer.clipboard.XClipboardNotifier     </Type>
-<Type>   com.sun.star.datatransfer.XTransferableEx          </Type>
-<Type>   com.sun.star.datatransfer.XTransferableSource          </Type>
-<Type>   com.sun.star.io.XOutputStream                      </Type>
-<Type>   com.sun.star.lang.DisposedException                    </Type>
-<Type>   com.sun.star.lang.IllegalArgumentException             </Type>
-<Type>   com.sun.star.lang.XComponent                           </Type>
-<Type>   com.sun.star.lang.XInitialization                  </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory                 </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                </Type>
-<Type>   com.sun.star.lang.XServiceInfo                         </Type>
-<Type>   com.sun.star.lang.XTypeProvider                        </Type>
-<Type>   com.sun.star.registry.XRegistryKey                     </Type>
-<Type>   com.sun.star.uno.TypeClass                             </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
+
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name> dtrans </module-name>
+    <component-description>
+        <author> Oliver Braun </author>
+        <name> com.sun.star.comp.datatransfer.generic </name>
+        <description> This module includes a generic clipboard implementation </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="beta"/>
+        <supported-service> com.sun.star.datatransfer.clipboard.GenericClipboard </supported-service>
+        <supported-service> com.sun.star.datatransfer.clipboard.ClipboardManager </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type> com.sun.star.datatransfer.clipboard.RenderingCapabilities </type>
+        <type> com.sun.star.datatransfer.clipboard.XClipboardEx </type>
+        <type> com.sun.star.datatransfer.clipboard.XClipboardManager </type>
+        <type> com.sun.star.datatransfer.clipboard.XClipboardNotifier </type>
+        <type> com.sun.star.datatransfer.XTransferableEx </type>
+        <type> com.sun.star.datatransfer.XTransferableSource </type>
+        <type> com.sun.star.io.XOutputStream </type>
+        <type> com.sun.star.lang.DisposedException </type>
+        <type> com.sun.star.lang.IllegalArgumentException </type>
+        <type> com.sun.star.lang.XComponent </type>
+        <type> com.sun.star.lang.XInitialization </type>
+        <type> com.sun.star.lang.XMultiServiceFactory </type>
+        <type> com.sun.star.lang.XSingleServiceFactory </type>
+        <type> com.sun.star.lang.XServiceInfo </type>
+        <type> com.sun.star.lang.XTypeProvider </type>
+        <type> com.sun.star.registry.XRegistryKey </type>
+        <type> com.sun.star.uno.TypeClass </type>
+        <type> com.sun.star.uno.XWeak </type>
+        <type> com.sun.star.uno.XAggregation </type>
+    </component-description>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index 73b386309a14..c6ded6c468de 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: generic_clipboard.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-22 14:26:15 $
+ *  last change: $Author: obr $ $Date: 2001-07-27 10:03:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,11 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 
-OClipboard::OClipboard() :
+using ::dtrans::GenericClipboard;
+using ::rtl::OUString;
+
+GenericClipboard::GenericClipboard() :
     m_aMutex(),
     WeakComponentImplHelper4< XClipboardEx, XClipboardNotifier, XServiceInfo, XInitialization > (m_aMutex),
     m_bInitialized(sal_False)
@@ -86,7 +88,7 @@ OClipboard::OClipboard() :
 
 // ------------------------------------------------------------------------
 
-OClipboard::OClipboard(const ::rtl::OUString& rName) :
+GenericClipboard::GenericClipboard(const ::rtl::OUString& rName) :
     m_aMutex(),
     WeakComponentImplHelper4< XClipboardEx, XClipboardNotifier, XServiceInfo, XInitialization > (m_aMutex),
     m_aName(rName),
@@ -96,13 +98,13 @@ OClipboard::OClipboard(const ::rtl::OUString& rName) :
 
 // ------------------------------------------------------------------------
 
-OClipboard::~OClipboard()
+GenericClipboard::~GenericClipboard()
 {
 }
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboard::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
     throw(Exception, RuntimeException)
 {
     if (!m_bInitialized)
@@ -118,7 +120,7 @@ void SAL_CALL OClipboard::initialize( const Sequence< Any >& aArguments )
 
 // ------------------------------------------------------------------------
 
-OUString SAL_CALL OClipboard::getImplementationName(  )
+OUString SAL_CALL GenericClipboard::getImplementationName(  )
     throw(RuntimeException)
 {
     return OUString::createFromAscii(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME);
@@ -126,7 +128,7 @@ OUString SAL_CALL OClipboard::getImplementationName(  )
 
 // ------------------------------------------------------------------------
 
-sal_Bool SAL_CALL OClipboard::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName )
     throw(RuntimeException)
 {
     Sequence < OUString > SupportedServicesNames = GenericClipboard_getSupportedServiceNames();
@@ -140,7 +142,7 @@ sal_Bool SAL_CALL OClipboard::supportsService( const OUString& ServiceName )
 
 // ------------------------------------------------------------------------
 
-Sequence< OUString > SAL_CALL OClipboard::getSupportedServiceNames(  )
+Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(    )
     throw(RuntimeException)
 {
     return GenericClipboard_getSupportedServiceNames();
@@ -148,7 +150,7 @@ Sequence< OUString > SAL_CALL OClipboard::getSupportedServiceNames(  )
 
 // ------------------------------------------------------------------------
 
-Reference< XTransferable > SAL_CALL OClipboard::getContents()
+Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
     throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -157,7 +159,7 @@ Reference< XTransferable > SAL_CALL OClipboard::getContents()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboard::setContents(const Reference< XTransferable >& xTrans,
+void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans,
                                       const Reference< XClipboardOwner >& xClipboardOwner )
     throw(RuntimeException)
 {
@@ -195,7 +197,7 @@ void SAL_CALL OClipboard::setContents(const Reference< XTransferable >& xTrans,
 
 // ------------------------------------------------------------------------
 
-OUString SAL_CALL OClipboard::getName()
+OUString SAL_CALL GenericClipboard::getName()
     throw(RuntimeException)
 {
     return m_aName;
@@ -203,7 +205,7 @@ OUString SAL_CALL OClipboard::getName()
 
 // ------------------------------------------------------------------------
 
-sal_Int8 SAL_CALL OClipboard::getRenderingCapabilities()
+sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities()
     throw(RuntimeException)
 {
     return RenderingCapabilities::Delayed;
@@ -212,7 +214,7 @@ sal_Int8 SAL_CALL OClipboard::getRenderingCapabilities()
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
+void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
     throw(RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -224,7 +226,7 @@ void SAL_CALL OClipboard::addClipboardListener( const Reference< XClipboardListe
 
 // ------------------------------------------------------------------------
 
-void SAL_CALL OClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
+void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
     throw(RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
@@ -247,5 +249,5 @@ Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
 Reference< XInterface > SAL_CALL GenericClipboard_createInstance(
     const Reference< XMultiServiceFactory > & xMultiServiceFactory)
 {
-    return Reference < XInterface >( ( OWeakObject * ) new OClipboard());
+    return Reference < XInterface >( ( OWeakObject * ) new GenericClipboard());
 }
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index 6e56f305ddf4..cee67353a2e2 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: generic_clipboard.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mh $ $Date: 2001-01-31 15:37:00 $
+ *  last change: $Author: obr $ $Date: 2001-07-27 10:03:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,83 +84,88 @@
 
 // ------------------------------------------------------------------------
 
-#define GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.comp.datatransfer.GenericClipboard"
+#define GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.comp.datatransfer.clipboard.GenericClipboard"
 
 // ------------------------------------------------------------------------
 
-class OClipboard : public ::cppu::WeakComponentImplHelper4 < \
-::com::sun::star::datatransfer::clipboard::XClipboardEx, \
-::com::sun::star::datatransfer::clipboard::XClipboardNotifier, \
-::com::sun::star::lang::XServiceInfo, \
-::com::sun::star::lang::XInitialization >
+namespace dtrans
 {
-    ::osl::Mutex m_aMutex;
-    ::rtl::OUString m_aName;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents;
-    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner;
+    class GenericClipboard : public ::cppu::WeakComponentImplHelper4 < \
+    ::com::sun::star::datatransfer::clipboard::XClipboardEx, \
+    ::com::sun::star::datatransfer::clipboard::XClipboardNotifier, \
+    ::com::sun::star::lang::XServiceInfo, \
+    ::com::sun::star::lang::XInitialization >
+    {
+        ::osl::Mutex m_aMutex;
+        ::rtl::OUString m_aName;
 
-    sal_Bool m_bInitialized;
-    virtual ~OClipboard();
+        ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents;
+        ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner;
 
-public:
+        sal_Bool m_bInitialized;
+        virtual ~GenericClipboard();
 
-    OClipboard(const ::rtl::OUString& rName);
-    OClipboard();
+    public:
 
-    /*
-     * XInitialization
-     */
+        GenericClipboard(const ::rtl::OUString& rName);
+        GenericClipboard();
 
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-        throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+        /*
+         * XInitialization
+         */
 
-    /*
-     * XServiceInfo
-     */
+        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+            throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XServiceInfo
+         */
 
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    /*
-     * XClipboard
-     */
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XClipboard
+         */
 
-    virtual void SAL_CALL setContents(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getName()
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setContents(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
+            throw(::com::sun::star::uno::RuntimeException);
 
-    /*
-     * XClipboardEx
-     */
+        virtual ::rtl::OUString SAL_CALL getName()
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XClipboardEx
+         */
 
-    /*
-     * XClipboardNotifier
-     */
+        virtual sal_Int8 SAL_CALL getRenderingCapabilities()
+            throw(::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL addClipboardListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(::com::sun::star::uno::RuntimeException);
+        /*
+         * XClipboardNotifier
+         */
 
-    virtual void SAL_CALL removeClipboardListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addClipboardListener(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+            throw(::com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL removeClipboardListener(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
+            throw(::com::sun::star::uno::RuntimeException);
+
+    };
 
 };
 
@@ -171,72 +176,3 @@ public:
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-