diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-28 12:01:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-29 09:50:19 +0200 |
| commit | a2795356608c9de3679ccd3076c7df14cb549d8b (patch) | |
| tree | 327bd5f473f476ef96843438898e506964d50f38 /sd/qa | |
| parent | b0f7efe83096655348d32782636bf0f54d837834 (diff) | |
com::sun::star->css in sd
Change-Id: Ic0cbc857a3a9c66241b94c30bf8c859435f5a4b4
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 6 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index ee6a4167a811..96ef8094d770 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1246,8 +1246,8 @@ void SdExportTest::testCellLeftAndRightMargin() sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); CPPUNIT_ASSERT( pTableObj ); - uno::Reference< com::sun::star::table::XTable > xTable (pTableObj->getTable(), uno::UNO_QUERY_THROW); - uno::Reference< com::sun::star::table::XMergeableCell > xCell( xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); + uno::Reference< css::table::XTable > xTable (pTableObj->getTable(), uno::UNO_QUERY_THROW); + uno::Reference< css::table::XMergeableCell > xCell( xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCellPropSet(xCell, uno::UNO_QUERY_THROW); uno::Any aLeftMargin = xCellPropSet->getPropertyValue("TextLeftDistance"); @@ -1286,7 +1286,7 @@ void SdExportTest::testTableCellBorder() table::BorderLine2 aBorderLine; uno::Reference< table::XTable > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW); - uno::Reference< com::sun::star::table::XMergeableCell > xCell(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW); + uno::Reference< css::table::XMergeableCell > xCell(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xCellPropSet (xCell, uno::UNO_QUERY_THROW); xCellPropSet->getPropertyValue("LeftBorder") >>= aBorderLine; diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 763bf07109a8..e05cf4d47ff7 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -547,9 +547,9 @@ void SdImportTest::testFdo72998() SdrObjCustomShape *pObj = dynamic_cast<SdrObjCustomShape *>(pPage->GetObj(2)); CPPUNIT_ASSERT( pObj ); const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const ::com::sun::star::uno::Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( OUString( "ViewBox" ) ); + const css::uno::Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( OUString( "ViewBox" ) ); CPPUNIT_ASSERT_MESSAGE( "Missing ViewBox", pViewBox ); - com::sun::star::awt::Rectangle aViewBox; + css::awt::Rectangle aViewBox; CPPUNIT_ASSERT( (*pViewBox >>= aViewBox ) ); CPPUNIT_ASSERT_MESSAGE( "Width should be zero - for forcing scale to 1", !aViewBox.Width ); CPPUNIT_ASSERT_MESSAGE( "Height should be zero - for forcing scale to 1", !aViewBox.Height ); @@ -635,7 +635,7 @@ void SdImportTest::testFdo64512() void SdImportTest::testFdo71075() { double values[] = { 12.0, 13.0, 14.0 }; - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71075.odp"), ODP); SdDrawDocument *pDoc = xDocShRef->GetDoc(); @@ -1254,8 +1254,8 @@ void SdImportTest::testRowHeight() sal_Int32 nHeight; const OUString sHeight("Height"); - uno::Reference< com::sun::star::table::XTable > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW); - uno::Reference< com::sun::star::table::XTableRows > xRows( xTable->getRows(), uno::UNO_QUERY_THROW); + uno::Reference< css::table::XTable > xTable(pTableObj->getTable(), uno::UNO_QUERY_THROW); + uno::Reference< css::table::XTableRows > xRows( xTable->getRows(), uno::UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xRefRow( xRows->getByIndex(0), uno::UNO_QUERY_THROW ); xRefRow->getPropertyValue( sHeight ) >>= nHeight; CPPUNIT_ASSERT_EQUAL( sal_Int32(508), nHeight); |