summaryrefslogtreecommitdiff
path: root/sw/source/ui/inc/view.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/inc/view.hxx')
-rw-r--r--sw/source/ui/inc/view.hxx16
1 files changed, 9 insertions, 7 deletions
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index b181c85fa5ae..7cff88c897cc 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: view.hxx,v $
- * $Revision: 1.60 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,16 +29,18 @@
#include <vcl/timer.hxx>
#include <vcl/field.hxx>
+#include <svtools/htmlcfg.hxx>
#include <sfx2/viewfac.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx> // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell)
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <svx/zoomitem.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editstat.hxx>
#include "swdllapi.h"
#include <swtypes.hxx>
#include <shellid.hxx>
#include <layout/layout.hxx>
+#include <IMark.hxx>
class SwBaseShell;
class Button;
@@ -94,6 +93,7 @@ struct SwConversionArgs;
class Graphic;
class GraphicFilter;
class SwPostItMgr;
+class SwFieldBookmark;
namespace com{ namespace sun { namespace star {
namespace view{ class XSelectionSupplier; }
@@ -197,6 +197,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
static SearchAttrItemList* pReplList;
+ SvxHtmlOptions aHTMLOpt;
Timer aTimer; //Fuer verzoegerte ChgLnks waehrend
//einer Aktion
String aPageStr; //Statusanzeige, aktuelle Seite
@@ -306,6 +307,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * );
SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* );
+ SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * );
inline long GetXScroll() const;
inline long GetYScroll() const;
@@ -463,7 +465,7 @@ public:
DECL_LINK( SpellError, LanguageType * );
BOOL ExecSpellPopup( const Point& rPt );
-
+ BOOL ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
// SMARTTAGS
BOOL ExecSmartTagPopup( const Point& rPt );