commit d2c1bc036de4b24a0f4602fbc7fd978fa8d603eb
author Jan Holesovsky <kendy@collabora.com> Thu Mar 24 17:05:24 2016 +0100
committer Jan Holesovsky <kendy@collabora.com> Thu Mar 24 17:06:37 2016 +0100
tree a04ad3debf930f65bd83943c079d419c061590a0
parent ccabf4a408a246a931011732a5711e3b5334b17f

Disable gdrive/OneDrive/Alfresco cloud based on whether they are compiled in.

Change-Id: I81bde1f85489ede4b8c826389146ad0990d6abb6

officecfg/registry/data/org/openoffice/Office/Common.xcu

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>

svtools/source/dialogs/PlaceEditDialog.cxx

diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index ee96ad1..137cec3 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++;
    }