CWS gnumake3: #i86790#: clean up mess with ooo+iso resource files

6 files changed, 49 insertions, 688 deletions

diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/about_ooo.hrc
index e49b27cb29e8..2d81fff3b454 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/about_ooo.hrc
@@ -25,11 +25,6 @@
  *
  ************************************************************************/
 
-#include <svx/svxids.hrc>
-
-#define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
-
 #define OOO_CONTRIBUTOR_LIST \
 ItemList = \
 { \
@@ -1086,242 +1081,3 @@ ItemList = \
     < "Mattia Zuliani" ; > ; \
 };
 
-
-#define DEVELOPER_LIST \
-ItemList = \
-{ \
-    < "" ; > ; \
-    < "GENERAL MANAGEMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Michael Bemmer" ; > ; \
-    < "" ; > ; \
-    < "FUNCTIONAL STAFF" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Sabine Huetsch" ; > ; \
-    < "" ; > ; \
-    < "OpenOffice.org COORDINATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Taxhet" ; > ; \
-    < "" ; > ; \
-    < "TECHNICAL ARCHITECT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Matthias Huetsch" ; > ; \
-    < "Kay Ramme" ; > ; \
-    < "" ; > ; \
-    < "PROGRAM MANAGEMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Joost Andrae" ; > ; \
-    < "Martin Damboldt" ; > ; \
-    < "Martin Hollmichel" ; > ; \
-    < "Andre Kuemmel" ; > ; \
-    < "Marcus Lange" ; > ; \
-    < "Uwe Luebbers" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME DEVELOPMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Dieter Loeschky" ; > ; \
-    < "" ; > ; \
-    < "TECHNICAL ARCHITECT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Michael Brauer" ; > ; \
-    < "Malte Timmermann" ; > ; \
-    < "" ; > ; \
-    < "ODF" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Svante Schubert" ; > ; \
-    < "" ; > ; \
-    < "DESIGN" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stella Schulze" ; > ; \
-    < "" ; > ; \
-    < "Migration" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Michael Bohn" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME WRITER & FRAMEWORK" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Mathias Bauer" ; > ; \
-    < "" ; > ; \
-    < "Henning Brinkmann" ; > ; \
-    < "Steffen Grund" ; > ; \
-    < "Hans-Peter Burow" ; > ; \
-    < "Carsten Driesner" ; > ; \
-    < "Thomas Lange" ; > ; \
-    < "Andreas Martens" ; > ; \
-    < "Frank Meies" ; > ; \
-    < "Bjoern Michaelsen" ; > ; \
-    < "Andreas Schluens" ; > ; \
-    < "Oliver Specht" ; > ; \
-    < "Oliver-Rainer Wittmann" ; > ; \
-    < "Michael Stahl" ; > ; \
-    < "Mikhail Voitenko" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME IMPRESS, GRAPHICS & BASE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Kai Ahrens" ; > ; \
-    < "" ; > ; \
-    < "Volker Ahrendt" ; > ; \
-    < "Herbert Duerr" ; > ; \
-    < "Andre Fischer" ; > ; \
-    < "Ilko Hoepping" ; > ; \
-    < "Sven Jacobi" ; > ; \
-    < "Ocke Janssen" ; > ; \
-    < "Artem Khvat" ; > ; \
-    < "Lars Langhans" ; > ; \
-    < "Armin Le Grand" ; > ; \
-    < "Christian Lippka" ; > ; \
-    < "Philipp Lohmann" ; > ; \
-    < "Frank Schoenheit" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME PROGRAMMABILITY & DEPLOYMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Kai Sommerfeld" ; > ; \
-    < "" ; > ; \
-    < "Stephan Bergmann" ; > ; \
-    < "Andreas Bregas" ; > ; \
-    < "Steffen Grund" ; > ; \
-    < "Mihaela Kedikova" ; > ; \
-    < "Tobias Krause" ; > ; \
-    < "Joachim Lingner" ; > ; \
-    < "Christoph Neumann" ; > ; \
-    < "Hennes Rohling" ; > ; \
-    < "Juergen Schmidt" ; > ; \
-    < "Ingo Schmidt-Rosbiegal" ; > ; \
-    < "Dirk Voelzke" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME CALC" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stephan Schaefer" ; > ; \
-    < "" ; > ; \
-    < "Thomas Benisch" ; > ; \
-    < "Daniel Boelzle" ; > ; \
-    < "Berend Cornelius" ; > ; \
-    < "Ingrid Halama" ; > ; \
-    < "Bjoern Milcke" ; > ; \
-    < "Niklas Nebel" ; > ; \
-    < "Eike Rathke" ; > ; \
-    < "Daniel Rentz" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "USER EXPERIENCE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Andreas Bartel" ; > ; \
-    < "Bettina Haberer" ; > ; \
-    < "Christian Jansen" ; > ; \
-    < "Frank Loehmann" ; > ; \
-    < "Elizabeth Matthis" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "QUALITY ASSURANCE & COORDINATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Nils Fuhrmann" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "RELEASE ENGINEERING " ; 8 ; > ; \
-    < "" ; > ; \
-    < "Ruediger Timm" ; > ; \
-    < "" ; > ; \
-    < "Oliver Bolte" ; > ; \
-    < "Vladimir Glazounov" ; > ; \
-    < "Ivo Hinkelmann" ; > ; \
-    < "Hans-Joachim Lankenau" ; > ; \
-    < "Jens-Heiner Rechtien" ; > ; \
-    < "Kurt Zenker" ; > ; \
-    < "" ; > ; \
-    < "DEVELOPMENT TOOLS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Joerg Jahnke" ; > ; \
-    < "" ; > ; \
-    < "Bernd Eilers" ; > ; \
-    < "Gregor Hartmann" ; > ; \
-    < "Frank Mau" ; > ; \
-    < "Nikolai Pretzell" ; > ; \
-    < "" ; > ; \
-    < "QUALITY ASSURANCE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Thorsten Ziehm" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME AUTOMATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Thorsten Bosbach" ; > ; \
-    < "Helge Delfs" ; > ; \
-    < "Joerg Sievers" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME WRITER" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Baltzer" ; > ; \
-    < "Hasan Ilter" ; > ; \
-    < "Michael Ruess" ; > ; \
-    < "Eric Savary" ; > ; \
-    < "Ulf Stroehler" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME CALC" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Oliver Craemer" ; > ; \
-    < "Thomas Klarhoefer" ; > ; \
-    < "Frank Stecher" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME IMPRESS & BASE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Christoph Lukasiak" ; > ; \
-    < "Marc Neumann" ; > ; \
-    < "Wolfram Garten" ; > ; \
-    < "Christian Guenther" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME INFRASTRUCTURE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Olaf Felka" ; > ; \
-    < "Thorsten Martens" ; > ; \
-    < "Joerg W. Skottke" ; > ; \
-    < "Andreas Treumann" ; > ; \
-    < "" ; > ; \
-    < "INFORMATION TECHNOLOGY" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Dirk Marquardt" ; > ; \
-    < "Gerd Weiss" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "MANUALS & ONLINE HELP" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Frank Peters" ; > ; \
-    < "" ; > ; \
-    < "Clayton Cornell" ; > ; \
-    < "Uwe Fischer" ; > ; \
-    < "Martina Waller" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "GLOBALIZATION PROGRAM MANAGEMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Rafaella Braconi" ; > ; \
-    < "" ; > ; \
-    < "MARKETING & OPERATIONS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "PRODUCT MANAGMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Goetz Wohlberg" ; > ; \
-    < "Lutz Hoeger" ; > ; \
-    < "" ; > ; \
-    < "MARKETING" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Rosana Ardila Biela" ; > ; \
-    < "Kay Koll" ; > ; \
-    < "Iyer Venkatesan" ; > ; \
-    < "" ; > ; \
-    < "OPERATIONS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Parker Proffitt" ; > ; \
-    < "" ; > ; \
-    < "SUN SIGMA BLACK BELT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Zimmermann" ; > ; \
-    < "" ; > ; \
-};\
-
-#define TEXT_DEFAULTABOUT \
-    Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME"; \
-    Text [ en-US ] = "About %PRODUCTNAME" ; \
-
-// ******************************************************************* EOF
-
diff --git a/svx/source/intro/about_ooo.src b/svx/source/intro/about_ooo.src
new file mode 100644
index 000000000000..8c253973bd5c
--- /dev/null
+++ b/svx/source/intro/about_ooo.src
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <svtools/svtools.hrc>
+#include <about_ooo.hrc>
+
+String ABOUT_STR_COPYRIGHT
+{
+    Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";
+};
+
+StringArray ABOUT_STR_DEVELOPER_ARY
+{
+    OOO_CONTRIBUTOR_LIST
+};
+
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
deleted file mode 100644
index 7b9067662c7a..000000000000
--- a/svx/source/intro/iso.src
+++ /dev/null
@@ -1,226 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_IMAGEMGR_HRC
-#include <svtools/imagemgr.hrc>
-#endif
-
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-
-#include "intro.hrc"
-String RID_APPTITLE
-{
-    Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
-};
-
-// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis
-String STR_VERSION_TYPE
-{
-    Text = "01";
-};
-
-// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig!
-String STR_VERSION_ID
-{
-    Text = "50";
-};
-
-String RID_BUILDVERSION
-{
-    Text = UPDVER ;
-};
-
-ModalDialog RID_DEFAULTABOUT
-{
-    HelpID = "svx:ModalDialog:RID_DEFAULTABOUT";
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 245 , 260 ) ;
-    Moveable = TRUE ;
-    SVLook = TRUE ;
-    TEXT_DEFAULTABOUT
-    OKButton ABOUT_BTN_OK
-    {
-        DefButton = TRUE ;
-        Pos = MAP_APPFONT ( 174 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    FixedText ABOUT_FTXT_VERSION
-    {
-        Pos = MAP_APPFONT ( 54 , 6 ) ;
-        Size = MAP_APPFONT ( 118 , 16 ) ;
-        WordBreak = TRUE ;
-        Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
-    };
-    MultiLineEdit ABOUT_FTXT_COPYRIGHT
-    {
-        HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 54 , 25 ) ;
-        Size = MAP_APPFONT ( 168 , 51 ) ;
-        IgnoreTab = TRUE ;
-        ReadOnly = TRUE ;
-        AutoVScroll = TRUE ;
-    };
-    String ABOUT_STR_COPYRIGHT
-    {
-        Text[ en-US ] = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are \"commercial computer software\" or \"commercial technical data\" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project.";
-    };
-    StringArray ABOUT_STR_DEVELOPER_ARY
-    {
-        DEVELOPER_LIST
-    };
-    String ABOUT_STR_FRENCH_COPYRIGHT
-    {
-        Text = "Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.\n\nThis software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.\n\nThe information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.\n\nIf this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:\n\nU.S. GOVERNMENT RIGHTS\nPrograms, software, databases, and related documentation and technical data delivered to U.S. Government customers are ""commercial computer software"" or ""commercial technical data"" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.\n\nThis software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.\n\nOracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.\n\nThis software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.\n\nThis product is based on the OpenOffice.org project." ;
-    };
-    String ABOUT_STR_ACCEL
-    {
-        Text = "SDT" ;
-    };
-};
-
-#define MASK_COL    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
-#define IMGLST_IDLST \
-    IdList = {                      \
-        SID_GENERAL_OPTIONS;        \
-        SID_LANGUAGE_OPTIONS;       \
-        SID_INET_DLG;               \
-        SID_SW_EDITOPTIONS;         \
-        SID_SW_ONLINEOPTIONS;       \
-        SID_SC_EDITOPTIONS;         \
-        SID_SD_EDITOPTIONS;         \
-        SID_SD_GRAPHIC_OPTIONS;     \
-        SID_SM_EDITOPTIONS;         \
-        SID_SCH_EDITOPTIONS;        \
-        SID_SB_STARBASEOPTIONS;     \
-        SID_FILTER_DLG;             \
-    };                              \
-    IdCount = {                     \
-        12;                         \
-    };
-
-ImageList RID_IMGLIST_TREEOPT
-{
-    Prefix = "tr";
-    MASK_COL
-    IMGLST_IDLST
-};
-ImageList RID_IMGLIST_TREEOPT_HC
-{
-    Prefix = "trh";
-    MASK_COL
-    IMGLST_IDLST
-};
-
-#define MASK_COL2   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
-#define X_IMAGE_LIST \
-    IdList = {                  \
-        IMG_IMPRESS ;           \
-        IMG_CALC ;              \
-        IMG_CALCTEMPLATE ;      \
-        IMG_CHART ;             \
-        IMG_IMPRESSTEMPLATE ;   \
-        IMG_HTML ;              \
-        IMG_MATH ;              \
-        IMG_WRITER ;            \
-        IMG_WRITERTEMPLATE ;    \
-        IMG_MACROLIB ;          \
-        IMG_GLOBAL_DOC ;        \
-        IMG_DRAW ;              \
-        IMG_DRAWTEMPLATE ;      \
-        IMG_NEWFROMTEMPLATE ;   \
-        IMG_DATABASE ;  \
-    };                          \
-    IdCount = {                 \
-        15;                     \
-    };
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG
-{
-    Prefix = "lx";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL
-{
-    Prefix = "sx";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
-    Prefix = "lxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
-    Prefix = "sxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-// ******************************************************************* EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
index 4d0686baac04..4d40d41716c0 100644
--- a/svx/source/intro/makefile.mk
+++ b/svx/source/intro/makefile.mk
@@ -27,40 +27,23 @@
 PRJ=..$/..$
 
 PRJNAME=svx
-TARGET=intro
+TARGET=about
 
 # --- Settings ------------------------------------------------------------
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES
-
 # --- Allgemein -----------------------------------------------------------
 
-LOCALIZE_ME=intro_tmpl.hrc
-
-SRS1NAME= iso
+SRS1NAME= ooo
 SRC1FILES=	\
-    $(SRS1NAME).src
+    about_ooo.src
 
-RESLIB1NAME=$(SRS1NAME)
+RESLIB1NAME=$(TARGET)
 RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES= \
-    $(SRS)$/$(SRS1NAME).srs
-
-# Version "OpenOffice.org"
-SRS2NAME= ooo
-SRC2FILES=  \
-    $(SRS2NAME).src
-
-RESLIB2NAME=$(SRS2NAME)
-RESLIB2IMAGES=$(PRJ)$/res
-RESLIB2SRSFILES= \
-    $(SRS)$/$(SRS2NAME).srs
+    $(SRS)$/ooo.srs
 
 .INCLUDE :  target.mk
 
-$(SRS)$/iso.srs: $(INCCOM)$/intro.hrc
-$(SRS)$/ooo.srs: $(INCCOM)$/intro.hrc
-
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
deleted file mode 100644
index 7f6f0ed6ff47..000000000000
--- a/svx/source/intro/ooo.src
+++ /dev/null
@@ -1,196 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-
-#ifndef _SVTOOLS_IMAGEMGR_HRC
-#include <svtools/imagemgr.hrc>
-#endif
-
-#ifndef _SFX_HRC
-#include <sfx2/sfx.hrc>
-#endif
-
-#include <svx/svxids.hrc>
-#include "intro.hrc"
-
-String RID_APPTITLE
-{
-    Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
-};
-
-// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis
-String STR_VERSION_TYPE
-{
-    Text = "01";
-};
-
-// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig!
-String STR_VERSION_ID
-{
-    Text = "50";
-};
-
-String RID_BUILDVERSION
-{
-    Text = UPDVER ;
-};
-
-ModalDialog RID_DEFAULTABOUT
-{
-    HelpID = "svx:ModalDialog:RID_DEFAULTABOUT";
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 245 , 260 ) ;
-    Moveable = TRUE ;
-    SVLook = TRUE ;
-    TEXT_DEFAULTABOUT
-    OKButton ABOUT_BTN_OK
-    {
-        DefButton = TRUE ;
-        Pos = MAP_APPFONT ( 174 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    FixedText ABOUT_FTXT_VERSION
-    {
-        Pos = MAP_APPFONT ( 54 , 6 ) ;
-        Size = MAP_APPFONT ( 118 , 16 ) ;
-        WordBreak = TRUE ;
-        Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
-    };
-    MultiLineEdit ABOUT_FTXT_COPYRIGHT
-    {
-        HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 54 , 25 ) ;
-        Size = MAP_APPFONT ( 168 , 51 ) ;
-        IgnoreTab = TRUE ;
-        ReadOnly = TRUE ;
-        AutoVScroll = TRUE ;
-    };
-    String ABOUT_STR_COPYRIGHT
-    {
-        Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";
-    };
-    StringArray ABOUT_STR_DEVELOPER_ARY
-    {
-        OOO_CONTRIBUTOR_LIST
-    };
-    String ABOUT_STR_ACCEL
-    {
-        Text = "SDT" ;
-    };
-};
-
-// imagelist with images of the "New" menu and the file open dialog
-
-#define MASK_COL2   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
-#define X_IMAGE_LIST \
-    IdList = {                  \
-        IMG_IMPRESS ;           \
-        IMG_CALC ;              \
-        IMG_CALCTEMPLATE ;      \
-        IMG_CHART ;             \
-        IMG_IMPRESSTEMPLATE ;   \
-        IMG_HTML ;              \
-        IMG_MATH ;              \
-        IMG_WRITER ;            \
-        IMG_WRITERTEMPLATE ;    \
-        IMG_MACROLIB ;          \
-        IMG_GLOBAL_DOC ;        \
-        IMG_DRAW ;              \
-        IMG_DRAWTEMPLATE ;      \
-        IMG_NEWFROMTEMPLATE ;   \
-        IMG_DATABASE;           \
-    };                          \
-    IdCount = {                 \
-        15;                     \
-    };
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG
-{
-    Prefix = "lx";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL
-{
-    Prefix = "sx";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
-    Prefix = "lxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
-    Prefix = "sxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-#define MASK_COL    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
-#define IMGLST_IDLST \
-    IdList = {                      \
-        SID_GENERAL_OPTIONS;        \
-        SID_LANGUAGE_OPTIONS;       \
-        SID_INET_DLG;               \
-        SID_SW_EDITOPTIONS;         \
-        SID_SW_ONLINEOPTIONS;       \
-        SID_SC_EDITOPTIONS;         \
-        SID_SD_EDITOPTIONS;         \
-        SID_SD_GRAPHIC_OPTIONS;     \
-        SID_SM_EDITOPTIONS;         \
-        SID_SCH_EDITOPTIONS;        \
-        SID_SB_STARBASEOPTIONS;     \
-        SID_FILTER_DLG;             \
-    };                              \
-    IdCount = {                     \
-        12;                         \
-    };
-
-ImageList RID_IMGLIST_TREEOPT
-{
-    Prefix = "tr";
-    MASK_COL
-    IMGLST_IDLST
-};
-
-ImageList RID_IMGLIST_TREEOPT_HC
-{
-    Prefix = "trh";
-    MASK_COL
-    IMGLST_IDLST
-};
-
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 934fbd76a86f..2fea800b4a00 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -29,6 +29,10 @@
 #include "app.hrc"
 
  //----------------------------------------------------------------------------
+String RID_APPTITLE
+{
+    Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
+};
 
 #define MASKCOLOR       MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };