summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/propread.hxx
diff options
context:
space:
mode:
authorRafael Dominguez <venccsralph@gmail.com>2011-03-26 08:48:07 -0430
committerKatarina Machalkova <kmachalkova@suse.cz>2011-04-28 11:02:16 +0200
commit08364f64ab0df90909c2daea5b321b92c42466cc (patch)
treec257486d96f34a4717e29537381fa90631fd4447 /sd/source/filter/ppt/propread.hxx
parent64a817a3e62ea200684a8fd60caa035b4ec7691d (diff)
Remove deprecated List container in PropRead
Moved PropEntry to header.
Diffstat (limited to 'sd/source/filter/ppt/propread.hxx')
-rw-r--r--sd/source/filter/ppt/propread.hxx20
1 files changed, 16 insertions, 4 deletions
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index 3385dd37e28f..79b1c27dd174 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -110,7 +110,19 @@
// ------------------------------------------------------------------------
-class PropEntry;
+struct PropEntry
+{
+ sal_uInt32 mnId;
+ sal_uInt32 mnSize;
+ sal_uInt16 mnTextEnc;
+ sal_uInt8* mpBuf;
+
+ PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc );
+ PropEntry( const PropEntry& rProp );
+ ~PropEntry() { delete[] mpBuf; } ;
+
+ const PropEntry& operator=(const PropEntry& rPropEntry);
+};
class PropItem : public SvMemoryStream
{
@@ -168,7 +180,7 @@ class Section
// ------------------------------------------------------------------------
-class PropRead : private List
+class PropRead
{
sal_Bool mbStatus;
SvStorageStreamRef mpSvStream;
@@ -178,14 +190,14 @@ class PropRead : private List
sal_uInt16 mnVersionLo;
sal_uInt16 mnVersionHi;
sal_uInt8 mApplicationCLSID[ 16 ];
+ boost::ptr_vector<Section> maSections;
void AddSection( Section& rSection );
public:
PropRead( SvStorage& rSvStorage, const String& rName );
- ~PropRead();
- PropRead& operator=( PropRead& rPropRead );
+ PropRead& operator=( const PropRead& rPropRead );
const Section* GetSection( const sal_uInt8* pFMTID );
sal_Bool IsValid() const { return mbStatus; };
void Read();