INTEGRATION: CWS layoutmanager (1.36.98); FILE MERGED

2004/02/19 17:09:30 cd 1.36.98.7: RESYNC: (1.41-1.43); FILE MERGED
2003/12/19 07:15:22 cd 1.36.98.6: #111899# Removed/Added some slots
2003/11/24 18:20:44 cd 1.36.98.5: RESYNC: (1.40-1.41); FILE MERGED
2003/11/07 09:01:48 cd 1.36.98.4: #111899# Fix read-only problem with FormatMenuState slot
2003/10/28 07:51:13 cd 1.36.98.3: #111899# Added/changed some slots for status updates
2003/10/06 11:53:22 cd 1.36.98.2: RESYNC: (1.36-1.40); FILE MERGED
2003/10/01 14:53:28 cd 1.36.98.1: #111899# Use UNO based menu implementation

1 files changed, 80 insertions, 419 deletions

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 9233d1e33a05..69ef3f2b7d91 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -637,33 +637,6 @@ SfxVoidItem AddWatch SID_BASICIDE_ADDWATCH
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem AlwaysVisible SID_TASK_ALWAYSVISIBLE
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = TRUE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxRectangleItem Area SID_WIN_POSSIZE
 
 [
@@ -691,106 +664,6 @@ SfxRectangleItem Area SID_WIN_POSSIZE
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ArrangeWinsHorizontal SID_HORIZONTALDOCKWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SfxVoidItem ArrangeHorizontal SID_HORIZONTALWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SfxVoidItem ArrangeWinsVertical SID_VERTICALDOCKWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SfxVoidItem ArrangeVertical SID_VERTICALWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxStringItem Author SID_DOCINFO_AUTHOR
 
 [
@@ -1131,61 +1004,6 @@ SfxBoolItem Beamer SID_BROWSER
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem BeamerTaskSensitive SID_BROWSER_TASK
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = TRUE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SfxVoidItem BookmarkMenu SID_BOOKMARKS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* status: */
-    SlotType = SfxStringItem
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem BreakPointsChanged SID_BASICIDE_BRKPNTSCHANGED
 ()
 [
@@ -1376,31 +1194,6 @@ SfxStringItem Caption SID_CAPTION
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem Cascade SID_CASCADEWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxTemplateItem CharStyle SID_STYLE_FAMILY1
 
 [
@@ -1480,31 +1273,6 @@ SfxStringItem ChooseMacro SID_BASICIDE_CHOOSEMACRO
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ClearDiskCache SID_CLEARDISKCACHE
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_OPTIONS;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem ClearHistory SID_CLEARHISTORY
 ()
 [
@@ -1658,31 +1426,6 @@ SfxVoidItem CloseWin SID_CLOSEWIN
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem CloseTask SID_CLOSETASK
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = TRUE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem Closing SID_CLOSING
 
 [
@@ -1764,33 +1507,6 @@ SfxStringItem CommercialUse SID_OFFICE_COMMERCIAL_USE
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem CommonTaskBarVisible SID_TOGGLECOMMONTASKBAR
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION)
 [
@@ -2049,6 +1765,33 @@ SfxStringItem CurrentTime SID_CURRENTTIME
 ]
 
 //--------------------------------------------------------------------------
+SfxBoolItem CommonTaskBarVisible SID_TOGGLECOMMONTASKBAR
+
+[
+      /* flags: */
+      AutoUpdate = FALSE,
+      Cachable = Cachable,
+      FastCall = FALSE,
+      HasCoreId = FALSE,
+      HasDialog = FALSE,
+      ReadOnlyDoc = TRUE,
+      Toggle = FALSE,
+      Container = TRUE,
+      RecordAbsolute = FALSE,
+      RecordPerSet;
+      Synchron;
+
+      Readonly = FALSE,
+
+      /* config: */
+      AccelConfig = TRUE,
+      MenuConfig = TRUE,
+      StatusBarConfig = FALSE,
+      ToolBoxConfig = TRUE,
+      GroupId = GID_VIEW;
+]
+
+//--------------------------------------------------------------------------
 SfxStringItem CurrentURL SID_CURRENT_URL
 
 [
@@ -2565,33 +2308,6 @@ SfxStringItem FileName SID_FILE_NAME
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem FloatingTask SID_FLOATING_TASK
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = TRUE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem FocusUrlBox SID_FOCUSURLBOX
 ()
 [
@@ -4881,31 +4597,6 @@ SfxUInt16Item MetricUnit SID_ATTR_METRIC
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem Minimize SID_MINIMIZEWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem Modified SID_MODIFIED
 
 [
@@ -5295,7 +4986,7 @@ SfxVoidItem ObjectCatalog SID_BASICIDE_OBJCAT
 
 //--------------------------------------------------------------------------
 SfxStringItem ObjectMenue SID_OBJECT
-
+(SfxUInt16Item VerbID SID_OBJECT)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -5310,7 +5001,7 @@ SfxStringItem ObjectMenue SID_OBJECT
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE,
+    /* Readonly = FALSE, */
 
     /* config: */
     AccelConfig = FALSE,
@@ -7173,34 +6864,6 @@ SfxObjectItem SplitVertical SID_SPLIT_VERTICAL
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem StartMenu SID_STARTMENU
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* status: */
-    SlotType = SfxStringItem
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem StartRegistrationDialog SID_ONLINE_REGISTRATION_DLG
 ()
 [
@@ -7622,56 +7285,6 @@ SfxTemplateItem TemplateFamily5 SID_STYLE_FAMILY5
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem Tile SID_TILEWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SfxVoidItem TileWins SID_TILEDOCKWINS
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem TipsDialog SID_TIPWINDOW
 
 [
@@ -8602,6 +8215,30 @@ SfxVoidItem AddonHelp SID_ADDONHELP
 ]
 
 //--------------------------------------------------------------------------
+SfxStringItem FormatMenuState SID_FORMATMENUSTATE
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_VIEW;
+]
+
+//--------------------------------------------------------------------------
 SfxVoidItem InternetDialog SID_INET_DLG
 ()
 [
@@ -8719,8 +8356,8 @@ SfxVoidItem InsertBusinessCard FN_BUSINESS_CARD
     Asynchron;
 
     /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
     StatusBarConfig = FALSE,
     ToolBoxConfig = TRUE,
     GroupId = GID_INSERT;
@@ -9001,6 +8638,31 @@ SfxVoidItem DatasourceAdministration SID_DATASOURCE_ADMINISTRATION
     GroupId = GID_APPLICATION;
 ]
 
+//--------------------------------------------------------------------------
+SfxBoolItem Minimized SID_MINIMIZED
+
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_VIEW;
+]
+
 SfxVoidItem AutoCorrectDlg SID_AUTO_CORRECT_DLG
 (SfxBoolItem ShowSwOptions SID_AUTO_CORRECT_DLG)
 [
@@ -9048,4 +8710,3 @@ SfxVoidItem OptionsTreeDialog SID_OPTIONS_TREEDIALOG
     ToolBoxConfig = TRUE,
     GroupId = GID_OPTIONS;
 ]
-