Cmis: Fixed the installation of the new UCP provider and libcmis

6 files changed, 26 insertions, 3 deletions

diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index 8cd6d143fae0..58d6e4167c8e 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -202,7 +202,7 @@
                 <value>com.sun.star.ucb.CmisContentProvider</value>
               </prop>
               <prop oor:name="URLTemplate">
-                <value>vnd.sun.star.cmis</value>
+                <value>cmis+atom</value>
               </prop>
               <prop oor:name="Arguments">
                 <value/>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 8c5a21463a2c..a96049af770c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -160,6 +160,7 @@ my_components = \
     stringresource \
     syssh \
     ucb1 \
+	ucpcmis \
     ucpexpand1 \
     ucpext \
     ucpfile1 \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 568ab94e3a65..ec58f59de245 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -186,6 +186,25 @@ End
 
 #endif
 
+File gid_File_Lib_Cmis
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    #ifdef MACOSX
+       Name = STRING(CONCAT2(libcmis-0.2.0,UNXSUFFIX));
+    #else
+       Name = STRING(CONCAT3(libcmis-0.2,UNXSUFFIX,.0));
+    #endif
+  #else
+   #ifdef _gcc3
+    Name = "libcmis-0.2.dll";
+   #else
+    Name = "libcmis.dll";
+   #endif
+  #endif
+End
+
 #ifndef SYSTEM_DB
 
 File gid_File_Lib_Db
@@ -1333,6 +1352,8 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 #endif
 
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
+
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3ba48efa2d49..0865fb8094c2 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -340,6 +340,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Comphelper2,
 	gid_File_Lib_Cached1,
+	gid_File_Lib_Cmis,
 	gid_File_Lib_Curl,
 	gid_Unixlink_File_Lib_Curl,
 	gid_File_Lib_Db,
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index c1031789344a..55c91202f814 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2136,7 +2136,7 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin,
             { ".uno:", "staroffice.uno:", INET_PROT_UNO,
               PrefixInfo::INTERNAL },
             { "cid:", 0, INET_PROT_CID, PrefixInfo::OFFICIAL },
-            { "cmis+atom:", 0, INET_PROT_CMIS_ATOM, PrefixInfo::EXTERNAL },
+            { "cmis+atom:", 0, INET_PROT_CMIS_ATOM, PrefixInfo::INTERNAL },
             { "data:", 0, INET_PROT_DATA, PrefixInfo::OFFICIAL },
             { "db:", "staroffice.db:", INET_PROT_DB, PrefixInfo::INTERNAL },
             { "file:", 0, INET_PROT_FILE, PrefixInfo::OFFICIAL },
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 122f8fead402..297737c5a026 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -46,7 +46,7 @@ ContentProvider::queryContent(
            uno::RuntimeException )
 {
 #ifdef DEBUG
-    fprintf(stderr, "QueryContent: '%s'",
+    fprintf(stderr, "QueryContent: '%s'\n",
        (const sal_Char *)rtl::OUStringToOString
        (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
 #endif