summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdfmtf.hxx
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2012-08-30 23:19:17 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-08-31 08:35:18 +0400
commitc050300a72f80ab838bd10f0cedd355048a2aaa5 (patch)
treef76f73fc49a3a70329a58f1d83e8d1b723634baf /svx/source/svdraw/svdfmtf.hxx
parent9bb30a4a0ef0d032ccf79b6d3c2b64f86bdbaa22 (diff)
remove SdrObjRefList, use vector directly
also prevent using operator[] on empty vector Change-Id: I0582ab1c7fd04a0bc6d717d8ca51670c3e5ef1c9
Diffstat (limited to 'svx/source/svdraw/svdfmtf.hxx')
-rw-r--r--svx/source/svdraw/svdfmtf.hxx32
1 files changed, 2 insertions, 30 deletions
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index ceead0de48b0..f0fc89ec4f09 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -46,44 +46,16 @@ class SdrObject;
class SvdProgressInfo;
//************************************************************
-// Helper Class SdrObjRefList
-//************************************************************
-
-class SdrObjRefList
-{
- std::vector<SdrObject*> aList;
-public:
-
- SdrObjRefList()
- : aList()
- {}
-
- void Clear() { aList.clear(); }
- sal_uLong GetObjCount() const { return aList.size(); }
- SdrObject* GetObj(sal_uLong nNum) const { return aList[nNum]; }
- SdrObject* operator[](sal_uLong nNum) const { return aList[nNum]; }
- void InsertObject(SdrObject* pObj) { aList.push_back(pObj); }
- void InsertObject(SdrObject* pObj, sal_uLong nPos)
- {
- if(nPos==CONTAINER_APPEND)
- aList.push_back(pObj);
- else
- aList.insert(aList.begin() + nPos, pObj);
- }
- void RemoveObject(sal_uLong nPos) { aList.erase(aList.begin()+nPos); }
-};
-
-//************************************************************
// Helper Class ImpSdrGDIMetaFileImport
//************************************************************
class ImpSdrGDIMetaFileImport
{
protected:
- SdrObjRefList aTmpList;
+ std::vector<SdrObject*> aTmpList;
VirtualDevice aVD;
Rectangle aScaleRect;
- sal_uLong nMapScalingOfs; // from here on, not edited with MapScaling
+ size_t nMapScalingOfs; // from here on, not edited with MapScaling
SfxItemSet* pLineAttr;
SfxItemSet* pFillAttr;
SfxItemSet* pTextAttr;