unusedcode: ucbhelper:: cleaning

2 files changed, 0 insertions, 306 deletions

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index ff2a8ef9f21a..19fd94e2a9e6 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -205,7 +205,6 @@ public:
     Reference< XMultiServiceFactory > getServiceManager() { return m_xSMgr; }
 
     Any  executeCommand( const Command& rCommand );
-    void abortCommand();
 
     inline const Reference< XCommandEnvironment >& getEnvironment() const;
     inline void setEnvironment(
@@ -405,18 +404,6 @@ Content::Content( const rtl::OUString& rURL,
 }
 
 //=========================================================================
-Content::Content( const Reference< XContentIdentifier >& rId,
-                  const Reference< XCommandEnvironment >& rEnv )
-    throw ( ContentCreationException, RuntimeException )
-{
-    ContentBroker* pBroker = getContentBroker( true );
-
-    Reference< XContent > xContent = getContent( *pBroker, rId, true );
-
-    m_xImpl = new Content_Impl( pBroker->getServiceManager(), xContent, rEnv );
-}
-
-//=========================================================================
 Content::Content( const Reference< XContent >& rContent,
                   const Reference< XCommandEnvironment >& rEnv )
     throw ( ContentCreationException, RuntimeException )
@@ -458,42 +445,6 @@ sal_Bool Content::create( const rtl::OUString& rURL,
 }
 
 //=========================================================================
-// static
-sal_Bool Content::create( const Reference< XContentIdentifier >& rId,
-                          const Reference< XCommandEnvironment >& rEnv,
-                          Content& rContent )
-{
-    ContentBroker* pBroker = getContentBroker( false );
-    if ( !pBroker )
-        return sal_False;
-
-    Reference< XContent > xContent = getContent( *pBroker, rId, false );
-    if ( !xContent.is() )
-        return sal_False;
-
-    rContent.m_xImpl
-        = new Content_Impl( pBroker->getServiceManager(), xContent, rEnv );
-
-    return sal_True;
-}
-
-//=========================================================================
-// static
-sal_Bool Content::create( const Reference< XContent >& xContent,
-                          const Reference< XCommandEnvironment >& rEnv,
-                          Content& rContent )
-{
-    ContentBroker* pBroker = getContentBroker( false );
-    if ( !pBroker )
-        return sal_False;
-
-    rContent.m_xImpl
-        = new Content_Impl( pBroker->getServiceManager(), xContent, rEnv );
-
-    return sal_True;
-}
-
-//=========================================================================
 Content::~Content()
 {
 }
@@ -574,17 +525,6 @@ Any Content::getPropertyValue( const rtl::OUString& rPropertyName )
 }
 
 //=========================================================================
-Any Content::getPropertyValue( sal_Int32 nPropertyHandle )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Sequence< sal_Int32 > aHandles( 1 );
-    aHandles.getArray()[ 0 ] = nPropertyHandle;
-
-    Sequence< Any > aRet = getPropertyValues( aHandles );
-    return aRet.getConstArray()[ 0 ];
-}
-
-//=========================================================================
 Any Content::setPropertyValue( const rtl::OUString& rName,
                                 const Any& rValue )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -600,21 +540,6 @@ Any Content::setPropertyValue( const rtl::OUString& rName,
 }
 
 //=========================================================================
-Any Content::setPropertyValue( const sal_Int32 nPropertyHandle,
-                                const Any& rValue )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Sequence< sal_Int32 > aHandles( 1 );
-    aHandles.getArray()[ 0 ] = nPropertyHandle;
-
-    Sequence< Any > aValues( 1 );
-    aValues.getArray()[ 0 ] = rValue;
-
-    Sequence< Any > aErrors = setPropertyValues( aHandles, aValues );
-    return aErrors.getConstArray()[ 0 ];
-}
-
-//=========================================================================
 Sequence< Any > Content::getPropertyValues(
                             const Sequence< rtl::OUString >& rPropertyNames )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -832,25 +757,6 @@ Any Content::executeCommand( const rtl::OUString& rCommandName,
 }
 
 //=========================================================================
