summaryrefslogtreecommitdiff
path: root/include/test/sheet
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-04-26 14:38:52 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-04-26 14:41:36 +0200
commitadd638b725bb9e5c94b33f6802483bc7101e3681 (patch)
treeafabfbf9b8bee490a1090bd7d45b33afa7f1e79a /include/test/sheet
parentf5e003050c65669d53d0d4d2208b2b4d1b699a86 (diff)
test: clean up namespacing
Change-Id: I7df07176bdbd15fdfdf8f9a7cdb26d4bee12997d
Diffstat (limited to 'include/test/sheet')
-rw-r--r--include/test/sheet/cellproperties.hxx4
-rw-r--r--include/test/sheet/datapilotfield.hxx4
-rw-r--r--include/test/sheet/tableautoformatfield.hxx6
-rw-r--r--include/test/sheet/xcellrangedata.hxx5
-rw-r--r--include/test/sheet/xcellrangereferrer.hxx8
-rw-r--r--include/test/sheet/xcellrangesquery.hxx7
-rw-r--r--include/test/sheet/xdatabaserange.hxx5
-rw-r--r--include/test/sheet/xdatapilotdescriptor.hxx9
-rw-r--r--include/test/sheet/xdatapilotfieldgrouping.hxx4
-rw-r--r--include/test/sheet/xdatapilottable.hxx8
-rw-r--r--include/test/sheet/xdatapilottable2.hxx22
-rw-r--r--include/test/sheet/xgoalseek.hxx5
-rw-r--r--include/test/sheet/xnamedrange.hxx8
-rw-r--r--include/test/sheet/xnamedranges.hxx7
-rw-r--r--include/test/sheet/xprintareas.hxx10
-rw-r--r--include/test/sheet/xsheetannotation.hxx7
-rw-r--r--include/test/sheet/xsheetannotations.hxx9
-rw-r--r--include/test/sheet/xsheetoutline.hxx4
-rw-r--r--include/test/sheet/xspreadsheetdocument.hxx4
-rw-r--r--include/test/sheet/xspreadsheets2.hxx22
20 files changed, 51 insertions, 107 deletions
diff --git a/include/test/sheet/cellproperties.hxx b/include/test/sheet/cellproperties.hxx
index 49f9c37246cb..fcbdc5fe8611 100644
--- a/include/test/sheet/cellproperties.hxx
+++ b/include/test/sheet/cellproperties.hxx
@@ -11,14 +11,12 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST CellProperties
{
public:
- virtual uno::Reference < uno::XInterface > init() = 0;
+ virtual css::uno::Reference < css::uno::XInterface > init() = 0;
void testVertJustify();
void testRotateReference();
diff --git a/include/test/sheet/datapilotfield.hxx b/include/test/sheet/datapilotfield.hxx
index 253bdf474ac2..8fa8cdb0d986 100644
--- a/include/test/sheet/datapilotfield.hxx
+++ b/include/test/sheet/datapilotfield.hxx
@@ -10,14 +10,12 @@
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST DataPilotField
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
void testSortInfo();
void testLayoutInfo();
diff --git a/include/test/sheet/tableautoformatfield.hxx b/include/test/sheet/tableautoformatfield.hxx
index 6b6d79f1fe57..a42f5b908e50 100644
--- a/include/test/sheet/tableautoformatfield.hxx
+++ b/include/test/sheet/tableautoformatfield.hxx
@@ -9,17 +9,15 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-using namespace com::sun::star;
-
namespace apitest {
class TableAutoFormatField
{
public:
//don't use virtual init() here
- uno::Reference< beans::XPropertySet > initTest();
+ css::uno::Reference< beans::XPropertySet > initTest();
- virtual uno::Reference< > getServiceFactory() = 0;
+ virtual css::uno::Reference< > getServiceFactory() = 0;
void testRotateReference();
void testVertJustify();
diff --git a/include/test/sheet/xcellrangedata.hxx b/include/test/sheet/xcellrangedata.hxx
index dd56045b8649..63cc44f08bc8 100644
--- a/include/test/sheet/xcellrangedata.hxx
+++ b/include/test/sheet/xcellrangedata.hxx
@@ -10,15 +10,12 @@
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XCellRangeData
{
public:
-
- virtual uno::Reference< uno::XInterface > getXCellRangeData() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > getXCellRangeData() = 0;
void testGetDataArray();
void testSetDataArray();
diff --git a/include/test/sheet/xcellrangereferrer.hxx b/include/test/sheet/xcellrangereferrer.hxx
index 22044302b087..5af153f86a13 100644
--- a/include/test/sheet/xcellrangereferrer.hxx
+++ b/include/test/sheet/xcellrangereferrer.hxx
@@ -10,17 +10,15 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XCellRangeReferrer
{
public:
- XCellRangeReferrer( table::CellRangeAddress aCellRange ):
+ XCellRangeReferrer( css::table::CellRangeAddress aCellRange ):
maCellRange( aCellRange ) {}
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
void testGetReferredCells();
@@ -28,7 +26,7 @@ protected:
~XCellRangeReferrer() {}
private:
- table::CellRangeAddress maCellRange;
+ css::table::CellRangeAddress maCellRange;
};
}
diff --git a/include/test/sheet/xcellrangesquery.hxx b/include/test/sheet/xcellrangesquery.hxx
index 3d419b7c8203..e48c5b5e0ab0 100644
--- a/include/test/sheet/xcellrangesquery.hxx
+++ b/include/test/sheet/xcellrangesquery.hxx
@@ -10,17 +10,12 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
-
namespace apitest {
-
class OOO_DLLPUBLIC_TEST XCellRangesQuery
{
public:
-
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
//Testcases
void testQueryColumnDifference();
diff --git a/include/test/sheet/xdatabaserange.hxx b/include/test/sheet/xdatabaserange.hxx
index 2be7e4dc663f..aae8ec7bf73b 100644
--- a/include/test/sheet/xdatabaserange.hxx
+++ b/include/test/sheet/xdatabaserange.hxx
@@ -7,19 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <rtl/ustring.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XDatabaseRange
{
public:
- virtual uno::Reference< uno::XInterface > init(const OUString& rDBName) = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init(const OUString& rDBName) = 0;
void testDataArea();
void testGetSortDescriptor();
diff --git a/include/test/sheet/xdatapilotdescriptor.hxx b/include/test/sheet/xdatapilotdescriptor.hxx
index 55b26a3bbfe7..9f85f2ebd40f 100644
--- a/include/test/sheet/xdatapilotdescriptor.hxx
+++ b/include/test/sheet/xdatapilotdescriptor.hxx
@@ -15,8 +15,6 @@
#include <vector>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XDataPilotDescriptor
@@ -32,16 +30,15 @@ public:
void testGetDataFields();
void testGetHiddenFields();
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
protected:
~XDataPilotDescriptor() {}
private:
+ void testGetDataPilotFields_Impl( css::uno::Reference< css::sheet::XDataPilotDescriptor > xDescr );
- void testGetDataPilotFields_Impl( uno::Reference< sheet::XDataPilotDescriptor > xDescr );
-
- void checkName( uno::Reference< container::XIndexAccess > xIndex, sal_Int32 nIndex );
+ void checkName( css::uno::Reference< css::container::XIndexAccess > xIndex, sal_Int32 nIndex );
static std::vector<OUString> maFieldNames;
};
diff --git a/include/test/sheet/xdatapilotfieldgrouping.hxx b/include/test/sheet/xdatapilotfieldgrouping.hxx
index fd11a45cb051..f741663b274e 100644
--- a/include/test/sheet/xdatapilotfieldgrouping.hxx
+++ b/include/test/sheet/xdatapilotfieldgrouping.hxx
@@ -11,8 +11,6 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XDataPilotFieldGrouping
@@ -21,7 +19,7 @@ public:
void testCreateNameGroup();
void testCreateDateGroup();
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
protected:
~XDataPilotFieldGrouping() {}
diff --git a/include/test/sheet/xdatapilottable.hxx b/include/test/sheet/xdatapilottable.hxx
index 27c5f2a7ca8c..d11df25397d8 100644
--- a/include/test/sheet/xdatapilottable.hxx
+++ b/include/test/sheet/xdatapilottable.hxx
@@ -13,22 +13,20 @@
#include "cppunit/extensions/HelperMacros.h"
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XDataPilotTable
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
virtual ~XDataPilotTable();
void testGetOutputRange();
void testRefresh();
protected:
- uno::Reference< table::XCell > xCellForChange;
- uno::Reference< table::XCell > xCellForCheck;
+ css::uno::Reference< css::table::XCell > xCellForChange;
+ css::uno::Reference< css::table::XCell > xCellForCheck;
};
}
diff --git a/include/test/sheet/xdatapilottable2.hxx b/include/test/sheet/xdatapilottable2.hxx
index b1dc31159af3..002218b78ebd 100644
--- a/include/test/sheet/xdatapilottable2.hxx
+++ b/include/test/sheet/xdatapilottable2.hxx
@@ -18,8 +18,6 @@
#include <vector>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XDataPilotTable2
@@ -31,23 +29,23 @@ public:
void testInsertDrillDownSheet();
virtual ~XDataPilotTable2();
- virtual uno::Reference< uno::XInterface > initDP2() = 0;
- virtual uno::Reference< uno::XInterface > getSheets() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > initDP2() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > getSheets() = 0;
protected:
private:
- bool checkDrillDownSheetContent(uno::Reference< sheet::XSpreadsheet >, uno::Sequence< uno::Sequence < uno::Any > > aData);
+ bool checkDrillDownSheetContent(css::uno::Reference< css::sheet::XSpreadsheet >, css::uno::Sequence< css::uno::Sequence < css::uno::Any > > aData);
- void getOutputRanges(uno::Reference< sheet::XDataPilotTable2 >);
- void buildDataFields(uno::Reference< sheet::XDataPilotTable2 >);
- void buildResultCells(uno::Reference< sheet::XDataPilotTable2 >);
+ void getOutputRanges(css::uno::Reference< css::sheet::XDataPilotTable2 >);
+ void buildDataFields(css::uno::Reference< css::sheet::XDataPilotTable2 >);
+ void buildResultCells(css::uno::Reference< css::sheet::XDataPilotTable2 >);
- std::vector< table::CellAddress > maResultCells;
+ std::vector< css::table::CellAddress > maResultCells;
std::vector< sal_Int32 > maDataFieldDims;
- table::CellRangeAddress maRangeWhole;
- table::CellRangeAddress maRangeTable;
- table::CellRangeAddress maRangeResult;
+ css::table::CellRangeAddress maRangeWhole;
+ css::table::CellRangeAddress maRangeTable;
+ css::table::CellRangeAddress maRangeResult;
};
}
diff --git a/include/test/sheet/xgoalseek.hxx b/include/test/sheet/xgoalseek.hxx
index 71fce12a356b..892a6b7a559f 100644
--- a/include/test/sheet/xgoalseek.hxx
+++ b/include/test/sheet/xgoalseek.hxx
@@ -10,15 +10,12 @@
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XGoalSeek
{
public:
-
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
void testSeekGoal();
diff --git a/include/test/sheet/xnamedrange.hxx b/include/test/sheet/xnamedrange.hxx
index 97a6afdf4926..19465fe528e7 100644
--- a/include/test/sheet/xnamedrange.hxx
+++ b/include/test/sheet/xnamedrange.hxx
@@ -30,14 +30,12 @@
#include <com/sun/star/sheet/XNamedRange.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XNamedRange
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
// XNamedRange
void testGetContent();
@@ -46,11 +44,11 @@ public:
void testSetType();
void testGetReferencePosition();
void testSetReferencePosition();
+
protected:
~XNamedRange() {}
- virtual uno::Reference< sheet::XNamedRange> getNamedRange(const OUString&) = 0;
-
+ virtual css::uno::Reference< css::sheet::XNamedRange> getNamedRange(const OUString&) = 0;
};
}
diff --git a/include/test/sheet/xnamedranges.hxx b/include/test/sheet/xnamedranges.hxx
index d0d2eeedb66f..57b0b8521536 100644
--- a/include/test/sheet/xnamedranges.hxx
+++ b/include/test/sheet/xnamedranges.hxx
@@ -26,13 +26,10 @@
* instead of those above.
*/
-#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XNamedRanges
@@ -45,7 +42,7 @@ public:
virtual ~XNamedRanges();
- virtual uno::Reference< uno::XInterface > init(sal_Int32 nSheets = 0) = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init(sal_Int32 nSheets = 0) = 0;
// XNamedRanges
void testAddNewByName();
@@ -54,7 +51,7 @@ public:
void testOutputList();
protected:
- uno::Reference< sheet::XSpreadsheet > xSheet;
+ css::uno::Reference< css::sheet::XSpreadsheet > xSheet;
private:
OUString maNameToRemove;
diff --git a/include/test/sheet/xprintareas.hxx b/include/test/sheet/xprintareas.hxx
index 08f534877690..e1b7e2bdbc8c 100644
--- a/include/test/sheet/xprintareas.hxx
+++ b/include/test/sheet/xprintareas.hxx
@@ -26,17 +26,15 @@
* instead of those above.
*/
- #include <com/sun/star/sheet/XPrintAreas.hpp>
- #include <test/testdllapi.hxx>
-
-using namespace com::sun::star;
+#include <com/sun/star/sheet/XPrintAreas.hpp>
+#include <test/testdllapi.hxx>
namespace apitest {
class OOO_DLLPUBLIC_TEST XPrintAreas
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
void testSetAndGetPrintTitleColumns(); //getter and setter in one test case
void testSetAndGetPrintTitleRows();
@@ -50,8 +48,6 @@ public:
protected:
~XPrintAreas() {}
-
-
};
}
diff --git a/include/test/sheet/xsheetannotation.hxx b/include/test/sheet/xsheetannotation.hxx
index 9dd552d2803d..03effd3f0198 100644
--- a/include/test/sheet/xsheetannotation.hxx
+++ b/include/test/sheet/xsheetannotation.hxx
@@ -32,14 +32,12 @@
#include <com/sun/star/table/CellAddress.hpp>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XSheetAnnotation
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
// XSheetAnnotation
void testGetPosition();
@@ -51,8 +49,7 @@ public:
protected:
~XSheetAnnotation() {}
- virtual uno::Reference< sheet::XSheetAnnotation> getAnnotation(table::CellAddress&) = 0;
-
+ virtual css::uno::Reference< css::sheet::XSheetAnnotation> getAnnotation(css::table::CellAddress&) = 0;
};
}
diff --git a/include/test/sheet/xsheetannotations.hxx b/include/test/sheet/xsheetannotations.hxx
index 9c1c2111008c..314b841e948b 100644
--- a/include/test/sheet/xsheetannotations.hxx
+++ b/include/test/sheet/xsheetannotations.hxx
@@ -26,29 +26,24 @@
* instead of those above.
*/
-#include <rtl/ustring.hxx>
#include <com/sun/star/sheet/XSheetAnnotations.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XSheetAnnotations
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
// XSheetAnnotations
void testInsertNew();
void testRemoveByIndex();
-
protected:
~XSheetAnnotations() {}
- virtual uno::Reference< sheet::XSheetAnnotations> getAnnotations() = 0;
-
+ virtual css::uno::Reference< css::sheet::XSheetAnnotations> getAnnotations() = 0;
};
}
diff --git a/include/test/sheet/xsheetoutline.hxx b/include/test/sheet/xsheetoutline.hxx
index b52ac0eeb7aa..54db6661e2c3 100644
--- a/include/test/sheet/xsheetoutline.hxx
+++ b/include/test/sheet/xsheetoutline.hxx
@@ -30,14 +30,12 @@
#include <com/sun/star/sheet/XSheetOutline.hpp>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XSheetOutline
{
public:
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
// XSheetOutline
void testHideDetail();
diff --git a/include/test/sheet/xspreadsheetdocument.hxx b/include/test/sheet/xspreadsheetdocument.hxx
index edeef9c4891c..51bdf62b5db4 100644
--- a/include/test/sheet/xspreadsheetdocument.hxx
+++ b/include/test/sheet/xspreadsheetdocument.hxx
@@ -10,8 +10,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <test/testdllapi.hxx>
-using namespace com::sun::star;
-
namespace apitest {
class XSpreadsheetDocument
@@ -19,7 +17,7 @@ class XSpreadsheetDocument
public:
XSpreadsheetDocument(sal_Int32 nSheets) : mnSheets(nSheets) {}
- virtual uno::Reference< uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
void testGetSheets();
diff --git a/include/test/sheet/xspreadsheets2.hxx b/include/test/sheet/xspreadsheets2.hxx
index 83b9eddd15e7..3b429e412eb6 100644
--- a/include/test/sheet/xspreadsheets2.hxx
+++ b/include/test/sheet/xspreadsheets2.hxx
@@ -33,10 +33,6 @@
#include <com/sun/star/sheet/XNamedRanges.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <rtl/ustring.hxx>
-
-using namespace com::sun::star;
-
namespace apitest {
class OOO_DLLPUBLIC_TEST XSpreadsheets2
@@ -57,23 +53,23 @@ public:
void testImportNewNamedRange();
void testImportCellStyle();
- virtual uno::Reference< lang::XComponent > getComponent() = 0;
- virtual uno::Reference< uno::XInterface > init() = 0;
- virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString&) = 0;
+ virtual css::uno::Reference< css::lang::XComponent > getComponent() = 0;
+ virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+ virtual css::uno::Reference< css::lang::XComponent > loadFromDesktop(const OUString&) = 0;
virtual void createFileURL(const OUString&, OUString&) = 0;
protected:
- uno::Reference< sheet::XSpreadsheetDocument> xDocument;
+ css::uno::Reference< css::sheet::XSpreadsheetDocument> xDocument;
private:
- uno::Reference< sheet::XSpreadsheetDocument> getDoc(const OUString&, uno::Reference< lang::XComponent >&);
- uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument >);
+ css::uno::Reference< css::sheet::XSpreadsheetDocument> getDoc(const OUString&, css::uno::Reference< css::lang::XComponent >&);
+ css::uno::Reference< css::sheet::XNamedRanges> getNamedRanges(css::uno::Reference< css::sheet::XSpreadsheetDocument >);
void importSheetToCopy();
bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent );
- uno::Reference< sheet::XSpreadsheetDocument> xDestDoc;
- uno::Reference< sheet::XSpreadsheet > xDestSheet;
- uno::Reference< sheet::XSpreadsheet > xSrcSheet;
+ css::uno::Reference< css::sheet::XSpreadsheetDocument> xDestDoc;
+ css::uno::Reference< css::sheet::XSpreadsheet > xDestSheet;
+ css::uno::Reference< css::sheet::XSpreadsheet > xSrcSheet;
OUString aSrcSheetName;
OUString aSrcFileName;
OUString aDestFileBase;