CWS-TOOLING: integrate CWS notes7

2008-12-29 19:45:08 +0100 mod  r265824 : CWS-TOOLING: rebase CWS notes7 to trunk@265758 (milestone: DEV300:m38)
2008-12-16 14:54:42 +0100 mod  r265544 : #i97239#
2008-12-16 14:53:18 +0100 mod  r265543 : #i97239#
2008-12-16 13:36:43 +0100 mod  r265537 : 96602
2008-12-13 13:02:54 +0100 mba  r265452 : warning fixed
2008-12-13 08:20:21 +0100 mod  r265448 : search inside notes
2008-12-13 00:11:47 +0100 mod  r265447 : search inside notes
2008-12-13 00:11:09 +0100 mod  r265446 : search inside notes
2008-12-13 00:10:52 +0100 mod  r265445 : search inside notes
2008-12-12 19:39:14 +0100 mod  r265439 : search inside notes
2008-12-12 19:02:44 +0100 mod  r265438 : search inside notes
2008-12-12 16:42:07 +0100 mba  r265431 : #i80135#: search in notes
2008-12-12 16:11:54 +0100 mba  r265429 : #i80135#: search in notes
2008-12-12 16:11:02 +0100 mba  r265428 : #i80135#: search in notes
2008-12-11 20:24:20 +0100 pb  r265358 : fix: #i80135# fixes for aNotesBtn
2008-12-11 20:23:19 +0100 pb  r265357 : fix: #i80135# fixes for aNotesBtn
2008-12-11 07:42:17 +0100 pb  r265241 : fix: #i80135# CB_NOTES added
2008-12-11 07:40:36 +0100 pb  r265240 : fix: #i80135# CB_NOTES added
2008-12-11 07:32:03 +0100 pb  r265239 : fix: #i80135# CheckBox aNotesBtn added
2008-12-11 07:24:45 +0100 pb  r265238 : fix: #i80135# CheckBox aNotesBtn added
2008-12-10 15:41:31 +0100 mod  r265198 : crash using replies
2008-12-10 15:21:23 +0100 mod  r265195 : crash using replies
2008-12-10 13:45:14 +0100 mba  r265181 : warning fixed
2008-12-10 13:26:45 +0100 mba  r265178 : warning fixed
2008-12-10 11:48:23 +0100 mba  r265162 : fixed compilation error on Linux
2008-12-03 18:39:07 +0100 mod  r264806 : we don't get the Ctrl-Alt-N on mac inside a note, let's do the whole reply thing using the shell, cleaner anyway
2008-12-03 17:13:59 +0100 mod  r264802 : search dialog can be started and closed when focus is inside a note
2008-12-03 00:07:08 +0100 mod  r264733 : search inside notes
2008-12-02 18:06:08 +0100 mod  r264729 : WaE
2008-12-02 15:01:26 +0100 mod  r264703 : WaE
2008-12-02 00:20:14 +0100 mod  r264644 : WaE
2008-12-01 10:06:14 +0100 mod  r264587 : WaE
2008-12-01 01:28:34 +0100 mod  r264585 : WaE
2008-11-30 22:51:19 +0100 mod  r264584 : search inside notes
2008-11-30 17:03:04 +0100 mod  r264583 : search inside notes
2008-11-28 16:30:05 +0100 mod  r264560 : #i96602#
2008-11-28 16:14:50 +0100 mod  r264559 : test
2008-11-28 16:11:37 +0100 mod  r264558 : test
2008-11-17 17:46:10 +0100 mod  r263735 : WaE
2008-11-17 17:45:56 +0100 mod  r263734 : WaE
2008-11-17 17:37:35 +0100 mod  r263733 : revert manual fix for icu
2008-11-17 15:03:55 +0100 mod  r263726 : manual fix for icu
2008-11-17 11:17:49 +0100 mod  r263707 : manual fix for icu
2008-11-14 15:51:19 +0100 mod  r263679 : fix
2008-11-14 14:48:02 +0100 mod  r263676 : some more cleanup, redline comments not in the margin for 3.1
2008-11-14 08:37:07 +0100 mod  r263664 : end of line missing
2008-11-13 18:36:53 +0100 mod  r263660 : WaE
2008-11-13 18:20:04 +0100 mod  r263659 : #i94374#
2008-11-13 15:51:28 +0100 mod  r263648 : CWS-TOOLING: rebase CWS notes7 to trunk@263288 (milestone: DEV300:m35)
2008-11-13 08:33:19 +0100 mod  r263622 : typos
2008-11-02 23:18:19 +0100 mod  r263278 : changes notes, replies
2008-11-01 11:48:35 +0100 mod  r262873 : replies, comments
2008-11-01 11:44:57 +0100 mod  r262872 : notes search button
2008-10-10 14:34:34 +0200 mod  r262150 : migration from cvs to svn
2008-10-10 14:33:39 +0200 mod  r262149 : migration from cvs to svn

