summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-10-31 18:27:30 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-11-07 10:45:15 +0100
commit78657d31ca3118759b7e817d12886f3b713aea07 (patch)
tree5c39b624d1499043db9d293d2c098aaf8f048e5b /sw
parentc163d06882b9ef39165bf277606fc70f7ed0435e (diff)
Remove unused Graphic member of SwOLENode
Change-Id: Iaff7e86a8e11e9befc6feacdafd3a78a1971bbcd
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/ndole.hxx1
-rw-r--r--sw/source/core/ole/ndole.cxx5
2 files changed, 1 insertions, 5 deletions
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index a3622e1cb616..65189eecb5cb 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -71,7 +71,6 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
{
friend class SwNodes;
mutable SwOLEObj aOLEObj;
- Graphic* pGraphic;
OUString sChartTblName; ///< with chart objects: name of referenced table.
bool bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify
(e.g. copied). Is not persistent. */
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 35df868ac038..396394629be1 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -211,7 +211,6 @@ SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
SwAttrSet* pAutoAttr ) :
SwNoTxtNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
aOLEObj( xObj ),
- pGraphic(0),
bOLESizeInvalid( false ),
mpObjectLink( NULL )
{
@@ -225,7 +224,6 @@ SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
SwAttrSet* pAutoAttr ) :
SwNoTxtNode( rWhere, ND_OLENODE, pGrfColl, pAutoAttr ),
aOLEObj( rString, nAspect ),
- pGraphic(0),
bOLESizeInvalid( false ),
mpObjectLink( NULL )
{
@@ -235,14 +233,13 @@ SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
SwOLENode::~SwOLENode()
{
DisconnectFileLink_Impl();
- delete pGraphic;
}
const Graphic* SwOLENode::GetGraphic()
{
if ( aOLEObj.GetOleRef().is() )
return aOLEObj.xOLERef.GetGraphic();
- return pGraphic;
+ return 0;
}
SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )