summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-08-15 12:28:36 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-16 18:44:04 +0200
commitdd3b0fa68b9e850ed8df34094c21abfbd8c6f61b (patch)
treeff05afbf79bd377e64882de52ad78c6b61d631de /svx
parentb94bff540a47a9fc5ce0586aa58e28321c96e4aa (diff)
Remove unused field
Change-Id: I962c2bbd29b2ce2e39bf0f9db4c12fc5535cf4f6
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/svdlayer.hxx2
-rw-r--r--svx/inc/svx/svdpage.hxx1
-rw-r--r--svx/source/svdraw/svdlayer.cxx6
3 files changed, 3 insertions, 6 deletions
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index f0b468baa755..b4ed6ee5fd2d 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -31,7 +31,6 @@
#include <tools/string.hxx>
#include <tools/stream.hxx>
-#include <tools/contnr.hxx>
#include <svx/svdsob.hxx>
#include <svx/svdtypes.hxx> // fuer typedef SdrLayerID
#include "svx/svxdllapi.h"
@@ -86,7 +85,6 @@ friend class SdrPage;
protected:
std::vector<SdrLayer*> aLayer;
- Container aLSets;
SdrLayerAdmin* pParent; // Der Admin der Seite kennt den Admin des Docs
SdrModel* pModel; // zum Broadcasten
String aControlLayerName;
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index e700f29c8cc1..892e758218ea 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -33,6 +33,7 @@
#include <vcl/print.hxx>
#include <vcl/gdimtf.hxx>
#include <tools/weakbase.hxx>
+#include <tools/contnr.hxx>
#include <cppuhelper/weakref.hxx>
#include <svx/svdtypes.hxx>
#include <svx/svdlayer.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 4b0282231f31..5ede97f8da94 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -160,7 +160,6 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const
SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent):
aLayer(),
- aLSets(1024,16,16),
pModel(NULL)
{
aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls"));
@@ -169,7 +168,6 @@ SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent):
SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin):
aLayer(),
- aLSets(1024,16,16),
pParent(NULL),
pModel(NULL)
{
@@ -204,8 +202,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi
bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const
{
if (pParent!=rCmpLayerAdmin.pParent ||
- aLayer.size()!=rCmpLayerAdmin.aLayer.size() ||
- aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False;
+ aLayer.size()!=rCmpLayerAdmin.aLayer.size())
+ return sal_False;
bool bOk = true;
sal_uInt16 nAnz=GetLayerCount();
sal_uInt16 i=0;