diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
| commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
| tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /dbaccess/source/ui/inc | |
| parent | fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff) | |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'dbaccess/source/ui/inc')
35 files changed, 100 insertions, 832 deletions
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 0603efee7195..6691a05c897a 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -23,18 +23,18 @@ #include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> #include "SqlNameEdit.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { class OPropColumnEditCtrl : public OSQLNameEdit { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; short m_nPos; OUString m_strHelpText; public: - OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const override { return IsValueChangedFromSaved(); } @@ -44,12 +44,12 @@ namespace dbaui class OPropEditCtrl : public Edit { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; short m_nPos; OUString m_strHelpText; public: - OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const override { return IsValueChangedFromSaved(); } @@ -63,7 +63,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const override { return IsValueChangedFromSaved(); } @@ -79,7 +79,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); bool IsModified() const { return IsValueChangedFromSaved(); } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 495a1e6428c7..7abbda015b36 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -133,8 +133,8 @@ namespace dbaui bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); - VclPtr<OPropNumericEditCtrl> CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId); - VclPtr<FixedText> CreateText(sal_uInt16 _nTextRes); + VclPtr<OPropNumericEditCtrl> CreateNumericControl(const char* pHelpId, short _nProperty, const OString& _sHelpId); + VclPtr<FixedText> CreateText(const char* pTextRes); void InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); protected: diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 18f90fcc300a..cbea8346b2b0 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX #include <svl/undo.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -29,13 +29,13 @@ namespace dbaui class OCommentUndoAction : public SfxUndoAction { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: OUString m_strComment; // undo, redo comment public: - OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); } + OCommentUndoAction(const char* pCommentID) { m_strComment = DBA_RES(pCommentID); } virtual OUString GetComment() const override { return m_strComment; } }; diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index ffe027d59f54..4af8a9846100 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -21,7 +21,7 @@ #include "singledoccontroller.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "JoinTableView.hxx" #include "JoinDesignView.hxx" #include "TableConnectionData.hxx" @@ -43,7 +43,7 @@ namespace dbaui class OJoinController : public OJoinController_BASE { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: TTableConnectionData m_vTableConnectionData; TTableWindowData m_vTableData; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 469b5636c33e..46749fc1e3ec 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -26,7 +26,7 @@ #include <vcl/msgbox.hxx> #include "JoinTableView.hxx" #include "RelControliFace.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "RelationControl.hxx" namespace dbaui @@ -35,7 +35,7 @@ namespace dbaui class ORelationDialog : public ModalDialog ,public IRelationControlInterface { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr<OTableListBoxControl> m_xTableControl; OJoinTableView::OTableWindowMap* m_pTableMap; diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 4629155ca21c..613b8422ca7e 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX #include "singledoccontroller.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/XObjectOutputStream.hpp> @@ -38,7 +38,7 @@ namespace dbaui class OTableController : public OTableController_BASE { private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::vector< std::shared_ptr<OTableRow> > m_vRowList; OTypeInfoMap m_aTypeInfo; std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index ed0fd74deb74..ee4850107f43 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include "moduledbu.hxx" +#include "core_resource.hxx" class Edit; namespace dbaui @@ -43,7 +43,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox typedef std::map<OUString, TPrivileges> TTablePrivilegeMap; - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; css::uno::Reference< css::container::XNameAccess > m_xUsers; css::uno::Reference< css::container::XNameAccess > m_xTables; diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index a9bb0effd649..1ef136e58abf 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX #include "DExport.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "commontypes.hxx" #include <com/sun/star/awt/FontDescriptor.hpp> @@ -183,7 +183,7 @@ namespace dbaui class ORowSetImportExport : public ODatabaseImportExport { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::vector<sal_Int32> m_aColumnMapping; std::vector<sal_Int32> m_aColumnTypes; css::uno::Reference< css::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 91d116c3b685..4dae7caf265f 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -309,9 +309,9 @@ namespace dbaui /** returns the result of the user action when view the query dialog. @param _pParent The parent of the dialog - @param _nTitle + @param pTitle A string resource id for the text which will be displayed as title. - @param _nText + @param pText A string resource id for the text which will be displayed above the buttons. When the string contains a #1. This will be replaced by the name. @param _bAll @@ -321,7 +321,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); + sal_Int32 askForUserAction(vcl::Window* _pParent, const char* pTitle, const char* pText, bool _bAll, const OUString& _sName); /** creates a new view from a query or table @param _sName diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 81cafa3360b2..5c1ced4d136a 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -24,7 +24,7 @@ #include "dsntypes.hxx" #include "IItemSetHelper.hxx" #include <comphelper/uno3.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <memory> namespace com { namespace sun { namespace star { @@ -43,9 +43,9 @@ namespace dbaui /** implements the user admin dialog */ - class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient + class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; css::uno::Reference< css::sdbc::XConnection> m_xConnection; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 3e94b4f41cb1..5ac918089a28 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -21,7 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX #include "IItemSetHelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <sfx2/tabdlg.hxx> @@ -38,7 +38,7 @@ namespace dbaui ,public IItemSetHelper ,public IDatabaseSettingsDialog { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; protected: diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index ae53e8ee88a6..f0f5160ae75b 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -21,7 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX #include <dbaccess/genericcontroller.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "brwview.hxx" #include "sbagrid.hxx" @@ -76,7 +76,7 @@ namespace dbaui // for implementing the XFormController class FormControllerImpl; friend class FormControllerImpl; - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; // our rowset css::uno::Reference< css::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 5b51cf707a1a..f8701058b4e6 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -22,8 +22,6 @@ #include <vcl/window.hxx> -#include <tools/resid.hxx> - #include <com/sun/star/awt/PosSize.hpp> #include <dbaccess/dataview.hxx> #include <unotools/eventlisteneradapter.hxx> diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 8d6771ad6039..5bce762d0c68 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -29,9 +29,7 @@ namespace dbaui // OCharsetDisplay typedef ::dbtools::OCharsetMap OCharsetDisplay_Base; - class OCharsetDisplay - :protected OCharsetDisplay_Base - ,protected SvxTextEncodingTable + class OCharsetDisplay : protected OCharsetDisplay_Base { protected: OUString m_aSystemDisplayName; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 39d664240dc2..215b6c760d22 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -97,7 +97,7 @@ public: protected: // adds a new detail page and remove all the old ones - void addDetailPage(sal_uInt16 _nPageId,sal_uInt16 _nTextId,CreateTabPage pCreateFunc); + void addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage pCreateFunc); virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; virtual short Ok() override; diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 100e21839e95..695a6a3e2734 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX #include "ScrollHelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -51,7 +51,7 @@ namespace dbaui class IContextMenuProvider; class DBTreeListBox :public SvTreeListBox { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; OScrollHelper m_aScrollHelper; Timer m_aTimer; // is needed for table updates Point m_aMousePos; diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc deleted file mode 100644 index e9db2315c125..000000000000 --- a/dbaccess/source/ui/inc/dbu_brw.hrc +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC - -#include "dbu_resource.hrc" - - // FREE RID_STR_BRW_START + 0 -#define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 -#define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 -#define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 -#define RID_STR_UNDO_MODIFY_RECORD RID_STR_BRW_START + 5 -#define STR_NO_COLUMNNAME_MATCHING RID_STR_BRW_START + 6 -#define RID_STR_SAVE_CURRENT_RECORD RID_STR_BRW_START + 7 -#define STR_DATASOURCE_GRIDCONTROL_NAME RID_STR_BRW_START + 8 -#define STR_OPENTABLES_WARNINGS RID_STR_BRW_START + 9 -#define STR_OPENTABLES_WARNINGS_DETAILS RID_STR_BRW_START + 10 -#define STR_CONNECTING_DATASOURCE RID_STR_BRW_START + 11 -#define STR_LOADING_QUERY RID_STR_BRW_START + 12 -#define STR_LOADING_TABLE RID_STR_BRW_START + 13 - -// please adjust checking before insert new strings - -#if STR_LOADING_TABLE > RID_STR_BRW_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc deleted file mode 100644 index 8ae4595b628e..000000000000 --- a/dbaccess/source/ui/inc/dbu_control.hrc +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC - -#include "dbu_resource.hrc" - -#define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START -#define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 -#define STR_TABLE_PRIV_DELETE RID_STR_CONTROL_START + 2 -#define STR_TABLE_PRIV_UPDATE RID_STR_CONTROL_START + 3 -#define STR_TABLE_PRIV_ALTER RID_STR_CONTROL_START + 4 -#define STR_TABLE_PRIV_REFERENCE RID_STR_CONTROL_START + 5 -#define STR_TABLE_PRIV_DROP RID_STR_CONTROL_START + 6 -#define STR_TABLE_PRIV_SELECT RID_STR_CONTROL_START + 7 -#define STR_ALL_TABLES_AND_VIEWS RID_STR_CONTROL_START + 8 -#define STR_NOTABLEINFO RID_STR_CONTROL_START + 11 -#define STR_ALL_TABLES RID_STR_CONTROL_START + 12 -#define STR_ALL_VIEWS RID_STR_CONTROL_START + 13 - -// please adjust checking before insert new strings - -#if STR_ALL_VIEWS > RID_STR_CONTROL_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc deleted file mode 100644 index 960c175a3ff6..000000000000 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ /dev/null @@ -1,155 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC - -#include "dbu_resource.hrc" - -#define PAGE_X 281 -#define PAGE_Y 215 -#define WIZARD_PAGE_X 225 -#define WIZARD_PAGE_Y 240 - -//constants for the wizards -#define INDENT_BELOW_RADIO 10 - -#define STR_PARENTTITLE_GENERAL RID_STR_DLG_START + 0 - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE -#define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 -#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 - // FREE - // FREE -#define STR_ERR_USE_CONNECT_TO RID_STR_DLG_START + 11 -#define STR_ALREADYEXISTOVERWRITE RID_STR_DLG_START + 12 -#define STR_COULD_NOT_LOAD_ODBC_LIB RID_STR_DLG_START + 13 -#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_UNSUPPORTED_DATASOURCE_TYPE RID_STR_DLG_START + 17 - // 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_ADD_TABLES RID_STR_DLG_START + 25 -#define STR_ADD_TABLE_OR_QUERY RID_STR_DLG_START + 26 -#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 -#define STR_ORDER_ASCENDING RID_STR_DLG_START + 30 -#define STR_ORDER_DESCENDING RID_STR_DLG_START + 31 -#define STR_CONFIRM_DROP_INDEX RID_STR_DLG_START + 32 -#define STR_LOGICAL_INDEX_NAME RID_STR_DLG_START + 33 -#define STR_CONNECTION_TEST RID_STR_DLG_START + 34 -#define STR_CONNECTION_SUCCESS RID_STR_DLG_START + 35 - // FREE -#define STR_JDBCDRIVER_SUCCESS RID_STR_DLG_START + 37 -#define STR_JDBCDRIVER_NO_SUCCESS RID_STR_DLG_START + 38 -#define STR_MSACCESS_FILTERNAME RID_STR_DLG_START + 39 -#define STR_CONNECTION_NO_SUCCESS RID_STR_DLG_START + 40 -#define STR_DBASE_PATH_OR_FILE RID_STR_DLG_START + 41 -#define STR_TEXT_HEADERTEXT RID_STR_DLG_START + 42 -#define STR_TEXT_HELPTEXT RID_STR_DLG_START + 43 -#define STR_TEXT_PATH_OR_FILE RID_STR_DLG_START + 45 -#define STR_FLAT_PATH_OR_FILE RID_STR_DLG_START + 46 -#define STR_CALC_PATH_OR_FILE RID_STR_DLG_START + 47 -#define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 -#define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 -#define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 -#define STR_WRITER_PATH_OR_FILE RID_STR_DLG_START + 51 -#define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 -#define STR_COMMONURL RID_STR_DLG_START + 53 -#define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 -#define STR_EXCEPTION_ERRORCODE 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_EXCEPTION_STATUS RID_STR_DLG_START + 58 -#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 -#define STR_EXCEPTION_ERROR RID_STR_DLG_START + 62 -#define STR_EXCEPTION_WARNING RID_STR_DLG_START + 63 -#define STR_EXCEPTION_INFO RID_STR_DLG_START + 64 -#define STR_EXCEPTION_DETAILS RID_STR_DLG_START + 65 -#define STR_MSACCESS_2007_FILTERNAME RID_STR_DLG_START + 66 -#define STR_FIREBIRD_FILTERNAME RID_STR_DLG_START + 67 - -#define STR_DBWIZARDTITLE RID_STR_DLG_START + 68 -#define STR_PAGETITLE_INTROPAGE RID_STR_DLG_START + 69 -#define STR_PAGETITLE_DBASE RID_STR_DLG_START + 70 -#define STR_PAGETITLE_TEXT RID_STR_DLG_START + 71 -#define STR_PAGETITLE_MSACCESS RID_STR_DLG_START + 72 -#define STR_PAGETITLE_LDAP RID_STR_DLG_START + 73 -#define STR_PAGETITLE_ADO RID_STR_DLG_START + 74 -#define STR_PAGETITLE_JDBC RID_STR_DLG_START + 75 -#define STR_PAGETITLE_ORACLE RID_STR_DLG_START + 76 -#define STR_PAGETITLE_MYSQL RID_STR_DLG_START + 77 -#define STR_PAGETITLE_ODBC RID_STR_DLG_START + 78 -#define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET RID_STR_DLG_START + 79 -#define STR_PAGETITLE_AUTHENTIFICATION RID_STR_DLG_START + 80 -#define STR_PAGETITLE_MYSQL_NATIVE RID_STR_DLG_START + 81 -#define STR_PAGETITLE_FINAL RID_STR_DLG_START + 82 - -#define STR_DBASE_HEADERTEXT RID_STR_DLG_START + 83 -#define STR_DBASE_HELPTEXT RID_STR_DLG_START + 84 - -#define STR_MSACCESS_HEADERTEXT RID_STR_DLG_START + 85 -#define STR_MSACCESS_HELPTEXT RID_STR_DLG_START + 86 - -#define STR_ADO_HEADERTEXT RID_STR_DLG_START + 87 -#define STR_ADO_HELPTEXT RID_STR_DLG_START + 88 - -#define STR_ODBC_HEADERTEXT RID_STR_DLG_START + 89 -#define STR_ODBC_HELPTEXT RID_STR_DLG_START + 90 - -#define STR_JDBC_HEADERTEXT RID_STR_DLG_START + 91 -#define STR_JDBC_HELPTEXT RID_STR_DLG_START + 92 - -#define STR_MYSQLJDBC_HEADERTEXT RID_STR_DLG_START + 93 -#define STR_MYSQLJDBC_HELPTEXT RID_STR_DLG_START + 94 -#define STR_MYSQL_DRIVERCLASSTEXT RID_STR_DLG_START + 95 -#define STR_MYSQL_DEFAULT RID_STR_DLG_START + 96 - -#define STR_ORACLE_HEADERTEXT RID_STR_DLG_START + 97 -#define STR_ORACLE_DEFAULT RID_STR_DLG_START + 98 -#define STR_ORACLE_DRIVERCLASSTEXT RID_STR_DLG_START + 99 -#define STR_ORACLE_HELPTEXT RID_STR_DLG_START + 100 - -#define STR_DATABASE_TYPE_CHANGE RID_STR_DLG_START + 101 - -#define STR_COULD_NOT_CONVERT_PARAM RID_STR_DLG_START + 102 - -// please adjust checking before insert new strings - -#define LAST_STR_HERE RID_STR_DLG_START + 103 - -#if LAST_STR_HERE > RID_STR_DLG_END -#error Resource-Id Overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_dlg.hxx index f8586e40f8cd..2990728ff047 100644 --- a/dbaccess/source/ui/inc/dbu_rel.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hxx @@ -16,23 +16,18 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC +#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC +#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" -#define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START -#define STR_RELATIONDESIGN RID_STR_REL_START + 1 -#define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STR_REL_START + 2 -#define STR_QUERY_REL_DELETE_WINDOW RID_STR_REL_START + 3 -#define STR_QUERY_REL_EDIT RID_STR_REL_START + 4 -#define STR_QUERY_REL_CREATE RID_STR_REL_START + 5 -#define STR_QUERY_REL_COULD_NOT_CREATE RID_STR_REL_START + 6 -// please adjust checking before insert new strings +#define PAGE_X 281 +#define PAGE_Y 215 +#define WIZARD_PAGE_X 225 +#define WIZARD_PAGE_Y 240 -#if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_END -#error Resource ID overflow in #file, #line -#endif +//constants for the wizards +#define INDENT_BELOW_RADIO 10 #endif diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc deleted file mode 100644 index ae37b93478f1..000000000000 --- a/dbaccess/source/ui/inc/dbu_misc.hrc +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC - -#include "dbu_resource.hrc" - -#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 -#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 -#define STR_WIZ_NAME_ALREADY_DEFINED RID_STR_MISC_START + 4 -#define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 -#define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 -#define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 -#define STR_COULDNOTOPEN_LINKEDDOC RID_STR_MISC_START + 8 -#define STR_SUGGEST_APPEND_TABLE_DATA RID_STR_MISC_START + 9 -#define STR_UNDO_COLON RID_STR_MISC_START + 10 -#define STR_REDO_COLON RID_STR_MISC_START + 11 -#define STR_UNKNOWN_TYPE_FOUND RID_STR_MISC_START + 12 -#define STR_FILE_DOES_NOT_EXIST RID_STR_MISC_START + 13 -#define STR_WARNINGS_DURING_CONNECT RID_STR_MISC_START + 14 -#define STR_NAMED_OBJECT_ALREADY_EXISTS RID_STR_MISC_START + 15 -#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16 -#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17 - -#define STR_WIZ_PB_PREV RID_STR_MISC_START + 18 -#define STR_WIZ_PB_NEXT RID_STR_MISC_START + 19 -#define STR_WIZ_PB_OK RID_STR_MISC_START + 20 - -// please adjust checking before insert new strings - -#if STR_INVALID_TABLE_NAME_LENGTH > RID_STR_MISC_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_pageids.hxx b/dbaccess/source/ui/inc/dbu_pageids.hxx new file mode 100644 index 000000000000..710a582d933a --- /dev/null +++ b/dbaccess/source/ui/inc/dbu_pageids.hxx @@ -0,0 +1,38 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC +#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC + +// tab pages + +#define PAGE_DBASE 1001 +#define PAGE_ODBC 1003 +#define PAGE_TEXT 1004 +#define PAGE_ADO 1007 +#define PAGE_LDAP 1015 +#define PAGE_MYSQL_ODBC 1017 +#define PAGE_USERDRIVER 1019 +#define PAGE_MYSQL_JDBC 1020 +#define PAGE_MYSQL_NATIVE 1024 +#define PAGE_ORACLE_JDBC 1027 + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc deleted file mode 100644 index 306fd9fb6057..000000000000 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC - -#include "dbu_resource.hrc" - -#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 -#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 -#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 -#define STR_QUERY_UNDO_REMOVECONNECTION RID_STR_QRY_START + 5 -#define STR_QUERY_UNDO_TABWINSHOW RID_STR_QRY_START + 6 -#define STR_QUERY_UNDO_TABWINDELETE RID_STR_QRY_START + 7 -#define STR_QUERY_UNDO_MODIFY_CELL RID_STR_QRY_START + 8 -#define STR_QUERY_UNDO_SIZE_COLUMN RID_STR_QRY_START + 9 -#define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 -#define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 -#define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 -#define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 -#define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 -#define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 -#define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 -#define STR_QUERY_SORTTEXT RID_STR_QRY_START + 19 -#define STR_QUERY_FUNCTIONS RID_STR_QRY_START + 20 -#define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 -#define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 -#define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 -#define STR_QUERY_LIMIT_ALL RID_STR_QRY_START + 24 -// free -#define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 -#define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 -#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 -#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STR_QRY_START + 29 -#define STR_QRY_NOSELECT RID_STR_QRY_START + 30 -#define STR_QRY_COLUMN_NOT_FOUND RID_STR_QRY_START + 31 -#define STR_QRY_JOIN_COLUMN_COMPARE RID_STR_QRY_START + 32 -#define STR_QRY_LIKE_LEFT_NO_COLUMN RID_STR_QRY_START + 33 -#define STR_QRY_CHECK_CASESENSITIVE RID_STR_QRY_START + 34 -#define STR_QUERY_UNDO_TABFIELDMOVED RID_STR_QRY_START + 35 -#define STR_QRY_ILLEGAL_JOIN RID_STR_QRY_START + 36 -#define STR_QRY_TOO_LONG_STATEMENT RID_STR_QRY_START + 37 -#define STR_QRY_SYNTAX RID_STR_QRY_START + 38 -#define STR_QRY_NATIVE RID_STR_QRY_START + 39 -#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40 -// empty -#define STR_JOIN_TYPE_HINT RID_STR_QRY_START + 44 -#define STR_QUERY_SAVEMODIFIED RID_STR_QRY_START + 45 -#define STR_ERROR_PARSING_STATEMENT RID_STR_QRY_START + 46 -#define STR_INFO_OPENING_IN_SQL_VIEW RID_STR_QRY_START + 47 -#define STR_STATEMENT_WITHOUT_RESULT_SET RID_STR_QRY_START + 48 -// empty -#define STR_NO_ALTER_VIEW_SUPPORT RID_STR_QRY_START + 50 -#define STR_QUERY_CROSS_JOIN RID_STR_QRY_START + 51 - // please adjust checking when inserting new strings - -#if STR_QUERY_CROSS_JOIN > RID_STR_QRY_END -#error resource id overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc deleted file mode 100644 index d339c94cf65f..000000000000 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC - -#include <svl/solar.hrc> - -#define RID_PAGE_START RID_DBACCESS_START -#define RID_ERRORBOX_START RID_DBACCESS_START -#define RID_QUERYBOX_START RID_DBACCESS_START -#define RID_TOOLBOX_START RID_DBACCESS_START -#define RID_BITMAP_START RID_DBACCESS_START -#define RID_IMAGE_START RID_DBACCESS_START -#define RID_IMAGELIST_START RID_DBACCESS_START -#define RID_MENU_START RID_DBACCESS_START -#define RID_STRING_START RID_DBACCESS_START -#define RID_UNTYPED_START RID_DBACCESS_START -#define RID_WARN_START RID_DBACCESS_START -#define RID_CONTROL_START RID_DBACCESS_START -#define RID_MISC_START RID_DBACCESS_START - -// new defines to make the strings folder specific -#define RID_STR_BRW_START RID_DBACCESS_START -#define RID_STR_BRW_END RID_STR_BRW_START + 40 // 0 - 39 - -#define RID_STR_CONTROL_START RID_STR_BRW_END -#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69 - -#define RID_STR_DLG_START RID_STR_CONTROL_END -#define RID_STR_DLG_END RID_STR_DLG_START + 144 // 70 - 183 + 30 free - -#define RID_STR_MISC_START RID_STR_DLG_END -#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 214 - 233 - -#define RID_STR_QRY_START RID_STR_MISC_END -#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 234 - 313 - -#define RID_STR_TBL_START RID_STR_QRY_END -#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 314 - 393 - -#define RID_STR_REL_START RID_STR_TBL_END -#define RID_STR_REL_END RID_STR_REL_START + 10 // 394 - 413 - -#define RID_STR_UNO_START RID_STR_REL_END -#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414 - 433 - -#define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 75 // 434 - 503 - -#define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 50 // 504 - 543 - -#if RID_STR_GEN_END > RID_DBACCESS_END -#error Resource ID overflow in #file, #line -#endif - -// tab pages - - // FREE -#define PAGE_DBASE RID_PAGE_START + 1 -#define PAGE_ODBC RID_PAGE_START + 3 -#define PAGE_TEXT RID_PAGE_START + 4 - // FREE -#define PAGE_ADO RID_PAGE_START + 7 - // FREE - // FREE - // FREE -#define PAGE_LDAP RID_PAGE_START + 15 -#define PAGE_MYSQL_ODBC RID_PAGE_START + 17 -#define PAGE_USERDRIVER RID_PAGE_START + 19 -#define PAGE_MYSQL_JDBC RID_PAGE_START + 20 - // FREE - // FREE -#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 - // FREE -#define PAGE_ORACLE_JDBC RID_PAGE_START + 27 - - // FREE - -// strings -#define STR_TBL_TITLE RID_STR_GEN_START -#define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 -#define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 -#define STR_NAME_ALREADY_EXISTS RID_STR_GEN_START + 3 -#define STR_PAGETITLE_GENERAL RID_STR_GEN_START + 4 -#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 -#define STR_TABLEDESIGN_DATASOURCE_DELETED RID_STR_GEN_START + 7 -#define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 -#define STR_QRY_CONTINUE RID_STR_GEN_START + 9 -#define STR_COLUMN_NAME RID_STR_GEN_START + 10 -#define STR_ERROR_OCCURRED_WHILE_COPYING RID_STR_GEN_START + 11 -#define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 -#define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 -#define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 -#define STR_COULDNOTCREATE_DRIVERMANAGER RID_STR_GEN_START + 15 -#define STR_UNEXPECTED_ERROR RID_STR_GEN_START + 16 -#define STR_ENTER_CONNECTION_PASSWORD RID_STR_GEN_START + 18 -#define STR_NOREGISTEREDDRIVER RID_STR_GEN_START + 19 -#define STR_DATASOURCE_DELETED RID_STR_GEN_START + 20 -#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21 -#define STR_QRY_TITLE RID_STR_GEN_START + 22 -#define STR_VIEW_TITLE RID_STR_GEN_START + 23 -#define STR_SUB_DOCS_WITH_SCRIPTS RID_STR_GEN_START + 24 -#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL RID_STR_GEN_START + 25 -#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 -#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 -#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 -#define RID_STR_QUERIES_CONTAINER RID_STR_GEN_START + 29 -#define RID_STR_TABLES_CONTAINER RID_STR_GEN_START + 30 -#define STR_NEW_FOLDER RID_STR_GEN_START + 31 -#define RID_STR_FORM RID_STR_GEN_START + 32 -#define RID_STR_REPORT RID_STR_GEN_START + 33 -#define STR_FRM_LABEL RID_STR_GEN_START + 34 -#define STR_RPT_LABEL RID_STR_GEN_START + 35 -#define STR_FOLDER_LABEL RID_STR_GEN_START + 36 -#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37 -#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 -#define STR_PAGETITLE_ADVANCED RID_STR_GEN_START + 39 -#define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40 -#define STR_PAGETITLE_CONNECTION RID_STR_GEN_START + 41 -#define STR_TBL_LABEL RID_STR_GEN_START + 42 -#define STR_QRY_LABEL RID_STR_GEN_START + 44 -#define STR_TITLE_RENAME RID_STR_GEN_START + 45 -#define STR_TITLE_PASTE_AS RID_STR_GEN_START + 46 -#define STR_AUTOFIELDSEPARATORLIST RID_STR_GEN_START + 47 -#define STR_AUTOTEXTSEPARATORLIST RID_STR_GEN_START + 48 -#define STR_AUTOTEXT_FIELD_SEP_NONE RID_STR_GEN_START + 49 -#define STR_AUTODELIMITER_MISSING RID_STR_GEN_START + 50 -#define STR_AUTODELIMITER_MUST_DIFFER RID_STR_GEN_START + 51 -#define STR_AUTONO_WILDCARDS RID_STR_GEN_START + 52 -#define STR_SPREADSHEET_HEADERTEXT RID_STR_GEN_START + 53 -#define STR_SPREADSHEET_HELPTEXT RID_STR_GEN_START + 54 -#define STR_SPREADSHEETPATH RID_STR_GEN_START + 55 -#define STR_RSC_CHARSETS RID_STR_GEN_START + 56 -#define STR_QRY_CRITERIA_ON_ASTERISK RID_STR_GEN_START + 57 -#define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58 -#define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59 -#define STR_QUERY_CLOSEDOCUMENTS RID_STR_GEN_START + 60 -#define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61 -#define STR_QUERY_CONNECTION_LOST RID_STR_GEN_START + 62 -#define STR_QUERY_USERADMIN_DELETE_USER RID_STR_GEN_START + 63 -#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES RID_STR_GEN_START + 64 -#define RID_STR_TABLE_FORMAT RID_STR_GEN_START + 65 -#define RID_STR_ROW_HEIGHT RID_STR_GEN_START + 66 -#define RID_STR_COPY RID_STR_GEN_START + 67 -#define RID_STR_COLUMN_FORMAT RID_STR_GEN_START + 68 -#define RID_STR_COLUMN_WIDTH RID_STR_GEN_START + 69 - -// untyped resources - -#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc deleted file mode 100644 index 88821d2df8ef..000000000000 --- a/dbaccess/source/ui/inc/dbu_tbl.hrc +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC - -#include "dbu_resource.hrc" - -#define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START -#define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 -#define STR_VALUE_YES RID_STR_TBL_START + 2 -#define STR_VALUE_NO RID_STR_TBL_START + 3 -#define STR_VALUE_NONE RID_STR_TBL_START + 6 -#define STR_TAB_FIELD_NAME RID_STR_TBL_START + 7 -#define STR_TAB_FIELD_DATATYPE RID_STR_TBL_START + 8 -#define STR_TAB_HELP_TEXT RID_STR_TBL_START + 10 -#define STR_FIELD_AUTOINCREMENT RID_STR_TBL_START + 12 -#define STR_TAB_PROPERTIES RID_STR_TBL_START + 13 -#define STR_TABED_UNDO_TYPE_CHANGED RID_STR_TBL_START + 17 -#define STR_TABED_UNDO_ROWDELETED RID_STR_TBL_START + 18 -#define STR_TABED_UNDO_ROWINSERTED RID_STR_TBL_START + 19 -#define STR_TABED_UNDO_NEWROWINSERTED RID_STR_TBL_START + 20 -#define STR_HELP_AUTOINCREMENT RID_STR_TBL_START + 22 -#define STR_HELP_FORMAT_CODE RID_STR_TBL_START + 23 -#define STR_HELP_SCALE RID_STR_TBL_START + 24 -#define STR_HELP_LENGTH RID_STR_TBL_START + 25 -#define STR_HELP_NUMERIC_TYPE RID_STR_TBL_START + 26 -#define STR_HELP_TEXT_LENGTH RID_STR_TBL_START + 27 -#define STR_HELP_FIELD_REQUIRED RID_STR_TBL_START + 28 -#define STR_HELP_DEFAULT_VALUE RID_STR_TBL_START + 29 -#define STR_HELP_BOOL_DEFAULT RID_STR_TBL_START + 30 -#define STR_FORMAT RID_STR_TBL_START + 31 -#define STR_SCALE RID_STR_TBL_START + 32 -#define STR_LENGTH RID_STR_TBL_START + 33 -#define STR_NUMERIC_TYPE RID_STR_TBL_START + 34 -#define STR_TEXT_LENGTH RID_STR_TBL_START + 35 -#define STR_FIELD_REQUIRED RID_STR_TBL_START + 36 -#define STR_DEFAULT_VALUE RID_STR_TBL_START + 37 -#define STR_TABED_UNDO_CELLMODIFIED RID_STR_TBL_START + 38 -#define STR_TAB_FIELD_COLUMN_NAME RID_STR_TBL_START + 39 -#define STR_TBL_COLUMN_IS_KEYCOLUMN RID_STR_TBL_START + 40 -#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE RID_STR_TBL_START + 41 -#define STR_TABLEDESIGN_ALTER_ERROR RID_STR_TBL_START + 42 -#define STR_AUTOINCREMENT_VALUE RID_STR_TBL_START + 43 -#define STR_HELP_FORMAT_BUTTON RID_STR_TBL_START + 44 -#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STR_TBL_START + 45 -#define STR_TAB_FIELD_COLUMN_DATATYPE RID_STR_TBL_START + 46 -#define STR_NO_TYPE_INFO_AVAILABLE RID_STR_TBL_START + 48 -#define STR_CHANGE_COLUMN_NAME RID_STR_TBL_START + 49 -#define STR_CHANGE_COLUMN_TYPE RID_STR_TBL_START + 50 -#define STR_CHANGE_COLUMN_DESCRIPTION RID_STR_TBL_START + 51 -#define STR_CHANGE_COLUMN_ATTRIBUTE RID_STR_TBL_START + 52 -#define STR_TABLEDESIGN_SAVE_ERROR RID_STR_TBL_START + 53 -#define STR_TABLEDESIGN_COULD_NOT_DROP_COL RID_STR_TBL_START + 54 -#define STR_COLUMN_DESCRIPTION RID_STR_TBL_START + 55 -#define STR_BUTTON_FORMAT RID_STR_TBL_START + 56 - -// please adjust checking before insert new strings - -#if STR_BUTTON_FORMAT > RID_STR_TBL_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc deleted file mode 100644 index 923828ac871d..000000000000 --- a/dbaccess/source/ui/inc/dbu_uno.hrc +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC - -#include "dbu_resource.hrc" - -#define STR_CTW_NO_VIEWS_SUPPORT ( RID_STR_UNO_START + 1 ) -#define STR_CTW_NO_PRIMARY_KEY_SUPPORT ( RID_STR_UNO_START + 2 ) -#define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ( RID_STR_UNO_START + 3 ) -#define STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ( RID_STR_UNO_START + 4 ) -#define STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS ( RID_STR_UNO_START + 5 ) -#define STR_CTW_UNSUPPORTED_COLUMN_TYPE ( RID_STR_UNO_START + 6 ) -#define STR_CTW_ILLEGAL_PARAMETER_COUNT ( RID_STR_UNO_START + 7 ) -#define STR_CTW_ERROR_DURING_INITIALIZATION ( RID_STR_UNO_START + 8 ) -#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 ) -#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 ) -#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 ) - -// please adjust when inserting new strings: -#define RID_STR_UNO_LAST_USED STR_CTW_ERROR_INVALID_INTERACTIONHANDLER - -#if RID_STR_UNO_LAST_USED >= RID_STR_UNO_END -#error too many resources in uno .... -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 956158f40e3f..29280e01c897 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -25,7 +25,7 @@ #include "IItemSetHelper.hxx" #include <comphelper/uno3.hxx> #include <svtools/wizardmachine.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <memory> namespace com { namespace sun { namespace star { @@ -52,10 +52,10 @@ class OGeneralPage; class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ -class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient +class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient { private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index b02986503b0d..ec4fe02bca21 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -28,7 +28,7 @@ #include <memory> #include <svtools/roadmapwizard.hxx> #include <connectivity/dbtools.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace com { namespace sun { namespace star { namespace beans { @@ -56,11 +56,10 @@ class ODbDataSourceAdministrationHelper; class OMySQLIntroPageSetup; class OFinalDBPageSetup; -class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient +class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient { - private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; OUString m_sURL; diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 21c2f083cb10..88cf84be00c0 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <unotools/eventlisteneradapter.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <osl/mutex.hxx> #include <svtools/editbrowsebox.hxx> @@ -46,7 +46,7 @@ namespace dbaui ,public ::utl::OEventListenerAdapter { protected: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; ::osl::Mutex m_aMutex; VclPtr<MultiLineEditSyntaxHighlight> m_pSQL; diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 20aaf70cac7d..2ceea1f294e6 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -58,7 +58,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase12.hxx> #include <cppuhelper/implbase10.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -120,7 +120,7 @@ namespace dbaui ,public SbaXFormAdapter_BASE3 { private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; css::uno::Reference< css::sdbc::XRowSet > m_xMainForm; ::osl::Mutex m_aMutex; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 39f7bd96fd80..034e28bb0856 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <svtools/editbrowsebox.hxx> #include "indexcollection.hxx" #include <com/sun/star/uno/Sequence.hxx> @@ -33,7 +33,7 @@ namespace dbaui // IndexFieldsControl class IndexFieldsControl : public ::svt::EditBrowseBox { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: IndexFields m_aSavedValue; diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx deleted file mode 100644 index d4e7463eb301..000000000000 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX -#define INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX - -#include <osl/mutex.hxx> -#include <tools/resid.hxx> - -class ResMgr; - -namespace dbaui -{ - -// OModule -class OModuleImpl; -class OModule -{ - friend class OModuleClient; - -private: - OModule() = delete; //TODO: get rid of this class - -protected: - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - -public: - /// get the vcl res manager of the module - static ResMgr* getResManager(); - -protected: - /// register a client for the module - static void registerClient(); - /// revoke a client for the module - static void revokeClient(); - -private: - /** ensure that the impl class exists - @precond m_aMutex is guarded when this method gets called - */ - static void ensureImpl(); -}; - -// OModuleClient -/** base class for objects which uses any global module-specific resources -*/ -class OModuleClient -{ -public: - OModuleClient() { OModule::registerClient(); } - ~OModuleClient() { OModule::revokeClient(); } -}; - -// ModuleRes -/** specialized ResId, using the resource manager provided by the global module -*/ -class ModuleRes : public ::ResId -{ -public: - ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } -}; - -} // namespace dbaui - -#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index 2309ba1176a2..6fb2ef9c915f 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -20,8 +20,8 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX #include "GeneralUndo.hxx" -#include "dbu_control.hrc" #include <vcl/vclptr.hxx> +#include "strings.hrc" namespace dbaui { diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 4629cb6419d0..d4d75f32b720 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -23,7 +23,7 @@ #include <svtools/genericunodialog.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include "dsntypes.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" class SfxItemSet; class SfxItemPool; @@ -37,7 +37,7 @@ typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase; class ODatabaseAdministrationDialog :public ODatabaseAdministrationDialogBase { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: SfxItemSet* m_pDatasourceItems; // item set for the dialog SfxItemPool* m_pItemPool; // item pool for the item set for the dialog diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 44e6250748ca..0731c1405b43 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -22,7 +22,7 @@ #include <svtools/genericunodialog.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -32,7 +32,7 @@ class OSQLMessageDialog :public OSQLMessageDialogBase ,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog > { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: // <properties> css::uno::Any m_aException; |