ooo-build r13812 - in trunk: . patches/dev300

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13812 - in trunk: . patches/dev300
Date: Fri, 5 Sep 2008 15:45:19 +0000 (UTC)
Author: kyoshida
Date: Fri Sep  5 15:45:19 2008
New Revision: 13812
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13812&view=rev

Log:
2008-09-05  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/apply:
	* patches/dev300/sfxnotify-removal-svtools.diff: added new patch to 
	remove SFX_NOTIFY from svtools.
	
	* patches/dev300/sfxnotify-removal-automation.diff:
	* patches/dev300/sfxnotify-removal-basic.diff:
	* patches/dev300/sfxnotify-removal-chart2.diff:
	* patches/dev300/sfxnotify-removal-sc.diff:
	* patches/dev300/sfxnotify-removal-sd.diff:
	* patches/dev300/sfxnotify-removal-sfx2.diff:
	* patches/dev300/sfxnotify-removal-svx.diff: updated from 
	sfxnotifyremoval cws.


Added:
   trunk/patches/dev300/sfxnotify-removal-svtools.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sfxnotify-removal-automation.diff
   trunk/patches/dev300/sfxnotify-removal-basic.diff
   trunk/patches/dev300/sfxnotify-removal-chart2.diff
   trunk/patches/dev300/sfxnotify-removal-sc.diff
   trunk/patches/dev300/sfxnotify-removal-sd.diff
   trunk/patches/dev300/sfxnotify-removal-sfx2.diff
   trunk/patches/dev300/sfxnotify-removal-svx.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep  5 15:45:19 2008
@@ -805,6 +805,7 @@
 sfxnotify-removal-sd.diff, i#89809, kohei
 sfxnotify-removal-sfx2.diff, i#89810, kohei
 sfxnotify-removal-svx.diff, i#89811, kohei
+sfxnotify-removal-svtools.diff, kohei
 
 # reduce mininum password length from 5 to 1.
 min-password-length-sfx2.diff, i#85453, kohei

Modified: trunk/patches/dev300/sfxnotify-removal-automation.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-automation.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-automation.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx
-index d5d8ee2..3f77243 100644
---- automation/source/app/testbasi.cxx
-+++ automation/source/app/testbasi.cxx
-@@ -152,9 +152,9 @@ void TTBasic::ReportRuntimeError( AppBasEd *pEditWin )
+Index: automation/source/app/testbasi.cxx
+===================================================================
+RCS file: /cvs/util/automation/source/app/testbasi.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.14.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.9.14.1
+--- automation/source/app/testbasi.cxx	11 Apr 2008 09:54:34 -0000	1.9
++++ automation/source/app/testbasi.cxx	23 May 2008 20:00:11 -0000	1.9.14.1
+@@ -152,9 +152,9 @@
  {
  	SbxVariableRef aDummy = new SbxVariable;
  	aDummy->SetUserData( 24 );  // ID_MaybeAddErr

Modified: trunk/patches/dev300/sfxnotify-removal-basic.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-basic.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-basic.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
-index ff2be94..ffd1eff 100644
---- basic/source/app/app.cxx
-+++ basic/source/app/app.cxx
-@@ -828,8 +828,7 @@ void BasicFrame::SetAutoRun( BOOL bAuto )
+Index: basic/source/app/app.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/app/app.cxx,v
+retrieving revision 1.79
+retrieving revision 1.78.20.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.79 -r1.78.20.2
+--- basic/source/app/app.cxx	11 Jul 2008 18:44:27 -0000	1.79
++++ basic/source/app/app.cxx	31 Jul 2008 00:12:54 -0000	1.78.20.2
+@@ -826,8 +826,7 @@
  	bIsAutoRun = bAuto;
  }
  
@@ -12,11 +16,15 @@
  {
  	if ( rHint.ISA( TTExecutionStatusHint ) )
  	{
-diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
-index 06b59d6..3ea8541 100644
---- basic/source/app/appbased.cxx
-+++ basic/source/app/appbased.cxx
-@@ -108,8 +108,7 @@ AppBasEd::~AppBasEd()
+Index: basic/source/app/appbased.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/app/appbased.cxx,v
+retrieving revision 1.13
+retrieving revision 1.13.20.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.13.20.1
+--- basic/source/app/appbased.cxx	11 Apr 2008 11:29:41 -0000	1.13
++++ basic/source/app/appbased.cxx	23 May 2008 20:03:23 -0000	1.13.20.1
+@@ -108,8 +108,7 @@
  	pMod->SetName( CUniString("--").Append( pMod->GetName() ) );
  }
  

Modified: trunk/patches/dev300/sfxnotify-removal-chart2.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-chart2.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-chart2.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
-index 4dba7a8..728e443 100644
---- chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
-+++ chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
-@@ -342,7 +342,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
+Index: chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx,v
+retrieving revision 1.19
+retrieving revision 1.18.20.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.19 -r1.18.20.2
+--- chart2/source/controller/drawinglayer/DrawViewWrapper.cxx	6 Jun 2008 09:07:05 -0000	1.19
++++ chart2/source/controller/drawinglayer/DrawViewWrapper.cxx	31 Jul 2008 00:17:43 -0000	1.18.20.2
+@@ -342,7 +342,7 @@
      return false;
  }
  
@@ -11,7 +15,7 @@
  {
      //prevent wrong reselection of objects
      SdrModel* pSdrModel( this->GetModel() );
-@@ -342,7 +342,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
+@@ -359,7 +359,7 @@
              return;
      }
  
@@ -20,11 +24,15 @@
      
      if( pSdrHint != 0 )
      {
-diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
-index 6329d2e..b22b31b 100644
---- chart2/source/controller/inc/DrawViewWrapper.hxx
-+++ chart2/source/controller/inc/DrawViewWrapper.hxx
-@@ -94,7 +94,7 @@ public:
+Index: chart2/source/controller/inc/DrawViewWrapper.hxx
+===================================================================
+RCS file: /cvs/graphics/chart2/source/controller/inc/DrawViewWrapper.hxx,v
+retrieving revision 1.11
+retrieving revision 1.11.20.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.11.20.1
+--- chart2/source/controller/inc/DrawViewWrapper.hxx	10 Apr 2008 20:32:07 -0000	1.11
++++ chart2/source/controller/inc/DrawViewWrapper.hxx	23 May 2008 20:05:06 -0000	1.11.20.1
+@@ -94,7 +94,7 @@
      SdrObject* getNamedSdrObject( const rtl::OUString& rName ) const;
      bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const;
  

Modified: trunk/patches/dev300/sfxnotify-removal-sc.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-sc.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-sc.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
-index 3a9248d..7b768b0 100644
---- sc/inc/stlsheet.hxx
-+++ sc/inc/stlsheet.hxx
-@@ -87,8 +87,7 @@ protected:
+Index: sc/inc/stlsheet.hxx
+===================================================================
+RCS file: /cvs/sc/sc/inc/stlsheet.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.46.1
+--- sc/inc/stlsheet.hxx	10 Apr 2008 18:55:50 -0000	1.5
++++ sc/inc/stlsheet.hxx	23 May 2008 20:06:20 -0000	1.5.46.1
+@@ -87,8 +87,7 @@
  							  SfxStyleFamily	eFamily,
  							  USHORT			nMask );
  
@@ -12,11 +16,15 @@
  };
  
  #endif	   // SC_STLSHEET_HXX
-diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
-index 8c31a1b..d71757b 100644
---- sc/source/ui/docshell/servobj.cxx
-+++ sc/source/ui/docshell/servobj.cxx
-@@ -209,8 +209,7 @@ BOOL __EXPORT ScServerObject::GetData(
+Index: sc/source/ui/docshell/servobj.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/docshell/servobj.cxx,v
+retrieving revision 1.11
+retrieving revision 1.11.10.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.11 -r1.11.10.1
+--- sc/source/ui/docshell/servobj.cxx	14 May 2008 09:57:35 -0000	1.11
++++ sc/source/ui/docshell/servobj.cxx	23 May 2008 20:06:20 -0000	1.11.10.1
+@@ -209,8 +209,7 @@
  	return 0;
  }
  
@@ -26,11 +34,15 @@
  {
  	BOOL bDataChanged = FALSE;
  
-diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
-index c718207..7579cae 100644
---- sc/source/ui/inc/docsh.hxx
-+++ sc/source/ui/inc/docsh.hxx
-@@ -161,8 +161,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
+Index: sc/source/ui/inc/docsh.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/docsh.hxx,v
+retrieving revision 1.50
+retrieving revision 1.50.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.50 -r1.50.46.1
+--- sc/source/ui/inc/docsh.hxx	15 Apr 2008 14:34:04 -0000	1.50
++++ sc/source/ui/inc/docsh.hxx	23 May 2008 20:06:20 -0000	1.50.46.1
+@@ -161,8 +161,7 @@
  
  protected:
  
@@ -40,11 +52,15 @@
  
  public:
  					TYPEINFO();
-diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
-index fa02725..3177ba9 100644
---- sc/source/ui/inc/drawview.hxx
-+++ sc/source/ui/inc/drawview.hxx
-@@ -71,8 +71,7 @@ public:
+Index: sc/source/ui/inc/drawview.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/drawview.hxx,v
+retrieving revision 1.12
+retrieving revision 1.12.44.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.12.44.1
+--- sc/source/ui/inc/drawview.hxx	10 Apr 2008 22:51:57 -0000	1.12
++++ sc/source/ui/inc/drawview.hxx	23 May 2008 20:06:20 -0000	1.12.44.1
+@@ -71,8 +71,7 @@
  	virtual			~ScDrawView();
  
  	virtual void	MarkListHasChanged();
@@ -54,11 +70,15 @@
  
      virtual void    DoConnect(SdrOle2Obj* pOleObj);
  
-diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
-index ce25f83..b1d0a08 100644
---- sc/source/ui/inc/dwfunctr.hxx
-+++ sc/source/ui/inc/dwfunctr.hxx
-@@ -146,8 +146,7 @@ public:
+Index: sc/source/ui/inc/dwfunctr.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/dwfunctr.hxx,v
+retrieving revision 1.7
+retrieving revision 1.7.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.46.1
+--- sc/source/ui/inc/dwfunctr.hxx	10 Apr 2008 22:53:01 -0000	1.7
++++ sc/source/ui/inc/dwfunctr.hxx	23 May 2008 20:06:20 -0000	1.7.46.1
+@@ -146,8 +146,7 @@
  					~ScFunctionDockWin();
  
      using SfxDockingWindow::Notify;
@@ -68,11 +88,15 @@
  
  	void			SetSlotIDs( USHORT nLeft, USHORT nRight )
  						{ nLeftSlot = nLeft; nRightSlot = nRight; }
-diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
-index 02338fa..e32a9f5 100644
---- sc/source/ui/inc/inputwin.hxx
-+++ sc/source/ui/inc/inputwin.hxx
-@@ -140,8 +140,7 @@ protected:
+Index: sc/source/ui/inc/inputwin.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/inputwin.hxx,v
+retrieving revision 1.17
+retrieving revision 1.17.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.17 -r1.17.46.1
+--- sc/source/ui/inc/inputwin.hxx	10 Apr 2008 23:04:16 -0000	1.17
++++ sc/source/ui/inc/inputwin.hxx	23 May 2008 20:06:20 -0000	1.17.46.1
+@@ -140,8 +140,7 @@
  
  	virtual long	Notify( NotifyEvent& rNEvt );
  
@@ -82,11 +106,15 @@
  
  private:
  	void			FillRangeNames();
-diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
-index 0c9e34a..27bf4a5 100644
---- sc/source/ui/inc/navipi.hxx
-+++ sc/source/ui/inc/navipi.hxx
-@@ -330,8 +330,7 @@ public:
+Index: sc/source/ui/inc/navipi.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/navipi.hxx,v
+retrieving revision 1.13
+retrieving revision 1.13.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.13.46.1
+--- sc/source/ui/inc/navipi.hxx	10 Apr 2008 23:10:04 -0000	1.13
++++ sc/source/ui/inc/navipi.hxx	23 May 2008 20:06:21 -0000	1.13.46.1
+@@ -330,8 +330,7 @@
  				~ScNavigatorDlg();
  
      using Window::Notify;
@@ -96,11 +124,15 @@
  
  	void			CursorPosChanged();
  
-diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
-index 7fd20a3..02a57c4 100644
---- sc/source/ui/inc/prevwsh.hxx
-+++ sc/source/ui/inc/prevwsh.hxx
-@@ -118,8 +118,7 @@ public:
+Index: sc/source/ui/inc/prevwsh.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/prevwsh.hxx,v
+retrieving revision 1.13
+retrieving revision 1.13.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.13.46.1
+--- sc/source/ui/inc/prevwsh.hxx	10 Apr 2008 23:16:41 -0000	1.13
++++ sc/source/ui/inc/prevwsh.hxx	23 May 2008 20:06:21 -0000	1.13.46.1
+@@ -118,8 +118,7 @@
                      GetSourceData() const       { return aSourceData; }
  	BYTE			GetSourceDesignMode() const	{ return nSourceDesignMode; }
  
@@ -110,11 +142,15 @@
  
  	virtual SfxPrinter*		GetPrinter( BOOL bCreate = FALSE );
      virtual USHORT          SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
-diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
-index 48a7dd4..e2bda29 100644
---- sc/source/ui/inc/servobj.hxx
-+++ sc/source/ui/inc/servobj.hxx
-@@ -69,8 +69,7 @@ public:
+Index: sc/source/ui/inc/servobj.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/servobj.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.46.1
+--- sc/source/ui/inc/servobj.hxx	10 Apr 2008 23:21:18 -0000	1.6
++++ sc/source/ui/inc/servobj.hxx	23 May 2008 20:06:21 -0000	1.6.46.1
+@@ -69,8 +69,7 @@
  				 			const String & rMimeType,
  				 			BOOL bSynchron = FALSE );
  
@@ -124,11 +160,15 @@
              void    EndListeningAll();
  };
  
-diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
-index c6dd6a5..b0f3949 100644
---- sc/source/ui/inc/tabvwsh.hxx
-+++ sc/source/ui/inc/tabvwsh.hxx
-@@ -357,8 +357,7 @@ public:
+Index: sc/source/ui/inc/tabvwsh.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/inc/tabvwsh.hxx,v
+retrieving revision 1.31
+retrieving revision 1.30.46.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.31 -r1.30.46.2
+--- sc/source/ui/inc/tabvwsh.hxx	22 Jul 2008 14:44:01 -0000	1.31
++++ sc/source/ui/inc/tabvwsh.hxx	31 Jul 2008 00:14:26 -0000	1.30.46.2
+@@ -358,8 +358,7 @@
  	void			SetEditChartName(const String& aStr){aEditChartName=aStr;}
  	const String&	GetEditChartName() const;
  
@@ -138,11 +178,15 @@
  
      ScNavigatorSettings*    GetNavigatorSettings();
  
-diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
-index 9eb58ee..6a8af49 100644
---- sc/source/ui/view/drawvie3.cxx
-+++ sc/source/ui/view/drawvie3.cxx
-@@ -141,8 +141,7 @@ ScAnchorType ScDrawView::GetAnchor() const
+Index: sc/source/ui/view/drawvie3.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/drawvie3.cxx,v
+retrieving revision 1.16
+retrieving revision 1.16.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.16 -r1.16.46.1
+--- sc/source/ui/view/drawvie3.cxx	11 Apr 2008 01:29:04 -0000	1.16
++++ sc/source/ui/view/drawvie3.cxx	23 May 2008 20:06:23 -0000	1.16.46.1
+@@ -141,8 +141,7 @@
  	return SCA_DONTKNOW;
  }
  
@@ -152,7 +196,7 @@
  {
  	if (rHint.ISA(ScTabDeletedHint))						// Tabelle geloescht
  	{
-@@ -160,7 +159,7 @@ void __EXPORT ScDrawView::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType
+@@ -160,7 +159,7 @@
  			UpdateWorkArea();
  	}
  	else
@@ -161,10 +205,14 @@
  }
  
  void ScDrawView::UpdateIMap( SdrObject* pObj )
-diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
-index e60c51c..56bac97 100644
---- sc/source/ui/view/tabvwsh5.cxx
-+++ sc/source/ui/view/tabvwsh5.cxx
+Index: sc/source/ui/view/tabvwsh5.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/view/tabvwsh5.cxx,v
+retrieving revision 1.13
+retrieving revision 1.13.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.13 -r1.13.46.1
+--- sc/source/ui/view/tabvwsh5.cxx	11 Apr 2008 01:43:00 -0000	1.13
++++ sc/source/ui/view/tabvwsh5.cxx	23 May 2008 20:06:24 -0000	1.13.46.1
 @@ -58,8 +58,7 @@
  
  //==================================================================
@@ -175,7 +223,7 @@
  {
  	if (rHint.ISA(SfxSimpleHint))						// ohne Parameter
  	{
-@@ -313,7 +312,7 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC
+@@ -313,7 +312,7 @@
  		}
  	}
  

Modified: trunk/patches/dev300/sfxnotify-removal-sd.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-sd.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-sd.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
-index 4e12eee..ff5fc49 100644
---- sd/inc/stlpool.hxx
-+++ sd/inc/stlpool.hxx
-@@ -135,7 +135,7 @@ protected:
+Index: sd/inc/stlpool.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/inc/stlpool.hxx,v
+retrieving revision 1.7
+retrieving revision 1.7.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.34.1
+--- sd/inc/stlpool.hxx	10 Apr 2008 18:23:46 -0000	1.7
++++ sd/inc/stlpool.hxx	23 May 2008 20:07:50 -0000	1.7.34.1
+@@ -135,7 +135,7 @@
  	using  SfxStyleSheetPool::Create;
  	virtual ~SdStyleSheetPool();
  
@@ -11,11 +15,15 @@
  
  	void AddStyleFamily( const SdPage* pPage );
  	void RemoveStyleFamily( const SdPage* pPage );
-diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
-index 3ee3e39..d5761f4 100644
---- sd/inc/stlsheet.hxx
-+++ sd/inc/stlsheet.hxx
-@@ -136,7 +136,7 @@ protected:
+Index: sd/inc/stlsheet.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/inc/stlsheet.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.32.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.32.1
+--- sd/inc/stlsheet.hxx	10 Apr 2008 18:24:05 -0000	1.6
++++ sd/inc/stlsheet.hxx	23 May 2008 20:07:50 -0000	1.6.32.1
+@@ -136,7 +136,7 @@
  	virtual void Load (SvStream& rIn, USHORT nVersion);
  	virtual void Store(SvStream& rOut);
  
@@ -24,11 +32,15 @@
  	virtual 			~SdStyleSheet();
  
  	void throwIfDisposed() throw (::com::sun::star::uno::RuntimeException);
-diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
-index f36a91b..4da57c3 100644
---- sd/source/core/stlsheet.cxx
-+++ sd/source/core/stlsheet.cxx
-@@ -112,7 +112,7 @@ class ModifyListenerForewarder : public SfxListener
+Index: sd/source/core/stlsheet.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/core/stlsheet.cxx,v
+retrieving revision 1.24
+retrieving revision 1.23.32.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.24 -r1.23.32.2
+--- sd/source/core/stlsheet.cxx	6 Jun 2008 11:58:23 -0000	1.24
++++ sd/source/core/stlsheet.cxx	31 Jul 2008 00:13:13 -0000	1.23.32.2
+@@ -113,7 +113,7 @@
  public:
  	ModifyListenerForewarder( SdStyleSheet* pStyleSheet );
  
@@ -37,7 +49,7 @@
  
  private:
  	SdStyleSheet* mpStyleSheet;
-@@ -128,7 +128,7 @@ ModifyListenerForewarder::ModifyListenerForewarder( SdStyleSheet* pStyleSheet )
+@@ -129,7 +129,7 @@
  	}
  }
  
@@ -46,7 +58,7 @@
  {
  	if( mpStyleSheet )
  		mpStyleSheet->notifyModifyListener();
-@@ -553,8 +553,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
+@@ -559,8 +559,7 @@
  |*
  \************************************************************************/
  
@@ -56,11 +68,15 @@
  {
  	// erstmal die Basisklassenfunktionalitaet
  	SfxStyleSheet::Notify(rBC, rHint);
-diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
-index 269006e..950fd0c 100644
---- sd/source/ui/dlg/docprev.cxx
-+++ sd/source/ui/dlg/docprev.cxx
-@@ -305,7 +305,7 @@ void SdDocPreviewWin::updateViewSettings()
+Index: sd/source/ui/dlg/docprev.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/dlg/docprev.cxx,v
+retrieving revision 1.25
+retrieving revision 1.25.32.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.25 -r1.25.32.1
+--- sd/source/ui/dlg/docprev.cxx	10 Apr 2008 19:43:39 -0000	1.25
++++ sd/source/ui/dlg/docprev.cxx	23 May 2008 20:07:51 -0000	1.25.32.1
+@@ -305,7 +305,7 @@
  	Invalidate();
  }
  
@@ -69,11 +85,15 @@
  {
  	if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_COLORS_CHANGED )
  	{
-diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
-index 0cd52a1..ff83426 100644
---- sd/source/ui/inc/FormShellManager.hxx
-+++ sd/source/ui/inc/FormShellManager.hxx
-@@ -138,11 +138,7 @@ private:
+Index: sd/source/ui/inc/FormShellManager.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/inc/FormShellManager.hxx,v
+retrieving revision 1.10
+retrieving revision 1.10.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.10.34.1
+--- sd/source/ui/inc/FormShellManager.hxx	10 Apr 2008 20:40:14 -0000	1.10
++++ sd/source/ui/inc/FormShellManager.hxx	23 May 2008 20:07:51 -0000	1.10.34.1
+@@ -138,11 +138,7 @@
          the factory working properly this method should not be necessary
          (and may be removed in the future.)
      */
@@ -86,11 +106,15 @@
  };
  
  } // end of namespace sd
-diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
-index f0bcebb..e91a82a 100644
---- sd/source/ui/inc/PreviewRenderer.hxx
-+++ sd/source/ui/inc/PreviewRenderer.hxx
-@@ -116,10 +116,7 @@ public:
+Index: sd/source/ui/inc/PreviewRenderer.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/inc/PreviewRenderer.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.34.1
+--- sd/source/ui/inc/PreviewRenderer.hxx	10 Apr 2008 20:48:24 -0000	1.6
++++ sd/source/ui/inc/PreviewRenderer.hxx	23 May 2008 20:07:51 -0000	1.6.34.1
+@@ -116,10 +116,7 @@
          int nWidth);
  
  protected:
@@ -102,11 +126,15 @@
  
  private:
      ::std::auto_ptr<VirtualDevice> mpPreviewDevice;
-diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx
-index 6abf393..2d45737 100644
---- sd/source/ui/inc/SlideView.hxx
-+++ sd/source/ui/inc/SlideView.hxx
-@@ -107,8 +107,7 @@ public:
+Index: sd/source/ui/inc/SlideView.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/inc/SlideView.hxx,v
+retrieving revision 1.8
+retrieving revision 1.8.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.34.1
+--- sd/source/ui/inc/SlideView.hxx	10 Apr 2008 20:51:29 -0000	1.8
++++ sd/source/ui/inc/SlideView.hxx	23 May 2008 20:07:51 -0000	1.8.34.1
+@@ -107,8 +107,7 @@
  	void		            AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); 
  	const GraphicObject*    GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const;
  
@@ -116,11 +144,15 @@
  
  	virtual void        DoCut( ::Window* pWindow = NULL );
  	virtual void        DoCopy( ::Window* pWindow = NULL );
-diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
-index a59d6ca..c8912b6 100644
---- sd/source/ui/inc/ViewShellBase.hxx
-+++ sd/source/ui/inc/ViewShellBase.hxx
-@@ -262,10 +262,7 @@ public:
+Index: sd/source/ui/inc/ViewShellBase.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/inc/ViewShellBase.hxx,v
+retrieving revision 1.23
+retrieving revision 1.23.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.23 -r1.23.34.1
+--- sd/source/ui/inc/ViewShellBase.hxx	11 Apr 2008 08:28:50 -0000	1.23
++++ sd/source/ui/inc/ViewShellBase.hxx	23 May 2008 20:07:51 -0000	1.23.34.1
+@@ -262,10 +262,7 @@
  protected:
  	osl::Mutex maMutex;
  
@@ -132,11 +164,15 @@
  
      virtual void InitializeFramework (void);
  
-diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
-index 13434bd..10ef73d 100644
---- sd/source/ui/inc/docprev.hxx
-+++ sd/source/ui/inc/docprev.hxx
-@@ -67,7 +67,7 @@ protected:
+Index: sd/source/ui/inc/docprev.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/inc/docprev.hxx,v
+retrieving revision 1.10
+retrieving revision 1.10.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.10.34.1
+--- sd/source/ui/inc/docprev.hxx	11 Apr 2008 08:29:16 -0000	1.10
++++ sd/source/ui/inc/docprev.hxx	23 May 2008 20:07:51 -0000	1.10.34.1
+@@ -67,7 +67,7 @@
  
      svtools::ColorConfig maColorConfig;
  
@@ -145,11 +181,15 @@
  
  	void updateViewSettings();
  
-diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
-index 4de544a..ea24ea7 100644
---- sd/source/ui/inc/drawview.hxx
-+++ sd/source/ui/inc/drawview.hxx
-@@ -65,8 +65,7 @@ public:
+Index: sd/source/ui/inc/drawview.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/inc/drawview.hxx,v
+retrieving revision 1.14
+retrieving revision 1.14.32.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.14 -r1.14.32.1
+--- sd/source/ui/inc/drawview.hxx	10 Apr 2008 21:05:09 -0000	1.14
++++ sd/source/ui/inc/drawview.hxx	23 May 2008 20:07:51 -0000	1.14.32.1
+@@ -65,8 +65,7 @@
  
  	virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE);
  
@@ -159,11 +199,15 @@
  
  	void	BlockPageOrderChangedHint(BOOL bBlock);
  
-diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
-index d4e5df4..114a42e 100644
---- sd/source/ui/slidesorter/view/SlideSorterView.cxx
-+++ sd/source/ui/slidesorter/view/SlideSorterView.cxx
-@@ -750,7 +750,7 @@ void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint
+Index: sd/source/ui/slidesorter/view/SlideSorterView.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/slidesorter/view/SlideSorterView.cxx,v
+retrieving revision 1.28
+retrieving revision 1.27.30.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.28 -r1.27.30.2
+--- sd/source/ui/slidesorter/view/SlideSorterView.cxx	6 Jun 2008 12:09:05 -0000	1.28
++++ sd/source/ui/slidesorter/view/SlideSorterView.cxx	31 Jul 2008 00:13:30 -0000	1.27.30.2
+@@ -752,7 +752,7 @@
      if (pDocShell!=NULL && pDocShell->IsEnableSetModified())
          mbModelChangedWhileModifyEnabled = true;
  
@@ -172,11 +216,15 @@
  }
  
  
-diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
-index 2c5f67a..1faa495 100644
---- sd/source/ui/tools/PreviewRenderer.cxx
-+++ sd/source/ui/tools/PreviewRenderer.cxx
-@@ -477,11 +477,7 @@ Image PreviewRenderer::ScaleBitmap (
+Index: sd/source/ui/tools/PreviewRenderer.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/tools/PreviewRenderer.cxx,v
+retrieving revision 1.16
+retrieving revision 1.16.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.16 -r1.16.34.1
+--- sd/source/ui/tools/PreviewRenderer.cxx	10 Apr 2008 22:42:21 -0000	1.16
++++ sd/source/ui/tools/PreviewRenderer.cxx	23 May 2008 20:07:51 -0000	1.16.34.1
+@@ -477,11 +477,7 @@
  
  
  
@@ -189,11 +237,15 @@
  {
  	if (rHint.IsA(TYPE(SfxSimpleHint))
          && mpDocShellOfView != NULL)
-diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
-index 3d21f3e..ad77b02 100644
---- sd/source/ui/view/FormShellManager.cxx
-+++ sd/source/ui/view/FormShellManager.cxx
-@@ -323,11 +323,7 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent*, pEvent)
+Index: sd/source/ui/view/FormShellManager.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/view/FormShellManager.cxx,v
+retrieving revision 1.12
+retrieving revision 1.12.34.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.12.34.1
+--- sd/source/ui/view/FormShellManager.cxx	10 Apr 2008 22:55:59 -0000	1.12
++++ sd/source/ui/view/FormShellManager.cxx	23 May 2008 20:07:52 -0000	1.12.34.1
+@@ -323,11 +323,7 @@
  
  
  
@@ -206,11 +258,15 @@
  {
      const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
      if (pSimpleHint!=NULL && pSimpleHint->GetId()==SFX_HINT_DYING)
-diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
-index a7ed783..ce2c70a 100644
---- sd/source/ui/view/ViewShellBase.cxx
-+++ sd/source/ui/view/ViewShellBase.cxx
-@@ -478,12 +478,9 @@ SdDrawDocument* ViewShellBase::GetDocument (void) const
+Index: sd/source/ui/view/ViewShellBase.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/view/ViewShellBase.cxx,v
+retrieving revision 1.44
+retrieving revision 1.42.34.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.44 -r1.42.34.2
+--- sd/source/ui/view/ViewShellBase.cxx	1 Jul 2008 23:02:01 -0000	1.44
++++ sd/source/ui/view/ViewShellBase.cxx	31 Jul 2008 00:13:21 -0000	1.42.34.2
+@@ -479,12 +479,9 @@
  
  
  
@@ -225,11 +281,15 @@
  
  	if (rHint.IsA(TYPE(SfxEventHint)))
  	{
-diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
-index 9889045..fe7031a 100644
---- sd/source/ui/view/drawview.cxx
-+++ sd/source/ui/view/drawview.cxx
-@@ -404,8 +404,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet,
+Index: sd/source/ui/view/drawview.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/view/drawview.cxx,v
+retrieving revision 1.51
+retrieving revision 1.50.30.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.51 -r1.50.30.2
+--- sd/source/ui/view/drawview.cxx	6 Jun 2008 12:09:32 -0000	1.51
++++ sd/source/ui/view/drawview.cxx	31 Jul 2008 00:13:17 -0000	1.50.30.2
+@@ -404,8 +404,7 @@
  |*
  \************************************************************************/
  
@@ -239,7 +299,7 @@
  {
  	if ( mpDrawViewShell && rHint.ISA(SdrHint) )
  	{
-@@ -436,7 +435,7 @@ void DrawView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
+@@ -436,7 +435,7 @@
  		}
  	}
  
@@ -248,11 +308,15 @@
  }
  
  /*************************************************************************
-diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
-index 5062b73..ca32063 100644
---- sd/source/ui/view/drviews1.cxx
-+++ sd/source/ui/view/drviews1.cxx
-@@ -384,7 +384,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
+Index: sd/source/ui/view/drviews1.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/view/drviews1.cxx,v
+retrieving revision 1.80
+retrieving revision 1.79.34.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.80 -r1.79.34.2
+--- sd/source/ui/view/drviews1.cxx	1 Jul 2008 13:38:26 -0000	1.80
++++ sd/source/ui/view/drviews1.cxx	31 Jul 2008 00:13:24 -0000	1.79.34.2
+@@ -387,7 +387,7 @@
  
          // If the master view toolbar is not shown we hide it before
          // switching the edit mode.
@@ -261,7 +325,7 @@
              && IsMainViewShell()
              && ! bShowMasterViewToolbar)
          {
-@@ -457,7 +457,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
+@@ -460,7 +460,7 @@
  
          // If the master view toolbar is to be shown we turn it on after the
          // edit mode has been changed.
@@ -270,11 +334,15 @@
              && IsMainViewShell()
              && bShowMasterViewToolbar)
          {
-diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
-index 22d2fbd..5bd51ea 100644
---- sd/source/ui/view/drviews2.cxx
-+++ sd/source/ui/view/drviews2.cxx
-@@ -409,7 +409,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
+Index: sd/source/ui/view/drviews2.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/view/drviews2.cxx,v
+retrieving revision 1.55
+retrieving revision 1.55.32.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.55 -r1.55.32.1
+--- sd/source/ui/view/drviews2.cxx	10 Apr 2008 23:04:37 -0000	1.55
++++ sd/source/ui/view/drviews2.cxx	23 May 2008 20:07:52 -0000	1.55.32.1
+@@ -409,7 +409,7 @@
  				}
  				USHORT nPage = maTabControl.GetCurPageId() - 1;
  				mpActualPage = GetDoc()->GetSdPage(nPage, mePageKind);
@@ -283,7 +351,7 @@
                      rReq,
                      mpActualPage,
                      mePageKind);
-@@ -431,7 +431,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
+@@ -431,7 +431,7 @@
  
                  SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE);
                  SFX_REQUEST_ARG (rReq, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE);

Modified: trunk/patches/dev300/sfxnotify-removal-sfx2.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-sfx2.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-sfx2.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
-index eaf7aac..898730d 100644
---- sfx2/inc/sfx2/viewfrm.hxx
-+++ sfx2/inc/sfx2/viewfrm.hxx
-@@ -145,8 +145,7 @@ private:
+Index: sfx2/inc/sfx2/viewfrm.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/sfx2/viewfrm.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.46.1
+--- sfx2/inc/sfx2/viewfrm.hxx	11 Apr 2008 11:46:36 -0000	1.5
++++ sfx2/inc/sfx2/viewfrm.hxx	23 May 2008 20:08:51 -0000	1.5.46.1
+@@ -145,8 +145,7 @@
  #endif
  
  protected:
@@ -12,11 +16,15 @@
  
  	SAL_DLLPRIVATE void SetWindow_Impl( Window *pWin );
  
-diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
-index d246439..016e401 100644
---- sfx2/inc/sfx2/viewsh.hxx
-+++ sfx2/inc/sfx2/viewsh.hxx
-@@ -185,10 +185,8 @@ protected:
+Index: sfx2/inc/sfx2/viewsh.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/sfx2/viewsh.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.46.1
+--- sfx2/inc/sfx2/viewsh.hxx	11 Apr 2008 11:46:52 -0000	1.5
++++ sfx2/inc/sfx2/viewsh.hxx	23 May 2008 20:08:51 -0000	1.5.46.1
+@@ -185,10 +185,8 @@
  
  	virtual void				Move();
  
@@ -29,11 +37,15 @@
  public:
  	// Iteration
  	static SfxViewShell*        GetFirst( const TypeId* pType = 0, BOOL bOnlyVisible = TRUE );
-diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
-index 65aa8df..de32503 100644
---- sfx2/source/dialog/templdlg.cxx
-+++ sfx2/source/dialog/templdlg.cxx
-@@ -1562,8 +1562,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
+Index: sfx2/source/dialog/templdlg.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/dialog/templdlg.cxx,v
+retrieving revision 1.58
+retrieving revision 1.58.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.58 -r1.58.46.1
+--- sfx2/source/dialog/templdlg.cxx	11 Apr 2008 12:50:57 -0000	1.58
++++ sfx2/source/dialog/templdlg.cxx	23 May 2008 20:08:51 -0000	1.58.46.1
+@@ -1562,8 +1562,7 @@
  
  
  //-------------------------------------------------------------------------
@@ -43,11 +55,15 @@
  {
  	// Aktualisierung anstossen
  	if(rHint.Type() == TYPE(SfxSimpleHint))
-diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
-index 79818f5..9d43d53 100644
---- sfx2/source/inc/templdgi.hxx
-+++ sfx2/source/inc/templdgi.hxx
-@@ -226,8 +226,7 @@ protected:
+Index: sfx2/source/inc/templdgi.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/inc/templdgi.hxx,v
+retrieving revision 1.18
+retrieving revision 1.18.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.18 -r1.18.46.1
+--- sfx2/source/inc/templdgi.hxx	11 Apr 2008 13:28:19 -0000	1.18
++++ sfx2/source/inc/templdgi.hxx	23 May 2008 20:08:51 -0000	1.18.46.1
+@@ -226,8 +226,7 @@
  	USHORT				StyleNrToInfoOffset( USHORT i );
  	USHORT				InfoOffsetToStyleNr( USHORT i );
  
@@ -57,11 +73,15 @@
  
  	void				FamilySelect( USHORT nId );
  	void				SetFamily( USHORT nId );
-diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
-index bfd4374..46aa9c1 100644
---- sfx2/source/view/prnmon.cxx
-+++ sfx2/source/view/prnmon.cxx
-@@ -113,17 +113,10 @@ public:
+Index: sfx2/source/view/prnmon.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/view/prnmon.cxx,v
+retrieving revision 1.25
+retrieving revision 1.25.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.25 -r1.25.46.1
+--- sfx2/source/view/prnmon.cxx	11 Apr 2008 13:39:16 -0000	1.25
++++ sfx2/source/view/prnmon.cxx	23 May 2008 20:08:52 -0000	1.25.46.1
+@@ -113,17 +113,10 @@
  	SfxViewShell*			GetViewShell() const { return pViewShell; }
  	BOOL					SetPage( USHORT nPage, const String &rPage );
      void                    CreateMonitor();
@@ -81,11 +101,15 @@
  {
  	SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
  	if ( pPrintHint )
-diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
-index fda1518..f289053 100644
---- sfx2/source/view/topfrm.cxx
-+++ sfx2/source/view/topfrm.cxx
-@@ -1151,7 +1151,7 @@ void SfxTopViewFrame::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+Index: sfx2/source/view/topfrm.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/view/topfrm.cxx,v
+retrieving revision 1.96
+retrieving revision 1.96.46.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.96 -r1.96.46.1
+--- sfx2/source/view/topfrm.cxx	11 Apr 2008 13:40:01 -0000	1.96
++++ sfx2/source/view/topfrm.cxx	23 May 2008 20:08:52 -0000	1.96.46.1
+@@ -1151,7 +1151,7 @@
  	}
      }
  
@@ -94,11 +118,15 @@
  }
  
  //--------------------------------------------------------------------
-diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
-index edf7045..3b95c2a 100644
---- sfx2/source/view/viewfrm.cxx
-+++ sfx2/source/view/viewfrm.cxx
-@@ -1222,13 +1222,8 @@ void SfxViewFrame::ReleaseObjectShell_Impl( sal_Bool bStoreView )
+Index: sfx2/source/view/viewfrm.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/view/viewfrm.cxx,v
+retrieving revision 1.136
+retrieving revision 1.136.8.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.136 -r1.136.8.1
+--- sfx2/source/view/viewfrm.cxx	13 May 2008 13:09:22 -0000	1.136
++++ sfx2/source/view/viewfrm.cxx	23 May 2008 20:08:52 -0000	1.136.8.1
+@@ -1221,13 +1221,8 @@
          pDispatcher->Flush();
          EndListening( *xObjSh );
  

Added: trunk/patches/dev300/sfxnotify-removal-svtools.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sfxnotify-removal-svtools.diff	Fri Sep  5 15:45:19 2008
@@ -0,0 +1,138 @@
+Index: svtools/inc/svtools/brdcst.hxx
+===================================================================
+RCS file: /cvs/util/svtools/inc/svtools/brdcst.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.60.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.60.2
+--- svtools/inc/svtools/brdcst.hxx	10 Apr 2008 18:55:49 -0000	1.3
++++ svtools/inc/svtools/brdcst.hxx	23 May 2008 21:27:49 -0000	1.3.60.2
+@@ -41,9 +41,6 @@
+ typedef SvPtrarr SfxListenerArr_Impl;
+ #endif
+ 
+-#define SFX_FORWARD( rBC, rBCT, rHint, rHintT ) \
+-		Forward( rBC, rHint )
+-
+ //-------------------------------------------------------------------------
+ 
+ class SVL_DLLPUBLIC SfxBroadcaster
+@@ -58,8 +55,7 @@
+ 	const SfxBroadcaster&	operator=(const SfxBroadcaster &); // verboten
+ 
+ protected:
+-	void					SFX_FORWARD(SfxBroadcaster& rBC, const TypeId& rBCType,
+-										const SfxHint& rHint, const TypeId& rHintType);
++	void					Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
+ 	virtual void			ListenersGone();
+ 
+ public:
+Index: svtools/inc/svtools/style.hxx
+===================================================================
+RCS file: /cvs/util/svtools/inc/svtools/style.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.60.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.60.1
+--- svtools/inc/svtools/style.hxx	10 Apr 2008 19:30:52 -0000	1.5
++++ svtools/inc/svtools/style.hxx	23 May 2008 20:25:33 -0000	1.5.60.1
+@@ -296,8 +296,7 @@
+ 						SfxStyleSheet( const UniString&, const SfxStyleSheetBasePool&, SfxStyleFamily, USHORT );
+ 						SfxStyleSheet( const SfxStyleSheet& );
+ 
+-	virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+-								const SfxHint& rHint, const TypeId& rHintType );
++	virtual void 		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ 	virtual BOOL 		SetParent( const UniString& );
+ 
+ protected:
+Index: svtools/source/items/style.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/items/style.cxx,v
+retrieving revision 1.19
+retrieving revision 1.19.60.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.19 -r1.19.60.1
+--- svtools/source/items/style.cxx	10 Apr 2008 21:14:20 -0000	1.19
++++ svtools/source/items/style.cxx	23 May 2008 20:25:39 -0000	1.19.60.1
+@@ -1283,10 +1283,9 @@
+ 
+ // alle Zuhoerer benachtichtigen
+ 
+-void SfxStyleSheet::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
+-						   const SfxHint& rHint, const TypeId& rHintType )
++void SfxStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint )
+ {
+-	SFX_FORWARD(rBC, rBCType, rHint, rHintType);
++	Forward(rBC, rHint);
+ }
+ 
+ //////////////////////// SfxStyleSheetPool ///////////////////////////////
+Index: svtools/source/notify/brdcst.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/notify/brdcst.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.60.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.60.1
+--- svtools/source/notify/brdcst.cxx	10 Apr 2008 21:45:26 -0000	1.8
++++ svtools/source/notify/brdcst.cxx	23 May 2008 20:25:45 -0000	1.8.60.1
+@@ -61,22 +61,12 @@
+ 	// is anybody to notify?
+ 	if ( aListeners.Count() /*! || aGlobListeners.Count() */ )
+ 	{
+-        #if 0
+-		// determine the type only once, because of its expensiveness
+-		const TypeId& rBCType = Type();
+-		const TypeId& rHintType = rHint.Type();
+-        #endif
+-
+ 		// notify all registered listeners exactly once
+ 		for ( USHORT n = 0; n < aListeners.Count(); ++n )
+ 		{
+ 			SfxListener* pListener = aListeners[n];
+ 			if ( pListener )
+-                #if 0
+-				pListener->SFX_NOTIFY( *this, rBCType, rHint, rHintType );
+-                #else
+ 				pListener->Notify( *this, rHint );
+-                #endif
+ 		}
+ 	}
+ }
+@@ -183,15 +173,14 @@
+ 
+ // forward a notification to all registered listeners
+ 
+-void SfxBroadcaster::SFX_FORWARD(SfxBroadcaster& rBC, const TypeId& rBCType,
+-							   const SfxHint& rHint, const TypeId& rHintType)
++void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint)
+ {
+ 	const USHORT nCount = aListeners.Count();
+ 	for ( USHORT i = 0; i < nCount; ++i )
+ 	{
+ 		SfxListener *pListener = aListeners[i];
+ 		if ( pListener )
+-			pListener->SFX_NOTIFY( rBC, rBCType, rHint, rHintType);
++			pListener->Notify( rBC, rHint );
+ 	}
+ }
+ 
+Index: svtools/source/notify/lstner.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/notify/lstner.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.60.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.60.1
+--- svtools/source/notify/lstner.cxx	10 Apr 2008 21:47:42 -0000	1.8
++++ svtools/source/notify/lstner.cxx	23 May 2008 20:25:45 -0000	1.8.60.1
+@@ -182,11 +182,9 @@
+ // base implementation of notification handler
+ 
+ #ifdef DBG_UTIL
+-void SfxListener::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+-							  const SfxHint&, const TypeId& rHintType )
++void SfxListener::Notify( SfxBroadcaster& rBC, const SfxHint& )
+ #else
+-void SfxListener::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
+-							  const SfxHint&, const TypeId& )
++void SfxListener::Notify( SfxBroadcaster&, const SfxHint& )
+ #endif
+ {
+     #ifdef DBG_UTIL

Modified: trunk/patches/dev300/sfxnotify-removal-svx.diff
==============================================================================
--- trunk/patches/dev300/sfxnotify-removal-svx.diff	(original)
+++ trunk/patches/dev300/sfxnotify-removal-svx.diff	Fri Sep  5 15:45:19 2008
@@ -1,8 +1,12 @@
-diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
-index ab0dd63..2d8441c 100644
---- svx/inc/svx/colrctrl.hxx
-+++ svx/inc/svx/colrctrl.hxx
-@@ -136,8 +136,7 @@ public:
+Index: svx/inc/svx/colrctrl.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/colrctrl.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.76.1
+--- svx/inc/svx/colrctrl.hxx	10 Apr 2008 19:26:16 -0000	1.3
++++ svx/inc/svx/colrctrl.hxx	23 May 2008 20:11:02 -0000	1.3.76.1
+@@ -136,8 +136,7 @@
  										   const ResId& rResId );
  					~SvxColorDockingWindow();
  
@@ -12,11 +16,15 @@
  
  	void			SetSlotIDs( USHORT nLeft, USHORT nRight )
  						{ nLeftSlot = nLeft; nRightSlot = nRight; }
-diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
-index cbe6e9b..5ff9f07 100644
---- svx/inc/svx/fntctl.hxx
-+++ svx/inc/svx/fntctl.hxx
-@@ -54,10 +54,7 @@ private:
+Index: svx/inc/svx/fntctl.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/fntctl.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.76.1
+--- svx/inc/svx/fntctl.hxx	10 Apr 2008 19:40:15 -0000	1.4
++++ svx/inc/svx/fntctl.hxx	23 May 2008 20:11:02 -0000	1.4.76.1
+@@ -54,10 +54,7 @@
  	DECL_LINK( MenuSelect, FontNameMenu * );
  	SVX_DLLPRIVATE virtual void	StateChanged( USHORT nSID, SfxItemState eState,
  								  const SfxPoolItem* pState );
@@ -28,11 +36,15 @@
  //#endif
  
  public:
-diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
-index e3c0d7d..caf9ec1 100644
---- svx/inc/svx/ruler.hxx
-+++ svx/inc/svx/ruler.hxx
-@@ -216,8 +216,7 @@ protected:
+Index: svx/inc/svx/ruler.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/ruler.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.76.1
+--- svx/inc/svx/ruler.hxx	10 Apr 2008 19:58:38 -0000	1.4
++++ svx/inc/svx/ruler.hxx	23 May 2008 20:11:02 -0000	1.4.76.1
+@@ -216,8 +216,7 @@
  	virtual void    ExtraDown();
  	virtual void	MouseMove( const MouseEvent& rMEvt );
  
