diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-17 09:41:52 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-31 12:03:29 +0100 |
| commit | 75bc673b60d3eb40713868ce3d1b4f62dd6e1208 (patch) | |
| tree | d377d1454c0dde448869a7c581c011862d3b555e /ucbhelper | |
| parent | 4cc2571e49de162f52ac9ec171f98732bb256517 (diff) | |
Travelled MIME type through UCB for CMIS UCP to use it when creating documents
Change-Id: Id067932355607d3d60994862201b531f9844506d
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/inc/ucbhelper/content.hxx | 3 | ||||
| -rw-r--r-- | ucbhelper/source/client/content.cxx | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx index 9c06bf5366e7..259c77292492 100644 --- a/ucbhelper/inc/ucbhelper/content.hxx +++ b/ucbhelper/inc/ucbhelper/content.hxx @@ -669,7 +669,8 @@ public: transferContent( const Content& rSourceContent, InsertOperation eOperation, const ::rtl::OUString & rTitle, - const sal_Int32 nNameClashAction ) + const sal_Int32 nNameClashAction, + const ::rtl::OUString & rMimeType = ::rtl::OUString( ) ) throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index ec3b4544d62c..22c9b31269f1 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/ucb/ContentAction.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> -#include <com/sun/star/ucb/GlobalTransferCommandArgument.hpp> +#include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/ucb/XContentCreator.hpp> @@ -961,7 +961,8 @@ 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, + const rtl::OUString & rMimeType ) throw( CommandAbortedException, RuntimeException, Exception ) { Reference< XUniversalContentBroker > pBroker( @@ -995,12 +996,13 @@ sal_Bool Content::transferContent( const Content& rSourceContent, // Unreachable } - GlobalTransferCommandArgument aTransferArg( + GlobalTransferCommandArgument2 aTransferArg( eTransOp, rSourceContent.getURL(), // SourceURL getURL(), // TargetFolderURL, rTitle, - nNameClashAction ); + nNameClashAction, + rMimeType ); Command aCommand; aCommand.Name = rtl::OUString("globalTransfer"); aCommand.Handle = -1; // n/a |