cws tl74: merge with DEV300_m72

1 files changed, 26 insertions, 30 deletions

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)
 [