[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry svtools/source

[Jan Holesovsky]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |    8 +++----
 svtools/source/dialogs/PlaceEditDialog.cxx               |   16 ++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 9baa30bcabb7259c3497db6fa774de2a588ae017
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Thu Mar 24 17:05:24 2016 +0100

    Disable gdrive/OneDrive/Alfresco cloud based on whether they are compiled 
in.
    
    Change-Id: I81bde1f85489ede4b8c826389146ad0990d6abb6
    Reviewed-on: https://gerrit.libreoffice.org/23496
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: David Tardon <dtar...@redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 3441172..7cf3e97 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -561,8 +561,8 @@
     <prop oor:name="CmisServersUrls">
       <value>
         <it>https://www.googleapis.com/drive/v2</it>
-        <!-- <it>https://apis.live.net/v5.0</it>
-        <it>https://api.alfresco.com/cmis/versions/1.0/atom/</it> -->
+        <it>https://apis.live.net/v5.0</it>
+        <it>https://api.alfresco.com/cmis/versions/1.0/atom/</it>
         <it></it>
         <it>http://&lt;host:port&gt;/alfresco/cmisatom</it>
         <it>http://&lt;host&gt;/p8cmis/wsdl</it>
@@ -580,8 +580,8 @@
     <prop oor:name="CmisServersNames">
       <value>
         <it>Google Drive</it>
-        <!-- <it>OneDrive</it>
-        <it>Alfresco Cloud</it> -->
+        <it>OneDrive</it>
+        <it>Alfresco Cloud</it>
         <it>--------------------</it>
         <it>Alfresco 4</it>
         <it>IBM FileNet P8</it>
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx 
b/svtools/source/dialogs/PlaceEditDialog.cxx
index b062b93..9d0a08e 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -173,19 +173,21 @@ void PlaceEditDialog::InitDetails( )
     for ( sal_Int32 i = 0; i < aTypesUrlsList.getLength( ) && 
aTypesNamesList.getLength( ); ++i )
     {
         OUString sUrl = aTypesUrlsList[i];
+
+        if ((sUrl == GDRIVE_BASE_URL && bSkipGDrive) ||
+            (sUrl.startsWith( ALFRESCO_CLOUD_BASE_URL) && bSkipAlfresco) ||
+            (sUrl == ONEDRIVE_BASE_URL && bSkipOneDrive))
+        {
+            // this service is not supported
+            continue;
+        }
+
         nPos = m_pLBServerType->InsertEntry( aTypesNamesList[i], nPos );
 
         std::shared_ptr<DetailsContainer> 
xCmisDetails(std::make_shared<CmisDetailsContainer>(this, sUrl));
         xCmisDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
         m_aDetailsContainers.push_back(xCmisDetails);
 
-        if ( ( sUrl == GDRIVE_BASE_URL && bSkipGDrive ) ||
-             ( sUrl.startsWith( ALFRESCO_CLOUD_BASE_URL ) && bSkipAlfresco ) ||
-             ( sUrl == ONEDRIVE_BASE_URL && bSkipOneDrive ) )
-        {
-            xCmisDetails->setActive( false );
-        }
-
         nPos++;
     }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits