summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2013-03-18 11:02:54 +0100
committerThorsten Behrens <tbehrens@suse.com>2013-03-18 11:10:24 +0100
commitb32c31cc9c1dc11251196a4bfbba7d8848581d43 (patch)
treeeb97d2a42388f82c39eda28a086120c88ded3d06
parent4343c497173e4e2c3066b63d4e71c46bfc475008 (diff)
Fix crash in fdo#62119
This fixes the crash, not the missing line styles. Change-Id: I762fb58831ac44bdab7f02101acf7ccb58172ee9
-rw-r--r--svx/source/dialog/dlgctrl.cxx18
1 files changed, 18 insertions, 0 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index e35724641dee..4d65bb7f1692 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -917,6 +917,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorLB(Window *pParent, Vc
void ColorLB::Fill( const XColorListRef &pColorTab )
{
+ if( !pColorTab.is() )
+ return;
+
long nCount = pColorTab->Count();
XColorEntry* pEntry;
SetUpdateMode( sal_False );
@@ -972,6 +975,9 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_Tr
void HatchingLB::Fill( const XHatchListRef &pList )
{
+ if( !pList.is() )
+ return;
+
mpList = pList;
XHatchEntry* pEntry;
long nCount = pList->Count();
@@ -1106,6 +1112,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent,
void GradientLB::Fill( const XGradientListRef &pList )
{
+ if( !pList.is() )
+ return;
+
mpList = pList;
XGradientEntry* pEntry;
long nCount = pList->Count();
@@ -1288,6 +1297,9 @@ void BitmapLB::SetVirtualDevice()
void BitmapLB::Fill( const XBitmapListRef &pList )
{
+ if( !pList.is() )
+ return;
+
mpList = pList;
XBitmapEntry* pEntry;
const long nCount(pList->Count());
@@ -1455,6 +1467,9 @@ void FillTypeLB::Fill()
void LineLB::Fill( const XDashListRef &pList )
{
+ if( !pList.is() )
+ return;
+
long nCount = pList->Count();
XDashEntry* pEntry;
SetUpdateMode( sal_False );
@@ -1524,6 +1539,9 @@ void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
void LineEndLB::Fill( const XLineEndListRef &pList, sal_Bool bStart )
{
+ if( !pList.is() )
+ return;
+
long nCount = pList->Count();
XLineEndEntry* pEntry;
VirtualDevice aVD;