diff options
Diffstat (limited to 'sw/source/ui/inc/view.hxx')
| -rw-r--r-- | sw/source/ui/inc/view.hxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index bbf32cdea482..080bd8bcb316 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,7 @@ #include <vcl/timer.hxx> #include <vcl/field.hxx> +#include <vcl/floatwin.hxx> #include <svtools/htmlcfg.hxx> #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> @@ -127,13 +129,13 @@ enum ShellModes SHELL_MODE_MEDIA, SHELL_MODE_EXTRUDED_CUSTOMSHAPE, SHELL_MODE_FONTWORK, - SHELL_MODE_POSTIT + SHELL_MODE_POSTIT, + SHELL_MODE_NAVIGATION }; /*-------------------------------------------------------------------- Beschreibung: Anwendung einer Vorlage --------------------------------------------------------------------*/ - struct SwApplyTemplate { union @@ -160,11 +162,9 @@ struct SwApplyTemplate } }; - /*-------------------------------------------------------------------- Beschreibung: Sicht auf ein Dokument --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwView: public SfxViewShell { //Messehack (MA,MBA) @@ -246,6 +246,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwPostItMgr *mpPostItMgr; int nSelectionType; + FloatingWindow *mpFieldPopup; static const int MASTERENUMCOMMANDS = 6; @@ -307,6 +308,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); + SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, FloatingWindow * ); + inline long GetXScroll() const; inline long GetYScroll() const; SW_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; @@ -329,6 +332,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * ); SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * ); SW_DLLPRIVATE sal_Bool UpdateScrollbars(); + SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz ); SW_DLLPRIVATE void CreatePageButtons(sal_Bool bShow); @@ -418,7 +422,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const; virtual sal_Bool HasUIFeature( sal_uInt32 nFeature ); - virtual void ShowCursor( FASTBOOL bOn = sal_True ); + virtual void ShowCursor( bool bOn = sal_True ); virtual ErrCode DoVerb( long nVerb ); virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, @@ -468,7 +472,8 @@ public: DECL_LINK( SpellError, LanguageType * ); sal_Bool ExecSpellPopup( const Point& rPt ); - sal_Bool ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); + void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM ); + // SMARTTAGS sal_Bool ExecSmartTagPopup( const Point& rPt ); @@ -670,7 +675,6 @@ public: }; // ----------------- inline Methoden ---------------------- - inline long SwView::GetXScroll() const { return aVisArea.GetWidth() * nScrollX / 100L; @@ -686,11 +690,10 @@ inline const SwDocShell *SwView::GetDocShell() const return ((SwView*)this)->GetDocShell(); } -//*********************************************************** - SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, sal_Bool bPreview); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |