summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-10-07 18:46:56 +0900
committerCaolán McNamara <caolanm@redhat.com>2014-10-08 15:18:32 +0000
commitad8c2f7090ea2e77bb9afe77b2764f1b4560ad76 (patch)
tree41e7d92633f00c30dbde46e039857bfbfc276dcf /include
parent79141e2ce2cac45634d48d13cf07f5d3fad171a6 (diff)
fdo#75757: remove inheritance to std::vector
from SvxMSDffShapeOrders. Change-Id: Idf551f1fbde907759d6a296141e2837264dbbb10 Reviewed-on: https://gerrit.libreoffice.org/11840 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/filter/msfilter/msdffimp.hxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 33cbc41fd221..45234622d999 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -111,11 +111,7 @@ typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer;
// the following two will be sorted by the order of their appearance:
typedef boost::ptr_vector<SvxMSDffBLIPInfo> SvxMSDffBLIPInfos;
-class SvxMSDffShapeOrders : public std::vector<SvxMSDffShapeOrder*>
-{
-public:
- ~SvxMSDffShapeOrders();
-};
+typedef boost::ptr_vector<SvxMSDffShapeOrder> SvxMSDffShapeOrders;
struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById
{
@@ -695,7 +691,7 @@ public:
inline const SvxMSDffShapeInfos_ById* GetShapeInfos( void ) const
{ return m_pShapeInfosById.get(); }
- inline const SvxMSDffShapeOrders* GetShapeOrders( void ) const
+ inline SvxMSDffShapeOrders* GetShapeOrders( void ) const
{ return pShapeOrders; }
void StoreShapeOrder(sal_uLong nId,