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>

1 files changed, 14 insertions, 14 deletions

diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx
index e5d8ccea386d..5302c165fc31 100644
--- a/oox/qa/unit/vba_compression.cxx
+++ b/oox/qa/unit/vba_compression.cxx
@@ -84,8 +84,8 @@ void ReadFiles(const OUString& rTestFile, const OUString& rReference,
 
 void TestVbaCompression::testSimple1()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/simple1.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/simple1.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/simple1.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/simple1.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -107,8 +107,8 @@ void TestVbaCompression::testSimple1()
 
 void TestVbaCompression::testSimple2()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/simple2.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/simple2.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/simple2.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/simple2.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -129,8 +129,8 @@ void TestVbaCompression::testSimple2()
 
 void TestVbaCompression::testSimple3()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/simple3.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/simple3.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/simple3.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/simple3.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -151,8 +151,8 @@ void TestVbaCompression::testSimple3()
 
 void TestVbaCompression::testComplex1()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/complex1.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/complex1.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/complex1.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/complex1.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -173,8 +173,8 @@ void TestVbaCompression::testComplex1()
 
 void TestVbaCompression::testSpec321()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec321.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/spec321.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/spec321.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/spec321.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -195,8 +195,8 @@ void TestVbaCompression::testSpec321()
 
 void TestVbaCompression::testSpec322()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec322.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/spec322.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/spec322.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/spec322.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);
@@ -217,8 +217,8 @@ void TestVbaCompression::testSpec322()
 
 void TestVbaCompression::testSpec323()
 {
-    OUString aTestFile = getPathFromSrc("/oox/qa/unit/data/vba/spec323.bin");
-    OUString aReference = getPathFromSrc("/oox/qa/unit/data/vba/reference/spec323.bin");
+    OUString aTestFile = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/spec323.bin");
+    OUString aReference = m_directories.getPathFromSrc("/oox/qa/unit/data/vba/reference/spec323.bin");
 
     SvMemoryStream aOutputMemoryStream(4096, 4096);
     SvMemoryStream aReferenceMemoryStream(4096, 4096);