diff options
| author | Christian Lippka <cl@openoffice.org> | 2010-03-26 15:39:43 +0100 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2010-03-26 15:39:43 +0100 |
| commit | 8add6851259b5112e90bcb810c90e2a990003f3c (patch) | |
| tree | c726972f53cc1ba7f584e5ff44a4bfaebc87083e | |
| parent | 43bddaee08638fa321cd7e16b6de90413149de03 (diff) | |
made the layout placeholder appear after load and on text edit
| -rw-r--r-- | sd/source/ui/view/viewoverlaymanager.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 0ca1ed04677f..a9df2a1baf94 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -376,7 +376,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) aImgMO = Image(b); } */ - ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i>>1], aImg, aImgMO, aPoint ); + ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i], aImg, aImgMO, aPoint ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetPageView( mrView.GetSdrPageView() ); @@ -426,7 +426,11 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) , mnUpdateTagsEvent( 0 ) { Link aLink( LINK(this,ViewOverlayManager,EventMultiplexerListener) ); - mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE); + mrBase.GetEventMultiplexer()->AddEventListener(aLink, tools::EventMultiplexerEvent::EID_CURRENT_PAGE + | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED + | tools::EventMultiplexerEvent::EID_VIEW_ADDED + | tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT + | tools::EventMultiplexerEvent::EID_END_TEXT_EDIT ); StartListening( *mrBase.GetDocShell() ); } @@ -514,7 +518,7 @@ bool ViewOverlayManager::CreateTags() for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) { - if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && !static_cast<SdrTextObj*>((*iter))->HasEditText() ) + if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && (mrBase.GetDrawView()->GetTextEditObject() != (*iter)) ) { rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *this, *mrBase.GetMainViewShell()->GetView(), *(*iter) ) ); maTagVector.push_back(xTag); @@ -554,6 +558,10 @@ IMPL_LINK(ViewOverlayManager,EventMultiplexerListener, { switch (pEvent->meEventId) { + case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: + case tools::EventMultiplexerEvent::EID_VIEW_ADDED: + case tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT: + case tools::EventMultiplexerEvent::EID_END_TEXT_EDIT: case tools::EventMultiplexerEvent::EID_CURRENT_PAGE: UpdateTags(); break; |