tl74: merge with DEV300 m60

8 files changed, 110 insertions, 42 deletions

diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index be2a86160124..ff64d80bd8af 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -128,7 +128,7 @@ interface SlideSorterView
         ExecMethod = FuSupport ;
         StateMethod = GetClipboardState ;
     ]
-    SID_PASTE2 // ole : no, status : ?
+    SID_PASTE_SPECIAL // ole : no, status : ?
     [
         ExecMethod = FuSupport ;
         StateMethod = GetClipboardState ;
@@ -199,7 +199,7 @@ interface SlideSorterView
         GroupId = GID_DOCUMENT ;
         ExecMethod = ExecCtrl ;
         StateMethod = GetCtrlState ;
-        Asynchron , Volatile , AutoUpdate ,
+        Asynchron , AutoUpdate ,
         MenuConfig , AccelConfig , ToolBoxConfig ;
     ]
     SID_SEARCH_DLG // ole : no, status : ?
diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/TaskPaneViewShell.sdi
index ede307b955bf..8d35e88155c4 100644
--- a/sd/sdi/TaskPaneViewShell.sdi
+++ b/sd/sdi/TaskPaneViewShell.sdi
@@ -308,3 +308,4 @@ shell LayoutMenu
 shell TaskPaneViewShell
 {
 }
+
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 4284594241fc..179b8c778ce2 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -62,7 +62,7 @@ interface DrawView
         GroupId = GID_DOCUMENT ;
         ExecMethod = ExecCtrl ;
         StateMethod = GetCtrlState ;
-        Asynchron , Volatile , AutoUpdate ,
+        Asynchron , AutoUpdate ,
         MenuConfig , AccelConfig , ToolBoxConfig ;
     ]
     SID_PAGEMODE // ole : no, status : play rec
@@ -281,7 +281,7 @@ interface DrawView
         StateMethod = GetMenuState ;
     ]
 
-    SID_PASTE2 // ole : no, status : ?
+    SID_PASTE_SPECIAL // ole : no, status : ?
     [
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index a41ed20e4ddd..603a6036d711 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -185,6 +185,46 @@ interface ImpressEditView : DrawView
 shell DrawViewShell
 {
     import ImpressEditView[Automation];
+    SID_INSERT_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_SHOW_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_REPLYTO_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_DELETE_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_DELETEALL_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_PREVIOUS_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_NEXT_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_DELETEALLBYAUTHOR_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
 }
 
 
diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi
index 12245e6584dc..055f762aa314 100644
--- a/sd/sdi/grviewsh.sdi
+++ b/sd/sdi/grviewsh.sdi
@@ -50,4 +50,44 @@ interface GraphicEditView : DrawView
 shell GraphicViewShell
 {
     import GraphicEditView[Automation];
+    SID_INSERT_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_SHOW_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_REPLYTO_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_DELETE_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_DELETEALL_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_PREVIOUS_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_NEXT_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
+    SID_DELETEALLBYAUTHOR_POSTIT
+    [
+        ExecMethod = ExecuteAnnotation;
+        StateMethod = GetAnnotationState;
+    ]
 }
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index a442c65e8d64..8a2c8fd971d7 100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,6 +41,7 @@ SVSDIINC=$(PRJ)$/source$/ui$/inc
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.IF "$(L10N_framework)"==""
 
 # --- Files --------------------------------------------------------
 
@@ -55,17 +56,18 @@ SVSDI1DEPEND= \
     _docsh.sdi \
     docshell.sdi \
     drtxtob.sdi \
-    drbezob.sdi \
-    drgrfob.sdi \
+        drbezob.sdi \
+        drgrfob.sdi \
     _drvwsh.sdi \
     drviewsh.sdi \
-    mediaob.sdi \
-    tables.sdi\
+        mediaob.sdi \
+        tables.sdi\
     outlnvsh.sdi \
     SlideSorterController.sdi \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
+        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 SVSDI2DEPEND= \
@@ -74,17 +76,18 @@ SVSDI2DEPEND= \
     _docsh.sdi \
     grdocsh.sdi \
     drtxtob.sdi \
-    drbezob.sdi \
-    drgrfob.sdi \
+        drbezob.sdi \
+        drgrfob.sdi \
     _drvwsh.sdi \
     grviewsh.sdi \
-    mediaob.sdi \
+        mediaob.sdi \
     outlnvsh.sdi \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
+        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 # --- Targets -------------------------------------------------------
-
+.ENDIF
 .INCLUDE :  target.mk
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 515b5b6b84ce..7c37e455276c 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -339,7 +339,6 @@ SfxVoidItem Break SID_BREAK
     GroupId = GID_MODIFY;
 ]
 
-//--------------------------------------------------------------------------
 SfxVoidItem CapturePoint SID_CAPTUREPOINT
 ()
 [
@@ -1921,7 +1920,7 @@ SfxVoidItem DeleteLayer SID_DELETE_LAYER
 [
     /* flags: */
     AutoUpdate = FALSE,
-    Cachable = Volatile,
+    Cachable = Cachable,
     FastCall = FALSE,
     HasCoreId = FALSE,
     HasDialog = TRUE,
@@ -1946,7 +1945,7 @@ SfxVoidItem DeletePage SID_DELETE_PAGE
 [
     /* flags: */
     AutoUpdate = FALSE,
-    Cachable = Volatile,
+    Cachable = Cachable,
     FastCall = FALSE,
     HasCoreId = FALSE,
     HasDialog = TRUE,
@@ -5261,31 +5260,6 @@ SfxBoolItem ParaspaceIncrease SID_PARASPACE_INCREASE
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem PasteClipboard SID_PASTE2
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Volatile,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_EDIT;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem PickThrough SID_PICK_THROUGH
 
 [
@@ -6772,7 +6746,7 @@ SfxVoidItem DeleteMasterPage SID_DELETE_MASTER_PAGE()
 [
     /* flags: */
     AutoUpdate = FALSE,
-    Cachable = Volatile,
+    Cachable = Cachable,
     FastCall = FALSE,
     HasCoreId = FALSE,
     HasDialog = TRUE,
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index c1843a4c4864..5ff7a06a9938 100644
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.sdi
@@ -90,6 +90,16 @@ shell TableObjectBar
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
+    SID_TABLE_INSERT_ROW_DLG
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
+    SID_TABLE_INSERT_COL_DLG
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
     SID_TABLE_DELETE_ROW
     [
         ExecMethod = Execute;