sb111: merged in DEV300_m71

4 files changed, 276 insertions, 197 deletions

diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 03cfa0bc8290..fde86609e850 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.hxx
@@ -60,6 +60,7 @@ namespace com { namespace sun { namespace star { namespace ucb {
     class XContentIdentifier;
     class XDynamicResultSet;
     class XAnyCompareFactory;
+    struct ContentInfo;
     struct NumberedSortingInfo;
 } } } }
 
@@ -70,7 +71,7 @@ namespace ucbhelper
 
 /**
   * These are the possible values for the parameter eMode of method
-  * ucb::Content::createCursor.
+  * ucbhelper::Content::createCursor.
   */
 enum ResultSetInclude
 {
@@ -81,7 +82,7 @@ enum ResultSetInclude
 
 /**
   * These are the possible values for the parameter eOperation of method
-  * ucb::Content::insertNewContent.
+  * ucbhelper::Content::insertNewContent.
   */
 enum InsertOperation
 {
@@ -106,14 +107,14 @@ class UCBHELPER_DLLPUBLIC Content
 protected:
     ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
                                                 rtl::OUString >& rPropertyNames,
-                                                  ResultSetInclude eMode )
+                                                ResultSetInclude eMode )
             throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
 
     ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
                                                 sal_Int32 >& rPropertyHandles,
-                                                  ResultSetInclude eMode )
+                                                ResultSetInclude eMode )
             throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -148,7 +149,7 @@ public:
       *        errors.
       */
     Content( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContentIdentifier >& rId,
+                    ::com::sun::star::ucb::XContentIdentifier >& rId,
              const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv )
         throw ( ::com::sun::star::ucb::ContentCreationException,
@@ -163,7 +164,7 @@ public:
       *        errors.
       */
     Content( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContent >& rContent,
+                    ::com::sun::star::ucb::XContent >& rContent,
              const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv )
         throw ( ::com::sun::star::ucb::ContentCreationException,
@@ -221,7 +222,7 @@ public:
       */
     static sal_Bool
     create( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContentIdentifier >& rId,
+                    ::com::sun::star::ucb::XContentIdentifier >& rId,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
             Content& rContent );
@@ -241,7 +242,7 @@ public:
       */
     static sal_Bool
     create( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContent >& xContent,
+                    ::com::sun::star::ucb::XContent >& xContent,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
             Content& rContent );
@@ -501,7 +502,7 @@ public:
     setPropertyValues( const ::com::sun::star::uno::Sequence<
                                 rtl::OUString >& rPropertyNames,
                        const ::com::sun::star::uno::Sequence<
-                                   ::com::sun::star::uno::Any >& rValues )
+                                    ::com::sun::star::uno::Any >& rValues )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -539,7 +540,7 @@ public:
     setPropertyValues( const ::com::sun::star::uno::Sequence<
                                 sal_Int32 >& nPropertyHandles,
                        const ::com::sun::star::uno::Sequence<
-                                   ::com::sun::star::uno::Any >& rValues )
+                                    ::com::sun::star::uno::Any >& rValues )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -655,8 +656,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet >
     createDynamicCursor( const ::com::sun::star::uno::Sequence<
                          rtl::OUString >& rPropertyNames,
-                           ResultSetInclude eMode
-                             = INCLUDE_FOLDERS_AND_DOCUMENTS )
+                         ResultSetInclude eMode
+                            = INCLUDE_FOLDERS_AND_DOCUMENTS )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -678,8 +679,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet >
     createDynamicCursor( const ::com::sun::star::uno::Sequence<
                          sal_Int32 >& rPropertyHandles,
-                           ResultSetInclude eMode
-                             = INCLUDE_FOLDERS_AND_DOCUMENTS )
+                         ResultSetInclude eMode
+                            = INCLUDE_FOLDERS_AND_DOCUMENTS )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -821,16 +822,31 @@ public:
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
+
+    /**
+      * This method returns the different types of contents this content
+      * can create.
+      *
+      * @return the content types or an empty sequence if no contents can be
+      *         created by this content.
+      */
+    ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::ContentInfo >
+    queryCreatableContentsInfo()
+        throw( ::com::sun::star::ucb::CommandAbortedException,
+               ::com::sun::star::uno::RuntimeException,
+               ::com::sun::star::uno::Exception );
+
     /**
       * This method creates, initializes and inserts ( commits ) a new content
       * (i.e. it could be used to create a new file system folder).
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param rPropertyNames is a sequence of names of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -846,9 +862,9 @@ public:
     sal_Bool
     insertNewContent( const ::rtl::OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
-                          rtl::OUString >& rPropertyNames,
+                        rtl::OUString >& rPropertyNames,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       Content& rNewContent )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -856,13 +872,14 @@ public:
     /**
       * This method creates, initializes and inserts ( commits ) a new content
       * (i.e. it could be used to create a new file system folder).
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param nPropertyHandes is a sequence of handles of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -880,7 +897,7 @@ public:
                       const ::com::sun::star::uno::Sequence<
                         sal_Int32 >& nPropertyHandles,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       Content& rNewContent )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -888,14 +905,15 @@ public:
     /**
       * This method creates, initializes and inserts (commits) a new content
       * inside this (the target folder) content. For example, it can be used to
-      * create a new file system folder.
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * create a new file system file.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param rPropertyNames is a sequence of names of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -913,9 +931,9 @@ public:
     sal_Bool
     insertNewContent( const ::rtl::OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
-                          rtl::OUString >& rPropertyNames,
+                        rtl::OUString >& rPropertyNames,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::io::XInputStream >& rStream,
                       Content& rNewContent )
@@ -925,14 +943,15 @@ public:
     /**
       * This method creates, initializes and inserts (commits) a new content
       * inside this (the target folder) content. For example, it can be used to
-      * create a new file system folder.
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * create a new file system file.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param nPropertyHandes is a sequence of handles of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -952,7 +971,7 @@ public:
                       const ::com::sun::star::uno::Sequence<
                         sal_Int32 >& nPropertyHandles,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::io::XInputStream >& rStream,
                       Content& rNewContent )
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 4a620b4b4074..5307fa659d72 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -73,9 +73,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/activedatasink.hxx>
 #include <ucbhelper/activedatastreamer.hxx>
-#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX
 #include <ucbhelper/interactionrequest.hxx>
-#endif
 #include <ucbhelper/cancelcommandexecution.hxx>
 
 using namespace com::sun::star::container;
@@ -149,7 +147,7 @@ void EmptyInputStream::closeInput()
 //=========================================================================
 
 class ContentEventListener_Impl : public cppu::OWeakObject,
-                                     public XContentEventListener
+                                      public XContentEventListener
 {
     Content_Impl& m_rContent;
 
@@ -157,7 +155,7 @@ public:
     ContentEventListener_Impl( Content_Impl& rContent )
     : m_rContent( rContent ) {}
 
-     // XInterface
+    // XInterface
     XINTERFACE_DECL()
 
     // XContentEventListener
@@ -184,8 +182,8 @@ friend class ContentEventListener_Impl;
     mutable rtl::OUString               m_aURL;
     Reference< XMultiServiceFactory >   m_xSMgr;
     Reference< XContent >               m_xContent;
-    Reference< XCommandProcessor >      m_xCommandProcessor;
-      Reference< XCommandEnvironment >      m_xEnv;
+    Reference< XCommandProcessor >          m_xCommandProcessor;
+    Reference< XCommandEnvironment >    m_xEnv;
     Reference< XContentEventListener >  m_xContentEventListener;
     mutable osl::Mutex                  m_aMutex;
     sal_Int32                           m_nCommandId;
@@ -210,6 +208,7 @@ public:
 
     Any  executeCommand( const Command& rCommand );
     void abortCommand();
+
     inline const Reference< XCommandEnvironment >& getEnvironment() const;
     inline void setEnvironment(
                         const Reference< XCommandEnvironment >& xNewEnv );
@@ -589,7 +588,7 @@ Any Content::getPropertyValue( sal_Int32 nPropertyHandle )
 
 //=========================================================================
 Any Content::setPropertyValue( const rtl::OUString& rName,
-                                  const Any& rValue )
+                                const Any& rValue )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Sequence< rtl::OUString > aNames( 1 );
@@ -604,7 +603,7 @@ Any Content::setPropertyValue( const rtl::OUString& rName,
 
 //=========================================================================
 Any Content::setPropertyValue( const sal_Int32 nPropertyHandle,
-                                  const Any& rValue )
+                                const Any& rValue )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Sequence< sal_Int32 > aHandles( 1 );
@@ -676,8 +675,8 @@ Reference< XRow > Content::getPropertyValuesInterface(
 
         rProp.Name       = pNames[ n ];
         rProp.Handle     = -1; // n/a
-//      rProp.Type       =
-//      rProp.Attributes = ;
+//        rProp.Type       =
+//        rProp.Attributes = ;
     }
 
     Command aCommand;
@@ -709,8 +708,8 @@ Reference< XRow > Content::getPropertyValuesInterface(
 
         rProp.Name       = rtl::OUString(); // n/a
         rProp.Handle     = pHandles[ n ];
-//      rProp.Type       =
-//      rProp.Attributes = ;
+//        rProp.Type       =
+//        rProp.Attributes = ;
     }
 
     Command aCommand;
@@ -728,7 +727,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
 //=========================================================================
 Sequence< Any > Content::setPropertyValues(
                             const Sequence< rtl::OUString >& rPropertyNames,
-                               const Sequence< Any >& rValues )
+                                const Sequence< Any >& rValues )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rPropertyNames.getLength() != rValues.getLength() )
@@ -758,7 +757,7 @@ Sequence< Any > Content::setPropertyValues(
         rProp.Name   = pNames[ n ];
         rProp.Handle = -1; // n/a
         rProp.Value  = pValues[ n ];
-//      rProp.State  = ;
+//        rProp.State  = ;
     }
 
     Command aCommand;
@@ -776,7 +775,7 @@ Sequence< Any > Content::setPropertyValues(
 //=========================================================================
 Sequence< Any > Content::setPropertyValues(
                             const Sequence< sal_Int32 >& nPropertyHandles,
-                               const Sequence< Any >& rValues )
+                                const Sequence< Any >& rValues )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( nPropertyHandles.getLength() != rValues.getLength() )
@@ -806,7 +805,7 @@ Sequence< Any > Content::setPropertyValues(
         rProp.Name   = rtl::OUString(); // n/a
         rProp.Handle = pHandles[ n ];
         rProp.Value  = pValues[ n ];
-//      rProp.State  = ;
+//        rProp.State  = ;
     }
 
     Command aCommand;
@@ -936,7 +935,7 @@ Reference< XResultSet > Content::createCursor(
 
     OSL_ENSURE( aResult.is(), "Content::createCursor - no cursor!" );
 
-     if ( !aResult.is() )
+    if ( !aResult.is() )
     {
         // Former, the open command directly returned a XResultSet.
         aCursorAny >>= aResult;
@@ -966,7 +965,7 @@ Reference< XResultSet > Content::createCursor(
 
     OSL_ENSURE( aResult.is(), "Content::createCursor - no cursor!" );
 
-     if ( !aResult.is() )
+    if ( !aResult.is() )
     {
         // Former, the open command directly returned a XResultSet.
         aCursorAny >>= aResult;
@@ -1010,7 +1009,7 @@ Reference< XDynamicResultSet > Content::createDynamicCursor(
 //=========================================================================
 Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
                             const Sequence< rtl::OUString >& rPropertyNames,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1045,7 +1044,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
 //=========================================================================
 Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
                             const Sequence< sal_Int32 >& rPropertyHandles,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1080,7 +1079,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
 //=========================================================================
 Reference< XResultSet > Content::createSortedCursor(
                             const Sequence< rtl::OUString >& rPropertyNames,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1134,7 +1133,7 @@ Reference< XResultSet > Content::createSortedCursor(
 //=========================================================================
 Reference< XResultSet > Content::createSortedCursor(
                             const Sequence< sal_Int32 >& rPropertyHandles,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1333,7 +1332,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
 
 //=========================================================================
 void Content::writeStream( const Reference< XInputStream >& rStream,
-                            sal_Bool bReplaceExisting )
+                           sal_Bool bReplaceExisting )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     InsertCommandArgument aArg;
@@ -1351,11 +1350,31 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
 }
 
 //=========================================================================
+Sequence< ContentInfo > Content::queryCreatableContentsInfo()
+    throw( CommandAbortedException, RuntimeException, Exception )
+{
+    // First, try it using "CreatableContentsInfo" property -> the "new" way.
+    Sequence< ContentInfo > aInfo;
+    if ( getPropertyValue(
+             rtl::OUString::createFromAscii( "CreatableContentsInfo" ) )
+         >>= aInfo )
+        return aInfo;
+
+    // Second, try it using XContentCreator interface -> the "old" way (not
+    // providing the chance to supply an XCommandEnvironment.
+    Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
+    if ( xCreator.is() )
+        aInfo = xCreator->queryCreatableContentsInfo();
+
+    return aInfo;
+}
+
+//=========================================================================
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< rtl::OUString >&
                                         rPropertyNames,
-                                      const Sequence< Any >& rPropertyValues,
-                                      Content& rNewContent )
+                                    const Sequence< Any >& rPropertyValues,
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     return insertNewContent( rContentType,
@@ -1369,8 +1388,8 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< sal_Int32 >&
                                         nPropertyHandles,
-                                      const Sequence< Any >& rPropertyValues,
-                                      Content& rNewContent )
+                                    const Sequence< Any >& rPropertyValues,
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     return insertNewContent( rContentType,
@@ -1384,29 +1403,51 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< rtl::OUString >&
                                         rPropertyNames,
-                                      const Sequence< Any >& rPropertyValues,
+                                    const Sequence< Any >& rPropertyValues,
                                     const Reference< XInputStream >& rData,
-                                      Content& rNewContent )
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rContentType.getLength() == 0 )
         return sal_False;
 
-    Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
-
-    OSL_ENSURE( xCreator.is(),
-                "Content::insertNewContent - Not a XContentCreator!" );
-
-    if ( !xCreator.is() )
-        return sal_False;
-
+    // First, try it using "createNewContent" command -> the "new" way.
     ContentInfo aInfo;
     aInfo.Type = rContentType;
     aInfo.Attributes = 0;
 
-    Reference< XContent > xNew = xCreator->createNewContent( aInfo );
+    Command aCommand;
+    aCommand.Name     = rtl::OUString::createFromAscii( "createNewContent" );
+    aCommand.Handle   = -1; // n/a
+    aCommand.Argument <<= aInfo;
+
+    Reference< XContent > xNew;
+    try
+    {
+        m_xImpl->executeCommand( aCommand ) >>= xNew;
+    }
+    catch ( RuntimeException const & )
+    {
+        throw;
+    }
+    catch ( Exception const & )
+    {
+    }
+
     if ( !xNew.is() )
-        return sal_False;
+    {
+        // Second, try it using XContentCreator interface -> the "old"
+        // way (not providing the chance to supply an XCommandEnvironment.
+        Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
+
+        if ( !xCreator.is() )
+            return sal_False;
+
+        xNew = xCreator->createNewContent( aInfo );
+
+        if ( !xNew.is() )
+            return sal_False;
+    }
 
     Content aNewContent( xNew, m_xImpl->getEnvironment() );
     aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
@@ -1425,29 +1466,51 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< sal_Int32 >&
                                         nPropertyHandles,
-                                      const Sequence< Any >& rPropertyValues,
+                                    const Sequence< Any >& rPropertyValues,
                                     const Reference< XInputStream >& rData,
-                                      Content& rNewContent )
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rContentType.getLength() == 0 )
         return sal_False;
 
-    Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
-
-    OSL_ENSURE( xCreator.is(),
-                "Content::insertNewContent - Not a XContentCreator!" );
-
-    if ( !xCreator.is() )
-        return sal_False;
-
+    // First, try it using "createNewContent" command -> the "new" way.
     ContentInfo aInfo;
     aInfo.Type = rContentType;
     aInfo.Attributes = 0;
 
-    Reference< XContent > xNew = xCreator->createNewContent( aInfo );
+    Command aCommand;
+    aCommand.Name     = rtl::OUString::createFromAscii( "createNewContent" );
+    aCommand.Handle   = -1; // n/a
+    aCommand.Argument <<= aInfo;
+
+    Reference< XContent > xNew;
+    try
+    {
+        m_xImpl->executeCommand( aCommand ) >>= xNew;
+    }
+    catch ( RuntimeException const & )
+    {
+        throw;
+    }
+    catch ( Exception const & )
+    {
+    }
+
     if ( !xNew.is() )
-        return sal_False;
+    {
+        // Second, try it using XContentCreator interface -> the "old"
+        // way (not providing the chance to supply an XCommandEnvironment.
+        Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
+
+        if ( !xCreator.is() )
+            return sal_False;
+
+        xNew = xCreator->createNewContent( aInfo );
+
+        if ( !xNew.is() )
+            return sal_False;
+    }
 
     Content aNewContent( xNew, m_xImpl->getEnvironment() );
     aNewContent.setPropertyValues( nPropertyHandles, rPropertyValues );
@@ -1466,7 +1529,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::transferContent( const Content& rSourceContent,
                                    InsertOperation eOperation,
                                    const rtl::OUString & rTitle,
-                                     const sal_Int32 nNameClashAction )
+                                   const sal_Int32 nNameClashAction )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     ContentBroker* pBroker = ContentBroker::get();
@@ -1580,8 +1643,8 @@ sal_Bool Content::isDocument()
 //=========================================================================
 
 Content_Impl::Content_Impl( const Reference< XMultiServiceFactory >& rSMgr,
-                              const Reference< XContent >& rContent,
-                              const Reference< XCommandEnvironment >& rEnv )
+                            const Reference< XContent >& rContent,
+                            const Reference< XCommandEnvironment >& rEnv )
 : m_xSMgr( rSMgr ),
   m_xContent( rContent ),
   m_xEnv( rEnv ),
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index 51490ed40296..9a41c55ccfd8 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
@@ -38,12 +38,10 @@
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDINFO_HPP_
 #include <com/sun/star/ucb/XCommandInfo.hpp>
-#endif
 #include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 
 #include "rtl/ref.hxx"
@@ -57,9 +55,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/configurationkeys.hxx>
@@ -89,8 +85,8 @@ class TestDataSink : public cppu::OWeakObject, public XActiveDataSink
     uno::Reference< XInputStream > m_xStream;
 
 public:
-//  TestDataSink() {}
-//  virtual ~TestDataSink();
+//    TestDataSink() {}
+//    virtual ~TestDataSink();
 
     // XInterface methods
     virtual Any SAL_CALL queryInterface( const Type & rType )
@@ -128,7 +124,8 @@ private:
     DECL_LINK( NameHdl, Edit * );
 
 public:
-    StringInputDialog( const String& rTitle,
+    StringInputDialog( ResMgr& rResMgr,
+                       const String& rTitle,
                        const String& rDefaultText,
                        String* pGroupName = 0 );
     String GetValue() const { return m_aNameEdit.GetText(); }
@@ -147,15 +144,15 @@ class UcbExplorerListBoxEntry : public SvLBoxEntry
 
     enum EntryType { FOLDER, DOCUMENT, LINK };
 
-    ::ucb::Content m_aContent;
-    EntryType      m_eType;
+    ::ucbhelper::Content m_aContent;
+    EntryType            m_eType;
 
 public:
     UcbExplorerListBoxEntry();
     virtual ~UcbExplorerListBoxEntry();
 
     BOOL createNewContent( const ContentInfo& rInfo,
-                           ::ucb::Content& rNewContent );
+                           ::ucbhelper::Content& rNewContent );
 };
 
 //=========================================================================
@@ -176,13 +173,13 @@ private:
     virtual void         RequestingChilds( SvLBoxEntry* pParent );
 
 public:
-    UcbExplorerTreeListBox( Window* pParent, WinBits nWinStyle = 0 );
+    UcbExplorerTreeListBox( ResMgr & rResMgr, Window* pParent, WinBits nWinStyle = 0 );
     virtual ~UcbExplorerTreeListBox();
 
     virtual void Command( const CommandEvent& rCEvt );
 
     UcbExplorerListBoxEntry*
-    InsertEntry( ::ucb::Content& rContent, SvLBoxEntry* pParent );
+    InsertEntry( ::ucbhelper::Content& rContent, SvLBoxEntry* pParent );
     UcbExplorerListBoxEntry*
     InsertEntry( const String& rURL, SvLBoxEntry* pParent = 0 );
 };
@@ -200,7 +197,7 @@ class UcbExplorerWindow : public WorkWindow
     UcbExplorerTreeListBox m_aTree;
 
 public:
-    UcbExplorerWindow( Window *pParent, WinBits nWinStyle );
+    UcbExplorerWindow( ResMgr & rResMgr, Window *pParent, WinBits nWinStyle );
     virtual ~UcbExplorerWindow();
 
     virtual void Resize();
@@ -230,7 +227,7 @@ Any SAL_CALL TestDataSink::queryInterface( const Type & rType )
 {
     Any aRet = cppu::queryInterface(
                         rType,
-                           static_cast< XActiveDataSink * >( this ) );
+                            static_cast< XActiveDataSink * >( this ) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -273,16 +270,17 @@ uno::Reference< XInputStream > SAL_CALL TestDataSink::getInputStream()
 //
 //=========================================================================
 
-StringInputDialog::StringInputDialog( const String& rTitle,
+StringInputDialog::StringInputDialog( ResMgr& rResMgr,
+                                      const String& rTitle,
                                       const String& rDefaultText,
                                       String* pGroupName )
-: ModalDialog( 0, ResId( DLG_STRINGINPUT ) ),
-  m_aNameText ( this, ResId( FT_STRINGINPUT_DLG_NAME ) ),
-  m_aNameEdit ( this, ResId( ED_STRINGINPUT_DLG_NAME ) ),
-  m_aNameGroup( this, ResId( GB_STRINGINPUT_DLG_NAME ) ),
-  m_aOKBtn    ( this, ResId( BT_STRINGINPUT_DLG_OK ) ),
-  m_aCancelBtn( this, ResId( BT_STRINGINPUT_DLG_CANCEL ) ),
-  m_aHelpBtn  ( this, ResId( BT_STRINGINPUT_DLG_HELP ) )
+  : ModalDialog( 0, ResId( DLG_STRINGINPUT, rResMgr ) ),
+  m_aNameText ( this, ResId( FT_STRINGINPUT_DLG_NAME, rResMgr ) ),
+  m_aNameEdit ( this, ResId( ED_STRINGINPUT_DLG_NAME, rResMgr ) ),
+  m_aNameGroup( this, ResId( GB_STRINGINPUT_DLG_NAME, rResMgr ) ),
+  m_aOKBtn    ( this, ResId( BT_STRINGINPUT_DLG_OK, rResMgr ) ),
+  m_aCancelBtn( this, ResId( BT_STRINGINPUT_DLG_CANCEL, rResMgr ) ),
+  m_aHelpBtn  ( this, ResId( BT_STRINGINPUT_DLG_HELP, rResMgr ) )
 {
     FreeResource();
     SetText( rTitle );
@@ -343,7 +341,7 @@ UcbExplorerListBoxEntry::~UcbExplorerListBoxEntry()
 
 //=========================================================================
 BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
-                                                ::ucb::Content& rNewContent )
+                                                ::ucbhelper::Content& rNewContent )
 {
     sal_Int32 nCount = rInfo.Properties.getLength();
     Sequence< Any > aPropValues( nCount );
@@ -358,7 +356,10 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
             const OUString& rName = pProps[ n ].Name;
-            StringInputDialog* pDlg = new StringInputDialog( rName, rName );
+
+            std::auto_ptr< ResMgr > xManager(
+                ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
+            StringInputDialog* pDlg = new StringInputDialog( *xManager.get(), rName, rName );
             USHORT nRet = pDlg->Execute();
             if ( nRet == RET_OK )
             {
@@ -444,7 +445,10 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
         // Let the user specify the URL of a content containing the
         // data to supply to the new content.
 
+        std::auto_ptr< ResMgr > xManager(
+            ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
         StringInputDialog* pDlg = new StringInputDialog(
+                                            *xManager.get(),
                                             OUString::createFromAscii(
                                                 "Document Data Source URL" ),
                                             OUString() );
@@ -457,7 +461,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             if ( aSourceURL.getLength() == 0 )
             {
                 DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
-                              "No document data URL!" );
+                               "No document data URL!" );
                 return FALSE;
             }
 
@@ -465,11 +469,11 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             {
                 uno::Reference< XCommandEnvironment > xEnv;
 
-                ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get();
+                ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
                 if ( pBroker )
                 {
                     uno::Reference< XInteractionHandler > xInteractionHandler(
-                         pBroker->getServiceManager()->createInstance(
+                        pBroker->getServiceManager()->createInstance(
                                 OUString::createFromAscii(
                                     "com.sun.star.task.InteractionHandler" ) ),
                         UNO_QUERY );
@@ -477,21 +481,21 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
                     uno::Reference< XProgressHandler > xProgressHandler
                                     /* = new ProgressHandler( *pBroker ) */ ;
 
