From b1cbee8ee772f061ab8791ca41b079a7a8edbaa6 Mon Sep 17 00:00:00 2001 From: sj Date: Tue, 13 Jul 2010 17:26:23 +0200 Subject: impress194: #111699# applied patch (PPTTextObj::PPTTextObj with null field) --- filter/source/msfilter/svdfppt.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index adb3329db..bd2292051 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7122,6 +7122,10 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport PPTCharPropSet* pCurrent = (PPTCharPropSet*)aCharPropList.GetObject( nIdx ); sal_Int32 nNextStringLen = pCurrent->maString.Len(); + DBG_ASSERT( pFE->pField1, "missing field!" ); + if (!pFE->pField1) + break; + const SvxURLField* pField = (const SvxURLField*)pFE->pField1->GetField(); if ( pCurrent->mpFieldItem ) -- cgit v1.2.3 From 15e165677197e7ac2691e34165f742e7023f467b Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 14 Jul 2010 14:31:23 +0200 Subject: fixed build problem (missing header file) --- binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx index ae847d20b..bed4934af 100644 --- a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx +++ b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx @@ -38,6 +38,7 @@ #include +#include #include #include -- cgit v1.2.3 From 0d3ebf32562beccfbbcae0d1b56762c1dd101266 Mon Sep 17 00:00:00 2001 From: sj Date: Thu, 15 Jul 2010 12:53:28 +0200 Subject: impress194: #i111380# applied patch --- binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx index 6b79c0515..e169646b8 100644 --- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx +++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx @@ -2023,7 +2023,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ) case MWT_IDENTITY : { maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f; - maXForm.eDx = maXForm.eDx = 0.0f; + maXForm.eDx = maXForm.eDy = 0.0f; } break; -- cgit v1.2.3