diff options
Diffstat (limited to 'sc')
100 files changed, 686 insertions, 2038 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index d5db4886f..491dae477 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2,9 +2,9 @@ * * $RCSfile: document.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:48 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:24:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,6 +88,7 @@ class SfxBroadcaster; class SfxHint; class SfxItemSet; class SfxObjectShell; +class SfxBindings; class SfxPoolItem; class SfxItemPool; class SfxPrinter; @@ -606,6 +607,7 @@ public: BOOL GetDdeLinkData( USHORT nPos, String& rAppl, String& rTopic, String& rItem ) const; BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); + SfxBindings* GetViewBindings(); SfxObjectShell* GetDocumentShell() const { return pShell; } ScDrawLayer* GetDrawLayer() { return pDrawLayer; } SfxBroadcaster* GetDrawBroadcaster(); // zwecks Header-Vermeidung diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index cb213c968..106164144 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:14 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -450,9 +450,12 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, pTimer ) if (!pShell->IsModified()) { pShell->SetModified( TRUE ); - SfxBindings& rBind = SFX_BINDINGS(); - rBind.Invalidate( SID_SAVEDOC ); - rBind.Invalidate( SID_DOC_MODIFIED ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( SID_SAVEDOC ); + pBindings->Invalidate( SID_DOC_MODIFIED ); + } } } diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 1b9d16a1a..0ec1ce231 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:14 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -438,8 +438,9 @@ BOOL ScDocument::LinkEmptyTab( USHORT& rTab, const String& aDocTab, &aFilterName ); pLink->Update(); pLink->SetInCreate( FALSE ); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_LINKS ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_LINKS ); } return TRUE; } @@ -487,8 +488,9 @@ BOOL ScDocument::LinkExternalTab( USHORT& rTab, const String& aDocTab, &aFilterName ); pLink->Update(); pLink->SetInCreate( FALSE ); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_LINKS ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_LINKS ); } return TRUE; } diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index c18e954ad..5b93b7510 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen8.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:14 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,7 @@ #include <svx/linkmgr.hxx> #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> +#include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <svtools/flagitem.hxx> #include <svtools/intitem.hxx> @@ -1351,6 +1352,29 @@ BOOL ScDocument::HasMacroCallsAfterLoad() // wird direkt nach dem Laden abgefrag return FALSE; // nichts gefunden } +//------------------------------------------------------------------------ + +SfxBindings* ScDocument::GetViewBindings() +{ + // used to invalidate slots after changes to this document + + if ( !pShell ) + return NULL; // no ObjShell -> no view + + // first check current view + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if ( pViewFrame && pViewFrame->GetObjectShell() != pShell ) // wrong document? + pViewFrame = NULL; + + // otherwise use first view for this doc + if ( !pViewFrame ) + pViewFrame = SfxViewFrame::GetFirst( pShell ); + + if (pViewFrame) + return &pViewFrame->GetBindings(); + else + return NULL; +} diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 7cac67d4a..ced5107e7 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawpage.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:15 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index d7e252f52..b16c65249 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwlayer.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:15 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** @@ -555,7 +554,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 6847a29e9..02f8a334d 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -2,9 +2,9 @@ * * $RCSfile: global.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:15 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -835,7 +835,10 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget ) // kein SID_SILENT mehr wegen Bug #42525# (war angeblich sowieso falsch) - SFX_DISPATCHER().Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetDispatcher()->Execute( SID_OPENDOC, + SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aUrl, &aTarget, &aFrm, &aReferer, &aNewView, &aBrowsing, diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 2a9a2fc71..354a8300b 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: userdat.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:16 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** @@ -555,7 +554,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 798c13a73..0d6dfca4b 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ddelink.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:17 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -291,8 +291,9 @@ void __EXPORT ScDdeLink::ListenersGone() if ( !pLinkMgr->GetLinks().Count() ) // letzten geloescht ? { - SfxBindings& rBind = SFX_BINDINGS(); - rBind.Invalidate( SID_LINKS ); + SfxBindings* pBindings = pDoc->GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_LINKS ); } bIsInUpdate = bWas; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 14b2fb091..3875bb26f 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interpr2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:16:17 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:44:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1711,8 +1711,9 @@ void ScInterpreter::ScDde() pLinkMgr->InsertDDELink( *pLink, aAppl, aTopic, aItem ); if ( pLinkMgr->GetLinks().Count() == 1 ) // erster ? { - SfxBindings& rBind = SFX_BINDINGS(); - rBind.Invalidate( SID_LINKS ); // Link-Manager enablen + SfxBindings* pBindings = pDok->GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_LINKS ); // Link-Manager enablen } //! asynchron auswerten ??? diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 39686b11f..28270c528 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlexp.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:12 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:45:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,275 +65,6 @@ #pragma hdrstop -//------------------------------------------------------------------ - -#ifdef MAC -#define _SYSDEP_HXX -#endif - -// TOOLS -#define _BIGINT_HXX -#define _SFXMULTISEL_HXX -#define _STACK_HXX -#define _QUEUE_HXX -#define _DYNARR_HXX -#define _TREELIST_HXX -#define _CACHESTR_HXX -#define _NEW_HXX -//#define _SHL_HXX -//#define _LINK_HXX -//#define _ERRCODE_HXX -//#define _GEN_HXX -//#define _FRACT_HXX -//#define _STRING_HXX -//#define _MTF_HXX -//#define _CONTNR_HXX -//#define _LIST_HXX -//#define _TABLE_HXX -#define _DYNARY_HXX -//#define _UNQIDX_HXX -//#define _SVMEMPOOL_HXX -//#define _UNQID_HXX -//#define _DEBUG_HXX -//#define _DATE_HXX -//#define _TIME_HXX -//#define _DATETIME_HXX -//#define _INTN_HXX -//#define _WLDCRD_HXX -//#define _FSYS_HXX -//#define _STREAM_HXX -#define _CACHESTR_HXX -#define _SV_MULTISEL_HXX - -//SV -//#define _CLIP_HXX -#define _CONFIG_HXX -#define _CURSOR_HXX -#define _FONTDLG_HXX -#define _PRVWIN_HXX -//#define _COLOR_HXX -//#define _PAL_HXX -//#define _BITMAP_HXX -//#define _GDIOBJ_HXX -//#define _POINTR_HXX -//#define _ICON_HXX -//#define _IMAGE_HXX -//#define _KEYCOD_HXX -//#define _EVENT_HXX -#define _HELP_HXX -//#define _APP_HXX -//#define _MDIAPP_HXX -//#define _TIMER_HXX -//#define _METRIC_HXX -//#define _REGION_HXX -//#define _OUTDEV_HXX -//#define _SYSTEM_HXX -//#define _VIRDEV_HXX -//#define _JOBSET_HXX -//#define _PRINT_HXX -//#define _WINDOW_HXX -//#define _SYSWIN_HXX -//#define _WRKWIN_HXX -#define _MDIWIN_HXX -//#define _FLOATWIN_HXX -#define _DOCKWIN_HXX //??? -//#define _CTRL_HXX **** -#define _SCRBAR_HXX -//#define _BUTTON_HXX *** -#define _IMAGEBTN_HXX -#define _FIXED_HXX -#define _GROUP_HXX -#define _EDIT_HXX -#define _COMBOBOX_HXX -#define _LSTBOX_HXX -#define _SELENG_HXX -#define _SPLIT_HXX -#define _SPIN_HXX -#define _FIELD_HXX -#define _MOREBTN_HXX -#define _TOOLBOX_HXX -#define _STATUS_HXX -#define _SVTCTRL3_HXX -#define _SVTCTRL2_HXX -//#define _DIALOG_HXX *** -#define _MSGBOX_HXX -//#define _SYSDLG_HXX *** -#define _PRNDLG_HXX -#define _COLDLG_HXX -#define _TABDLG_HXX -//#define _GDIMTF_HXX -//#define _POLY_HXX -#define _ACCEL_HXX -//#define _GRAPH_HXX -#define _SOUND_HXX - -//svtools -#define _SCRWIN_HXX -#define _RULER_HXX -#define _TABBAR_HXX -#define _VALUESET_HXX -#define _STDMENU_HXX -#define _STDCTRL_HXX -#define _CTRLBOX_HXX -#define _CTRLTOOL_HXX -#define _EXTATTR_HXX -#define _FRM3D_HXX -#define _EXTATTR_HXX - -//SVTOOLS -#define _SVTREELIST_HXX -//#define _FILTER_HXX *** -#define _SVLBOXITM_HXX -#define _SVTREEBOX_HXX -#define _SVICNVW_HXX -#define _SVTABBX_HXX - -//sfxcore.hxx -//#define _SFXINIMGR_HXX *** -//#define _SFXCFGITEM_HXX -#define _SFX_PRINTER_HXX -#define _SFXGENLINK_HXX -#define _SFXHINTPOST_HXX -//#define _SFXDOCINF_HXX *** -#define _SFXLINKHDL_HXX -#define _SFX_PROGRESS_HXX - -//sfxsh.hxx -//#define _SFX_SHELL_HXX *** -//#define _SFXAPP_HXX *** -#define _SFX_BINDINGS_HXX -#define _SFXDISPATCH_HXX -//#define _SFXMSG_HXX *** -#define _SFXOBJFACE_HXX -#define _SFXREQUEST_HXX -#define _SFXMACRO_HXX - -// SFX -#define _SFXAPPWIN_HXX -#define _SFX_SAVEOPT_HXX -#define _SFX_CHILDWIN_HXX -#define _SFXCTRLITEM_HXX -#define _SFXPRNMON_HXX -#define _INTRO_HXX -#define _SFXMSGDESCR_HXX -#define _SFXMSGPOOL_HXX -#define _SFXFILEDLG_HXX -#define _PASSWD_HXX -#define _SFXTBXCTRL_HXX -#define _SFXSTBITEM_HXX -#define _SFXMNUITEM_HXX -#define _SFXIMGMGR_HXX -#define _SFXTBXMGR_HXX -#define _SFXSTBMGR_HXX -#define _SFX_MINFITEM_HXX -#define _SFXEVENT_HXX - -//sfxdoc.hxx -//#define _SFX_OBJSH_HXX *** -//#define _SFX_CLIENTSH_HXX -//#define _SFXDOCINF_HXX *** -//define _SFX_OBJFAC_HXX *** -#define _SFX_DOCFILT_HXX -//#define _SFXDOCFILE_HXX *** -#define _VIEWFAC_HXX -#define _SFXVIEWFRM_HXX -//#define _SFXVIEWSH_HXX -#define _MDIFRM_HXX -#define _SFX_IPFRM_HXX -#define _SFX_INTERNO_HXX - -//sfxdlg.hxx -#define _SFXTABDLG_HXX -#define _BASEDLGS_HXX -#define _SFX_DINFDLG_HXX -#define _SFXDINFEDT_HXX -#define _SFX_MGETEMPL_HXX -#define _SFX_TPLPITEM_HXX -#define _SFX_STYLEDLG_HXX -#define _NEWSTYLE_HXX -#define _SFXDOCTEMPL_HXX -#define _SFXDOCTDLG_HXX -#define _SFX_TEMPLDLG_HXX -#define _SFXNEW_HXX -#define _SFXDOCMAN_HXX -#define _SFXDOCKWIN_HXX - -//sfxitems.hxx -#define _SFX_WHMAP_HXX -#define _ARGS_HXX -//#define _SFXPOOLITEM_HXX *** -//#define _SFXINTITEM_HXX *** -//#define _SFXENUMITEM_HXX *** -#define _SFXFLAGITEM_HXX -//#define _SFXSTRITEM_HXX *** -#define _SFXPTITEM_HXX -#define _SFXRECTITEM_HXX -//#define _SFXITEMPOOL_HXX *** -//#define _SFXITEMSET_HXX *** -#define _SFXITEMITER_HXX -#define _SFX_WHITER_HXX -#define _SFXPOOLCACH_HXX -#define _AEITEM_HXX -#define _SFXRNGITEM_HXX -#define _SFXSLSTITM_HXX -//#define _SFXSTYLE_HXX *** - -//xout.hxx -//#define _XENUM_HXX *** -//#define _XPOLY_HXX *** -//#define _XATTR_HXX *** -#define _XOUTX_HXX -//#define _XPOOL_HXX *** -#define _XTABLE_HXX - -//svdraw.hxx -#define _SDR_NOVIEWMARKER -#define _SDR_NODRAGMETHODS -#define _SDR_NOUNDO -#define _SDR_NOXOUTDEV -#define _SDR_NOVIEWMARKER -#define _SDR_NODRAGMETHODS - -#define SI_NOITEMS -#define SI_NODRW -#define _SI_NOSBXCONTROLS -#define _VCATTR_HXX -#define _VCONT_HXX -//#define _VCSBX_HXX *** -#define _SI_NOOTHERFORMS -#define _VCTRLS_HXX -//#define _VCDRWOBJ_HXX *** -#define _SI_NOCONTROL -#define _SETBRW_HXX -#define _VCBRW_HXX -#define _SI_NOSBXCONTROLS -#define _SIDLL_HXX - -#define _SVX_DAILDLL_HXX -#define _SVX_HYPHEN_HXX -//#define _SVX_IMPGRF_HXX *** -#define _SVX_OPTITEMS_HXX -#define _SVX_OPTGERL_HXX -#define _SVX_OPTSAVE_HXX -#define _SVX_OPTSPELL_HXX -#define _SVX_OPTPATH_HXX -#define _SVX_OPTLINGU_HXX -#define _SVX_RULER_HXX -#define _SVX_RULRITEM_HXX -#define _SVX_SPLWRAP_HXX -#define _SVX_SPLDLG_HXX -#define _SVX_THESDLG_HXX - -//inet -#define _INETINDP_HXX -#define _INETIMP_HXX -#define _INETWRAP_HXX -#define _INETKEEP_HXX -#define _PLUGMGR_HXX -//#define _URLOBJ_HXX *** - -#define SFX_NOCLOOKS - // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 25fd9dfdf..1c76304dc 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scfobj.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:15 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:45:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -198,7 +198,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 9c68a7847..b30512332 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -2,9 +2,9 @@ * * $RCSfile: client.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,7 +195,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -#define _SFX_BINDINGS_HXX #define _SFXDISPATCH_HXX //??? //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** @@ -259,10 +258,6 @@ #pragma hdrstop -#ifndef PCH -#include "segmentc.hxx" -#endif - // INCLUDE --------------------------------------------------------------- #ifndef _SFX_OBJSH_HXX //autogen @@ -306,12 +301,8 @@ #include "tabvwsh.hxx" #include "document.hxx" -SEG_EOFGLOBALS() - //------------------------------------------------------------------------ -#pragma SEG_FUNCDEF(client_01) - ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel ) : SfxInPlaceClient( pViewShell, pDraw ), pModel( pSdrModel ), @@ -319,14 +310,10 @@ ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrMod { } -#pragma SEG_FUNCDEF(client_02) - __EXPORT ScClient::~ScClient() { } -#pragma SEG_FUNCDEF(client_05) - SdrOle2Obj* ScClient::GetDrawObj() { SvEmbeddedObject* pMyObj = GetEmbedObj(); @@ -360,8 +347,6 @@ SdrOle2Obj* ScClient::GetDrawObj() return pOle2Obj; } -#pragma SEG_FUNCDEF(client_03) - void __EXPORT ScClient::RequestObjAreaPixel( const Rectangle& rObjRect ) { SfxViewShell* pSfxViewSh = GetViewShell(); @@ -469,8 +454,6 @@ void __EXPORT ScClient::RequestObjAreaPixel( const Rectangle& rObjRect ) pViewSh->ScrollToObject( pDrawObj ); } -#pragma SEG_FUNCDEF(client_04) - void __EXPORT ScClient::ViewChanged( USHORT nAspect ) { SfxInPlaceClient::ViewChanged( nAspect ); @@ -515,8 +498,6 @@ void __EXPORT ScClient::ViewChanged( USHORT nAspect ) } } -#pragma SEG_FUNCDEF(client_08) - void __EXPORT ScClient::MakeViewData() { SfxInPlaceClient::MakeViewData(); @@ -543,8 +524,6 @@ void __EXPORT ScClient::MakeViewData() } } -#pragma SEG_FUNCDEF(client_06) - void __EXPORT ScClient::MakeVisible() { SdrOle2Obj* pDrawObj = GetDrawObj(); @@ -557,8 +536,6 @@ void __EXPORT ScClient::MakeVisible() } } -#pragma SEG_FUNCDEF(client_0a) - // Mit Optimierung gibt es Abstuerze beim Deaktivieren von Grafik-Image-Objekten #ifdef WNT @@ -602,8 +579,6 @@ void lcl_ReplaceObject( SdrOle2Obj* pGrafOle, SdrGrafObj* pGrafObj, #pragma optimize ( "", on ) #endif -#pragma SEG_FUNCDEF(client_09) - void __EXPORT ScClient::UIActivate( BOOL bActivate ) { SvInPlaceClientRef aIPClient( this ); // nicht aus versehen zwischendrin loeschen @@ -638,148 +613,3 @@ void __EXPORT ScClient::UIActivate( BOOL bActivate ) } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.44 2000/09/17 14:08:53 willem.vandorp - OpenOffice header added. - - Revision 1.43 2000/08/31 16:38:17 willem.vandorp - Header and footer replaced - - Revision 1.42 2000/02/11 12:21:23 hr - #70473# changes for unicode ( patched by automated patchtool ) - - Revision 1.41 1999/04/19 17:04:18 NN - #65014# Objekte/Charts koennen auch gruppiert vorkommen - - - Rev 1.40 19 Apr 1999 19:04:18 NN - #65014# Objekte/Charts koennen auch gruppiert vorkommen - - Rev 1.39 26 Mar 1999 18:12:16 HJS - sim ist tot - - Rev 1.38 03 Mar 1999 18:08:40 NN - #62107# GetDrawObj: Name vom SdrOle2Obj statt vom IPObj - - Rev 1.37 27 Nov 1998 11:30:16 NN - #41302#/#56515# ReplaceObject ohne bMark, ForceMove beim Deaktivieren - - Rev 1.36 16 Oct 1998 21:09:12 NN - #57916# ClearHighlightRanges beim Deaktivieren - - Rev 1.35 13 Oct 1998 16:00:34 NN - #56590# RequestObjAreaPixel: Rundungsfehler bei SetLogicRect vermeiden - - Rev 1.34 05 Dec 1997 20:08:20 ANK - Includes geaendert - - Rev 1.33 04 Sep 1997 20:29:48 RG - change header - - Rev 1.32 29 Apr 1997 17:25:50 HJS - includes/defines - - Rev 1.31 10 Jan 1997 13:45:44 NN - lcl_ReplaceObject ohne Optimierung - - Rev 1.30 04 Dec 1996 14:50:04 NN - Image-Objekt wieder durch Grafik ersetzen jetzt in UIActivate - - Rev 1.29 25 Oct 1996 11:39:28 TRI - socore.hxx - - Rev 1.28 23 Aug 1996 11:31:40 NF - clooks - - Rev 1.27 22 Aug 1996 10:58:20 NF - clooks - - Rev 1.26 15 Aug 1996 20:24:50 HJS - define raus - - Rev 1.25 15 Aug 1996 19:12:32 HJS - clooks - - Rev 1.24 12 Aug 1996 11:37:04 NF - clooks - - Rev 1.23 06 Aug 1996 09:10:54 NF - clooks - - Rev 1.22 01 Aug 1996 14:24:08 NF - clooks - - Rev 1.21 03 Jul 1996 14:51:32 NN - ScrollToObject an der View statt DoScroll - - Rev 1.20 30 May 1996 14:53:24 NF - CLOOKS ... ! - - Rev 1.19 18 Apr 1996 17:15:24 NN - 313: MakeViewData - - Rev 1.18 18 Apr 1996 15:43:32 NN - 313: MakeVisible - - Rev 1.17 27 Mar 1996 14:58:04 NN - RequestObjAreaPixel: Bereich auf Seite anpassen, Scrollen wenn noetig - - Rev 1.16 21 Mar 1996 11:43:18 ER - SV311 soref changes - - Rev 1.15 14 Mar 1996 14:42:30 NN - #25327# ViewChanged: erst SetObjArea, dann SetLogicRect (wegen Scale) - - Rev 1.14 29 Feb 1996 18:59:40 NF - CLOOKS - - Rev 1.13 23 Feb 1996 12:18:40 NF - CLOOKS - - Rev 1.12 16 Feb 1996 14:48:10 MO - 306er SO2-Aenderungen - - Rev 1.11 26 Jan 1996 09:57:10 NN - RequestObjAreaPixel: statt PixelToLogic mit Rechteck - Position und Groesse getrennt umrechnen - - Rev 1.10 22 Jan 1996 16:24:02 NN - #24481# Scale beruecksichtigen - - Rev 1.9 18 Nov 1995 18:21:34 NN - pDrawObject nicht mehr merken, stattdessen suchen - - Rev 1.8 08 Nov 1995 13:04:04 MO - 301-Aenderungen - - Rev 1.7 26 Sep 1995 18:10:40 JN - DrawObject merken - - Rev 1.6 14 Sep 1995 12:01:44 NN - soipenv.hxx - - Rev 1.5 06 Sep 1995 09:44:10 NN - bei ViewChanged Position behalten - - Rev 1.4 04 Sep 1995 14:09:00 NN - SetObjArea am Environment statt SetObjSize (2.55) - - Rev 1.3 09 Aug 1995 13:12:02 NN - bGrafEdit-Flag - - Rev 1.2 31 Jul 1995 10:26:44 NN - Container Anpassung in RequestObjAreaPixel - - Rev 1.1 13 Jul 1995 13:10:38 NN - SdrOle2Obj als Member fuer Groessenaenderungen - - Rev 1.0 13 Jul 1995 12:19:30 NN - Initial revision. - -------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - - diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index ce08febab..275bba028 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inputhdl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1700,21 +1700,25 @@ void ScInputHandler::RemoveSelection() void ScInputHandler::InvalidateAttribs() { - SfxBindings& rBindings = SFX_APP()->GetBindings(); + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + { + SfxBindings& rBindings = pViewFrm->GetBindings(); - rBindings.Invalidate( SID_ATTR_CHAR_FONT ); - rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); - rBindings.Invalidate( SID_ATTR_CHAR_COLOR ); + rBindings.Invalidate( SID_ATTR_CHAR_FONT ); + rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); + rBindings.Invalidate( SID_ATTR_CHAR_COLOR ); - rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT ); - rBindings.Invalidate( SID_ATTR_CHAR_POSTURE ); - rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE ); - rBindings.Invalidate( SID_ULINE_VAL_NONE ); - rBindings.Invalidate( SID_ULINE_VAL_SINGLE ); - rBindings.Invalidate( SID_ULINE_VAL_DOUBLE ); - rBindings.Invalidate( SID_ULINE_VAL_DOTTED ); + rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT ); + rBindings.Invalidate( SID_ATTR_CHAR_POSTURE ); + rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE ); + rBindings.Invalidate( SID_ULINE_VAL_NONE ); + rBindings.Invalidate( SID_ULINE_VAL_SINGLE ); + rBindings.Invalidate( SID_ULINE_VAL_DOUBLE ); + rBindings.Invalidate( SID_ULINE_VAL_DOTTED ); - rBindings.Invalidate( SID_HYPERLINK_GETLINK ); + rBindings.Invalidate( SID_HYPERLINK_GETLINK ); + } } @@ -2521,7 +2525,11 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE ResetAutoPar(); if ( KEY_INSERT == nCode ) - SFX_APP()->GetBindings().Invalidate( SID_ATTR_INSERT ); + { + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); + } } DataChanged(); // ruft auch UpdateParenthesis() diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index c6a3788d2..a83da852c 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inputwin.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -294,7 +294,7 @@ void __EXPORT ScInputWindow::Select() SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ) { - SFX_DISPATCHER().Execute( SID_OPENDLG_FUNCTION, + pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); // die Toolbox wird sowieso disabled, also braucht auch nicht umgeschaltet @@ -873,7 +873,10 @@ void ScTextWnd::StartEditEngine() } SC_MOD()->SetInputMode( SC_INPUT_TOP ); - SFX_BINDINGS().Invalidate( SID_ATTR_INSERT ); + + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); } void ScTextWnd::StopEditEngine() @@ -892,7 +895,9 @@ void ScTextWnd::StopEditEngine() if (pScMod->IsEditMode()) pScMod->SetInputMode(SC_INPUT_TABLE); - SFX_BINDINGS().Invalidate( SID_ATTR_INSERT ); + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); if (bSelection) Invalidate(); // damit Selektion nicht stehenbleibt @@ -1208,7 +1213,7 @@ void ScPosWnd::DoEnter() //! new method at ScModule to query if function autopilot is open SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) ) - SFX_DISPATCHER().Execute( SID_OPENDLG_FUNCTION, + pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); } else @@ -1224,7 +1229,9 @@ void ScPosWnd::DoEnter() // Position (Zelle oder Namen) setzen SfxStringItem aPosItem( SID_CURRENTCELL, aText ); SfxBoolItem aUnmarkItem( FN_PARAM_1, TRUE ); // Selektion aufheben - SFX_DISPATCHER().Execute( SID_CURRENTCELL, + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if ( pViewFrm ) + pViewFrm->GetDispatcher()->Execute( SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aPosItem, &aUnmarkItem, 0L ); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 201a3d53a..98433ab12 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scmod.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-09-22 07:57:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -311,7 +311,9 @@ void ScModule::FillStatusBar(StatusBar& rStatusBar) void ScModule::Execute( SfxRequest& rReq ) { - SfxBindings& rBindings = SFX_BINDINGS(); + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; + const SfxItemSet* pReqArgs = rReq.GetArgs(); USHORT nSlot = rReq.GetSlot(); @@ -459,7 +461,8 @@ void ScModule::Execute( SfxRequest& rReq ) aNewOpts.SetAutoComplete( bNew ); SetAppOptions( aNewOpts ); ScInputHandler::SetAutoComplete( bNew ); - rBindings.Invalidate( FID_AUTOCOMPLETE ); + if (pBindings) + pBindings->Invalidate( FID_AUTOCOMPLETE ); rReq.Done(); } break; @@ -470,7 +473,8 @@ void ScModule::Execute( SfxRequest& rReq ) BOOL bNew = !aNewOpts.GetDetectiveAuto(); aNewOpts.SetDetectiveAuto( bNew ); SetAppOptions( aNewOpts ); - rBindings.Invalidate( SID_DETECTIVE_AUTO ); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_AUTO ); rReq.Done(); } break; @@ -485,12 +489,15 @@ void ScModule::Execute( SfxRequest& rReq ) aNewOpts.SetStatusFunc( rItem.GetValue() ); SetAppOptions( aNewOpts ); - rBindings.Invalidate( SID_TABLE_CELL ); - rBindings.Update( SID_TABLE_CELL ); // sofort + if (pBindings) + { + pBindings->Invalidate( SID_TABLE_CELL ); + pBindings->Update( SID_TABLE_CELL ); // sofort - rBindings.Invalidate( SID_PSZ_FUNCTION ); - rBindings.Update( SID_PSZ_FUNCTION ); - // falls Menue gleich wieder aufgeklappt wird + pBindings->Invalidate( SID_PSZ_FUNCTION ); + pBindings->Update( SID_PSZ_FUNCTION ); + // falls Menue gleich wieder aufgeklappt wird + } } break; @@ -861,7 +868,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) //-------------------------------------------------------------- - SfxBindings& rBindings = SFX_BINDINGS(); + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; + ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL; @@ -919,7 +928,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pViewSh->UpdateAnchorHandles(); } SetViewOptions( rNewOpt ); - rBindings.Invalidate(SID_HELPLINES_MOVE); + if (pBindings) + pBindings->Invalidate(SID_HELPLINES_MOVE); } //============================================ @@ -949,8 +959,11 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) ScViewOptions aNewViewOpt ( GetViewOptions() ); aNewViewOpt.SetGridOptions( aNewGridOpt ); SetViewOptions( aNewViewOpt ); - rBindings.Invalidate(SID_GRID_VISIBLE); - rBindings.Invalidate(SID_GRID_USE); + if (pBindings) + { + pBindings->Invalidate(SID_GRID_VISIBLE); + pBindings->Invalidate(SID_GRID_USE); + } } // @@ -1098,7 +1111,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( pViewSh ) pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags - rBindings.Invalidate( SID_AUTOSPELL_CHECK ); + if (pBindings) + pBindings->Invalidate( SID_AUTOSPELL_CHECK ); } //============================================ @@ -1171,7 +1185,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) WaitObject aWait( pDocSh->GetDialogParent() ); pDoc->CalcAll(); pViewSh->UpdateCharts( TRUE ); - rBindings.Invalidate( SID_ATTR_SIZE ); //SvxPosSize-StatusControl-Update + if (pBindings) + pBindings->Invalidate( SID_ATTR_SIZE ); //SvxPosSize-StatusControl-Update } if ( pViewSh && bUpdateMarks ) @@ -1187,8 +1202,11 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pViewSh->PaintLeft(); pViewSh->PaintExtras(); pViewSh->InvalidateBorder(); - rBindings.Invalidate( FID_TOGGLEHEADERS ); // -> Checks im Menue - rBindings.Invalidate( FID_TOGGLESYNTAX ); + if (pBindings) + { + pBindings->Invalidate( FID_TOGGLEHEADERS ); // -> Checks im Menue + pBindings->Invalidate( FID_TOGGLESYNTAX ); + } } } @@ -1395,11 +1413,12 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis ) if(nCurRefDlgId==0 || (nId==nCurRefDlgId && !bVis)) { - SFX_BINDINGS().Update(); // sonst kommt der Sfx beim LockDispatcher durcheinander + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if ( pViewFrm ) + pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher - nCurRefDlgId = bVis ? nId : 0 ; // vor SetChildWindow + nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow - SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm ) pViewFrm->SetChildWindow( nId, bVis ); diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index f0aab82ca..5749a2653 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: condfrmt.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:46:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,10 +65,6 @@ #pragma hdrstop -#ifndef PCH -#include <segmentc.hxx> -#endif - #ifndef _SFXDISPATCH_HXX //autogen #include <sfx2/dispatch.hxx> #endif @@ -89,15 +85,11 @@ #undef _CONDFRMT_CXX -SEG_EOFGLOBALS() - - //============================================================================ // class ScConditionalFormat //---------------------------------------------------------------------------- // Konstruktor -#pragma SEG_FUNCDEF(condfrmt_01) ScConditionalFormatDlg::ScConditionalFormatDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -347,7 +339,6 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( //---------------------------------------------------------------------------- // Destruktor -#pragma SEG_FUNCDEF(condfrmt_0d) __EXPORT ScConditionalFormatDlg::~ScConditionalFormatDlg() { @@ -355,7 +346,6 @@ __EXPORT ScConditionalFormatDlg::~ScConditionalFormatDlg() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(condfrmt_0e) void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) { @@ -378,7 +368,6 @@ void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDoc } //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(condfrmt_15) void ScConditionalFormatDlg::AddRefEntry() { @@ -395,7 +384,6 @@ void ScConditionalFormatDlg::AddRefEntry() } //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(condfrmt_0f) BOOL ScConditionalFormatDlg::IsRefInputMode() { @@ -404,7 +392,6 @@ BOOL ScConditionalFormatDlg::IsRefInputMode() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(condfrmt_10) void ScConditionalFormatDlg::SetActive() { @@ -422,7 +409,6 @@ void ScConditionalFormatDlg::SetActive() //---------------------------------------------------------------------------- // Holt die ausgewaehlte bedingte Formatierung ab -#pragma SEG_FUNCDEF(condfrmt_11) void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt ) { @@ -482,7 +468,6 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt //---------------------------------------------------------------------------- // Zerstoert den Dialog -#pragma SEG_FUNCDEF(condfrmt_03) BOOL ScConditionalFormatDlg::Close() { @@ -495,7 +480,6 @@ BOOL ScConditionalFormatDlg::Close() //---------------------------------------------------------------------------- // Enabled/Disabled Condition1-Controls -#pragma SEG_FUNCDEF(condfrmt_04) IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG ) { @@ -517,7 +501,6 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -#pragma SEG_FUNCDEF(condfrmt_05) IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG ) { @@ -546,7 +529,6 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -#pragma SEG_FUNCDEF(condfrmt_06) IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG ) { @@ -578,7 +560,6 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Enabled/Disabled Condition2-Controls -#pragma SEG_FUNCDEF(condfrmt_07) IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG ) { @@ -600,7 +581,6 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -#pragma SEG_FUNCDEF(condfrmt_08) IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG ) { @@ -629,7 +609,6 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -#pragma SEG_FUNCDEF(condfrmt_09) IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG ) { @@ -661,7 +640,6 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Enabled/Disabled Condition3-Controls -#pragma SEG_FUNCDEF(condfrmt_0a) IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG ) { @@ -683,7 +661,6 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -#pragma SEG_FUNCDEF(condfrmt_0b) IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG ) { @@ -712,7 +689,6 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -#pragma SEG_FUNCDEF(condfrmt_0c) IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG ) { @@ -743,7 +719,6 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(condfrmt_12) IMPL_LINK( ScConditionalFormatDlg, EdGetFocusHdl, ScRefEdit*, pEd ) { @@ -756,7 +731,6 @@ IMPL_LINK( ScConditionalFormatDlg, EdGetFocusHdl, ScRefEdit*, pEd ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(condfrmt_13) IMPL_LINK( ScConditionalFormatDlg, EdLoseFocusHdl, ScRefEdit*, pEd ) { @@ -767,7 +741,6 @@ IMPL_LINK( ScConditionalFormatDlg, EdLoseFocusHdl, ScRefEdit*, pEd ) //---------------------------------------------------------------------------- // [OK], [Cancel] -#pragma SEG_FUNCDEF(condfrmt_14) IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn ) { @@ -779,7 +752,7 @@ IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn ) SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( FID_CONDITIONAL_FORMAT, + GetBindings().GetDispatcher()->Execute( FID_CONDITIONAL_FORMAT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); Close(); @@ -791,77 +764,3 @@ IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn ) } -/***************************************************************************** - - Source Code Control System - History - - $Log: not supported by cvs2svn $ - Revision 1.20 2000/09/17 14:08:55 willem.vandorp - OpenOffice header added. - - Revision 1.19 2000/08/31 16:38:19 willem.vandorp - Header and footer replaced - - Revision 1.18 2000/04/17 13:29:42 nn - unicode changes - - Revision 1.17 2000/01/17 19:23:39 nn - #67336# SwitchToDocument - - Revision 1.16 1999/06/09 16:08:20 NN - Sfx-appwin removed - - - Rev 1.15 09 Jun 1999 18:08:20 NN - Sfx-appwin removed - - Rev 1.14 26 May 1999 14:29:02 NN - #66123# Name fuer Standard-Vorlage kommt aus Resource - - Rev 1.13 10 Dec 1998 20:40:42 ANK - #51738# Umstellung auf ScRefEdit zum Anzeigen von Referenzen - - Rev 1.12 06 Aug 1998 21:20:52 ANK - #54702# Enablen/Disablen der Applikation nur noch in ScAnyRefDlg - - Rev 1.11 16 Sep 1997 19:37:48 NN - #42538# bedingte Formatierung/Gueltigkeit mit relativen Referenzen - - Rev 1.10 04 Sep 1997 20:32:54 RG - change header - - Rev 1.9 03 Sep 1997 15:11:14 RG - change header - - Rev 1.8 28 Nov 1996 18:49:40 NN - mehrfache und 3D-Referenzen zulassen - - Rev 1.7 13 Nov 1996 20:12:04 NN - #33143# AutoHide nur bei Bereichsreferenz - - Rev 1.6 05 Nov 1996 21:15:46 NN - #32969# Focus initial auf ersten Wert - - Rev 1.5 05 Nov 1996 14:51:10 NN - ScApplication gibts nicht mehr - - Rev 1.4 01 Nov 1996 06:30:38 MH - chg: includes, defines - - Rev 1.3 29 Oct 1996 14:04:36 NN - ueberall ScResId statt ResId - - Rev 1.2 22 Oct 1996 17:58:14 RJ - Buttons fuer Referenzeingabe - - Rev 1.1 16 Oct 1996 16:33:16 RJ - Dialog fuer bedingte Formatierung mit Leben gefuellt - - Rev 1.0 14 Oct 1996 15:09:42 SOH - Initial revision. - - -*****************************************************************************/ - -#pragma SEG_EOFMODULE - diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index ff4ed245d..65e729cd7 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tbinsert.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:53 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:47:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,10 +69,6 @@ #pragma hdrstop -#ifndef PCH -#include <segmentc.hxx> -#endif - // INCLUDE --------------------------------------------------------------- #include <tools/shl.hxx> @@ -87,9 +83,7 @@ #include "scresid.hxx" #include "sc.hrc" -// STATIC DATA ----------------------------------------------------------- - -SEG_EOFGLOBALS() +// ----------------------------------------------------------------------- SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); @@ -99,22 +93,16 @@ SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); // //------------------------------------------------------------------ -#pragma SEG_FUNCDEF(tbinsert_01) - ScTbxInsertCtrl::ScTbxInsertCtrl( USHORT nId, ToolBox& rTbx, SfxBindings& rBind ) : SfxToolBoxControl( nId, rTbx, rBind ), nLastSlotId(0) { } -#pragma SEG_FUNCDEF(tbinsert_02) - __EXPORT ScTbxInsertCtrl::~ScTbxInsertCtrl() { } -#pragma SEG_FUNCDEF(tbinsert_03) - void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -133,8 +121,6 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT nSID, SfxItemState eState, } } -#pragma SEG_FUNCDEF(tbinsert_04) - SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow() { USHORT nWinResId, nTbxResId; @@ -164,19 +150,15 @@ SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow() return pWin; } -#pragma SEG_FUNCDEF(tbinsert_05) - SfxPopupWindowType __EXPORT ScTbxInsertCtrl::GetPopupWindowType() const { return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK; } -#pragma SEG_FUNCDEF(tbinsert_06) - void __EXPORT ScTbxInsertCtrl::Select( BOOL bMod1 ) { if (nLastSlotId) - SFX_DISPATCHER().Execute(nLastSlotId); + GetBindings().GetDispatcher()->Execute(nLastSlotId); } //------------------------------------------------------------------ @@ -185,8 +167,6 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL bMod1 ) // //------------------------------------------------------------------ -#pragma SEG_FUNCDEF(tbinsert_07) - ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign, const ResId& rRIdWin, const ResId& rRIdTbx, SfxBindings& rBindings ) : @@ -210,14 +190,10 @@ ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign, aTbx.GetToolBox().SetClickHdl( LINK(this, ScTbxInsertPopup, TbxClickHdl)); } -#pragma SEG_FUNCDEF(tbinsert_08) - ScTbxInsertPopup::~ScTbxInsertPopup() { } -#pragma SEG_FUNCDEF(tbinsert_09) - SfxPopupWindow* __EXPORT ScTbxInsertPopup::Clone() const { return new ScTbxInsertPopup( GetId(), aTbx.GetToolBox().GetAlign(), @@ -225,33 +201,28 @@ SfxPopupWindow* __EXPORT ScTbxInsertPopup::Clone() const (SfxBindings&) GetBindings() ); } -#pragma SEG_FUNCDEF(tbinsert_0a) - void ScTbxInsertPopup::StartSelection() { aTbx.GetToolBox().StartSelection(); } -#pragma SEG_FUNCDEF(tbinsert_0b) - IMPL_LINK(ScTbxInsertPopup, TbxSelectHdl, ToolBox*, pBox) { EndPopupMode(); USHORT nLastSlotId = pBox->GetCurItemId(); SfxUInt16Item aItem( GetId(), nLastSlotId ); - SFX_DISPATCHER().Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L ); - SFX_DISPATCHER().Execute( nLastSlotId, SFX_CALLMODE_ASYNCHRON ); + SfxDispatcher* pDisp = GetBindings().GetDispatcher(); + pDisp->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L ); + pDisp->Execute( nLastSlotId, SFX_CALLMODE_ASYNCHRON ); return 0; } -#pragma SEG_FUNCDEF(tbinsert_0c) - IMPL_LINK(ScTbxInsertPopup, TbxClickHdl, ToolBox*, pBox) { USHORT nLastSlotId = pBox->GetCurItemId(); SfxUInt16Item aItem( GetId(), nLastSlotId ); - SFX_DISPATCHER().Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L ); + GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L ); if(aTbxClickHdl.IsSet()) aTbxClickHdl.Call(pBox); return 0; @@ -263,60 +234,5 @@ void __EXPORT ScTbxInsertPopup::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.15 2000/09/17 14:08:55 willem.vandorp - OpenOffice header added. - - Revision 1.14 2000/08/31 16:38:19 willem.vandorp - Header and footer replaced - - Revision 1.13 2000/05/24 17:40:43 er - NOOLDSV - - Revision 1.12 2000/05/23 13:07:55 hr - prevent conflict between STLPORT and Workshop - - Revision 1.11 1999/04/07 11:52:12 ANK - #64357# Asynchron die Slots ausfuehren - - - Rev 1.10 07 Apr 1999 13:52:12 ANK - #64357# Asynchron die Slots ausfuehren - - Rev 1.9 24 Jul 1998 16:05:20 NN - #51812# bei GetImage am ImageManager das Module angeben - - Rev 1.8 10 Mar 1998 14:42:54 NN - ToolBoxManager mit GetBindings() statt rBindings initialisieren - - Rev 1.7 05 Dec 1997 20:03:38 ANK - Includes geaendert - - Rev 1.6 19 Sep 1997 12:12:20 NN - EndPopupMode / EndSelection rufen - - Rev 1.5 23 Mar 1997 22:40:06 NN - Alignment im ctor des PopupWindow uebergeben - - Rev 1.4 23 Mar 1997 17:52:28 NN - Clone nicht mit altem ToolBoxControl (sonst GPF nach Praesentation) - - Rev 1.3 14 Nov 1996 09:46:10 NF - includes... - - Rev 1.2 29 Oct 1996 14:04:50 NN - ueberall ScResId statt ResId - - Rev 1.1 21 Oct 1996 15:32:20 NN - Ausrichtung mit IsHorizontal statt eAlign abfragen - - Rev 1.0 16 Oct 1996 16:48:30 NN - Initial revision. - -------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 87a1f24eb..322377074 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: consdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:48:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -489,7 +489,8 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, p ) SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( SID_CONSOLIDATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + GetBindings().GetDispatcher()->Execute( SID_CONSOLIDATE, + SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); Close(); } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 5da21c15e..8b7892d46 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filtdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:48:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,10 +67,6 @@ #pragma hdrstop -#ifndef PCH -#include <segmentc.hxx> -#endif - // INCLUDE ------------------------------------------------------------------- #include <rangelst.hxx> #ifndef _SFXDISPATCH_HXX //autogen @@ -106,14 +102,11 @@ #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() -SEG_EOFGLOBALS() - //============================================================================ // class ScFilterDlg //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_01) ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -168,7 +161,6 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_02) __EXPORT ScFilterDlg::~ScFilterDlg() { @@ -185,7 +177,6 @@ __EXPORT ScFilterDlg::~ScFilterDlg() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_03) void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) { @@ -330,7 +321,6 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_04) BOOL __EXPORT ScFilterDlg::Close() { @@ -342,8 +332,6 @@ BOOL __EXPORT ScFilterDlg::Close() // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. -#pragma SEG_FUNCDEF(filtdlg_05) - void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) { if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus @@ -358,7 +346,6 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_06) void ScFilterDlg::SetActive() { @@ -376,8 +363,6 @@ void ScFilterDlg::SetActive() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_07) - void ScFilterDlg::FillFieldLists() { aLbField1.Clear(); @@ -423,7 +408,6 @@ void ScFilterDlg::FillFieldLists() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_08) void ScFilterDlg::UpdateValueList( USHORT nList ) { @@ -496,8 +480,6 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) UpdateHdrInValueList( nList ); } -#pragma SEG_FUNCDEF(filtdlg_13) - void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) { //! GetText / SetText ?? @@ -545,7 +527,6 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) } //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_10) void ScFilterDlg::ClearValueList( USHORT nList ) { @@ -561,7 +542,6 @@ void ScFilterDlg::ClearValueList( USHORT nList ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_09) USHORT ScFilterDlg::GetFieldSelPos( USHORT nField ) { @@ -572,7 +552,6 @@ USHORT ScFilterDlg::GetFieldSelPos( USHORT nField ) } //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_0a) ScQueryItem* ScFilterDlg::GetOutputItem() { @@ -680,7 +659,6 @@ ScQueryItem* ScFilterDlg::GetOutputItem() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_11) BOOL ScFilterDlg::IsRefInputMode() const { @@ -691,7 +669,6 @@ BOOL ScFilterDlg::IsRefInputMode() const //---------------------------------------------------------------------------- // Handler: // ======== -#pragma SEG_FUNCDEF(filtdlg_0b) IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { @@ -716,7 +693,8 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( FID_FILTER_OK, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + GetBindings().GetDispatcher()->Execute( FID_FILTER_OK, + SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, GetOutputItem(), 0L, 0L ); Close(); } @@ -731,7 +709,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_0c) IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, pBtn ) { @@ -749,7 +726,6 @@ IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, pBtn ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_0d) IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) { @@ -785,7 +761,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_0e) IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { @@ -880,7 +855,6 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_0f) IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { @@ -920,7 +894,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(filtdlg_12) IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { @@ -948,215 +921,3 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) } -/*---------------------------------------------------------------------------- - - $Log: not supported by cvs2svn $ - Revision 1.65 2000/09/17 14:08:56 willem.vandorp - OpenOffice header added. - - Revision 1.64 2000/08/31 16:38:20 willem.vandorp - Header and footer replaced - - Revision 1.63 2000/05/25 10:20:06 er - NOOLDSV - - Revision 1.62 2000/04/14 17:38:02 nn - unicode changes - - Revision 1.61 2000/02/11 12:23:25 hr - #70473# changes for unicode ( patched by automated patchtool ) - - Revision 1.60 2000/01/17 19:21:28 nn - #67336# SwitchToDocument - - Revision 1.59 1999/06/09 16:09:04 NN - Sfx-appwin removed - - - Rev 1.58 09 Jun 1999 18:09:04 NN - Sfx-appwin removed - - Rev 1.57 10 Dec 1998 20:09:18 ANK - #51738# Umstellung auf ScRefEdit zum Anzeigen von Referenzen - - Rev 1.56 14 Sep 1998 20:58:06 ANK - #55978# Ausgabebereich disablen bei Redlining - - Rev 1.55 02 Sep 1998 12:48:32 TJ - include - - Rev 1.54 12 Aug 1998 19:47:32 ANK - #54702# IsRefInputMode ueberarbeitet - - Rev 1.53 06 Aug 1998 21:18:30 ANK - #54702# Enablen/Disablen der Applikation nur noch in ScAnyRefDlg - - Rev 1.52 15 Mar 1998 14:22:18 NN - #48339# App-Fenster disablen mit bChild=FALSE - - Rev 1.51 02 Dec 1997 13:08:12 TJ - include - - Rev 1.50 30 Sep 1997 13:07:42 TJ - include - - Rev 1.49 03 Sep 1997 15:18:20 RG - change header - - Rev 1.48 15 Feb 1997 17:36:26 NN - Checkbox 'persistent' fuer Ausgabe-Bereich - - Rev 1.47 14 Feb 1997 19:14:28 ER - aktuelle Spalte nur im ersten Eintrag - - Rev 1.46 14 Feb 1997 12:59:30 ER - selektierte Spalte statt ersetm leeren Feldnamen - - Rev 1.45 06 Dec 1996 14:11:46 NN - #33824# Header umschalten: nur betroffenen Eintrag loeschen/einfuegen - - Rev 1.44 29 Nov 1996 18:57:30 NN - Gross-/Kleinschreibung auch in Werte-Liste - - Rev 1.43 27 Nov 1996 14:18:08 NN - #31076# Entry-Listen pro Spalte nur einmal holen - - Rev 1.42 15 Nov 1996 17:22:44 NN - #33345# Spaltenkoepfe-Button auswerten - - Rev 1.41 13 Nov 1996 20:11:16 NN - #33143# AutoHide nur bei Bereichsreferenz - - Rev 1.40 13 Nov 1996 11:33:20 NN - ScQueryParam mit dynamischen Eintraegen - - Rev 1.39 05 Nov 1996 14:49:58 NN - ScApplication gibts nicht mehr - - Rev 1.38 29 Oct 1996 14:03:36 NN - ueberall ScResId statt ResId - - Rev 1.37 22 Oct 1996 15:32:02 RJ - Buttons fuer Referenzeingabe - - Rev 1.36 04 Oct 1996 17:22:46 RJ - Einklappen des Fensters bei Referenzeingabe - - Rev 1.35 27 Jun 1996 11:49:28 NN - Dispatcher::Execute Umstellung - - Rev 1.34 05 Jun 1996 19:19:10 NN - kein Show im ctor (Position wird von aussen gesetzt) - - Rev 1.33 26 Apr 1996 12:02:40 NN - SfxModelessDialog statt ModelessDialog - - Rev 1.32 25 Apr 1996 18:08:36 NN - SetReference aufgeteilt in SetReference und AddRefEntry - - Rev 1.31 18 Jan 1996 11:44:42 MO - #24232# leer/nicht-leer-Behandlung, neuer Link - - Rev 1.30 27 Nov 1995 13:42:12 MO - RangeUtil/Area/Tripel gegen Address/Range ersetzt - - Rev 1.29 09 Nov 1995 10:20:12 JN - weitere Verbesseungen Modeless Dialoge - - Rev 1.28 08 Nov 1995 13:05:48 MO - 301-Aenderungen - - Rev 1.27 08 Nov 1995 10:45:48 JN - Umstellung auf SfxChildWindow - - Rev 1.26 26 Oct 1995 11:34:24 MO - Default-Button-Bit bei Error/MessBoxen - - Rev 1.25 18 Sep 1995 10:07:48 MO - bRefInput-Kontrolle ueber Timer - - Rev 1.24 14 Jul 1995 13:55:18 MO - 3. ValueList im Init fuellen (BugId: 15364) - - Rev 1.23 12 Jul 1995 16:57:48 MO - TypedStrColloction fuer Wertklisten - - Rev 1.22 07 Jul 1995 17:36:36 MO - Bugfix: Auswertung Connect-Parameter - - Rev 1.21 08 Jun 1995 16:22:06 MO - leer/nicht-leer Filter - - Rev 1.20 25 Apr 1995 11:40:08 MO - leer/nicht-leer Feldwerte - - Rev 1.19 24 Apr 1995 12:49:46 MO - Dispatcher Unlock vor Execute - - Rev 1.18 18 Apr 1995 10:02:34 MO - Referenzeingabe mit Maus ueberarbeitet - - Rev 1.17 02 Mar 1995 16:20:20 MO - InfoBoxen mit Rsc-Strings - - Rev 1.16 26 Feb 1995 10:26:58 TRI - basicide.hxx included - - Rev 1.15 22 Feb 1995 17:07:20 MO - * Fehler bei der Rueckgabe der Verknuefungsoperationen behoben - - - Rev 1.14 08 Feb 1995 12:55:02 MO - * Dispatcher-Execute: 0L angehaengt (sonst uneindeutig) - - Rev 1.13 03 Feb 1995 12:43:02 MO - * Ctor: Show() - - - Rev 1.12 27 Jan 1995 16:14:44 MO - * Umstellung aus Slot-IDs - - Rev 1.11 26 Jan 1995 19:00:18 TRI - __EXPORT bei virtuellen Methoden eingebaut - - Rev 1.10 25 Jan 1995 18:53:56 MO - * Auswertung der Connect-ListBoxen korrigiert - - Rev 1.9 25 Jan 1995 12:39:00 MO - * Einzelne Zellposition als Kopierziel (SetReferenz und Ueberpruefungen) - - Rev 1.8 19 Jan 1995 16:47:48 TRI - __EXPORT vor verschiedene LinkHandler gesetzt - - Rev 1.7 18 Jan 1995 13:56:26 TRI - Pragmas zur Segementierung eingebaut - - Rev 1.6 17 Jan 1995 11:57:34 MO - CheckBoxHdl fuer aBtnHeader wieder aktiviert - - Rev 1.5 16 Jan 1995 14:24:54 MO - Fehlerbehandlung bei ungueltigen Bereichsnamen im EndDlg-Handler - - Rev 1.4 13 Jan 1995 17:30:34 MO - Special-Dialog ausgegliedert - - Rev 1.3 13 Jan 1995 10:22:14 MO - fuer Spezialdialog verwendbare Resource-Handler nach foptmgr verschoben - - Rev 1.2 12 Jan 1995 14:49:52 MO - * Erkennung von DB-Bereichen - * Gegenseitige Aktualisierung der CopyArea-ListBox/Edit - * Einlesen von RangeNames mit RT_ABSAREA - - - Rev 1.1 09 Jan 1995 11:14:52 MO - Parameter werden jetzt per SfxItem (ScQueryItem) uebergeben, - bzw. mit GetOutputItemSet() zurueckgegeben. - - Rev 1.0 05 Jan 1995 12:44:12 MO - Initial revision. - -----------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index c97e033f7..714644f71 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pvlaydlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:48:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1226,7 +1226,8 @@ IMPL_LINK( ScPivotLayoutDlg, OkHdl, OKButton *, EMPTYARG ) SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( SID_PIVOT_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + GetBindings().GetDispatcher()->Execute( SID_PIVOT_TABLE, + SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); Close(); } diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 4494db390..68e1f52e7 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfiltdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:48:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,10 +67,6 @@ #pragma hdrstop -#ifndef PCH -#include <segmentc.hxx> -#endif - // INCLUDE ------------------------------------------------------------------- #ifndef _SFXDISPATCH_HXX //autogen @@ -103,14 +99,11 @@ #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK),\ ScGlobal::GetRscString(rid) ).Execute() -SEG_EOFGLOBALS() - //============================================================================ // class ScSpecialFilterDialog //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_01) ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -149,7 +142,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_02) __EXPORT ScSpecialFilterDlg::~ScSpecialFilterDlg() { @@ -171,7 +163,6 @@ __EXPORT ScSpecialFilterDlg::~ScSpecialFilterDlg() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_03) void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { @@ -273,7 +264,6 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_04) BOOL __EXPORT ScSpecialFilterDlg::Close() { @@ -285,8 +275,6 @@ BOOL __EXPORT ScSpecialFilterDlg::Close() // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. -#pragma SEG_FUNCDEF(sfiltdlg_05) - void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) { if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus @@ -307,7 +295,6 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_06) void ScSpecialFilterDlg::SetActive() { @@ -333,7 +320,6 @@ void ScSpecialFilterDlg::SetActive() //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_08) ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) @@ -347,7 +333,6 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_0e) BOOL ScSpecialFilterDlg::IsRefInputMode() const { @@ -358,7 +343,6 @@ BOOL ScSpecialFilterDlg::IsRefInputMode() const //---------------------------------------------------------------------------- // Handler: // ======== -#pragma SEG_FUNCDEF(sfiltdlg_09) IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { @@ -468,7 +452,8 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( FID_FILTER_OK, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + GetBindings().GetDispatcher()->Execute( FID_FILTER_OK, + SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, GetOutputItem( theOutParam, theFilterArea ), 0L, 0L ); Close(); } @@ -488,7 +473,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_0b) IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { @@ -529,7 +513,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_0c) IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { @@ -549,7 +532,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) //---------------------------------------------------------------------------- -#pragma SEG_FUNCDEF(sfiltdlg_0d) IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, ScRefEdit*, pEd ) { @@ -587,157 +569,3 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, ScRefEdit*, pEd ) } -/*---------------------------------------------------------------------------- - - $Log: not supported by cvs2svn $ - Revision 1.47 2000/09/17 14:08:57 willem.vandorp - OpenOffice header added. - - Revision 1.46 2000/08/31 16:38:21 willem.vandorp - Header and footer replaced - - Revision 1.45 2000/06/06 17:37:28 nn - SpecialFilterDlg: source range in item - - Revision 1.44 2000/04/14 17:38:03 nn - unicode changes - - Revision 1.43 2000/01/17 19:21:36 nn - #67336# SwitchToDocument - - Revision 1.42 1999/06/09 16:09:04 NN - Sfx-appwin removed - - - Rev 1.41 09 Jun 1999 18:09:04 NN - Sfx-appwin removed - - Rev 1.40 10 Dec 1998 20:16:40 ANK - #51738# Umstellung auf ScRefEdit zum Anzeigen von Referenzen - - Rev 1.39 14 Sep 1998 20:58:06 ANK - #55978# Ausgabebereich disablen bei Redlining - - Rev 1.38 12 Aug 1998 19:47:34 ANK - #54702# IsRefInputMode ueberarbeitet - - Rev 1.37 06 Aug 1998 21:18:30 ANK - #54702# Enablen/Disablen der Applikation nur noch in ScAnyRefDlg - - Rev 1.36 15 Mar 1998 14:23:32 NN - App-Fenster disablen mit bChild=FALSE - - Rev 1.35 30 Sep 1997 13:08:58 TJ - include - - Rev 1.34 03 Sep 1997 15:18:54 RG - change header - - Rev 1.33 11 Apr 1997 15:50:42 NN - #35206# Spaltenkoepfe fuer Spezialfilter disabled - - Rev 1.32 15 Feb 1997 17:36:30 NN - Checkbox 'persistent' fuer Ausgabe-Bereich - - Rev 1.31 13 Nov 1996 20:11:26 NN - #33143# AutoHide nur bei Bereichsreferenz - - Rev 1.30 13 Nov 1996 11:33:22 NN - ScQueryParam mit dynamischen Eintraegen - - Rev 1.29 05 Nov 1996 14:50:16 NN - ScApplication gibts nicht mehr - - Rev 1.28 29 Oct 1996 14:03:56 NN - ueberall ScResId statt ResId - - Rev 1.27 22 Oct 1996 15:32:18 RJ - Buttons fuer Referenzeingabe - - Rev 1.26 04 Oct 1996 17:23:12 RJ - Einklappen des Fensters bei Referenzeingabe - - Rev 1.25 27 Jun 1996 11:49:30 NN - Dispatcher::Execute Umstellung - - Rev 1.24 05 Jun 1996 19:19:30 NN - kein Show im ctor (Position wird von aussen gesetzt) - - Rev 1.23 26 Apr 1996 12:02:42 NN - SfxModelessDialog statt ModelessDialog - - Rev 1.22 26 Apr 1996 10:52:40 NN - neues SetReference auch fuer SpecialFilterDlg - - Rev 1.21 18 Jan 1996 11:45:32 MO - unbennant-Eintrag wieder sichtbar, neuer Link - - Rev 1.20 27 Nov 1995 13:42:12 MO - RangeUtil/Area/Tripel gegen Address/Range ersetzt - - Rev 1.19 09 Nov 1995 10:20:12 JN - weitere Verbesseungen Modeless Dialoge - - Rev 1.18 08 Nov 1995 13:06:24 MO - 301-Aenderungen - - Rev 1.17 08 Nov 1995 10:45:46 JN - Umstellung auf SfxChildWindow - - Rev 1.16 18 Sep 1995 10:07:54 MO - bRefInput-Kontrolle ueber Timer - - Rev 1.15 24 Jul 1995 14:13:28 MO - EXPORT - - Rev 1.14 24 Apr 1995 12:49:36 MO - Dispatcher Unlock vor Execute - - Rev 1.13 18 Apr 1995 10:02:48 MO - Referenzeingabe mit Maus ueberarbeitet - - Rev 1.12 02 Mar 1995 16:20:26 MO - InfoBoxen mit Rsc-Strings - - Rev 1.11 08 Feb 1995 12:56:10 MO - * Dispatcher-Execute: 0L angehaengt (sonst uneindeutig) - - Rev 1.10 08 Feb 1995 10:27:26 MO - * Mac-Anpassungen - - - Rev 1.9 03 Feb 1995 12:42:44 MO - * Ctor: Show - - Rev 1.8 27 Jan 1995 16:15:54 MO - * Umstellung auf Slot-IDs - - Rev 1.7 26 Jan 1995 19:02:40 TRI - __EXPORT bei virtuellen Methoden eingebaut - - Rev 1.6 25 Jan 1995 18:54:26 MO - * Mauseingabe von Bereichen im Filter-Edit wieder moeglich - - Rev 1.5 25 Jan 1995 12:55:50 MO - * Einzelne Zellposition als Kopierziel (SetReferenz und Ueberpruefungen) - - Rev 1.4 19 Jan 1995 17:08:02 TRI - __EXPORT vor verschiedene LinkHandler gesetzt - - Rev 1.3 18 Jan 1995 13:56:26 TRI - Pragmas zur Segementierung eingebaut - - Rev 1.2 17 Jan 1995 11:59:40 MO - Erzeugen des OutPut-Items in EndDlgHdl/GetOutputItem - - Rev 1.1 16 Jan 1995 14:26:14 MO - Einlesen von Filterbereichsnamen mit Selektion/Modify - Fehlerbehandlung von ungueltigen Bereichsnamen im EndDlg-Handler - - Rev 1.0 13 Jan 1995 17:32:24 MO - Initial revision. - -----------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 3af1ee8bb..a1ff1045b 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfunc.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -210,7 +210,9 @@ BOOL ScDocFunc::DetectiveAddPred(const ScAddress& rPos) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( SID_DETECTIVE_REFRESH ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_REFRESH ); } else delete pUndo; @@ -241,7 +243,9 @@ BOOL ScDocFunc::DetectiveDelPred(const ScAddress& rPos) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( SID_DETECTIVE_REFRESH ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_REFRESH ); } else delete pUndo; @@ -270,7 +274,9 @@ BOOL ScDocFunc::DetectiveAddSucc(const ScAddress& rPos) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( SID_DETECTIVE_REFRESH ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_REFRESH ); } else delete pUndo; @@ -301,7 +307,9 @@ BOOL ScDocFunc::DetectiveDelSucc(const ScAddress& rPos) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( SID_DETECTIVE_REFRESH ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_REFRESH ); } else delete pUndo; @@ -330,7 +338,9 @@ BOOL ScDocFunc::DetectiveAddError(const ScAddress& rPos) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( SID_DETECTIVE_REFRESH ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_REFRESH ); } else delete pUndo; @@ -397,7 +407,9 @@ BOOL ScDocFunc::DetectiveDelAll(USHORT nTab) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDetective( &rDocShell, pUndo, NULL, pUndoList ) ); aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( SID_DETECTIVE_REFRESH ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DETECTIVE_REFRESH ); } else delete pUndo; @@ -1845,7 +1857,9 @@ BOOL ScDocFunc::DeleteTable( USHORT nTab, BOOL bRecord, BOOL bApi ) if (bWasLinked) { rDocShell.UpdateLinks(); // Link-Manager updaten - SFX_BINDINGS().Invalidate(SID_LINKS); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate(SID_LINKS); } rDocShell.PostPaintExtras(); @@ -2142,7 +2156,7 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos, ScDocument* pDoc = rDocShell.GetDocument(); USHORT nTab = rPos.Tab(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings* pBindings = rDocShell.GetViewBindings(); USHORT nPos = bColumn ? rPos.Col() : rPos.Row(); if (nPos == 0) @@ -2166,16 +2180,23 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos, if (bColumn) { rDocShell.PostPaint( nPos-1, 0, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID ); - rBindings.Invalidate( FID_INS_COLBRK ); - rBindings.Invalidate( FID_DEL_COLBRK ); + if (pBindings) + { + pBindings->Invalidate( FID_INS_COLBRK ); + pBindings->Invalidate( FID_DEL_COLBRK ); + } } else { rDocShell.PostPaint( 0, nPos-1, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID ); - rBindings.Invalidate( FID_INS_ROWBRK ); - rBindings.Invalidate( FID_DEL_ROWBRK ); + if (pBindings) + { + pBindings->Invalidate( FID_INS_ROWBRK ); + pBindings->Invalidate( FID_DEL_ROWBRK ); + } } - rBindings.Invalidate( FID_DEL_MANUALBREAKS ); + if (pBindings) + pBindings->Invalidate( FID_DEL_MANUALBREAKS ); if (bSetModified) aModificator.SetDocumentModified(); @@ -2190,7 +2211,7 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos, ScDocument* pDoc = rDocShell.GetDocument(); USHORT nTab = rPos.Tab(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings* pBindings = rDocShell.GetViewBindings(); USHORT nPos = bColumn ? rPos.Col() : rPos.Row(); BYTE nFlags = bColumn ? pDoc->GetColFlags( nPos, nTab ) : pDoc->GetRowFlags( nPos, nTab ); @@ -2211,16 +2232,23 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos, if (bColumn) { rDocShell.PostPaint( nPos-1, 0, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID ); - rBindings.Invalidate( FID_INS_COLBRK ); - rBindings.Invalidate( FID_DEL_COLBRK ); + if (pBindings) + { + pBindings->Invalidate( FID_INS_COLBRK ); + pBindings->Invalidate( FID_DEL_COLBRK ); + } } else { rDocShell.PostPaint( 0, nPos-1, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID ); - rBindings.Invalidate( FID_INS_ROWBRK ); - rBindings.Invalidate( FID_DEL_ROWBRK ); + if (pBindings) + { + pBindings->Invalidate( FID_INS_ROWBRK ); + pBindings->Invalidate( FID_DEL_ROWBRK ); + } } - rBindings.Invalidate( FID_DEL_MANUALBREAKS ); + if (pBindings) + pBindings->Invalidate( FID_DEL_MANUALBREAKS ); if (bSetModified) aModificator.SetDocumentModified(); @@ -2396,11 +2424,14 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp rDocShell.PostPaint( aMarkRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE ); aModificator.SetDocumentModified(); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_ALIGNLEFT ); // ChangeIndent setzt auf links - rBindings.Invalidate( SID_ALIGNRIGHT ); - rBindings.Invalidate( SID_ALIGNBLOCK ); - rBindings.Invalidate( SID_ALIGNCENTERHOR ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( SID_ALIGNLEFT ); // ChangeIndent setzt auf links + pBindings->Invalidate( SID_ALIGNRIGHT ); + pBindings->Invalidate( SID_ALIGNBLOCK ); + pBindings->Invalidate( SID_ALIGNCENTERHOR ); + } return TRUE; } @@ -3043,9 +3074,12 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, pDoc->SetDirty( rRange ); aModificator.SetDocumentModified(); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( FID_MERGE_ON ); - rBindings.Invalidate( FID_MERGE_OFF ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( FID_MERGE_ON ); + pBindings->Invalidate( FID_MERGE_OFF ); + } return TRUE; } @@ -3486,8 +3520,9 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, pLink->Update(); // kein SetInCreate -> Update ausfuehren pLink->SetDoInsert(TRUE); // Default = TRUE - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_LINKS ); + SfxBindings* pBindings = rDocShell.GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_LINKS ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 5155809ab..248ac76a1 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2640,8 +2640,12 @@ void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ ) if (bUpdate) { - SFX_BINDINGS().Invalidate( SID_SAVEDOC ); - SFX_BINDINGS().Invalidate( SID_DOC_MODIFIED ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( SID_SAVEDOC ); + pBindings->Invalidate( SID_DOC_MODIFIED ); + } } if (bIsModified) diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index abf90d007..8aac7d489 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,7 +177,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 4dc554d88..6703a54c8 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh4.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) // SID_SC_CELLS (Cells) - removed (old Basic) const SfxItemSet* pReqArgs = rReq.GetArgs(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings* pBindings = GetViewBindings(); USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) @@ -481,8 +481,11 @@ void ScDocShell::Execute( SfxRequest& rReq ) bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer Menue aDocument.SetAutoCalc( bNewVal ); SetDocumentModified(); - rBindings.Invalidate( FID_AUTO_CALC ); -// rBindings.Invalidate( FID_RECALC ); // jetzt immer enabled + if (pBindings) + { + pBindings->Invalidate( FID_AUTO_CALC ); +// pBindings->Invalidate( FID_RECALC ); // jetzt immer enabled + } rReq.Done(); } break; @@ -651,7 +654,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) } } // Slots invalidieren - rBindings.InvalidateAll(FALSE); + if (pBindings) + pBindings->InvalidateAll(FALSE); } } break; @@ -754,7 +758,9 @@ void ScDocShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) pViewFrm->ShowChildWindow(ScAcceptChgDlgWrapper::GetChildWindowId(),TRUE); //@51669 - SFX_BINDINGS().Invalidate(FID_CHG_ACCEPT); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + pBindings->Invalidate(FID_CHG_ACCEPT); rReq.SetReturnValue( SfxInt32Item( nSlot, 0 ) ); //! ??????? rReq.Done(); @@ -996,10 +1002,13 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) if (bExtended) { - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_STATUS_PAGESTYLE ); - rBindings.Invalidate( SID_STYLE_FAMILY4 ); - rBindings.Invalidate( FID_RESET_PRINTZOOM ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( SID_STATUS_PAGESTYLE ); + pBindings->Invalidate( SID_STYLE_FAMILY4 ); + pBindings->Invalidate( FID_RESET_PRINTZOOM ); + } } } } @@ -1033,8 +1042,9 @@ void ScDocShell::SetPrintZoom( USHORT nTab, USHORT nScale, USHORT nPages ) aPrintFunc.UpdatePages(); aModificator.SetDocumentModified(); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( FID_RESET_PRINTZOOM ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + pBindings->Invalidate( FID_RESET_PRINTZOOM ); } } @@ -1142,7 +1152,9 @@ void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi ) aModificator.SetDocumentModified(); - SFX_BINDINGS().Invalidate( FID_RESET_PRINTZOOM ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + pBindings->Invalidate( FID_RESET_PRINTZOOM ); } void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, @@ -1189,9 +1201,12 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, if ( aNewName != aOldName && aDocument.RenamePageStyleInUse( aOldName, aNewName ) ) { - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_STATUS_PAGESTYLE ); - rBindings.Invalidate( FID_RESET_PRINTZOOM ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( SID_STATUS_PAGESTYLE ); + pBindings->Invalidate( FID_RESET_PRINTZOOM ); + } } if ( pOutSet ) @@ -1942,6 +1957,16 @@ ScTabViewShell* ScDocShell::GetBestViewShell() return pViewSh; } +SfxBindings* ScDocShell::GetViewBindings() +{ + // used to invalidate slots after changes to this document + + SfxViewShell* pViewSh = GetBestViewShell(); + if (pViewSh) + return &pViewSh->GetViewFrame()->GetBindings(); + else + return NULL; +} //------------------------------------------------------------------ diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index b9829a8f7..029a056ca 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh5.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -805,7 +805,9 @@ void ScDocShell::ModifyScenario( USHORT nTab, const String& rName, const String& if ( rName != aOldName ) SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); - SFX_BINDINGS().Invalidate( SID_SELECT_SCENARIO ); + SfxBindings* pBindings = GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_SELECT_SCENARIO ); } USHORT ScDocShell::MakeScenario( USHORT nTab, const String& rName, const String& rComment, diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index ddf06a082..f2faf5e91 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olinefun.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,7 @@ // INCLUDE --------------------------------------------------------------- #include <vcl/sound.hxx> +#include <sfx2/bindings.hxx> #include "olinefun.hxx" @@ -75,11 +76,23 @@ #include "olinetab.hxx" #include "undodat.hxx" #include "globstr.hrc" +#include "sc.hrc" //======================================================================== -void lcl_InvalidateOutliner(); //! in dbfunc3 - hierher verschieben!!! +void lcl_InvalidateOutliner( SfxBindings* pBindings ) +{ + if ( pBindings ) + { + pBindings->Invalidate( SID_OUTLINE_SHOW ); + pBindings->Invalidate( SID_OUTLINE_HIDE ); + pBindings->Invalidate( SID_OUTLINE_REMOVE ); + + pBindings->Invalidate( SID_STATUS_SUM ); // wegen ein-/ausblenden + pBindings->Invalidate( SID_ATTR_SIZE ); + } +} //------------------------------------------------------------------------ @@ -163,7 +176,7 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, nParts ); rDocShell.SetDocumentModified(); - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); bSuccess = TRUE; } else @@ -224,7 +237,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, nParts ); rDocShell.SetDocumentModified(); bDone = TRUE; - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); // es wird nicht wieder eingeblendet -> kein UpdatePageBreaks } @@ -277,7 +290,7 @@ BOOL ScOutlineDocFunc::RemoveAllOutlines( USHORT nTab, BOOL bRecord, BOOL bApi ) rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE ); rDocShell.SetDocumentModified(); - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); bSuccess = TRUE; } else if (!bApi) @@ -340,7 +353,7 @@ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bA rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_LEFT | PAINT_TOP | PAINT_SIZE ); rDocShell.SetDocumentModified(); - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); return TRUE; } @@ -423,7 +436,7 @@ BOOL ScOutlineDocFunc::SelectLevel( USHORT nTab, BOOL bColumns, USHORT nLevel, lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd ); rDocShell.SetDocumentModified(); - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); return TRUE; } @@ -517,7 +530,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, rDocShell.SetDocumentModified(); bDone = TRUE; - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); } if (!bDone && !bApi) @@ -607,7 +620,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, rDocShell.SetDocumentModified(); bDone = TRUE; - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); } if (!bDone && !bApi) @@ -692,7 +705,7 @@ BOOL ScOutlineDocFunc::ShowOutline( USHORT nTab, BOOL bColumns, USHORT nLevel, U //! if (bPaint) //! UpdateScrollBars(); - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); return TRUE; //! immer ??? } @@ -753,7 +766,7 @@ BOOL ScOutlineDocFunc::HideOutline( USHORT nTab, BOOL bColumns, USHORT nLevel, U //! if (bPaint) //! UpdateScrollBars(); - lcl_InvalidateOutliner(); + lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); return TRUE; //! immer ??? } diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index e0bd60146..ed2b325d7 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:50:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX @@ -323,7 +322,6 @@ #include <sfx2/request.hxx> #include <svtools/whiter.hxx> #include <vcl/msgbox.hxx> -#include <segmentc.hxx> #include "drawsh.hxx" #include "drwlayer.hxx" @@ -343,10 +341,6 @@ //------------------------------------------------------------------ -SEG_EOFGLOBALS() - -#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE) - TYPEINIT1( ScDrawShell, SfxShell ); SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) @@ -361,8 +355,6 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) // abschalten der nicht erwuenschten Acceleratoren: -#pragma SEG_FUNCDEF(drawsh_09) - void ScDrawShell::StateDisableItems( SfxItemSet &rSet ) { SfxWhichIter aIter(rSet); @@ -376,8 +368,6 @@ void ScDrawShell::StateDisableItems( SfxItemSet &rSet ) } -#pragma SEG_FUNCDEF(drawsh_05) - void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) { USHORT nSlot = rReq.GetSlot(); @@ -520,8 +510,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } } -#pragma SEG_FUNCDEF(drawsh_06) - void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) { ScDrawView* pView = pViewData->GetScDrawView(); @@ -560,8 +548,6 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) delete pDlg; } -#pragma SEG_FUNCDEF(drawsh_07) - void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) { ScDrawView* pView = pViewData->GetScDrawView(); @@ -594,8 +580,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) delete pDlg; } -#pragma SEG_FUNCDEF(drawsh_08) - void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage ) { ScDrawView* pView = pViewData->GetScDrawView(); @@ -622,222 +606,4 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage ) delete( pDlg ); } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.70 2000/09/17 14:09:01 willem.vandorp - OpenOffice header added. - - Revision 1.69 2000/08/31 16:38:23 willem.vandorp - Header and footer replaced - - Revision 1.68 2000/05/09 18:30:02 nn - use IMPL_INTERFACE macro without IDL - - Revision 1.67 2000/02/11 12:25:38 hr - #70473# changes for unicode ( patched by automated patchtool ) - - Revision 1.66 1999/06/22 08:55:54 NN - pass ItemSet to GetAttributes - - - Rev 1.65 22 Jun 1999 10:55:54 NN - pass ItemSet to GetAttributes - - Rev 1.64 22 Feb 1999 20:49:50 ANK - #47158# Erweiterungen fuer neue DrawForm-Shell - - Rev 1.63 12 Jan 1998 14:06:46 TJ - include - - Rev 1.62 05 Dec 1997 19:31:10 NN - Includes - - Rev 1.61 04 Sep 1997 14:30:38 RG - change header - - Rev 1.60 27 Aug 1997 13:41:54 TRI - VCL includes - - Rev 1.59 05 Aug 1997 15:21:44 TJ - include svx/srchitem.hxx - - Rev 1.58 14 Apr 1997 13:05:16 HJS - includes - - Rev 1.57 04 Apr 1997 16:27:02 TRI - includes - - Rev 1.56 23 Jan 1997 15:37:02 NN - beim SvxAreaTabDialog die View uebergeben - - Rev 1.55 08 Jan 1997 20:50:12 HJS - forward - - Rev 1.54 15 Nov 1996 17:55:46 NN - SvxTextTabDialog aufrufen - - Rev 1.53 08 Nov 1996 08:43:00 NF - includes... - - Rev 1.52 29 Oct 1996 14:05:14 NN - ueberall ScResId statt ResId - - Rev 1.51 21 Oct 1996 15:36:18 NN - include tbxalign war ueberfluessig - - Rev 1.50 22 Aug 1996 15:39:42 NF - clooks - - Rev 1.49 09 Aug 1996 20:37:12 NN - Svx-Includes aus scitems.hxx raus - - Rev 1.48 22 May 1996 14:52:46 NN - GetDrawView -> GetScDrawView - - Rev 1.47 10 Apr 1996 09:31:42 NF - sv.hxx als ertes includen - - Rev 1.46 22 Mar 1996 14:03:20 MH - add: include sfxiiter.hxx - - Rev 1.45 07 Mar 1996 12:27:38 NF - Zuviele defines - - Rev 1.44 13 Feb 1996 08:26:50 TRI - CLOOKS - - Rev 1.43 23 Jan 1996 23:43:50 HJS - anpassung fuer die nicht-b - - Rev 1.42 18 Dec 1995 14:18:42 MO - Visibility-Flags auf Server gesetzt - - Rev 1.41 12 Dec 1995 18:58:44 MO - Disable-Methode fuer div. Acceleratoren - - Rev 1.40 12 Dec 1995 17:41:40 MO - Standard-Textattribute setzen - - Rev 1.39 11 Dec 1995 18:42:58 MO - ExecuteTextAttrDlg - - Rev 1.37 10 Dec 1995 15:51:54 TRI - define entfernt - - Rev 1.36 30 Nov 1995 20:09:40 MO - Linienenden-Control Execute - - Rev 1.35 28 Nov 1995 21:43:52 MO - include-Reihenfolge geandert - - Rev 1.34 10 Nov 1995 18:36:30 NN - static -> lcl - - Rev 1.33 26 Oct 1995 14:24:20 JN - richtigen Dialog bei Legende aufrufen - - Rev 1.32 06 Oct 1995 08:05:46 NN - 300: Parameter bOnlyHardAttr bei MergeAttrFromMarked - - Rev 1.31 10 Aug 1995 00:36:10 HJS - svundo muss da sein - - Rev 1.30 07 Aug 1995 13:04:22 MO - 253b: Transform-Dialog Aufrufparameter - - Rev 1.29 03 Aug 1995 13:22:26 MO - FontWork-ChildWindow Register - - Rev 1.28 21 Jul 1995 10:06:14 NN - InvalidateAttribs beim direkten Setzen von Attributen - - Rev 1.27 20 Jul 1995 18:37:38 MO - BugFix: vertikale Anordnung der ObjBar (BugId: 16227) - - Rev 1.26 08 Jul 1995 19:14:00 HJS - ein define zuviel - - Rev 1.25 06 Jul 1995 22:11:12 HJS - ein #define zuviel - - Rev 1.24 04 Jul 1995 11:57:40 MO - Parameterkorrektur fuer LineDlg - - Rev 1.23 20 Jun 1995 16:23:46 NN - nochmal Segmentierung - - Rev 1.22 13 Jun 1995 18:30:40 MO - seg-pragmas korrigiert - - Rev 1.21 13 Jun 1995 14:43:30 MO - spezielles Segmentierungs-pragma - - Rev 1.20 07 Jun 1995 10:09:00 MO - SFX_OBJECTBAR_OBJECT - - Rev 1.19 07 Jun 1995 08:43:22 MO - SvxIds fuer DrawUI - - Rev 1.18 23 May 1995 14:46:04 MO - Aufruf Transform-Dialog angepasst - - Rev 1.17 10 May 1995 14:44:36 TRI - - Rev 1.16 04 May 1995 09:28:36 TRI - SvxAreaTabPage: geanderte Paramteranzahl - - Rev 1.15 05 Apr 1995 18:16:34 NN - tabvwsh-include raus (Funktionen nach viewdata) - - Rev 1.14 04 Apr 1995 18:14:20 TRI - Out of Keys - - Rev 1.13 30 Mar 1995 18:31:12 TRI - Out of Keys - - Rev 1.12 27 Mar 1995 17:44:54 TRI - Out of Keys - Aufteilung - - Rev 1.11 21 Mar 1995 11:12:18 MO - 242-Aenderungen - - Rev 1.10 15 Mar 1995 12:59:28 NN - MarkAll - - Rev 1.9 03 Mar 1995 22:59:16 NN - 2.41 Anpassung - - Rev 1.8 27 Feb 1995 13:25:36 SC - * syntax-Fehler korrigiert - - - Rev 1.7 27 Feb 1995 08:53:52 NN - Anordnung - - Rev 1.6 25 Feb 1995 20:18:46 NN - Alignment-Funktionen - - Rev 1.5 17 Feb 1995 18:59:50 NN - Paste mit Fenster - - Rev 1.4 15 Feb 1995 02:00:44 NN - Cut/Copy/Paste - - Rev 1.3 14 Feb 1995 19:55:38 NN - ObjectMenue (disabled) - - Rev 1.2 13 Feb 1995 20:59:58 NN - Popup Menue - - Rev 1.1 12 Feb 1995 21:42:34 NN - Drawing Objektleiste - - Rev 1.0 01 Feb 1995 18:21:42 NN - Initial revision. - -------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 8ff554c68..0df139555 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:55 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:50:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index aaf780299..adadee2f8 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh4.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:50:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -236,7 +236,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 9e5848814..675d9714e 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drformsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:51:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index 632c482f8..6a4f6fc88 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drtxtob1.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:51:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index bc87205de..e0697cbbd 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drtxtob2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:51:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX @@ -487,7 +486,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) else pViewFrm->ToggleChildWindow( nId ); - SFX_BINDINGS().Invalidate( SID_FONTWORK ); + pViewFrm->GetBindings().Invalidate( SID_FONTWORK ); rReq.Done(); } break; diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 3d1ad6f34..c4c210a24 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconstr.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:52:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -196,7 +196,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** @@ -389,7 +388,8 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) // #49458# bei Uno-Controls nicht in Textmodus if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) { - SFX_DISPATCHER().Execute(SID_DRAW_TEXT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(SID_DRAW_TEXT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); @@ -439,10 +439,11 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) { pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1()); + SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher(); if ( pView->HasMarkedObj() ) - SFX_DISPATCHER().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + rDisp.Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); else - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + rDisp.Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } } @@ -473,7 +474,8 @@ BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt) } else // Zeichenmodus beenden { - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } break; diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 85e9caa37..0d1272db5 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuconuno.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:52:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -#define _SFX_BINDINGS_HXX //??? #define _SFXDISPATCH_HXX //??? //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 3e34c0ebc..5306ecfaa 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fudraw.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:53:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -244,13 +244,15 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt) if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT ) { // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); bReturn = TRUE; } else if ( pViewShell->IsDrawSelMode() ) { pView->UnmarkAll(); - SFX_DISPATCHER().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); bReturn = TRUE; } else if ( pView->HasMarkedObj() ) diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index 883d8a0fa..044796bcf 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fumark.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:53:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,7 +178,8 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) bStartDrag = FALSE; pWindow->ReleaseMouse(); - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); // Daten an der View merken @@ -228,7 +229,8 @@ BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt) { case KEY_ESCAPE: // beenden - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); bReturn = TRUE; break; } diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 1256dc9a9..3aa956789 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fupoor.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:53:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -197,7 +197,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX *** //#define _SFXAPP_HXX *** -//#define _SFX_BINDINGS_HXX *** #define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 54ac17ec5..5d51ab087 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusel.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:53:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -363,7 +363,6 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if ( pIPClient->IsInPlaceActive() ) { pIPClient->GetProtocol().Reset2Open(); -// SFX_APP()->SetDispatcher(pViewShell->GetViewFrame()->GetDispatcher() ); SFX_APP()->SetViewFrame(pViewShell->GetViewFrame()); // 242.a: ??? } } @@ -411,7 +410,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) { - SFX_DISPATCHER().Execute(SID_DRAW_TEXT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(SID_DRAW_TEXT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); @@ -453,7 +453,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // darum hier die harte IsLeft-Abfrage if ( !bReturn && rMEvt.IsLeft() ) if (pViewShell->IsDrawSelMode()) - SFX_DISPATCHER().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); return (bReturn); } diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index fa286f808..2344dafce 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusel2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:53:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -391,7 +391,8 @@ BOOL FuSelection::TestComment( SdrPageView* pPV, const Point& rPos ) // SdrHdl* pHdl = pView->HitHandle( rPos, *pWindow ); // BOOL bDrag = pView->BegDragObj( rPos, NULL, pHdl ); - SFX_DISPATCHER().Execute(SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); if ( pPoor && pPoor->GetSlotID() == SID_DRAW_NOTEEDIT ) // hat keine RTTI diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index e0d29be5f..10fe9beca 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: futext.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:49:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,7 +202,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX @@ -319,6 +318,7 @@ #include <svx/svdview.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> #include "futext.hxx" @@ -332,10 +332,8 @@ //------------------------------------------------------------------ -void lcl_InvalidateAttribs() +void lcl_InvalidateAttribs( SfxBindings& rBindings ) { - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT ); rBindings.Invalidate( SID_ATTR_CHAR_POSTURE ); rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE ); @@ -493,7 +491,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) } pView->SetDragMode(SDRDRAG_MOVE); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_OBJECT_ROTATE ); rBindings.Invalidate( SID_OBJECT_MIRROR ); pHdl=pView->GetHdl(nHdlNum); @@ -530,7 +528,8 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) // Notizen editieren -> keine neuen Textobjekte erzeugen, // stattdessen Textmodus verlassen - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + pViewShell->GetViewData()->GetDispatcher(). + Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } else { @@ -547,7 +546,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt) { pWindow->CaptureMouse(); // ForcePointer(&rMEvt); - lcl_InvalidateAttribs(); + lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() ); } pViewShell->SetActivePointer(pView->GetPreferedPointer( @@ -616,7 +615,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt) aDragTimer.Stop(); } - lcl_InvalidateAttribs(); + lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() ); Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -665,10 +664,11 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt) { pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1()); + SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher(); if ( pView->HasMarkedObj() ) - SFX_DISPATCHER().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + rDisp.Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); else - SFX_DISPATCHER().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + rDisp.Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } } } @@ -699,7 +699,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt) nSdrObjKind != OBJ_OUTLINETEXT && ! pObj->ISA(SdrTextObj) ) { -// SFX_DISPATCHER().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); +// pViewShell->GetViewData()->GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } } } @@ -780,7 +780,7 @@ BOOL __EXPORT FuText::KeyInput(const KeyEvent& rKEvt) if ( pView->KeyInput(rKEvt, pWindow) ) { bReturn = TRUE; - lcl_InvalidateAttribs(); + lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() ); } else { @@ -801,7 +801,7 @@ BOOL __EXPORT FuText::KeyInput(const KeyEvent& rKEvt) void FuText::Activate() { pView->SetDragMode(SDRDRAG_MOVE); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_OBJECT_ROTATE ); rBindings.Invalidate( SID_OBJECT_MIRROR ); @@ -857,7 +857,7 @@ void FuText::Deactivate() void FuText::SelectionHasChanged() { pView->SetDragMode(SDRDRAG_MOVE); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_OBJECT_ROTATE ); rBindings.Invalidate( SID_OBJECT_MIRROR ); diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index d34fb01e1..2c7008126 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: futext2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:49:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,7 +202,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 20f6a33e0..407da6af1 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: futext3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:49:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,7 +202,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -#define _SFX_BINDINGS_HXX #define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 681114cd2..25d1b2204 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dwfunctr.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:56 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:54:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,7 +219,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindings, __EXPORT ScFunctionDockWin::~ScFunctionDockWin() { - EndListening( SFX_BINDINGS() ); + EndListening( GetBindings() ); } /************************************************************************* @@ -706,8 +706,9 @@ BOOL __EXPORT ScFunctionDockWin::Close() { SfxBoolItem aItem( FID_FUNCTION_BOX, FALSE ); - SFX_DISPATCHER().Execute( FID_FUNCTION_BOX, SFX_CALLMODE_ASYNCHRON | - SFX_CALLMODE_RECORD, &aItem, 0L ); + GetBindings().GetDispatcher()->Execute( FID_FUNCTION_BOX, + SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + &aItem, 0L ); SfxDockingWindow::Close(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 8b2b9e802..82e1174d0 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formula.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:57 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:54:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -735,7 +735,7 @@ void ScFormulaDlg::DoEnter(BOOL bOk) // Enable() der Eingabezeile erzwingen: if ( pScViewShell ) pScViewShell->UpdateInputHandler(); - SFX_DISPATCHER().Execute( SID_INS_FUNCTION, + GetBindings().GetDispatcher()->Execute( SID_INS_FUNCTION, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aRetItem, &aStrItem, &aMatItem, 0L ); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 605e521f8..6444a06b8 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anyrefdg.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:57 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:25:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -144,6 +144,7 @@ class ScAnyRefDlg : public SfxModelessDialog friend ScRefButton; private: + SfxBindings* pMyBindings; Edit* pRefEdit; // aktives Eingabefeld ScRefButton* pRefBtn; // Button dazu String sOldDialogText; // Originaltitel des Dialogfensters @@ -195,6 +196,7 @@ public: void ViewShellChanged(ScTabViewShell* pScViewShell); void SwitchToDocument(); + SfxBindings& GetBindings(); virtual void SetActive() = 0; // virtual BOOL Close(); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index bb47f68a2..2dbd1d64a 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:58 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:25:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -345,6 +345,8 @@ public: const String& GetDdeTextFmt() const { return aDdeTextFmt; } + SfxBindings* GetViewBindings(); + ScTabViewShell* GetBestViewShell(); ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; } diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 977f0fdb8..2ffa76707 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewdata.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:02 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:25:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,6 +113,8 @@ class EditStatus; class Outliner; class Window; class SfxObjectShell; +class SfxBindings; +class SfxDispatcher; class ScPatternAttr; class ScRangeListRef; class ScExtDocOptions; @@ -233,6 +235,8 @@ public: ScTabViewShell* GetViewShell() const { return pViewShell; } SfxObjectShell* GetSfxDocShell() const; + SfxBindings& GetBindings(); // from ViewShell's ViewFrame + SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame ScMarkData& GetMarkData() { return aMarkData; } diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index fcfad37d7..f0a2b5df9 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: anyrefdg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:02 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:42:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -359,6 +359,7 @@ void lcl_HideAllReferences() ScAnyRefDlg::ScAnyRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, USHORT nResId) : SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ), + pMyBindings( pB ), pRefEdit( NULL ), pAccel( NULL ), bAccInserted( FALSE ), @@ -455,6 +456,15 @@ ScAnyRefDlg::~ScAnyRefDlg() //---------------------------------------------------------------------------- +SfxBindings& ScAnyRefDlg::GetBindings() +{ + //! SfxModelessDialog should allow access to pBindings pointer + + return *pMyBindings; +} + +//---------------------------------------------------------------------------- + void ScAnyRefDlg::SwitchToDocument() { ScTabViewShell* pCurrent = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 6d0a3bbef..2271b04c6 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: solvrdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:42:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -285,7 +285,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( SID_SOLVE, + GetBindings().GetDispatcher()->Execute( SID_SOLVE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); Close(); diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 6cf56d3a0..7b5874c04 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabopdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:42:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -352,7 +352,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( SID_TABOP, + GetBindings().GetDispatcher()->Execute( SID_TABOP, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L ); Close(); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 12547b9f0..e05684f5f 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -2,9 +2,9 @@ * * $RCSfile: content.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:55:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 5b25a25df..a9f9297e8 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: navipi.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:55:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -818,7 +818,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win rBindings.LEAVEREGISTRATIONS(); StartListening( *(SFX_APP()) ); - StartListening( SFX_BINDINGS() ); + StartListening( rBindings ); aLbDocuments.Hide(); // bei NAV_LMODE_NONE gibts die nicht @@ -867,7 +867,7 @@ __EXPORT ScNavigatorDlg::~ScNavigatorDlg() delete pMarkArea; EndListening( *(SFX_APP()) ); - EndListening( SFX_BINDINGS() ); + EndListening( rBindings ); } //------------------------------------------------------------------------ @@ -1147,7 +1147,7 @@ void ScNavigatorDlg::SetCurrentCell( USHORT nColNo, USHORT nRowNo ) SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // ggf. Selektion aufheben - SFX_DISPATCHER().Execute( SID_CURRENTCELL, + rBindings.GetDispatcher()->Execute( SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aPosItem, &aUnmarkItem, 0L ); } @@ -1158,7 +1158,7 @@ void ScNavigatorDlg::SetCurrentCellStr( const String rName ) ppBoundItems[0]->ClearCache(); SfxStringItem aNameItem( SID_CURRENTCELL, rName ); - SFX_DISPATCHER().Execute( SID_CURRENTCELL, + rBindings.GetDispatcher()->Execute( SID_CURRENTCELL, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aNameItem, 0L ); } @@ -1171,7 +1171,7 @@ void ScNavigatorDlg::SetCurrentTable( USHORT nTabNo ) { // Tabelle fuer Basic ist 1-basiert SfxUInt16Item aTabItem( SID_CURRENTTAB, nTabNo + 1 ); - SFX_DISPATCHER().Execute( SID_CURRENTTAB, + rBindings.GetDispatcher()->Execute( SID_CURRENTTAB, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aTabItem, 0L ); } @@ -1203,7 +1203,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const String rName ) void ScNavigatorDlg::SetCurrentObject( const String rName ) { SfxStringItem aNameItem( SID_CURRENTOBJECT, rName ); - SFX_DISPATCHER().Execute( SID_CURRENTOBJECT, + rBindings.GetDispatcher()->Execute( SID_CURRENTOBJECT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aNameItem, 0L ); } @@ -1213,7 +1213,7 @@ void ScNavigatorDlg::SetCurrentObject( const String rName ) void ScNavigatorDlg::SetCurrentDoc( const String& rDocName ) // aktivieren { SfxStringItem aDocItem( SID_CURRENTDOC, rDocName ); - SFX_DISPATCHER().Execute( SID_CURRENTDOC, + rBindings.GetDispatcher()->Execute( SID_CURRENTDOC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aDocItem, 0L ); } @@ -1386,15 +1386,15 @@ void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize ) if ( bShow ) { - SfxBindings& rBindings = SFX_BINDINGS(); - Size aMinSize = aInitSize; - + Size aMinSize = aInitSize; aMinSize.Height() += nInitListHeight; if ( pFloat ) pFloat->SetMinOutputSizePixel( aMinSize ); aSize.Height() = nListModeHeight; + rBindings.Invalidate( SID_SELECT_SCENARIO ); rBindings.Update( SID_SELECT_SCENARIO ); + aWndScenarios.Show(); aLbDocuments.Show(); } diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index bcec8b855..f54839e1a 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scenwnd.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:03 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:55:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/viewfrm.hxx> #include <svtools/slstitm.hxx> #include <svtools/stritem.hxx> #include <vcl/msgbox.hxx> @@ -188,7 +189,10 @@ void __EXPORT ScScenarioListBox::DoubleClick() { SfxStringItem aStringItem( SID_SELECT_SCENARIO, GetSelectEntry() ); - SFX_DISPATCHER().Execute( SID_SELECT_SCENARIO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetDispatcher()->Execute( SID_SELECT_SCENARIO, + SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aStringItem, 0L, 0L ); } @@ -261,7 +265,9 @@ long __EXPORT ScScenarioListBox::Notify( NotifyEvent& rNEvt ) if ( nRes == RET_YES ) { SfxStringItem aStringItem( SID_DELETE_SCENARIO, aName ); - SFX_DISPATCHER().Execute( SID_DELETE_SCENARIO, + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetDispatcher()->Execute( SID_DELETE_SCENARIO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aStringItem, 0L, 0L ); } @@ -269,7 +275,9 @@ long __EXPORT ScScenarioListBox::Notify( NotifyEvent& rNEvt ) else if ( nId == RID_NAVIPI_SCENARIO_EDIT ) { SfxStringItem aStringItem( SID_EDIT_SCENARIO, aName ); - SFX_DISPATCHER().Execute( SID_EDIT_SCENARIO, + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + pViewFrm->GetDispatcher()->Execute( SID_EDIT_SCENARIO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aStringItem, 0L, 0L ); } @@ -308,8 +316,13 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent,const String& aQH_List, aEdComment.SetQuickHelpText(aQH_Comment); aEdComment.SetBackground( Color( COL_LIGHTGRAY ) ); - SFX_BINDINGS().Invalidate( SID_SELECT_SCENARIO ); - SFX_BINDINGS().Update( SID_SELECT_SCENARIO ); + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (pViewFrm) + { + SfxBindings& rBindings = pViewFrm->GetBindings(); + rBindings.Invalidate( SID_SELECT_SCENARIO ); + rBindings.Update( SID_SELECT_SCENARIO ); + } } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 17e055b4e..0955529f9 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: areasdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:04 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:56:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -549,7 +549,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) { SFX_APP()->LockDispatcher( FALSE ); SwitchToDocument(); - SFX_DISPATCHER().Execute( SID_CHANGE_PRINTAREA, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + GetBindings().GetDispatcher()->Execute( SID_CHANGE_PRINTAREA, + SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aPrintArea, &aRepeatRow, &aRepeatCol, 0L ); } diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 7bc475c7e..4b46b33b8 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undoblk3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:07 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:54:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1763,7 +1763,6 @@ void __EXPORT ScUndoInsertAreaLink::Undo() if (pLink) pLinkManager->Remove(*pLink); - SFX_BINDINGS().Invalidate(SID_LINKS); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1783,7 +1782,6 @@ void __EXPORT ScUndoInsertAreaLink::Redo() pLink->Update(); pLink->SetInCreate( FALSE ); - SFX_BINDINGS().Invalidate(SID_LINKS); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1856,7 +1854,6 @@ void __EXPORT ScUndoRemoveAreaLink::Undo() pLink->Update(); pLink->SetInCreate( FALSE ); - SFX_BINDINGS().Invalidate(SID_LINKS); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } @@ -1873,7 +1870,6 @@ void __EXPORT ScUndoRemoveAreaLink::Redo() if (pLink) pLinkManager->Remove(*pLink); - SFX_BINDINGS().Invalidate(SID_LINKS); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index b07670e89..34784ca14 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undotab.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:07 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:54:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -204,7 +204,9 @@ void __EXPORT ScUndoInsertTab::Redo() void __EXPORT ScUndoInsertTab::Repeat(SfxRepeatTarget& rTarget) { - SFX_DISPATCHER().Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + if (rTarget.ISA(ScTabViewTarget)) + ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher(). + Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } BOOL __EXPORT ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const @@ -323,7 +325,9 @@ void __EXPORT ScUndoInsertTables::Redo() void __EXPORT ScUndoInsertTables::Repeat(SfxRepeatTarget& rTarget) { - SFX_DISPATCHER().Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + if (rTarget.ISA(ScTabViewTarget)) + ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher(). + Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } BOOL __EXPORT ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const @@ -430,7 +434,6 @@ void __EXPORT ScUndoDeleteTab::Undo() if (bLink) { pDocShell->UpdateLinks(); // Link-Manager updaten - SFX_BINDINGS().Invalidate(SID_LINKS); } EndUndo(); // Draw-Undo muss vor dem Broadcast kommen! @@ -1004,7 +1007,9 @@ void __EXPORT ScUndoImportTab::Redo() void __EXPORT ScUndoImportTab::Repeat(SfxRepeatTarget& rTarget) { - SFX_DISPATCHER().Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + if (rTarget.ISA(ScTabViewTarget)) + ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher(). + Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } BOOL __EXPORT ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const @@ -1074,7 +1079,6 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const else // remove link pDoc->SetLink( pTabs[i], SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty ); pDocShell->UpdateLinks(); - SFX_BINDINGS().Invalidate(SID_LINKS); } void __EXPORT ScUndoRemoveLink::Undo() @@ -1139,7 +1143,9 @@ void __EXPORT ScUndoShowHideTab::Redo() void __EXPORT ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget) { - SFX_DISPATCHER().Execute( bShow ? FID_TABLE_SHOW : FID_TABLE_HIDE, + if (rTarget.ISA(ScTabViewTarget)) + ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher(). + Execute( bShow ? FID_TABLE_SHOW : FID_TABLE_HIDE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 4262ce5df..da10e5ca9 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsuno.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:07 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:57:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -5540,8 +5540,9 @@ void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ) ScPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab ).UpdatePages(); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_DELETE_PRINTAREA ); + SfxBindings* pBindings = pDocSh->GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_DELETE_PRINTAREA ); pDocSh->SetDocumentModified(); } @@ -5873,7 +5874,9 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr pDoc->SetLink( nTab, nLinkMode, aFileString, aFilterString, aOptString, aSheetString ); pDocSh->UpdateLinks(); // ggf. Link eintragen oder loeschen - SFX_BINDINGS().Invalidate(SID_LINKS); + SfxBindings* pBindings = pDocSh->GetViewBindings(); + if (pBindings) + pBindings->Invalidate(SID_LINKS); //! Undo fuer Link-Daten an der Table @@ -6312,10 +6315,13 @@ void SAL_CALL ScTableSheetObj::setPropertyValue( ScPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab ).UpdatePages(); pDocSh->SetDocumentModified(); - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_STYLE_FAMILY4 ); - rBindings.Invalidate( SID_STATUS_PAGESTYLE ); - rBindings.Invalidate( FID_RESET_PRINTZOOM ); + SfxBindings* pBindings = pDocSh->GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( SID_STYLE_FAMILY4 ); + pBindings->Invalidate( SID_STATUS_PAGESTYLE ); + pBindings->Invalidate( FID_RESET_PRINTZOOM ); + } } } else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) ) diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index e6f551019..86d6b7807 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: styleuno.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:57:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -729,7 +729,9 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName ) pStylePool->Erase( pStyle ); - SFX_BINDINGS().Invalidate( SID_STYLE_FAMILY4 ); + SfxBindings* pBindings = pDocShell->GetViewBindings(); + if (pBindings) + pBindings->Invalidate( SID_STYLE_FAMILY4 ); pDocShell->SetDocumentModified(); } } @@ -1046,9 +1048,12 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) // Zellvorlagen = 2, Seitenvorlagen = 4 UINT16 nId = ( eFamily == SFX_STYLE_FAMILY_PARA ) ? SID_STYLE_FAMILY2 : SID_STYLE_FAMILY4; - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( nId ); - rBindings.Invalidate( SID_STYLE_APPLY ); + SfxBindings* pBindings = pDocShell->GetViewBindings(); + if (pBindings) + { + pBindings->Invalidate( nId ); + pBindings->Invalidate( SID_STYLE_APPLY ); + } } } } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 56d4752fc..9be405357 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewuno.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:57:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1023,7 +1023,7 @@ void ScTabViewObj::setZoom(INT16 Zoom) pViewSh->PaintGrid(); pViewSh->PaintTop(); pViewSh->PaintLeft(); - SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM ); + pViewSh->GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); } } @@ -1308,7 +1308,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( pViewSh->PaintExtras(); pViewSh->InvalidateBorder(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewSh->GetViewFrame()->GetBindings(); rBindings.Invalidate( FID_TOGGLEHEADERS ); // -> Checks im Menue rBindings.Invalidate( FID_TOGGLESYNTAX ); } diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 116c226ac..d036c9461 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: auditsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,9 +74,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#define GLOBALOVERFLOW -#include "segmentc.hxx" - #include "auditsh.hxx" #include "tabvwsh.hxx" #include "scresid.hxx" @@ -89,13 +86,6 @@ //------------------------------------------------------------------------ -SEG_EOFGLOBALS() - -//------------------------------------------------------------------------ - -#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE) - - TYPEINIT1( ScAuditingShell, SfxShell ); SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) @@ -105,7 +95,6 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) //------------------------------------------------------------------------ -#pragma SEG_FUNCDEF(auditsh_01) ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), @@ -119,18 +108,16 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) : } //------------------------------------------------------------------------ -#pragma SEG_FUNCDEF(auditsh_02) ScAuditingShell::~ScAuditingShell() { } //------------------------------------------------------------------------ -#pragma SEG_FUNCDEF(auditsh_03) void ScAuditingShell::Execute( SfxRequest& rReq ) { - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) { @@ -188,55 +175,10 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) } //------------------------------------------------------------------------ -#pragma SEG_FUNCDEF(auditsh_04) void ScAuditingShell::GetState( SfxItemSet& rSet ) { rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.11 2000/09/17 14:09:30 willem.vandorp - OpenOffice header added. - - Revision 1.10 2000/08/31 16:38:44 willem.vandorp - Header and footer replaced - - Revision 1.9 2000/05/09 18:30:15 nn - use IMPL_INTERFACE macro without IDL - - Revision 1.8 2000/04/14 08:31:36 nn - unicode changes - - Revision 1.7 1999/06/02 19:40:56 ANK - #66547# SubShells - - - Rev 1.6 02 Jun 1999 21:40:56 ANK - #66547# SubShells - - Rev 1.5 24 Nov 1997 20:04:54 NN - includes - - Rev 1.4 04 Sep 1997 19:51:46 RG - change header - - Rev 1.3 05 Aug 1997 14:33:14 TJ - include svx/srchitem.hxx - - Rev 1.2 29 Oct 1996 13:35:32 NN - ueberall ScResId statt ResId - - Rev 1.1 09 Aug 1996 20:34:22 NN - Svx-Includes aus scitems.hxx raus - - Rev 1.0 29 May 1996 19:41:46 NN - Initial revision. - -------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index d68b81085..da110e840 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsh2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -223,7 +223,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) #if 0 if( pScApp->GetSbaObject()->IsAddrPIOpen() ) { - SFX_DISPATCHER().Execute( SID_SBA_ADDRPI, + pViewData->GetDispatcher().Execute( SID_SBA_ADDRPI, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } #endif diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 064608c8e..d2245ac8f 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsh3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -849,7 +849,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_STATUS_DOCPOS: { //! Navigator an-/ausschalten (wie im Writer) ??? - //!SFX_DISPATCHER().Execute( SID_NAVIGATOR, + //!pViewData->GetDispatcher().Execute( SID_NAVIGATOR, //! SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); } break; diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 7602b6a5b..775d3f065 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -2,9 +2,9 @@ * * $RCSfile: colrowba.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -193,7 +193,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 3879dea38..5a79667fb 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfunc.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:34:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -434,7 +434,7 @@ void ScDBFunc::HideAutoFilter() GetViewData()->GetDocShell()->PostPaint( nCol1,nRow1,nTab, nCol2,nRow1,nTab, PAINT_GRID ); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewData()->GetBindings(); rBindings.Invalidate( SID_AUTO_FILTER ); rBindings.Invalidate( SID_AUTOFILTER_HIDE ); } diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index cae2a0ce0..cae8e53b3 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfunc3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:34:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,17 +100,6 @@ // Outliner // -void lcl_InvalidateOutliner() -{ - SfxBindings& rBindings = SFX_BINDINGS(); - rBindings.Invalidate( SID_OUTLINE_SHOW ); - rBindings.Invalidate( SID_OUTLINE_HIDE ); - rBindings.Invalidate( SID_OUTLINE_REMOVE ); - - rBindings.Invalidate( SID_STATUS_SUM ); // wegen ein-/ausblenden - rBindings.Invalidate( SID_ATTR_SIZE ); -} - // Outline-Gruppierung erzeugen void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord ) diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index 9780c55b5..6bdaa5d31 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfunc4.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:34:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index b1194e21b..d29e9ab74 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawvie3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:35:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,7 +120,6 @@ //#define _SFXSH_HXX //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX #define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index ab8b0bc35..8b0095518 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawvie4.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:35:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -#define _SFX_BINDINGS_HXX //??? #define _SFXDISPATCH_HXX //??? //#define _SFXMSG_HXX //#define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 1189895db..faa0654bc 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawview.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:35:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -204,7 +204,8 @@ void ScDrawView::AddCustomHdl() void ScDrawView::InvalidateAttribs() { - SfxBindings& rBindings = SFX_BINDINGS(); + if (!pViewData) return; + SfxBindings& rBindings = pViewData->GetBindings(); // echte Statuswerte: @@ -264,7 +265,8 @@ void ScDrawView::InvalidateAttribs() void ScDrawView::InvalidateDrawTextAttrs() { - SfxBindings& rBindings = SFX_BINDINGS(); + if (!pViewData) return; + SfxBindings& rBindings = pViewData->GetBindings(); rBindings.Invalidate( SID_ATTR_CHAR_FONT ); rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 8825e14d9..1cc7c1f76 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: editsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:36:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,10 +98,6 @@ #include <vcl/sound.hxx> -#define GLOBALOVERFLOW -#include <segmentc.hxx> - - #define _EDITSH_CXX #include "editsh.hxx" @@ -120,12 +116,8 @@ #define ScEditShell #include "scslots.hxx" -SEG_EOFGLOBALS() - -#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE) TYPEINIT1( ScEditShell, SfxShell ); -#pragma SEG_FUNCDEF(editsh_0a) SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) { @@ -133,8 +125,6 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) } -#pragma SEG_FUNCDEF(editsh_01) - ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : pEditView (pView), pViewData (pData), @@ -145,14 +135,10 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("EditCell"))); } -#pragma SEG_FUNCDEF(editsh_02) - ScEditShell::~ScEditShell() { } -#pragma SEG_FUNCDEF(editsh_08) - void ScEditShell::SetEditView(EditView* pView) { pEditView = pView; @@ -161,13 +147,11 @@ void ScEditShell::SetEditView(EditView* pView) SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() ); } -#pragma SEG_FUNCDEF(editsh_04) - void ScEditShell::Execute( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); USHORT nSlot = rReq.GetSlot(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); DBG_ASSERT(pHdl,"kein ScInputHandler"); @@ -189,7 +173,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) pTableView->SetInsertMode( bIsInsertMode ); if (pTopView) pTopView->SetInsertMode( bIsInsertMode ); - SFX_BINDINGS().Invalidate( SID_ATTR_INSERT ); + rBindings.Invalidate( SID_ATTR_INSERT ); break; case SID_ATTR_INSERT: @@ -199,7 +183,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) pTableView->SetInsertMode( bIsInsertMode ); if (pTopView) pTopView->SetInsertMode( bIsInsertMode ); - SFX_BINDINGS().Invalidate( SID_ATTR_INSERT ); + rBindings.Invalidate( SID_ATTR_INSERT ); } break; @@ -483,8 +467,6 @@ void ScEditShell::Execute( SfxRequest& rReq ) pHdl->SetSelIsRef(TRUE); } -#pragma SEG_FUNCDEF(editsh_05) - void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) { ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); @@ -531,8 +513,6 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) } } -#pragma SEG_FUNCDEF(editsh_0c) - const SvxURLField* ScEditShell::GetURLField() { ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); @@ -551,8 +531,6 @@ const SvxURLField* ScEditShell::GetURLField() return NULL; } -#pragma SEG_FUNCDEF(editsh_09) - void __EXPORT ScEditShell::GetClipState( SfxItemSet& rSet ) { BOOL bPaste = FALSE; @@ -590,12 +568,10 @@ void lcl_InvalidateUnder( SfxBindings& rBindings ) rBindings.Invalidate( SID_ULINE_VAL_DOTTED ); } -#pragma SEG_FUNCDEF(editsh_06) - void ScEditShell::ExecuteAttr(SfxRequest& rReq) { SfxItemSet aSet( pEditView->GetEmptyItemSet() ); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); USHORT nSlot = rReq.GetSlot(); @@ -734,8 +710,6 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) rReq.Done(); } -#pragma SEG_FUNCDEF(editsh_07) - void ScEditShell::GetAttrState(SfxItemSet &rSet) { SfxItemSet aAttribs = pEditView->GetAttribs(); @@ -773,8 +747,6 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht } -#pragma SEG_FUNCDEF(editsh_0b) - String ScEditShell::GetSelectionText( BOOL bWholeWord ) { String aStrSelection; @@ -797,90 +769,4 @@ String ScEditShell::GetSelectionText( BOOL bWholeWord ) return aStrSelection; } -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.85 2000/09/17 14:09:31 willem.vandorp - OpenOffice header added. - - Revision 1.84 2000/08/31 16:38:45 willem.vandorp - Header and footer replaced - - Revision 1.83 2000/07/21 18:21:23 nn - select url field after inserting - - Revision 1.82 2000/07/21 10:35:15 nn - #75683# SID_HYPERLINK_GETLINK: use selection as text if no link selected - - Revision 1.81 2000/05/09 18:30:15 nn - use IMPL_INTERFACE macro without IDL - - Revision 1.80 2000/04/14 08:31:37 nn - unicode changes - - Revision 1.79 2000/03/31 17:27:08 nn - #74687# after executing dialogs, check for edit mode - - Revision 1.78 2000/02/11 12:37:23 hr - #70473# changes for unicode ( patched by automated patchtool ) - - Revision 1.77 1999/09/24 15:59:13 nn - hlnkitem.hxx moved to svx - - Revision 1.76 1999/06/02 19:41:34 ANK - #66547# SubShells - - - Rev 1.75 02 Jun 1999 21:41:34 ANK - #66547# SubShells - - Rev 1.74 14 Jan 1999 16:21:56 NN - #60725# SID_CHARMAP: SetAttribs an der EditEngine statt der View - - Rev 1.73 13 Jan 1999 17:05:52 NN - #60811# SID_HYPERLINK_SETLINK: Adjust an der Selektion rufen - - Rev 1.72 16 Nov 1998 20:48:28 NN - #57254# SID_HYPERLINK_SETLINK: auch TopView - - Rev 1.71 05 Dec 1997 19:21:52 NN - Includes - - Rev 1.70 02 Dec 1997 12:38:40 TJ - include - - Rev 1.69 24 Nov 1997 20:06:08 NN - includes - - Rev 1.68 11 Sep 1997 19:57:02 NN - Hyperlink ersetzen: Einfuegen auf Selektion - - Rev 1.67 04 Sep 1997 19:44:22 RG - change header - - Rev 1.66 27 Aug 1997 12:19:28 TRI - VCL Anpassung - - Rev 1.65 05 Aug 1997 14:29:22 TJ - include svx/srchitem.hxx - - Rev 1.64 01 Aug 1997 11:32:58 NN - #42327# RemoveAttribs(TRUE) - - Rev 1.63 30 Jul 1997 17:27:10 HJS - includes - - Rev 1.62 29 Jul 1997 21:23:02 MH - Syntax - - Rev 1.61 29 Jul 1997 09:55:14 OM - Hyperlink Statusmethode - - Rev 1.60 16 Jul 1997 21:04:26 NN - Hypo-Feature: Klammern hervorheben - -------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 5a4453305..355df5228 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formatsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:36:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -259,12 +259,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // Wenn ToolBar vertikal : if ( !rReq.GetArgs() ) { - SFX_DISPATCHER().Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); + pViewData->GetDispatcher().Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); return; } //-------------------------------------------------------------------- - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); const USHORT nSlotId = rReq.GetSlot(); const USHORT nCurTab = GetViewData()->GetTabNo(); @@ -914,7 +914,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pSet = rReq.GetArgs(); USHORT nSlot = rReq.GetSlot(); @@ -963,7 +963,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); const SfxItemSet* pSet = rReq.GetArgs(); const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -1231,7 +1231,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pNewAttrs = rReq.GetArgs(); pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index c3b71cc82..1855cfbc5 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gridwin.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:36:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -968,7 +968,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, { // lcl_StartFilterDialog( pViewData, aParam, Application::GetAppWindow() ); pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ?? - SFX_DISPATCHER().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); + pViewData->GetDispatcher().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } else { @@ -1247,7 +1247,7 @@ void __EXPORT ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt ) SfxInt16Item aPosXItem( SID_RANGE_COL, nPosX ); SfxInt16Item aPosYItem( SID_RANGE_ROW, nPosY ); - SFX_DISPATCHER().Execute( SID_FILL_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + pViewData->GetDispatcher().Execute( SID_FILL_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aPosXItem, &aPosYItem, (void*)0L ); } @@ -1538,7 +1538,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (pScMod->IsModalMode(pViewData->GetSfxDocShell())) return; - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = pViewData->GetBindings(); if (bEEMouse) { EditView* pEditView; @@ -1635,7 +1635,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } else - SFX_DISPATCHER().Execute( FID_FILL_AUTO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); + pViewData->GetDispatcher().Execute( FID_FILL_AUTO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } else if (pViewData->GetFillMode() == SC_FILL_MATRIX) { @@ -2698,7 +2698,7 @@ BOOL ScGridWindow::DropPrivate( const DropEvent& rEvt ) SfxStringItem aRangeItem( SID_CHART_SOURCE, aRangeName ); USHORT nId = (rEvt.GetAction() == DROP_COPY) ? SID_CHART_ADDSOURCE : SID_CHART_SOURCE; - SFX_DISPATCHER().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, + pViewData->GetDispatcher().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aRangeItem, &aNameItem, (void*) NULL ); } else if ( nDragStartX != rData.nStartX || nDragStartY != rData.nStartY || diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index be37ce03a..8b20f2ccf 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gridwin3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:36:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -464,7 +464,7 @@ void ScGridWindow::UpdateStatusPosSize() aSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( 0, 0 ) ) ); } - SFX_BINDINGS().SetState(aSet); + pViewData->GetBindings().SetState(aSet); } BOOL ScGridWindow::DrawHasMarkedObj() diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index ec11c910b..08c8985ff 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olkact.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 91f3604a8..a3cfc8e62 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: output3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX #define _SFXMSG_HXX //* #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 01162fde4..2b65653a5 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: preview.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -607,7 +607,14 @@ void ScPreview::DoInvalidate() void ScPreview::StaticInvalidate() { - SfxBindings& rBindings = SFX_BINDINGS(); + // static method, because it's called asynchronously + // -> must use current viewframe + + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); + if (!pViewFrm) + return; + + SfxBindings& rBindings = pViewFrm->GetBindings(); rBindings.Invalidate(SID_STATUS_DOCPOS); rBindings.Invalidate(SID_STATUS_PAGESTYLE); rBindings.Invalidate(SID_PREVIEW_PREVIOUS); diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index cba1b283f..ff6cca13e 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: prevwsh2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -199,7 +199,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 36c28b4ac..0545b489a 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabcont.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:37:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -250,17 +250,18 @@ void __EXPORT ScTabControl::Select() pDoc->ExtendMarksFromTable( nPage ); */ - if (SFX_DISPATCHER().IsLocked()) + SfxDispatcher& rDisp = pViewData->GetDispatcher(); + if (rDisp.IsLocked()) pViewData->GetView()->SetTabNo( nPage ); else { // Tabelle fuer Basic ist 1-basiert SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 ); - SFX_DISPATCHER().Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, + rDisp.Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, (void*) NULL ); } - SfxBindings& rBind = SFX_BINDINGS(); + SfxBindings& rBind = pViewData->GetBindings(); rBind.Invalidate( FID_FILL_TAB ); rBind.Invalidate( FID_INS_TABLE ); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 40fd05fa8..a86633adb 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:32:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1117,7 +1117,7 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) PaintGrid(); PaintTop(); PaintLeft(); - SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM ); + aViewData.GetBindings().Invalidate( SID_ATTR_ZOOM ); } bDone = TRUE; @@ -2083,7 +2083,7 @@ void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fu void ScTabView::InvalidateSplit() { - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_WINDOW_SPLIT ); rBindings.Invalidate( SID_WINDOW_FIX ); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 0081cb3f8..47e77d9a3 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:32:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -459,7 +459,7 @@ void ScTabView::SelectAllTables() // pDoc->ExtendMarksFromTable( nTab ); aViewData.GetDocShell()->PostPaintExtras(); - SFX_BINDINGS().Invalidate( FID_FILL_TAB ); + aViewData.GetBindings().Invalidate( FID_FILL_TAB ); } } diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 7a4d9450a..e2793ed34 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:32:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,7 +288,7 @@ void ScTabView::ShowCursor() void ScTabView::InvalidateAttribs() { - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_STYLE_APPLY ); rBindings.Invalidate( SID_STYLE_FAMILY2 ); @@ -366,7 +366,7 @@ void ScTabView::SetCursor( USHORT nPosX, USHORT nPosY, BOOL bNew ) void ScTabView::CellContentChanged() { - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen rBindings.Invalidate( SID_THESAURUS ); @@ -398,7 +398,7 @@ void ScTabView::SelectionChanged() UpdateAutoFillMark(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue @@ -1476,7 +1476,7 @@ void ScTabView::SetTabNo( USHORT nTab, BOOL bNew ) pGridWin[i]->UpdateEditViewPos(); } - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); ScMarkData& rMark = aViewData.GetMarkData(); if (!rMark.GetTableSelect(nTab)) { @@ -2458,7 +2458,7 @@ void ScTabView::ZoomChanged() InterpretVisible(); // #69343# have everything calculated before painting - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_ATTR_ZOOM ); } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index dfa6d273c..72ca2ab9a 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview5.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:32:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -550,7 +550,7 @@ void ScTabView::TabChanged() pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page } - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = aViewData.GetBindings(); // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles... @@ -619,7 +619,7 @@ void ScTabView::DrawDeselectAll() ( pViewSh->IsDrawTextShell() || pDrawActual->GetSlotID() == SID_DRAW_NOTEEDIT ) ) { // end text edit (as if escape pressed, in FuDraw) - SFX_DISPATCHER().Execute( pDrawActual->GetSlotID(), + aViewData.GetDispatcher().Execute( pDrawActual->GetSlotID(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index f42971cba..d7888812d 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:28:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,7 +127,6 @@ #define _SVDRAG_HXX #define _SVDLAYER_HXX -//#define _SFX_BINDINGS_HXX #define _SFXFILEDLG_HXX #define _SFX_MACRO_HXX #define _SFXMNUITEM_HXX @@ -166,9 +165,6 @@ // INCLUDE --------------------------------------------------------------- -#define GLOBALOVERFLOW -#include <segmentc.hxx> - #include "scitems.hxx" #include <basctl/idetemp.hxx> #include <svx/imapdlg.hxx> @@ -191,10 +187,6 @@ #define SearchSettings #include <svx/svxslots.hxx> -SEG_EOFGLOBALS() - -#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE) - TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener); SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL)) @@ -237,90 +229,3 @@ SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) ) //------------------------------------------------------------------ -/*------------------------------------------------------------------------ - - $Log: not supported by cvs2svn $ - Revision 1.305 2000/09/17 14:09:35 willem.vandorp - OpenOffice header added. - - Revision 1.304 2000/09/04 13:31:53 tbe - basicide, isetbrw, si, vcdlged moved from svx to basctl - - Revision 1.303 2000/08/31 16:38:48 willem.vandorp - Header and footer replaced - - Revision 1.302 2000/05/09 18:30:15 nn - use IMPL_INTERFACE macro without IDL - - Revision 1.301 2000/05/09 17:37:21 nn - old Basic removed - - Revision 1.300 2000/04/14 08:31:38 nn - unicode changes - - Revision 1.299 2000/02/09 09:57:30 nn - #72165# child window registration for hyperlink dialog - - Revision 1.298 1999/06/07 15:30:30 ANK - #66547# Searchsettings aktiviert - - - Rev 1.297 07 Jun 1999 17:30:30 ANK - #66547# Searchsettings aktiviert - - Rev 1.296 02 Jun 1999 21:42:26 ANK - #66547# SubShells - - Rev 1.295 09 Apr 1998 21:58:40 ANK - Redlining Erweiterungen - - Rev 1.294 13 Mar 1998 12:58:24 ANK - Changes - - Rev 1.293 08 Mar 1998 20:38:28 ANK - Redlining - - Rev 1.292 05 Dec 1997 19:22:38 NN - Includes - - Rev 1.291 20 Nov 1997 20:30:56 NN - includes angepasst - - Rev 1.290 14 Oct 1997 19:58:56 ANK - Neue Funktionsbox - - Rev 1.289 23 May 1997 20:32:30 NN - ScFormulaDlgWrapper registrieren - - Rev 1.288 08 Apr 1997 17:34:42 HJS - includes, defines - - Rev 1.287 18 Nov 1996 19:11:58 ER - new: ScColRowNameRangesDlg - - Rev 1.286 14 Nov 1996 22:00:44 NN - CHILDWINDOW_CONTEXT_REGISTRATION fuer Navigator - - Rev 1.285 29 Oct 1996 13:36:20 NN - ueberall ScResId statt ResId - - Rev 1.284 16 Oct 1996 16:24:52 RJ - Einbindung des Dialogs fuer bedingte Formatierung - - Rev 1.283 09 Aug 1996 20:35:02 NN - Svx-Includes aus scitems.hxx raus - - Rev 1.282 10 Jul 1996 14:21:18 KA - gallery entfernt, da jetzt im Explorer - - Rev 1.281 05 Jul 1996 17:25:26 NN - SearchSettings aus svxslots, bei GetSbxObject anlegen - - Rev 1.280 20 Jun 1996 19:04:08 NN - Werkzeugleiste registrieren - -------------------------------------------------------------------------*/ - -#pragma SEG_EOFMODULE - - diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index c005633bf..84701d31b 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,7 +162,6 @@ #define _SFX_PRNMON_HXX //#define _SFXDISPATCH_HXX //#define _SFXCTRLITEM_HXX -//#define _SFX_BINDINGS_HXX #define _SFX_MINFITEM_HXX #define _SFX_MACRO_HXX #define _SFX_CHOR @@ -318,7 +317,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) ScTabView* pTabView = GetViewData()->GetView(); USHORT nTab = GetViewData()->GetTabNo(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); Window* pWin = pTabView->GetActiveWin(); SdrView* pView = pTabView->GetSdrView(); @@ -421,8 +420,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren if ( nNewId == SID_FM_CREATE_CONTROL ) { - SFX_DISPATCHER().Execute(SID_FM_LEAVE_CREATE); - SFX_BINDINGS().InvalidateAll(FALSE); + GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE); + GetViewFrame()->GetBindings().InvalidateAll(FALSE); //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? } @@ -435,8 +434,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nDrawSfxId == SID_FM_CREATE_CONTROL && nNewId != nDrawSfxId ) { // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren - SFX_DISPATCHER().Execute(SID_FM_LEAVE_CREATE); - SFX_BINDINGS().InvalidateAll(FALSE); + GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE); + GetViewFrame()->GetBindings().InvalidateAll(FALSE); //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 767bb35ab..de562a151 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh3.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -535,7 +535,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) else pThisFrame->ToggleChildWindow(ScFunctionChildWindow::GetChildWindowId() ); - SFX_BINDINGS().Invalidate(FID_FUNCTION_BOX); + GetViewFrame()->GetBindings().Invalidate(FID_FUNCTION_BOX); rReq.Done (); } break; @@ -766,7 +766,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_CHG_ACCEPT: { pThisFrame->ToggleChildWindow(ScAcceptChgDlgWrapper::GetChildWindowId()); - SFX_BINDINGS().Invalidate(FID_CHG_ACCEPT); + GetViewFrame()->GetBindings().Invalidate(FID_CHG_ACCEPT); rReq.Done (); /* @@ -818,7 +818,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_STATUS_DOCPOS: { //! Navigator an-/ausschalten (wie im Writer) ??? - //!SFX_DISPATCHER().Execute( SID_NAVIGATOR, + //!GetViewData()->GetDispatcher().Execute( SID_NAVIGATOR, //! SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); } break; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 597e01541..ca381fe50 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh4.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1215,10 +1215,10 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if (nMode == SC_ENTER_NORMAL) { if( bShift ) - SFX_DISPATCHER().Execute( SID_CURSORENTERUP, + GetViewData()->GetDispatcher().Execute( SID_CURSORENTERUP, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); else - SFX_DISPATCHER().Execute( SID_CURSORENTERDOWN, + GetViewData()->GetDispatcher().Execute( SID_CURSORENTERDOWN, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } else @@ -1269,7 +1269,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) } if ( nSlotId ) { - SFX_DISPATCHER().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); + GetViewData()->GetDispatcher().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); bUsed = TRUE; } } @@ -1679,7 +1679,7 @@ void ScTabViewShell::ExecTbx( SfxRequest& rReq ) default: DBG_ERROR("Slot im Wald"); } - SFX_BINDINGS().Invalidate( nSlot ); + GetViewFrame()->GetBindings().Invalidate( nSlot ); } void ScTabViewShell::GetTbxState( SfxItemSet& rSet ) diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 3bf95ac57..78707d096 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh5.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -163,7 +163,7 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC bReadOnly = GetViewData()->GetSfxDocShell()->IsReadOnly(); SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadOnly); - SFX_DISPATCHER().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON, + GetViewData()->GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON, &aItem, 0L ); } break; diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index ff2e970ef..950e272de 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsh9.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX #define _SFXDISPATCH_HXX //??? //#define _SFXMSG_HXX *** //#define _SFXOBJFACE_HXX *** @@ -456,7 +455,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) SfxViewFrame* pThisFrame = GetViewFrame(); USHORT nId = ScIMapChildWindowId(); pThisFrame->ToggleChildWindow( nId ); - SFX_BINDINGS().Invalidate( SID_IMAP ); + GetViewFrame()->GetBindings().Invalidate( SID_IMAP ); if ( pThisFrame->HasChildWindow( nId ) ) { diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 564d7fdce..712ae0e2f 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwsha.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -550,7 +550,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */ ) pHdl->NotifyChange( &aState, bForce ); } - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile rBindings.Invalidate( SID_ATTR_SIZE ); } @@ -589,7 +589,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq ) ScViewOptions aViewOptions = GetViewData()->GetOptions(); ScGridOptions aGridOptions = aViewOptions.GetGridOptions(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewFrame()->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; USHORT nSlotId = rReq.GetSlot(); diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 51f296644..4418058b6 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshb.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -313,7 +313,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) // Rahmen fuer Chart einfuegen wird abgebrochen: FuPoor* pPoor = GetDrawFuncPtr(); if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART ) - SFX_DISPATCHER().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + GetViewData()->GetDispatcher().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); MakeDrawLayer(); diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 10bde16c4..c2525abad 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshe.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -301,14 +301,14 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) // Request ausfuehren (dabei wird das SearchItem gespeichert) aSearchItem.SetWhich(SID_SEARCH_ITEM); - SFX_DISPATCHER().Execute( FID_SEARCH_NOW, + GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW, rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_STANDARD, &aSearchItem, 0L ); } else { - SFX_DISPATCHER().Execute( + GetViewData()->GetDispatcher().Execute( SID_SEARCH_DLG, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD ); } } @@ -319,7 +319,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) SvxSearchItem aSearchItem = ScGlobal::GetSearchItem(); aSearchItem.SetWhich(SID_SEARCH_ITEM); - SFX_DISPATCHER().Execute( FID_SEARCH_NOW, + GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW, rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_STANDARD, &aSearchItem, 0L ); diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index b14a1ac02..05003863e 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -191,7 +191,6 @@ ///#define _PLUGAPPL_HXX //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 425e87d25..e598d3145 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshh.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,6 @@ //sfxsh.hxx //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 46a2234e0..0eead67b9 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewdata.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1601,6 +1601,18 @@ SfxObjectShell* ScViewData::GetSfxDocShell() const return pDocShell; } +SfxBindings& ScViewData::GetBindings() +{ + DBG_ASSERT( pViewShell, "GetBindings() without ViewShell" ); + return pViewShell->GetViewFrame()->GetBindings(); +} + +SfxDispatcher& ScViewData::GetDispatcher() +{ + DBG_ASSERT( pViewShell, "GetDispatcher() without ViewShell" ); + return *pViewShell->GetViewFrame()->GetDispatcher(); +} + Window* ScViewData::GetDialogParent() { DBG_ASSERT( pViewShell, "GetDialogParent() ohne ViewShell" ); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 1344f3f1f..9681af058 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -714,7 +714,7 @@ void ScViewFunc::SetPrintRanges( const String* pPrint, ScPrintFunc( pDocSh, pDocSh->GetPrinter(), nCurTab ).UpdatePages(); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewData()->GetBindings(); rBindings.Invalidate( SID_DELETE_PRINTAREA ); pDocSh->SetDocumentModified(); @@ -1441,7 +1441,7 @@ void ScViewFunc::MakeScenario( const String& rName, const String& rComment, SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar else { - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewData()->GetBindings(); rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar rBindings.Invalidate( SID_TABLES_COUNT ); rBindings.Invalidate( SID_SELECT_SCENARIO ); @@ -1708,7 +1708,7 @@ BOOL ScViewFunc::DeleteTables(const SvUShorts &TheTabs, BOOL bRecord ) if (bWasLinked) { pDocSh->UpdateLinks(); // Link-Manager updaten - SFX_BINDINGS().Invalidate(SID_LINKS); + GetViewData()->GetBindings().Invalidate(SID_LINKS); } pDocSh->PostPaintExtras(); @@ -1775,7 +1775,7 @@ void ScViewFunc::InsertAreaLink( const String& rFile, pLink->Update(); // kein SetInCreate -> Update ausfuehren pLink->SetDoInsert(TRUE); // Default = TRUE - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewData()->GetBindings(); rBindings.Invalidate( SID_LINKS ); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator @@ -1925,7 +1925,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, pLink->Update(); pLink->SetInCreate( FALSE ); - SfxBindings& rBindings = SFX_BINDINGS(); + SfxBindings& rBindings = GetViewData()->GetBindings(); rBindings.Invalidate( SID_LINKS ); } } @@ -1976,7 +1976,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, USHORT nDestTab, BOOL bCopy ) String aUrl = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/")); aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc4" SfxStringItem aItem( SID_FILE_NAME, aUrl ); - const SfxObjectItem* pObjItem = (const SfxObjectItem*) SFX_DISPATCHER().Execute( + const SfxObjectItem* pObjItem = (const SfxObjectItem*) GetViewData()->GetDispatcher().Execute( SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aItem, 0L ); if (pObjItem) { @@ -1994,7 +1994,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, USHORT nDestTab, BOOL bCopy ) String aFactory = STRING_SCAPP; // "scalc4" SfxStringItem aItem( SID_NEWDOCDIRECT, aFactory ); const SfxViewFrameItem* pViewFrameItem = (const SfxViewFrameItem*) - SFX_DISPATCHER().Execute( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, &aItem, 0L ); + GetViewData()->GetDispatcher().Execute( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, &aItem, 0L ); if ( pViewFrameItem ) { diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 7a1d5568b..f71f3421e 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun4.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -252,7 +252,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) GetViewData()->GetEditView(eWhich, pEditView, nCol, nRow); pEditSel = new ESelection(pEditView->GetSelection()); SC_MOD()->InputEnterHandler(); - SFX_BINDINGS().Update(); // sonst kommt der Sfx durcheinander... + GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander... } else { @@ -582,7 +582,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) if ( pFlt && !nErr ) { // Code aus dem SFX geklaut! - SfxDispatcher &rDispatcher = SFX_DISPATCHER(); + SfxDispatcher &rDispatcher = GetViewData()->GetDispatcher(); SfxStringItem aFileNameItem( SID_FILE_NAME, rFile ); SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 869ae4015..226a3ead7 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun5.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,6 @@ ///#define _PLUGAPPL_HXX //#define _SFX_SHELL_HXX //#define _SFXAPP_HXX -//#define _SFX_BINDINGS_HXX //#define _SFXDISPATCH_HXX #define _SFXMSG_HXX #define _SFXOBJFACE_HXX @@ -640,11 +639,8 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, SvDataObject* pObject, SfxBoolItem aAreaNew(FN_PARAM_2, bAreaIsNew); // asynchron, damit nicht der ganze Import im Drop-Handler passiert - // nicht SFX_DISPATCHER, weil die View beim Drag&Drop nicht aktiv sein muss - SfxDispatcher* pDisp = - GetViewData()->GetViewShell()->GetViewFrame()->GetDispatcher(); - if (pDisp) - pDisp->Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON, + SfxDispatcher& rDisp = GetViewData()->GetDispatcher(); + rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON, &aDataDesc, &aTarget, &aAreaNew, 0L ); bRet = TRUE; diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 34744e4f9..f091999d5 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun6.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $ + * last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -324,7 +324,7 @@ void ScViewFunc::EditNote() // Shown-Flag nicht veraendern // Objekt aktivieren (wie in FuSelection::TestComment) - SFX_DISPATCHER().Execute(SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); + GetViewData()->GetDispatcher().Execute(SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = GetDrawFuncPtr(); if ( pPoor && pPoor->GetSlotID() == SID_DRAW_NOTEEDIT ) // hat keine RTTI |