-Any Content::executeCommand( sal_Int32 nCommandHandle,
-                             const Any& rCommandArgument )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Command aCommand;
-    aCommand.Name     = rtl::OUString(); // n/a
-    aCommand.Handle   = nCommandHandle;
-    aCommand.Argument = rCommandArgument;
-
-    return m_xImpl->executeCommand( aCommand );
-}
-
-//=========================================================================
-void Content::abortCommand()
-{
-    m_xImpl->abortCommand();
-}
-
-//=========================================================================
 Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
                               ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -947,36 +853,6 @@ Reference< XResultSet > Content::createCursor(
 }
 
 //=========================================================================
-Reference< XResultSet > Content::createCursor(
-                            const Sequence< sal_Int32 >& rPropertyHandles,
-                            ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Any aCursorAny = createCursorAny( rPropertyHandles, eMode );
-
-    Reference< XDynamicResultSet > xDynSet;
-    Reference< XResultSet > aResult;
-
-    aCursorAny >>= xDynSet;
-    if ( xDynSet.is() )
-        aResult = xDynSet->getStaticResultSet();
-
-    OSL_ENSURE( aResult.is(), "Content::createCursor - no cursor!" );
-
-    if ( !aResult.is() )
-    {
-        // Former, the open command directly returned a XResultSet.
-        aCursorAny >>= aResult;
-
-        OSL_ENSURE( !aResult.is(),
-                    "Content::createCursor - open-Command must "
-                    "return a Reference< XDynnamicResultSet >!" );
-    }
-
-    return aResult;
-}
-
-//=========================================================================
 Reference< XDynamicResultSet > Content::createDynamicCursor(
                             const Sequence< rtl::OUString >& rPropertyNames,
                             ResultSetInclude eMode )
@@ -1005,76 +881,6 @@ Reference< XDynamicResultSet > Content::createDynamicCursor(
 }
 
 //=========================================================================
-Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
-                            const Sequence< rtl::OUString >& rPropertyNames,
-                            const Sequence< NumberedSortingInfo >& rSortInfo,
-                            Reference< XAnyCompareFactory > rAnyCompareFactory,
-                            ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Reference< XDynamicResultSet > aResult;
-    Reference< XDynamicResultSet > aOrigCursor = createDynamicCursor( rPropertyNames, eMode );
-
-    if( aOrigCursor.is() )
-    {
-        Reference< XMultiServiceFactory > aServiceManager = m_xImpl->getServiceManager();
-
-        if( aServiceManager.is() )
-        {
-            Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
-                                UNO_QUERY );
-
-            aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor,
-                                                              rSortInfo,
-                                                              rAnyCompareFactory );
-        }
-
-        OSL_ENSURE( aResult.is(), "Content::createSortedDynamicCursor - no sorted cursor!\n" );
-
-        if( !aResult.is() )
-            aResult = aOrigCursor;
-    }
-
-    return aResult;
-}
-
-//=========================================================================
-Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
-                            const Sequence< sal_Int32 >& rPropertyHandles,
-                            const Sequence< NumberedSortingInfo >& rSortInfo,
-                            Reference< XAnyCompareFactory > rAnyCompareFactory,
-                            ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Reference< XDynamicResultSet > aResult;
-    Reference< XDynamicResultSet > aOrigCursor = createDynamicCursor( rPropertyHandles, eMode );
-
-    if( aOrigCursor.is() )
-    {
-        Reference< XMultiServiceFactory > aServiceManager = m_xImpl->getServiceManager();
-
-        if( aServiceManager.is() )
-        {
-            Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
-                                UNO_QUERY );
-
-            aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor,
-                                                              rSortInfo,
-                                                              rAnyCompareFactory );
-        }
-
-        OSL_ENSURE( aResult.is(), "Content::createSortedDynamicCursor - no sorted cursor!\n" );
-
-        if( !aResult.is() )
-            aResult = aOrigCursor;
-    }
-
-    return aResult;
-}
-
-//=========================================================================
 Reference< XResultSet > Content::createSortedCursor(
                             const Sequence< rtl::OUString >& rPropertyNames,
                             const Sequence< NumberedSortingInfo >& rSortInfo,
@@ -1129,60 +935,6 @@ Reference< XResultSet > Content::createSortedCursor(
 }
 
 //=========================================================================
-Reference< XResultSet > Content::createSortedCursor(
-                            const Sequence< sal_Int32 >& rPropertyHandles,
-                            const Sequence< NumberedSortingInfo >& rSortInfo,
-                            Reference< XAnyCompareFactory > rAnyCompareFactory,
-                            ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    Reference< XResultSet > aResult;
-    Reference< XDynamicResultSet > aDynSet;
-
-    Any aCursorAny = createCursorAny( rPropertyHandles, eMode );
-
-    aCursorAny >>= aDynSet;
-
-    if( aDynSet.is() )
-    {
-        Reference< XDynamicResultSet > aDynResult;
-        Reference< XMultiServiceFactory > aServiceManager = m_xImpl->getServiceManager();
-
-        if( aServiceManager.is() )
-        {
-            Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
-                                UNO_QUERY );
-
-            aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet,
-                                                              rSortInfo,
-                                                              rAnyCompareFactory );
-        }
-
-        OSL_ENSURE( aDynResult.is(), "Content::createSortedCursor - no sorted cursor!\n" );
-
-        if( aDynResult.is() )
-            aResult = aDynResult->getStaticResultSet();
-        else
-            aResult = aDynSet->getStaticResultSet();
-    }
-
-    OSL_ENSURE( aResult.is(), "Content::createSortedCursor - no cursor!" );
-
-    if ( !aResult.is() )
-    {
-        // Former, the open command directly returned a XResultSet.
-        aCursorAny >>= aResult;
-
-        OSL_ENSURE( !aResult.is(),
-                    "Content::createCursor - open-Command must "
-                    "return a Reference< XDynnamicResultSet >!" );
-    }
-
-    return aResult;
-}
-
-//=========================================================================
 Reference< XInputStream > Content::openStream()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
@@ -1384,21 +1136,6 @@ 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 )
-    throw( CommandAbortedException, RuntimeException, Exception )
-{
-    return insertNewContent( rContentType,
-                             nPropertyHandles,
-                             rPropertyValues,
-                             new EmptyInputStream,
-                             rNewContent );
-}
-
-//=========================================================================
-sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< rtl::OUString >&
                                         rPropertyNames,
                                     const Sequence< Any >& rPropertyValues,
@@ -1871,21 +1608,6 @@ Any Content_Impl::executeCommand( const Command& rCommand )
 }
 
 //=========================================================================
-void Content_Impl::abortCommand()
-{
-    sal_Int32 nCommandId;
-    Reference< XCommandProcessor > xCommandProcessor;
-    {
-        osl::MutexGuard aGuard( m_aMutex );
-        nCommandId = m_nCommandId;
-        xCommandProcessor = m_xCommandProcessor;
-    }
-
-    if ( ( nCommandId != 0 ) && xCommandProcessor.is() )
-        xCommandProcessor->abort( nCommandId );
-}
-
-//=========================================================================
 inline const Reference< XCommandEnvironment >&
                                         Content_Impl::getEnvironment() const
 {
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 8eb455ca0aeb..36669b0b1fd0 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -206,34 +206,6 @@ sal_Bool ContentBroker::initialize(
 
 //=========================================================================
 // static
-sal_Bool ContentBroker::initialize(
-                        const Reference< XMultiServiceFactory >& rSMgr,
-                        const ContentProviderDataList & rData )
-{
-    OSL_ENSURE( !m_pTheBroker,
-                "ContentBroker::initialize - already initialized!" );
-
-    if ( !m_pTheBroker )
-    {
-        osl::Guard< osl::Mutex > aGuard( getGlobalContentBrokerMutex() );
-
-        if ( !m_pTheBroker )
-        {
-            ContentBroker * pBroker = new ContentBroker( rSMgr, rData );
-
-            // Force init to be able to detect UCB init trouble immediately.
-            if ( pBroker->m_pImpl->initialize() )
-                m_pTheBroker = pBroker;
-            else
-                delete pBroker;
-        }
-    }
-
-    return m_pTheBroker != 0;
-}
-
-//=========================================================================
-// static
 void ContentBroker::deinitialize()
 {
     osl::MutexGuard aGuard( getGlobalContentBrokerMutex() );