summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-06-23 20:54:46 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-06-24 08:46:09 +0200
commit991eeb321595fb184b13032dd3a7734af33232d1 (patch)
tree05f58882ff83bc1d95930124e14cf17d865b3c6a /svx
parentb8f7ea5da41d61d405adec54dcd10b54ee0e5591 (diff)
Remove unused mpOwner in SvxTextEditSource.
Change-Id: I824e8436945e056840386960308b8e63627a603f
Diffstat (limited to 'svx')
-rw-r--r--svx/source/table/cell.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx6
-rw-r--r--svx/source/unodraw/unoshtxt.cxx16
3 files changed, 10 insertions, 14 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 0407bbe6b163..1b9a982e25bd 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -420,7 +420,7 @@ void Cell::SetModel(SdrModel* pNewModel)
}
else
{
- SetEditSource( new SvxTextEditSource( &GetObject(), this, static_cast< XWeak * >( this ) ) );
+ SetEditSource( new SvxTextEditSource( &GetObject(), this ) );
}
SetStyleSheet( 0, true );
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 1dd3bbacb820..0c2e6076ae53 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3962,7 +3962,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
: SvxShape( pObject, getSvxMapProvider().GetMap(SVXMAP_TEXT), getSvxMapProvider().GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
{
if( pObject && pObject->GetModel() )
- SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) );
+ SetEditSource( new SvxTextEditSource( pObject, 0 ) );
}
@@ -3970,7 +3970,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* p
: SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
{
if( pObject && pObject->GetModel() )
- SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) );
+ SetEditSource( new SvxTextEditSource( pObject, 0 ) );
}
@@ -3984,7 +3984,7 @@ SvxShapeText::~SvxShapeText() throw ()
void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
{
if( pNewObj && (NULL == GetEditSource()))
- SetEditSource( new SvxTextEditSource( pNewObj, 0, static_cast< uno::XWeak* >(this) ) );
+ SetEditSource( new SvxTextEditSource( pNewObj, 0 ) );
SvxShape::Create( pNewObj, pNewPage );
}
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 1e854d5cedae..93205e65de37 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -102,7 +102,6 @@ private:
bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
- XInterface* mpOwner;
SvxUnoTextRangeBaseList maTextRanges;
SvxTextForwarder* GetBackgroundTextForwarder();
@@ -121,7 +120,7 @@ private:
void dispose();
public:
- SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText, XInterface* pOwner );
+ SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText );
SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow );
virtual ~SvxTextEditSourceImpl();
@@ -158,7 +157,7 @@ public:
-SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText, XInterface* pOwner )
+SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText )
: maRefCount ( 0 ),
mpObject ( pObject ),
mpText ( pText ),
@@ -175,8 +174,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( false ),
- mbNotificationsDisabled ( false ),
- mpOwner( pOwner )
+ mbNotificationsDisabled ( false )
{
DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -213,8 +211,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( true ),
- mbNotificationsDisabled ( false ),
- mpOwner(0)
+ mbNotificationsDisabled ( false )
{
if( !mpText )
{
@@ -304,7 +301,6 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel )
mpWindow = 0;
m_xLinguServiceManager.clear();
- mpOwner = 0;
mpModel = pNewModel;
@@ -1039,9 +1035,9 @@ IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify)
// SvxTextEditSource
-SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText, XInterface* pOwner )
+SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText )
{
- mpImpl = new SvxTextEditSourceImpl( pObject, pText, pOwner );
+ mpImpl = new SvxTextEditSourceImpl( pObject, pText );
mpImpl->acquire();
}