cws tl74: merge with DEV300_m72

9 files changed, 122 insertions, 153 deletions

diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 5da69fa977f3..f20cdbd7c385 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appslots.sdi,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 6fb1b161b2f2..d16239535193 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 35f410db44af..3c6dae423b9f 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk
index f8def0a3c23c..800a48d7f608 100644
--- a/sfx2/sdi/makefile.mk
+++ b/sfx2/sdi/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/mdislots.sdi b/sfx2/sdi/mdislots.sdi
index 88ffba45051e..2759f6bcd4d8 100644
--- a/sfx2/sdi/mdislots.sdi
+++ b/sfx2/sdi/mdislots.sdi
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index ed69beb09bef..3b5bdda55f49 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -5897,31 +5893,31 @@ SfxVoidItem ExportDialog SID_EXPORT_DIALOG
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ImportDialog SID_IMPORT_DIALOG

-()

-[

-    /* flags: */

-    AutoUpdate = FALSE,

-    Cachable = Cachable,

-    FastCall = FALSE,

-    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_DOCUMENT;

-]

-

-//--------------------------------------------------------------------------

+SfxVoidItem ImportDialog SID_IMPORT_DIALOG
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    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_DOCUMENT;
+]
+
+//--------------------------------------------------------------------------
 SfxVoidItem SaveConfiguration SID_SAVECONFIG
 (SfxStringItem FileName SID_CFGFILE)
 [
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index 30fe37ffa5f0..d9be2f587eda 100644
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
@@ -1,89 +1,89 @@
-    item void       SfxVoidItem;

-    item BOOL       SfxBoolItem;

-    item INT32      SfxUInt16Item;

-    item INT16      SfxInt16Item;

-    item INT32      SfxUInt32Item;

-    item INT32      SfxInt32Item;

-    item String     SfxStringItem;

-    item BYTE       SfxByteItem;

-    item INT16      SfxEnumItem;

-    item INT16      SfxAllEnumItem;

-    item INT16      TbxImageItem;

-

-    item String     SbxItem;                //! Dummy

-    item String     SfxObjectItem;          //! Dummy

-    item String     SfxTemplateItem;        //! Dummy

-    item String     SfxMacroInfoItem;       //! Dummy

-    item String     SfxImageItem;           //! Dummy

-    item String     SfxFrameItem;           //! Dummy

-    item String     SfxObjectShellItem      //! Dummy

-    item String     SfxUsrAnyItem           //! Dummy

-

-    struct Point

-    {

-        INT32   X   MID_X;

-        INT32   Y   MID_Y;

-    };

-    item Point SfxPointItem;

-

-    struct Rectangle

-    {

-        INT32   Left    MID_RECT_LEFT;

-        INT32   Top     MID_RECT_TOP;

-        INT32   Width   MID_WIDTH;

-        INT32   Height  MID_HEIGHT;

-    };

-    item Rectangle SfxRectangleItem;

-

-    struct DocInfo

-    {

-        BOOL        UseUserData        MID_DOCINFO_USEUSERDATA;

-        BOOL        DeleteUserData    MID_DOCINFO_DELETEUSERDATA;

-        String      Title              MID_DOCINFO_TITLE;

-        String      Subject            MID_DOCINFO_SUBJECT;

-        String      KeyWords           MID_DOCINFO_KEYWORDS;

-        String      Description        MID_DOCINFO_DESCRIPTION;

-        BOOL        AutoReload         MID_DOCINFO_AUTOLOADENABLED;

-        INT32       AutoReloadTime     MID_DOCINFO_AUTOLOADSECS;

-        String      AutoReloadURL      MID_DOCINFO_AUTOLOADURL;

-        String      AutoReloadFrame    MID_DOCINFO_DEFAULTTARGET;

-    };

-    item DocInfo SfxDocumentInfoItem;

-

-    struct SvxSearch

-    {

-        INT16       StyleFamily     MID_SEARCH_STYLEFAMILY;

-        UINT16      CellType        MID_SEARCH_CELLTYPE;

-        BOOL        RowDirection    MID_SEARCH_ROWDIRECTION;

-        BOOL        AllTables       MID_SEARCH_ALLTABLES;

-        BOOL        Backward        MID_SEARCH_BACKWARD;

-        BOOL        Pattern         MID_SEARCH_PATTERN;

-        BOOL        Content         MID_SEARCH_CONTENT;

-        BOOL        AsianOptions    MID_SEARCH_ASIANOPTIONS;

-        INT16       AlgorithmType   MID_SEARCH_ALGORITHMTYPE;

-        INT32       SearchFlags     MID_SEARCH_FLAGS;

-        String      SearchString    MID_SEARCH_SEARCHSTRING;

-        String      ReplaceString   MID_SEARCH_REPLACESTRING;

-        INT16       Locale          MID_SEARCH_LOCALE;

-        INT32       ChangedChars    MID_SEARCH_CHANGEDCHARS;

-        INT32       DeletedChars    MID_SEARCH_DELETEDCHARS;

-        INT32       InsertedChars   MID_SEARCH_INSERTEDCHARS;

-        INT32       TransliterateFlags MID_SEARCH_TRANSLITERATEFLAGS;

-        INT16       Command         MID_SEARCH_COMMAND;

-    };

-    item SvxSearch SvxSearchItem;

-

-    struct SvxSize

-    {

-        INT32               Width           MID_SIZE_WIDTH;

-        INT32               Height          MID_SIZE_HEIGHT;

-    };

-    item SvxSize SvxSizeItem;

-

-    struct SfxScriptOrganizer

-    {

-        String Language MID_SCRIPT_ORGANIZER_LANGUAGE;

-    };

-    item SfxScriptOrganizer SfxScriptOrganizerItem;

-    item String     SvxClipboardFmtItem;    //! Dummy

-

+    item void       SfxVoidItem;
+    item BOOL       SfxBoolItem;
+    item INT32      SfxUInt16Item;
+    item INT16      SfxInt16Item;
+    item INT32      SfxUInt32Item;
+    item INT32      SfxInt32Item;
+    item String     SfxStringItem;
+    item BYTE       SfxByteItem;
+    item INT16      SfxEnumItem;
+    item INT16      SfxAllEnumItem;
+    item INT16      TbxImageItem;
+
+    item String     SbxItem;                //! Dummy
+    item String     SfxObjectItem;          //! Dummy
+    item String     SfxTemplateItem;        //! Dummy
+    item String     SfxMacroInfoItem;       //! Dummy
+    item String     SfxImageItem;           //! Dummy
+    item String     SfxFrameItem;           //! Dummy
+    item String     SfxObjectShellItem      //! Dummy
+    item String     SfxUsrAnyItem           //! Dummy
+
+    struct Point
+    {
+        INT32   X   MID_X;
+        INT32   Y   MID_Y;
+    };
+    item Point SfxPointItem;
+
+    struct Rectangle
+    {
+        INT32   Left    MID_RECT_LEFT;
+        INT32   Top     MID_RECT_TOP;
+        INT32   Width   MID_WIDTH;
+        INT32   Height  MID_HEIGHT;
+    };
+    item Rectangle SfxRectangleItem;
+
+    struct DocInfo
+    {
+        BOOL        UseUserData        MID_DOCINFO_USEUSERDATA;
+        BOOL        DeleteUserData    MID_DOCINFO_DELETEUSERDATA;
+        String      Title              MID_DOCINFO_TITLE;
+        String      Subject            MID_DOCINFO_SUBJECT;
+        String      KeyWords           MID_DOCINFO_KEYWORDS;
+        String      Description        MID_DOCINFO_DESCRIPTION;
+        BOOL        AutoReload         MID_DOCINFO_AUTOLOADENABLED;
+        INT32       AutoReloadTime     MID_DOCINFO_AUTOLOADSECS;
+        String      AutoReloadURL      MID_DOCINFO_AUTOLOADURL;
+        String      AutoReloadFrame    MID_DOCINFO_DEFAULTTARGET;
+    };
+    item DocInfo SfxDocumentInfoItem;
+
+    struct SvxSearch
+    {
+        INT16       StyleFamily     MID_SEARCH_STYLEFAMILY;
+        UINT16      CellType        MID_SEARCH_CELLTYPE;
+        BOOL        RowDirection    MID_SEARCH_ROWDIRECTION;
+        BOOL        AllTables       MID_SEARCH_ALLTABLES;
+        BOOL        Backward        MID_SEARCH_BACKWARD;
+        BOOL        Pattern         MID_SEARCH_PATTERN;
+        BOOL        Content         MID_SEARCH_CONTENT;
+        BOOL        AsianOptions    MID_SEARCH_ASIANOPTIONS;
+        INT16       AlgorithmType   MID_SEARCH_ALGORITHMTYPE;
+        INT32       SearchFlags     MID_SEARCH_FLAGS;
+        String      SearchString    MID_SEARCH_SEARCHSTRING;
+        String      ReplaceString   MID_SEARCH_REPLACESTRING;
+        INT16       Locale          MID_SEARCH_LOCALE;
+        INT32       ChangedChars    MID_SEARCH_CHANGEDCHARS;
+        INT32       DeletedChars    MID_SEARCH_DELETEDCHARS;
+        INT32       InsertedChars   MID_SEARCH_INSERTEDCHARS;
+        INT32       TransliterateFlags MID_SEARCH_TRANSLITERATEFLAGS;
+        INT16       Command         MID_SEARCH_COMMAND;
+    };
+    item SvxSearch SvxSearchItem;
+
+    struct SvxSize
+    {
+        INT32               Width           MID_SIZE_WIDTH;
+        INT32               Height          MID_SIZE_HEIGHT;
+    };
+    item SvxSize SvxSizeItem;
+
+    struct SfxScriptOrganizer
+    {
+        String Language MID_SCRIPT_ORGANIZER_LANGUAGE;
+    };
+    item SfxScriptOrganizer SfxScriptOrganizerItem;
+    item String     SvxClipboardFmtItem;    //! Dummy
+
diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi
index 44cd45d00868..b69bd5df93f3 100644
--- a/sfx2/sdi/sfxslots.sdi
+++ b/sfx2/sdi/sfxslots.sdi
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 1919f3d7a6ab..4d14d927adf6 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify