[ooo-build-commit] .: 2 commits - patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                         |    6 +--
 patches/vba/vba-override-base-vbaevents.diff |   47 ++++++++-------------------
 2 files changed, 16 insertions(+), 37 deletions(-)

New commits:
commit 6ed260a2d63e443331f2bb10cb6927606492677d
Author: Noel Power <noel.power at novell.com>
Date:   Wed Oct 6 13:48:26 2010 +0100

    remove sc-ooo330-m2-fixes.diff ( fixes not able to select cells )
    
    really fix the problem this patch tried to address by fixing the vba patch. This problem seems to be an unfortunate sideaffect of the collision between sun/oracle vba and our vba code interacting in an unexpected way

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cd2fd8d..bfa9db7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2744,9 +2744,6 @@ sfx2-style-edit-greyentry.diff, i#85003, simonaw
 [ Netbook ]
 netbook-window-decoration-update.diff, n#621116, rodo
 
-[ CalcFixes ]
-sc-ooo330-m2-fixes.diff, muthusuba
-
 [ OOXMLExportDevel ]
 oox-sc-notes.diff, muthusuba
 
diff --git a/patches/vba/vba-override-base-vbaevents.diff b/patches/vba/vba-override-base-vbaevents.diff
index f94bd5b..4331325 100644
--- a/patches/vba/vba-override-base-vbaevents.diff
+++ b/patches/vba/vba-override-base-vbaevents.diff
@@ -18,7 +18,7 @@ diff --git sc/source/ui/unoobj/viewuno.cxx sc/source/ui/unoobj/viewuno.cxx
 index a08c2a6..442673f 100644
 --- sc/source/ui/unoobj/viewuno.cxx
 +++ sc/source/ui/unoobj/viewuno.cxx
-@@ -460,6 +460,117 @@ void SAL_CALL ScViewPaneObj::release() throw()
+@@ -460,6 +460,95 @@ void SAL_CALL ScViewPaneObj::release() throw()
      OWeakObject::release();
  }
  
@@ -85,31 +85,9 @@ index a08c2a6..442673f 100644
 +	bSelectionChangeOccured = sal_False;
 +
 +	sal_Bool result =  sal_False;
-+    // process BeforeDoubleClick and BeforeRightClick events
-+	if( e.ClickCount == 2 || e.Buttons == ::com::sun::star::awt::MouseButton::RIGHT )
-+	{
-+		// ensure the target is a cell
-+        uno::Reference< table::XCell > xCell( e.Target, uno::UNO_QUERY );
-+		if( xCell.is() && xVbaEventsHelper.is() && pViewObj)
-+		{
-+			uno::Sequence< uno::Any > aArgs(1);
-+			aArgs[0] = pViewObj->getSelection();
-+			sal_Int32 nEventId = script::vba::VBAEventId::WORKSHEET_BEFORERIGHTCLICK;
-+			if( e.ClickCount == 2 )
-+				nEventId = script::vba::VBAEventId::WORKSHEET_BEFOREDOUBLECLICK;
-+            
-+			// TODO: process Cancel argument	
-+			try
-+			{
-+				xVbaEventsHelper->processVbaEvent( nEventId, aArgs );
-+				result = sal_True;
-+			}
-+			catch( uno::Exception& )
-+			{
-+			}
-+		}
-+	}
-+	return result;
++
++     // ScTabViewObj::MousePressed should handle process BeforeDoubleClick and BeforeRightClick events
++     return sal_True;
 +}
 +
 +sal_Bool SAL_CALL ScTabViewEventListener::mouseReleased( const awt::EnhancedMouseEvent&/*e*/) throw (uno::RuntimeException)
@@ -118,7 +96,7 @@ index a08c2a6..442673f 100644
 +	{
 +		fireSelectionChangeEvent();
 +	}
-+	return sal_False;
++	return sal_True;
 +}
 +
 +void SAL_CALL ScTabViewEventListener::selectionChanged( const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
@@ -136,7 +114,7 @@ index a08c2a6..442673f 100644
  //------------------------------------------------------------------------
  
  //	Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
-@@ -485,7 +596,19 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
+@@ -485,7 +596,22 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
      bDrawSelModeSet(sal_False)
  {
      if (pViewSh)
@@ -146,11 +124,14 @@ index a08c2a6..442673f 100644
 +	if( pViewData )
 +	{
 +            uno::Reference< script::vba::XVBAEventProcessor > xVbaEventsHelper (pViewData->GetDocument()->GetVbaEventProcessor(), uno::UNO_QUERY );
-+			ScTabViewEventListener* pEventListener = new ScTabViewEventListener( this, xVbaEventsHelper );
-+			uno::Reference< awt::XEnhancedMouseClickHandler > aMouseClickHandler( *pEventListener, uno::UNO_QUERY );
-+			addEnhancedMouseClickHandler( aMouseClickHandler );
-+            uno::Reference< view::XSelectionChangeListener > aSelectionChangeListener( *pEventListener, uno::UNO_QUERY );
-+            addSelectionChangeListener( aSelectionChangeListener );
++            if ( xVbaEventsHelper.is() )
++            {
++                ScTabViewEventListener* pEventListener = new ScTabViewEventListener( this, xVbaEventsHelper );
++                uno::Reference< awt::XEnhancedMouseClickHandler > aMouseClickHandler( *pEventListener, uno::UNO_QUERY );
++                addEnhancedMouseClickHandler( aMouseClickHandler );
++                uno::Reference< view::XSelectionChangeListener > aSelectionChangeListener( *pEventListener, uno::UNO_QUERY );
++                addSelectionChangeListener( aSelectionChangeListener );
++            }
 +	}
 +    }
  }
commit a617c8c2c683d8234f6f5b2ca9463653b46623a5
Author: Noel Power <noel.power at novell.com>
Date:   Wed Oct 6 10:05:50 2010 +0100

    disable vba-fix-logical-precedence-order.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bba0bc7..cd2fd8d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1116,7 +1116,8 @@ vbasupport-patch-roll-up.diff, i#113356, i#112998 i#113955 i#113358 i#113515 i#1
 # fix column address for Range.Cell
 vba-rangecell-colparam.diff, bnc#639297
 # fix logical Operator precendence for VBA
-vba-fix-logical-precedence-order.diff
+# disabled as it causes a regression
+#vba-fix-logical-precedence-order.diff
 # fix bug with implicit handling of XIndexAccess for
 # objects ( introduced in vbasupportdev300.diff )
 vba-fix-implicit-indexaccess.diff