From 5ec9de5266069c22f12305392eaec5a7eac3204b Mon Sep 17 00:00:00 2001
From: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue, 17 Nov 2009 12:33:55 +0100
Subject: cbosdo02: field patch to upstream applied

---
 sw/source/ui/inc/view.hxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sw/source/ui/inc/view.hxx')

diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 7ddfc2775299..b11f1a6e00ef 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -42,6 +42,7 @@
 #include <swtypes.hxx>
 #include <shellid.hxx>
 #include <layout/layout.hxx>
+#include <IMark.hxx>
 
 class SwBaseShell;
 class Button;
@@ -94,6 +95,7 @@ struct SwConversionArgs;
 class Graphic;
 class GraphicFilter;
 class SwPostItMgr;
+class SwFieldBookmark;
 
 namespace com{ namespace sun { namespace star {
     namespace view{ class XSelectionSupplier; }
@@ -465,7 +467,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 );
 
-- 
cgit 


From 55f1f483cfa4cde111593782f17c514a0056d7f0 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 8 Jan 2010 18:32:51 +0100
Subject: #i107450#: build all other modules with new editeng lib

---
 sw/source/ui/inc/view.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sw/source/ui/inc/view.hxx')

diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 7ddfc2775299..94e64c7493b8 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -35,9 +35,9 @@
 #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>
-- 
cgit 


From a3dad64d25dfe6ef0297d6d2fbaf72fcef5017fb Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Wed, 13 Jan 2010 22:25:07 +0100
Subject: #i107450#: move more code out of svx

---
 sw/source/ui/inc/view.hxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sw/source/ui/inc/view.hxx')

diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 94e64c7493b8..9dfde47be3dc 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -32,6 +32,7 @@
 
 #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)
@@ -197,6 +198,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 +308,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;
-- 
cgit 


From 1a359bd2a8d7621574942287703e7df69ebffa16 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 12 Feb 2010 15:01:35 +0100
Subject: changefileheader2: #i109125#: change source file copyright notice
 from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile,
 Revision)

---
 sw/source/ui/inc/view.hxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sw/source/ui/inc/view.hxx')

diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index b181c85fa5ae..83d0f1b40e09 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
-- 
cgit