dr77: rebase to DEV300m96

2 files changed, 11 insertions, 112 deletions

diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
deleted file mode 100644
index 0c64214d4c37..000000000000
--- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
+++ /dev/null
@@ -1,101 +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 DBU_EXTENSIONNOTPRESENT_HXX
-#define DBU_EXTENSIONNOTPRESENT_HXX
-
-#ifndef _DIALOG_HXX //autogen
-#include <vcl/dialog.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
-#include <vcl/fixed.hxx>
-#endif
-#ifndef _SV_LSTBOX_HXX
-#include <vcl/lstbox.hxx>
-#endif
-#ifndef _SV_FIELD_HXX
-#include <vcl/field.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_
-#include <com/sun/star/report/XReportDefinition.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
-#include <com/sun/star/lang/Locale.hpp>
-#endif
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
-
-namespace dbaui
-{
-
-/*************************************************************************
-|*
-|* Groups and Sorting dialog
-|*
-\************************************************************************/
-class OExtensionNotPresentDialog :  public ModalDialog
-{
-    FixedImage                              m_aFI_WARNING;
-    FixedText                               m_aFT_TEXT;
-
-    PushButton                              m_aPB_DOWNLOAD;
-    CancelButton                            m_aPB_CANCEL;
-
-    ::com::sun::star::lang::Locale          m_nLocale;
-    com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory;
-
-    /** returns the format string.
-    */
-    // ::rtl::OUString getFormatString(::sal_Int16 _nNumberFormatIndex);
-
-    DECL_LINK(Download_Click,PushButton*);
-
-    // not CopyCTOR, no self assignment
-    OExtensionNotPresentDialog(const OExtensionNotPresentDialog&);
-    void operator =(const OExtensionNotPresentDialog&);
-
-    // get some values out of the configuration
-    rtl::OUString getFromConfigurationExtension(rtl::OUString const& _sPropertyName) const;
-    rtl::OUString getFromConfigurationExtension(rtl::OString const& _sPropertyName) const; // syntactic sugar
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::system::XSystemShellExecute > getShellExecuter() const;
-
-public:
-    OExtensionNotPresentDialog( Window* pParent, com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > );
-    virtual ~OExtensionNotPresentDialog();
-    virtual short   Execute();
-
-    inline String getText() const { return m_aFT_TEXT.GetText(); }
-};
-// =============================================================================
-} // namespace rptui
-// =============================================================================
-#endif // DBU_EXTENSIONNOTPRESENT_HXX
-
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 7e1b7df0d100..b107a0014dbb 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -64,24 +64,24 @@
 #define STR_ADABAS_ERROR_SYSTEMTABLES       RID_STR_DLG_START + 6
 #define STR_ERROR_PASSWORDS_NOT_IDENTICAL   RID_STR_DLG_START + 7
 #define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME  RID_STR_DLG_START + 8
-#define STR_DATASOURCE_DEFAULTNAME          RID_STR_DLG_START + 9
-#define STR_ERR_EMPTY_DSN_NAME              RID_STR_DLG_START + 10
+    // FREE
+    // FREE
 #define STR_ERR_USE_CONNECT_TO              RID_STR_DLG_START + 11
 #define STR_ALREADYEXISTOVERWRITE           RID_STR_DLG_START + 12
-#define STR_QUERY_DROP_ALL                  RID_STR_DLG_START + 13
+    // FREE
 #define STR_INDEX_NAME_ALREADY_USED         RID_STR_DLG_START + 14
 #define STR_ASK_FOR_DIRECTORY_CREATION      RID_STR_DLG_START + 15
 #define STR_COULD_NOT_CREATE_DIRECTORY      RID_STR_DLG_START + 16
-#define STR_ADDRESSBOOK_SYSTEM              RID_STR_DLG_START + 17
-#define STR_ADDRESSBOOK_MOZILLA             RID_STR_DLG_START + 18
-#define STR_ADDRESSBOOK_EVOLUTION           RID_STR_DLG_START + 19
     // FREE
-#define STR_ADDRESSBOOK_LDAP                RID_STR_DLG_START + 21
-#define STR_ADDRESSBOOK_OUTLOOK             RID_STR_DLG_START + 22
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
 #define STR_COMMAND_EXECUTED_SUCCESSFULLY   RID_STR_DLG_START + 23
 #define STR_DIRECTSQL_CONNECTIONLOST        RID_STR_DLG_START + 24
-#define STR_HINT_READONLY_CONNECTION        RID_STR_DLG_START + 25
-#define STR_HINT_CONNECTION_NOT_CAPABLE     RID_STR_DLG_START + 26
+    // FREE
+    // FREE
 #define STR_USERADMIN_NOT_AVAILABLE         RID_STR_DLG_START + 27
 #define STR_TAB_INDEX_SORTORDER             RID_STR_DLG_START + 28
 #define STR_TAB_INDEX_FIELD                 RID_STR_DLG_START + 29
@@ -110,7 +110,7 @@
 #define STR_NO_ADABASE_DATASOURCES          RID_STR_DLG_START + 55
 #define STR_NO_ADDITIONAL_SETTINGS          RID_STR_DLG_START + 56
 #define STR_HOSTNAME                        RID_STR_DLG_START + 57
-#define STR_ADDRESSBOOK_THUNDERBIRD         RID_STR_DLG_START + 58
+    // FREE
 #define STR_MOZILLA_PROFILE_NAME            RID_STR_DLG_START + 59
 #define STR_THUNDERBIRD_PROFILE_NAME        RID_STR_DLG_START + 60
 #define STR_EXPLAN_STRINGCONVERSION_ERROR   RID_STR_DLG_START + 61