[Libreoffice] [PATCH] frm::OInterfaceContainer::insertByIndex must not crash for null argument.

2011-09-06 Thread Stephan Bergmann 
Found a regression from a recent Disable fake VBA events for the 
old-style form controls commit that causes the forms/qa/unoapi check to 
fail.  Attached patch fixes it.


-Stephan
From 9bea29af5a3fd86031e28bb8b4ca3f445f3eca96 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann sberg...@redhat.com
Date: Tue, 6 Sep 2011 10:58:50 +0200
Subject: [PATCH] frm::OInterfaceContainer::insertByIndex must not crash for
 null argument.

Regression introduced with 4fae740db79d4e7cc97440e2bab8d1ef612d9b51;
caused forms/qa/unoapi check to fail.
---
 forms/source/misc/InterfaceContainer.cxx |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/forms/source/misc/InterfaceContainer.cxx 
b/forms/source/misc/InterfaceContainer.cxx
index af24414..ff5b9c7 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -827,14 +827,6 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, 
const Reference XProper
 sal_Bool _bEvents, ElementDescription* _pApprovalResult, sal_Bool _bFire ) 
throw( IllegalArgumentException )
 {
 const bool bHandleEvents = _bEvents  m_xEventAttacher.is();
-bool bHandleVbaEvents = false;
-try
-{
-_rxElement-getPropertyValue(rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM(GenerateVbaEvents) ) ) = bHandleVbaEvents;
-}
-catch( const Exception )
-{
-}
 
 // SYNCHRONIZED -
 ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -890,6 +882,14 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, 
const Reference XProper
 // - SYNCHRONIZED
 
 // insert faked VBA events?
+bool bHandleVbaEvents = false;
+try
+{
+_rxElement-getPropertyValue(rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM(GenerateVbaEvents) ) ) = bHandleVbaEvents;
+}
+catch( const Exception )
+{
+}
 if ( bHandleVbaEvents )
 {
 Reference XEventAttacherManager  xMgr ( 
pElementMetaData-xInterface, UNO_QUERY );
-- 
1.7.6

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] frm::OInterfaceContainer::insertByIndex must not crash for null argument.

2011-09-06 Thread Caolán McNamara 
On Tue, 2011-09-06 at 11:07 +0200, Stephan Bergmann wrote:
 Found a regression from a recent Disable fake VBA events for the 
 old-style form controls commit that causes the forms/qa/unoapi check to 
 fail.  Attached patch fixes it.

pushed, this is part of getting the subsequent tests working again,
right ?

I think Bjoern might have a list of bugs for those somewhere FWIW.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] frm::OInterfaceContainer::insertByIndex must not crash for null argument.

2011-09-06 Thread Bjoern Michaelsen 
On Tue, 06 Sep 2011 11:00:26 +0100
Caolán McNamara caol...@redhat.com wrote:

 On Tue, 2011-09-06 at 11:07 +0200, Stephan Bergmann wrote:
  Found a regression from a recent Disable fake VBA events for the 
  old-style form controls commit that causes the forms/qa/unoapi
  check to fail.  Attached patch fixes it.
 
 pushed, this is part of getting the subsequent tests working again,
 right ?
 
 I think Bjoern might have a list of bugs for those somewhere FWIW.

Yes, there is:
https://bugs.freedesktop.org/buglist.cgi?status_whiteboard_type=anywordssubstrquery_format=advancedstatus_whiteboard=unoapitest%20complextestbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENED

(whiteboard keywords: unoapitest, complextest)

all should be blocking:
https://bugs.freedesktop.org/show_bug.cgi?id=35690

Best,

Bjoern

-- 
https://launchpad.net/~bjoern-michaelsen
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] frm::OInterfaceContainer::insertByIndex must not crash for null argument.

2011-09-06 Thread Noel Power 

Hi Stephan,
On 06/09/11 10:07, Stephan Bergmann wrote:
Found a regression from a recent Disable fake VBA events for the 
old-style form controls commit that causes the forms/qa/unoapi check 
to fail.  Attached patch fixes it.


-Stephan
thanks for fixing, ( I see Caolán pushed ) btw what exactly was null /me 
just doesn't see where/why moving the getPropertyValue makes a difference.


thanks for cc'ing me 'cause at the moment due to some problems I don't 
understand it appears I am not getting any libreoffice-dev mails at all :-/


Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] frm::OInterfaceContainer::insertByIndex must not crash for null argument.

2011-09-06 Thread Stephan Bergmann 

On 09/06/2011 12:25 PM, Noel Power wrote:

Hi Stephan,
On 06/09/11 10:07, Stephan Bergmann wrote:

Found a regression from a recent Disable fake VBA events for the
old-style form controls commit that causes the forms/qa/unoapi check
to fail. Attached patch fixes it.

-Stephan

thanks for fixing, ( I see Caolán pushed ) btw what exactly was null /me
just doesn't see where/why moving the getPropertyValue makes a difference.


The unoapi tests call insertByIndex with a null interface, 
approveNewElement called from OInterfaceContainer::implInsert checks for 
null and throws an exception, but your modification accessed _rxElement 
before it got passed to approveNewElement.


-Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice