[Libreoffice-commits] .: starmath/qa

Caolán McNamara caolan at kemper.freedesktop.org
Wed Dec 8 07:07:03 PST 2010


 starmath/qa/cppunit/test_starmath.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f8246b5b38ea60b136a416c23862e04bdb3cb16a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 8 14:40:10 2010 +0000

    cppunit: more zoom tests with standard view mode

diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 46b1296..28df945 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -80,6 +80,9 @@ private:
 };
 
 Test::Test()
+    : m_pDispatcher(NULL)
+    , m_pSmCmdBoxWindow(NULL)
+    , m_pEditWindow(NULL)
 {
     m_xContext = cppu::defaultBootstrap_InitialComponentContext();
     m_xFactory = m_xContext->getServiceManager();
@@ -99,7 +102,7 @@ Test::Test()
 void Test::setUp()
 {
     m_xDocShRef = new SmDocShell(
-        SFXMODEL_EMBEDDED_OBJECT |
+        SFXMODEL_STANDARD |
         SFXMODEL_DISABLE_EMBEDDED_SCRIPTS |
         SFXMODEL_DISABLE_DOCUMENT_RECOVERY);
     m_xDocShRef->DoInitNew(0);
@@ -345,8 +348,6 @@ void Test::tViewZoom()
         CPPUNIT_ASSERT_MESSAGE("Should be optimal zoom", nFinalZoom == nOptimalZoom);
     }
 
-#if 0
-    //TO-DO: switch from embedded to normal to get these meaningfull
     {
         SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());
         m_pViewShell->Execute(aZoomOut);
@@ -374,7 +375,6 @@ void Test::tViewZoom()
         nFinalZoom = rGraphicWindow.GetZoom();
         CPPUNIT_ASSERT_MESSAGE("Should be same as optimal zoom", nFinalZoom == nOptimalZoom);
     }
-#endif
 
     {
         SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, m_pViewShell->GetPool());


More information about the Libreoffice-commits mailing list