[Libreoffice-commits] .: 2 commits - svx/source writerperfect/StaticLibrary_writerperfect.mk

[Lionel Elie Mamane]

 svx/source/fmcomp/fmgridif.cxx               |    3 +++
 writerperfect/StaticLibrary_writerperfect.mk |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 4b30e0cae3ec75acbd68ec449ba7a1641f6f18f9
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Sep 10 00:14:08 2011 +0200

    Proper fix for "problem with sytem wpd/wpg"

diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index ec4dfbc..67e6afc 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -30,12 +30,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
 
 $(eval $(call gb_StaticLibrary_set_include,writerperfect,\
 	$$(INCLUDE) \
-	$(LIBWPD_CFLAGS) \
-	$(LIBWPG_CFLAGS) \
     -I$(realpath $(SRCDIR)/writerperfect/source) \
 ))
 
-$(echo $(call gb_StaticLibrary_use_externals,writerperfect,\
+$(eval $(call gb_StaticLibrary_use_externals,writerperfect,\
 	wpd \
 	wpg \
 ))
commit 0ef7ce4a234c6649dcca219b96185acb7634fe34
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Sep 9 23:37:16 2011 +0200

    FmXGridPeer::getByIndex: Error checking of pGrid->GetModelColumnPos(nId) call
    
    Fixes crash of fdo#40701, but not broken feature

diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index c0b929b..6ccd37d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2436,6 +2436,9 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException,
     // get the list position
     sal_uInt16 nPos = pGrid->GetModelColumnPos(nId);
 
+    if ( nPos == GRID_COLUMN_NOT_FOUND )
+        return aElement;
+
     DbGridColumn* pCol = pGrid->GetColumns().at( nPos );
     Reference< ::com::sun::star::awt::XControl >  xControl(pCol->GetCell());
     aElement <<= xControl;