[Libreoffice-commits] .: Branch 'integration/dev300_m106' - starmath/qa sw/source

[Thorsten Behrens]

 starmath/qa/cppunit/makefile.mk    |    2 +-
 sw/source/core/docnode/ndnotxt.cxx |    4 ++--
 sw/source/core/draw/dflyobj.cxx    |    3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit cb119a9420d68c5ae9b61dd854339b9d8de1ef9f
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue May 24 01:39:42 2011 +0200

    Post-merge fix

diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk
index a61a13e..e1fc8e2 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 c8a3e61..5c71edf 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 e21caf0..cf5982a 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