sd/qa/unit/import-tests.cxx | 66 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 33 deletions(-)
New commits:
commit c52bc46136d24557ca142ee2d143be1ee7a0f4cf
Author: Robert Antoni Buj Gelonch <robert....@gmail.com>
Date: Tue May 26 11:40:17 2015 +0200
Coding style: removing the scope resolution operator in xDocShRef
declarations
Change-Id: Ie88d2f3d6af3553976ebe0d299c4e9f31443cda6
Signed-off-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 440271e..111f1d8 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -200,7 +200,7 @@ void SdImportTest::testDocumentLayout()
{
int nUpdateMe = -1; // index of test we want to update; supposedly
only when the test is created
- ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc(
"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ),
aFilesToCompare[i].nFormat );
+ sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc(
"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ),
aFilesToCompare[i].nFormat );
if( aFilesToCompare[i].nExportType >= 0 )
xDocShRef = saveAndReload( xDocShRef,
aFilesToCompare[i].nExportType );
compareWithShapesDump( xDocShRef,
@@ -211,7 +211,7 @@ void SdImportTest::testDocumentLayout()
void SdImportTest::testSmoketest()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -239,7 +239,7 @@ void SdImportTest::testSmoketest()
void SdImportTest::testN759180()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/n759180.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/n759180.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -277,7 +277,7 @@ void SdImportTest::testN759180()
void SdImportTest::testN862510_1()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_1.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_1.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -302,7 +302,7 @@ void SdImportTest::testN862510_1()
void SdImportTest::testN862510_2()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_2.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_2.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -321,7 +321,7 @@ void SdImportTest::testN862510_2()
void SdImportTest::testN862510_4()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_4.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_4.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -346,7 +346,7 @@ void SdImportTest::testN862510_4()
void SdImportTest::testN828390_2()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_2.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_2.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -366,7 +366,7 @@ void SdImportTest::testN828390_2()
void SdImportTest::testN828390_3()
{
bool bPassed = true;
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_3.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_3.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -398,7 +398,7 @@ void SdImportTest::testN828390_3()
void SdImportTest::testMasterPageStyleParent()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/odp/masterpage_style_parent.odp"), ODP );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/odp/masterpage_style_parent.odp"), ODP );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -437,7 +437,7 @@ void SdImportTest::testMasterPageStyleParent()
void SdImportTest::testN778859()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -456,7 +456,7 @@ void SdImportTest::testN778859()
void SdImportTest::testFdo68594()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/ppt/fdo68594.ppt"), PPT);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/ppt/fdo68594.ppt"), PPT);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -475,7 +475,7 @@ void SdImportTest::testFdo68594()
void SdImportTest::testFdo72998()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/cshapes.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/cshapes.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -505,7 +505,7 @@ std::ostream& operator<<(std::ostream& rStrm, const Color&
rColor)
void SdImportTest::testFdo77027()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/odp/fdo77027.odp"), ODP);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/odp/fdo77027.odp"), ODP);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -529,7 +529,7 @@ void SdImportTest::testFdo77027()
void SdImportTest::testFdo64512()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo64512.odp"), ODP);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo64512.odp"), ODP);
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -574,7 +574,7 @@ void SdImportTest::testFdo71075()
{
double values[] = { 12.0, 13.0, 14.0 };
::com::sun::star::uno::Any aAny;
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71075.odp"), ODP);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71075.odp"), ODP);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -616,7 +616,7 @@ void SdImportTest::testFdo71075()
void SdImportTest::testStrictOOXML()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/strict_ooxml.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/strict_ooxml.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -630,7 +630,7 @@ void SdImportTest::testStrictOOXML()
void SdImportTest::testBnc870237()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870237.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870237.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -663,7 +663,7 @@ void SdImportTest::testCreationDate()
void SdImportTest::testBnc887225()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/bnc887225.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/bnc887225.pptx"), PPTX );
// In the document, lastRow and lastCol table properties are used.
// Make sure styles are set properly for individual cells.
@@ -711,7 +711,7 @@ void SdImportTest::testBnc887225()
void SdImportTest::testBnc480256()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc480256.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc480256.pptx"), PPTX);
// In the document, there are two tables with table background properties.
// Make sure colors are set properly for individual cells.
@@ -770,7 +770,7 @@ void SdImportTest::testBnc584721_1()
{
// Title text shape on the master page contained wrong text.
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -788,7 +788,7 @@ void SdImportTest::testBnc584721_2()
{
// Import created an extra/unneeded outliner shape on the master slide
next to the imported title shape.
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -804,7 +804,7 @@ void SdImportTest::testBnc584721_3()
// Subtitle was simply skipped on master slides.
// Check whether the second shape is a subtitle shape with the right text.
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_3.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_3.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -826,7 +826,7 @@ void SdImportTest::testBnc584721_3()
void SdImportTest::testBnc591147()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc591147.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc591147.pptx"), PPTX);
// In the document, there are two slides with media files.
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
@@ -865,7 +865,7 @@ void SdImportTest::testBnc584721_4()
{
// Black text was imported as white because of wrong caching mechanism
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_4.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_4.pptx"), PPTX);
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -904,7 +904,7 @@ void SdImportTest::testBnc904423()
{
// Here the problem was that different fill properties were applied in
wrong order on the shape
// Right order: 1) master slide fill style, 2) theme, 3) direct formatting
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("sd/qa/unit/data/pptx/bnc904423.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("sd/qa/unit/data/pptx/bnc904423.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -957,7 +957,7 @@ void SdImportTest::testShapeLineStyle()
{
// Here the problem was that different line properties were applied in
wrong order on the shape
// Right order: 1) master slide line style, 2) theme, 3) direct formatting
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("sd/qa/unit/data/pptx/ShapeLineProperties.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("sd/qa/unit/data/pptx/ShapeLineProperties.pptx"), PPTX);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -1024,7 +1024,7 @@ void SdImportTest::testShapeLineStyle()
void SdImportTest::testBnc862510_6()
{
// Black text was imported instead of gray
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_6.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_6.pptx"), PPTX);
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -1062,7 +1062,7 @@ void SdImportTest::testBnc862510_6()
void SdImportTest::testBnc862510_7()
{
// Title shape's text was aligned to left instead of center.
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_7.pptx"), PPTX);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_7.pptx"), PPTX);
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -1095,7 +1095,7 @@ void SdImportTest::testBnc862510_7()
void SdImportTest::testPDFImport()
{
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
uno::Reference< drawing::XDrawPagesSupplier >
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -1115,7 +1115,7 @@ void SdImportTest::testPDFImportSkipImages()
SfxAllItemSet *pParams = new SfxAllItemSet( SfxGetpApp()->GetPool() );
pParams->Put( SfxStringItem ( SID_FILE_FILTEROPTIONS,
OUString("SkipImages") ) );
- ::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF, pParams);
+ sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF, pParams);
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
uno::Reference< drawing::XDrawPagesSupplier >
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -1134,7 +1134,7 @@ void SdImportTest::testPDFImportSkipImages()
void SdImportTest::testBulletSuffix()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n83889.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n83889.pptx"), PPTX );
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
@@ -1159,7 +1159,7 @@ void SdImportTest::testBulletSuffix()
void SdImportTest::testBnc910045()
{
// Problem with table style which defines cell color with fill style
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/bnc910045.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/bnc910045.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -1179,7 +1179,7 @@ void SdImportTest::testBnc910045()
void SdImportTest::testRowHeight()
{
- ::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n80340.pptx"), PPTX );
+ sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n80340.pptx"), PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
