[PATCH] Remove Inheritance from std::vector

[Delveri chick]

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index c601fb1..807b861 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -88,8 +88,8 @@ protected:
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
 public:
-            TYPEINFO_OVERRIDE();
-            SvMetaName();
+    TYPEINFO_OVERRIDE();
+    SvMetaName();

     virtual bool                SetName( const OString& rName,
SvIdlDataBase * = NULL  );
     void                        SetDescription( const OString& rText )
@@ -113,8 +113,8 @@ class SvMetaReference : public SvMetaName
 protected:
     SvMetaReferenceRef  aRef;
 public:
-            TYPEINFO_OVERRIDE();
-            SvMetaReference();
+    TYPEINFO_OVERRIDE();
+    SvMetaReference();

     const SvString &    GetName() const SAL_OVERRIDE
                         {
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 8768cc0..50942b4 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -58,8 +58,8 @@ public:
 };

 template<typename Value>
-class SwVectorModifyBase : public std::vector<Value>
-{
+class SwVectorModifyBase{
+
 public:
     typedef typename std::vector<Value>::const_iterator const_iterator;

@@ -71,6 +71,7 @@ protected:

 private:
     const DestructorPolicy mPolicy;
+    std::vector<Value>  my_Value;

 protected:
     // default destructor deletes all contained elements
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index eb303d6..48a290e 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -63,7 +63,7 @@ class SwServerObject;

 void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );

-class SwTableLines : public std::vector<SwTableLine*> {
+class SwTableLines {
 public:
     // free's any remaining child objects
     ~SwTableLines();
@@ -74,6 +74,9 @@ public:
         const_iterator it = std::find(begin(), end(), pBox);
         return it == end() ? USHRT_MAX : it - begin();
     }
+
+private:
+    std::vector<SwTableLine*> my_SWTbLine;
 };

 class SwTableBoxes : public std::vector<SwTableBox*> {
diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx
index a57b99b..0cd5b8e 100644
--- a/sw/source/filter/ww8/types.hxx
+++ b/sw/source/filter/ww8/types.hxx
@@ -24,10 +24,12 @@

 namespace ww
 {
-    class bytes : public std::vector<sal_uInt8>
-    {
+    class bytes{
+
         public:
             const sal_uInt8* data() const { return empty() ? 0 : &front();
}
+        private:
+            std::vector<sal_uInt8> my_uInt8;
     };

     enum WordVersion {eWW1 = 1, eWW2 = 2, eWW6 = 6, eWW7 = 7, eWW8 = 8};

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice