[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util sc/source

[Armin Le Grand]

 instsetoo_native/util/openoffice.lst |    2 +-
 sc/source/ui/view/gridwin.cxx        |   14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 73a9e800ff4f61058750acb6840af780a0505b49
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Jun 19 11:23:41 2013 +0000

    i122497 Filter D&D flags for calc D&D

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 108525c..e397dfa 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3565,6 +3565,13 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
         {
             sal_Int8 nMyAction = rEvt.mnAction;
 
+            // clear DND_ACTION_LINK when other actions are set. The usage below cannot handle
+            // multiple set values
+            if((nMyAction & DND_ACTION_LINK) && (nMyAction & (DND_ACTION_COPYMOVE)))
+            {
+                nMyAction &= ~DND_ACTION_LINK;
+            }
+
             if ( !rData.pDrawTransfer ||
                     !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) )      // drawing within the document
                 if ( rEvt.mbDefault && nMyAction == DND_ACTION_MOVE )
@@ -3573,7 +3580,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
             ScDocument* pThisDoc = pViewData->GetDocument();
             SdrObject* pHitObj = pThisDoc->GetObjectAtPoint(
                         pViewData->GetTabNo(), PixelToLogic(rEvt.maPosPixel) );
-            if ( pHitObj && nMyAction == DND_ACTION_LINK && !rData.pDrawTransfer )
+            if ( pHitObj && nMyAction == DND_ACTION_LINK ) // && !rData.pDrawTransfer )
             {
                 if ( IsDropFormatSupported(SOT_FORMATSTR_ID_SVXB)
                     || IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE)
@@ -4191,8 +4198,9 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
     }
 
     Point aLogicPos = PixelToLogic(aPos);
+    sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
 
-    if (rData.pDrawTransfer)
+    if (!bIsLink && rData.pDrawTransfer)
     {
         sal_uInt16 nFlags = rData.pDrawTransfer->GetDragSourceFlags();
 
@@ -4228,8 +4236,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
         }
     }
 
-    sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
-
     ScDocument* pThisDoc = pViewData->GetDocument();
     SdrObject* pHitObj = pThisDoc->GetObjectAtPoint( pViewData->GetTabNo(), PixelToLogic(aPos) );
     if ( pHitObj && bIsLink )
commit ff8c8d3c169bb1adf489bca080a91fd5f7bea95f
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Wed Jun 19 10:08:34 2013 +0000

    122444: new UpdateURL to reflect new location for the XML update feeds

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index ffc9807..2de02be 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -71,7 +71,7 @@ Apache_OpenOffice
             ABOUTBOXPRODUCTVERSION 4.0.0
             BASEPRODUCTVERSION 4.0
             PCPFILENAME openoffice.pcp
-            UPDATEURL https://ooo-site.apache.org/projects/update/aoo40/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo40/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
             REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
             ADDSYSTEMINTEGRATION 1