CWS swlayoutrefactoring: resync to m96, no conflict resolution

5 files changed, 21 insertions, 139 deletions

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 4725f53f3655..d77df897a95a 100755
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -34,12 +34,6 @@ interface _Annotation
         StateMethod = GetNoteState ;
     ]
 
-    FN_DELETE_NOTE
-    [
-        ExecMethod = NoteExec ;
-        StateMethod = GetNoteState ;
-    ]
-
     FN_DELETE_NOTE_AUTHOR
     [
         ExecMethod = NoteExec ;
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index bc91e94064a7..3660722c6d4b 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -121,6 +121,25 @@ interface BaseTextDocument
         StateMethod = GetState ;
     ]
 
+<<<<<<< local
+=======
+    SID_BROWSER_MODE
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
+
+    FN_PRINT_LAYOUT
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
+    SID_MAIL_PREPAREEXPORT
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState;
+    ]
+>>>>>>> other
 }
 
 
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 994077d9552b..6ea824eab6cf 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -914,7 +914,7 @@ interface BaseText
         ExecMethod = ExecField ;
         StateMethod = StateField;
     ]
-    FN_DELETE_NOTE
+    FN_DELETE_COMMENT
     [
         ExecMethod = ExecField ;
         StateMethod = StateField;
diff --git a/sw/sdi/makefile.mk b/sw/sdi/makefile.mk
deleted file mode 100644
index e539c7a05511..000000000000
--- a/sw/sdi/makefile.mk
+++ /dev/null
@@ -1,106 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-# wx mktyplib nur unter Windows aufrufbar
-# VMB.386 und WXSRVR.EXE muessen geladen sein! (n:\mscwini\bin)
-
-PRJ=..
-
-PRJNAME=sw
-TARGET=swslots
-
-# --- Settings -----------------------------------------------------
-.IF "$(L10N_framework)"==""
-SVSDIINC=$(PRJ)$/source$/ui$/inc
-.ENDIF
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-.IF "$(L10N_framework)"==""
-SDI1NAME=$(TARGET)
-SDI1EXPORT=swriter
-#SIDHRCNAME=swslots.hrc
-
-# --- Files --------------------------------------------------------
-SVSDI1DEPEND= \
-        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
-        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
-        $(SOLARINCXDIR)$/svx/svx.sdi \
-        $(SOLARINCXDIR)$/svx/svxitems.sdi \
-        $(SOLARINCXDIR)$/svx/xoitems.sdi \
-                switems.sdi\
-        swriter.sdi\
-        _docsh.sdi\
-        docsh.sdi\
-        wdocsh.sdi\
-        wrtapp.sdi\
-        _basesh.sdi\
-        basesh.sdi\
-        _textsh.sdi\
-        textsh.sdi\
-        wtextsh.sdi\
-        _drwbase.sdi\
-        drwbassh.sdi\
-        wdrwbase.sdi\
-        formsh.sdi\
-        _formsh.sdi\
-        wformsh.sdi\
-        drawsh.sdi\
-        drwtxtsh.sdi\
-        _listsh.sdi\
-        listsh.sdi\
-        wlistsh.sdi\
-        _frmsh.sdi\
-        frmsh.sdi\
-        wfrmsh.sdi\
-        _tabsh.sdi\
-        tabsh.sdi\
-        wtabsh.sdi\
-        _grfsh.sdi\
-        grfsh.sdi\
-        wgrfsh.sdi\
-        _olesh.sdi\
-        olesh.sdi\
-        wolesh.sdi\
-        beziersh.sdi\
-        _viewsh.sdi\
-        viewsh.sdi\
-        wviewsh.sdi\
-        _mediash.sdi\
-        mediash.sdi\
-        _annotsh.sdi\
-        annotsh.sdi\
-        swslots.hrc \
-        $(INC)$/globals.hrc \
-                $(INC)$/cmdid.h 
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index aae7ec7a019c..64f52343cb7b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -9916,32 +9916,7 @@ SfxBoolItem SelectionModeDefault FN_SELECTION_MODE_DEFAULT
     GroupId = GID_EDIT;
 ]
 
-//--------------------------------------------------------------------------
-SfxVoidItem DeleteNote FN_DELETE_NOTE
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_EDIT;
-]
-
-SfxVoidItem ReplyNote FN_REPLY
+SfxVoidItem ReplyComment FN_REPLY
 ()
 [
     /* flags: */