diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-23 13:56:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-23 13:56:37 +0000 |
commit | 7264d2767095150944ff1e6999c71be1dbdc6f83 (patch) | |
tree | 41614c0bea8345bdd1f71f6b8fc4bc0aa0b197b1 /sw | |
parent | 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f (diff) |
inherit privately
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/tblsel.hxx | 19 | ||||
-rw-r--r-- | sw/source/core/unocore/unochart.cxx | 4 |
2 files changed, 18 insertions, 5 deletions
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 314ce4728cfa..668988aff351 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -52,12 +52,25 @@ class SwCellFrm; SV_DECL_PTRARR( SwCellFrms, SwCellFrm*, 16, 16 ) -class SwSelBoxes : public std::map<sal_uLong, SwTableBox*> { +class SwSelBoxes : private std::map<sal_uLong, SwTableBox*> +{ typedef std::map<sal_uLong, SwTableBox*> Base; public: - using Base::insert; - using Base::find; + using Base::begin; + using Base::clear; using Base::count; + using Base::const_iterator; + using Base::const_reverse_iterator; + using Base::empty; + using Base::end; + using Base::erase; + using Base::find; + using Base::insert; + using Base::iterator; + using Base::rbegin; + using Base::rend; + using Base::reverse_iterator; + using Base::size; std::pair<iterator, bool> insert(SwTableBox* pBox) { return Base::insert(std::make_pair(pBox->GetSttIdx(), pBox)); } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 41a294c30d9a..2c4feef7dacd 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1695,8 +1695,8 @@ void SwChartDataProvider::AddRowCols( if (nBoxes < 1 || nLines < 1) return; - SwTableBox* pFirstBox = rBoxes.begin()->second; - SwTableBox* pLastBox = rBoxes.rbegin()->second; + SwTableBox* pFirstBox = rBoxes.begin()->second; + SwTableBox* pLastBox = rBoxes.rbegin()->second; if (pFirstBox && pLastBox) { |