incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354018 - in /incubator/ooo/branches/alg/aw080/main: sc/source/ui/drawfunc/fudraw.cxx sc/source/ui/inc/fudraw.hxx sd/source/ui/func/fupoor.cxx sd/source/ui/inc/fupoor.hxx sd/source/ui/view/drviews1.cxx
Date Tue, 26 Jun 2012 13:52:24 GMT
Author: alg
Date: Tue Jun 26 13:52:19 2012
New Revision: 1354018

URL: http://svn.apache.org/viewvc?rev=1354018&view=rev
Log:
aw080: Smaller corrections

Modified:
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fudraw.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/inc/fudraw.hxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/inc/fupoor.hxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fudraw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fudraw.cxx?rev=1354018&r1=1354017&r2=1354018&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fudraw.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fudraw.cxx Tue Jun 26 13:52:19
2012
@@ -730,11 +730,11 @@ sal_Bool __EXPORT FuDraw::KeyInput(const
 	return (bReturn);
 }
 
-// #97016# II
 void FuDraw::SelectionHasChanged()
 {
-	const SdrHdlList& rHdlList = pView->GetHdlList();
-	((SdrHdlList&)rHdlList).ResetFocusHdl();
+    // Not needed TTTT
+	//const SdrHdlList& rHdlList = pView->GetHdlList();
+	//((SdrHdlList&)rHdlList).ResetFocusHdl();
 }
 
 /*************************************************************************

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/inc/fudraw.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/inc/fudraw.hxx?rev=1354018&r1=1354017&r2=1354018&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/inc/fudraw.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/inc/fudraw.hxx Tue Jun 26 13:52:19
2012
@@ -57,8 +57,6 @@ class FuDraw : public FuPoor
 	virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
 	virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
 	virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
-
-	// #97016# II
 	virtual void SelectionHasChanged();
 
     sal_Bool IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx?rev=1354018&r1=1354017&r2=1354018&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx Tue Jun 26 13:52:19
2012
@@ -968,11 +968,11 @@ bool FuPoor::MouseMove(const MouseEvent&
 	return false;
 }
 
-// #97016# II
 void FuPoor::SelectionHasChanged()
 {
-	const SdrHdlList& rHdlList = mpView->GetHdlList();
-	((SdrHdlList&)rHdlList).ResetFocusHdl();
+    // Not needed TTTT
+	// const SdrHdlList& rHdlList = mpView->GetHdlList();
+	// ((SdrHdlList&)rHdlList).ResetFocusHdl();
 }
 
 /*************************************************************************

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/inc/fupoor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/inc/fupoor.hxx?rev=1354018&r1=1354017&r2=1354018&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/inc/fupoor.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/inc/fupoor.hxx Tue Jun 26 13:52:19
2012
@@ -93,8 +93,6 @@ public:
 	virtual void ScrollEnd() {} 	// ForceScroll aufgerufen
 
 	void SetWindow(::sd::Window* pWin) { mpWindow = pWin; }
-
-	// #97016# II
 	virtual void SelectionHasChanged();
 
 	sal_uInt16	GetSlotID() const { return( nSlotId ); }

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=1354018&r1=1354017&r2=1354018&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 Jun 26 13:52:19
2012
@@ -262,11 +262,7 @@ void DrawViewShell::SelectionHasChanged 
 				RTL_TEXTENCODING_UTF8 )).getStr() );
 	}
 
-	if( HasCurrentFunction() )
-	{
-		GetCurrentFunction()->SelectionHasChanged();
-	}
-	else
+	if( !HasCurrentFunction() )
 	{
         GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*this,*mpDrawView);
 	}



Mime
View raw message