#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2

1 files changed, 31 insertions, 31 deletions

diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 11ba30252..32db53290 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -67,7 +67,7 @@ public:
         mpTestView = createTestView();
         maViews.addView( mpTestView );
 
-        mpLayerManager.reset( 
+        mpLayerManager.reset(
             new target::LayerManager(
                 maViews,
                 basegfx::B2DRange(0.0,0.0,100.0,100.0),
@@ -82,37 +82,37 @@ public:
 
     void testLayer()
     {
-        target::LayerSharedPtr pBgLayer( 
+        target::LayerSharedPtr pBgLayer(
             target::Layer::createBackgroundLayer( basegfx::B2DRange(0,0,100,100) ) );
         pBgLayer->addView( mpTestView );
 
-        target::LayerSharedPtr pFgLayer( 
+        target::LayerSharedPtr pFgLayer(
             target::Layer::createLayer( basegfx::B2DRange(0,0,100,100) ) );
         pFgLayer->addView( mpTestView );
 
-        CPPUNIT_ASSERT_MESSAGE( "BG layer must confess that!", 
+        CPPUNIT_ASSERT_MESSAGE( "BG layer must confess that!",
                                 pBgLayer->isBackgroundLayer() );
-        CPPUNIT_ASSERT_MESSAGE( "FG layer lies!", 
+        CPPUNIT_ASSERT_MESSAGE( "FG layer lies!",
                                 !pFgLayer->isBackgroundLayer() );
 
-        CPPUNIT_ASSERT_MESSAGE( "BG layer must not have pending updates!", 
+        CPPUNIT_ASSERT_MESSAGE( "BG layer must not have pending updates!",
                                 !pBgLayer->isUpdatePending() );
         pBgLayer->addUpdateRange( basegfx::B2DRange(0,0,10,10) );
-        CPPUNIT_ASSERT_MESSAGE( "BG layer must have pending updates!", 
+        CPPUNIT_ASSERT_MESSAGE( "BG layer must have pending updates!",
                                 pBgLayer->isUpdatePending() );
 
         TestShapeSharedPtr pTestShape = createTestShape(
             basegfx::B2DRange(0.0,0.0,1000.0,1000.0),
             1.0);
         pBgLayer->updateBounds( pTestShape );
-        CPPUNIT_ASSERT_MESSAGE( "BG layer must not resize!", 
+        CPPUNIT_ASSERT_MESSAGE( "BG layer must not resize!",
                                 !pBgLayer->commitBounds() );
 
         TestShapeSharedPtr pTestShape2 = createTestShape(
             basegfx::B2DRange(0.0,0.0,1.0,1.0),
             1.0);
         pFgLayer->updateBounds( pTestShape2 );
-        CPPUNIT_ASSERT_MESSAGE( "FG layer must resize!", 
+        CPPUNIT_ASSERT_MESSAGE( "FG layer must resize!",
                                 pFgLayer->commitBounds() );
     }
 
@@ -120,36 +120,36 @@ public:
     {
         mpLayerManager->activate( false );
 
-        CPPUNIT_ASSERT_MESSAGE( "Un-added shape must have zero view layers", 
+        CPPUNIT_ASSERT_MESSAGE( "Un-added shape must have zero view layers",
                                 mpTestShape->getViewLayers().empty() );
         mpLayerManager->addShape(mpTestShape);
-        CPPUNIT_ASSERT_MESSAGE( "Adding a shape requires a LayerManager update", 
+        CPPUNIT_ASSERT_MESSAGE( "Adding a shape requires a LayerManager update",
                                 mpLayerManager->isUpdatePending() );
 
         // update does the delayed viewAdded call to the shape
-        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", 
+        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager",
                                 mpLayerManager->update() );
-        CPPUNIT_ASSERT_MESSAGE( "Added shape must have one view layer", 
+        CPPUNIT_ASSERT_MESSAGE( "Added shape must have one view layer",
                                 mpTestShape->getViewLayers().size() == 1 );
-        CPPUNIT_ASSERT_MESSAGE( "Shape must been rendered", 
+        CPPUNIT_ASSERT_MESSAGE( "Shape must been rendered",
                                 mpTestShape->getNumRenders() );
-        CPPUNIT_ASSERT_MESSAGE( "Shape must not been updated", 
+        CPPUNIT_ASSERT_MESSAGE( "Shape must not been updated",
                                 !mpTestShape->getNumUpdates() );
 
         // test second view, check whether shape gets additional view
         TestViewSharedPtr pTestView( createTestView() );
-        CPPUNIT_ASSERT_MESSAGE( "Adding second View failed", 
+        CPPUNIT_ASSERT_MESSAGE( "Adding second View failed",
                                 maViews.addView( pTestView ) );
-        CPPUNIT_ASSERT_MESSAGE( "View container must have two views", 
+        CPPUNIT_ASSERT_MESSAGE( "View container must have two views",
                                 maViews.end() - maViews.begin() == 2 );
         mpLayerManager->viewAdded(pTestView);
-        CPPUNIT_ASSERT_MESSAGE( "Added shape must have two view layers", 
+        CPPUNIT_ASSERT_MESSAGE( "Added shape must have two view layers",
                                 mpTestShape->getViewLayers().size() == 2 );
 
-        CPPUNIT_ASSERT_MESSAGE( "Removing second View failed", 
+        CPPUNIT_ASSERT_MESSAGE( "Removing second View failed",
                                 maViews.removeView( pTestView ) );
         mpLayerManager->viewRemoved(pTestView);
-        CPPUNIT_ASSERT_MESSAGE( "Added shape must have one view layer", 
+        CPPUNIT_ASSERT_MESSAGE( "Added shape must have one view layer",
                                 mpTestShape->getViewLayers().size() == 1 );
 
         mpLayerManager->deactivate();
@@ -175,28 +175,28 @@ public:
         mpLayerManager->activate( false );
 
         // update does the delayed viewAdded call to the shape
-        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", 
+        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager",
                                 mpLayerManager->update() );
-        CPPUNIT_ASSERT_MESSAGE( "View must have background layer only", 
+        CPPUNIT_ASSERT_MESSAGE( "View must have background layer only",
                                 mpTestView->getViewLayers().empty() );
 
         // LayerManager must now generate one extra view layer
         mpLayerManager->enterAnimationMode(pShape2);
-        CPPUNIT_ASSERT_MESSAGE( "No update pending on LayerManager", 
+        CPPUNIT_ASSERT_MESSAGE( "No update pending on LayerManager",
                                 mpLayerManager->isUpdatePending() );
-        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager", 
+        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager",
                                 mpLayerManager->update() );
-        CPPUNIT_ASSERT_MESSAGE( "View must have one extra layer only", 
+        CPPUNIT_ASSERT_MESSAGE( "View must have one extra layer only",
                                 mpTestView->getViewLayers().size() == 1 );
-        CPPUNIT_ASSERT_MESSAGE( "View layer must have 10x10 size", 
-                                mpTestView->getViewLayers().at(0)->getBounds() == 
+        CPPUNIT_ASSERT_MESSAGE( "View layer must have 10x10 size",
+                                mpTestView->getViewLayers().at(0)->getBounds() ==
                                 basegfx::B2DRange(0.0,0.0,10.0,10.0) );
 
         // LayerManager must now remove the extra view layer
         mpLayerManager->leaveAnimationMode(pShape2);
-        CPPUNIT_ASSERT_MESSAGE( "No update pending on LayerManager", 
+        CPPUNIT_ASSERT_MESSAGE( "No update pending on LayerManager",
                                 mpLayerManager->isUpdatePending() );
-        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager #2", 
+        CPPUNIT_ASSERT_MESSAGE( "Update failed on LayerManager #2",
                                 mpLayerManager->update() );
         CPPUNIT_ASSERT_MESSAGE( "Shape 1 must be on background layer", 
                                 mpTestShape->getViewLayers().at(0).first == mpTestView );