diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-09 09:22:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-09 10:26:50 +0000 |
commit | d527c1df688db82f93a2fb336f2c5ae0a243104f (patch) | |
tree | 255a7f7f4cf9c3847deb55b066e4387a4d31ce4b /ucbhelper/source | |
parent | fd468f7c928902600ce612df0141d6ed98b09b9e (diff) |
callcatcher: update list
Diffstat (limited to 'ucbhelper/source')
-rw-r--r-- | ucbhelper/source/client/content.cxx | 165 | ||||
-rw-r--r-- | ucbhelper/source/provider/simplecertificatevalidationrequest.cxx | 33 |
2 files changed, 0 insertions, 198 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 59cc3997057e..c4e5d8dc9037 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -559,27 +559,6 @@ Sequence< Any > Content::getPropertyValues( } //========================================================================= -Sequence< Any > Content::getPropertyValues( - const Sequence< sal_Int32 >& nPropertyHandles ) - throw( CommandAbortedException, RuntimeException, Exception ) -{ - Reference< XRow > xRow = getPropertyValuesInterface( nPropertyHandles ); - - sal_Int32 nCount = nPropertyHandles.getLength(); - Sequence< Any > aValues( nCount ); - - if ( xRow.is() ) - { - Any* pValues = aValues.getArray(); - - for ( sal_Int32 n = 0; n < nCount; ++n ) - pValues[ n ] = xRow->getObject( n + 1, Reference< XNameAccess >() ); - } - - return aValues; -} - -//========================================================================= Reference< XRow > Content::getPropertyValuesInterface( const Sequence< rtl::OUString >& rPropertyNames ) throw( CommandAbortedException, RuntimeException, Exception ) @@ -613,39 +592,6 @@ Reference< XRow > Content::getPropertyValuesInterface( } //========================================================================= -Reference< XRow > Content::getPropertyValuesInterface( - const Sequence< sal_Int32 >& nPropertyHandles ) - throw( CommandAbortedException, RuntimeException, Exception ) -{ - sal_Int32 nCount = nPropertyHandles.getLength(); - Sequence< Property > aProps( nCount ); - Property* pProps = aProps.getArray(); - - const sal_Int32* pHandles = nPropertyHandles.getConstArray(); - - for ( sal_Int32 n = 0; n< nCount; ++n ) - { - Property& rProp = pProps[ n ]; - - rProp.Name = rtl::OUString(); // n/a - rProp.Handle = pHandles[ n ]; -// rProp.Type = -// rProp.Attributes = ; - } - - Command aCommand; - aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")); - aCommand.Handle = -1; // n/a - aCommand.Argument <<= aProps; - - Any aResult = m_xImpl->executeCommand( aCommand ); - - Reference< XRow > xRow; - aResult >>= xRow; - return xRow; -} - -//========================================================================= Sequence< Any > Content::setPropertyValues( const Sequence< rtl::OUString >& rPropertyNames, const Sequence< Any >& rValues ) @@ -694,54 +640,6 @@ Sequence< Any > Content::setPropertyValues( } //========================================================================= -Sequence< Any > Content::setPropertyValues( - const Sequence< sal_Int32 >& nPropertyHandles, - const Sequence< Any >& rValues ) - throw( CommandAbortedException, RuntimeException, Exception ) -{ - if ( nPropertyHandles.getLength() != rValues.getLength() ) - { - ucbhelper::cancelCommandExecution( - makeAny( IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Length of property handles sequence and value " - "sequence are unequal!" )), - get(), - -1 ) ), - m_xImpl->getEnvironment() ); - // Unreachable - } - - sal_Int32 nCount = rValues.getLength(); - Sequence< PropertyValue > aProps( nCount ); - PropertyValue* pProps = aProps.getArray(); - - const sal_Int32* pHandles = nPropertyHandles.getConstArray(); - const Any* pValues = rValues.getConstArray(); - - for ( sal_Int32 n = 0; n< nCount; ++n ) - { - PropertyValue& rProp = pProps[ n ]; - - rProp.Name = rtl::OUString(); // n/a - rProp.Handle = pHandles[ n ]; - rProp.Value = pValues[ n ]; -// rProp.State = ; - } - - Command aCommand; - aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); - aCommand.Handle = -1; // n/a - aCommand.Argument <<= aProps; - - Any aResult = m_xImpl->executeCommand( aCommand ); - - Sequence< Any > aErrors; - aResult >>= aErrors; - return aErrors; -} - -//========================================================================= Any Content::executeCommand( const rtl::OUString& rCommandName, const Any& rCommandArgument ) throw( CommandAbortedException, RuntimeException, Exception ) @@ -1149,69 +1047,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, - const Reference< XInputStream >& rData, - Content& rNewContent ) - throw( CommandAbortedException, RuntimeException, Exception ) -{ - if ( rContentType.isEmpty() ) - return sal_False; - - // First, try it using "createNewContent" command -> the "new" way. - ContentInfo aInfo; - aInfo.Type = rContentType; - aInfo.Attributes = 0; - - Command aCommand; - aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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() ) - { - // 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 ); - aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), - makeAny( - InsertCommandArgument( - rData.is() ? rData : new EmptyInputStream, - sal_False /* ReplaceExisting */ ) ) ); - aNewContent.m_xImpl->inserted(); - - rNewContent = aNewContent; - return sal_True; -} - -//========================================================================= sal_Bool Content::transferContent( const Content& rSourceContent, InsertOperation eOperation, const rtl::OUString & rTitle, diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx index c12ae0d8cfbb..952139bb94e8 100644 --- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx +++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx @@ -53,37 +53,4 @@ SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sa pCertificate.get(); } -//========================================================================= -sal_Int32 SimpleCertificateValidationRequest::getResponse() const -{ - rtl::Reference< InteractionContinuation > xSelection = getSelection(); - if ( xSelection.is() ) - { - InteractionContinuation * pSelection = xSelection.get(); - - uno::Reference< task::XInteractionAbort > xAbort( - pSelection, uno::UNO_QUERY ); - if ( xAbort.is() ) - return 1; - - uno::Reference< task::XInteractionRetry > xRetry( - pSelection, uno::UNO_QUERY ); - if ( xRetry.is() ) - return 2; - - uno::Reference< task::XInteractionApprove > xApprove( - pSelection, uno::UNO_QUERY ); - if ( xApprove.is() ) - return 4; - - uno::Reference< task::XInteractionDisapprove > xDisapprove( - pSelection, uno::UNO_QUERY ); - if ( xDisapprove.is() ) - return 8; - - OSL_FAIL( "CertificateValidationRequest - Unknown continuation!" ); - } - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |