diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-05-24 01:39:42 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-05-24 01:39:42 +0200 |
| commit | cb119a9420d68c5ae9b61dd854339b9d8de1ef9f (patch) | |
| tree | b76543b98cafdd54d26bcbd5ae0176e491b9d419 | |
| parent | 8f6b8858024a0395d685afff15d8657981593a14 (diff) | |
Post-merge fixintegration/dev300_m106
| -rw-r--r-- | starmath/qa/cppunit/makefile.mk | 2 | ||||
| -rwxr-xr-x | sw/source/core/docnode/ndnotxt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk index a61a13ed37..e1fc8e23df 100644 --- a/starmath/qa/cppunit/makefile.mk +++ b/starmath/qa/cppunit/makefile.mk @@ -96,8 +96,8 @@ test_components = \ component/framework/util/fwk \ component/toolkit/util/tk \ component/sfx2/util/sfx \ + component/vcl/vcl.$(GUIBASE) \ configmgr \ - vcl \ mcnttype \ i18npool .IF "$(OS)" == "WNT" diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index c8a3e6106a..5c71edfbf0 100755 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -158,8 +158,8 @@ const PolyPolygon *SwNoTxtNode::HasContour() const } } } - OSL_ASSERT( !bPixelGrf || aGrfMap == aContourMap, - "scale factor for pixel unsupported" ); + OSL_ENSURE( !bPixelGrf || aGrfMap == aContourMap, + "scale factor for pixel unsupported" ); OutputDevice* pOutDev = (bPixelGrf || bPixelContour) ? Application::GetDefaultDevice() : 0; diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index e21caf0f52..cf5982ac87 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -474,8 +474,7 @@ namespace if ( pMetaFile && pMetaFile->IsRecord() && !pMetaFile->IsPause() ) { - ASSERT( false, - "MapMode restoration during meta file creation is somehow suspect - using <SetRelativeMapMode(..)>, but not sure, if correct." ) + OSL_FAIL( "MapMode restoration during meta file creation is somehow suspect - using <SetRelativeMapMode(..)>, but not sure, if correct." ); mpOutDev->SetRelativeMapMode( pViewShell->getPrePostMapMode() ); } else |