summaryrefslogtreecommitdiff
path: root/filter/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-03-09 17:20:15 +0200
committerMichael Stahl <mstahl@redhat.com>2012-03-13 23:19:53 +0100
commitf1bd21bdbb07879f9337d2da2ef1a02792a76369 (patch)
tree611734788309dd194f4d12160bd086f34263c74c /filter/inc
parentb81955ffe00f8e7137f0cd0aacc1f2970bfc02af (diff)
Converts from tools/table.hxx to std::map in DffPropSet class in filter module
Diffstat (limited to 'filter/inc')
-rw-r--r--filter/inc/filter/msfilter/msdffimp.hxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index c8edec044f6f..3366a9c88431 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -35,7 +35,6 @@
#include <svl/svarray.hxx>
#include <tools/color.hxx>
#include <tools/gen.hxx>
-#include <tools/table.hxx>
#include <svx/msdffdef.hxx>
#include <vcl/graph.hxx>
#include <string.h>
@@ -106,10 +105,17 @@ struct DffPropFlags
class SvxMSDffManager;
-class MSFILTER_DLLPUBLIC DffPropSet : public Table
+class MSFILTER_DLLPUBLIC DffPropSet
{
+private:
+ void InitializeProp(sal_uInt32 nKey, sal_uInt32 nContent,
+ DffPropFlags& rFlags, sal_uInt32 nRecordType) const;
+
protected:
+typedef std::map<sal_uInt32, sal_uInt32> RecordTypesMap;
+
+ RecordTypesMap maRecordTypes;
sal_uInt32 mpContents[ 1024 ];
DffPropFlags mpFlags[ 1024 ];
@@ -466,12 +472,14 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
protected :
+typedef std::map<sal_uInt32, sal_uInt32> OffsetMap;
+
String maBaseURL;
sal_uInt32 mnCurMaxShapeId; // we need this information to
sal_uInt32 mnDrawingsSaved; // access the right drawing
sal_uInt32 mnIdClusters; // while only knowing the shapeid
FIDCL* mpFidcls;
- Table maDgOffsetTable; // array of fileoffsets
+ OffsetMap maDgOffsetTable; // array of fileoffsets
friend class DffPropertyReader;