chart2/qa/extras/chart2_trendcalculators.cxx | 1
chart2/qa/extras/chart2dump/chart2dump.cxx | 19 -
chart2/qa/extras/chart2export.cxx | 3
chart2/qa/extras/chart2import.cxx | 12
chart2/qa/extras/charttest.hxx | 28 -
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 42 --
chart2/source/model/main/ChartModel_Persistence.cxx | 1
chart2/source/model/template/StockDataInterpreter.cxx | 1
chart2/source/tools/AxisHelper.cxx | 75 +--
chart2/source/tools/ChartTypeHelper.cxx | 3
chart2/source/tools/DiagramHelper.cxx | 2
chart2/source/view/main/ChartView.cxx | 3
comphelper/source/misc/documentinfo.cxx | 1
connectivity/source/commontools/dbtools.cxx | 15
connectivity/source/drivers/component/CDatabaseMetaData.cxx | 1
connectivity/source/drivers/hsqldb/HConnection.cxx | 3
dbaccess/qa/extras/dialog-save.cxx | 9
dbaccess/qa/extras/empty-stdlib-save.cxx | 9
dbaccess/qa/extras/nolib-save.cxx | 9
dbaccess/source/ui/misc/databaseobjectview.cxx | 13
dbaccess/source/ui/tabledesign/TableController.cxx | 1
embeddedobj/source/msole/olepersist.cxx | 3
extensions/source/abpilot/datasourcehandling.cxx | 15
filter/source/svg/svgwriter.cxx | 189
++++------
forms/source/runtime/formoperations.cxx | 1
framework/source/dispatch/closedispatcher.cxx | 11
oox/source/export/chartexport.cxx | 3
oox/source/export/drawingml.cxx | 2
oox/source/ppt/slidepersist.cxx | 2
package/source/xstor/xstorage.cxx | 3
pyuno/source/module/pyuno_module.cxx | 1
reportdesign/source/core/api/FormattedField.cxx | 15
reportdesign/source/filter/xml/xmlExport.cxx | 3
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 13
reportdesign/source/ui/dlg/Navigator.cxx | 1
sc/qa/extras/check_data_pilot_field.cxx | 1
sc/qa/extras/check_data_pilot_table.cxx | 1
sc/qa/extras/check_xcell_ranges_query.cxx | 1
sc/qa/extras/new_cond_format.cxx | 1
sc/qa/extras/regression-test.cxx | 8
sc/qa/extras/scannotationobj.cxx | 2
sc/qa/extras/scannotationshapeobj.cxx | 1
sc/qa/extras/scannotationsobj.cxx | 3
sc/qa/extras/scarealinkobj.cxx | 1
sc/qa/extras/scarealinksobj.cxx | 1
sc/qa/extras/scautoformatobj.cxx | 1
sc/qa/extras/sccellcursorobj.cxx | 2
sc/qa/extras/sccellobj.cxx | 1
sc/qa/extras/sccellrangeobj.cxx | 9
sc/qa/extras/sccellrangesobj.cxx | 1
sc/qa/extras/scconsolidationdescriptorobj.cxx | 1
sc/qa/extras/scdatabaserangeobj.cxx | 1
sc/qa/extras/scdatabaserangesobj.cxx | 1
sc/qa/extras/scdatapilotfieldobj.cxx | 4
sc/qa/extras/scdatapilotitemobj.cxx | 1
sc/qa/extras/scdatapilottableobj.cxx | 5
sc/qa/extras/scdatapilottablesobj.cxx | 2
sc/qa/extras/scddelinkobj.cxx | 1
sc/qa/extras/scdocumentconfigurationobj.cxx | 2
sc/qa/extras/scfilterdescriptorbaseobj.cxx | 1
sc/qa/extras/scfunctiondescriptionobj.cxx | 1
sc/qa/extras/scfunctionlistobj.cxx | 2
sc/qa/extras/scheaderfootercontentobj.cxx | 1
sc/qa/extras/scimportdescriptorbaseobj.cxx | 2
sc/qa/extras/sclabelrangeobj.cxx | 1
sc/qa/extras/sclabelrangesobj.cxx | 1
sc/qa/extras/scmodelobj.cxx | 1
sc/qa/extras/scoutlineobj.cxx | 1
sc/qa/extras/screcentfunctionsobj.cxx | 2
sc/qa/extras/scscenariosobj.cxx | 1
sc/qa/extras/scshapeobj.cxx | 3
sc/qa/extras/scsheetlinkobj.cxx | 1
sc/qa/extras/scsortdescriptorbaseobj.cxx | 2
sc/qa/extras/scspreadsheetsettings.cxx | 2
sc/qa/extras/scspreadsheetsettingsobj.cxx | 2
sc/qa/extras/scsubtotaldescriptorbaseobj.cxx | 1
sc/qa/extras/scsubtotalfieldobj.cxx | 2
sc/qa/extras/sctableconditionalentryobj.cxx | 1
sc/qa/extras/sctableconditionalformatobj.cxx | 1
sc/qa/extras/sctablesheetobj.cxx | 4
sc/qa/extras/sctablevalidationobj.cxx | 1
sc/qa/extras/sctabviewobj.cxx | 2
sc/qa/extras/scviewpaneobj.cxx | 1
sc/qa/perf/scperfobj.cxx | 21 -
sc/qa/unit/subsequent_filters-test.cxx | 3
sc/source/ui/docshell/macromgr.cxx | 15
sc/source/ui/vba/vbapagesetup.cxx | 96 +----
sc/source/ui/vba/vbarange.cxx | 29 -
sc/source/ui/vba/vbastyles.cxx | 9
sc/source/ui/vba/vbaworksheet.cxx | 32 -
sd/qa/unit/activex-controls-tests.cxx | 35 -
sd/qa/unit/import-tests.cxx | 1
sd/qa/unit/sdmodeltestbase.hxx | 4
sd/source/core/CustomAnimationEffect.cxx | 8
sd/source/filter/eppt/pptexanimations.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 9
sd/source/ui/presenter/PresenterTextView.cxx | 8
sd/source/ui/table/TableDesignPane.cxx | 35 -
sd/source/ui/unoidl/unopage.cxx | 33 -
sdext/source/minimizer/graphiccollector.cxx | 63 +--
sdext/source/presenter/PresenterButton.cxx | 5
sdext/source/presenter/PresenterScrollBar.cxx | 5
sdext/source/presenter/PresenterSlideShowView.cxx | 8
sdext/source/presenter/PresenterSlideSorter.cxx | 3
sfx2/source/appl/appmisc.cxx | 8
sfx2/source/bastyp/frmhtmlw.cxx | 1
sfx2/source/doc/SfxDocumentMetaData.cxx | 4
sfx2/source/doc/docfile.cxx | 3
sfx2/source/doc/docinf.cxx | 1
svx/source/core/graphichelper.cxx | 7
svx/source/svdraw/charthelper.cxx | 13
svx/source/table/tablecontroller.cxx | 2
svx/source/table/tablelayouter.cxx | 2
svx/source/xml/xmlxtimp.cxx | 8
sw/qa/api/XTextContentTest.hxx | 5
sw/qa/core/macros-test.cxx | 5
sw/source/filter/ww8/docxattributeoutput.cxx | 36 -
sw/source/ui/dbui/mmoutputtypepage.cxx | 11
sw/source/ui/vba/vbadocuments.cxx | 5
sw/source/uibase/sidebar/PageMarginControl.cxx | 7
sw/source/uibase/sidebar/PageOrientationControl.cxx | 7
test/source/container/xindexaccess.cxx | 2
test/source/container/xnamereplace.cxx | 1
test/source/sheet/tableautoformatfield.cxx | 3
test/source/sheet/xconsolidatable.cxx | 2
test/source/sheet/xdatabaserange.cxx | 1
test/source/sheet/xdatapilotdescriptor.cxx | 3
test/source/sheet/xdatapilottable2.cxx | 1
test/source/sheet/xdatapilottables.cxx | 1
test/source/sheet/xdatapilottablessupplier.cxx | 1
test/source/sheet/xscenariossupplier.cxx | 2
test/source/sheet/xsheetannotationssupplier.cxx | 1
test/source/sheet/xspreadsheet.cxx | 2
test/source/sheet/xspreadsheets2.cxx | 3
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 32 -
vcl/source/bitmap/BitmapTools.cxx | 6
vcl/source/gdi/vectorgraphicdata.cxx | 6
writerfilter/source/dmapper/DomainMapper.cxx | 3
writerfilter/source/dmapper/GraphicImport.cxx | 2
writerfilter/source/filter/RtfFilter.cxx | 4
writerfilter/source/filter/WriterFilter.cxx | 2
xmloff/source/chart/SchXMLExport.cxx | 3
xmloff/source/chart/SchXMLSeries2Context.cxx | 11
xmloff/source/draw/ximpshap.cxx | 27 -
xmlscript/source/xmldlg_imexp/imp_share.hxx | 3
xmlsecurity/qa/unit/signing/signing.cxx | 2
147 files changed, 388 insertions(+), 889 deletions(-)
New commits:
commit 5708534b942c1d0ce384f6a8473da6bb569410e7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Thu Jun 7 13:03:58 2018 +0200
look for unnecessary calls to Reference::is() after an UNO_QUERY_THROW
Since the previous call would throw if there was nothing to be assigned
to the value.
Idea from tml.
Used the following script to find places:
git grep -A3 -n UNO_QUERY_THROW | grep -B3 -F 'is()'
Change-Id: I36ba7b00bcd014bdf16c0455ab91056f82194969
Reviewed-on: https://gerrit.libreoffice.org/55417
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx
b/chart2/qa/extras/chart2_trendcalculators.cxx
index 42e1f52e467e..a889b6637eb7 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -84,7 +84,6 @@ void
Chart2TrendCalculators::loadCalculatorFromSheet(sal_Int32 nSheet)
CPPUNIT_ASSERT(xDataSeries.is());
Reference<chart2::XRegressionCurveContainer>
xRegressionCurveContainer(xDataSeries, UNO_QUERY_THROW);
- CPPUNIT_ASSERT( xRegressionCurveContainer.is() );
Sequence< Reference< chart2::XRegressionCurve > > xRegressionCurveSequence
= xRegressionCurveContainer->getRegressionCurves();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xRegressionCurveSequence.getLength());
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 7e8cd9b2a2f6..ceb818c70e0f 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -295,7 +295,6 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false)
setTestFileName(aTestFile);
load(getTestFileDirName(), getTestFileName());
uno::Reference< chart::XChartDocument > xChartDoc
(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
// Check title
uno::Reference< chart2::XChartDocument > xChartDoc2(xChartDoc,
UNO_QUERY_THROW);
@@ -344,7 +343,6 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false)
// Check column labels
uno::Reference< chart::XChartDataArray >
xChartData(xChartDoc->getData(), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartData.is());
uno::Sequence < OUString > aColumnLabels =
xChartData->getColumnDescriptions();
CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(aColumnLabels.getLength());
OUString sColumnLabels = sequenceToOneLineString(aColumnLabels);
@@ -410,7 +408,6 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
setTestFileName(aTestFile);
load(getTestFileDirName(), getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
@@ -451,7 +448,6 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xLegendEntryPropSet(xLegendEntry,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xLegendEntryPropSet.is());
drawing::HomogenMatrix3 aLegendEntryTransformation;
xLegendEntryPropSet->getPropertyValue("Transformation") >>=
aLegendEntryTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aLegendEntryTransformation,
INT_EPS);*/
@@ -469,7 +465,6 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
// Check display color
Reference< beans::XPropertySet > xPropSet(xLegendEntryGeom,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
util::Color aEntryGeomColor = 0;
xPropSet->getPropertyValue(UNO_NAME_FILLCOLOR) >>=
aEntryGeomColor;
CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aEntryGeomColor));
@@ -536,7 +531,6 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xGrid,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
drawing::HomogenMatrix3 aGridTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aGridTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aGridTransformation,
INT_EPS);
@@ -545,7 +539,6 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false)
uno::Reference<container::XIndexAccess> xIndexAccess(xGrid,
UNO_QUERY_THROW);
uno::Reference<drawing::XShape>
xGridLine(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
Reference< beans::XPropertySet > xGridLinePropSet(xGridLine,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xGridLinePropSet.is());
// Line type
drawing::LineDash aLineDash;
xGridLinePropSet->getPropertyValue("LineDash") >>= aLineDash;
@@ -581,7 +574,6 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
@@ -609,7 +601,6 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xXAxis, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
drawing::HomogenMatrix3 aAxisTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aAxisTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aAxisTransformation,
INT_EPS);
@@ -620,7 +611,6 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nAxisGeometriesCount);
uno::Reference<drawing::XShape>
xAxisLine(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
Reference< beans::XPropertySet > xAxisLinePropSet(xAxisLine,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xAxisLinePropSet.is());
// Line type
drawing::LineDash aLineDash;
xAxisLinePropSet->getPropertyValue("LineDash") >>= aLineDash;
@@ -655,7 +645,6 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
@@ -705,7 +694,6 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xLabelShape,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
/*drawing::HomogenMatrix3 aLabelTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aLabelTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aLabelTransformation, INT_EPS);*/
@@ -788,7 +776,6 @@ DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xColumnOrBar,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
drawing::HomogenMatrix3 aColumnOrBarTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aColumnOrBarTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aColumnOrBarTransformation, INT_EPS);
@@ -811,7 +798,6 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false)
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
@@ -830,7 +816,6 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xChartWall, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
/*drawing::HomogenMatrix3 aChartWallTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aChartWallTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aChartWallTransformation,
INT_EPS);*/
@@ -922,7 +907,6 @@ DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xSlice,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
drawing::HomogenMatrix3 aSliceTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aSliceTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aSliceTransformation, INT_EPS);
@@ -987,7 +971,6 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false)
// Check transformation
Reference< beans::XPropertySet > xPropSet(xArea, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPropSet.is());
drawing::HomogenMatrix3 aAreaTransformation;
xPropSet->getPropertyValue("Transformation") >>=
aAreaTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aAreaTransformation,
INT_EPS);
@@ -1083,7 +1066,6 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest,
false)
{
uno::Reference<container::XIndexAccess> XPointContainer (
getShapeByName(xShapes,
"CID/MultiClick/D=0:CS=0:CT=0:Series=" + OUString::number(nSeries) + ":Point="
+ OUString::number(nPoint)), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(XPointContainer.is());
uno::Reference<drawing::XShape>
XPoint(XPointContainer->getByIndex(0), UNO_QUERY_THROW);
uno::Reference<container::XNamed>
xNamedShape(XPointContainer, uno::UNO_QUERY);
CPPUNIT_DUMP_ASSERT_NOTE(xNamedShape->getName());
@@ -1098,7 +1080,6 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest,
false)
// Check transformation
Reference< beans::XPropertySet > xPointPropSet(XPoint,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPointPropSet.is());
drawing::HomogenMatrix3 aPointTransformation;
xPointPropSet->getPropertyValue("Transformation") >>=
aPointTransformation;
CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aPointTransformation, INT_EPS);
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index c43433d690a9..8ed59e43cf84 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -432,7 +432,6 @@ void Chart2ExportTest::testErrorBarXLSX()
CPPUNIT_ASSERT( xDataSeries.is() );
Reference< beans::XPropertySet > xPropSet( xDataSeries,
UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xPropSet.is() );
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
@@ -449,7 +448,6 @@ void Chart2ExportTest::testErrorBarXLSX()
CPPUNIT_ASSERT( xDataSeries.is() );
Reference< beans::XPropertySet > xPropSet( xDataSeries,
UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xPropSet.is() );
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
@@ -1143,7 +1141,6 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
CPPUNIT_ASSERT( xDataSeries.is() );
Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xPropSet.is() );
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 4f065d27161e..361b16d43056 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -218,7 +218,6 @@ void Chart2ImportTest::Fdo60083()
CPPUNIT_ASSERT( xDataSeries.is() );
Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xPropSet.is() );
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
@@ -268,7 +267,6 @@ void Chart2ImportTest::testErrorBarRange()
CPPUNIT_ASSERT( xDataSeries.is() );
Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xPropSet.is() );
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
@@ -298,7 +296,6 @@ void Chart2ImportTest::testErrorBarFormatting()
CPPUNIT_ASSERT( xDataSeries.is() );
Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xPropSet.is() );
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
@@ -354,7 +351,6 @@ uno::Sequence < OUString > getChartColumnDescriptions(
uno::Reference< chart::XC
{
CPPUNIT_ASSERT(xChart1Doc.is());
uno::Reference< chart::XChartDataArray > xChartData (
xChart1Doc->getData(), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartData.is());
uno::Sequence < OUString > seriesList =
xChartData->getColumnDescriptions();
return seriesList;
}
@@ -690,7 +686,6 @@ void Chart2ImportTest::testBnc889755()
{
load("/chart2/qa/extras/data/pptx/", "bnc889755.pptx");
uno::Reference<chart2::XChartDocument>
xChartDoc(getChartDocFromDrawImpress(0, 6), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
uno::Reference< chart2::XInternalDataProvider > xDataProvider(
xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW );
@@ -926,7 +921,6 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
uno::Reference< beans::XPropertySet > xAxisProp;
bool bTextCanOverlap = false;
uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
mxDiagram.set(xChartDoc->getDiagram());
CPPUNIT_ASSERT(mxDiagram.is());
uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram,
uno::UNO_QUERY );
@@ -1161,7 +1155,6 @@ void
Chart2ImportTest::testPlotVisOnlyDefaultValue2013XLSX()
{
load("/chart2/qa/extras/data/xlsx/", "plotVisOnly.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChart1Doc.is());
Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(),
uno::UNO_QUERY_THROW);
uno::Any aAny = xPropSet->getPropertyValue("IncludeHiddenCells");
CPPUNIT_ASSERT(aAny.hasValue());
@@ -1174,7 +1167,6 @@ void Chart2ImportTest::testRAngAxDefaultValue2013XLSX()
{
load("/chart2/qa/extras/data/xlsx/", "rAngAx.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChart1Doc.is());
Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(),
uno::UNO_QUERY_THROW);
uno::Any aAny = xPropSet->getPropertyValue("RightAngledAxes");
CPPUNIT_ASSERT(aAny.hasValue());
@@ -1328,7 +1320,6 @@ void Chart2ImportTest::testTdf90510()
{
load("/chart2/qa/extras/data/xls/", "piechart_outside.xls");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW );
- CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChart1Doc.is() );
Reference<beans::XPropertySet> xPropSet(
xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_QUERY_THROW
);
uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
CPPUNIT_ASSERT( aAny.hasValue() );
@@ -1341,7 +1332,6 @@ void Chart2ImportTest::testTdf109858()
{
load("/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW );
- CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChart1Doc.is() );
Reference<beans::XPropertySet> xPropSet(
xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_QUERY_THROW
);
uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
CPPUNIT_ASSERT( aAny.hasValue() );
@@ -1354,7 +1344,6 @@ void Chart2ImportTest::testTdf111173()
{
load("/chart2/qa/extras/data/xlsx/", "tdf111173.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW );
- CPPUNIT_ASSERT_MESSAGE( "failed to load chart", xChart1Doc.is() );
}
void Chart2ImportTest::testTdf115107()
@@ -1556,7 +1545,6 @@ void Chart2ImportTest::testTdf116163()
CPPUNIT_ASSERT(xXAxis.is());
uno::Reference<container::XIndexAccess> xIndexAccess(xXAxis,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xIndexAccess.is());
// Check text
uno::Reference<text::XTextRange> xLabel0(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 438565222db4..202475e7e4ca 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -184,26 +184,20 @@ Reference< lang::XComponent > getChartCompFromSheet(
sal_Int32 nSheet, uno::Refe
// let us assume that we only have one chart per sheet
uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDoc.is());
uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xIA.is());
uno::Reference< table::XTableChartsSupplier > xChartSupplier(
xIA->getByIndex(nSheet), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartSupplier.is());
uno::Reference< table::XTableCharts > xCharts =
xChartSupplier->getCharts();
CPPUNIT_ASSERT(xCharts.is());
uno::Reference< container::XIndexAccess > xIACharts(xCharts,
UNO_QUERY_THROW);
uno::Reference< table::XTableChart > xChart( xIACharts->getByIndex(0),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChart.is());
uno::Reference< document::XEmbeddedObjectSupplier >
xEmbObjectSupplier(xChart, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xEmbObjectSupplier.is());
uno::Reference< lang::XComponent > xChartComp(
xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW );
- CPPUNIT_ASSERT(xChartComp.is());
return xChartComp;
@@ -212,20 +206,16 @@ Reference< lang::XComponent > getChartCompFromSheet(
sal_Int32 nSheet, uno::Refe
Reference< chart2::XChartDocument > getChartDocFromSheet( sal_Int32 nSheet,
uno::Reference< lang::XComponent > const & xComponent )
{
uno::Reference< chart2::XChartDocument > xChartDoc (
getChartCompFromSheet(nSheet, xComponent), UNO_QUERY_THROW );
- CPPUNIT_ASSERT(xChartDoc.is());
return xChartDoc;
}
uno::Reference<table::XTablePivotCharts>
getTablePivotChartsFromSheet(sal_Int32 nSheet, uno::Reference<lang::XComponent>
const & xComponent)
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDoc.is());
uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xIA.is());
uno::Reference<table::XTablePivotChartsSupplier>
xChartSupplier(xIA->getByIndex(nSheet), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartSupplier.is());
uno::Reference<table::XTablePivotCharts> xTablePivotCharts =
xChartSupplier->getPivotCharts();
CPPUNIT_ASSERT(xTablePivotCharts.is());
@@ -239,13 +229,10 @@ Reference<lang::XComponent>
getPivotChartCompFromSheet(sal_Int32 nSheet, uno::Re
uno::Reference<container::XIndexAccess> xIACharts(xTablePivotCharts,
UNO_QUERY_THROW);
uno::Reference<table::XTablePivotChart>
xTablePivotChart(xIACharts->getByIndex(0), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xTablePivotChart.is());
uno::Reference<document::XEmbeddedObjectSupplier>
xEmbObjectSupplier(xTablePivotChart, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xEmbObjectSupplier.is());
uno::Reference<lang::XComponent>
xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartComp.is());
return xChartComp;
}
@@ -253,7 +240,6 @@ Reference<lang::XComponent>
getPivotChartCompFromSheet(sal_Int32 nSheet, uno::Re
Reference<chart2::XChartDocument> getPivotChartDocFromSheet(sal_Int32 nSheet,
uno::Reference<lang::XComponent> const & xComponent)
{
uno::Reference<chart2::XChartDocument>
xChartDoc(getPivotChartCompFromSheet(nSheet, xComponent), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
return xChartDoc;
}
@@ -261,16 +247,12 @@ Reference<chart2::XChartDocument>
getPivotChartDocFromSheet(uno::Reference<table
{
uno::Reference<container::XIndexAccess> xIACharts(xTablePivotCharts,
UNO_QUERY_THROW);
uno::Reference<table::XTablePivotChart>
xTablePivotChart(xIACharts->getByIndex(nIndex), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xTablePivotChart.is());
uno::Reference<document::XEmbeddedObjectSupplier>
xEmbObjectSupplier(xTablePivotChart, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xEmbObjectSupplier.is());
uno::Reference<lang::XComponent>
xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartComp.is());
uno::Reference<chart2::XChartDocument> xChartDoc(xChartComp,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartDoc.is());
return xChartDoc;
}
@@ -283,13 +265,11 @@ Reference< chart2::XChartType > getChartTypeFromDoc(
Reference< chart2::XChartDo
CPPUNIT_ASSERT( xDiagram.is() );
Reference< chart2::XCoordinateSystemContainer > xCooSysContainer(
xDiagram, UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xCooSysContainer.is() );
Sequence< Reference< chart2::XCoordinateSystem > > xCooSysSequence(
xCooSysContainer->getCoordinateSystems());
CPPUNIT_ASSERT( xCooSysSequence.getLength() > nCooSys );
Reference< chart2::XChartTypeContainer > xChartTypeContainer(
xCooSysSequence[nCooSys], UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xChartTypeContainer.is() );
Sequence< Reference< chart2::XChartType > > xChartTypeSequence(
xChartTypeContainer->getChartTypes() );
CPPUNIT_ASSERT( xChartTypeSequence.getLength() > nChartType );
@@ -304,7 +284,6 @@ Reference<chart2::XAxis> getAxisFromDoc(
CPPUNIT_ASSERT(xDiagram.is());
Reference<chart2::XCoordinateSystemContainer> xCooSysContainer(xDiagram,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xCooSysContainer.is());
Sequence<Reference<chart2::XCoordinateSystem> > xCooSysSequence =
xCooSysContainer->getCoordinateSystems();
CPPUNIT_ASSERT(xCooSysSequence.getLength() > nCooSys);
@@ -323,7 +302,6 @@ sal_Int32
getNumberOfDataSeries(uno::Reference<chart2::XChartDocument> const & x
{
Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc,
nChartType, nCooSys);
Reference<chart2::XDataSeriesContainer> xDataSeriesContainer(xChartType,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDataSeriesContainer.is());
uno::Sequence<uno::Reference<chart2::XDataSeries>>
xSeriesSequence(xDataSeriesContainer->getDataSeries());
return xSeriesSequence.getLength();
@@ -335,7 +313,6 @@ Reference< chart2::XDataSeries >
getDataSeriesFromDoc(uno::Reference<chart2::XCh
{
Reference< chart2::XChartType > xChartType = getChartTypeFromDoc(
xChartDoc, nChartType, nCooSys );
Reference< chart2::XDataSeriesContainer > xDataSeriesContainer(
xChartType, UNO_QUERY_THROW );
- CPPUNIT_ASSERT ( xDataSeriesContainer.is() );
Sequence< Reference< chart2::XDataSeries > > xSeriesSequence(
xDataSeriesContainer->getDataSeries() );
CPPUNIT_ASSERT( xSeriesSequence.getLength() > nDataSeries );
@@ -407,7 +384,6 @@ uno::Sequence < OUString >
getWriterChartColumnDescriptions( Reference< lang::XC
CPPUNIT_ASSERT( xChartDoc->getDataProvider().is() );
uno::Reference<beans::XPropertySet> xProp(xChartDoc->getDataProvider(),
uno::UNO_QUERY );
uno::Reference< chart2::XAnyDescriptionAccess > xAnyDescriptionAccess (
xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW );
- CPPUNIT_ASSERT( xAnyDescriptionAccess.is() );
uno::Sequence< OUString > seriesList =
xAnyDescriptionAccess->getColumnDescriptions();
return seriesList;
}
@@ -503,7 +479,6 @@ uno::Reference< chart::XChartDocument >
ChartTest::getChartDocFromImpress( const
uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent,
uno::UNO_QUERY_THROW );
uno::Reference< drawing::XDrawPage > xPage(
xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
- CPPUNIT_ASSERT(xPage.is());
uno::Reference< beans::XPropertySet > xShapeProps(
xPage->getByIndex(0), uno::UNO_QUERY );
CPPUNIT_ASSERT(xShapeProps.is());
@@ -526,8 +501,6 @@ uno::Reference<chart::XChartDocument>
ChartTest::getChartDocFromDrawImpress(
uno::Reference<drawing::XDrawPage> xPage(
xPages->getDrawPages()->getByIndex(nPage), uno::UNO_QUERY_THROW);
- if (!xPage.is())
- return xEmpty;
uno::Reference<beans::XPropertySet> xShapeProps(xPage->getByIndex(nShape),
uno::UNO_QUERY);
if (!xShapeProps.is())
@@ -566,7 +539,6 @@ uno::Sequence < OUString >
ChartTest::getImpressChartColumnDescriptions( const O
{
uno::Reference< chart::XChartDocument > xChartDoc =
getChartDocFromImpress( pDir, pName );
uno::Reference< chart::XChartDataArray > xChartData (
xChartDoc->getData(), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartData.is());
uno::Sequence < OUString > seriesList =
xChartData->getColumnDescriptions();
return seriesList;
}
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 94d74b0eefe3..5a80655bae99 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1253,25 +1253,22 @@ uno::Reference< uno::XInterface > SAL_CALL
ChartDocumentWrapper::createInstance(
{
Reference< lang::XMultiServiceFactory > xFact(
m_spChart2ModelContact->m_xContext->getServiceManager(),
uno::UNO_QUERY_THROW );
- if( xFact.is() )
+ Reference< lang::XInitialization > xViewInit(
xFact->createInstance(
+ CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
+ if(xViewInit.is())
{
- Reference< lang::XInitialization > xViewInit(
xFact->createInstance(
- CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
- if(xViewInit.is())
+ try
{
- try
- {
- m_xChartView = xViewInit;
-
- Sequence< Any > aArguments(2);
- aArguments[0] <<= Reference<frame::XModel>(this);
- aArguments[1] <<= true; // bRefreshAddIn
- xViewInit->initialize(aArguments);
- }
- catch (const uno::Exception&)
- {
- DBG_UNHANDLED_EXCEPTION("chart2");
- }
+ m_xChartView = xViewInit;
+
+ Sequence< Any > aArguments(2);
+ aArguments[0] <<= Reference<frame::XModel>(this);
+ aArguments[1] <<= true; // bRefreshAddIn
+ xViewInit->initialize(aArguments);
+ }
+ catch (const uno::Exception&)
+ {
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -1316,14 +1313,11 @@ uno::Reference< uno::XInterface > SAL_CALL
ChartDocumentWrapper::createInstance(
{
Reference< lang::XMultiServiceFactory > xFact(
m_spChart2ModelContact->m_xContext->getServiceManager(),
uno::UNO_QUERY_THROW );
- if( xFact.is() )
+ uno::Reference< util::XRefreshable > xAddIn(
+ xFact->createInstance( aServiceSpecifier ), uno::UNO_QUERY );
+ if( xAddIn.is() )
{
- uno::Reference< util::XRefreshable > xAddIn(
- xFact->createInstance( aServiceSpecifier ), uno::UNO_QUERY
);
- if( xAddIn.is() )
- {
- xResult = xAddIn;
- }
+ xResult = xAddIn;
}
}
catch (const uno::Exception&)
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx
b/chart2/source/model/main/ChartModel_Persistence.cxx
index cdc0d0338a02..dabde5d32ba4 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -129,7 +129,6 @@ Reference< embed::XStorage > lcl_createStorage(
aStorageArgs[2] <<= rMediaDescriptor;
xStorage.set(
xStorageFact->createInstanceWithArguments( aStorageArgs ),
uno::UNO_QUERY_THROW );
- OSL_ENSURE( xStorage.is(), "No Storage" );
}
catch(const css::ucb::ContentCreationException&)
{
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx
b/chart2/source/model/template/StockDataInterpreter.cxx
index f766d41aaed9..a6db346a44ea 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -240,7 +240,6 @@ InterpretedData SAL_CALL
StockDataInterpreter::interpretDataSource(
xSeries.set( new DataSeries );
OSL_ASSERT( xSeries.is() );
Reference< data::XDataSink > xSink( xSeries,
uno::UNO_QUERY_THROW );
- OSL_ASSERT( xSink.is() );
xSink->setData( aSequences[nGroupIndex][nSeriesIdx] );
aResultSeries[nGroupIndex][nSeriesIdx].set( xSeries );
}
diff --git a/chart2/source/tools/AxisHelper.cxx
b/chart2/source/tools/AxisHelper.cxx
index 84c008612332..4a9cf9218641 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -239,52 +239,49 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
try
{
Reference< XChartTypeContainer > xCTCnt(
xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW );
- if( xCTCnt.is() )
+ OUString aRoleToMatch;
+ if( nDimensionIndex == 0 )
+ aRoleToMatch = "values-x";
+ Sequence< Reference< XChartType > > aChartTypes(
xCTCnt->getChartTypes());
+ for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength();
++nCTIdx )
{
- OUString aRoleToMatch;
- if( nDimensionIndex == 0 )
- aRoleToMatch = "values-x";
- Sequence< Reference< XChartType > > aChartTypes(
xCTCnt->getChartTypes());
- for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength();
++nCTIdx )
+ if( nDimensionIndex != 0 )
+ aRoleToMatch =
ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection(
aChartTypes[nCTIdx] );
+ Reference< XDataSeriesContainer > xDSCnt(
aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
+ Sequence< Reference< XDataSeries > > aDataSeriesSeq(
xDSCnt->getDataSeries());
+ for( sal_Int32 nSeriesIdx=0;
nSeriesIdx<aDataSeriesSeq.getLength(); ++nSeriesIdx )
{
- if( nDimensionIndex != 0 )
- aRoleToMatch =
ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection(
aChartTypes[nCTIdx] );
- Reference< XDataSeriesContainer > xDSCnt(
aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
- Sequence< Reference< XDataSeries > > aDataSeriesSeq(
xDSCnt->getDataSeries());
- for( sal_Int32 nSeriesIdx=0;
nSeriesIdx<aDataSeriesSeq.getLength(); ++nSeriesIdx )
- {
- Reference< chart2::XDataSeries >
xDataSeries(aDataSeriesSeq[nSeriesIdx]);
- Reference< data::XDataSource > xSource(
xDataSeries, uno::UNO_QUERY_THROW );
+ Reference< chart2::XDataSeries >
xDataSeries(aDataSeriesSeq[nSeriesIdx]);
+ Reference< data::XDataSource > xSource( xDataSeries,
uno::UNO_QUERY_THROW );
- if( nDimensionIndex == 1 )
- {
- //only take those series into account that are
attached to this axis
- sal_Int32 nAttachedAxisIndex =
DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
- if( nAttachedAxisIndex != nAxisIndex )
- continue;
- }
+ if( nDimensionIndex == 1 )
+ {
+ //only take those series into account that are
attached to this axis
+ sal_Int32 nAttachedAxisIndex =
DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
+ if( nAttachedAxisIndex != nAxisIndex )
+ continue;
+ }
- Reference< data::XLabeledDataSequence >
xLabeledSeq(
- DataSeriesHelper::getDataSequenceByRole(
xSource, aRoleToMatch ) );
+ Reference< data::XLabeledDataSequence > xLabeledSeq(
+ DataSeriesHelper::getDataSequenceByRole( xSource,
aRoleToMatch ) );
- if( !xLabeledSeq.is() && nDimensionIndex==0 )
- {
- ScaleData aData = xAxis->getScaleData();
- xLabeledSeq = aData.Categories;
- }
+ if( !xLabeledSeq.is() && nDimensionIndex==0 )
+ {
+ ScaleData aData = xAxis->getScaleData();
+ xLabeledSeq = aData.Categories;
+ }
- if( xLabeledSeq.is() )
+ if( xLabeledSeq.is() )
+ {
+ Reference< data::XDataSequence > xSeq(
xLabeledSeq->getValues());
+ if( xSeq.is() )
{
- Reference< data::XDataSequence > xSeq(
xLabeledSeq->getValues());
- if( xSeq.is() )
- {
- sal_Int32 nKey =
xSeq->getNumberFormatKeyByIndex( -1 );
- // initialize the value
- if( aKeyMap.find( nKey ) == aKeyMap.end())
- aKeyMap[ nKey ] = 0;
- // increase frequency
- aKeyMap[ nKey ] = (aKeyMap[ nKey ] + 1);
- }
+ sal_Int32 nKey =
xSeq->getNumberFormatKeyByIndex( -1 );
+ // initialize the value
+ if( aKeyMap.find( nKey ) == aKeyMap.end())
+ aKeyMap[ nKey ] = 0;
+ // increase frequency
+ aKeyMap[ nKey ] = (aKeyMap[ nKey ] + 1);
}
}
}
diff --git a/chart2/source/tools/ChartTypeHelper.cxx
b/chart2/source/tools/ChartTypeHelper.cxx
index 23aa42efed73..658855d6380b 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -248,8 +248,7 @@ uno::Sequence < sal_Int32 >
ChartTypeHelper::getSupportedLabelPlacements( const
{
bool bDonut = false;
uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType,
uno::UNO_QUERY_THROW );
- if(xChartTypeProp.is())
- xChartTypeProp->getPropertyValue( "UseRings") >>= bDonut;
+ xChartTypeProp->getPropertyValue( "UseRings") >>= bDonut;
if(!bDonut)
{
diff --git a/chart2/source/tools/DiagramHelper.cxx
b/chart2/source/tools/DiagramHelper.cxx
index 801c40e2ce52..652a4e468841 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -578,8 +578,6 @@ bool DiagramHelper::attachSeriesToAxis( bool
bAttachToMainAxis
//set property at axis
Reference< beans::XPropertySet > xProp( xDataSeries, uno::UNO_QUERY_THROW
);
- if( !xProp.is() )
- return bChanged;
sal_Int32 nNewAxisIndex = bAttachToMainAxis ? 0 : 1;
sal_Int32 nOldAxisIndex =
DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 22f268b19a4a..259b58ce7779 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1808,8 +1808,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
const CreateShapeParam2D
bool bPosSizeExcludeAxesProperty = true;
uno::Reference< beans::XPropertySet > xDiaProps( xDiagram,
uno::UNO_QUERY_THROW );
- if( xDiaProps.is() )
- xDiaProps->getPropertyValue("PosSizeExcludeAxes") >>=
bPosSizeExcludeAxesProperty;
+ xDiaProps->getPropertyValue("PosSizeExcludeAxes") >>=
bPosSizeExcludeAxesProperty;
if (rParam.mbUseFixedInnerSize || bPosSizeExcludeAxesProperty)
{
aPos = awt::Point( m_aResultingDiagramRectangleExcludingAxes.X,
m_aResultingDiagramRectangleExcludingAxes.Y );
diff --git a/comphelper/source/misc/documentinfo.cxx
b/comphelper/source/misc/documentinfo.cxx
index b63450590554..a2c0e7140c33 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -101,7 +101,6 @@ namespace comphelper {
{
Reference< XDocumentProperties > xDocProps (
xDPS->getDocumentProperties(), UNO_QUERY_THROW );
- OSL_ENSURE(xDocProps.is(), "no DocumentProperties");
sTitle = xDocProps->getTitle();
if ( !sTitle.isEmpty() )
return sTitle;
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 1540b49840e4..3a32d21e5a77 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -485,16 +485,13 @@ Reference< XNameAccess> getPrimaryKeyColumns_throw(const
Reference< XPropertySet
for(sal_Int32 i = 0;i< nCount;++i)
{
xProp.set(xKeys->getByIndex(i),UNO_QUERY_THROW);
- if ( xProp.is() )
+ sal_Int32 nKeyType = 0;
+ xProp->getPropertyValue(sPropName) >>= nKeyType;
+ if(KeyType::PRIMARY == nKeyType)
{
- sal_Int32 nKeyType = 0;
- xProp->getPropertyValue(sPropName) >>= nKeyType;
- if(KeyType::PRIMARY == nKeyType)
- {
- const Reference<XColumnsSupplier>
xKeyColsSup(xProp,UNO_QUERY_THROW);
- xKeyColumns = xKeyColsSup->getColumns();
- break;
- }
+ const Reference<XColumnsSupplier>
xKeyColsSup(xProp,UNO_QUERY_THROW);
+ xKeyColumns = xKeyColsSup->getColumns();
+ break;
}
}
}
diff --git a/connectivity/source/drivers/component/CDatabaseMetaData.cxx
b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
index 7834e53c18b7..a2edb795fc1e 100644
--- a/connectivity/source/drivers/component/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
@@ -152,7 +152,6 @@ Reference< XResultSet > SAL_CALL
OComponentDatabaseMetaData::getColumns(
if(match(tableNamePattern,*pTabIter,'\0'))
{
const Reference< XColumnsSupplier>
xTable(xNames->getByName(*pTabIter),UNO_QUERY_THROW);
- OSL_ENSURE(xTable.is(),"Table not found! Normally a exception had
to be thrown here!");
aRow[3] = new ORowSetValueDecorator(*pTabIter);
const Reference< XNameAccess> xColumns = xTable->getColumns();
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx
b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 04d58a33a1b3..4b43df187eda 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -247,8 +247,7 @@ namespace connectivity { namespace hsqldb
try
{
Reference< XNameAccess > xTables( impl_getTableContainer_throw(),
UNO_QUERY_THROW );
- if ( xTables.is() )
- bDoesExist = xTables->hasByName( _rTableName );
+ bDoesExist = xTables->hasByName( _rTableName );
}
catch( const Exception& )
{
diff --git a/dbaccess/qa/extras/dialog-save.cxx
b/dbaccess/qa/extras/dialog-save.cxx
index e9194a0e6e7d..eb1095fe4ba7 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -72,17 +72,13 @@ void DialogSaveTest::test()
uno::Reference< lang::XComponent > xComponent =
loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
uno::Reference< frame::XStorable > xDocStorable(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocStorable.is());
uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocScr.is());
uno::Reference< script::XStorageBasedLibraryContainer >
xStorBasLib(xDocScr->getBasicLibraries());
CPPUNIT_ASSERT(xStorBasLib.is());
uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xBasLib.is());
uno::Reference< script::XStorageBasedLibraryContainer >
xStorDlgLib(xDocScr->getDialogLibraries());
CPPUNIT_ASSERT(xStorDlgLib.is());
uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDlgLib.is());
xBasLib->loadLibrary(sStandard);
CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
// the whole point of this test is to test the "save" operation
@@ -91,12 +87,10 @@ void DialogSaveTest::test()
// make some change to enable a save
// uno::Reference< document::XDocumentPropertiesSupplier >
xDocPropSuppl(xComponent, UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xDocPropSuppl.is());
// uno::Reference< document::XDocumentPropertiesSupplier >
xDocProps(xDocPropSuppl->getDocumentProperties());
// CPPUNIT_ASSERT(xDocProps.is());
// xDocProps.setTitle(xDocProps.getTitle() + " suffix");
uno::Reference< util::XModifiable > xDocMod(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocMod.is());
xDocMod->setModified(true);
// now save; the code path to exercise in this test is the "store to
same location"
@@ -105,7 +99,6 @@ void DialogSaveTest::test()
// close
uno::Reference< util::XCloseable > xDocCloseable(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocCloseable.is());
xDocCloseable->close(false);
// All our uno::References are (should?) be invalid now -> let them go
out of scope
@@ -114,9 +107,7 @@ void DialogSaveTest::test()
uno::Sequence<uno::Any> args(1);
args[0] <<= aFileName;
Reference<container::XHierarchicalNameAccess>
xHNA(getMultiServiceFactory()->createInstanceWithArguments("com.sun.star.packages.Package",
args), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xHNA.is());
Reference< beans::XPropertySet >
xPS(xHNA->getByHierarchicalName("Dialogs/Standard/Dialog1.xml"),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xPS.is());
sal_Int64 nSize = 0;
CPPUNIT_ASSERT(xPS->getPropertyValue("Size") >>= nSize);
CPPUNIT_ASSERT(nSize != 0);
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx
b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 648ffb29a1ef..86f381cf8519 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -72,17 +72,13 @@ void DialogSaveTest::test()
uno::Reference< lang::XComponent > xComponent =
loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
uno::Reference< frame::XStorable > xDocStorable(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocStorable.is());
uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocScr.is());
uno::Reference< script::XStorageBasedLibraryContainer >
xStorBasLib(xDocScr->getBasicLibraries());
CPPUNIT_ASSERT(xStorBasLib.is());
uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xBasLib.is());
uno::Reference< script::XStorageBasedLibraryContainer >
xStorDlgLib(xDocScr->getDialogLibraries());
CPPUNIT_ASSERT(xStorDlgLib.is());
uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDlgLib.is());
xBasLib->loadLibrary(sStandard);
xDlgLib->loadLibrary(sStandard);
CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
@@ -102,15 +98,12 @@ void DialogSaveTest::test()
xI->removeByName("Dialog1");
// uno::Reference< util::XModifiable > xDlgMod(xDlgLib,
UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xDlgMod.is());
// xDlgMod->setModified(sal_True);
// uno::Reference< util::XModifiable > xScrMod(xDocScr,
UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xScrMod.is());
// xScrMod->setModified(sal_True);
// uno::Reference< util::XModifiable > xDocMod(xComponent,
UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xDocMod.is());
// std::cerr << "** Modified: " <<
static_cast<bool>(xDocMod->isModified()) << std::endl;
// xDocMod->setModified(sal_True);
// std::cerr << "** Modified: " <<
static_cast<bool>(xDocMod->isModified()) << std::endl;
@@ -122,7 +115,6 @@ void DialogSaveTest::test()
// close
uno::Reference< util::XCloseable > xDocCloseable(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocCloseable.is());
xDocCloseable->close(false);
// All our uno::References are (should?) be invalid now -> let them go
out of scope
@@ -131,7 +123,6 @@ void DialogSaveTest::test()
uno::Sequence<uno::Any> args(1);
args[0] <<= aFileName;
Reference<container::XHierarchicalNameAccess>
xHNA(getMultiServiceFactory()->createInstanceWithArguments("com.sun.star.packages.Package",
args), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xHNA.is());
CPPUNIT_ASSERT(!xHNA->hasByHierarchicalName("Basic/Standard"));
CPPUNIT_ASSERT(!xHNA->hasByHierarchicalName("Dialogs/Standard"));
}
diff --git a/dbaccess/qa/extras/nolib-save.cxx
b/dbaccess/qa/extras/nolib-save.cxx
index e42784c9800d..f5e4ae59b837 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -72,17 +72,13 @@ void DialogSaveTest::test()
uno::Reference< lang::XComponent > xComponent =
loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
uno::Reference< frame::XStorable > xDocStorable(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocStorable.is());
uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocScr.is());
uno::Reference< script::XStorageBasedLibraryContainer >
xStorBasLib(xDocScr->getBasicLibraries());
CPPUNIT_ASSERT(xStorBasLib.is());
uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xBasLib.is());
uno::Reference< script::XStorageBasedLibraryContainer >
xStorDlgLib(xDocScr->getDialogLibraries());
CPPUNIT_ASSERT(xStorDlgLib.is());
uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDlgLib.is());
xBasLib->loadLibrary(sStandard);
xDlgLib->loadLibrary(sStandard);
CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
@@ -92,15 +88,12 @@ void DialogSaveTest::test()
xDlgLib->removeLibrary(sStandard);
// uno::Reference< util::XModifiable > xDlgMod(xDlgLib,
UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xDlgMod.is());
// xDlgMod->setModified(sal_True);
// uno::Reference< util::XModifiable > xScrMod(xDocScr,
UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xScrMod.is());
// xScrMod->setModified(sal_True);
// uno::Reference< util::XModifiable > xDocMod(xComponent,
UNO_QUERY_THROW);
- // CPPUNIT_ASSERT(xDocMod.is());
// std::cerr << "** Modified: " <<
static_cast<bool>(xDocMod->isModified()) << std::endl;
// xDocMod->setModified(sal_True);
// std::cerr << "** Modified: " <<
static_cast<bool>(xDocMod->isModified()) << std::endl;
@@ -112,7 +105,6 @@ void DialogSaveTest::test()
// close
uno::Reference< util::XCloseable > xDocCloseable(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDocCloseable.is());
xDocCloseable->close(false);
// All our uno::References are (should?) be invalid now -> let them go
out of scope
@@ -121,7 +113,6 @@ void DialogSaveTest::test()
uno::Sequence<uno::Any> args(1);
args[0] <<= aFileName;
Reference<container::XHierarchicalNameAccess>
xHNA(getMultiServiceFactory()->createInstanceWithArguments("com.sun.star.packages.Package",
args), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xHNA.is());
CPPUNIT_ASSERT(!xHNA->hasByHierarchicalName("Basic/Standard"));
CPPUNIT_ASSERT(!xHNA->hasByHierarchicalName("Dialogs/Standard"));
}
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx
b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 676b26cbf92f..e68f17ffd3ca 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -232,16 +232,9 @@ namespace dbaui
// try whether the designer is a dialog
Reference< XExecutableDialog > xDialog( xDesigner, UNO_QUERY_THROW );
- if ( xDialog.is() )
- {
- try { AsyncDialogExecutor::executeModalDialogAsync( xDialog ); }
- catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); }
- return nullptr;
- }
-
- Reference< XComponent > xDesignerComponent( xDesigner, UNO_QUERY );
- OSL_ENSURE( xDesignerComponent.is(), "TableDesigner::doCreateView: a
designer which is no dialog and no component?" );
- return xDesignerComponent;
+ try { AsyncDialogExecutor::executeModalDialogAsync( xDialog ); }
+ catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); }
+ return nullptr;
}
Reference< XInterface >
TableDesigner::impl_getConnectionProvidedDesigner_nothrow( const OUString&
_rTableName )
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 71c6e722fecc..51898df9ff0b 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -961,7 +961,6 @@ bool OTableController::checkColumns(bool _bNew)
void OTableController::alterColumns()
{
Reference<XColumnsSupplier> xColSup(m_xTable,UNO_QUERY_THROW);
- OSL_ENSURE(xColSup.is(),"What happen here?!");
Reference<XNameAccess> xColumns = xColSup->getColumns();
Reference<XIndexAccess> xIdxColumns(xColumns,UNO_QUERY_THROW);
diff --git a/embeddedobj/source/msole/olepersist.cxx
b/embeddedobj/source/msole/olepersist.cxx
index b60c0299a561..73434da6092b 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -372,8 +372,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const
uno::Reference< io::XStrea
uno::UNO_QUERY_THROW );
uno::Reference< io::XSeekable > xCachedSeek( xCachedVisualRepresentation,
uno::UNO_QUERY_THROW );
- if ( xCachedSeek.is() )
- xCachedSeek->seek( 0 );
+ xCachedSeek->seek( 0 );
uno::Reference < io::XStream > xTempFile(
io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
diff --git a/extensions/source/abpilot/datasourcehandling.cxx
b/extensions/source/abpilot/datasourcehandling.cxx
index eb149ea4b106..0923e9902943 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -203,16 +203,13 @@ namespace abp
// create the UNO context
m_pImpl->xContext.set( lcl_getDataSourceContext( _rxORB ),
UNO_QUERY_THROW );
- if (m_pImpl->xContext.is())
- {
- // collect the data source names
- Sequence< OUString > aDSNames =
m_pImpl->xContext->getElementNames();
- const OUString* pDSNames = aDSNames.getConstArray();
- const OUString* pDSNamesEnd = pDSNames + aDSNames.getLength();
+ // collect the data source names
+ Sequence< OUString > aDSNames =
m_pImpl->xContext->getElementNames();
+ const OUString* pDSNames = aDSNames.getConstArray();
+ const OUString* pDSNamesEnd = pDSNames + aDSNames.getLength();
- for ( ;pDSNames != pDSNamesEnd; ++pDSNames )
- m_pImpl->aDataSourceNames.insert( *pDSNames );
- }
+ for ( ;pDSNames != pDSNamesEnd; ++pDSNames )
+ m_pImpl->aDataSourceNames.insert( *pDSNames );
}
catch( const Exception& )
{
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 9cbe2b24e3ee..7f740aa7a0c0 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -948,143 +948,140 @@ bool SVGTextWriter::nextParagraph()
if( xTextContent.is() )
{
Reference< XServiceInfo > xServiceInfo( xTextContent,
UNO_QUERY_THROW );
- if( xServiceInfo.is() )
- {
#if OSL_DEBUG_LEVEL > 0
- OUString sInfo;
+ OUString sInfo;
#endif
- if( xServiceInfo->supportsService(
"com.sun.star.text.Paragraph" ) )
+ if( xServiceInfo->supportsService( "com.sun.star.text.Paragraph" )
)
+ {
+ mrCurrentTextParagraph.set( xTextContent );
+ Reference< XPropertySet > xPropSet( xTextContent,
UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
+ if( xPropSetInfo->hasPropertyByName( "NumberingLevel" ) )
{
- mrCurrentTextParagraph.set( xTextContent );
- Reference< XPropertySet > xPropSet( xTextContent,
UNO_QUERY_THROW );
- Reference< XPropertySetInfo > xPropSetInfo =
xPropSet->getPropertySetInfo();
- if( xPropSetInfo->hasPropertyByName( "NumberingLevel" ) )
+ sal_Int16 nListLevel = 0;
+ if( xPropSet->getPropertyValue( "NumberingLevel" ) >>=
nListLevel )
{
- sal_Int16 nListLevel = 0;
- if( xPropSet->getPropertyValue( "NumberingLevel" ) >>=
nListLevel )
- {
- mbIsNewListItem = true;
+ mbIsNewListItem = true;
#if OSL_DEBUG_LEVEL > 0
- sInfo = "NumberingLevel: " + OUString::number(
nListLevel );
- mrExport.AddAttribute( XML_NAMESPACE_NONE,
"style", sInfo );
+ sInfo = "NumberingLevel: " + OUString::number(
nListLevel );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, "style",
sInfo );
#endif
- Reference< XIndexReplace > xNumRules;
- if( xPropSetInfo->hasPropertyByName(
"NumberingRules" ) )
- {
- xPropSet->getPropertyValue( "NumberingRules" )
>>= xNumRules;
- }
- if( xNumRules.is() && ( nListLevel <
xNumRules->getCount() ) )
+ Reference< XIndexReplace > xNumRules;
+ if( xPropSetInfo->hasPropertyByName( "NumberingRules"
) )
+ {
+ xPropSet->getPropertyValue( "NumberingRules" ) >>=
xNumRules;
+ }
+ if( xNumRules.is() && ( nListLevel <
xNumRules->getCount() ) )
+ {
+ bool bIsNumbered = true;
+ OUString sNumberingIsNumber("NumberingIsNumber");
+ if( xPropSetInfo->hasPropertyByName(
sNumberingIsNumber ) )
{
- bool bIsNumbered = true;
- OUString
sNumberingIsNumber("NumberingIsNumber");
- if( xPropSetInfo->hasPropertyByName(
sNumberingIsNumber ) )
+ if( !(xPropSet->getPropertyValue(
sNumberingIsNumber ) >>= bIsNumbered ) )
{
- if( !(xPropSet->getPropertyValue(
sNumberingIsNumber ) >>= bIsNumbered ) )
- {
- OSL_FAIL( "numbered paragraph without
number info" );
- bIsNumbered = false;
- }
+ OSL_FAIL( "numbered paragraph without
number info" );
+ bIsNumbered = false;
+ }
#if OSL_DEBUG_LEVEL > 0
- if( bIsNumbered )
- {
- sInfo = "true";
- mrExport.AddAttribute(
XML_NAMESPACE_NONE, "is-numbered", sInfo );
- }
-#endif
+ if( bIsNumbered )
+ {
+ sInfo = "true";
+ mrExport.AddAttribute( XML_NAMESPACE_NONE,
"is-numbered", sInfo );
}
- mbIsNewListItem = bIsNumbered;
+#endif
+ }
+ mbIsNewListItem = bIsNumbered;
- if( bIsNumbered )
+ if( bIsNumbered )
+ {
+ Sequence<PropertyValue> aProps;
+ if( xNumRules->getByIndex( nListLevel ) >>=
aProps )
{
- Sequence<PropertyValue> aProps;
- if( xNumRules->getByIndex( nListLevel )
>>= aProps )
+ sal_Int16 eType =
NumberingType::CHAR_SPECIAL;
+ sal_Unicode cBullet = 0xf095;
+ const sal_Int32 nCount =
aProps.getLength();
+ const PropertyValue* pPropArray =
aProps.getConstArray();
+ for( sal_Int32 i = 0; i < nCount; ++i )
{
- sal_Int16 eType =
NumberingType::CHAR_SPECIAL;
- sal_Unicode cBullet = 0xf095;
- const sal_Int32 nCount =
aProps.getLength();
- const PropertyValue* pPropArray =
aProps.getConstArray();
- for( sal_Int32 i = 0; i < nCount; ++i )
+ const PropertyValue& rProp =
pPropArray[i];
+ if( rProp.Name == "NumberingType" )
{
- const PropertyValue& rProp =
pPropArray[i];
- if( rProp.Name == "NumberingType" )
- {
- rProp.Value >>= eType;
- }
- else if( rProp.Name ==
"BulletChar" )
+ rProp.Value >>= eType;
+ }
+ else if( rProp.Name == "BulletChar" )
+ {
+ OUString sValue;
+ rProp.Value >>= sValue;
+ if( !sValue.isEmpty() )
{
- OUString sValue;
- rProp.Value >>= sValue;
- if( !sValue.isEmpty() )
- {
- cBullet = sValue[0];
- }
+ cBullet = sValue[0];
}
}
- meNumberingType = eType;
- mbIsListLevelStyleImage = (
NumberingType::BITMAP == meNumberingType );
- if( NumberingType::CHAR_SPECIAL ==
meNumberingType )
+ }
+ meNumberingType = eType;
+ mbIsListLevelStyleImage = (
NumberingType::BITMAP == meNumberingType );
+ if( NumberingType::CHAR_SPECIAL ==
meNumberingType )
+ {
+ if( cBullet )
{
- if( cBullet )
+ if( cBullet < ' ' )
{
- if( cBullet < ' ' )
- {
- cBullet = 0xF000 + 149;
- }
- mcBulletChar = cBullet;
+ cBullet = 0xF000 + 149;
+ }
+ mcBulletChar = cBullet;
#if OSL_DEBUG_LEVEL > 0
- sInfo = OUString::number(
static_cast<sal_Int32>(cBullet) );
- mrExport.AddAttribute(
XML_NAMESPACE_NONE, "bullet-char", sInfo );
+ sInfo = OUString::number(
static_cast<sal_Int32>(cBullet) );
+ mrExport.AddAttribute(
XML_NAMESPACE_NONE, "bullet-char", sInfo );
#endif
- }
-
}
+
}
}
}
-
}
- }
- Reference< XEnumerationAccess > xEnumerationAccess(
xTextContent, UNO_QUERY_THROW );
- Reference< XEnumeration > xEnumeration(
xEnumerationAccess->createEnumeration(), UNO_QUERY_THROW );
- if( xEnumeration.is() && xEnumeration->hasMoreElements() )
- {
- mrTextPortionEnumeration.set( xEnumeration );
}
-#if OSL_DEBUG_LEVEL > 0
- sInfo = "Paragraph";
-#endif
}
- else if( xServiceInfo->supportsService(
"com.sun.star.text.Table" ) )
+
+ Reference< XEnumerationAccess > xEnumerationAccess(
xTextContent, UNO_QUERY_THROW );
+ Reference< XEnumeration > xEnumeration(
xEnumerationAccess->createEnumeration(), UNO_QUERY_THROW );
+ if( xEnumeration.is() && xEnumeration->hasMoreElements() )
{
- OSL_FAIL( "SVGTextWriter::nextParagraph: text tables are
not handled." );
+ mrTextPortionEnumeration.set( xEnumeration );
+ }
#if OSL_DEBUG_LEVEL > 0
- sInfo = "Table";
+ sInfo = "Paragraph";
#endif
- }
- else
- {
- OSL_FAIL( "SVGTextWriter::nextParagraph: Unknown text
content." );
- return false;
- }
+ }
+ else if( xServiceInfo->supportsService( "com.sun.star.text.Table"
) )
+ {
+ OSL_FAIL( "SVGTextWriter::nextParagraph: text tables are not
handled." );
#if OSL_DEBUG_LEVEL > 0
- mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", sInfo );
- SvXMLElementExport aParaElem( mrExport, XML_NAMESPACE_NONE,
"desc", mbIWS, mbIWS );
+ sInfo = "Table";
#endif
}
else
{
- OSL_FAIL( "SVGTextWriter::nextParagraph: no XServiceInfo
interface available for text content." );
+ OSL_FAIL( "SVGTextWriter::nextParagraph: Unknown text
content." );
return false;
}
+#if OSL_DEBUG_LEVEL > 0
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", sInfo );
+ SvXMLElementExport aParaElem( mrExport, XML_NAMESPACE_NONE,
"desc", mbIWS, mbIWS );
+#endif
+ }
+ else
+ {
+ OSL_FAIL( "SVGTextWriter::nextParagraph: no XServiceInfo interface
available for text content." );
+ return false;
+ }
- const OUString& rParagraphId = implGetValidIDFromInterface(
Reference<XInterface>(xTextContent, UNO_QUERY) );
- if( !rParagraphId.isEmpty() )
- {
- mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId
);
- }
- return true;
+ const OUString& rParagraphId = implGetValidIDFromInterface(
Reference<XInterface>(xTextContent, UNO_QUERY) );
+ if( !rParagraphId.isEmpty() )
+ {
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId );
}
+ return true;
}
return false;
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index 0bd7486952ac..525aa803f83f 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -522,7 +522,6 @@ namespace frm
// No control... do what we can with the models
bool shouldCommit(true);
Reference< XIndexAccess > xFormComps(xFrm, UNO_QUERY_THROW);
- assert( xFormComps.is() );
const sal_Int32 cnt = xFormComps->getCount();
for(int i=0; i < cnt; ++i)
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index ed79058194ab..b986b9a9467f 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -381,13 +381,10 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback,
LinkParamNone*, void)
try
{
css::uno::Reference< css::beans::XFastPropertySet > xSet(
xContext->getServiceManager()->createInstanceWithContext(IMPLEMENTATIONNAME_QUICKLAUNCHER,
xContext), css::uno::UNO_QUERY_THROW );
- if( xSet.is() )
- {
- css::uno::Any aVal( xSet->getFastPropertyValue( 0 ) );
- bool bState = false;
- if( aVal >>= bState )
- bQuickstarterRunning = bState;
- }
+ css::uno::Any aVal( xSet->getFastPropertyValue( 0 ) );
+ bool bState = false;
+ if( aVal >>= bState )
+ bQuickstarterRunning = bState;
}
catch( const css::uno::Exception& )
{
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index d12827629794..c6f30fb5600a 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -230,8 +230,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
{
sal_Int32 nAxisIndex = 0;
Reference< beans::XPropertySet > xProp( xDataSeries,
uno::UNO_QUERY_THROW );
- if( xProp.is() )
- xProp->getPropertyValue("AttachedAxisIndex") >>= nAxisIndex;
+ xProp->getPropertyValue("AttachedAxisIndex") >>= nAxisIndex;
bResult = (0==nAxisIndex);
}
catch( const uno::Exception & )
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 25ea475b2ac4..a7657c67d394 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1393,7 +1393,7 @@ void DrawingML::WriteShapeTransformation( const
Reference< XShape >& rXShape, sa
nRotation = nRotation * -1 + 36000;
uno::Reference<lang::XServiceInfo> xServiceInfo(rXShape,
uno::UNO_QUERY_THROW);
- bool bIsGroupShape = (xServiceInfo.is() &&
xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"));
+ bool bIsGroupShape =
xServiceInfo->supportsService("com.sun.star.drawing.GroupShape");
WriteTransformation(tools::Rectangle(Point(aPos.X, aPos.Y),
Size(aSize.Width, aSize.Height)), nXmlNamespace,
bFlipHWrite, bFlipVWrite,
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation), bIsGroupShape);
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 8d6abaab47e1..4f337500761c 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -205,7 +205,7 @@ void SlidePersist::applyTextStyles( const XmlFilterBase&
rFilterBase )
Reference< container::XNameAccess > aXNameAccess(
aXStyleFamiliesSupplier->getStyleFamilies() );
Reference< container::XNamed > aXNamed( mxPage, UNO_QUERY_THROW );
- if ( aXNameAccess.is() && aXNamed.is() )
+ if ( aXNameAccess.is() )
{
oox::drawingml::TextListStylePtr pTextListStylePtr;
OUString aStyle;
diff --git a/package/source/xstor/xstorage.cxx
b/package/source/xstor/xstorage.cxx
index 0a43a07869f9..2796976ea872 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1743,8 +1743,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference<
container::XNameContain
if ( m_xRelStorage->hasElements() )
{
uno::Reference< embed::XTransactedObject > xTrans(
m_xRelStorage, uno::UNO_QUERY_THROW );
- if ( xTrans.is() )
- xTrans->commit();
+ xTrans->commit();
}
if ( xNewPackageFolder.is() && xNewPackageFolder->hasByName(
aRelsStorName ) )
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index bd04097f01af..a50ca379cf9a 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -336,7 +336,6 @@ static PyObject* initTestEnvironment(
Reference<XMultiServiceFactory> const xMSF(
xContext->getServiceManager(),
css::uno::UNO_QUERY_THROW);
- if (!xMSF.is()) { abort(); }
char *const testlib = getenv("TEST_LIB");
if (!testlib) { abort(); }
OString const libname = OString(testlib, strlen(testlib))
diff --git a/reportdesign/source/core/api/FormattedField.cxx
b/reportdesign/source/core/api/FormattedField.cxx
index 72a300e8876d..80068d54bd8b 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -216,16 +216,13 @@ uno::Reference< util::XCloneable > SAL_CALL
OFormattedField::createClone( )
uno::Reference< report::XReportComponent> xSource = this;
uno::Reference< report::XFormattedField>
xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FORMATTEDFIELD),uno::UNO_QUERY_THROW);
- if ( xSet.is() )
+ ::std::vector< uno::Reference< report::XFormatCondition> >::const_iterator
aIter = m_aProps.m_aFormatConditions.begin();
+ ::std::vector< uno::Reference< report::XFormatCondition> >::const_iterator
aEnd = m_aProps.m_aFormatConditions.end();
+ for (sal_Int32 i = 0; aIter != aEnd; ++aIter,++i)
{
- ::std::vector< uno::Reference< report::XFormatCondition>
>::const_iterator aIter = m_aProps.m_aFormatConditions.begin();
- ::std::vector< uno::Reference< report::XFormatCondition>
>::const_iterator aEnd = m_aProps.m_aFormatConditions.end();
- for (sal_Int32 i = 0; aIter != aEnd; ++aIter,++i)
- {
- uno::Reference< report::XFormatCondition > xCond =
xSet->createFormatCondition();
- ::comphelper::copyProperties(aIter->get(),xCond.get());
- xSet->insertByIndex(i,uno::makeAny(xCond));
- }
+ uno::Reference< report::XFormatCondition > xCond =
xSet->createFormatCondition();
+ ::comphelper::copyProperties(aIter->get(),xCond.get());
+ xSet->insertByIndex(i,uno::makeAny(xCond));
}
return xSet.get();
}
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 29028f1459af..80f25884cf28 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -328,7 +328,6 @@ void ORptExport::exportFunctions(const
Reference<XIndexAccess>& _xFunctions)
for (sal_Int32 i = 0; i< nCount; ++i)
{
uno::Reference< report::XFunction>
xFunction(_xFunctions->getByIndex(i),uno::UNO_QUERY_THROW);
- OSL_ENSURE(xFunction.is(),"Function object is NULL!");
exportFunction(xFunction);
}
}
@@ -1346,8 +1345,6 @@ SvXMLAutoStylePoolP* ORptExport::CreateAutoStylePool()
void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >&
xDoc )
{
m_xReportDefinition.set(xDoc,UNO_QUERY_THROW);
- OSL_ENSURE(m_xReportDefinition.is(),"DataSource is NULL!");
-
SvXMLExport::setSourceDocument(xDoc);
}
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index af3b1787360f..63b8b2f94133 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -108,7 +108,7 @@ void SAL_CALL ImportDocumentHandler::endDocument()
{
m_xDelegatee->endDocument();
uno::Reference< chart2::data::XDataReceiver >
xReceiver(m_xModel,uno::UNO_QUERY_THROW);
- if ( xReceiver.is() && m_bImportedChart )
+ if ( m_bImportedChart )
{
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 2e2bc8f07ed2..e49748177b70 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -443,9 +443,6 @@ bool ORptFilter::implImport( const Sequence< PropertyValue
>& rDescriptor )
if ( bRet )
{
m_xReportDefinition.set(GetModel(),UNO_QUERY_THROW);
- OSL_ENSURE(m_xReportDefinition.is(),"ReportDefinition is NULL!");
- if ( !m_xReportDefinition.is() )
- return false;
#if OSL_DEBUG_LEVEL > 1
uno::Reference < container::XNameAccess > xAccess( xStorage,
uno::UNO_QUERY );
@@ -1077,14 +1074,10 @@ const OUString& ORptFilter::convertFormula(const
OUString& _sFormula)
void SAL_CALL ORptFilter::startDocument()
{
m_xReportDefinition.set(GetModel(),UNO_QUERY_THROW);
- OSL_ENSURE(m_xReportDefinition.is(),"ReportDefinition is NULL!");
- if ( m_xReportDefinition.is() )
- {
- m_pReportModel =
reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition);
- OSL_ENSURE(m_pReportModel,"Report model is NULL!");
+ m_pReportModel =
reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition);
+ OSL_ENSURE(m_pReportModel,"Report model is NULL!");
- SvXMLImport::startDocument();
- }
+ SvXMLImport::startDocument();
}
void ORptFilter::endDocument()
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx
b/reportdesign/source/ui/dlg/Navigator.cxx
index 66bf2ec329a5..79ceeb9da8c3 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -537,7 +537,6 @@ void NavigatorTree::traverseSection(const uno::Reference<
report::XSection>& _xS
for (sal_Int32 i = 0; i < nCount; ++i)
{
uno::Reference< report::XReportComponent>
xElement(_xSection->getByIndex(i),uno::UNO_QUERY_THROW);
- OSL_ENSURE(xElement.is(),"Found report element which is NULL!");
insertEntry(lcl_getName(xElement.get()),pSection,lcl_getImageId(xElement),TREELIST_APPEND,new
UserData(this,xElement));
uno::Reference< report::XReportDefinition>
xSubReport(xElement,uno::UNO_QUERY);
if ( xSubReport.is() )
diff --git a/sc/qa/extras/check_data_pilot_field.cxx
b/sc/qa/extras/check_data_pilot_field.cxx
index f5a4163e74c3..a132788e2b8b 100644
--- a/sc/qa/extras/check_data_pilot_field.cxx
+++ b/sc/qa/extras/check_data_pilot_field.cxx
@@ -89,7 +89,6 @@ uno::Reference< uno::XInterface > CheckDataPilotField::init()
return mxObject;
uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is());
// the cell range
table::CellRangeAddress sCellRangeAdress;
diff --git a/sc/qa/extras/check_data_pilot_table.cxx
b/sc/qa/extras/check_data_pilot_table.cxx
index 1a4e6e4c2410..586fe72b0af3 100644
--- a/sc/qa/extras/check_data_pilot_table.cxx
+++ b/sc/qa/extras/check_data_pilot_table.cxx
@@ -86,7 +86,6 @@ uno::Reference< uno::XInterface > CheckDataPilotTable::init()
return mxObject;
uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is());
// the cell range
table::CellRangeAddress sCellRangeAdress;
diff --git a/sc/qa/extras/check_xcell_ranges_query.cxx
b/sc/qa/extras/check_xcell_ranges_query.cxx
index ec5d44cb3d2d..c5ebef7ef4e9 100644
--- a/sc/qa/extras/check_xcell_ranges_query.cxx
+++ b/sc/qa/extras/check_xcell_ranges_query.cxx
@@ -64,7 +64,6 @@ uno::Reference< uno::XInterface >
CheckXCellRangesQuery::init()
mxComponent = loadFromDesktop("private:factory/scalc");
uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is());
// Getting spreadsheet
uno::Reference< sheet::XSpreadsheets > oSheets =
xSheetDoc->getSheets();
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx
index e3bf1e2a44ad..60c27979477e 100644
--- a/sc/qa/extras/new_cond_format.cxx
+++ b/sc/qa/extras/new_cond_format.cxx
@@ -71,7 +71,6 @@ uno::Reference< uno::XInterface >
ScConditionalFormatTest::init(sal_Int32 nIndex
{
// get the first sheet
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
uno::UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(nIndex),
uno::UNO_QUERY_THROW);
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
index 1ac0b9387b03..27b85ece8a48 100644
--- a/sc/qa/extras/regression-test.cxx
+++ b/sc/qa/extras/regression-test.cxx
@@ -79,32 +79,24 @@ void ScChartRegressionTest::test()
CPPUNIT_ASSERT(xComponent.is());
uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDoc.is());
uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xIA.is());
uno::Reference< table::XTableChartsSupplier > xChartSupplier(
xIA->getByIndex(0), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChartSupplier.is());
uno::Reference< table::XTableCharts > xCharts =
xChartSupplier->getCharts();
CPPUNIT_ASSERT(xCharts.is());
uno::Reference< container::XIndexAccess > xIACharts(xCharts,
UNO_QUERY_THROW);
uno::Reference< table::XTableChart > xChart( xIACharts->getByIndex(0),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xChart.is());
uno::Reference< document::XEmbeddedObjectSupplier >
xEmbObjectSupplier(xChart, UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xEmbObjectSupplier.is());
uno::Reference< lang::XComponent > xChartComp(
xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW );
- CPPUNIT_ASSERT(xChartComp.is());
uno::Reference< chart2::XChartDocument > xChartDoc ( xChartComp,
UNO_QUERY_THROW );
- CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW );
- CPPUNIT_ASSERT(xDumper.is());
OUString aDump = xDumper->dump();
std::cout << aDump;
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 18beb9dabb48..7d6d10890c12 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -75,8 +75,6 @@ uno::Reference< sheet::XSheetAnnotation>
ScAnnontationObj::getAnnotation(table::
uno::Reference< sheet::XSheetAnnotationAnchor > xAnnotationAnchor(xCell,
UNO_QUERY_THROW);
uno::Reference< sheet::XSheetAnnotation > xSheetAnnotation(
xAnnotationAnchor->getAnnotation(), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xSheetAnnotation.is());
-
return xSheetAnnotation;
}
diff --git a/sc/qa/extras/scannotationshapeobj.cxx
b/sc/qa/extras/scannotationshapeobj.cxx
index 795a0fdb9b35..77fce301ce1f 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -72,7 +72,6 @@ void ScAnnotationShapeObj::tearDown()
uno::Reference<uno::XInterface> ScAnnotationShapeObj::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet(xIA->getByIndex(0),
UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scannotationsobj.cxx
b/sc/qa/extras/scannotationsobj.cxx
index b9f230316b71..31f94c3e3196 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -56,7 +56,6 @@ uno::Reference< sheet::XSheetAnnotations>
ScAnnontationsObj::getAnnotations(long
{
// get the sheet
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(nIndex),
UNO_QUERY_THROW);
@@ -65,8 +64,6 @@ uno::Reference< sheet::XSheetAnnotations>
ScAnnontationsObj::getAnnotations(long
uno::Reference< sheet::XSheetAnnotationsSupplier >
xAnnotationSupplier(xSheet, UNO_QUERY_THROW);
uno::Reference< sheet::XSheetAnnotations > xSheetAnnotations(
xAnnotationSupplier->getAnnotations(), UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xSheetAnnotations.is());
-
return xSheetAnnotations;
}
diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx
index c0c8c6c9b188..0183515071c9 100644
--- a/sc/qa/extras/scarealinkobj.cxx
+++ b/sc/qa/extras/scarealinkobj.cxx
@@ -66,7 +66,6 @@ ScAreaLinkObj::ScAreaLinkObj()
uno::Reference< uno::XInterface > ScAreaLinkObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< beans::XPropertySet > xPropSet(xDoc, uno::UNO_QUERY_THROW);
uno::Reference< sheet::XAreaLinks >
xLinks(xPropSet->getPropertyValue("AreaLinks"), uno::UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
index df65526c8d0f..352efd65d20b 100644
--- a/sc/qa/extras/scarealinksobj.cxx
+++ b/sc/qa/extras/scarealinksobj.cxx
@@ -52,7 +52,6 @@ ScAreaLinksObj::ScAreaLinksObj()
uno::Reference< uno::XInterface > ScAreaLinksObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< beans::XPropertySet > xPropSet(xDoc, uno::UNO_QUERY_THROW);
uno::Reference< sheet::XAreaLinks >
xLinks(xPropSet->getPropertyValue("AreaLinks"), uno::UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index ca2b55cf200d..851f6dce34ac 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -53,7 +53,6 @@ ScAutoFormatObj::ScAutoFormatObj()
uno::Reference<uno::XInterface> ScAutoFormatObj::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIA(
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index 8e3b0ca43b08..61e564215787 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -119,7 +119,6 @@ ScCellCursorObj::ScCellCursorObj():
uno::Reference< uno::XInterface > ScCellCursorObj::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<container::XIndexAccess> xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0),
UNO_QUERY_THROW);
@@ -134,7 +133,6 @@ uno::Reference< uno::XInterface > ScCellCursorObj::init()
uno::Reference< uno::XInterface > ScCellCursorObj::getXSpreadsheet()
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0),
UNO_QUERY_THROW);
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx
index 996d8a9f4268..0db73b287500 100644
--- a/sc/qa/extras/sccellobj.cxx
+++ b/sc/qa/extras/sccellobj.cxx
@@ -63,7 +63,6 @@ ScCellObj::ScCellObj()
uno::Reference< uno::XInterface > ScCellObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xSheetDoc.is());
uno::Reference<sheet::XSpreadsheets> xSheets (xSheetDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIndex(xSheets, UNO_QUERY_THROW);
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 80ae6f8b664b..78670eef364c 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -167,23 +167,18 @@ ScCellRangeObj::ScCellRangeObj():
uno::Reference< uno::XInterface > ScCellRangeObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("Could not create interface of type XSpreadsheet",
xSheet.is());
-
uno::Reference<table::XCellRange>
xReturn(xSheet->getCellRangeByPosition(0,0,4,4), UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("Could not create object of type XCellRangesQuery",
xReturn.is());
return xReturn;
}
uno::Reference< uno::XInterface > ScCellRangeObj::getXSpreadsheet()
{
uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0),
UNO_QUERY_THROW);
@@ -194,16 +189,12 @@ uno::Reference< uno::XInterface >
ScCellRangeObj::getXSpreadsheet()
uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData()
{
uno::Reference< sheet::XSpreadsheetDocument> xDoc (mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(1),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("Could not create interface of type XSpreadsheet",
xSheet.is());
-
uno::Reference<table::XCellRange>
xReturn(xSheet->getCellRangeByPosition(0,0,3,3), UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("Could not create object of type XCellRangesQuery",
xReturn.is());
return xReturn;
}
diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx
index 5a0c5e90139c..0dd8a7520715 100644
--- a/sc/qa/extras/sccellrangesobj.cxx
+++ b/sc/qa/extras/sccellrangesobj.cxx
@@ -74,7 +74,6 @@ ScCellRangesObj::ScCellRangesObj():
uno::Reference< uno::XInterface > ScCellRangesObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< container::XIndexAccess > xIndexAccess(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet(xIndexAccess->getByIndex(0),
uno::UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scconsolidationdescriptorobj.cxx
b/sc/qa/extras/scconsolidationdescriptorobj.cxx
index a68f5fe0ef5b..e229ade7e5a8 100644
--- a/sc/qa/extras/scconsolidationdescriptorobj.cxx
+++ b/sc/qa/extras/scconsolidationdescriptorobj.cxx
@@ -62,7 +62,6 @@ ScConsolidationDescriptorObj::ScConsolidationDescriptorObj()
uno::Reference<uno::XInterface> ScConsolidationDescriptorObj::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<sheet::XConsolidatable> xConsolidatable(xDoc,
UNO_QUERY_THROW);
return xConsolidatable->createConsolidationDescriptor(true);
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx
b/sc/qa/extras/scdatabaserangeobj.cxx
index ba8e8efbf4ef..fed4a8dd7d5e 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -67,7 +67,6 @@ ScDatabaseRangeObj::ScDatabaseRangeObj()
uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString&
rDBName )
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xNameAccess(
xPropSet->getPropertyValue("DatabaseRanges"), UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scdatabaserangesobj.cxx
b/sc/qa/extras/scdatabaserangesobj.cxx
index 9df20f8a57b6..a2f2c42308cf 100644
--- a/sc/qa/extras/scdatabaserangesobj.cxx
+++ b/sc/qa/extras/scdatabaserangesobj.cxx
@@ -53,7 +53,6 @@ ScDatabaseRangesObj::ScDatabaseRangesObj()
uno::Reference<uno::XInterface> ScDatabaseRangesObj::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<beans::XPropertySet> xPropSet(xDoc, UNO_QUERY_THROW);
uno::Reference<sheet::XDatabaseRanges>
xDbRanges(xPropSet->getPropertyValue("DatabaseRanges"),
diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx
b/sc/qa/extras/scdatapilotfieldobj.cxx
index 94c725ad8ce1..1b9ea1a65c42 100644
--- a/sc/qa/extras/scdatapilotfieldobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldobj.cxx
@@ -66,24 +66,20 @@ ScDataPilotFieldObj::ScDataPilotFieldObj()
uno::Reference< uno::XInterface > ScDataPilotFieldObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(1),
UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("Could not create interface of type XSpreadsheet",
xSheet.is());
uno::Reference< sheet::XDataPilotTablesSupplier > xDPTS(xSheet,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDPTS.is());
uno::Reference< sheet::XDataPilotTables > xDPT =
xDPTS->getDataPilotTables();
CPPUNIT_ASSERT(xDPT.is());
uno::Sequence<OUString> aElementNames = xDPT->getElementNames();
(void) aElementNames;
uno::Reference< sheet::XDataPilotDescriptor >
xDPDsc(xDPT->getByName("DataPilot1"),UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDPDsc.is());
uno::Reference< container::XIndexAccess > xIA(
xDPDsc->getDataPilotFields(), UNO_QUERY_THROW);
uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0),
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xReturnValue.is());
return xReturnValue;
}
diff --git a/sc/qa/extras/scdatapilotitemobj.cxx
b/sc/qa/extras/scdatapilotitemobj.cxx
index ab2d44338b80..5d182624c00f 100644
--- a/sc/qa/extras/scdatapilotitemobj.cxx
+++ b/sc/qa/extras/scdatapilotitemobj.cxx
@@ -65,7 +65,6 @@ uno::Reference< uno::XInterface > ScDataPilotItemObj::init()
table::CellAddress sCellAddress(0, 7, 8);
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
// we need to sheets
uno::Reference< sheet::XSpreadsheets > xSheets(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scdatapilottableobj.cxx
b/sc/qa/extras/scdatapilottableobj.cxx
index ebc14b04191b..b9896862fa73 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -82,7 +82,6 @@ ScDataPilotTableObj::ScDataPilotTableObj()
uno::Reference< uno::XInterface > ScDataPilotTableObj::init()
{
uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0),
UNO_QUERY_THROW);
@@ -95,13 +94,11 @@ uno::Reference< uno::XInterface >
ScDataPilotTableObj::init()
CPPUNIT_ASSERT_MESSAGE("Could not create interface of type XSpreadsheet",
xSheet.is());
uno::Reference< sheet::XDataPilotTablesSupplier > xDPTS(xSheet,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDPTS.is());
uno::Reference< sheet::XDataPilotTables > xDPT =
xDPTS->getDataPilotTables();
CPPUNIT_ASSERT(xDPT.is());
uno::Reference< sheet::XDataPilotTable >
xDPTable(xDPT->getByName("DataPilotTable"),UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDPTable.is());
return xDPTable;
}
@@ -126,13 +123,11 @@ uno::Reference< uno::XInterface >
ScDataPilotTableObj::initDP2()
CPPUNIT_ASSERT_MESSAGE("Could not create interface of type XSpreadsheet",
xSheet.is());
uno::Reference< sheet::XDataPilotTablesSupplier > xDPTS(xSheet,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDPTS.is());
uno::Reference< sheet::XDataPilotTables > xDPT =
xDPTS->getDataPilotTables();
CPPUNIT_ASSERT(xDPT.is());
uno::Reference< sheet::XDataPilotTable >
xDPTable(xDPT->getByName("DataPilotTable2"),UNO_QUERY_THROW);
- CPPUNIT_ASSERT(xDPTable.is());
return xDPTable;
}
diff --git a/sc/qa/extras/scdatapilottablesobj.cxx
b/sc/qa/extras/scdatapilottablesobj.cxx
index 0f44daa60fb5..7a86605852e7 100644
--- a/sc/qa/extras/scdatapilottablesobj.cxx
+++ b/sc/qa/extras/scdatapilottablesobj.cxx
@@ -59,7 +59,6 @@ ScDataPilotTablesObj::ScDataPilotTablesObj()
uno::Reference<uno::XInterface> ScDataPilotTablesObj::init()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(),
UNO_QUERY_THROW);
@@ -84,7 +83,6 @@ uno::Reference<uno::XInterface> ScDataPilotTablesObj::init()
uno::Reference<uno::XInterface> ScDataPilotTablesObj::getXSpreadsheet()
{
uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent,
UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(),
UNO_QUERY_THROW);
uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(),
UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index 91899ceef78a..a9b7358e54da 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -59,7 +59,6 @@ ScDDELinkObj::ScDDELinkObj()
uno::Reference<uno::XInterface> ScDDELinkObj::init()
{
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
