diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 14:14:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 08:04:40 +0000 |
| commit | 60b1c95cc47831246f097ee13dda8bcd71c57eb4 (patch) | |
| tree | 8f8ede597a247c78f3742fa46ba9777b66edb76e /svtools/qa | |
| parent | 50336412f775af154509d67b1ebbdb4b5feb147b (diff) | |
Extract Directories from BootstrapFixtureBase
(as some tests derive from the latter only for the Directories part, not for the
setUp/tearDown overrides: those tests will be cleaned up next)
Change-Id: Ib6b78eea868b8bc21d4cc6e8fd9e1d025deca05f
Reviewed-on: https://gerrit.libreoffice.org/23078
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svtools/qa')
| -rw-r--r-- | svtools/qa/unit/GraphicObjectTest.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index cbefed1f1f66..d1ee3c2abe43 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -80,7 +80,7 @@ void GraphicObjectTest::testSwap() { // simple non-linked case { - GraphicObject aGraphObj(lcl_loadGraphic(getURLFromSrc(aGraphicFile))); + GraphicObject aGraphObj(lcl_loadGraphic(m_directories.getURLFromSrc(aGraphicFile))); CPPUNIT_ASSERT(!aGraphObj.HasSwapStreamHdl()); CPPUNIT_ASSERT(!aGraphObj.IsSwappedOut()); CPPUNIT_ASSERT_EQUAL(nGraphicSizeBytes, aGraphObj.GetGraphic().GetSizeBytes()); @@ -96,7 +96,7 @@ void GraphicObjectTest::testSwap() // linked case { - GraphicObject aGraphObj(lcl_loadGraphic(getURLFromSrc(aGraphicFile))); + GraphicObject aGraphObj(lcl_loadGraphic(m_directories.getURLFromSrc(aGraphicFile))); aGraphObj.SetSwapStreamHdl(LINK(this, GraphicObjectTest, getLinkStream)); CPPUNIT_ASSERT(aGraphObj.HasSwapStreamHdl()); @@ -114,7 +114,7 @@ void GraphicObjectTest::testSwap() // combination of two GraphicObjects { - GraphicObject aGraphObj(lcl_loadGraphic(getURLFromSrc(aGraphicFile))); + GraphicObject aGraphObj(lcl_loadGraphic(m_directories.getURLFromSrc(aGraphicFile))); GraphicObject aGraphObj2(aGraphObj); aGraphObj2.SetSwapStreamHdl(LINK(this, GraphicObjectTest, getLinkStream)); @@ -155,7 +155,7 @@ void GraphicObjectTest::testSizeBasedAutoSwap() } uno::Reference< lang::XComponent > xComponent = - loadFromDesktop(getURLFromSrc("svtools/qa/unit/data/document_with_two_images.odt"), "com.sun.star.text.TextDocument"); + loadFromDesktop(m_directories.getURLFromSrc("svtools/qa/unit/data/document_with_two_images.odt"), "com.sun.star.text.TextDocument"); SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(xComponent.get()); CPPUNIT_ASSERT(pTxtDoc); @@ -246,7 +246,7 @@ void GraphicObjectTest::testTdf88935() // Load a file with two images uno::Reference< lang::XComponent > xComponent = - loadFromDesktop(getURLFromSrc("svtools/qa/unit/data/document_with_two_images.odt"), "com.sun.star.text.TextDocument"); + loadFromDesktop(m_directories.getURLFromSrc("svtools/qa/unit/data/document_with_two_images.odt"), "com.sun.star.text.TextDocument"); SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(xComponent.get()); CPPUNIT_ASSERT(pTxtDoc); SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc(); |