@@ -42,11 +54,15 @@
  
  	// Berechnung der Grenzwerte fuer Objectgrenzen
  	// Werte sind bezogen auf die Seite
-diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
-index 3951d93..6a178d0 100644
---- svx/inc/svx/scene3d.hxx
-+++ svx/inc/svx/scene3d.hxx
-@@ -122,10 +122,7 @@ protected:
+Index: svx/inc/svx/scene3d.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/scene3d.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.74.1
+--- svx/inc/svx/scene3d.hxx	10 Apr 2008 19:58:53 -0000	1.4
++++ svx/inc/svx/scene3d.hxx	23 May 2008 20:11:02 -0000	1.4.74.1
+@@ -122,10 +122,7 @@
  
  	void RebuildLists();
  
@@ -58,11 +74,15 @@
  
  	BOOL AreThereTransparentParts() const;
  
-diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
-index c438a6d..a187240 100644
---- svx/inc/svx/svdedxv.hxx
-+++ svx/inc/svx/svdedxv.hxx
-@@ -158,7 +158,7 @@ public:
+Index: svx/inc/svx/svdedxv.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdedxv.hxx,v
+retrieving revision 1.5
+retrieving revision 1.4.76.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.4.76.2
+--- svx/inc/svx/svdedxv.hxx	6 Jun 2008 12:21:39 -0000	1.5
++++ svx/inc/svx/svdedxv.hxx	31 Jul 2008 00:15:59 -0000	1.4.76.2
+@@ -162,7 +162,7 @@
  	virtual void BckAction();
  	virtual void TakeActionRect(Rectangle& rRect) const;
  
@@ -71,11 +91,15 @@
  	virtual void ModelHasChanged();
  
  	//************************************************************************
-diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
-index 1dcbe6b..91edbd6 100644
---- svx/inc/svx/svdmrkv.hxx
-+++ svx/inc/svx/svdmrkv.hxx
-@@ -166,7 +166,7 @@ private:
+Index: svx/inc/svx/svdmrkv.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdmrkv.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.76.1
+--- svx/inc/svx/svdmrkv.hxx	10 Apr 2008 20:18:22 -0000	1.6
++++ svx/inc/svx/svdmrkv.hxx	23 May 2008 20:11:02 -0000	1.6.76.1
+@@ -166,7 +166,7 @@
      void UndirtyMrkPnt() const;
  
  protected:
@@ -84,11 +108,15 @@
      virtual void ModelHasChanged(); // Wird von der PaintView gerufen
      virtual void SetMarkHandles();                                           // aHdl (Liste der Handles) fuellen
      virtual void SetMarkRects();                                             // Rects an den PageViews
-diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
-index 751c083..fb8bbfb 100644
---- svx/inc/svx/svdoattr.hxx
-+++ svx/inc/svx/svdoattr.hxx
-@@ -80,7 +80,7 @@ protected:
+Index: svx/inc/svx/svdoattr.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdoattr.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.74.1
+--- svx/inc/svx/svdoattr.hxx	10 Apr 2008 20:18:55 -0000	1.3
++++ svx/inc/svx/svdoattr.hxx	23 May 2008 20:11:02 -0000	1.3.74.1
+@@ -80,7 +80,7 @@
      FASTBOOL ImpSetShadowAttributes( const SfxItemSet& rSet, SfxItemSet& rShadowSet ) const;
  
  	// Zuhoeren, ob sich ein StyleSheet aendert
@@ -97,11 +125,15 @@
  
  	SdrAttrObj();
  	virtual ~SdrAttrObj();
-diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
-index 428e9b9..c671bfe 100644
---- svx/inc/svx/svdocapt.hxx
-+++ svx/inc/svx/svdocapt.hxx
-@@ -113,7 +113,7 @@ public:
+Index: svx/inc/svx/svdocapt.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdocapt.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.74.1
+--- svx/inc/svx/svdocapt.hxx	10 Apr 2008 20:19:35 -0000	1.3
++++ svx/inc/svx/svdocapt.hxx	23 May 2008 20:11:02 -0000	1.3.74.1
+@@ -113,7 +113,7 @@
  
  	virtual basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const;
  	virtual void SetModel(SdrModel* pNewModel);
@@ -110,11 +142,15 @@
  
  	virtual sal_uInt32 GetHdlCount() const;
  	virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
-diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
-index 634cc72..ec7b08b 100644
---- svx/inc/svx/svdocirc.hxx
-+++ svx/inc/svx/svdocirc.hxx
-@@ -93,7 +93,7 @@ private:
+Index: svx/inc/svx/svdocirc.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdocirc.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.74.1
+--- svx/inc/svx/svdocirc.hxx	10 Apr 2008 20:19:52 -0000	1.4
++++ svx/inc/svx/svdocirc.hxx	23 May 2008 20:11:02 -0000	1.4.74.1
+@@ -93,7 +93,7 @@
  	SVX_DLLPRIVATE virtual void RecalcXPoly();
  
  protected:
@@ -123,11 +159,15 @@
  
  public:
  	TYPEINFO();
-diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
-index fda6329..087e7fd 100644
---- svx/inc/svx/svdoedge.hxx
-+++ svx/inc/svx/svdoedge.hxx
-@@ -203,7 +203,7 @@ public:
+Index: svx/inc/svx/svdoedge.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdoedge.hxx,v
+retrieving revision 1.4
+retrieving revision 1.3.74.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.3.74.2
+--- svx/inc/svx/svdoedge.hxx	1 Jul 2008 23:16:31 -0000	1.4
++++ svx/inc/svx/svdoedge.hxx	31 Jul 2008 00:15:56 -0000	1.3.74.2
+@@ -205,7 +205,7 @@
  	sal_Bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; }
  
  protected:
@@ -136,11 +176,15 @@
  
  	XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter) const;
  	void ImpRecalcEdgeTrack();  // Neuberechnung des Verbindungsverlaufs
-diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
-index fe5e4b1..d7bd973 100644
---- svx/inc/svx/svdograf.hxx
-+++ svx/inc/svx/svdograf.hxx
-@@ -222,8 +222,7 @@ public:
+Index: svx/inc/svx/svdograf.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdograf.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.74.1
+--- svx/inc/svx/svdograf.hxx	10 Apr 2008 20:20:34 -0000	1.4
++++ svx/inc/svx/svdograf.hxx	23 May 2008 20:11:03 -0000	1.4.74.1
+@@ -222,8 +222,7 @@
  
  	void 					AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly );
  
@@ -150,11 +194,15 @@
  
  	bool					IsMirrored() { return bMirrored; }
  	void					SetMirrored( bool _bMirrored ) { bMirrored = _bMirrored; }
-diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
-index e4c86fa..905cc10 100644
---- svx/inc/svx/svdorect.hxx
-+++ svx/inc/svx/svdorect.hxx
-@@ -148,7 +148,7 @@ public:
+Index: svx/inc/svx/svdorect.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdorect.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.74.1
+--- svx/inc/svx/svdorect.hxx	10 Apr 2008 20:22:32 -0000	1.4
++++ svx/inc/svx/svdorect.hxx	23 May 2008 20:11:03 -0000	1.4.74.1
+@@ -148,7 +148,7 @@
  
  	virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
  
@@ -163,11 +211,15 @@
  };
  
  #endif //_SVDORECT_HXX
-diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
-index 79ef5a2..3c19feb 100644
---- svx/inc/svx/svdovirt.hxx
-+++ svx/inc/svx/svdovirt.hxx
-@@ -58,7 +58,7 @@ protected:
+Index: svx/inc/svx/svdovirt.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdovirt.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.74.1
+--- svx/inc/svx/svdovirt.hxx	10 Apr 2008 20:23:54 -0000	1.3
++++ svx/inc/svx/svdovirt.hxx	23 May 2008 20:11:03 -0000	1.3.74.1
+@@ -58,7 +58,7 @@
  	Rectangle					aSnapRect;
  
  protected:
@@ -176,11 +228,15 @@
  
  	virtual SdrObjGeoData* NewGeoData() const;
  	virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
-diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
-index 288582e..acc0f25 100644
---- svx/inc/svx/svdpagv.hxx
-+++ svx/inc/svx/svdpagv.hxx
-@@ -142,7 +142,7 @@ protected:
+Index: svx/inc/svx/svdpagv.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdpagv.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.4 -r1.4.74.1
+--- svx/inc/svx/svdpagv.hxx	10 Apr 2008 20:24:29 -0000	1.4
++++ svx/inc/svx/svdpagv.hxx	23 May 2008 20:11:03 -0000	1.4.74.1
+@@ -142,7 +142,7 @@
  	sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
  	void SetAllLayers(SetOfByte& rB, sal_Bool bJa);
  
