sc/qa/unit/helper/xpath.cxx | 4 ++--
sc/qa/unit/helper/xpath.hxx | 2 +-
sc/qa/unit/subsequent_export-test.cxx | 30 +++++++++++++++---------------
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit a63c9c5de4de41d7b27fcee2c5e403145c970002
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Mar 11 01:32:26 2016 +0100
just take a reference
Change-Id: I9c156cc931fa1312df3588d86e2c592c8fd79c30
Reviewed-on: https://gerrit.libreoffice.org/23136
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/qa/unit/helper/xpath.cxx b/sc/qa/unit/helper/xpath.cxx
index 78b48dd..43dafa3 100644
--- a/sc/qa/unit/helper/xpath.cxx
+++ b/sc/qa/unit/helper/xpath.cxx
@@ -19,9 +19,9 @@
#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
-xmlDocPtr XPathHelper::parseExport(ScDocShell* pShell,
uno::Reference<lang::XMultiServiceFactory> xSFactory, const OUString& rFile,
sal_Int32 nFormat)
+xmlDocPtr XPathHelper::parseExport(ScDocShell& rShell,
uno::Reference<lang::XMultiServiceFactory> xSFactory, const OUString& rFile,
sal_Int32 nFormat)
{
- std::shared_ptr<utl::TempFile> pTempFile =
ScBootstrapFixture::exportTo(pShell, nFormat);
+ std::shared_ptr<utl::TempFile> pTempFile =
ScBootstrapFixture::exportTo(&rShell, nFormat);
// Read the XML stream we're interested in.
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(xSFactory),
pTempFile->GetURL());
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index dedd929..d45fc76 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -36,7 +36,7 @@ namespace XPathHelper
* xml stream, and asserting an XPath expression. This method returns the
* xml stream, so that you can do the asserting.
*/
- SCQAHELPER_DLLPUBLIC xmlDocPtr parseExport(ScDocShell* pShell,
uno::Reference< lang::XMultiServiceFactory> xSFactory,
+ SCQAHELPER_DLLPUBLIC xmlDocPtr parseExport(ScDocShell& rShell,
uno::Reference< lang::XMultiServiceFactory> xSFactory,
const OUString& rFile, sal_Int32 nFormat);
}
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 2bc7a18d..cf13dcb 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -1100,7 +1100,7 @@ void ScExportTest::testRichTextCellFormat()
ScDocShellRef xDocSh = loadDoc("cellformat.", FORMAT_XLS);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pSheet = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
+ xmlDocPtr pSheet = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pSheet);
// make sure the only cell in this doc is assigned some formatting record
@@ -1113,7 +1113,7 @@ void ScExportTest::testRichTextCellFormat()
//the stream anymore. I have neither knowledge nor time to debug it
ScDocShellRef xNewDocSh = loadDoc("cellformat.", FORMAT_XLS);
- xmlDocPtr pStyles = XPathHelper::parseExport(&(*xNewDocSh), m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
+ xmlDocPtr pStyles = XPathHelper::parseExport(*xNewDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pStyles);
OString nFormatIdx = OString::number( aCellFormat.toInt32() + 1 );
@@ -2162,7 +2162,7 @@ void ScExportTest::testRelativePaths()
ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"content.xml", FORMAT_ODS);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"content.xml", FORMAT_ODS);
CPPUNIT_ASSERT(pDoc);
OUString aURL = getXPath(pDoc,
"/office:document-content/office:body/office:spreadsheet/table:table/table:table-row[2]/table:table-cell[2]/text:p/text:a",
"href");
@@ -2720,7 +2720,7 @@ void ScExportTest::testSheetTextBoxHyperlink()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc,
"/xdr:wsDr[1]/xdr:twoCellAnchor[1]/xdr:sp[1]/xdr:nvSpPr[1]/xdr:cNvPr[1]/a:hlinkClick[1]",
1);
@@ -2733,7 +2733,7 @@ void ScExportTest::testFontSize()
ScDocShellRef xDocSh = loadDoc("fontSize.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString fontSize = getXPath(pDoc,
"/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:txBody/a:p[1]/a:r[1]/a:rPr", "sz");
@@ -2749,7 +2749,7 @@ void ScExportTest::testSheetCharacterKerningSpace()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString CharKerningSpace = getXPath(pDoc,
@@ -2769,7 +2769,7 @@ void ScExportTest::testSheetCondensedCharacterSpace()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString CondensedCharSpace = getXPath(pDoc,
@@ -2787,7 +2787,7 @@ void ScExportTest::testTextUnderlineColor()
ScDocShellRef xDocSh = loadDoc("underlineColor.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString color = getXPath(pDoc,
"/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:txBody/a:p[1]/a:r[1]/a:rPr/a:uFill/a:solidFill/a:srgbClr",
"val");
@@ -2803,7 +2803,7 @@ void ScExportTest::testSheetRunParagraphProperty()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/sharedStrings.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/sharedStrings.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString aColor = getXPath(pDoc, "/x:sst/x:si/x:r[1]/x:rPr[1]/x:color",
"rgb");
@@ -2818,7 +2818,7 @@ void ScExportTest::testPreserveTextWhitespaceXLSX()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/sharedStrings.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/sharedStrings.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/x:sst/x:si/x:t", "space", "preserve");
xDocSh->DoClose();
@@ -2830,7 +2830,7 @@ void ScExportTest::testPreserveTextWhitespace2XLSX()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/sharedStrings.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/sharedStrings.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/x:sst/x:si[1]/x:t", "space", "preserve");
assertXPath(pDoc, "/x:sst/x:si[2]/x:r[1]/x:t", "space", "preserve");
@@ -2843,7 +2843,7 @@ void ScExportTest::testHiddenShape()
ScDocShellRef xDocSh = loadDoc("hiddenShape.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/drawing1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc,
"/xdr:wsDr/xdr:twoCellAnchor/xdr:sp[1]/xdr:nvSpPr/xdr:cNvPr", "hidden", "1");
}
@@ -2852,7 +2852,7 @@ void ScExportTest::testHyperlinkXLSX()
ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/drawings/_rels/drawing1.xml.rels", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/drawings/_rels/drawing1.xml.rels", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/r:Relationships/r:Relationship", "Target",
"#Sheet2!A1");
}
@@ -3028,7 +3028,7 @@ void ScExportTest::testMatrixMultiplication()
ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/worksheets/sheet1.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
OUString CellFormulaRange = getXPath(pDoc,
@@ -3154,7 +3154,7 @@ void ScExportTest::testTextDirection()
ScDocShellRef xDocSh = loadDoc("writingMode.", FORMAT_XLSX);
CPPUNIT_ASSERT(xDocSh.Is());
- xmlDocPtr pDoc = XPathHelper::parseExport(&(*xDocSh), m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
+ xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/x:styleSheet/x:cellXfs/x:xf[2]/x:alignment",
"readingOrder", "1");//LTR
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
