You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/11/13 13:14:14 UTC
svn commit: r1408691 - in
/incubator/ooo/branches/alg/aw080/main/sd/source/ui: func/fusel.cxx
view/drviews1.cxx
Author: alg
Date: Tue Nov 13 12:14:13 2012
New Revision: 1408691
URL: http://svn.apache.org/viewvc?rev=1408691&view=rev
Log:
Added missing force trigger selection change and forwarding from ViewShell to SelectionHasChanged.
Modified:
incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx
incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx?rev=1408691&r1=1408690&r2=1408691&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx Tue Nov 13 12:14:13 2012
@@ -697,6 +697,13 @@ bool FuSelection::MouseButtonUp(const Mo
if( !mpView )
return false;
+ if(mpView->isSelectionChangePending())
+ {
+ // force trigger selection change to get bSelectionChanged
+ // set in FuSelection::SelectionHasChanged() call eventually
+ mpView->forceSelectionChange();
+ }
+
const double fHitLog(basegfx::B2DVector(mpWindow->GetInverseViewTransformation() * basegfx::B2DVector(HITPIX, 0.0)).getLength());
const double fDrgLog(basegfx::B2DVector(mpWindow->GetInverseViewTransformation() * basegfx::B2DVector(DRGPIX, 0.0)).getLength());
const basegfx::B2DPoint aPixelPos(rMEvt.GetPosPixel().X(), rMEvt.GetPosPixel().Y());
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx?rev=1408691&r1=1408690&r2=1408691&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx Tue Nov 13 12:14:13 2012
@@ -262,7 +262,12 @@ void DrawViewShell::SelectionHasChanged
RTL_TEXTENCODING_UTF8 )).getStr() );
}
- if( !HasCurrentFunction() )
+ if(HasCurrentFunction())
+ {
+ // SelectionHasChanged() needs to be triggered for current founction
+ GetCurrentFunction()->SelectionHasChanged();
+ }
+ else
{
GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*this,*mpDrawView);
}