@@ -189,11 +245,15 @@
  
  	// Nachsehen, ob AktGroup noch Inserted ist.
  	void CheckAktGroup();
-diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
-index 202b12b..e412a94 100644
---- svx/inc/svx/svdpntv.hxx
-+++ svx/inc/svx/svdpntv.hxx
-@@ -272,7 +272,7 @@ public:
+Index: svx/inc/svx/svdpntv.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdpntv.hxx,v
+retrieving revision 1.7
+retrieving revision 1.7.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.74.1
+--- svx/inc/svx/svdpntv.hxx	10 Apr 2008 20:24:49 -0000	1.7
++++ svx/inc/svx/svdpntv.hxx	23 May 2008 20:11:03 -0000	1.7.74.1
+@@ -272,7 +272,7 @@
  	BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
  protected:
  
@@ -202,11 +262,15 @@
  	void GlueInvalidate() const;
  
  	void ShowEncirclement(OutputDevice* pOut);
-diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
-index 721e812..fb79b7a 100644
---- svx/inc/svx/svdview.hxx
-+++ svx/inc/svx/svdview.hxx
-@@ -197,7 +197,7 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi
+Index: svx/inc/svx/svdview.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/svdview.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.5 -r1.5.76.1
+--- svx/inc/svx/svdview.hxx	10 Apr 2008 20:27:23 -0000	1.5
++++ svx/inc/svx/svdview.hxx	23 May 2008 20:11:03 -0000	1.5.76.1
+@@ -197,7 +197,7 @@
  protected:
  	SvtAccessibilityOptions	maAccessibilityOptions;
  
@@ -215,11 +279,15 @@
  
  public:
  	TYPEINFO();
-diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
-index df7684f..a6f5506 100644
---- svx/source/dialog/svxruler.cxx
-+++ svx/source/dialog/svxruler.cxx
-@@ -3621,8 +3621,7 @@ void __EXPORT SvxRuler::ExtraDown()
+Index: svx/source/dialog/svxruler.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/dialog/svxruler.cxx,v
+retrieving revision 1.39
+retrieving revision 1.39.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.39 -r1.39.76.1
+--- svx/source/dialog/svxruler.cxx	11 Apr 2008 00:04:33 -0000	1.39
++++ svx/source/dialog/svxruler.cxx	23 May 2008 20:11:03 -0000	1.39.76.1
+@@ -3621,8 +3621,7 @@
  }
  
  
@@ -229,11 +297,15 @@
  /*
  
     [Beschreibung]
-diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
-index 207bf0d..2811cfd 100644
---- svx/source/engine3d/scene3d.cxx
-+++ svx/source/engine3d/scene3d.cxx
-@@ -1010,13 +1010,10 @@ void E3dScene::RestGeoData(const SdrObjGeoData& rGeo)
+Index: svx/source/engine3d/scene3d.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/engine3d/scene3d.cxx,v
+retrieving revision 1.33
+retrieving revision 1.32.74.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.33 -r1.32.74.2
+--- svx/source/engine3d/scene3d.cxx	2 Jul 2008 12:06:03 -0000	1.33
++++ svx/source/engine3d/scene3d.cxx	31 Jul 2008 00:15:52 -0000	1.32.74.2
+@@ -1023,13 +1023,10 @@
  |*
  \************************************************************************/
  
@@ -249,11 +321,15 @@
  }
  
  /*************************************************************************
-diff --git a/svx/source/items/boxobj.hxx b/svx/source/items/boxobj.hxx
-index 77f42d6..171d4f7 100644
---- svx/source/items/boxobj.hxx
-+++ svx/source/items/boxobj.hxx
-@@ -66,8 +66,7 @@ private:
+Index: svx/source/items/boxobj.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/items/boxobj.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.3 -r1.3.76.1
+--- svx/source/items/boxobj.hxx	11 Apr 2008 01:51:13 -0000	1.3
++++ svx/source/items/boxobj.hxx	23 May 2008 20:11:04 -0000	1.3.76.1
+@@ -66,8 +66,7 @@
  
  protected:
  	// Schnittstelle zum SbxObject/SvDispatch/SfxShell..Object
@@ -263,11 +339,15 @@
  	virtual ULONG			SetProperty( USHORT nSID, SbxVariable &rRet );
  	virtual ULONG			GetProperty( USHORT nSID, SbxVariable &rRet );
  
-diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
-index 2502874..c4e9a8a 100644
---- svx/source/mnuctrls/fntctl.cxx
-+++ svx/source/mnuctrls/fntctl.cxx
-@@ -132,8 +132,7 @@ void SvxFontMenuControl::StateChanged(
+Index: svx/source/mnuctrls/fntctl.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/mnuctrls/fntctl.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.8 -r1.8.76.1
+--- svx/source/mnuctrls/fntctl.cxx	11 Apr 2008 02:02:16 -0000	1.8
++++ svx/source/mnuctrls/fntctl.cxx	23 May 2008 20:11:04 -0000	1.8.76.1
+@@ -132,8 +132,7 @@
  	der DocumentShell gef"ullt.
  */
  
@@ -277,11 +357,15 @@
  {
  	if ( rHint.Type() != TYPE(SfxSimpleHint) &&
  		 ( (SfxSimpleHint&)rHint ).GetId() == SFX_HINT_DOCCHANGED )
-diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
-index 78ceedc..b1a49d6 100644
---- svx/source/sdr/properties/graphicproperties.cxx
-+++ svx/source/sdr/properties/graphicproperties.cxx
-@@ -91,7 +91,7 @@ namespace sdr
+Index: svx/source/sdr/properties/graphicproperties.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/sdr/properties/graphicproperties.cxx,v
+retrieving revision 1.12
+retrieving revision 1.12.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.12 -r1.12.76.1
+--- svx/source/sdr/properties/graphicproperties.cxx	11 Apr 2008 02:41:56 -0000	1.12
++++ svx/source/sdr/properties/graphicproperties.cxx	23 May 2008 20:11:04 -0000	1.12.76.1
+@@ -91,7 +91,7 @@
  			rObj.SetXPolyDirty();
  
              // #i29367# Update GraphicAttr, too. This was formerly
@@ -290,11 +374,15 @@
              // called nowadays. BTW: strictly speaking, the whole
              // ImpSetAttrToGrafInfo/ImpSetGrafInfoToAttr stuff could
              // be dumped, when SdrGrafObj::aGrafInfo is removed and
-diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
-index f419a77..11a14da 100644
---- svx/source/svdraw/svdedxv.cxx
-+++ svx/source/svdraw/svdedxv.cxx
-@@ -157,9 +157,9 @@ void SdrObjEditView::TakeActionRect(Rectangle& rRect) const
+Index: svx/source/svdraw/svdedxv.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdedxv.cxx,v
+retrieving revision 1.61
+retrieving revision 1.60.74.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.61 -r1.60.74.2
+--- svx/source/svdraw/svdedxv.cxx	6 Jun 2008 12:33:45 -0000	1.61
++++ svx/source/svdraw/svdedxv.cxx	31 Jul 2008 00:15:49 -0000	1.60.74.2
+@@ -157,9 +157,9 @@
      }
  }
  
@@ -306,11 +394,15 @@
      // Printerwechsel waerend des Editierens
      SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
      if (pSdrHint!=NULL && pTextEditOutliner!=NULL) {
-diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
-index 787567a..9f5063e 100644
---- svx/source/svdraw/svdmrkv.cxx
-+++ svx/source/svdraw/svdmrkv.cxx
-@@ -203,7 +203,7 @@ SdrMarkView::~SdrMarkView()
+Index: svx/source/svdraw/svdmrkv.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdmrkv.cxx,v
+retrieving revision 1.39
+retrieving revision 1.39.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.39 -r1.39.74.1
+--- svx/source/svdraw/svdmrkv.cxx	11 Apr 2008 03:00:52 -0000	1.39
++++ svx/source/svdraw/svdmrkv.cxx	23 May 2008 20:11:05 -0000	1.39.74.1
+@@ -203,7 +203,7 @@
  	delete mpSdrViewSelection;
  }
  
@@ -319,7 +411,7 @@
  {
  	SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
  	if (pSdrHint!=NULL) 
-@@ -216,7 +216,7 @@ void __EXPORT SdrMarkView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType
+@@ -216,7 +216,7 @@
  			bMarkedPointsRectsDirty=TRUE;
  		}
  	}
@@ -328,11 +420,15 @@
  }
  
  void SdrMarkView::ModelHasChanged()
-diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
-index 45947f8..fc67cad 100644
---- svx/source/svdraw/svdoattr.cxx
-+++ svx/source/svdraw/svdoattr.cxx
-@@ -141,8 +141,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
+Index: svx/source/svdraw/svdoattr.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdoattr.cxx,v
+retrieving revision 1.51
+retrieving revision 1.51.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.51 -r1.51.74.1
+--- svx/source/svdraw/svdoattr.cxx	11 Apr 2008 03:01:38 -0000	1.51
++++ svx/source/svdraw/svdoattr.cxx	23 May 2008 20:11:05 -0000	1.51.74.1
+@@ -141,8 +141,7 @@
  ////////////////////////////////////////////////////////////////////////////////////////////////////
  // syntactical sugar for ItemSet accesses
  
