Kaydet (Commit) b32c31cc authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Fix crash in fdo#62119

This fixes the crash, not the missing line styles.

Change-Id: I762fb58831ac44bdab7f02101acf7ccb58172ee9
üst 4343c497
...@@ -917,6 +917,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorLB(Window *pParent, Vc ...@@ -917,6 +917,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorLB(Window *pParent, Vc
void ColorLB::Fill( const XColorListRef &pColorTab ) void ColorLB::Fill( const XColorListRef &pColorTab )
{ {
if( !pColorTab.is() )
return;
long nCount = pColorTab->Count(); long nCount = pColorTab->Count();
XColorEntry* pEntry; XColorEntry* pEntry;
SetUpdateMode( sal_False ); SetUpdateMode( sal_False );
...@@ -972,6 +975,9 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_Tr ...@@ -972,6 +975,9 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_Tr
void HatchingLB::Fill( const XHatchListRef &pList ) void HatchingLB::Fill( const XHatchListRef &pList )
{ {
if( !pList.is() )
return;
mpList = pList; mpList = pList;
XHatchEntry* pEntry; XHatchEntry* pEntry;
long nCount = pList->Count(); long nCount = pList->Count();
...@@ -1106,6 +1112,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent, ...@@ -1106,6 +1112,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent,
void GradientLB::Fill( const XGradientListRef &pList ) void GradientLB::Fill( const XGradientListRef &pList )
{ {
if( !pList.is() )
return;
mpList = pList; mpList = pList;
XGradientEntry* pEntry; XGradientEntry* pEntry;
long nCount = pList->Count(); long nCount = pList->Count();
...@@ -1288,6 +1297,9 @@ void BitmapLB::SetVirtualDevice() ...@@ -1288,6 +1297,9 @@ void BitmapLB::SetVirtualDevice()
void BitmapLB::Fill( const XBitmapListRef &pList ) void BitmapLB::Fill( const XBitmapListRef &pList )
{ {
if( !pList.is() )
return;
mpList = pList; mpList = pList;
XBitmapEntry* pEntry; XBitmapEntry* pEntry;
const long nCount(pList->Count()); const long nCount(pList->Count());
...@@ -1455,6 +1467,9 @@ void FillTypeLB::Fill() ...@@ -1455,6 +1467,9 @@ void FillTypeLB::Fill()
void LineLB::Fill( const XDashListRef &pList ) void LineLB::Fill( const XDashListRef &pList )
{ {
if( !pList.is() )
return;
long nCount = pList->Count(); long nCount = pList->Count();
XDashEntry* pEntry; XDashEntry* pEntry;
SetUpdateMode( sal_False ); SetUpdateMode( sal_False );
...@@ -1524,6 +1539,9 @@ void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) ...@@ -1524,6 +1539,9 @@ void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
void LineEndLB::Fill( const XLineEndListRef &pList, sal_Bool bStart ) void LineEndLB::Fill( const XLineEndListRef &pList, sal_Bool bStart )
{ {
if( !pList.is() )
return;
long nCount = pList->Count(); long nCount = pList->Count();
XLineEndEntry* pEntry; XLineEndEntry* pEntry;
VirtualDevice aVD; VirtualDevice aVD;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment