configure.ac | 2 +-
ucb/source/ucp/cmis/auth_provider.hxx | 2 +-
ucb/source/ucp/cmis/cmis_content.cxx | 2 --
ucb/source/ucp/cmis/cmis_content.hxx | 2 +-
ucb/source/ucp/cmis/cmis_provider.hxx | 2 +-
ucb/source/ucp/cmis/cmis_repo_content.cxx | 6 +++---
ucb/source/ucp/cmis/cmis_repo_content.hxx | 7 ++++---
ucb/source/ucp/cmis/cmis_url.cxx | 2 +-
8 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit b27fc4cc51d9d8bdd177d1ebfa89952ca8864720
Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr>
Date: Thu Jul 11 17:03:34 2013 +0200
Switched to use libcmis' future 0.4.0 code
This means that building with internal libcmis won't work. Make install
libcmis master code and use --with-system-libcmis to build after this
commit
Change-Id: I3df31b299cfc462436681bb36a62c626b3ce3dfe
diff --git a/configure.ac b/configure.ac
index 4f422ee..28e35e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7229,7 +7229,7 @@
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1])
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.0])
dnl ===================================================================
dnl Check for system libwpd
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx
b/ucb/source/ucp/cmis/auth_provider.hxx
index 56ea2e8..bbc0398 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -12,7 +12,7 @@
#ifndef AUTH_PROVIDER_HXX
#define AUTH_PROVIDER_HXX
-#include <libcmis/session.hxx>
+#include <libcmis/libcmis.hxx>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index cbce84b..9d4beeb 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -36,8 +36,6 @@
#include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <libcmis/document.hxx>
-
#include <comphelper/processfactory.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
#include <ucbhelper/content.hxx>
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx
b/ucb/source/ucp/cmis/cmis_content.hxx
index 56c9890..7728243 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <libcmis/session-factory.hxx>
+#include <libcmis/libcmis.hxx>
#include <list>
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx
b/ucb/source/ucp/cmis/cmis_provider.hxx
index aff705e..0dbe122 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -15,7 +15,7 @@
#include <com/sun/star/beans/Property.hpp>
#include <ucbhelper/providerhelper.hxx>
-#include <libcmis/session.hxx>
+#include <libcmis/libcmis.hxx>
namespace cmis
{
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index bc15d00..b2a0196 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -43,7 +43,7 @@ namespace cmis
{
RepoContent::RepoContent( const uno::Reference< uno::XComponentContext >&
rxContext,
ContentProvider *pProvider, const uno::Reference<
ucb::XContentIdentifier >& Identifier,
- list< libcmis::RepositoryPtr > aRepos )
+ vector< libcmis::RepositoryPtr > aRepos )
throw ( ucb::ContentCreationException )
: ContentImplHelper( rxContext, pProvider, Identifier ),
m_pProvider( pProvider ),
@@ -172,7 +172,7 @@ namespace cmis
if ( !m_sRepositoryId.isEmpty() )
{
- for ( list< libcmis::RepositoryPtr >::iterator it =
m_aRepositories.begin( );
+ for ( vector< libcmis::RepositoryPtr >::iterator it =
m_aRepositories.begin( );
it != m_aRepositories.end( ) && NULL == repo.get( ); ++it )
{
if ( STD_TO_OUSTR( ( *it )->getId( ) ) == m_sRepositoryId )
@@ -352,7 +352,7 @@ namespace cmis
if ( m_sRepositoryId.isEmpty( ) )
{
- for ( list< libcmis::RepositoryPtr >::iterator it =
m_aRepositories.begin( );
+ for ( vector< libcmis::RepositoryPtr >::iterator it =
m_aRepositories.begin( );
it != m_aRepositories.end(); ++it )
{
URL aUrl( m_aURL );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx
b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 0311f42..424cabc 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -23,8 +23,9 @@
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <libcmis/repository.hxx>
+#include <libcmis/libcmis.hxx>
+#include <vector>
#include <list>
namespace com { namespace sun { namespace star {
@@ -55,7 +56,7 @@ private:
URL m_aURL;
OUString m_sRepositoryId;
- std::list< libcmis::RepositoryPtr > m_aRepositories;
+ std::vector< libcmis::RepositoryPtr > m_aRepositories;
private:
@@ -79,7 +80,7 @@ public:
RepoContent( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext, ContentProvider
*pProvider,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& Identifier,
- std::list< libcmis::RepositoryPtr > aRepos = std::list<
libcmis::RepositoryPtr > ( ) )
+ std::vector< libcmis::RepositoryPtr > aRepos = std::vector<
libcmis::RepositoryPtr > ( ) )
throw ( com::sun::star::ucb::ContentCreationException );
virtual ~RepoContent();
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 1c08ce7..79c7a9e 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -10,7 +10,7 @@
*
*/
-#include <libcmis/session-factory.hxx>
+#include <libcmis/libcmis.hxx>
#include <rtl/uri.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
