summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-09-30 06:36:06 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-09-30 06:36:06 +0000
commitcef0495d86889fa0a764dc7101b5fb6c709f26d1 (patch)
treea1f4afd70b66a087020729953abc972522a2baf5
parentd22299433f22110def9077a5fd704c0eb5b0c49a (diff)
CWS-TOOLING: integrate CWS sfxnotifyremoval
-rw-r--r--basic/source/app/app.cxx3
-rw-r--r--basic/source/app/appbased.cxx5
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx5
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx8
-rw-r--r--sfx2/source/dialog/templdlg.cxx5
-rw-r--r--sfx2/source/inc/templdgi.hxx5
-rw-r--r--sfx2/source/view/prnmon.cxx13
-rw-r--r--sfx2/source/view/topfrm.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx11
-rw-r--r--svx/inc/svx/colrctrl.hxx5
-rw-r--r--svx/inc/svx/fntctl.hxx7
-rw-r--r--svx/inc/svx/ruler.hxx5
-rw-r--r--svx/inc/svx/scene3d.hxx5
-rw-r--r--svx/inc/svx/svdedxv.hxx4
-rw-r--r--svx/inc/svx/svdmrkv.hxx4
-rw-r--r--svx/inc/svx/svdoattr.hxx2
-rw-r--r--svx/inc/svx/svdocapt.hxx2
-rw-r--r--svx/inc/svx/svdocirc.hxx2
-rw-r--r--svx/inc/svx/svdoedge.hxx2
-rw-r--r--svx/inc/svx/svdograf.hxx3
-rw-r--r--svx/inc/svx/svdorect.hxx2
-rw-r--r--svx/inc/svx/svdovirt.hxx2
-rw-r--r--svx/inc/svx/svdpagv.hxx2
-rw-r--r--svx/inc/svx/svdpntv.hxx2
-rw-r--r--svx/inc/svx/svdview.hxx4
-rw-r--r--svx/source/dialog/svxruler.cxx5
-rw-r--r--svx/source/engine3d/scene3d.cxx7
-rw-r--r--svx/source/items/boxobj.hxx5
-rw-r--r--svx/source/mnuctrls/fntctl.cxx5
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx4
-rw-r--r--svx/source/svdraw/svdedxv.cxx4
-rw-r--r--svx/source/svdraw/svdmrkv.cxx6
-rw-r--r--svx/source/svdraw/svdoattr.cxx3
-rw-r--r--svx/source/svdraw/svdocapt.cxx4
-rw-r--r--svx/source/svdraw/svdocirc.cxx4
-rw-r--r--svx/source/svdraw/svdoedge.cxx8
-rw-r--r--svx/source/svdraw/svdograf.cxx5
-rw-r--r--svx/source/svdraw/svdorect.cxx4
-rw-r--r--svx/source/svdraw/svdovirt.cxx2
-rw-r--r--svx/source/svdraw/svdpagv.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx4
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx7
43 files changed, 76 insertions, 115 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 0c7ef05687..9293e4195f 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -826,8 +826,7 @@ void BasicFrame::SetAutoRun( BOOL bAuto )
bIsAutoRun = bAuto;
}
-void BasicFrame::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
- const SfxHint& rHint, const TypeId& )
+void BasicFrame::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( TTExecutionStatusHint ) )
{
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 485de82024..292b97e720 100644
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: appbased.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.20.1 $
*
* This file is part of OpenOffice.org.
*
@@ -108,8 +108,7 @@ AppBasEd::~AppBasEd()
pMod->SetName( CUniString("--").Append( pMod->GetName() ) );
}
-void AppBasEd::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
- const SfxHint& rHint, const TypeId& )
+void AppBasEd::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SfxSimpleHint* p = PTR_CAST(SfxSimpleHint,&rHint);
if( p )
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 3d1e1447ca..b551a4942f 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: viewfrm.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.46.1 $
*
* This file is part of OpenOffice.org.
*
@@ -145,8 +145,7 @@ private:
#endif
protected:
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
SAL_DLLPRIVATE void SetWindow_Impl( Window *pWin );
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index f00c50d1c5..861e676177 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: viewsh.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.46.1 $
*
* This file is part of OpenOffice.org.
*
@@ -185,10 +185,8 @@ protected:
virtual void Move();
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC,
- const TypeId& rBCType,
- const SfxHint& rHint,
- const TypeId& rHintType );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+
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 19908936c3..fda9402d0d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: templdlg.cxx,v $
- * $Revision: 1.58 $
+ * $Revision: 1.58.46.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1562,8 +1562,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
//-------------------------------------------------------------------------
-void SfxCommonTemplateDialog_Impl::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType)
+void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
// Aktualisierung anstossen
if(rHint.Type() == TYPE(SfxSimpleHint))
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index e29a58c7ee..a7996eea0b 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: templdgi.hxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.46.1 $
*
* This file is part of OpenOffice.org.
*
@@ -226,8 +226,7 @@ protected:
USHORT StyleNrToInfoOffset( USHORT i );
USHORT InfoOffsetToStyleNr( USHORT i );
- void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
+ void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
void FamilySelect( USHORT nId );
void SetFamily( USHORT nId );
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index beddaa53f0..a2645c69d4 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: prnmon.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.46.1 $
*
* This file is part of OpenOffice.org.
*
@@ -113,17 +113,10 @@ public:
SfxViewShell* GetViewShell() const { return pViewShell; }
BOOL SetPage( USHORT nPage, const String &rPage );
void CreateMonitor();
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC,
- const TypeId& rBCType,
- const SfxHint& rHint,
- const TypeId& rHintType );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
};
-void SfxPrintProgress_Impl::SFX_NOTIFY(
- SfxBroadcaster& /*rBC*/,
- const TypeId& rBCType,
- const SfxHint& rHint,
- const TypeId& rHintType )
+void SfxPrintProgress_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
if ( pPrintHint )
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index eda31d3574..2b1ccdfbc9 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -1151,7 +1151,7 @@ void SfxTopViewFrame::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
- SfxViewFrame::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+ SfxViewFrame::Notify( rBC, rHint );
}
//--------------------------------------------------------------------
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1edb60a688..7f3b58275c 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: viewfrm.cxx,v $
- * $Revision: 1.136 $
+ * $Revision: 1.136.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1221,13 +1221,8 @@ void SfxViewFrame::ReleaseObjectShell_Impl( sal_Bool bStoreView )
pDispatcher->Flush();
EndListening( *xObjSh );
- SFX_NOTIFY( *xObjSh, xObjSh->Type(),
- SfxSimpleHint(SFX_HINT_TITLECHANGED),
- TYPE(SfxSimpleHint) );
-
- SFX_NOTIFY( *xObjSh, xObjSh->Type(),
- SfxSimpleHint(SFX_HINT_DOCCHANGED),
- TYPE(SfxSimpleHint) );
+ Notify( *xObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
+ Notify( *xObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
if ( 1 == xObjSh->GetOwnerLockCount() && pImp->bObjLocked && xObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
xObjSh->DoClose();
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 5b3bf8fb88..08b80f77d5 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: colrctrl.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -136,8 +136,7 @@ public:
const ResId& rResId );
~SvxColorDockingWindow();
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
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 e6dc3e4f15..03435c4e96 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: fntctl.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,10 +54,7 @@ private:
DECL_LINK( MenuSelect, FontNameMenu * );
SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
- SVX_DLLPRIVATE virtual void SFX_NOTIFY( SfxBroadcaster& rBC,
- const TypeId& rBCType,
- const SfxHint& rHint,
- const TypeId& rHintType );
+ SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
//#endif
public:
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index d3bd8d2a2a..58aef4c972 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ruler.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -216,8 +216,7 @@ protected:
virtual void ExtraDown();
virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
// 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 01af407a17..c995ed40d2 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -120,10 +120,7 @@ protected:
void RebuildLists();
- virtual void SFX_NOTIFY(SfxBroadcaster &rBC,
- const TypeId &rBCType,
- const SfxHint &rHint,
- const TypeId &rHintType);
+ virtual void Notify(SfxBroadcaster &rBC, const SfxHint &rHint);
protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index c7736ed8d1..999a8b0963 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svdedxv.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.4.76.2 $
*
* This file is part of OpenOffice.org.
*
@@ -162,7 +162,7 @@ public:
virtual void BckAction();
virtual void TakeActionRect(Rectangle& rRect) const;
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
virtual void ModelHasChanged();
//************************************************************************
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index 13d9a972eb..962fce5030 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svdmrkv.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -166,7 +166,7 @@ private:
void UndirtyMrkPnt() const;
protected:
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
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 83bc54fdea..984d11b8a0 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -70,7 +70,7 @@ protected:
FASTBOOL ImpGetShadowDist(sal_Int32& nXDist, sal_Int32& nYDist) const;
// Zuhoeren, ob sich ein StyleSheet aendert
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
SdrAttrObj();
virtual ~SdrAttrObj();
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index b1ecf046ef..73691d17d4 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -118,7 +118,7 @@ public:
virtual basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const;
virtual void SetModel(SdrModel* pNewModel);
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
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 9b8f4064da..c40906ed95 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -98,7 +98,7 @@ private:
SVX_DLLPRIVATE virtual void RecalcXPoly();
protected:
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
public:
TYPEINFO();
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 78ce1c98d5..e84cc1c5b8 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -210,7 +210,7 @@ public:
sal_Bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; }
protected:
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
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 7d101c148b..5d912c1f7a 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -213,8 +213,7 @@ public:
void AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly );
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
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 4210a0ca82..dcf685fda3 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -146,7 +146,7 @@ public:
virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
};
#endif //_SVDORECT_HXX
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index 69ba123e33..79ab364d70 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -58,7 +58,7 @@ protected:
Rectangle aSnapRect;
protected:
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
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 8b41dfeab4..073bb3d6f2 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -140,7 +140,7 @@ protected:
sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
void SetAllLayers(SetOfByte& rB, sal_Bool bJa);
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
// Nachsehen, ob AktGroup noch Inserted ist.
void CheckAktGroup();
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index d05658b277..a318607cc3 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -275,7 +275,7 @@ public:
BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
protected:
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
void GlueInvalidate() const;
void ShowEncirclement(OutputDevice* pOut);
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index 431cb879df..ecbdc32cb4 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svdview.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -197,7 +197,7 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi
protected:
SvtAccessibilityOptions maAccessibilityOptions;
- virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
public:
TYPEINFO();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 70993ef8e0..6aea709563 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svxruler.cxx,v $
- * $Revision: 1.39 $
+ * $Revision: 1.39.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -3621,8 +3621,7 @@ void __EXPORT SvxRuler::ExtraDown()
}
-void __EXPORT SvxRuler::SFX_NOTIFY(SfxBroadcaster& , const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
/*
[Beschreibung]
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index a13ad388d8..a8c358a2fb 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -866,13 +866,10 @@ void E3dScene::RestGeoData(const SdrObjGeoData& rGeo)
|*
\************************************************************************/
-void E3dScene::SFX_NOTIFY(SfxBroadcaster &rBC,
- const TypeId &rBCType,
- const SfxHint &rHint,
- const TypeId &rHintType)
+void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint)
{
SetRectsDirty();
- E3dObject::SFX_NOTIFY(rBC, rBCType, rHint, rHintType);
+ E3dObject::Notify(rBC, rHint);
}
/*************************************************************************
diff --git a/svx/source/items/boxobj.hxx b/svx/source/items/boxobj.hxx
index 4696a09f64..c9dd80a555 100644
--- a/svx/source/items/boxobj.hxx
+++ b/svx/source/items/boxobj.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: boxobj.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -66,8 +66,7 @@ private:
protected:
// Schnittstelle zum SbxObject/SvDispatch/SfxShell..Object
- void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
+ void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
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 589dc80cba..0ab16726aa 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: fntctl.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -132,8 +132,7 @@ void SvxFontMenuControl::StateChanged(
der DocumentShell gef"ullt.
*/
-void SvxFontMenuControl::SFX_NOTIFY( SfxBroadcaster&, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType )
+void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
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 2a55564202..69921e4227 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: graphicproperties.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -91,7 +91,7 @@ namespace sdr
rObj.SetXPolyDirty();
// #i29367# Update GraphicAttr, too. This was formerly
- // triggered by SdrGrafObj::SFX_NOTIFY, which is no longer
+ // triggered by SdrGrafObj::Notify, which is no longer
// 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 6674131e1f..e687a023c4 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -154,9 +154,9 @@ void SdrObjEditView::TakeActionRect(Rectangle& rRect) const
}
}
-void __EXPORT SdrObjEditView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
- SdrGlueEditView::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+ SdrGlueEditView::Notify(rBC,rHint);
// 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 fdfebdb1ab..9e8494d69f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svdmrkv.cxx,v $
- * $Revision: 1.39 $
+ * $Revision: 1.39.74.1 $
*
* This file is part of OpenOffice.org.
*
@@ -203,7 +203,7 @@ SdrMarkView::~SdrMarkView()
delete mpSdrViewSelection;
}
-void __EXPORT SdrMarkView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
if (pSdrHint!=NULL)
@@ -216,7 +216,7 @@ void __EXPORT SdrMarkView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType
bMarkedPointsRectsDirty=TRUE;
}
}
- SdrSnapView::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+ SdrSnapView::Notify(rBC,rHint);
}
void SdrMarkView::ModelHasChanged()
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 04a79fffde..43b6748e76 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -140,8 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
////////////////////////////////////////////////////////////////////////////////////////////////////
// syntactical sugar for ItemSet accesses
-void __EXPORT SdrAttrObj::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
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 ed8b59b05a..ccb2e53bd4 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -792,9 +792,9 @@ void SdrCaptionObj::SetModel(SdrModel* pNewModel)
ImpRecalcTail();
}
-void SdrCaptionObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void SdrCaptionObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
- SdrRectObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+ SdrRectObj::Notify(rBC,rHint);
ImpRecalcTail();
}
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 1ac7384cdb..b3dab4e4e7 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1202,10 +1202,10 @@ Point SdrCircObj::GetSnapPoint(sal_uInt32 i) const
}
}
-void __EXPORT SdrCircObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
SetXPolyDirty();
- SdrRectObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+ SdrRectObj::Notify(rBC,rHint);
ImpSetAttrToCircInfo();
}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index bbf610ad24..803da80177 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1579,7 +1579,7 @@ je Objekt variiert von 0-3:
'C': n 0-3 0-3 = 1+U+1
*/
-void __EXPORT SdrEdgeObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId&, const SfxHint& rHint, const TypeId&)
+void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
@@ -1598,7 +1598,7 @@ void __EXPORT SdrEdgeObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId&, const S
{
bEdgeTrackUserDefined = sal_False;
}
- SdrTextObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+ SdrTextObj::Notify(rBC,rHint);
if (nNotifyingCount==0) { // Hier nun auch ein VerriegelungsFlag
((SdrEdgeObj*)this)->nNotifyingCount++;
SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
@@ -1634,13 +1634,13 @@ void SdrEdgeObj::Reformat()
if( NULL != aCon1.pObj )
{
SfxSimpleHint aHint( SFX_HINT_DATACHANGED );
- SFX_NOTIFY( *const_cast<SfxBroadcaster*>(aCon1.pObj->GetBroadcaster()), NULL, aHint, NULL );
+ Notify( *const_cast<SfxBroadcaster*>(aCon1.pObj->GetBroadcaster()), aHint );
}
if( NULL != aCon2.pObj )
{
SfxSimpleHint aHint( SFX_HINT_DATACHANGED );
- SFX_NOTIFY( *const_cast<SfxBroadcaster*>(aCon2.pObj->GetBroadcaster()), NULL, aHint, NULL );
+ Notify( *const_cast<SfxBroadcaster*>(aCon2.pObj->GetBroadcaster()), aHint );
}
}
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index a6bf7cd671..ee0d3179c9 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -977,11 +977,10 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
// -----------------------------------------------------------------------------
-void SdrGrafObj::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType )
+void SdrGrafObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
SetXPolyDirty();
- SdrRectObj::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+ SdrRectObj::Notify( rBC, rHint );
ImpSetAttrToGrafInfo();
}
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 80410d29d3..4d1c1892f7 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -679,9 +679,9 @@ SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const
return pRet;
}
-void SdrRectObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void SdrRectObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
- SdrTextObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+ SdrTextObj::Notify(rBC,rHint);
SetXPolyDirty(); // wg. Eckenradius
}
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 25bd9383ef..d841f01274 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -91,7 +91,7 @@ SdrObject& SdrVirtObj::ReferencedObj()
return rRefObj;
}
-void __EXPORT SdrVirtObj::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, const SfxHint& /*rHint*/, const TypeId& rHintType)
+void __EXPORT SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
{
bClosedObj=rRefObj.IsClosedObj();
SetRectsDirty(); // hier noch Optimieren.
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 74eca3c784..7a8847dc0d 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -265,7 +265,7 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow)
return xReturn;
}
-void __EXPORT SdrPageView::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& /*rBCType*/, const SfxHint& /*rHint*/, const TypeId& /*rHintType*/)
+void __EXPORT SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
{
// not really interested in
}
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 20fed56911..a586ded99e 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -320,7 +320,7 @@ SdrPaintView::~SdrPaintView()
////////////////////////////////////////////////////////////////////////////////////////////////////
-void __EXPORT SdrPaintView::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
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 9c32fe170c..b405937e41 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1555,14 +1555,14 @@ BOOL SdrView::IsDeleteMarkedPossible() const
return IsDeleteMarkedObjPossible();
}
-void SdrView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void SdrView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_ACCESSIBILITY_CHANGED )
{
onAccessibilityOptionsChanged();
}
- SdrCreateView::SFX_NOTIFY(rBC, rBCType, rHint, rHintType );
+ SdrCreateView::Notify(rBC, rHint);
}
SvtAccessibilityOptions& SdrView::getAccessibilityOptions()
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 954d061b0d..c7df83a525 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: colrctrl.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.76.1 $
*
* This file is part of OpenOffice.org.
*
@@ -357,10 +357,7 @@ SvxColorDockingWindow::~SvxColorDockingWindow()
|*
\************************************************************************/
-void SvxColorDockingWindow::SFX_NOTIFY( SfxBroadcaster& ,
- const TypeId& rBCType,
- const SfxHint& rHint,
- const TypeId& rHintType )
+void SvxColorDockingWindow::Notify( SfxBroadcaster& , const SfxHint& rHint )
{
const SfxPoolItemHint *pPoolItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
if ( pPoolItemHint