merge to m68

9 files changed, 120 insertions, 199 deletions

diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 83355d274..67d9cfb1e 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -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
@@ -89,78 +89,78 @@ SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE
 SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = TRUE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
 SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = TRUE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
 SfxBoolItem RightPane SID_RIGHT_PANE
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = FALSE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
@@ -193,52 +193,52 @@ SfxVoidItem NotesChildWindow SID_NOTES_WINDOW
 SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = TRUE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
 SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = FALSE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
@@ -267,7 +267,7 @@ SfxVoidItem TaskPaneShowPanel SID_TASK_PANE (
     GroupId = GID_VIEW;
 ]
 
-interface ViewShellBaseView : View
+interface ViewShellBaseView
 {
     SID_SWITCH_SHELL
     [
@@ -353,26 +353,26 @@ interface ViewShellBaseView : View
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_RLM 
+    SID_INSERT_RLM
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_LRM         
+    SID_INSERT_LRM
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_ZWSP         
+    SID_INSERT_ZWSP
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_ZWNBSP                
+    SID_INSERT_ZWNBSP
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
-    ]	
+    ]
     SID_RESTORE_EDITING_VIEW
     [
         ExecMethod = Execute ;
@@ -380,7 +380,7 @@ interface ViewShellBaseView : View
     ]
 }
 
-shell ViewShellBase : SfxViewShell
+shell ViewShellBase
 {
     import ViewShellBaseView[Automation];
 }
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index 743488de6..6d3267aac 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
@@ -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
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-interface DrawDocument : OfficeDocument
+interface DrawDocument
 {
     SID_PACKNGO // ole : ?, status : ?
     [
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index bdb512acf..58a6115a4 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2226,7 +2226,7 @@ interface DrawView
     
     SID_FORMATPAINTBRUSH //
     [
-        ExecMethod = FuTemporary ;
+        ExecMethod = FuPermanent ;
         StateMethod = GetMenuState ;
     ]
  
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index 2ee927d9e..159bd0522 100644
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.sdi
@@ -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
@@ -35,7 +35,7 @@ interface ImpressDocument : DrawDocument
 {
 }
 
-shell DrawDocShell : SfxObjectShell
+shell DrawDocShell
 {
     import ImpressDocument[Automation];
 }
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index 3e9915b07..4cd3ef0c9 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -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
@@ -35,7 +35,7 @@ interface GraphicDocument : DrawDocument
 {
 }
 
-shell GraphicDocShell : SfxObjectShell
+shell GraphicDocShell
 {
     import GraphicDocument[Automation];
 }
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index 8a2c8fd97..7eb22a96c 100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -51,6 +51,11 @@ SDI2NAME=$(TARGET2)
 SIDHRCNAME=SDSLOTS.HRC
 
 SVSDI1DEPEND= \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
     sdraw.sdi \
     app.sdi \
     _docsh.sdi \
@@ -67,11 +72,15 @@ SVSDI1DEPEND= \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
-        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 SVSDI2DEPEND= \
-    sdraw.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        sdraw.sdi \
     app.sdi \
     _docsh.sdi \
     grdocsh.sdi \
@@ -85,7 +94,6 @@ SVSDI2DEPEND= \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
-        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 # --- Targets -------------------------------------------------------
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index 8b985b103..db62ca5cd 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -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
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "svxslots.ilb"
-
 module
 "2DADF501-1F00-101C-A2E4-00001B4C5CE7"
 "33A1C840-1F00-101C-A2E4-00001B4C5CE7"
@@ -36,10 +34,15 @@ StarDraw
 [
 HelpText( "StarDraw Application" )
 SlotIdFile( "sdslots.hrc" )
-TypeLibFile( "sdgslots.tlb" )
 ModulePrefix( "Sd" )
 ]
 {
+        include "sfx2/sfxitems.sdi"
+        include "sfx2/sfx.sdi"
+        include "svx/svxitems.sdi"
+        include "svx/xoitems.sdi"
+        include "svx/svx.sdi"
+
         item UINT16 TbxImageItem;
 
         enum FadeEffect
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index db542fd44..3a0862a17 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -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
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "2DADF501-1F00-101C-A2E4-00001B4C5CE7"
 "33A1C840-1F00-101C-A2E4-00001B4C5CE7"
@@ -37,10 +35,15 @@ StarDraw
 [
 HelpText( "StarDraw Application" )
 SlotIdFile( "sdslots.hrc" )
-TypeLibFile( "sdslots.tlb" )
 ModulePrefix( "Sd" )
 ]
 {
+        include "sfx2/sfxitems.sdi"
+        include "sfx2/sfx.sdi"
+        include "svx/svxitems.sdi"
+        include "svx/xoitems.sdi"
+        include "svx/svx.sdi"
+
         item UINT16 TbxImageItem;
 
         enum FadeEffect
diff --git a/sd/sdi/svxitems.sdi b/sd/sdi/svxitems.sdi
deleted file mode 100644
index 42d036d4e..000000000
--- a/sd/sdi/svxitems.sdi
+++ /dev/null
@@ -1,93 +0,0 @@
-enum SvxAdjust
-{
-    SVX_ADJUST_LEFT,
-    SVX_ADJUST_RIGHT,
-    SVX_ADJUST_BLOCK,
-    SVX_ADJUST_CENTER,
-    SVX_ADJUST_BLOCKLINE,
-    SVX_ADJUST_END
-}
-
-item
-{
-    INT16 Red;
-    INT16 Green;
-    INT16 Blue;
-} SvxColorItem
-
-item SvxAdjust SvxAdjustItem;
-
-item String SvxBoxInfoItem;
-
-item String SvxBoxItem;
-item String SvxBrushItem;
-item String SvxCaseMapItem;
-item String SvxCharSetColorItem;
-item String SvxColumnItem;
-item String SvxContourItem;
-item String SvxCrossedOutItem;
-item String SvxDBDescMgr;
-item String SvxDbTypeItem;
-item String SvxEscapementItem;
-item String SvxFmtBreakItem;
-item String SvxFmtSplitItem;
-item String SvxFontHeightItem;
-item String SvxFontItem;
-item String SvxFontListItem;
-item String SvxHyphenZoneItem;
-item String SvxInFrameItem;
-item String SvxKerningItem;
-item String SvxLRSpaceItem;
-item String SvxLanguageItem;
-item String SvxLineSpacingItem;
-item String SvxMacroItem;
-item String SvxNoHyphenItem;
-item String SvxNoLinebreakItem;
-item String SvxNumberInfoItem;
-item String SvxOpaqueItem;
-item String SvxOrphansItem;
-item String SvxOverlineItem;
-item String SvxPageItem;
-item String SvxPageModelItem;
-item String SvxPagePosSizeItem;
-item String SvxPaperBinItem;
-item String SvxParaDlgLimitsItem;
-item String SvxPostItAuthorItem;
-item String SvxPostItDateItem;
-item String SvxPostItTextItem;
-item String SvxPostureItem;
-item String SvxPrintItem;
-item String SvxPropSizeItem;
-item String SvxProtectItem;
-item String SvxPtrItem;
-item String SvxRulerItem;
-item String SvxSearchItem;
-item String SvxSearchControllerItem;
-item String SvxSearchItem;
-item String SvxSetItem;
-item String SvxShadowedItem;
-item String SvxShadowItem;
-item String SvxSizeItem;
-item String SvxTabStopItem;
-item String SvxULSpaceItem;
-item String SvxUnderlineItem;
-item String SvxWeightItem;
-item String SvxWidowsItem;
-item String SvxWordLineModeItem;
-item String XFillAttrSetItem;
-item String XFillBitmapItem;
-item String XFillColorItem;
-item String XFillGradientItem;
-item String XFillHatchItem;
-item String XFillStyleItem;
-item String XLineAttrSetItem;
-item String XLineColorItem;
-item String XLineDashItem;
-item String XLineEndItem;
-item String XLineEndWidthItem;
-item String XLineEndCenterItem;
-item String XLineStartItem;
-item String XLineStartWidthItem;
-item String XLineStartCenterItem;
-item String XLineStyleItem;
-item String XLineWidthItem;