[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source

Dennis Francis (via logerrit) logerrit at kemper.freedesktop.org
Mon Feb 24 13:14:00 UTC 2020


 chart2/source/controller/main/ChartController_Window.cxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit eea0bc558fc1ac8d5c1537df2cf95f73720f3620
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Fri Feb 21 17:02:32 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 24 14:13:29 2020 +0100

    Remove unused lokit-only selection properties in..
    
    CID string for charts. This is messing up the parsing of
    CID string in ObjectIdentifier::getObjectType() and elsewhere
    where parsing CID is attempted, which inturn causes at least
    the sidebar's chart line properties listboxes not getting
    updated.
    
    The selection properties insertion in chart CID was introduced in commit
    
    3d705b98ca7f40a44f632f5565407274322ffde3
    
    but these are not even used in online as of present.
    
    Change-Id: Ic8040d84e1ad16f182fc7bdc3a9f533ad9664458
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89300
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index e3d65bd670d7..8cd01a2e1e09 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1691,17 +1691,6 @@ uno::Any SAL_CALL ChartController::getSelection()
         OUString aCID( m_aSelection.getSelectedCID() );
         if ( !aCID.isEmpty() )
         {
-            if ( comphelper::LibreOfficeKit::isActive() )
-            {
-                sal_Int32 nPos = aCID.lastIndexOf('/');
-                OUString sFirst = aCID.copy(0, nPos);
-                OUString sSecond = aCID.copy(nPos);
-                aCID = sFirst;
-                aCID += "/Draggable=" + OUString::number(static_cast<int>(isSelectedObjectDraggable()));
-                aCID += ":Resizable=" + OUString::number(static_cast<int>(isSelectedObjectResizable()));
-                aCID += ":Rotatable=" + OUString::number(static_cast<int>(isSelectedObjectRotatable()));
-                aCID += sSecond;
-            }
             aReturn <<= aCID;
         }
         else


More information about the Libreoffice-commits mailing list