cws tl79: fixed problems after merging with DEV300_m77

5 files changed, 104 insertions, 7 deletions

diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
new file mode 100644
index 000000000000..51f341c5c3c0
--- /dev/null
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SFX_HTMLMODE_HXX_
+#define _SFX_HTMLMODE_HXX_
+
+
+#define HTMLMODE_ON                 0x0001
+#define HTMLMODE_PARA_BORDER        0x0002 /* Absatzumrandungen */
+#define HTMLMODE_PARA_DISTANCE      0x0004 /* bestimmte Absatzabstaende */
+#define HTMLMODE_SMALL_CAPS         0x0008 /* Kapitaelchen */
+#define HTMLMODE_FRM_COLUMNS        0x0010 /* spaltige Rahmen */
+#define HTMLMODE_SOME_STYLES        0x0020 /* mind. MS IE */
+#define HTMLMODE_FULL_STYLES        0x0040 /* == SW */
+#define HTMLMODE_BLINK              0x0080 /* blinkende Zeichen*/
+#define HTMLMODE_PARA_BLOCK         0x0100 /* Blocksatz */
+#define HTMLMODE_DROPCAPS           0x0200 /* Initialen*/
+#define HTMLMODE_FIRSTLINE          0x0400 /* Erstzeileneinzug mit Spacer == NS 3.0 */
+#define HTMLMODE_GRAPH_POS          0x0800 /* Grafikpositionen Hintergrund */
+#define HTMLMODE_FULL_ABS_POS       0x1000 /* abs. Rahmenpositionierung */
+#define HTMLMODE_SOME_ABS_POS       0x2000 /* abs. Rahmenpositionierung vollst.*/
+#define HTMLMODE_RESERVED1          0x4000
+#define HTMLMODE_RESERVED0          0x8000
+
+
+#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx
index 8b2ca43fc945..d25f0ee0b967 100755
--- a/sfx2/inc/sfx2/securitypage.hxx
+++ b/sfx2/inc/sfx2/securitypage.hxx
@@ -28,6 +28,7 @@
 #define _SECURITYPAGE_HXX_
 
 #include "sfx2/tabdlg.hxx"
+#include "sfx2/htmlmode.hxx"
 
 #include <memory>
 
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index bc4c11b53184..74210ba680ef 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -155,6 +155,7 @@
 #define SID_RELOAD                          (SID_SFX_START + 508)
 #define SID_PRINTDOCDIRECT                  (SID_SFX_START + 509)
 #define SID_PICKLIST                        (SID_SFX_START + 510)
+#define SID_ATTR_XWINDOW                    (SID_SFX_START + 777)
 #define SID_PLUGIN_MODE                     (SID_SFX_START + 827)
 #define SID_EXPORTDOC                       (SID_SFX_START + 829)
 #define SID_EXPORTDOCASPDF                  (SID_SFX_START + 1673)
@@ -998,5 +999,30 @@
 
 #endif  // #ifndef _SFXSIDS_HRC
 
+//-----------------------------------------------------------------------
+// SfxSecurityPage related stuff
+
+#define FN_EDIT2                (SID_SW_START + 1800)
+#define FN_REDLINE_PROTECT      (FN_EDIT2 + 23)
+#define FN_REDLINE_ON           (FN_EDIT2 + 25)
+
+#define SID_HTML_MODE           (SID_SVX_START + 414)
+
+// Calc-Id's used for SfxSecurityPage
+#ifndef SC_FUNCTION_START
+#define SC_FUNCTION_START       (SID_SC_START + 200)
+#endif
+#ifndef FILE_MENU_END
+#define FILE_MENU_END           (SC_FUNCTION_START + 20)
+#endif
+#ifndef EDIT_MENU_START
+#define EDIT_MENU_START         (FILE_MENU_END)
+#endif
+#ifndef SC_VIEW_START
+#define SC_VIEW_START           (SID_SC_START)
+#endif
+#define FID_CHG_RECORD          (EDIT_MENU_START + 18)
+#define SID_CHG_PROTECT         (SC_VIEW_START + 84)
+
 // eof ------------------------------------------------------------------------
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1495a560965b..f8da760bc12d 100755
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
+
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/eitem.hxx>
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index affebc8615cb..d6351143c51e 100755
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -29,22 +29,23 @@
 #include "precompiled_sfx2.hxx"
 
 #include "sfx2/securitypage.hxx"
-#include "sfx2/sfx.hrc"
+
 #include "securitypage.hrc"
 #include "sfxresid.hxx"
 
+#include <sfx2/sfx.hrc>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/objsh.hxx>
+#include <sfx2/viewsh.hxx>
+#include <sfx2/dispatch.hxx>
+
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <svl/eitem.hxx>
-#include <svx/svxids.hrc>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/dispatch.hxx>
 #include <svl/poolitem.hxx>
-#include <svtools/xwindowitem.hxx>
-#include <sfx2/objsh.hxx>
 #include <svl/intitem.hxx>
-#include <svx/htmlmode.hxx>
+#include <svtools/xwindowitem.hxx>