@@ -342,11 +438,15 @@
  {
  	SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
  	BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
-diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
-index ae8336f..ec9d030 100644
---- svx/source/svdraw/svdocapt.cxx
-+++ svx/source/svdraw/svdocapt.cxx
-@@ -867,9 +867,9 @@ void SdrCaptionObj::SetModel(SdrModel* pNewModel)
+Index: svx/source/svdraw/svdocapt.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdocapt.cxx,v
+retrieving revision 1.29
+retrieving revision 1.29.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.29 -r1.29.74.1
+--- svx/source/svdraw/svdocapt.cxx	11 Apr 2008 03:02:11 -0000	1.29
++++ svx/source/svdraw/svdocapt.cxx	23 May 2008 20:11:05 -0000	1.29.74.1
+@@ -867,9 +867,9 @@
  	ImpRecalcTail();
  }
  
@@ -358,11 +458,15 @@
  	ImpRecalcTail();
  }
  
-diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
-index 8b08c53..b0a20de 100644
---- svx/source/svdraw/svdocirc.cxx
-+++ svx/source/svdraw/svdocirc.cxx
-@@ -1355,10 +1355,10 @@ Point SdrCircObj::GetSnapPoint(sal_uInt32 i) const
+Index: svx/source/svdraw/svdocirc.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdocirc.cxx,v
+retrieving revision 1.36
+retrieving revision 1.36.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.36 -r1.36.74.1
+--- svx/source/svdraw/svdocirc.cxx	11 Apr 2008 03:02:26 -0000	1.36
++++ svx/source/svdraw/svdocirc.cxx	23 May 2008 20:11:05 -0000	1.36.74.1
+@@ -1355,10 +1355,10 @@
  	}
  }
  
@@ -375,11 +479,15 @@
  	ImpSetAttrToCircInfo();
  }
  
-diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
-index 59a18d7..0c5a874 100644
---- svx/source/svdraw/svdoedge.cxx
-+++ svx/source/svdraw/svdoedge.cxx
-@@ -1661,7 +1661,7 @@ je Objekt variiert von 0-3:
+Index: svx/source/svdraw/svdoedge.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdoedge.cxx,v
+retrieving revision 1.44
+retrieving revision 1.43.74.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.44 -r1.43.74.2
+--- svx/source/svdraw/svdoedge.cxx	1 Jul 2008 23:19:32 -0000	1.44
++++ svx/source/svdraw/svdoedge.cxx	31 Jul 2008 00:15:44 -0000	1.43.74.2
+@@ -1671,7 +1671,7 @@
  'C':  n  0-3  0-3   = 1+U+1
  */
  
@@ -388,16 +496,16 @@
  {
  	SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
  	ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
-@@ -1676,7 +1676,7 @@ void __EXPORT SdrEdgeObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId&, const S
- 		if (bObj2) aCon2.pObj=NULL;
- 		return; // Und mehr braucht hier nicht getan werden.
+@@ -1690,7 +1690,7 @@
+ 	{
+ 		bEdgeTrackUserDefined = sal_False;
  	}
 -	SdrTextObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
-+	SdrTextObj::Notify(rBC,rHint);
++    SdrTextObj::Notify(rBC,rHint);
  	if (nNotifyingCount==0) { // Hier nun auch ein VerriegelungsFlag
  		((SdrEdgeObj*)this)->nNotifyingCount++;
  		SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
-@@ -1712,13 +1712,13 @@ void SdrEdgeObj::Reformat()
+@@ -1726,13 +1726,13 @@
  	if( NULL != aCon1.pObj )
  	{
  		SfxSimpleHint aHint( SFX_HINT_DATACHANGED );
@@ -413,11 +521,15 @@
  	}
  }
  
-diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
-index 205fc86..481ce93 100644
---- svx/source/svdraw/svdograf.cxx
-+++ svx/source/svdraw/svdograf.cxx
-@@ -1259,11 +1259,10 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
+Index: svx/source/svdraw/svdograf.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdograf.cxx,v
+retrieving revision 1.83
+retrieving revision 1.83.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.83 -r1.83.74.1
+--- svx/source/svdraw/svdograf.cxx	11 Apr 2008 03:02:57 -0000	1.83
++++ svx/source/svdraw/svdograf.cxx	23 May 2008 20:11:05 -0000	1.83.74.1
+@@ -1259,11 +1259,10 @@
  
  // -----------------------------------------------------------------------------
  
@@ -431,11 +543,15 @@
  	ImpSetAttrToGrafInfo();
  }
  
-diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
-index 3a7db4b..5ffee4f 100644
---- svx/source/svdraw/svdorect.cxx
-+++ svx/source/svdraw/svdorect.cxx
-@@ -844,9 +844,9 @@ SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const
+Index: svx/source/svdraw/svdorect.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdorect.cxx,v
+retrieving revision 1.30
+retrieving revision 1.30.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.30 -r1.30.74.1
+--- svx/source/svdraw/svdorect.cxx	11 Apr 2008 03:05:18 -0000	1.30
++++ svx/source/svdraw/svdorect.cxx	23 May 2008 20:11:06 -0000	1.30.74.1
+@@ -844,9 +844,9 @@
  	return pRet;
  }
  
@@ -447,11 +563,15 @@
  	SetXPolyDirty(); // wg. Eckenradius
  }
  
-diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
-index 83799d7..dd2f777 100644
---- svx/source/svdraw/svdovirt.cxx
-+++ svx/source/svdraw/svdovirt.cxx
-@@ -92,7 +92,7 @@ SdrObject& SdrVirtObj::ReferencedObj()
+Index: svx/source/svdraw/svdovirt.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdovirt.cxx,v
+retrieving revision 1.20
+retrieving revision 1.20.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.20 -r1.20.74.1
+--- svx/source/svdraw/svdovirt.cxx	11 Apr 2008 03:08:18 -0000	1.20
++++ svx/source/svdraw/svdovirt.cxx	23 May 2008 20:11:06 -0000	1.20.74.1
+@@ -92,7 +92,7 @@
  	return rRefObj;
  }
  
@@ -460,11 +580,15 @@
  {
  	bClosedObj=rRefObj.IsClosedObj();
  	SetRectsDirty(); // hier noch Optimieren.
-diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
-index 529776c..9f6a388 100644
---- svx/source/svdraw/svdpagv.cxx
-+++ svx/source/svdraw/svdpagv.cxx
-@@ -275,7 +275,7 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow)
+Index: svx/source/svdraw/svdpagv.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdpagv.cxx,v
+retrieving revision 1.61
+retrieving revision 1.61.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.61 -r1.61.74.1
+--- svx/source/svdraw/svdpagv.cxx	11 Apr 2008 03:08:58 -0000	1.61
++++ svx/source/svdraw/svdpagv.cxx	23 May 2008 20:11:06 -0000	1.61.74.1
+@@ -275,7 +275,7 @@
  	return xReturn;
  }
  
@@ -473,11 +597,15 @@
  {
      // not really interested in
  }
-diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
-index e88d886..3623a70 100644
---- svx/source/svdraw/svdpntv.cxx
-+++ svx/source/svdraw/svdpntv.cxx
-@@ -327,7 +327,7 @@ SdrPaintView::~SdrPaintView()
+Index: svx/source/svdraw/svdpntv.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdpntv.cxx,v
+retrieving revision 1.40
+retrieving revision 1.40.74.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.40 -r1.40.74.1
+--- svx/source/svdraw/svdpntv.cxx	11 Apr 2008 03:09:17 -0000	1.40
++++ svx/source/svdraw/svdpntv.cxx	23 May 2008 20:11:06 -0000	1.40.74.1
+@@ -327,7 +327,7 @@
  
  ////////////////////////////////////////////////////////////////////////////////////////////////////
  
@@ -486,11 +614,15 @@
  {
  	BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
  	if (bObjChg) {
-diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
-index 2e7f562..8f13ac3 100644
---- svx/source/svdraw/svdview.cxx
-+++ svx/source/svdraw/svdview.cxx
-@@ -1550,14 +1550,14 @@ BOOL SdrView::IsDeleteMarkedPossible() const
+Index: svx/source/svdraw/svdview.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/svdraw/svdview.cxx,v
+retrieving revision 1.28
+retrieving revision 1.27.72.2
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.28 -r1.27.72.2
+--- svx/source/svdraw/svdview.cxx	6 Jun 2008 12:34:40 -0000	1.28
++++ svx/source/svdraw/svdview.cxx	31 Jul 2008 00:15:40 -0000	1.27.72.2
+@@ -1555,14 +1555,14 @@
  	return IsDeleteMarkedObjPossible();
  }
  
@@ -507,11 +639,15 @@
  }
  
  SvtAccessibilityOptions& SdrView::getAccessibilityOptions()
-diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
-index 2fffe37..c69587b 100644
---- svx/source/tbxctrls/colrctrl.cxx
-+++ svx/source/tbxctrls/colrctrl.cxx
-@@ -357,10 +357,7 @@ SvxColorDockingWindow::~SvxColorDockingWindow()
+Index: svx/source/tbxctrls/colrctrl.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/tbxctrls/colrctrl.cxx,v
+retrieving revision 1.20
+retrieving revision 1.20.76.1
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.20 -r1.20.76.1
+--- svx/source/tbxctrls/colrctrl.cxx	11 Apr 2008 03:35:00 -0000	1.20
++++ svx/source/tbxctrls/colrctrl.cxx	23 May 2008 20:11:07 -0000	1.20.76.1
+@@ -357,10 +357,7 @@
  |*
  \************************************************************************/
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]