From 4cb0143327155b6678989a3fe63f11df5014f3a5 Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Mon, 9 Jul 2012 17:30:11 +0200 Subject: CMIS UCP: Added support for Binding URL and Repository as folders This feature needed to change quite some code in the way children are fetched in CMIS UCP to avoid running several times the same HTTP requests. The new URLs will find the following scheme: + Children of vnd.libreoffice.cmis+atom://admin@http-encoded-binding-url-no-repoid/ are the repositories listed by the binding URL + Children of vnd.libreoffice.cmis+atom://admin@http-encoded-binding-url-no-repoid/repoid are the root folder of the repository Change-Id: I405d88c82e6fc9f1110a84165a151257c4ce60db --- ucb/source/ucp/cmis/cmis_datasupplier.hxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'ucb/source/ucp/cmis/cmis_datasupplier.hxx') diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 14ad404c90f0..7a3b42060ffa 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -14,7 +14,7 @@ #include -#include "cmis_content.hxx" +#include "children_provider.hxx" namespace cmis { @@ -23,13 +23,10 @@ namespace cmis struct ResultListEntry { - ::rtl::OUString aId; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > xId; com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xContent; com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > xRow; - libcmis::ObjectPtr pObject; - ResultListEntry( libcmis::ObjectPtr pObj ) : pObject( pObj ) + ResultListEntry( com::sun::star::uno::Reference< com::sun::star::ucb::XContent > xCnt ) : xContent( xCnt ) { } @@ -43,7 +40,7 @@ namespace cmis class DataSupplier : public ucbhelper::ResultSetDataSupplier { private: - com::sun::star::uno::Reference< ::cmis::Content > mxContent; + ChildrenProvider* m_pChildrenProvider; com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; sal_Int32 mnOpenMode; bool mbCountFinal; @@ -52,7 +49,8 @@ namespace cmis public: DataSupplier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const com::sun::star::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); + ChildrenProvider* pChildrenProvider, sal_Int32 nOpenMode ); + virtual ~DataSupplier(); virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); -- cgit v1.2.3