7 files changed, 216 insertions, 15 deletions

diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 1f4e205ebe82..cbba9249acaa 100755
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: _annotsh.sdi,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.82.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,6 +31,12 @@
 interface _Annotation
 [ Automation = FALSE; ]
 {
+    FN_DELETE_COMMENT
+    [
+        ExecMethod = NoteExec ;
+        StateMethod = GetNoteState ;
+    ]
+
     FN_DELETE_NOTE
     [
         ExecMethod = NoteExec ;
@@ -67,6 +73,17 @@ interface _Annotation
         StateMethod = GetNoteState ;
     ]
 
+    FN_POSTIT
+        [
+                ExecMethod = NoteExec ;
+                StateMethod = GetNoteState ;
+        ]
+
+    FN_REPLY
+    [
+        ExecMethod = NoteExec ;
+        StateMethod = GetNoteState ;
+    ]
     FN_ESCAPE // api:
     [
         ExecMethod = NoteExec ;
@@ -151,12 +168,39 @@ interface _Annotation
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
+    FN_FORMAT_FOOTNOTE_DLG // status()
+    [
+        ExecMethod = Exec ;
+    ]
+
+    SID_OPEN_XML_FILTERSETTINGS // ole : no, status : ?
+    [
+        ExecMethod = Exec ;
+    ]
+
+    FN_WORDCOUNT_DIALOG
+    [
+        ExecMethod = Exec;
+    ]
+
+       FN_NUMBERING_OUTLINE_DLG   // status(final|play)
+    [
+        ExecMethod = Exec ;
+    ]
+
     FN_INSERT_SYMBOL // api:
     [
         ExecMethod = Exec ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
+    FN_INSERT_STRING
+    [
+            ExecMethod = Exec ;
+            StateMethod = NoState ;
+            DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
     SID_ATTR_CHAR_FONT // status()
     [
         ExecMethod = Exec;
@@ -303,4 +347,43 @@ interface _Annotation
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
+
+    SID_SEARCH_ITEM // status()
+    [
+        ExecMethod = ExecSearch ;
+        StateMethod = StateSearch ;
+        Export = FALSE;
+    ]
+    FN_REPEAT_SEARCH // status(final|play)
+    [
+        ExecMethod = ExecSearch ;
+    ]
+    FID_SEARCH_NOW // status()
+    [
+        ExecMethod = ExecSearch ;
+    ]
+    SID_SEARCH_OPTIONS // status()
+    [
+        StateMethod = StateSearch ;
+    ]
+    FID_SEARCH_SEARCHSET // status()
+    [
+        ExecMethod = ExecSearch ;
+    ]
+    FID_SEARCH_REPLACESET // status()
+    [
+        ExecMethod = ExecSearch ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+      // ab hier Export = FALSE;
+    FID_SEARCH_ON // status()
+    [
+        ExecMethod = ExecSearch ;
+        Export = FALSE;
+    ]
+    FID_SEARCH_OFF // status()
+    [
+        ExecMethod = ExecSearch ;
+        Export = FALSE;
+    ]
 }
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index d2d81bf39feb..a355bdb76b55 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: _frmsh.sdi,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.190.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -232,6 +232,27 @@ interface BaseTextFrame
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
+    FN_FORMAT_FOOTNOTE_DLG // status()
+    [
+        ExecMethod = Execute;
+    ]
+
+    SID_OPEN_XML_FILTERSETTINGS // ole : no, status : ?
+    [
+        ExecMethod = Execute ;
+    ]
+
+    FN_WORDCOUNT_DIALOG
+    [
+        ExecMethod = Execute;
+    ]
+
+       FN_NUMBERING_OUTLINE_DLG   // status(final|play)
+    [
+        ExecMethod = Execute ;
+    ]
+
+
     /*****************************************************
 
  Abfragefunktionen fuer ImageMaps
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index bfb8711b5a23..9d431b8b8291 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -64,7 +64,14 @@ interface BaseTextGraphic
     SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
     [
         ExecMethod = Execute ;
-        StateMethod = NoState ;
+        StateMethod = GetAttrState ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_TWAIN_TRANSFER
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetAttrState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi
index a29ed5dbd55d..c3693daf6c19 100755
--- a/sw/sdi/annotsh.sdi
+++ b/sw/sdi/annotsh.sdi
@@ -271,11 +271,6 @@ interface Annotation : _Annotation
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    SID_SEARCH_DLG
-    [
-        StateMethod = StateDisableItems
-    ]
-
     SID_STYLE_FAMILY1
     [
         StateMethod = StateDisableItems ;
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 62a3086f9e95..dd8441aefa98 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: drawsh.sdi,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.190.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -443,6 +443,25 @@ shell SwDrawShell : SwDrawBaseShell
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
+    FN_FORMAT_FOOTNOTE_DLG // status()
+    [
+        ExecMethod = Execute;
+    ]
+
+    SID_OPEN_XML_FILTERSETTINGS // ole : no, status : ?
+    [
+        ExecMethod = Execute ;
+    ]
+
+    FN_WORDCOUNT_DIALOG
+    [
+        ExecMethod = Execute;
+    ]
+
+       FN_NUMBERING_OUTLINE_DLG   // status(final|play)
+    [
+        ExecMethod = Execute ;
+    ]
 }
 
 
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 41ec7a88f857..c18d47ec2bc0 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: drwtxtsh.sdi,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.82.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -119,6 +119,14 @@ interface TextDrawText
         ExecMethod = ExecDraw ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
+
+    FN_INSERT_STRING
+    [
+            ExecMethod = ExecDraw ;
+            StateMethod = NoState ;
+            DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
     FN_INSERT_SOFT_HYPHEN // status(final|play)
         [
                 ExecMethod = ExecDraw ;
@@ -145,25 +153,23 @@ interface TextDrawText
     ]
     SID_INSERT_LRM
     [
-                ExecMethod = ExecDraw ;
+        ExecMethod = ExecDraw ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_INSERT_ZWSP
     [
-                ExecMethod = ExecDraw ;
+        ExecMethod = ExecDraw ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_INSERT_ZWNBSP
     [
-                ExecMethod = ExecDraw ;
+        ExecMethod = ExecDraw ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-
-
     SID_ATTR_CHAR_WEIGHT // api:
     [
         ExecMethod = Execute ;
@@ -512,6 +518,27 @@ interface TextDrawText
         StateMethod = GetState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";  // e.g. disable for read-only documents
     ]
+
+       FN_FORMAT_FOOTNOTE_DLG // status()
+    [
+        ExecMethod = Execute ;
+    ]
+
+    SID_OPEN_XML_FILTERSETTINGS // ole : no, status : ?
+    [
+        ExecMethod = Execute ;
+    ]
+
+    FN_WORDCOUNT_DIALOG
+    [
+        ExecMethod = Execute;
+    ]
+
+       FN_NUMBERING_OUTLINE_DLG   // status(final|play)
+    [
+        ExecMethod = Execute ;
+    ]
+
 }
 
 interface TextDrawFont
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 6d4b9e29bf35..9bba9039eb3d 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -10013,6 +10013,55 @@ SfxVoidItem DeleteNote FN_DELETE_NOTE
     GroupId = GID_EDIT;
 ]
 
+SfxVoidItem ReplyNote FN_REPLY
+()
+[
+    /* 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 DeleteComment FN_DELETE_COMMENT
+()
+[
+    /* 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 DeleteAuthor FN_DELETE_NOTE_AUTHOR ( SfxStringItem Author FN_DELETE_NOTE_AUTHOR )
 [