summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-11-27 13:00:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-11-27 15:51:46 +0000
commit7ef4a5bd51c606c70661dd303ebd1eeaec0c3834 (patch)
treefb216442992340ccab2440c299b982c463e69a4b /include
parent76bb6d7678669b5af1731fb87e632784cd3c01fc (diff)
removed pCaptionObj from accessibility
it was not initialized but accessed in one place. Checked with symphony code, there was a set method which is not in AOO trunk, thus solved accesses to zero pointer usage (cherry picked from commit bd0c3b940f6006d3cb49381230795db667aeb943) Conflicts: svx/inc/svx/svdobj.hxx svx/source/svdraw/svdobj.cxx Change-Id: Ic8dec5c6def35753d757066c7ea02e1a92b46f6c
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdobj.hxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ee08d6b088a8..f1b3dbbad506 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -357,7 +357,6 @@ protected:
SdrObjUserCall* pUserCall;
SdrObjPlusData* pPlusData; // Broadcaster, UserData, Konnektoren, ... (Das ist der Bitsack)
- SdrObject* pCaptionObj;
sal_uInt32 nOrdNum; // Rangnummer des Obj in der Liste
SfxGrabBagItem* pGrabBagItem; // Holds the GrabBagItem property
@@ -1036,7 +1035,6 @@ public:
// #i121917#
virtual bool HasText() const;
- const SdrObject* GetCaptionObj() const;
protected:
/** Sets a new UNO shape
*