extensions/Library_ldapbe2.mk | 13 +++----------
svtools/source/contnr/svimpbox.cxx | 12 ++++++++++++
2 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit 423079fd4db3163f66ab38d053f60eeec1afc2e7
Author: David Tardon <dtar...@redhat.com>
Date: Mon Feb 4 08:09:16 2013 +0100
fdo#60115 build of ldapbe2 breaks if nss is in nonstd. location
Change-Id: I32a0495edffbe13734457c230a3a1735aa254198
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index f0c053d..3e6d6b4 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -58,16 +58,9 @@ $(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\
wldap32 \
))
else # 0S!=WNT
-$(eval $(call gb_Library_use_externals,ldapbe2,openldap))
-
-$(eval $(call gb_Library_add_libs,ldapbe2,\
- -lssl3 \
- -lsmime3 \
- -lnss3 \
- -lnssutil3 \
- -lplds4 \
- -lplc4 \
- -lnspr4 \
+$(eval $(call gb_Library_use_externals,ldapbe2,\
+ nss3 \
+ openldap \
))
endif
commit adec665d2ca5265f8cad5fcd0063678909b160c9
Author: David Tardon <dtar...@redhat.com>
Date: Fri Jan 25 11:57:01 2013 +0100
rhbz#903615 avoid null ptr dereference
Change-Id: I336e3fffaaa42605b5fab2821c85c473635fbf27
diff --git a/svtools/source/contnr/svimpbox.cxx
b/svtools/source/contnr/svimpbox.cxx
index 6e60207..5d4dd02 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -348,6 +348,9 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *,
pScrollBar )
void SvImpLBox::CursorDown()
{
+ if (!pStartEntry)
+ return;
+
SvTreeListEntry* pNextFirstToDraw = pView->NextVisible(pStartEntry);
if( pNextFirstToDraw )
{
@@ -366,6 +369,9 @@ void SvImpLBox::CursorDown()
void SvImpLBox::CursorUp()
{
+ if (!pStartEntry)
+ return;
+
SvTreeListEntry* pPrevFirstToDraw = pView->PrevVisible(pStartEntry);
if( pPrevFirstToDraw )
{
@@ -391,6 +397,9 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta )
if( !nDelta )
return;
+ if (!pStartEntry)
+ return;
+
SvTreeListEntry* pNext = pView->NextVisible(pStartEntry, nRealDelta);
if( (sal_uLong)pNext == (sal_uLong)pStartEntry )
return;
@@ -428,6 +437,9 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta )
if( !nDelta )
return;
+ if (!pStartEntry)
+ return;
+
SvTreeListEntry* pPrev = pView->PrevVisible(pStartEntry, nRealDelta);
if( (sal_uLong)pPrev == (sal_uLong)pStartEntry )
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