-                    xEnv = new ::ucb::CommandEnvironment( xInteractionHandler,
-                                                               xProgressHandler );
+                    xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler,
+                                                                xProgressHandler );
                 }
 
-                ::ucb::Content aSourceContent( aSourceURL, xEnv );
+                ::ucbhelper::Content aSourceContent( aSourceURL, xEnv );
 
                 // Get source data.
                 rtl::Reference< TestDataSink > xSourceData = new TestDataSink;
-                aSourceContent.openStream( xSourceData.getBodyPtr() );
+                aSourceContent.openStream( xSourceData.get() );
                 xData = xSourceData->getInputStream();
             }
             catch ( ContentCreationException const & )
             {
                 DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
-                              "No content for document data!" );
+                               "No content for document data!" );
                 return FALSE;
             }
             catch ( CommandAbortedException const & )
@@ -516,7 +520,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
 
     // Create new content.
 
-       ULONG n = Application::ReleaseSolarMutex();
+        ULONG n = Application::ReleaseSolarMutex();
     BOOL bRet = sal_False;
 
     try
@@ -545,13 +549,14 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
 //
 //=========================================================================
 
-UcbExplorerTreeListBox::UcbExplorerTreeListBox(
-                                    Window* pParent, WinBits nWinStyle )
+UcbExplorerTreeListBox::UcbExplorerTreeListBox( ResMgr & rResMgr,
+                                                Window* pParent,
+                                                WinBits nWinStyle )
 : SvTreeListBox( pParent, nWinStyle ),
-  m_aFolderClosed( ResId( BMP_FOLDER_CLOSED ) ),
-  m_aFolderOpened( ResId( BMP_FOLDER_OPENED ) ),
-  m_aDocument( ResId( BMP_DOCUMENT ) ),
-  m_aLink( ResId( BMP_LINK ) )
+  m_aFolderClosed( ResId( BMP_FOLDER_CLOSED, rResMgr ) ),
+  m_aFolderOpened( ResId( BMP_FOLDER_OPENED, rResMgr ) ),
+  m_aDocument( ResId( BMP_DOCUMENT, rResMgr ) ),
+  m_aLink( ResId( BMP_LINK, rResMgr ) )
 {
 }
 
@@ -580,18 +585,18 @@ void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
         {
             case UcbExplorerListBoxEntry::FOLDER:
             {
-                   ULONG n = Application::ReleaseSolarMutex();
+                    ULONG n = Application::ReleaseSolarMutex();
 
                 try
                 {
                     Sequence< OUString > aPropertyNames( 0 );
-//                  OUString* pNames = aPropertyNames.getArray();
-//                  pNames[ 0 ] = OUString::createFromAscii( "Title" );
+//                    OUString* pNames = aPropertyNames.getArray();
+//                    pNames[ 0 ] = OUString::createFromAscii( "Title" );
 
                     uno::Reference< XResultSet > xResultSet
                         = pEntry->m_aContent.createCursor(
                                     aPropertyNames,
-                                    ::ucb::INCLUDE_FOLDERS_AND_DOCUMENTS );
+                                    ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS );
                     uno::Reference< XContentAccess > xContentAccess(
                                                     xResultSet, UNO_QUERY );
 
@@ -648,36 +653,32 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                 GetEntry( rPos, TRUE ) );
         if ( pEntry )
         {
-            PopupMenu* pMenu = new PopupMenu( ResId( MENU_POPUP ) );
+           std::auto_ptr< ResMgr > xManager(
+                ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
+           PopupMenu* pMenu = new PopupMenu( ResId( MENU_POPUP, *xManager.get() ) );
             PopupMenu* pNewMenu = 0;
 
-//          pMenu->SetSelectHdl( LINK( this,
-//                                     SfxCommonTemplateDialog_Impl,
-//                                     MenuSelectHdl ) );
+//            pMenu->SetSelectHdl( LINK( this,
+//                                       SfxCommonTemplateDialog_Impl,
+//                                       MenuSelectHdl ) );
 
             //////////////////////////////////////////////////////////////
             // Configure "New"
             //////////////////////////////////////////////////////////////
 
-            uno::Reference< XContentCreator > xCreator(
-                                    pEntry->m_aContent.get(), UNO_QUERY );
-            Sequence< ContentInfo > aInfo;
-            BOOL bCanCreate = xCreator.is();
-            if ( bCanCreate )
-            {
-                aInfo = xCreator->queryCreatableContentsInfo();
-                const ContentInfo* pInfo = aInfo.getConstArray();
-                sal_Int32 nCount = aInfo.getLength();
-                bCanCreate =  ( nCount > 0 );
+            Sequence< ContentInfo > aInfo
+                = pEntry->m_aContent.queryCreatableContentsInfo();
+            const ContentInfo* pInfo = aInfo.getConstArray();
+            sal_Int32 nCount = aInfo.getLength();
+            BOOL bCanCreate =  ( nCount > 0 );
 
-                pNewMenu = new PopupMenu;
-                pMenu->SetPopupMenu( MENU_NEW, pNewMenu );
+            pNewMenu = new PopupMenu;
+            pMenu->SetPopupMenu( MENU_NEW, pNewMenu );
 
-                for ( sal_Int32 n = 0; n < nCount; ++n )
-                {
-                    const ContentInfo& rInfo = pInfo[ n ];
-                    pNewMenu->InsertItem( 20000 + n + 1, rInfo.Type );
-                }
+            for ( sal_Int32 n = 0; n < nCount; ++n )
+            {
+                const ContentInfo& rInfo = pInfo[ n ];
+                pNewMenu->InsertItem( 20000 + n + 1, rInfo.Type );
             }
 
             pMenu->EnableItem( MENU_NEW, bCanCreate );
@@ -721,7 +722,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
             {
                 pMenu->EnableItem( MENU_DELETE,
                                    pEntry->m_aContent
-                                       .getCommands()->hasCommandByName(
+                                        .getCommands()->hasCommandByName(
                                         OUString::createFromAscii(
                                             "delete" ) ) );
             }
@@ -743,8 +744,8 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
             USHORT nSelected = pMenu->Execute( this, rPos );
             switch ( nSelected )
             {
-//              case MENU_NEW:
-//                  break;
+//                case MENU_NEW:
+//                    break;
 
                 case MENU_RENAME:
                 {
@@ -767,8 +768,11 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     {
                     }
 
+                    std::auto_ptr< ResMgr > xManager(
+                        ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
                     StringInputDialog* pDlg
                             = new StringInputDialog(
+                                    *xManager.get(),
                                     OUString::createFromAscii( "Title" ),
                                     aNewTitle );
 
@@ -884,7 +888,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     {
                         // New-menu entry selected.
 
-                           ::ucb::Content aNewContent;
+                        ::ucbhelper::Content aNewContent;
                         if ( pEntry->createNewContent(
                                     aInfo.getConstArray()[ nSelected - 20001 ],
                                     aNewContent ) )
@@ -910,8 +914,8 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
 
 //=========================================================================
 UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
-                                              ::ucb::Content& rContent,
-                                                 SvLBoxEntry* pParent )
+                                                ::ucbhelper::Content& rContent,
+                                                SvLBoxEntry* pParent )
 {
     try
     {
@@ -921,7 +925,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
         if ( !aTitle.getLength() )
             aTitle = OUString::createFromAscii( "/" );
 
-           UcbExplorerListBoxEntry* pEntry = 0;
+            UcbExplorerListBoxEntry* pEntry = 0;
 
         if ( rContent.isFolder() )
         {
@@ -995,18 +999,18 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
 
 //=========================================================================
 UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
-                                                  const String& rURL,
-                                                     SvLBoxEntry* pParent )
+                                                const String& rURL,
+                                                    SvLBoxEntry* pParent )
 {
     try
     {
         uno::Reference< XCommandEnvironment > xEnv;
 
-        ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get();
+        ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
         if ( pBroker )
         {
             uno::Reference< XInteractionHandler > xInteractionHandler(
-                 pBroker->getServiceManager()->createInstance(
+                pBroker->getServiceManager()->createInstance(
                         OUString::createFromAscii(
                             "com.sun.star.task.InteractionHandler" ) ),
                 UNO_QUERY );
@@ -1014,11 +1018,11 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
             uno::Reference< XProgressHandler > xProgressHandler
                                 /* = new ProgressHandler( *pBroker ) */ ;
 
-            xEnv = new ::ucb::CommandEnvironment( xInteractionHandler,
-                                                     xProgressHandler );
+            xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler,
+                                                        xProgressHandler );
         }
 
-        ::ucb::Content aContent( rURL, xEnv );
+        ::ucbhelper::Content aContent( rURL, xEnv );
         return InsertEntry( aContent, pParent );
     }
     catch ( ContentCreationException const & )
@@ -1034,9 +1038,9 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
 //
 //=========================================================================
 
-UcbExplorerWindow::UcbExplorerWindow( Window *pParent, WinBits nWinStyle )
+UcbExplorerWindow::UcbExplorerWindow( ResMgr & rResMgr, Window *pParent, WinBits nWinStyle )
 : WorkWindow( pParent, nWinStyle ),
-  m_aTree( this, WB_HSCROLL )
+  m_aTree( rResMgr, this, WB_HSCROLL )
 {
     Font aTreeFont( m_aTree.GetFont() );
     aTreeFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM("Courier") ) );
@@ -1105,7 +1109,7 @@ void MyApp::Main()
 
     comphelper::setProcessServiceFactory( xFac );
 
-    unO::Reference< XComponent > xComponent(    xFac, UNO_QUERY );
+    uno::Reference< XComponent > xComponent( xFac, UNO_QUERY );
 
     //////////////////////////////////////////////////////////////////////
     // Create UCB.
@@ -1116,16 +1120,16 @@ void MyApp::Main()
     Sequence< Any > aArgs( 2 );
     aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
     aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
-    sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xFac, aArgs );
+    sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aArgs );
 #else
     // Init UCB (Use provided configuration data)
-    ::ucb::ContentProviderDataList aProviders;
+    ::ucbhelper::ContentProviderDataList aProviders;
     aProviders.push_back(
-        ::ucb::ContentProviderData(
+        ::ucbhelper::ContentProviderData(
             OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ),
             OUString::createFromAscii( "file" ),
             OUString() ) );
-    sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xFac, aProviders );
+    sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aProviders );
 #endif
 
     if ( !bSuccess )
@@ -1138,12 +1142,12 @@ void MyApp::Main()
     // Create/init/show app window.
     //////////////////////////////////////////////////////////////////////
 
-    ResMgr* pMgr = ResMgr::CreateResMgr( CREATEVERSIONRESMGR( ucbexplorer ) );
-    Resource::SetResManager( pMgr );
+    std::auto_ptr< ResMgr > xManager(
+        ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
 
-    UcbExplorerWindow aAppWin( 0, WB_APP | WB_STDWORK );
+    UcbExplorerWindow aAppWin( *xManager.get(), 0, WB_APP | WB_STDWORK );
 
-    MenuBar aMBMain( ResId( MENU_MAIN ) );
+    MenuBar aMBMain( ResId( MENU_MAIN, *xManager.get() ) );
 
     // Check for command line params
 #if 0
@@ -1158,7 +1162,7 @@ void MyApp::Main()
         aRootURL = UniString::CreateFromAscii(
                         RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.hier:/" ) );
 
-    String aTitle( ResId( TEXT_TITLEBAR ) );
+     String aTitle( ResId( TEXT_TITLEBAR, *xManager.get() ) );
     aTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " - " ) );
     aTitle += aRootURL;
 
@@ -1183,7 +1187,7 @@ void MyApp::Main()
     // m_aTree holds UCB contents!
     aAppWin.m_aTree.Clear();
 
-    ::ucb::ContentBroker::deinitialize();
+    ::ucbhelper::ContentBroker::deinitialize();
 
     if ( xComponent.is() )
         xComponent->dispose();
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
index 14d4b8ee8770..1449897341d5 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
@@ -27,15 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//=========================================================================
-//
-// UCB Explorer ( resources )
-//
-// (C) 2000 StarOffice Entwicklungs GmbH, Hamburg, Germany
-//
-// $Author: rt $ $Date: 2008-04-10 16:20:05 $Revision$
-//
-//=========================================================================
 
 #include "ucbexplorer.hrc"
 
@@ -91,6 +82,7 @@ Menu MENU_POPUP
     };
 };
 
+/*
 Bitmap BMP_FOLDER_CLOSED
 {
     File = "bmp/fldclose.bmp" ;
@@ -107,6 +99,7 @@ Bitmap BMP_LINK
 {
     File = "bmp/link.bmp" ;
 };
+*/
 
 ModalDialog DLG_STRINGINPUT
 {