Kaydet (Commit) 6fdac894 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix ScDatabaseRangeObj test, fdo#43312

üst 32f38931
...@@ -170,8 +170,10 @@ public class ScDatabaseRangeObj extends TestCase { ...@@ -170,8 +170,10 @@ public class ScDatabaseRangeObj extends TestCase {
"Error getting test object from spreadsheet document", e); "Error getting test object from spreadsheet document", e);
} }
if (dbRanges.hasByName("dbRange")) { String dbName = "dbRange";
dbRanges.removeByName("dbRange");
if (dbRanges.hasByName(dbName)) {
dbRanges.removeByName(dbName);
} }
...@@ -185,22 +187,22 @@ public class ScDatabaseRangeObj extends TestCase { ...@@ -185,22 +187,22 @@ public class ScDatabaseRangeObj extends TestCase {
try { try {
// we need to add it // we need to add it
dbRanges.addNewByName("dbRanges",new CellRangeAddress((short)0, 0, 0, 0, 5)); dbRanges.addNewByName(dbName,new CellRangeAddress((short)0, 0, 0, 0, 5));
xNamed = (XNamed) UnoRuntime.queryInterface(XNamed.class, xNamed = (XNamed) UnoRuntime.queryInterface(XNamed.class,
dbrNA.getByName( dbrNA.getByName(
"dbRange")); dbName));
XCellRangeReferrer aReferrer = (XCellRangeReferrer) UnoRuntime.queryInterface( XCellRangeReferrer aReferrer = (XCellRangeReferrer) UnoRuntime.queryInterface(
XCellRangeReferrer.class, XCellRangeReferrer.class,
dbrNA.getByName("dbRange")); dbrNA.getByName(dbName));
XCellRangeAddressable aRangeA = (XCellRangeAddressable) UnoRuntime.queryInterface( XCellRangeAddressable aRangeA = (XCellRangeAddressable) UnoRuntime.queryInterface(
XCellRangeAddressable.class, XCellRangeAddressable.class,
aReferrer.getReferredCells()); aReferrer.getReferredCells());
aRange = aRangeA.getRangeAddress(); aRange = aRangeA.getRangeAddress();
oObj = (XInterface) AnyConverter.toObject( oObj = (XInterface) AnyConverter.toObject(
new Type(XInterface.class), new Type(XInterface.class),
dbrNA.getByName("dbRange")); dbrNA.getByName(dbName));
} catch (com.sun.star.lang.WrappedTargetException e) { } catch (com.sun.star.lang.WrappedTargetException e) {
e.printStackTrace(log); e.printStackTrace(log);
throw new StatusException( throw new StatusException(
......
...@@ -219,3 +219,7 @@ sc.ScCellRangeObj::com::sun::star::chart::XChartData ...@@ -219,3 +219,7 @@ sc.ScCellRangeObj::com::sun::star::chart::XChartData
### fdo43376 ### ### fdo43376 ###
sc.ScDDELinksObj sc.ScDDELinksObj
sc.ScDDELinkObj sc.ScDDELinkObj
### fdo44167 ###
sc.ScDatabaseRangeObj::com::sun::star::sheet::XDatabaseRange
sc.ScDatabaseRangeObj::com::sun::star::util::XRefreshable
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
-o sc.ScDataPilotItemsObj -o sc.ScDataPilotItemsObj
-o sc.ScDataPilotTableObj -o sc.ScDataPilotTableObj
-o sc.ScDataPilotTablesObj -o sc.ScDataPilotTablesObj
# fdo43312 -o sc.ScDatabaseRangeObj -o sc.ScDatabaseRangeObj
# -o sc.ScDatabaseRangesObj # -o sc.ScDatabaseRangesObj
# -o sc.ScDocumentConfiguration # -o sc.ScDocumentConfiguration
# -o sc.ScDrawPageObj # -o sc.ScDrawPageObj
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment