diff options
| -rw-r--r-- | hwpfilter/source/hwpfile.cxx | 4 | ||||
| -rw-r--r-- | hwpfilter/source/hwpfile.h | 2 | ||||
| -rw-r--r-- | include/test/sheet/xdatapilottable2.hxx | 2 | ||||
| -rw-r--r-- | test/source/sheet/xdatapilottable2.cxx | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 552233dd853d..d3bd660e77fd 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -253,7 +253,7 @@ void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist) } } -bool HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsigned char flag) +void HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsigned char flag) { std::unique_ptr<HWPPara> spNode( new HWPPara ); unsigned char tmp_etcflag; @@ -284,8 +284,6 @@ bool HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsi aplist.push_back(std::move(spNode)); spNode.reset( new HWPPara ); } - - return true; } void HWPFile::TagsRead() diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index 1c9e7a09a234..4f68543f5b13 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -156,7 +156,7 @@ class DLLEXPORT HWPFile /** * Reads main paragraph list */ - bool ReadParaList(std::vector<std::unique_ptr<HWPPara>> &aplist, unsigned char flag = 0); + void ReadParaList(std::vector<std::unique_ptr<HWPPara>> &aplist, unsigned char flag = 0); void ReadParaList(std::vector<HWPPara*> &aplist); /** * Sets if the stream is compressed diff --git a/include/test/sheet/xdatapilottable2.hxx b/include/test/sheet/xdatapilottable2.hxx index 8933379fb5c2..a7ffde07d964 100644 --- a/include/test/sheet/xdatapilottable2.hxx +++ b/include/test/sheet/xdatapilottable2.hxx @@ -38,7 +38,7 @@ public: protected: private: - static bool checkDrillDownSheetContent(css::uno::Reference< css::sheet::XSpreadsheet > const & xSheet, const css::uno::Sequence< css::uno::Sequence < css::uno::Any > >& aData); + static void checkDrillDownSheetContent(css::uno::Reference< css::sheet::XSpreadsheet > const & xSheet, const css::uno::Sequence< css::uno::Sequence < css::uno::Any > >& aData); void getOutputRanges(css::uno::Reference< css::sheet::XDataPilotTable2 > const &); void buildDataFields(css::uno::Reference< css::sheet::XDataPilotTable2 > const &); diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx index 5d49871bc620..d54a12f425bb 100644 --- a/test/source/sheet/xdatapilottable2.cxx +++ b/test/source/sheet/xdatapilottable2.cxx @@ -248,7 +248,7 @@ table::CellAddress getLastUsedCellAddress( uno::Reference< sheet::XSpreadsheet > } -bool XDataPilotTable2::checkDrillDownSheetContent(uno::Reference< sheet::XSpreadsheet > const & xSheet, const uno::Sequence< uno::Sequence< Any > >& aData) +void XDataPilotTable2::checkDrillDownSheetContent(uno::Reference< sheet::XSpreadsheet > const & xSheet, const uno::Sequence< uno::Sequence< Any > >& aData) { table::CellAddress aLastCell = getLastUsedCellAddress(xSheet, 0, 0); CPPUNIT_ASSERT(aData.getLength() > 0); @@ -271,7 +271,6 @@ bool XDataPilotTable2::checkDrillDownSheetContent(uno::Reference< sheet::XSpread CPPUNIT_ASSERT_EQUAL(aCell2, aCell1); } } - return true; } } |