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

3 files changed, 0 insertions, 101 deletions

diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx
deleted file mode 100644
index b3b347917ddc..000000000000
--- a/sfx2/inc/about.hxx
+++ /dev/null
@@ -1,83 +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 _ABOUT_HXX
-#define _ABOUT_HXX
-
-// include ---------------------------------------------------------------
-
-#include <tools/resary.hxx>
-#include <vcl/button.hxx>
-#include <vcl/accel.hxx>
-#include <svtools/svmedit.hxx>
-#include <tools/list.hxx>
-#include <svtools/stdctrl.hxx>
-#include <sfx2/basedlgs.hxx>        // SfxModalDialog
-
-DECLARE_LIST( AccelList, Accelerator* )
-
-// class AboutDialog -----------------------------------------------------
-
-class AboutDialog : public SfxModalDialog
-{
-private:
-    OKButton        aOKButton;
-    Image           aAppLogo;
-
-    FixedInfo       aVersionText;
-    MultiLineEdit   aCopyrightText;
-    FixedInfo       aBuildData;
-
-    ResStringArray  aDeveloperAry;
-    String          aDevVersionStr;
-    String          aAccelStr;
-    String          aVersionData;
-    String          aCopyrightTextStr;
-
-    AccelList       aAccelList;
-
-    AutoTimer       aTimer;
-    long            nOff;
-    long            m_nDeltaWidth;
-    int             m_nPendingScrolls;
-
-    BOOL            bNormal;
-
-protected:
-    virtual BOOL    Close();
-    virtual void    Paint( const Rectangle& );
-
-public:
-    AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr );
-    ~AboutDialog();
-
-    DECL_LINK( TimerHdl, Timer * );
-    DECL_LINK( AccelSelectHdl, Accelerator * );
-};
-
-#endif // #ifndef _ABOUT_HXX
-
-
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 980eec04cfa6..ed874b7fdc6f 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -159,12 +159,9 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 
     SfxAppData_Impl*            pAppData_Impl;
 
-//#if 0 // _SOLAR__PRIVATE
     DECL_DLLPRIVATE_LINK(       GlobalBasicErrorHdl_Impl, StarBASIC* );
     SAL_DLLPRIVATE BOOL         SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE);
     SAL_DLLPRIVATE short        QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE);
-    SAL_DLLPRIVATE void         InitializeDisplayName_Impl();
-//#endif
 
     static SfxApplication*      Create();
     void                        Init();
@@ -184,11 +181,9 @@ public:
     static SfxApplication*      GetOrCreate();
 
     // Resource Manager
-    bool                        InitLabelResMgr( const char* _pLabelPrefix, bool _bException = false );
     SfxResourceManager&         GetResourceManager() const;
     ResMgr*                     GetSfxResManager();
     SimpleResMgr*               GetSimpleResManager();
-    ResMgr*                     GetLabelResManager() const;
     static ResMgr*              CreateResManager( const char *pPrefix );
     SimpleResMgr*               CreateSimpleResManager();
 
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 44c00cc93018..2b9b28e03a12 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -208,18 +208,7 @@
 
 #define RID_DEFAULTABOUT                    (RID_SFX_START+0)
 
-#define ABOUT_BTN_OK                        1
-
-#define ABOUT_FTXT_VERSION                  1
-#define ABOUT_FTXT_COPYRIGHT                2
-
-#define ABOUT_STR_DEVELOPER_ARY             1
-#define ABOUT_STR_FRENCH_COPYRIGHT          2
-#define ABOUT_STR_ACCEL                     3
-#define ABOUT_STR_COPYRIGHT                 4
-
 #define RID_APPTITLE                        (RID_SFX_START+4)
-#define RID_BUILDVERSION                    (RID_SFX_START+5)
 
 #define RID_DOCALREADYLOADED_DLG            (RID_SFX_START+1)
 #define RID_CANTLOADDOC_DLG                 (RID_SFX_START+2)
@@ -259,8 +248,6 @@
 #define STR_MB                              (RID_SFX_START+113)
 #define STR_GB                              (RID_SFX_START+114)
 
-#define STR_VERSION_TYPE                    (RID_SFX_START+115)
-#define STR_VERSION_ID                      (RID_SFX_START+116)
 #define STR_STANDARD_SHORTCUT               (RID_SFX_START+117)
 #define STR_REPAIREDDOCUMENT                (RID_SFX_START+118)