2 files changed, 22 insertions, 22 deletions

diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 5189fc223aa5..2b105cbca164 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -519,12 +519,12 @@ void Test::testBinomInBinHor()
     pTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
 
     SmCursor aCursor(pTree, xDocShRef);
-    VirtualDevice aOutputDevice;
+    ScopedVclPtrInstance< VirtualDevice > pOutputDevice;
 
     // move forward (more than) enough places to be at the end
     int i;
     for (i = 0; i < 8; ++i)
-        aCursor.Move(&aOutputDevice, MoveRight);
+        aCursor.Move(pOutputDevice, MoveRight);
 
     // tack +d on the end, which will put the binom into an SmBinHorNode
     aCursor.InsertElement(PlusElement);
@@ -547,18 +547,18 @@ void Test::testBinVerInUnary()
     pTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
 
     SmCursor aCursor(pTree, xDocShRef);
-    VirtualDevice aOutputDevice;
+    ScopedVclPtrInstance< VirtualDevice > pOutputDevice;
 
     // move forward (more than) enough places to be at the end
     int i;
     for (i = 0; i < 3; ++i)
-        aCursor.Move(&aOutputDevice, MoveRight);
+        aCursor.Move(pOutputDevice, MoveRight);
 
     // select the operand
-    aCursor.Move(&aOutputDevice, MoveLeft, false);
+    aCursor.Move(pOutputDevice, MoveLeft, false);
     // set up a fraction
     aCursor.InsertFraction();
-    aCursor.Move(&aOutputDevice, MoveDown);
+    aCursor.Move(pOutputDevice, MoveDown);
     aCursor.InsertText("2");
 
     sExpected += " - { 1 over 2 } ";
@@ -576,7 +576,7 @@ void Test::testBinHorInSubSup()
     pTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
 
     SmCursor aCursor(pTree, xDocShRef);
-    VirtualDevice aOutputDevice;
+    ScopedVclPtrInstance< VirtualDevice > pOutputDevice;
 
     // Insert an RSup expression with a BinHor for the exponent
     aCursor.InsertText("a");
@@ -586,7 +586,7 @@ void Test::testBinHorInSubSup()
     aCursor.InsertText("c");
 
     // Move to the end and add d to the expression
-    aCursor.Move(&aOutputDevice, MoveRight);
+    aCursor.Move(pOutputDevice, MoveRight);
     aCursor.InsertElement(PlusElement);
     aCursor.InsertText("d");
 
@@ -604,30 +604,30 @@ void Test::testUnaryInMixedNumberAsNumerator()
     pTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
 
     SmCursor aCursor(pTree, xDocShRef);
-    VirtualDevice aOutputDevice;
+    ScopedVclPtrInstance< VirtualDevice > pOutputDevice;
 
     // move forward (more than) enough places to be at the end
     for (size_t i = 0; i < 3; ++i)
-        aCursor.Move(&aOutputDevice, MoveRight);
+        aCursor.Move(pOutputDevice, MoveRight);
 
     // Select the whole Unary Horizontal Node
-    aCursor.Move(&aOutputDevice, MoveLeft, false);
-    aCursor.Move(&aOutputDevice, MoveLeft, false);
+    aCursor.Move(pOutputDevice, MoveLeft, false);
+    aCursor.Move(pOutputDevice, MoveLeft, false);
 
     // Set up a fraction
     aCursor.InsertFraction();
-    aCursor.Move(&aOutputDevice, MoveDown);
+    aCursor.Move(pOutputDevice, MoveDown);
     aCursor.InsertText("2");
 
     // Move left and turn this into a mixed number
     // (bad form, but this could happen right?)
-    aCursor.Move(&aOutputDevice, MoveLeft);
-    aCursor.Move(&aOutputDevice, MoveLeft);
+    aCursor.Move(pOutputDevice, MoveLeft);
+    aCursor.Move(pOutputDevice, MoveLeft);
     aCursor.InsertText("2");
 
     // move forward (more than) enough places to be at the end
     for (size_t i = 0; i < 8; ++i)
-        aCursor.Move(&aOutputDevice, MoveRight);
+        aCursor.Move(pOutputDevice, MoveRight);
 
     // add 4 to the end
     aCursor.InsertElement(PlusElement);
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 4be2fd77ac50..5de607ce30b3 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -57,8 +57,8 @@ public:
 private:
     SfxBindings m_aBindings;
     std::unique_ptr<SfxDispatcher> m_pDispatcher;
-    std::unique_ptr<SmCmdBoxWindow> m_pSmCmdBoxWindow;
-    std::unique_ptr<SmEditWindow> m_pEditWindow;
+    VclPtr<SmCmdBoxWindow> m_pSmCmdBoxWindow;
+    VclPtr<SmEditWindow> m_pEditWindow;
     SmDocShellRef m_xDocShRef;
     SmViewShell *m_pViewShell;
 };
@@ -87,17 +87,17 @@ void Test::setUp()
     m_pDispatcher.reset(new SfxDispatcher(pViewFrame));
     m_aBindings.SetDispatcher(m_pDispatcher.get());
     m_aBindings.EnterRegistrations();
-    m_pSmCmdBoxWindow.reset(new SmCmdBoxWindow(&m_aBindings, NULL, NULL));
+    m_pSmCmdBoxWindow.reset(VclPtr<SmCmdBoxWindow>::Create(&m_aBindings, nullptr, nullptr));
     m_aBindings.LeaveRegistrations();
-    m_pEditWindow.reset(new SmEditWindow(*m_pSmCmdBoxWindow));
+    m_pEditWindow = VclPtr<SmEditWindow>::Create(*m_pSmCmdBoxWindow);
     m_pViewShell = m_pEditWindow->GetView();
     CPPUNIT_ASSERT_MESSAGE("Should have a SmViewShell", m_pViewShell);
 }
 
 void Test::tearDown()
 {
-    m_pEditWindow.reset();
-    m_pSmCmdBoxWindow.reset();
+    m_pEditWindow.disposeAndClear();
+    m_pSmCmdBoxWindow.disposeAndClear();
     m_pDispatcher.reset();
     m_xDocShRef->DoClose();
     m_xDocShRef.Clear();