diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:12:44 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:12:44 +0200 |
| commit | 101d6e67005573740f8448c224485d336d0a94c8 (patch) | |
| tree | 2321f6c48eb43acf25bf165dbf83ad94a29b90a0 | |
| parent | ab7fdc41234774352ff0efa1aefefd0f0a434bcb (diff) | |
| parent | 0d3ebf32562beccfbbcae0d1b56762c1dd101266 (diff) | |
CWS-TOOLING: integrate CWS impress194ooo/OOO330_m2
| -rw-r--r-- | binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx | 1 | ||||
| -rw-r--r-- | binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
3 files changed, 6 insertions, 1 deletions
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 <comphelper/classids.hxx> +#include <tools/urlobj.hxx> #include <sot/formats.hxx> #include <bf_svtools/ctrltool.hxx> 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; 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 ) |