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 | |
| 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')
317 files changed, 1163 insertions, 5737 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 3b5f5f79801d..31a89bc615dd 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -19,7 +19,7 @@ #include "BookmarkSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index f51a1d845ac6..b29ca36c16f6 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/IndexType.hpp> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/extract.hxx> diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 3912b16181ce..1e01dab55917 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -18,7 +18,7 @@ */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include "CRowSetColumn.hxx" diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 680be37f9b75..0a681e9642be 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -19,7 +19,7 @@ #include "CRowSetDataColumn.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 8e6f5c9837b5..184a749c2964 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -19,7 +19,8 @@ #include "CacheSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -27,7 +28,7 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XParameters.hpp> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index af261a6d2a0f..43038b7274a7 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "FilteredContainer.hxx" #include "RefreshListener.hxx" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index b62b70eeb5fb..98b263f21570 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -19,7 +19,8 @@ #include "HelperCollections.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" namespace dbaccess { diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 04ab330a3ba3..bab0851063d3 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -20,7 +20,7 @@ #include <memory> #include "KeySet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 79c2a05d4f59..7d4558390688 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -21,7 +21,7 @@ #include <memory> #include "OptimisticSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> @@ -32,7 +32,7 @@ #include <com/sun/star/sdb/SQLFilterOperator.hpp> #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 8f191ed318be..68da787a81dc 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -24,13 +24,13 @@ #include <string.h> #include "RowSet.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "sdbcoretools.hxx" #include "SingleSelectQueryComposer.hxx" #include "CRowSetColumn.hxx" #include "CRowSetDataColumn.hxx" #include "RowSetCache.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "tablecontainer.hxx" diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index c4b7fdb65a1e..a0a680e9113b 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -21,8 +21,9 @@ #include "CRowSetDataColumn.hxx" #include <connectivity/sdbcx/VCollection.hxx> #include "RowSetCache.hxx" -#include "dbastrings.hrc" -#include "core_resource.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index e51d87ac2458..8bd299112e1c 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -27,9 +27,10 @@ #include "RowSetCache.hxx" #include "StaticSet.hxx" #include "WrappedResultSet.hxx" -#include "core_resource.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "core_resource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 0558b34dcf13..d284a3e21e21 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -19,9 +19,9 @@ #include <string.h> #include "composertools.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "HelperCollections.hxx" #include "SingleSelectQueryComposer.hxx" #include "sqlbison.hxx" diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 5fc3a9276d32..e9d3af392ae8 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/XPreparedStatement.hpp> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include <connectivity/CommonTools.hxx> #include <comphelper/types.hxx> diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index cf8c115bf028..dd167c116d3e 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -21,9 +21,9 @@ #include "TableDeco.hxx" #include <definitioncolumn.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 883346bb2693..42dca2256cf8 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -18,7 +18,8 @@ */ #include "View.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "connectivity/dbexception.hxx" #include "connectivity/dbtools.hxx" diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index 77836d7746e2..a29463544475 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -19,7 +19,7 @@ #include "WrappedResultSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index 050931dc76a6..bd2209a7fd92 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -22,7 +22,8 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <comphelper/property.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" using namespace dbaccess; using namespace ::com::sun::star::sdbc; diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 1c431420a34e..0ad8d09324a0 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -20,9 +20,9 @@ #include "ContainerMediator.hxx" #include "apitools.hxx" #include "column.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "sdbcoretools.hxx" #include <com/sun/star/lang/DisposedException.hpp> diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index 860ed7d36617..4d8857f5ec07 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -18,7 +18,8 @@ */ #include "columnsettings.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 34604e602c9f..8d22401fdcea 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -24,7 +24,8 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "apitools.hxx" using namespace dbaccess; diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index f381b40fbb82..33683266da8d 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -19,7 +19,7 @@ #include "datasettings.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index a3ef15206420..f8b56a649b7c 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -20,7 +20,7 @@ #include <bitset> #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "definitioncolumn.hxx" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 7a79ae4415f3..619eacfab8ca 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -18,7 +18,7 @@ */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 9016d2bfba34..0a127bf448dd 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -18,11 +18,11 @@ */ #include "query.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <connectivity/warningscontainer.hxx> #include "HelperCollections.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index a390a614057a..c6221be76c7e 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -28,7 +28,7 @@ #include <comphelper/sequence.hxx> #include <com/sun/star/uno/XAggregation.hpp> #include <comphelper/processfactory.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <unotools/configmgr.hxx> diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 0add2d493d5e..1641f6445d47 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -18,7 +18,7 @@ */ #include "querycontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "query.hxx" #include "objectnameapproval.hxx" #include "veto.hxx" diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 019f2d238c9d..7ae594f98928 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -21,7 +21,7 @@ #include "querydescriptor.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 2970dc00c231..96ce95ad646c 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -26,7 +26,7 @@ #include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 320e2fc4f596..9a6eb24824da 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -18,7 +18,7 @@ */ #include <resultset.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 813fa8a450f1..978552f36b6f 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -19,7 +19,7 @@ #include <statement.hxx> #include <resultset.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 291f597fb7db..c192b10117bc 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -21,9 +21,9 @@ #include "table.hxx" #include <definitioncolumn.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "CIndexes.hxx" #include <osl/diagnose.h> diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 925552954ff3..cd03ff639e2a 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -18,14 +18,14 @@ */ #include "tablecontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "table.hxx" #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <comphelper/enumhelper.hxx> #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyState.hpp> diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 3ca37659ed55..111089ebac9a 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -18,9 +18,9 @@ */ #include "viewcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "View.hxx" #include <comphelper/enumhelper.hxx> diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index a0e760891d55..5d442e62c30b 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -19,7 +19,7 @@ #include "ComponentDefinition.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <osl/diagnose.h> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 47c71bcef2e2..e365e94d6367 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -34,7 +34,7 @@ #include "myucp_resultset.hxx" #include <com/sun/star/container/XNameContainer.hpp> #include "sdbcoretools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 3608a06e9ffe..f05eda723b83 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -19,12 +19,12 @@ #include "commandcontainer.hxx" #include "connection.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "databasecontext.hxx" #include "databasedocument.hxx" #include "datasource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "ModelImpl.hxx" #include "userinformation.hxx" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 4ee378e7d8ed..fb550264a0f0 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -18,10 +18,10 @@ */ #include "bookmarkcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <osl/diagnose.h> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 9513600459df..22ad03474d1f 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -20,7 +20,7 @@ #include "commandcontainer.hxx" #include "commanddefinition.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdb/TableDefinition.hpp> #include <com/sun/star/sdb/CommandDefinition.hpp> diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 111d535f2796..fd87605ca4e4 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -19,7 +19,7 @@ #include "commanddefinition.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 2390bcf467e1..30166707664d 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -22,9 +22,9 @@ #include <iterator> #include "connection.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "datasource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "statement.hxx" #include "preparedstatement.hxx" diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index a3fc0f66a7db..ce1c40b08968 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 237db1fce2fe..e023806270b2 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -20,13 +20,13 @@ #include <config_features.h> #include "apitools.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "databasecontext.hxx" #include "databasedocument.hxx" #include "databaseregistrations.hxx" #include "datasource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index cadc240f1ffe..e06b56310d7a 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -18,10 +18,10 @@ */ #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "datasource.hxx" #include "databasedocument.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "documenteventexecutor.hxx" #include "databasecontext.hxx" #include "documentcontainer.hxx" diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 68c8d140ddcf..5f5aa0a4cede 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -20,9 +20,9 @@ #include "datasource.hxx" #include "userinformation.hxx" #include "commandcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "connection.hxx" #include "SharedConnection.hxx" #include "databasedocument.hxx" @@ -594,7 +594,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString sPwd = m_pImpl->m_aPassword; } - sal_uInt16 nExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED; + const char* pExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED; if (xManager.is()) { sal_Int32 nAdditionalArgs(0); @@ -630,7 +630,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString // Nowadays, it's allowed for a driver to be registered for a given URL, but actually not to accept it. // This is because registration nowadays happens at compile time (by adding respective configuration data), // but acceptance is decided at runtime. - nExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER; + pExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER; } else { @@ -672,11 +672,11 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString } } else - nExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER; + pExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER; if ( !xReturn.is() ) { - OUString sMessage = DBA_RES(nExceptionMessageId) + OUString sMessage = DBA_RES(pExceptionMessageId) .replaceAll("$name$", m_pImpl->m_sConnectURL); SQLContext aContext; diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 3c3f3089365a..6270c92385d6 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -18,10 +18,10 @@ */ #include "definitioncontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index b30ee9adef0d..9674fe45ba61 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -18,7 +18,7 @@ */ #include "documentcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "documentdefinition.hxx" #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/OpenMode.hpp> @@ -35,7 +35,7 @@ #include <comphelper/processfactory.hxx> #include <connectivity/sqlerror.hxx> #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <comphelper/namedvaluecollection.hxx> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index d117a3fc0ca6..744ca5464122 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -18,7 +18,7 @@ */ #include "documentdefinition.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "sdbcoretools.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> @@ -83,7 +83,7 @@ #include <sal/macros.h> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "datasource.hxx" #include <com/sun/star/embed/XStateChangeBroadcaster.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index b1f55958ffe1..b7011dce3b32 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -19,7 +19,7 @@ #include "intercept.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/util/XModifiable.hpp> diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc deleted file mode 100644 index 64bbb69efdb9..000000000000 --- a/dbaccess/source/core/inc/core_resource.hrc +++ /dev/null @@ -1,97 +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_CORE_INC_CORE_RESOURCE_HRC -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC - -#include <svl/solar.hrc> - -#define RID_CORE_STRINGS_START RID_DBACCESS_START - -//- String-IDs -#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) -#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) -#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) -#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) -#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) -#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) -#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) -#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) -#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) -#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) -#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) -#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) -#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) -#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) -#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) -#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) -#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) -#define RID_STR_FILE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 35 ) -#define RID_STR_TABLE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 36 ) -#define RID_STR_CONFLICTING_NAMES ( RID_CORE_STRINGS_START + 37 ) -#define RID_STR_COMMAND_LEADING_TO_ERROR ( RID_CORE_STRINGS_START + 38 ) -#define RID_STR_STATEMENT_WITHOUT_RESULT_SET ( RID_CORE_STRINGS_START + 39 ) -#define RID_STR_NAME_MUST_NOT_BE_EMPTY ( RID_CORE_STRINGS_START + 40 ) -#define RID_STR_NO_NULL_OBJECTS_IN_CONTAINER ( RID_CORE_STRINGS_START + 41 ) -#define RID_STR_NAME_ALREADY_USED ( RID_CORE_STRINGS_START + 42 ) -#define RID_STR_OBJECT_CONTAINER_MISMATCH ( RID_CORE_STRINGS_START + 43 ) -#define RID_STR_OBJECT_ALREADY_CONTAINED ( RID_CORE_STRINGS_START + 44 ) -#define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 ) -#define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 ) -#define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 ) -#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) - -#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) -#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) -#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) -#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) -#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) -#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) - -#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) -#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) -#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) -#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) -#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) -#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) -#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) -#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) -#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) -#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) -#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) - -#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx deleted file mode 100644 index 2c52c7a41872..000000000000 --- a/dbaccess/source/core/inc/core_resource.hxx +++ /dev/null @@ -1,108 +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_CORE_INC_CORE_RESOURCE_HXX -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX - -#include <rtl/ustring.hxx> - -class ResMgr; - -namespace dbaccess -{ - -#define DBA_RES( id ) ResourceManager::loadString( id ) -#define DBA_RES_PARAM( id, ascii, replace ) ResourceManager::loadString( id, ascii, replace ) - - // ResourceManager - // handling resources within the DBA-Core library - class ResourceManager - { - friend class OModuleClient; - static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; - - private: - // no instantiation allowed - ResourceManager() = delete; - ~ResourceManager() { } - - protected: - static void ensureImplExists(); - /// register a client for the module - static void registerClient(); - /// revoke a client for the module - static void revokeClient(); - - public: - /** loads the string with the specified resource id - */ - static OUString loadString(sal_uInt16 _nResId); - - /** loads a string from the resource file, substituting a placeholder with a given string - - @param _nResId - the resource ID of the string to load - @param _pPlaceholderAscii - the ASCII representation of the placeholder string - @param _rReplace - the string which should substitute the placeholder - */ - static OUString loadString( - sal_uInt16 _nResId, - const sal_Char* _pPlaceholderAscii, - const OUString& _rReplace - ); - - /** loads a string from the resource file, substituting two placeholders with given strings - - @param _nResId - the resource ID of the string to load - @param _pPlaceholderAscii1 - the ASCII representation of the first placeholder string - @param _rReplace1 - the string which should substitute the first placeholder - @param _pPlaceholderAscii2 - the ASCII representation of the second placeholder string - @param _rReplace2 - the string which should substitute the second placeholder - */ - static OUString loadString( - sal_uInt16 _nResId, - const sal_Char* _pPlaceholderAscii1, - const OUString& _rReplace1, - const sal_Char* _pPlaceholderAscii2, - const OUString& _rReplace2 - ); - }; - - // OModuleClient - /** base class for objects which uses any global module-specific resources - */ - class OModuleClient - { - public: - OModuleClient() { ResourceManager::registerClient(); } - ~OModuleClient() { ResourceManager::revokeClient(); } - }; -} - -#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc deleted file mode 100644 index 5d9b36fc4f28..000000000000 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ /dev/null @@ -1,29 +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_CORE_INC_DBAMISCRES_HRC -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC - -#define STR_MYSQL_NATIVE 24 - -#define STR_END STR_MYSQL_NATIVE + 1 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index adde1ade5b3a..6b42cc2047b9 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -18,7 +18,7 @@ */ #include "ContainerMediator.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "PropertyForward.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index aaca4ecd9cd3..0d8b9805c033 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -18,7 +18,8 @@ */ #include "DatabaseDataProvider.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <cppuhelper/supportsservice.hxx> #include <comphelper/types.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 95cabf09220c..827bee9b9e43 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -18,7 +18,7 @@ */ #include "PropertyForward.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index 879f86516e6a..1b8bc07a1206 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -18,7 +18,7 @@ */ #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 2bef7806208e..f568942272da 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -18,14 +18,13 @@ */ #include "dsntypes.hxx" -#include "dbamiscres.hrc" #include <unotools/confignode.hxx> #include <osl/diagnose.h> #include <tools/wldcrd.hxx> #include <osl/file.hxx> -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include <comphelper/documentconstants.hxx> #include <comphelper/string.hxx> diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index c97a0a609c04..0f8ddc705d6a 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -18,7 +18,7 @@ */ #include "sdbcoretools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 62407e4df00f..7e848865a7e3 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -22,7 +22,7 @@ #include "storagetextstream.hxx" #include "subcomponentrecovery.hxx" #include "subcomponents.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index f2a7ea3b0f81..ad52b1638f90 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -38,37 +38,37 @@ namespace dbaccess } sal_Int32 ResourceManager::s_nClients = 0; - ResMgr* ResourceManager::m_pImpl = nullptr; + std::locale* ResourceManager::m_pImpl = nullptr; void ResourceManager::ensureImplExists() { if (m_pImpl) return; - m_pImpl = ResMgr::CreateResMgr("dba", Application::GetSettings().GetUILanguageTag()); + m_pImpl = new std::locale(Translate::Create("dba", Application::GetSettings().GetUILanguageTag())); } - OUString ResourceManager::loadString(sal_uInt16 _nResId) + OUString ResourceManager::loadString(const char* pResId) { OUString sReturn; ensureImplExists(); if (m_pImpl) - sReturn = OUString(ResId(_nResId,*m_pImpl)); + sReturn = Translate::get(pResId, *m_pImpl); return sReturn; } - OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace ) + OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace) { - OUString sString( loadString( _nResId ) ); + OUString sString(loadString(pResId)); return sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii), _rReplace ); } - OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1, - const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2 ) + OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1, + const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2) { - OUString sString( loadString( _nResId ) ); + OUString sString(loadString(pResId)); sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii1), _rReplace1 ); sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii2), _rReplace2 ); return sString; diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src deleted file mode 100644 index f81344328458..000000000000 --- a/dbaccess/source/core/resource/strings.src +++ /dev/null @@ -1,338 +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 . - */ - -#include "core_resource.hrc" -#include "dbamiscres.hrc" - -String RID_STR_CONNECTION_INVALID -{ - Text [ en-US ] = "No connection could be established."; -}; - -String RID_STR_TABLE_IS_FILTERED -{ - Text [ en-US ] = "The table $name$ already exists. It is not visible because it has been filtered out."; -}; - -String RID_STR_COULDNOTCONNECT_UNSPECIFIED -{ - Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."; -}; - -String RID_STR_COULDNOTCONNECT_NODRIVER -{ - Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'."; -}; - -String RID_STR_COULDNOTLOAD_MANAGER -{ - Text [ en-US ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded."; -}; - -String RID_STR_FORM -{ - Text [ en-US ] = "Form"; -}; - -String RID_STR_REPORT -{ - Text [ en-US ] = "Report"; -}; - -String RID_STR_DATASOURCE_NOT_STORED -{ - Text [ en-US ] = "The data source was not saved. Please use the interface XStorable to save the data source."; -}; - -String RID_STR_ONLY_QUERY -{ - Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; -}; - -String RID_STR_NO_VALUE_CHANGED -{ - Text [ en-US ] = "No values were modified."; -}; - -String RID_STR_NO_XROWUPDATE -{ - Text [ en-US ] = "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet."; -}; - -String RID_STR_NO_XRESULTSETUPDATE -{ - Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet."; -}; - -String RID_STR_NO_UPDATE_MISSING_CONDITION -{ - Text [ en-US ] = "Values could not be modified, due to a missing condition statement."; -}; - -String RID_STR_NO_COLUMN_ADD -{ - Text [ en-US ] = "The adding of columns is not supported."; -}; - -String RID_STR_NO_COLUMN_DROP -{ - Text [ en-US ] = "The dropping of columns is not supported."; -}; - -String RID_STR_NO_CONDITION_FOR_PK -{ - Text [ en-US ] = "The WHERE condition could not be created for the primary key."; -}; - -String RID_STR_COLUMN_UNKNOWN_PROP -{ - Text [ en-US ] = "The column does not support the property '%value'."; -}; - -String RID_STR_COLUMN_NOT_SEARCHABLE -{ - Text [ en-US ] = "The column is not searchable!"; -}; - -String RID_STR_NOT_SEQUENCE_INT8 -{ - Text [ en-US ] = "The value of the columns is not of the type Sequence<sal_Int8>."; -}; - -String RID_STR_COLUMN_NOT_VALID -{ - Text [ en-US ] = "The column is not valid."; -}; - -String RID_STR_COLUMN_MUST_VISIBLE -{ - Text [ en-US ] = "The column '%name' must be visible as a column."; -}; - -String RID_STR_NO_XQUERIESSUPPLIER -{ - Text [ en-US ] = "The interface XQueriesSupplier is not available."; -}; - -String RID_STR_NO_ABS_ZERO -{ - Text [ en-US ] = "An 'absolute(0)' call is not allowed."; -}; - -String RID_STR_NO_RELATIVE -{ - Text [ en-US ] = "Relative positioning is not allowed in this state."; -}; - -String RID_STR_NO_REFESH_AFTERLAST -{ - Text [ en-US ] = "A row cannot be refreshed when the ResultSet is positioned after the last row."; -}; - -String RID_STR_NO_MOVETOINSERTROW_CALLED -{ - Text [ en-US ] = "A new row cannot be inserted when the ResultSet is not first moved to the insert row."; -}; - -String RID_STR_NO_UPDATEROW -{ - Text [ en-US ] = "A row cannot be modified in this state"; -}; - -String RID_STR_NO_DELETEROW -{ - Text [ en-US ] = "A row cannot be deleted in this state."; -}; - -String RID_STR_NO_TABLE_RENAME -{ - Text [ en-US ] = "The driver does not support table renaming."; -}; - -String RID_STR_COLUMN_ALTER_BY_NAME -{ - Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name."; -}; - -String RID_STR_COLUMN_ALTER_BY_INDEX -{ - Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the index."; -}; - -String RID_STR_FILE_DOES_NOT_EXIST -{ - Text[ en-US ] = "The file \"$file$\" does not exist."; -}; - -String RID_STR_TABLE_DOES_NOT_EXIST -{ - Text [ en-US ] = "There exists no table named \"$table$\"."; -}; - -String RID_STR_QUERY_DOES_NOT_EXIST -{ - Text [ en-US ] = "There exists no query named \"$table$\"."; -}; - -String RID_STR_CONFLICTING_NAMES -{ - Text [ en-US ] = "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names."; -}; - -String RID_STR_COMMAND_LEADING_TO_ERROR -{ - Text [ en-US ] = "The SQL command leading to this error is:\n\n$command$"; -}; - -String RID_STR_STATEMENT_WITHOUT_RESULT_SET -{ - Text [ en-US ] = "The SQL command does not describe a result set."; -}; - -String RID_STR_NAME_MUST_NOT_BE_EMPTY -{ - Text [ en-US ] = "The name must not be empty."; -}; - -String RID_STR_NO_NULL_OBJECTS_IN_CONTAINER -{ - Text [ en-US ] = "The container cannot contain NULL objects."; -}; - -String RID_STR_NAME_ALREADY_USED -{ - Text [ en-US ] = "There already is an object with the given name."; -}; - -String RID_STR_OBJECT_CONTAINER_MISMATCH -{ - Text [ en-US ] = "This object cannot be part of this container."; -}; - -String RID_STR_OBJECT_ALREADY_CONTAINED -{ - Text [ en-US ] = "The object already is, with a different name, part of the container."; -}; - -String RID_STR_NAME_NOT_FOUND -{ - Text [ en-US ] = "Unable to find the document '$name$'."; -}; - -String RID_STR_ERROR_WHILE_SAVING -{ - Text [ en-US ] = "Could not save the document to $location$:\n$message$"; -}; - -String RID_NO_SUCH_DATA_SOURCE -{ - Text [ en-US ] = "Error accessing data source '$name$':\n$error$"; -}; - -String RID_STR_NO_SUB_FOLDER -{ - Text [ en-US ] = "There exists no folder named \"$folder$\"."; -}; - -String RID_STR_NO_DELETE_BEFORE_AFTER -{ - Text [ en-US ] = "Cannot delete the before-first or after-last row."; -}; - -String RID_STR_NO_DELETE_INSERT_ROW -{ - Text [ en-US ] = "Cannot delete the insert-row."; -}; - -String RID_STR_RESULT_IS_READONLY -{ - Text [ en-US ] = "Result set is read only."; -}; - -String RID_STR_NO_DELETE_PRIVILEGE -{ - Text [ en-US ] = "DELETE privilege not available."; -}; - -String RID_STR_ROW_ALREADY_DELETED -{ - Text [ en-US ] = "Current row is already deleted."; -}; - -String RID_STR_UPDATE_FAILED -{ - Text [ en-US ] = "Current row could not be updated."; -}; - -String RID_STR_NO_INSERT_PRIVILEGE -{ - Text [ en-US ] = "INSERT privilege not available."; -}; - -String RID_STR_INTERNAL_ERROR -{ - Text [ en-US ] = "Internal error: no statement object provided by the database driver."; -}; - -String RID_STR_EXPRESSION1 -{ - Text [ en-US ] = "Expression1"; -}; - -String RID_STR_NO_SQL_COMMAND -{ - Text [ en-US ] = "No SQL command was provided."; -}; - -String RID_STR_INVALID_INDEX -{ - Text [ en-US ] = "Invalid column index."; -}; - -String RID_STR_INVALID_CURSOR_STATE -{ - Text [ en-US ] = "Invalid cursor state."; -}; - -String RID_STR_CURSOR_BEFORE_OR_AFTER -{ - Text [ en-US ] = "The cursor points to before the first or after the last row."; -}; - -String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER -{ - Text [ en-US ] = "The rows before the first and after the last row don't have a bookmark."; -}; - -String RID_STR_NO_BOOKMARK_DELETED -{ - Text [ en-US ] = "The current row is deleted, and thus doesn't have a bookmark."; -}; - -String RID_STR_CONNECTION_REQUEST -{ - Text [ en-US ] = "A connection for the following URL was requested \"$name$\"."; -}; - -String RID_STR_MISSING_EXTENSION -{ - Text [ en-US ] = "The extension is not installed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc deleted file mode 100644 index 9105d11721dc..000000000000 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ /dev/null @@ -1,55 +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 DBACCESS_DBMM_GLOBAL_HRC -#define DBACCESS_DBMM_GLOBAL_HRC - -#include <svl/solar.hrc> - -#define RID_DBMM_STRING_START RID_DBACCESS_START + 0 - -#define STR_FORM ( RID_DBMM_STRING_START + 0 ) -#define STR_REPORT ( RID_DBMM_STRING_START + 1 ) -#define STR_OVERALL_PROGRESS ( RID_DBMM_STRING_START + 2 ) -#define STR_DATABASE_DOCUMENT ( RID_DBMM_STRING_START + 3 ) -#define STR_SAVED_COPY_TO ( RID_DBMM_STRING_START + 4 ) -#define STR_MOVED_LIBRARY ( RID_DBMM_STRING_START + 5 ) -#define STR_OOO_BASIC ( RID_DBMM_STRING_START + 6 ) -#define STR_JAVA_SCRIPT ( RID_DBMM_STRING_START + 7 ) -#define STR_BEAN_SHELL ( RID_DBMM_STRING_START + 8 ) -#define STR_JAVA ( RID_DBMM_STRING_START + 9 ) -#define STR_PYTHON ( RID_DBMM_STRING_START + 10 ) -#define STR_DIALOG ( RID_DBMM_STRING_START + 11 ) -#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 ) -#define STR_ERRORS ( RID_DBMM_STRING_START + 13 ) -#define STR_WARNINGS ( RID_DBMM_STRING_START + 14 ) -#define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 ) -#define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 ) -#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 ) -#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 ) -#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 ) -#define STR_STATE_CLOSE_SUB_DOCS ( RID_DBMM_STRING_START + 20 ) -#define STR_STATE_BACKUP_DBDOC ( RID_DBMM_STRING_START + 21 ) -#define STR_STATE_MIGRATE ( RID_DBMM_STRING_START + 22 ) -#define STR_STATE_SUMMARY ( RID_DBMM_STRING_START + 23 ) -#define STR_INVALID_BACKUP_LOCATION ( RID_DBMM_STRING_START + 25 ) - -#endif // DBACCESS_DBMM_GLOBAL_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx deleted file mode 100644 index 826e945ae167..000000000000 --- a/dbaccess/source/ext/macromigration/dbmm_module.cxx +++ /dev/null @@ -1,31 +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 . - */ - -#include "dbmm_module.hxx" - -#include <rtl/instance.hxx> - -namespace dbmm -{ - - IMPLEMENT_MODULE( MacroMigrationModule, "dbmm" ); - -} // namespace dbmm - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx deleted file mode 100644 index ff171823703f..000000000000 --- a/dbaccess/source/ext/macromigration/dbmm_module.hxx +++ /dev/null @@ -1,34 +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_EXT_MACROMIGRATION_DBMM_MODULE_HXX -#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX - -#include <unotools/componentresmodule.hxx> - -namespace dbmm -{ - - DEFINE_MODULE( MacroMigrationModule, MacroMigrationModuleClient, MacroMigrationResId ) - -} // namespace dbmm - -#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index 332d82987d20..1ced4c105042 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -17,26 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_module.hxx" +#include <cppuhelper/factory.hxx> #include "macromigrationwizard.hxx" -namespace dbmm +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, + SAL_UNUSED_PARAMETER void* ) { + css::uno::Reference<css::uno::XInterface> xRet; - static void initializeModule() + if (dbmm::MacroMigrationDialogService::getImplementationName_static() == OUString::createFromAscii(pImplementationName)) { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - createRegistryInfo_MacroMigrationDialogService(); + xRet = ::cppu::createSingleComponentFactory(dbmm::MacroMigrationDialogService::Create, + dbmm::MacroMigrationDialogService::getImplementationName_static(), + dbmm::MacroMigrationDialogService::getSupportedServiceNames_static(), nullptr); } -} // namespace dbmm - -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( - const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, - SAL_UNUSED_PARAMETER void* ) -{ - ::dbmm::initializeModule(); - return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName ); + if (xRet.is()) + xRet->acquire(); + return xRet.get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index 87f7311ec952..554945c068a3 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx @@ -17,30 +17,30 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/diagnose.h> +#include "core_resource.hxx" #include "dbmm_types.hxx" - -#include "dbmm_global.hrc" -#include "dbmm_module.hxx" +#include "strings.hrc" namespace dbmm { - // helper OUString getScriptTypeDisplayName( const ScriptType _eType ) { - sal_uInt16 nResId( 0 ); + const char *pResId = nullptr; switch ( _eType ) { - case eBasic: nResId = STR_OOO_BASIC; break; - case eBeanShell: nResId = STR_BEAN_SHELL; break; - case eJavaScript: nResId = STR_JAVA_SCRIPT; break; - case ePython: nResId = STR_PYTHON; break; - case eJava: nResId = STR_JAVA; break; - case eDialog: nResId = STR_DIALOG; break; + case eBasic: pResId = STR_OOO_BASIC; break; + case eBeanShell: pResId = STR_BEAN_SHELL; break; + case eJavaScript: pResId = STR_JAVA_SCRIPT; break; + case ePython: pResId = STR_PYTHON; break; + case eJava: pResId = STR_JAVA; break; + case eDialog: pResId = STR_DIALOG; break; } - OSL_ENSURE( nResId != 0, "getScriptTypeDisplayName: illegal script type!" ); - return nResId ? OUString( MacroMigrationResId( nResId ) ) : OUString(); + OSL_ENSURE( pResId != nullptr, "getScriptTypeDisplayName: illegal script type!" ); + + return pResId ? DBA_RES(pResId) : OUString(); } } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc deleted file mode 100644 index e4bc293c6803..000000000000 --- a/dbaccess/source/ext/macromigration/macromigration.hrc +++ /dev/null @@ -1,29 +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 DBACCESS_MACROMIGRATION_HRC -#define DBACCESS_MACROMIGRATION_HRC - -// height and width of tab pages -#define TAB_PAGE_WIDTH 280 -#define TAB_PAGE_HEIGHT 185 - -#endif // DBACCESS_MACROMIGRATION_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src deleted file mode 100644 index fe5812bfc50c..000000000000 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ /dev/null @@ -1,149 +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 . - */ - -#include "dbmm_global.hrc" - -String STR_STATE_CLOSE_SUB_DOCS -{ - Text [ en-US ] = "Prepare"; -}; - -String STR_STATE_BACKUP_DBDOC -{ - Text [ en-US ] = "Backup Document"; -}; - -String STR_STATE_MIGRATE -{ - Text [ en-US ] = "Migrate"; -}; - -String STR_STATE_SUMMARY -{ - Text [ en-US ] = "Summary"; -}; - -String STR_FORM -{ - Text [ en-US ] = "Form '$name$'"; - Text [ x-comment ] = "This refers to a form document inside a database document."; -}; - -String STR_REPORT -{ - Text [ en-US ] = "Report '$name$'"; - Text [ x-comment ] = "This refers to a report document inside a database document."; -}; - -String STR_OVERALL_PROGRESS -{ - Text [ en-US ] = "document $current$ of $overall$"; -}; - -String STR_DATABASE_DOCUMENT -{ - Text[ en-US ] = "Database Document"; -}; - -String STR_SAVED_COPY_TO -{ - Text[ en-US ] = "saved copy to $location$"; -}; - -String STR_MOVED_LIBRARY -{ - Text[ en-US ] = "migrated $type$ library '$old$' to '$new$'"; -}; - -String STR_LIBRARY_TYPE_AND_NAME -{ - Text [ en-US ] = "$type$ library '$library$'"; -}; - -String STR_MIGRATING_LIBS -{ - Text [ en-US ] = "migrating libraries ..."; -}; - -String STR_OOO_BASIC -{ - Text[ en-US ] = "%PRODUCTNAME Basic"; -}; - -String STR_JAVA_SCRIPT -{ - Text[ en-US ] = "JavaScript"; -}; - -String STR_BEAN_SHELL -{ - Text[ en-US ] = "BeanShell"; -}; - -String STR_JAVA -{ - Text[ en-US ] = "Java"; -}; - -String STR_PYTHON -{ - Text[ en-US ] = "Python"; -}; - -String STR_DIALOG -{ - Text[ en-US ] = "dialog"; -}; - -String STR_ERRORS -{ - Text [ en-US ] = "Error(s)"; -}; - -String STR_WARNINGS -{ - Text [ en-US ] = "Warnings"; -}; - -String STR_EXCEPTION -{ - Text [ en-US ] = "caught exception:"; -}; - -String STR_INVALID_BACKUP_LOCATION -{ - Text [ en-US ] = "You need to choose a backup location other than the document location itself."; -}; - -String STR_INVALID_NUMBER_ARGS -{ - Text [ en-US ] = "Invalid number of initialization arguments. Expected 1."; -}; - -String STR_NO_DATABASE -{ - Text [ en-US ] = "No database document found in the initialization arguments."; -}; - -String STR_NOT_READONLY -{ - Text [ en-US ] = "Not applicable to read-only documents."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 6637bb32f49c..349c95d2b35d 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_global.hrc" -#include "dbmm_module.hxx" #include "docinteraction.hxx" -#include "macromigration.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "macromigrationdialog.hxx" #include "macromigrationpages.hxx" #include "migrationengine.hxx" @@ -57,6 +56,10 @@ namespace dbmm #define PATH_DEFAULT 1 +// height and width of tab pages +#define TAB_PAGE_WIDTH 280 +#define TAB_PAGE_HEIGHT 185 + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::XInterface; @@ -125,10 +128,10 @@ namespace dbmm : MacroMigrationDialog_Base(_pParent) , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) ) { - OUString sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS ) ); - OUString sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC ) ); - OUString sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) ); - OUString sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) ); + OUString sTitlePrepare( DBA_RES( STR_STATE_CLOSE_SUB_DOCS ) ); + OUString sTitleStoreAs( DBA_RES( STR_STATE_BACKUP_DBDOC ) ); + OUString sTitleMigrate( DBA_RES( STR_STATE_MIGRATE ) ); + OUString sTitleSummary( DBA_RES( STR_STATE_SUMMARY ) ); describeState( STATE_CLOSE_SUB_DOCS, sTitlePrepare, &PreparationPage::Create ); describeState( STATE_BACKUP_DBDOC, sTitleStoreAs, &SaveDBDocPage::Create ); @@ -382,7 +385,7 @@ namespace dbmm // check that the backup location isn't the same as the document itself if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) ) { - ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ); + ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), DBA_RES( STR_INVALID_BACKUP_LOCATION ) ); aErrorBox->Execute(); rBackupPage.grabLocationFocus(); return false; diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index dd1f49942698..e2e134d5ac52 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -18,9 +18,7 @@ */ #include "dbaccess_helpid.hrc" -#include "dbmm_module.hxx" -#include "dbmm_global.hrc" -#include "macromigration.hrc" +#include "strings.hrc" #include "macromigrationpages.hxx" #include "macromigrationdialog.hxx" diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 96201b2f801f..4cb72dce82df 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -17,83 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_module.hxx" -#include "dbmm_global.hrc" -#include "macromigrationdialog.hxx" #include "macromigrationwizard.hxx" -#include <com/sun/star/ucb/AlreadyInitializedException.hpp> -#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> -#include <com/sun/star/frame/XStorable.hpp> - -#include <svtools/genericunodialog.hxx> - namespace dbmm { - - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::beans::XPropertySetInfo; - using ::com::sun::star::beans::Property; - using ::com::sun::star::ucb::AlreadyInitializedException; - using ::com::sun::star::sdb::XOfficeDatabaseDocument; - using ::com::sun::star::lang::IllegalArgumentException; - using ::com::sun::star::frame::XStorable; - - // MacroMigrationDialogService - class MacroMigrationDialogService; - typedef ::svt::OGenericUnoDialog MacroMigrationDialogService_Base; - typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService > MacroMigrationDialogService_PBase; - - class MacroMigrationDialogService - :public MacroMigrationDialogService_Base - ,public MacroMigrationDialogService_PBase - ,public MacroMigrationModuleClient - { - public: - explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext ); - - // XTypeProvider - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - - // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; - - // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - - // helper for factories - static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext ); - /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_static(); - /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - - protected: - virtual ~MacroMigrationDialogService() override; - - protected: - virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override; - - private: - Reference< XOfficeDatabaseDocument > m_xDocument; - }; - // MacroMigrationDialogService MacroMigrationDialogService::MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext ) :MacroMigrationDialogService_Base( _rxContext ) @@ -157,7 +84,7 @@ namespace dbmm if ( _rArguments.getLength() != 1 ) throw IllegalArgumentException( - MacroMigrationResId(STR_INVALID_NUMBER_ARGS), + DBA_RES(STR_INVALID_NUMBER_ARGS), *this, 1 ); @@ -165,7 +92,7 @@ namespace dbmm m_xDocument.set( _rArguments[0], UNO_QUERY ); if ( !m_xDocument.is() ) throw IllegalArgumentException( - MacroMigrationResId(STR_NO_DATABASE), + DBA_RES(STR_NO_DATABASE), *this, 1 ); @@ -173,7 +100,7 @@ namespace dbmm Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW ); if ( xDocStor->isReadonly() ) throw IllegalArgumentException( - MacroMigrationResId(STR_NOT_READONLY), + DBA_RES(STR_NOT_READONLY), *this, 1 ); @@ -197,12 +124,6 @@ namespace dbmm describeProperties( aProps ); return new ::cppu::OPropertyArrayHelper( aProps ); } - - void createRegistryInfo_MacroMigrationDialogService() - { - static OAutoRegistration< MacroMigrationDialogService > aAutoRegistration; - } - } // namespace dbmm /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx index 3c0bb6c37bbc..ebe1634c8bf6 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -17,17 +17,82 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX -#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX +#include "macromigrationdialog.hxx" -#include <sal/config.h> +#include <com/sun/star/ucb/AlreadyInitializedException.hpp> +#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> +#include <com/sun/star/frame/XStorable.hpp> -namespace dbmm { +#include <svtools/genericunodialog.hxx> -void createRegistryInfo_MacroMigrationDialogService(); +#include "core_resource.hxx" +#include "strings.hrc" -} +namespace dbmm +{ -#endif + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::XComponentContext; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::beans::XPropertySetInfo; + using ::com::sun::star::beans::Property; + using ::com::sun::star::ucb::AlreadyInitializedException; + using ::com::sun::star::sdb::XOfficeDatabaseDocument; + using ::com::sun::star::lang::IllegalArgumentException; + using ::com::sun::star::frame::XStorable; + + // MacroMigrationDialogService + class MacroMigrationDialogService; + typedef ::svt::OGenericUnoDialog MacroMigrationDialogService_Base; + typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService > MacroMigrationDialogService_PBase; + + class MacroMigrationDialogService + :public MacroMigrationDialogService_Base + ,public MacroMigrationDialogService_PBase + { + public: + explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext ); + + // XTypeProvider + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + + // XInitialization + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + + // XPropertySet + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; + + // helper for factories + static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext ); + /// @throws RuntimeException + static OUString SAL_CALL getImplementationName_static(); + /// @throws RuntimeException + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + + protected: + virtual ~MacroMigrationDialogService() override; + + protected: + virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override; + + private: + Reference< XOfficeDatabaseDocument > m_xDocument; + }; + +} // namespace dbmm /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 8b0b7a3c8a5f..ebfe416d28e5 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_global.hrc" -#include "dbmm_module.hxx" #include "dbmm_types.hxx" #include "docinteraction.hxx" #include "migrationengine.hxx" @@ -27,6 +25,8 @@ #include "migrationlog.hxx" #include "progresscapture.hxx" #include "progressmixer.hxx" +#include "core_resource.hxx" +#include "strings.hrc" #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp> @@ -209,8 +209,8 @@ namespace dbmm OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument ) { OUString sObjectName( - OUString(MacroMigrationResId( - _rDocument.eType == eForm ? STR_FORM : STR_REPORT)). + DBA_RES( + _rDocument.eType == eForm ? STR_FORM : STR_REPORT). replaceFirst("$name$", _rDocument.sHierarchicalName)); return sObjectName; } @@ -924,7 +924,7 @@ namespace dbmm // initialize global progress sal_Int32 nOverallRange( m_aSubDocs.size() ); OUString sProgressSkeleton( - OUString(MacroMigrationResId(STR_OVERALL_PROGRESS)). + DBA_RES( STR_OVERALL_PROGRESS). replaceFirst("$overall$", OUString::number(nOverallRange))); m_rProgress.start( nOverallRange ); @@ -1045,7 +1045,7 @@ namespace dbmm } // migrate the libraries - ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS)); + ProgressDelegator aDelegator(m_rProgress, sObjectName, DBA_RES(STR_MIGRATING_LIBS)); ProgressMixer aProgressMixer( aDelegator ); aProgressMixer.registerPhase( PHASE_JAVASCRIPT, 1 ); aProgressMixer.registerPhase( PHASE_BEANSHELL, 1 ); @@ -1773,7 +1773,7 @@ namespace dbmm { // a human-readable description of the affected library OUString sLibraryDescription( - OUString(MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME)). + DBA_RES(STR_LIBRARY_TYPE_AND_NAME). replaceFirst("$type$", getScriptTypeDisplayName(_eScriptType)). replaceFirst("$library$", _rLibraryName)); diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index 6c82391b8197..1346999440fe 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_module.hxx" -#include "dbmm_global.hrc" +#include "core_resource.hxx" #include "migrationerror.hxx" #include "migrationlog.hxx" +#include "strings.hrc" #include <comphelper/anytostring.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <vector> @@ -340,13 +341,13 @@ namespace dbmm } } - void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId ) + void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const char* pHeadingResId ) { _rBuffer.append( "=== " ); - _rBuffer.append ( OUString( MacroMigrationResId( _nHeadingResId ) ) ); + _rBuffer.append( DBA_RES(pHeadingResId) ); _rBuffer.append( " ===\n" ); - OUString sException( MacroMigrationResId( STR_EXCEPTION ) ); + OUString sException( DBA_RES( STR_EXCEPTION ) ); for ( ErrorLog::const_iterator error = _rErrors.begin(); error != _rErrors.end(); @@ -386,10 +387,10 @@ namespace dbmm if ( !m_pData->sBackupLocation.isEmpty() ) { - OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) ); + OUString sBackedUp( DBA_RES( STR_SAVED_COPY_TO ) ); sBackedUp = sBackedUp.replaceAll( "$location$", m_pData->sBackupLocation ); - aBuffer.append( "=== " + OUString( MacroMigrationResId( STR_DATABASE_DOCUMENT ) ) + aBuffer.append( "=== " + DBA_RES( STR_DATABASE_DOCUMENT ) + " ===\n" + sBackedUp + "\n\n"); } @@ -400,7 +401,7 @@ namespace dbmm } else { - OUString sMovedLibTemplate( MacroMigrationResId( STR_MOVED_LIBRARY ) ); + OUString sMovedLibTemplate( DBA_RES( STR_MOVED_LIBRARY ) ); for ( DocumentLogs::const_iterator doc = m_pData->aDocumentLogs.begin(); doc != m_pData->aDocumentLogs.end(); @@ -412,7 +413,7 @@ namespace dbmm if ( rDoc.aMovedLibraries.empty() ) continue; - OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) ); + OUString sDocTitle( DBA_RES( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) ); sDocTitle = sDocTitle.replaceAll( "$name$", rDoc.sName ); aBuffer.append( "=== " + sDocTitle + " ===\n" ); diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx index 55087bfc7756..49feb9af9181 100644 --- a/dbaccess/source/ext/macromigration/migrationprogress.hxx +++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX #define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX +#include <sal/types.h> +#include <rtl/ustring.hxx> + namespace dbmm { diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index aff11ddd5376..a20c299e8caf 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -19,7 +19,8 @@ #include "flt_reghelper.hxx" #include "xmlservices.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index fbb75beadd0c..db8a81e0a987 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -24,7 +24,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 9d0bfd65f25d..f1ceb62e3797 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <tools/debug.hxx> diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 20b562697383..c3be7fedaf49 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -27,7 +27,7 @@ #include "xmlEnums.hxx" #include "xmlDatabaseDescription.hxx" #include "xmlConnectionResource.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include <tools/diagnose_ex.h> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index 8905cfe44564..09d330d5a4a3 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 80d2377d3e77..e57ba90947d7 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -28,7 +28,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include "xmlConnectionData.hxx" diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 3416ee256838..b5c53aabb580 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -24,7 +24,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <vector> diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index a7f25caec522..fe0b336a74a5 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -29,7 +29,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include <rtl/strbuf.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index e9b4f23ba3e4..e9378590dd1d 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -24,7 +24,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <vector> diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index af7d1d61ba70..e79c57efe3e0 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -28,7 +28,8 @@ #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp> -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <connectivity/dbtools.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 579325c57fbe..bc6b1eb1c72a 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -26,7 +26,7 @@ #include "xmlEnums.hxx" #include "xmlFileBasedDatabase.hxx" #include "xmlServerDatabase.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include <tools/diagnose_ex.h> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 97b0c6ce41b3..b8137f2233a4 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -26,7 +26,7 @@ #include "xmlComponent.hxx" #include "xmlHierarchyCollection.hxx" #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 707a8b778d8d..0644db8ac6e8 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -31,7 +31,8 @@ #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "xmlEnums.hxx" #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 458a26b57161..8ddd10face62 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 5bcb2906eea0..d7e24a8fb5d0 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -27,7 +27,8 @@ #include <xmloff/maptype.hxx> #include <com/sun/star/awt/TextAlign.hpp> -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "xmlEnums.hxx" namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 44197f555ed4..d7a10a735814 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -26,7 +26,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index bad2b885b03b..3c44f3cfbee3 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index d37fd226947a..e93d411df2af 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index 06502559eec2..63718920070b 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 2450c8b9c875..ceb86414d249 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -25,7 +25,8 @@ #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" #include "xmlHierarchyCollection.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <ucbhelper/content.hxx> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 2cd959e5cfb5..20427c2a0df6 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -23,7 +23,8 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <xmloff/xmlimp.hxx> #include "xmlfilter.hxx" diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 41973b5efd6c..0f9007c379a6 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -43,7 +43,8 @@ #include <com/sun/star/uno/XNamingService.hpp> #include "xmlDatabase.hxx" #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <xmloff/DocumentSettingsContext.hxx> #include "xmlStyleImport.hxx" #include <xmloff/xmluconv.hxx> diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index d03fdb0d453b..015d8c14b4a1 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -30,6 +30,7 @@ #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> #include <connectivity/CommonTools.hxx> +#include "strings.hxx" // OSubComponent - a component which holds a hard ref to its parent // and is been hold itself (by the parent) with a weak ref diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc deleted file mode 100644 index a4ccd46649d4..000000000000 --- a/dbaccess/source/inc/dbastrings.hrc +++ /dev/null @@ -1,37 +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 DBACCESS_SHARED_DBASTRINGS_HRC -#define DBACCESS_SHARED_DBASTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - - #define SQLSTATE_GENERAL "01000" - - #define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode" - #define PROPERTY_IS_FORM "IsForm" - #define PROPERTY_PERSISTENT_PATH "PersistentPath" - -#endif // DBACCESS_SHARED_DBASTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc deleted file mode 100644 index 9911441257c6..000000000000 --- a/dbaccess/source/inc/dbustrings.hrc +++ /dev/null @@ -1,63 +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 DBACCESS_SHARED_DBUSTRINGS_HRC -#define DBACCESS_SHARED_DBUSTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - - // URLs - - #define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign" - #define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign" - #define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign" - #define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView" - #define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser" - #define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign" - #define URL_COMPONENT_APPLICATION ".component:DB/Application" - #define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign" - - // service names - - #define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" - - // other DBU relevant strings - - #define FRAME_NAME_QUERY_PREVIEW "QueryPreview" - #define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl" - #define PROPERTY_QUERYDESIGNVIEW "QueryDesignView" - #define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign" - #define PROPERTY_HELP_URL "HelpURL" - - // other DBU properties - - #define PROPERTY_TRISTATE "TriState" - #define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape" - #define PROPERTY_TABSTOP "TabStop" - #define PROPERTY_DEFAULTCONTROL "DefaultControl" - #define PROPERTY_ENABLED "Enabled" - #define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior" - -#endif // DBACCESS_SHARED_DBUSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/dbaccess/source/inc/sdbtstrings.hrc deleted file mode 100644 index 2268ad83e892..000000000000 --- a/dbaccess/source/inc/sdbtstrings.hrc +++ /dev/null @@ -1,31 +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 DBACCESS_SHARED_SDBTSTRINGS_HRC -#define DBACCESS_SHARED_SDBTSTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - -#endif // DBACCESS_SHARED_SDBTSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hxx index d05fbf775e44..197a9c95de9d 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC #define INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC -#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT -#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!" -#endif - // property ids #define PROPERTY_ID_TITLE 1 diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/source/inc/stringconstants.inc deleted file mode 100644 index acaf156546ec..000000000000 --- a/dbaccess/source/inc/stringconstants.inc +++ /dev/null @@ -1,248 +0,0 @@ -/* - * 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 . - */ - -// be included itself - - -// property names - -#define PROPERTY_URL "URL" -#define PROPERTY_INFO "Info" -#define PROPERTY_SETTINGS "Settings" -#define PROPERTY_ISPASSWORDREQUIRED "IsPasswordRequired" -#define PROPERTY_TABLEFILTER "TableFilter" -#define PROPERTY_TABLETYPEFILTER "TableTypeFilter" -#define PROPERTY_NAME "Name" -#define PROPERTY_SCHEMANAME "SchemaName" -#define PROPERTY_CATALOGNAME "CatalogName" -#define PROPERTY_PRIVILEGES "Privileges" -#define PROPERTY_ESCAPE_PROCESSING "EscapeProcessing" -#define PROPERTY_COMMAND "Command" -#define PROPERTY_TYPE "Type" -#define PROPERTY_TYPENAME "TypeName" -#define PROPERTY_PRECISION "Precision" -#define PROPERTY_SCALE "Scale" -#define PROPERTY_ISNULLABLE "IsNullable" -#define PROPERTY_ISAUTOINCREMENT "IsAutoIncrement" -#define PROPERTY_ISROWVERSION "IsRowVersion" -#define PROPERTY_DESCRIPTION "Description" -#define PROPERTY_DEFAULTVALUE "DefaultValue" -#define PROPERTY_NUMBERFORMAT "FormatKey" -#define PROPERTY_QUERYTIMEOUT "QueryTimeOut" -#define PROPERTY_MAXFIELDSIZE "MaxFieldSize" -#define PROPERTY_MAXROWS "MaxRows" -#define PROPERTY_CURSORNAME "CursorName" -#define PROPERTY_RESULTSETCONCURRENCY "ResultSetConcurrency" -#define PROPERTY_RESULTSETTYPE "ResultSetType" -#define PROPERTY_FETCHDIRECTION "FetchDirection" -#define PROPERTY_FETCHSIZE "FetchSize" -#define PROPERTY_USEBOOKMARKS "UseBookmarks" -#define PROPERTY_ISSEARCHABLE "IsSearchable" -#define PROPERTY_ISCURRENCY "IsCurrency" -#define PROPERTY_ISSIGNED "IsSigned" -#define PROPERTY_DISPLAYSIZE "DisplaySize" -#define PROPERTY_LABEL "Label" -#define PROPERTY_ISREADONLY "IsReadOnly" -#define PROPERTY_ISWRITABLE "IsWritable" -#define PROPERTY_ISDEFINITELYWRITABLE "IsDefinitelyWritable" -#define PROPERTY_VALUE "Value" -#define PROPERTY_TABLENAME "TableName" -#define PROPERTY_ISCASESENSITIVE "IsCaseSensitive" -#define PROPERTY_SERVICENAME "ServiceName" -#define PROPERTY_ISBOOKMARKABLE "IsBookmarkable" -#define PROPERTY_CANUPDATEINSERTEDROWS "CanUpdateInsertedRows" -#define PROPERTY_ISSET "IsSet" -#define PROPERTY_ISOUTPARAMETER "IsOutParameter" -#define PROPERTY_NUMBERFORMATSSUPPLIER "NumberFormatsSupplier" -#define PROPERTY_ISCALCULATED "IsCalculated" -#define PROPERTY_DATASOURCENAME "DataSourceName" -#define PROPERTY_DATABASE_LOCATION "DatabaseLocation" -#define PROPERTY_CONNECTION_RESOURCE "ConnectionResource" -#define PROPERTY_CONNECTION_INFO "ConnectionInfo" -#define PROPERTY_RESULT_SET "ResultSet" -#define PROPERTY_SELECTION "Selection" -#define PROPERTY_BOOKMARK_SELECTION "BookmarkSelection" -#define PROPERTY_COLUMN_NAME "ColumnName" -#define PROPERTY_COLUMN "Column" -#define PROPERTY_DATASOURCE "DataSource" -#define PROPERTY_TRANSACTIONISOLATION "TransactionIsolation" -#define PROPERTY_TYPEMAP "TypeMap" -#define PROPERTY_USER "User" -#define PROPERTY_PASSWORD "Password" -#define PROPERTY_COMMAND_TYPE "CommandType" -#define PROPERTY_ACTIVECOMMAND "ActiveCommand" -#define PROPERTY_ACTIVE_CONNECTION "ActiveConnection" -#define PROPERTY_FILTER "Filter" -#define PROPERTY_APPLYFILTER "ApplyFilter" -#define PROPERTY_ORDER "Order" -#define PROPERTY_APPLYORDER "ApplyOrder" -#define PROPERTY_ISMODIFIED "IsModified" -#define PROPERTY_ISNEW "IsNew" -#define PROPERTY_ROWCOUNT "RowCount" -#define PROPERTY_ISROWCOUNTFINAL "IsRowCountFinal" -#define PROPERTY_HELPFILENAME "HelpFileName" -#define PROPERTY_WIDTH "Width" -#define PROPERTY_ROW_HEIGHT "RowHeight" -#define PROPERTY_FORMATKEY "FormatKey" -#define PROPERTY_ALIGN "Align" -#define PROPERTY_FONT "FontDescriptor" -#define PROPERTY_TEXTCOLOR "TextColor" -#define PROPERTY_BOUNDFIELD "BoundField" -#define PROPERTY_CONTROLSOURCE "DataField" -#define PROPERTY_REALNAME "RealName" -#define PROPERTY_ISHIDDEN "IsHidden" -#define PROPERTY_UPDATE_TABLENAME "UpdateTableName" -#define PROPERTY_UPDATE_SCHEMANAME "UpdateSchemaName" -#define PROPERTY_UPDATE_CATALOGNAME "UpdateCatalogName" -#define PROPERTY_RELATIVEPOSITION "RelativePosition" -#define PROPERTY_CONTROLMODEL "ControlModel" -#define PROPERTY_ISASCENDING "IsAscending" -#define PROPERTY_RELATEDCOLUMN "RelatedColumn" -#define PROPERTY_ISUNIQUE "IsUnique" -#define PROPERTY_ISPRIMARYKEYINDEX "IsPrimaryKeyIndex" -#define PROPERTY_IGNORERESULT "IgnoreResult" -#define PROPERTY_UPDATERULE "UpdateRule" -#define PROPERTY_DELETERULE "DeleteRule" -#define PROPERTY_REFERENCEDTABLE "ReferencedTable" -#define PROPERTY_REFERENCEDCOLUMN "ReferencedColumn" -#define PROPERTY_PARENTWINDOW "ParentWindow" -#define PROPERTY_SQLEXCEPTION "SQLException" -#define PROPERTY_BORDER "Border" -#define PROPERTY_THREADSAFE "ThreadSafe" -#define PROPERTY_HELPTEXT "HelpText" -#define PROPERTY_CONTROLDEFAULT "ControlDefault" -#define PROPERTY_HIDDEN "Hidden" -#define PROPERTY_DEFAULTSTATE "DefaultState" -#define PROPERTY_SUPPRESSVERSIONCL "SuppressVersionColumns" -#define PROPERTY_SHOW_BROWSER "ShowBrowser" -#define PROPERTY_ENABLE_BROWSER "EnableBrowser" -#define PROPERTY_SHOWMENU "ShowMenu" -#define PROPERTY_LAYOUTINFORMATION "LayoutInformation" -#define PROPERTY_CURRENTTABLE "CurrentTable" -#define PROPERTY_DATABASENAME "DatabaseName" -#define PROPERTY_CONTROLUSER "ControlUser" -#define PROPERTY_CONTROLPASSWORD "ControlPassword" -#define PROPERTY_CACHESIZE "CacheSize" -#define PROPERTY_TEXTLINECOLOR "TextLineColor" -#define PROPERTY_TEXTEMPHASIS "FontEmphasisMark" -#define PROPERTY_TEXTRELIEF "FontRelief" -#define PROPERTY_DEFAULTTEXT "DefaultText" -#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault" -#define PROPERTY_AUTOINCREMENTCREATION "AutoIncrementCreation" -#define PROPERTY_BOOLEANCOMPARISONMODE "BooleanComparisonMode" -#define PROPERTY_ENABLESQL92CHECK "EnableSQL92Check" -#define PROPERTY_FONTCHARWIDTH "FontCharWidth" -#define PROPERTY_FONTCHARSET "FontCharset" -#define PROPERTY_FONTFAMILY "FontFamily" -#define PROPERTY_FONTHEIGHT "FontHeight" -#define PROPERTY_FONTKERNING "FontKerning" -#define PROPERTY_FONTNAME "FontName" -#define PROPERTY_FONTORIENTATION "FontOrientation" -#define PROPERTY_FONTPITCH "FontPitch" -#define PROPERTY_FONTSLANT "FontSlant" -#define PROPERTY_FONTSTRIKEOUT "FontStrikeout" -#define PROPERTY_FONTSTYLENAME "FontStyleName" -#define PROPERTY_FONTUNDERLINE "FontUnderline" -#define PROPERTY_FONTWEIGHT "FontWeight" -#define PROPERTY_FONTWIDTH "FontWidth" -#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode" -#define PROPERTY_FONTTYPE "FontType" -#define PROPERTY_PERSISTENT_NAME "PersistentName" -#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject" -#define PROPERTY_ORIGINAL "Original" -#define PROPERTY_USECATALOGINSELECT "UseCatalogInSelect" -#define PROPERTY_USESCHEMAINSELECT "UseSchemaInSelect" -#define PROPERTY_OUTERJOINESCAPE "EnableOuterJoinEscape" -#define PROPERTY_AS_TEMPLATE "AsTemplate" -#define PROPERTY_HAVING_CLAUSE "HavingClause" -#define PROPERTY_GROUP_BY "GroupBy" -#define PROPERTY_EDIT_WIDTH "EditWidth" -#define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer" -#define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled" - - -// service names - -#define SERVICE_SDBC_RESULTSET "com.sun.star.sdbc.ResultSet" -#define SERVICE_SDBC_ROWSET "com.sun.star.sdbc.RowSet" -#define SERVICE_SDBC_STATEMENT "com.sun.star.sdbc.Statement" -#define SERVICE_SDBC_PREPAREDSTATEMENT "com.sun.star.sdbc.PreparedStatement" -#define SERVICE_SDBC_CALLABLESTATEMENT "com.sun.star.sdbc.CallableStatement" -#define SERVICE_SDBC_CONNECTION "com.sun.star.sdbc.Connection" -#define SERVICE_SDBCX_CONTAINER "com.sun.star.sdbcx.Container" -#define SERVICE_SDBCX_TABLE "com.sun.star.sdbcx.Table" -#define SERVICE_SDBCX_RESULTSET "com.sun.star.sdbcx.ResultSet" -#define SERVICE_SDB_CONNECTION "com.sun.star.sdb.Connection" -#define SERVICE_SDBCX_COLUMN "com.sun.star.sdbcx.Column" -#define SERVICE_SDBCX_COLUMNDESCRIPTOR "com.sun.star.sdbcx.ColumnDescriptor" -#define SERVICE_SDB_COLUMNSETTINGS "com.sun.star.sdb.ColumnSettings" -#define SERVICE_SDB_RESULTCOLUMN "com.sun.star.sdb.ResultColumn" -#define SERVICE_SDB_DATACOLUMN "com.sun.star.sdb.DataColumn" -#define SERVICE_SDB_DATASOURCE "com.sun.star.sdb.DataSource" -#define SERVICE_SDB_RESULTSET "com.sun.star.sdb.ResultSet" -#define SERVICE_SDB_ROWSET "com.sun.star.sdb.RowSet" -#define SERVICE_SDB_PREPAREDSTATMENT "com.sun.star.sdb.PreparedStatement" -#define SERVICE_SDB_CALLABLESTATEMENT "com.sun.star.sdb.CallableStatement" -#define SERVICE_SDB_SQLQUERYCOMPOSER "com.sun.star.sdb.SQLQueryComposer" -#define SERVICE_SDB_DATASETTINGS "com.sun.star.sdb.DefinitionSettings" -#define SERVICE_SDB_QUERYDESCRIPTOR "com.sun.star.sdb.QueryDescriptor" -#define SERVICE_SDB_QUERY "com.sun.star.sdb.Query" -#define SERVICE_SDBCX_COLUMNS "com.sun.star.sdbcx.Columns" -#define SERVICE_SDBCX_TABLES "com.sun.star.sdbcx.Tables" -#define SERVICE_SDB_QUERIES "com.sun.star.sdb.Queries" -#define SERVICE_SDBCX_INDEXCOLUMN "com.sun.star.sdbcx.IndexColumn" -#define SERVICE_SDBCX_KEYCOLUMN "com.sun.star.sdbcx.KeyColumn" -#define SERVICE_SDB_DOCUMENTDEFINITION "com.sun.star.sdb.DocumentDefinition" -#define SERVICE_NAME_FORM "com.sun.star.sdb.Form" -#define SERVICE_NAME_FORM_COLLECTION "com.sun.star.sdb.Forms" -#define SERVICE_NAME_REPORT "com.sun.star.sdb.Report" -#define SERVICE_NAME_REPORT_COLLECTION "com.sun.star.sdb.Reports" -#define SERVICE_NAME_QUERY_COLLECTION "com.sun.star.sdb.Queries" -#define SERVICE_NAME_TABLE_COLLECTION "com.sun.star.sdb.Tables" -#define SERVICE_NAME_SINGLESELECTQUERYCOMPOSER "com.sun.star.sdb.SingleSelectQueryComposer" -#define SERVICE_SDB_APPLICATIONCONTROLLER "org.openoffice.comp.dbu.OApplicationController" - -// info properties -#define INFO_JDBCDRIVERCLASS "JavaDriverClass" -#define INFO_TEXTFILEEXTENSION "Extension" -#define INFO_CHARSET "CharSet" -#define INFO_TEXTFILEHEADER "HeaderLine" -#define INFO_FIELDDELIMITER "FieldDelimiter" -#define INFO_TEXTDELIMITER "StringDelimiter" -#define INFO_DECIMALDELIMITER "DecimalDelimiter" -#define INFO_THOUSANDSDELIMITER "ThousandDelimiter" -#define INFO_SHOWDELETEDROWS "ShowDeleted" -#define INFO_ALLOWLONGTABLENAMES "NoNameLengthLimit" -#define INFO_ADDITIONALOPTIONS "SystemDriverSettings" -#define INFO_AUTORETRIEVEVALUE "AutoRetrievingStatement" -#define INFO_AUTORETRIEVEENABLED "IsAutoRetrievingEnabled" -#define INFO_APPEND_TABLE_ALIAS "AppendTableAliasName" -#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName" -#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields" -#define INFO_PARAMETERNAMESUBST "ParameterNameSubstitution" -#define INFO_IGNOREDRIVER_PRIV "IgnoreDriverPrivileges" -#define INFO_USECATALOG "UseCatalog" -#define INFO_CONN_LDAP_BASEDN "BaseDN" -#define INFO_CONN_LDAP_ROWCOUNT "MaxRowCount" -#define INFO_PREVIEW "Preview" -#define INFO_MEDIATYPE "MediaType" -#define INFO_ESCAPE_DATETIME "EscapeDateTime" - -// other -#define INFO_POOLURL "PoolURL" -#define URL_INTERACTIVE "Interactive" diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc deleted file mode 100644 index b896a924b4ab..000000000000 --- a/dbaccess/source/inc/xmlstrings.hrc +++ /dev/null @@ -1,31 +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 DBACCESS_SHARED_XMLSTRINGS_HRC -#define DBACCESS_SHARED_XMLSTRINGS_HRC - -#include <rtl/ustring.hxx> - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - -#endif // DBACCESS_SHARED_XMLSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index cbc269aa6305..15cb2be4f883 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -18,7 +18,6 @@ */ #include "connectiontools.hxx" -#include "sdbt_services.hxx" #include "tablename.hxx" #include "objectnames.hxx" #include "datasourcemetadata.hxx" @@ -30,11 +29,6 @@ #include <algorithm> -extern "C" void SAL_CALL createRegistryInfo_ConnectionTools() -{ - ::sdbtools::OAutoRegistration< ::sdbtools::ConnectionTools > aRegistration; -} - namespace sdbtools { diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index d2026b579fff..9bc0e42b5c90 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -18,8 +18,9 @@ */ #include "objectnames.hxx" +#include "core_resource.hxx" -#include "sdbt_resource.hrc" +#include "strings.hrc" #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> @@ -99,7 +100,7 @@ namespace sdbtools ::dbtools::DatabaseMetaData aMeta( m_xConnection ); if ( aMeta.supportsSubqueriesInFrom() ) { - OUString sNeedDistinctNames( SdbtRes( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) ); + OUString sNeedDistinctNames( DBA_RES( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) ); aError.NextException <<= SQLException( sNeedDistinctNames, m_xConnection, OUString(), 0, Any() ); } @@ -282,7 +283,7 @@ namespace sdbtools && ( _nCommandType != CommandType::QUERY ) ) throw IllegalArgumentException( - SdbtRes( STR_INVALID_COMMAND_TYPE ), + DBA_RES( STR_INVALID_COMMAND_TYPE ), nullptr, 0 ); @@ -305,7 +306,7 @@ namespace sdbtools catch( const Exception& ) { throw IllegalArgumentException( - SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ), + DBA_RES( STR_CONN_WITHOUT_QUERIES_OR_TABLES ), nullptr, 0 ); @@ -368,9 +369,9 @@ namespace sdbtools if ( sBaseName.isEmpty() ) { if ( CommandType == CommandType::TABLE ) - sBaseName = OUString( SdbtRes( STR_BASENAME_TABLE ) ); + sBaseName = DBA_RES(STR_BASENAME_TABLE); else - sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) ); + sBaseName = DBA_RES(STR_BASENAME_QUERY); } else if( CommandType == CommandType::QUERY ) { diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 6a74c457aadc..433f75b72742 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX #include "connectiondependent.hxx" -#include "module_sdbt.hxx" #include <com/sun/star/sdb/tools/XObjectNames.hpp> @@ -40,9 +39,6 @@ namespace sdbtools class ObjectNames :public ObjectNames_Base ,public ConnectionDependentComponent { - private: - SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives - public: /** constructs the instance diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index e51e997c13e0..0e78a9cb7d35 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -18,9 +18,10 @@ */ #include "tablename.hxx" -#include "sdbt_resource.hrc" -#include "module_sdbt.hxx" -#include "sdbtstrings.hrc" +#include "core_resource.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" #include <com/sun/star/sdb/tools/CompositionType.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> @@ -53,8 +54,6 @@ namespace sdbtools // TableName struct TableName_Impl { - SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives - OUString sCatalog; OUString sSchema; OUString sName; @@ -152,7 +151,7 @@ namespace sdbtools || !xPSI->hasPropertyByName( PROPERTY_NAME ) ) throw IllegalArgumentException( - SdbtRes( STR_NO_TABLE_OBJECT ), + DBA_RES( STR_NO_TABLE_OBJECT ), *this, 0 ); @@ -199,7 +198,7 @@ namespace sdbtools found = true; if ( !found ) throw IllegalArgumentException( - SdbtRes( STR_INVALID_COMPOSITION_TYPE ), + DBA_RES( STR_INVALID_COMPOSITION_TYPE ), nullptr, 0 ); diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/inc/connectiondependent.hxx index 37fb95b16588..37fb95b16588 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/inc/connectiondependent.hxx diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/inc/connectiontools.hxx index 4eb9ed23354b..b4b6b727a8cf 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/inc/connectiontools.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX -#include "module_sdbt.hxx" - #include "connectiondependent.hxx" #include <com/sun/star/sdb/tools/XConnectionTools.hpp> @@ -44,9 +42,6 @@ namespace sdbtools class ConnectionTools :public ConnectionTools_Base ,public ConnectionDependentComponent { - private: - SdbtClient m_aModuleClient; - public: /** constructs a ConnectionTools instance diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx deleted file mode 100644 index 467b98963e3e..000000000000 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ /dev/null @@ -1,34 +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_SDBTOOLS_INC_MODULE_SDBT_HXX -#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX - -#include <unotools/componentresmodule.hxx> - -namespace sdbtools -{ - - DEFINE_MODULE( SdbtModule, SdbtClient, SdbtRes ) - -} // namespace sdbtools - -#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc deleted file mode 100644 index ae0dbe3ef783..000000000000 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ /dev/null @@ -1,38 +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 DBACCESS_SDBT_RESOURCE_HRC -#define DBACCESS_SDBT_RESOURCE_HRC - -#include <svl/solar.hrc> - -#define RID_SDBT_STRINGS_START RID_DBACCESS_START - -//- String-IDs -#define STR_QUERY_AND_TABLE_DISTINCT_NAMES RID_SDBT_STRINGS_START + 0 -#define STR_BASENAME_TABLE RID_SDBT_STRINGS_START + 1 -#define STR_BASENAME_QUERY RID_SDBT_STRINGS_START + 2 -#define STR_CONN_WITHOUT_QUERIES_OR_TABLES RID_SDBT_STRINGS_START + 3 -#define STR_NO_TABLE_OBJECT RID_SDBT_STRINGS_START + 4 -#define STR_INVALID_COMPOSITION_TYPE RID_SDBT_STRINGS_START + 5 -#define STR_INVALID_COMMAND_TYPE RID_SDBT_STRINGS_START + 6 - -#endif // DBACCESS_SDBT_RESOURCE_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx deleted file mode 100644 index d40ef6b96aff..000000000000 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ /dev/null @@ -1,29 +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 . - */ - -#include "module_sdbt.hxx" - -namespace sdbtools -{ - - IMPLEMENT_MODULE( SdbtModule, "sdbt" ) - -} // namespace sdbtools - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 65d438cc6b22..0f2edc74ab9b 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -17,34 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "module_sdbt.hxx" -#include "sdbt_services.hxx" +#include "connectiontools.hxx" +#include <comphelper/componentmodule.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -extern "C" void SAL_CALL sdbt_initializeModule() -{ - static bool s_bInit = false; - if (!s_bInit) - { - createRegistryInfo_ConnectionTools(); - s_bInit = true; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( - const sal_Char* pImplementationName, - void* pServiceManager, - void* /*pRegistryKey*/) + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*) { - sdbt_initializeModule(); - Reference< XInterface > xRet; - if (pServiceManager && pImplementationName) + + if (sdbtools::ConnectionTools::getImplementationName_static() == OUString::createFromAscii(pImplementationName)) { - xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory( - OUString::createFromAscii(pImplementationName)); + xRet = ::cppu::createSingleComponentFactory(sdbtools::ConnectionTools::Create, + sdbtools::ConnectionTools::getImplementationName_static(), + sdbtools::ConnectionTools::getSupportedServiceNames_static(), nullptr); } if (xRet.is()) diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src deleted file mode 100644 index 858c0d70633e..000000000000 --- a/dbaccess/source/sdbtools/resource/sdbt_strings.src +++ /dev/null @@ -1,57 +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 . - */ - -#include "sdbt_resource.hrc" - -String STR_QUERY_AND_TABLE_DISTINCT_NAMES -{ - Text [ en-US ] = "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table."; -}; - -String STR_BASENAME_TABLE -{ - Text [ en-US ] = "Table"; -}; - -String STR_BASENAME_QUERY -{ - Text [ en-US ] = "Query"; -}; - -String STR_CONN_WITHOUT_QUERIES_OR_TABLES -{ - Text [ en-US ] = "The given connection is no valid query and/or tables supplier."; -}; - -String STR_NO_TABLE_OBJECT -{ - Text [ en-US ] = "The given object is no table object."; -}; - -String STR_INVALID_COMPOSITION_TYPE -{ - Text [ en-US ] = "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType."; -}; - -String STR_INVALID_COMMAND_TYPE -{ - Text [ en-US ] = "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx deleted file mode 100644 index d0fb5ead3a40..000000000000 --- a/dbaccess/source/shared/sdbtstrings.cxx +++ /dev/null @@ -1,27 +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 . - */ - -#include "sdbtstrings.hrc" - -namespace sdbtools -{ - #include "stringconstants.inc" -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx deleted file mode 100644 index a6074fd5b0ae..000000000000 --- a/dbaccess/source/shared/xmlstrings.cxx +++ /dev/null @@ -1,27 +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 . - */ - -#include "xmlstrings.hrc" - -namespace dbaxml -{ -#include "stringconstants.inc" -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index ef7070e2b720..402998f35920 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -19,7 +19,8 @@ #include <memory> #include "AppController.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "advancedsettingsdlg.hxx" #include "subcomponentmanager.hxx" #include "uiservices.hxx" @@ -109,7 +110,7 @@ #include "AppView.hxx" #include "browserids.hxx" #include "dbu_reghelper.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include "defaultobjectnamecheck.hxx" #include "databaseobjectview.hxx" #include "listviewitems.hxx" @@ -864,7 +865,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const OUString sDSTypeName; if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURL ) ) { - sDSTypeName = OUString( ModuleRes( RID_STR_EMBEDDED_DATABASE ) ); + sDSTypeName = DBA_RES(RID_STR_EMBEDDED_DATABASE); } else { @@ -2035,9 +2036,9 @@ void OApplicationController::renameEntry() { OUString sLabel; if ( eType == E_FORM ) - sLabel = OUString(ModuleRes( STR_FRM_LABEL )); + sLabel = DBA_RES(STR_FRM_LABEL); else - sLabel = OUString(ModuleRes( STR_RPT_LABEL )); + sLabel = DBA_RES(STR_RPT_LABEL); OUString sName = *aList.begin(); if ( xHNames->hasByHierarchicalName(sName) ) @@ -2134,7 +2135,7 @@ void OApplicationController::renameEntry() } catch(const ElementExistException& e) { - OUString sMsg( ModuleRes( STR_NAME_ALREADY_EXISTS ) ); + OUString sMsg(DBA_RES(STR_NAME_ALREADY_EXISTS)); showError(SQLExceptionInfo(SQLException(sMsg.replaceAll("#", e.Message), e.Context, "S1000", 0, Any()))); } catch(const Exception& ) @@ -2528,9 +2529,9 @@ void OApplicationController::OnFirstControllerConnected() return; SQLWarning aWarning; - aWarning.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS ) ); + aWarning.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS); SQLException aDetail; - aDetail.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS_DETAIL ) ); + aDetail.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS_DETAIL); aWarning.NextException <<= aDetail; Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", nullptr, makeAny( aWarning ) ); @@ -2767,7 +2768,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) case DatabaseObjectContainer::REPORTS: if ( eSelectedCategory != E_NONE ) throw IllegalArgumentException( - ModuleRes(RID_STR_NO_DIFF_CAT), + DBA_RES(RID_STR_NO_DIFF_CAT), *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) ); eSelectedCategory = ( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE @@ -2781,7 +2782,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) case DatabaseObjectContainer::DATA_SOURCE: { OUString sMessage( - OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE)). + DBA_RES(RID_STR_UNSUPPORTED_OBJECT_TYPE). replaceFirst("$type$", OUString::number(pObject->Type))); throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() )); } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 81323fd6e5e9..654f0c238c6a 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -26,7 +26,7 @@ #include "dsntypes.hxx" #include <dbaccess/genericcontroller.hxx> #include "linkeddocuments.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "TableCopyHelper.hxx" #include <com/sun/star/beans/XPropertyChangeListener.hpp> @@ -94,7 +94,7 @@ namespace dbaui css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; TransferableDataHelper m_aSystemClipboard; // content of the clipboard css::uno::Reference< css::beans::XPropertySet > m_xDataSource; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 14c12d0848bc..bf23714399c3 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -22,7 +22,8 @@ #include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -55,7 +56,7 @@ #include <svx/dbaobjectex.hxx> #include "browserids.hxx" #include "dbu_reghelper.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include <vcl/menu.hxx> #include <comphelper/uno3.hxx> #include <vcl/svapp.hxx> @@ -176,7 +177,7 @@ void OApplicationController::deleteTables(const std::vector< OUString>& _rList) } else { - OUString sMessage(ModuleRes(STR_MISSING_TABLES_XDROP)); + OUString sMessage(DBA_RES(STR_MISSING_TABLES_XDROP)); ScopedVclPtrInstance< MessageDialog > aError(getView(), sMessage); aError->Execute(); } @@ -345,7 +346,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL { SolarMutexGuard aSolarGuard; - OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); + OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE)); sConnectingContext = sConnectingContext.replaceFirst("$name$", getStrippedDatabaseName()); // do the connection *without* holding getMutex() to avoid deadlock @@ -621,7 +622,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe if ( sTargetName.isEmpty() ) { - OUString sDefaultName = OUString( ModuleRes( STR_QRY_TITLE ) ); + OUString sDefaultName = DBA_RES(STR_QRY_TITLE); sDefaultName = sDefaultName.getToken( 0, ' ' ); Reference< XNameAccess > xQueries( getQueryDefinitions(), UNO_QUERY_THROW ); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index f1100dbb1c0e..28e0860c3b51 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -20,9 +20,10 @@ #include "AppController.hxx" #include "AppDetailView.hxx" #include "AppView.hxx" +#include "core_resource.hxx" #include "dbaccess_slotid.hrc" -#include "dbu_app.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "UITools.hxx" @@ -104,7 +105,7 @@ void OApplicationController::convertToView(const OUString& _sName) Reference< XDatabaseMetaData > xMeta = xConnection->getMetaData(); - OUString aName = OUString(ModuleRes(STR_TBL_TITLE)); + OUString aName = DBA_RES(STR_TBL_TITLE); aName = aName.getToken(0,' '); OUString aDefaultName = ::dbaui::createDefaultName(xMeta,xTables,aName); @@ -119,7 +120,7 @@ void OApplicationController::convertToView(const OUString& _sName) ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, false, ::dbtools::EComposeRule::InTableDefinitions ) ); Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); if ( !xView.is() ) - throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any()); + throw SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any()); getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView)); } } @@ -329,7 +330,7 @@ void SAL_CALL OApplicationController::connect( ) aError.doThrow(); // no particular error, but nonetheless could not connect -> throw a generic exception - OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); + OUString sConnectingContext( DBA_RES( STR_COULDNOTCONNECT_DATASOURCE ) ); ::dbtools::throwGenericSQLException( sConnectingContext.replaceFirst( "$name$", getStrippedDatabaseName() ), *this ); } } @@ -517,7 +518,7 @@ void OApplicationController::askToReconnect() bool bClear = true; if ( !m_pSubComponentManager->empty() ) { - ScopedVclPtrInstance< MessageDialog > aQry(getView(), ModuleRes(STR_QUERY_CLOSEDOCUMENTS), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQry(getView(), DBA_RES(STR_QUERY_CLOSEDOCUMENTS), VclMessageType::Question, VclButtonsType::YesNo); switch (aQry->Execute()) { case RET_YES: diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index f797da66b562..4f06cfc6a519 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -18,7 +18,7 @@ */ #include "AppDetailPageHelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <connectivity/dbtools.hxx> @@ -52,10 +52,11 @@ #include <toolkit/helper/vclunohelper.hxx> #include "AppView.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_app.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "callbacks.hxx" #include <dbaccess/IController.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dbaccess_slotid.hrc" #include "databaseobjectview.hxx" #include "imageprovider.hxx" diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index eecaa2a59cdd..24a44f4411aa 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -20,7 +20,7 @@ #include "AppDetailView.hxx" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" -#include "dbu_app.hrc" +#include "strings.hrc" #include "AppView.hxx" #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> @@ -29,6 +29,7 @@ #include <com/sun/star/sdbcx/XViewsSupplier.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/util/URL.hpp> +#include "core_resource.hxx" #include "listviewitems.hxx" #include <vcl/image.hxx> #include <vcl/mnemonic.hxx> @@ -38,7 +39,7 @@ #include <vcl/svapp.hxx> #include "callbacks.hxx" #include <dbaccess/IController.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" #include <algorithm> @@ -62,10 +63,10 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject; #define SPACEBETWEENENTRIES 4 -TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled ) +TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* _pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled ) :sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) ) - ,nHelpID( _nHelpID ) - ,sTitle( ModuleRes( _nTitleResourceID ) ) + ,pHelpID( _pHelpID ) + ,sTitle( DBA_RES(pTitleResourceID) ) ,bHideWhenDisabled( _bHideWhenDisabled ) { } @@ -295,10 +296,10 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ) void OCreationList::updateHelpText() { - sal_uInt16 nHelpTextId = 0; + const char* pHelpTextId = nullptr; if ( GetCurEntry() ) - nHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID; - m_rTaskWindow.setHelpText( nHelpTextId ); + pHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->pHelpID; + m_rTaskWindow.setHelpText(pHelpTextId); } void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const @@ -351,7 +352,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai m_aCreation->SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); m_aHelpText->SetHelpId(HID_APP_HELP_TEXT); m_aDescription->SetHelpId(HID_APP_DESCRIPTION_TEXT); - m_aDescription->SetText(ModuleRes(STR_DESCRIPTION)); + m_aDescription->SetText(DBA_RES(STR_DESCRIPTION)); Image aFolderImage = ImageProvider::getFolderImage( css::sdb::application::DatabaseObject::FORM ); m_aCreation->SetDefaultCollapsedEntryBmp( aFolderImage ); @@ -414,11 +415,11 @@ void OTasksWindow::ImplInitSettings() m_aDescription->SetControlFont(aFont); } -void OTasksWindow::setHelpText(sal_uInt16 _nId) +void OTasksWindow::setHelpText(const char* pId) { - if ( _nId ) + if (pId) { - OUString sText = ModuleRes(_nId); + OUString sText = DBA_RES(pId); m_aHelpText->SetText(sText); } else @@ -432,7 +433,7 @@ IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry(); if ( pEntry ) - m_aHelpText->SetText( ModuleRes( static_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) ); + m_aHelpText->SetText(DBA_RES(static_cast<TaskEntry*>(pEntry->GetUserData())->pHelpID)); } void OTasksWindow::Resize() @@ -522,8 +523,8 @@ void OTasksWindow::Clear() OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent ) ,m_aHorzSplitter(VclPtr<Splitter>::Create(this)) - ,m_aTasks(VclPtr<dbaui::OTitleWindow>::Create(this,STR_TASKS,WB_BORDER | WB_DIALOGCONTROL) ) - ,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this,0,WB_BORDER | WB_DIALOGCONTROL) ) + ,m_aTasks(VclPtr<dbaui::OTitleWindow>::Create(this, STR_TASKS, WB_BORDER | WB_DIALOGCONTROL)) + ,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this, nullptr, WB_BORDER | WB_DIALOGCONTROL)) ,m_rBorderWin(_rParent) { ImplInitSettings(); @@ -636,7 +637,7 @@ void OApplicationDetailView::impl_createPage( ElementType _eType, const Referenc bool bEnabled = !rData.aTasks.empty() && getBorderWin().getView()->getCommandController().isCommandEnabled( rData.aTasks[0].sUNOCommand ); getTasksWindow().Enable( bEnabled ); - m_aContainer->setTitle( rData.nTitleId ); + m_aContainer->setTitle(rData.pTitleId); // let our helper create the object list if ( _eType == E_TABLE ) @@ -672,26 +673,26 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane rList.push_back( TaskEntry( ".uno:DBNewTable", RID_STR_TABLES_HELP_TEXT_DESIGN, RID_STR_NEW_TABLE ) ); rList.push_back( TaskEntry( ".uno:DBNewTableAutoPilot", RID_STR_TABLES_HELP_TEXT_WIZARD, RID_STR_NEW_TABLE_AUTO ) ); rList.push_back( TaskEntry( ".uno:DBNewView", RID_STR_VIEWS_HELP_TEXT_DESIGN, RID_STR_NEW_VIEW, true ) ); - _rData.nTitleId = RID_STR_TABLES_CONTAINER; + _rData.pTitleId = RID_STR_TABLES_CONTAINER; break; case E_FORM: rList.push_back( TaskEntry( ".uno:DBNewForm", RID_STR_FORMS_HELP_TEXT, RID_STR_NEW_FORM ) ); rList.push_back( TaskEntry( ".uno:DBNewFormAutoPilot", RID_STR_FORMS_HELP_TEXT_WIZARD, RID_STR_NEW_FORM_AUTO ) ); - _rData.nTitleId = RID_STR_FORMS_CONTAINER; + _rData.pTitleId = RID_STR_FORMS_CONTAINER; break; case E_REPORT: rList.push_back( TaskEntry( ".uno:DBNewReport", RID_STR_REPORT_HELP_TEXT, RID_STR_NEW_REPORT, true ) ); rList.push_back( TaskEntry( ".uno:DBNewReportAutoPilot", RID_STR_REPORTS_HELP_TEXT_WIZARD, RID_STR_NEW_REPORT_AUTO ) ); - _rData.nTitleId = RID_STR_REPORTS_CONTAINER; + _rData.pTitleId = RID_STR_REPORTS_CONTAINER; break; case E_QUERY: rList.push_back( TaskEntry( ".uno:DBNewQuery", RID_STR_QUERIES_HELP_TEXT, RID_STR_NEW_QUERY ) ); rList.push_back( TaskEntry( ".uno:DBNewQueryAutoPilot", RID_STR_QUERIES_HELP_TEXT_WIZARD, RID_STR_NEW_QUERY_AUTO ) ); rList.push_back( TaskEntry( ".uno:DBNewQuerySql", RID_STR_QUERIES_HELP_TEXT_SQL, RID_STR_NEW_QUERY_SQL ) ); - _rData.nTitleId = RID_STR_QUERIES_CONTAINER; + _rData.pTitleId = RID_STR_QUERIES_CONTAINER; break; default: diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 634ebadfabbd..09093e2d2d5d 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -89,14 +89,14 @@ namespace dbaui struct TaskEntry { OUString sUNOCommand; - sal_uInt16 nHelpID; + const char* pHelpID; OUString sTitle; bool bHideWhenDisabled; // TODO: we should be consistent in the task pane and the menus/toolbars: // If an entry is disabled in the latter, it should also be disabled in the former. // If an entry is *hidden* in the former, it should also be hidden in the latter. - TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false ); + TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled = false ); }; typedef std::vector< TaskEntry > TaskEntryList; @@ -105,7 +105,7 @@ namespace dbaui /// the tasks available in the pane TaskEntryList aTasks; /// the resource ID for the title of the pane - sal_uInt16 nTitleId; + const char* pTitleId; }; class OTasksWindow : public vcl::Window @@ -139,7 +139,7 @@ namespace dbaui } void Clear(); - void setHelpText(sal_uInt16 _nId); + void setHelpText(const char* pId); }; class OApplicationDetailView : public OSplitterView , public IClipboardTest diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 23b9c3f28227..3fe62cb57912 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -19,8 +19,8 @@ #include "AppIconControl.hxx" #include "dbaccess_helpid.hrc" -#include "moduledbu.hxx" -#include "dbu_app.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include <vcl/image.hxx> #include "callbacks.hxx" @@ -38,7 +38,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) const struct CategoryDescriptor { - sal_uInt16 nLabelResId; + const char* pLabelResId; ElementType eType; const char* aImageResId; } aCategories[] = { @@ -50,7 +50,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) for (const CategoryDescriptor& aCategorie : aCategories) { SvxIconChoiceCtrlEntry* pEntry = InsertEntry( - OUString( ModuleRes( aCategorie.nLabelResId ) ) , + DBA_RES(aCategorie.pLabelResId) , Image(BitmapEx(OUString::createFromAscii(aCategorie.aImageResId)))); if ( pEntry ) pEntry->SetUserData( new ElementType( aCategorie.eType ) ); diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index f9953b6fcae2..96d546084358 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -19,7 +19,7 @@ #include "AppSwapWindow.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_app.hrc" +#include "strings.hrc" #include "AppView.hxx" #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 2bdcea9299bf..f3769cb0f509 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -18,14 +18,14 @@ */ #include "AppTitleWindow.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> namespace dbaui { -OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift) +OTitleWindow::OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) , m_aSpace1(VclPtr<FixedText>::Create(this)) , m_aSpace2(VclPtr<FixedText>::Create(this)) @@ -33,8 +33,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n , m_pChild(nullptr) , m_bShift(_bShift) { - - setTitle(_nTitleId); + setTitle(pTitleId); SetBorderStyle(WindowBorderStyle::MONO); ImplInitSettings(); @@ -100,11 +99,11 @@ void OTitleWindow::Resize() } } -void OTitleWindow::setTitle(sal_uInt16 _nTitleId) +void OTitleWindow::setTitle(const char* pTitleId) { - if ( _nTitleId != 0 ) + if (pTitleId) { - m_aTitle->SetText(ModuleRes(_nTitleId)); + m_aTitle->SetText(DBA_RES(pTitleId)); } } diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 491ebfd56912..c6a8d417df7f 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -34,7 +34,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: - OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); + OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift = true); virtual ~OTitleWindow() override; virtual void dispose() override; @@ -58,10 +58,10 @@ namespace dbaui vcl::Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource - @param _nTitleId + @param pTitleId The resource id of the title text. */ - void setTitle(sal_uInt16 _nTitleId); + void setTitle(const char* pTitleId); /** Gets the min Width in Pixel which is needed to display the whole diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index c57c414464ba..6920cc05614f 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -18,7 +18,7 @@ */ #include "AppView.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include "dbaccess_helpid.hrc" @@ -39,7 +39,7 @@ #include <vcl/settings.hxx> #include "AppTitleWindow.hxx" #include "dsntypes.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <dbaccess/IController.hxx> #include "browserids.hxx" #include <unotools/pathoptions.hxx> diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src deleted file mode 100644 index 82b118b0e801..000000000000 --- a/dbaccess/source/ui/app/app.src +++ /dev/null @@ -1,247 +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 . - */ -#include "dbu_app.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - -String RID_STR_NEW_FORM -{ - Text [ en-US ] = "Create Form in Design View..." ; -}; - -String RID_STR_NEW_FORM_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Form..." ; -}; - -String RID_STR_NEW_REPORT_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Report..." ; -}; - -String RID_STR_NEW_REPORT -{ - Text [ en-US ] = "Create Report in Design View..." ; -}; - -String RID_STR_NEW_QUERY -{ - Text [ en-US ] = "Create Query in Design View..." ; -}; - -String RID_STR_NEW_QUERY_SQL -{ - Text [ en-US ] = "Create Query in SQL View..." ; -}; - -String RID_STR_NEW_QUERY_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Query..." ; -}; -String RID_STR_NEW_TABLE -{ - Text [ en-US ] = "Create Table in Design View..." ; -}; - -String RID_STR_NEW_TABLE_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Table..." ; -}; -String RID_STR_NEW_VIEW -{ - Text [ en-US ] = "Create View..." ; -}; - -String RID_STR_FORMS_CONTAINER -{ - Text [ en-US ] = "Forms" ; -}; - -String RID_STR_REPORTS_CONTAINER -{ - Text [ en-US ] = "Reports" ; -}; - -String RID_STR_REPORTS_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "The wizard will guide you through the steps necessary to create a report." ; -}; - -String RID_STR_FORMS_HELP_TEXT -{ - Text [ en-US ] = "Create a form by specifying the record source, controls, and control properties." ; -}; - -String RID_STR_REPORT_HELP_TEXT -{ - Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ; -}; - -String RID_STR_FORMS_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "The wizard will guide you through the steps necessary to create a form." ; -}; - -String RID_STR_QUERIES_HELP_TEXT -{ - Text [ en-US ] = "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping." ; -}; - -String RID_STR_QUERIES_HELP_TEXT_SQL -{ - Text [ en-US ] = "Create a query by entering an SQL statement directly." ; -}; - -String RID_STR_QUERIES_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "The wizard will guide you through the steps necessary to create a query." ; -}; - -String RID_STR_TABLES_HELP_TEXT_DESIGN -{ - Text [ en-US ] = "Create a table by specifying the field names and properties, as well as the data types." ; -}; - -String RID_STR_TABLES_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "Choose from a selection of business and personal table samples, which you customize to create a table." ; -}; - -String RID_STR_VIEWS_HELP_TEXT_DESIGN -{ - Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ; -}; - -String STR_DATABASE -{ - Text [ en-US ] = "Database" ; -}; - -String STR_TASKS -{ - Text [ en-US ] = "Tasks" ; -}; - -String STR_DESCRIPTION -{ - Text [ en-US ] = "Description" ; -}; - -String STR_PREVIEW -{ - Text [ en-US ] = "Preview" ; -}; - -String STR_QUERY_CLOSEDOCUMENTS -{ - Text [ en-US ] = "The connection type has been altered.\nFor the changes to take effect, all forms, reports, queries and tables must be closed.\n\nDo you want to close all documents now?" ; -}; - -String RID_STR_FORM -{ - Text [ en-US ] = "Form"; -}; - -String RID_STR_REPORT -{ - Text [ en-US ] = "Report"; -}; - -String STR_FRM_LABEL -{ - Text [ en-US ] = "F~orm name" ; -}; - -String STR_RPT_LABEL -{ - Text [ en-US ] = "~Report name" ; -}; - -String STR_FOLDER_LABEL -{ - Text [ en-US ] = "F~older name" ; -}; - -String STR_SUB_DOCS_WITH_SCRIPTS -{ - Text [ en-US ] = "The document contains forms or reports with embedded macros."; -}; - -String STR_SUB_DOCS_WITH_SCRIPTS_DETAIL -{ - Text [ en-US ] = "Macros should be embedded into the database document itself.\n\n" - - "You can continue to use your document as before, however, you are encouraged to migrate " - "your macros. The menu item 'Tools / Migrate Macros ...' will assist you with this.\n\n" - - "Note that you won't be able to embed macros into the database document itself until " - "this migration is done. "; -}; - -String RID_STR_EMBEDDED_DATABASE -{ - Text [ en-US ] = "Embedded database"; -}; - -String RID_STR_NO_DIFF_CAT -{ - Text [ en-US ] = "You cannot select different categories."; -}; - -String RID_STR_UNSUPPORTED_OBJECT_TYPE -{ - Text [ en-US ] = "Unsupported object type found ($type$)."; -}; - -String STR_PAGETITLE_GENERAL -{ - Text [ en-US ] = "Advanced Properties" ; -}; - -String STR_PAGETITLE_ADVANCED -{ - Text [ en-US ] = "Additional Settings" ; -}; - -String STR_PAGETITLE_CONNECTION -{ - Text [ en-US ] = "Connection settings" ; -}; - -String STR_TBL_LABEL -{ - Text [ en-US ] = "~Table Name" ; -}; - -String STR_QRY_LABEL -{ - Text [ en-US ] = "~Query name" ; -}; - -String STR_TITLE_RENAME -{ - Text [ en-US ] = "Rename to"; -}; - -String STR_TITLE_PASTE_AS -{ - Text [ en-US ] = "Insert as"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc deleted file mode 100644 index e0a894a3331f..000000000000 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ /dev/null @@ -1,62 +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_APP_DBU_APP_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC - -#include "dbu_resource.hrc" - -#define RID_STR_NEW_FORM RID_STR_APP_START -#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 -#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 -#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 -#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 -#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 -#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 -#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 -#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 -#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 -#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 -#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 -#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 -#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 -#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 -#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 -#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 -#define STR_DATABASE RID_STR_APP_START + 21 -#define STR_TASKS RID_STR_APP_START + 22 -#define STR_DESCRIPTION RID_STR_APP_START + 23 -#define STR_PREVIEW RID_STR_APP_START + 24 -#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 -#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 -#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 -#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 -#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 -#define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31 -#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 -#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 - -// please adjust checking before insert new strings - -#if RID_STR_UNSUPPORTED_OBJECT_TYPE > RID_STR_APP_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index bb66c221b918..d74ea7192273 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -19,7 +19,8 @@ #include "subcomponentmanager.hxx" #include "AppController.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 4256ff2f36c1..b3e7ba256657 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -20,8 +20,10 @@ #include "browserids.hxx" #include "brwctrlr.hxx" #include "brwview.hxx" -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "queryfilter.hxx" #include "queryorder.hxx" #include "sqlmessage.hxx" @@ -536,8 +538,8 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno:: ,m_nRowSetPrivileges(0) ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) ) - ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) - ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD)) + ,m_sStateSaveRecord(DBA_RES(RID_STR_SAVE_CURRENT_RECORD)) + ,m_sStateUndoRecord(DBA_RES(RID_STR_UNDO_MODIFY_RECORD)) ,m_sModuleIdentifier( OUString( "com.sun.star.sdb.DataSourceBrowser" ) ) ,m_pFormControllerImpl(nullptr) ,m_nFormActionNestingLevel(0) @@ -751,7 +753,7 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent) // marry them Reference< css::container::XNameContainer > xNameCont(m_xRowSet, UNO_QUERY); { - OUString sText(ModuleRes(STR_DATASOURCE_GRIDCONTROL_NAME)); + OUString sText(DBA_RES(STR_DATASOURCE_GRIDCONTROL_NAME)); xNameCont->insertByName(sText, makeAny(m_xGridModel)); } @@ -1371,7 +1373,7 @@ void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) { - if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES) + if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), DBA_RES(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES) return false; return true; @@ -1983,7 +1985,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->setOrder(OUString()); xParser->appendOrderByColumn(xField, bSortUp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_ORDER), + DBA_RES(SBA_BROWSER_SETTING_ORDER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) @@ -2040,7 +2042,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendHavingClauseByColumn(xField,true,nOp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_FILTER), + DBA_RES(SBA_BROWSER_SETTING_FILTER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } @@ -2049,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendFilterByColumn(xField,true,nOp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_FILTER), + DBA_RES(SBA_BROWSER_SETTING_FILTER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index fee1b1ab6932..1be565799a11 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -24,8 +24,9 @@ #include <comphelper/types.hxx> #include <vcl/split.hxx> #include "dbtreeview.hxx" -#include "dbustrings.hrc" -#include "dbu_brw.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/awt/XControlContainer.hpp> #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index e744a20b6a07..e8cf07c36eb1 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XResultSetAccess.hpp> #include "TokenWriter.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <comphelper/uno3.hxx> #include <svx/dataaccessdescriptor.hxx> #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 7415e3a10698..b56ecf9318c3 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -18,7 +18,8 @@ */ #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "uiservices.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx index f955010eaff9..a81d475b0a98 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.cxx +++ b/dbaccess/source/ui/browser/dbtreemodel.cxx @@ -18,7 +18,7 @@ */ #include "dbtreemodel.hxx" -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 367023fa4be6..f65391f910b9 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -28,7 +28,7 @@ #include <osl/diagnose.h> #include "dbtreeview.hxx" #include "dbtreelistbox.hxx" -#include "dbu_brw.hrc" +#include "strings.hrc" #include "dbtreemodel.hxx" #include "svtools/treelistentry.hxx" diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index bcdb8cb216e8..850d514d2157 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -21,8 +21,8 @@ #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" #include "dbtreeview.hxx" -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include "QEnumTypes.hxx" #include "UITools.hxx" #include "unodatbr.hxx" diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 19832f26930a..8bbd503f2293 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -26,7 +26,8 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include "formadapter.hxx" #include <comphelper/processfactory.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "dbu_reghelper.hxx" #include <o3tl/any.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index d3cd39a7e1ed..8122b7cef908 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -23,8 +23,9 @@ #include <comphelper/enumhelper.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" #include <connectivity/dbexception.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index d95fd67d0fae..576289f3fb42 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -26,7 +26,7 @@ #include <dbaccess/dataview.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <vcl/stdtext.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src deleted file mode 100644 index 2171873f2bd8..000000000000 --- a/dbaccess/source/ui/browser/sbabrw.src +++ /dev/null @@ -1,103 +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 . - */ -#include "dbaccess_helpid.hrc" -#include "dbu_brw.hrc" -#include "browserids.hxx" - -String STR_QUERY_BRW_DELETE_ROWS -{ - Text[ en-US ] = "Do you want to delete the selected data?" ; -}; - -String SBA_BROWSER_SETTING_ORDER -{ - Text [ en-US ] = "Error setting the sort criteria"; -}; - -String SBA_BROWSER_SETTING_FILTER -{ - Text [ en-US ] = "Error setting the filter criteria"; -}; - -String RID_STR_CONNECTION_LOST -{ - Text [ en-US ] = "Connection lost"; -}; - -String RID_STR_QUERIES_CONTAINER -{ - Text [ en-US ] = "Queries"; -}; - -String RID_STR_TABLES_CONTAINER -{ - Text [ en-US ] = "Tables"; -}; - -String STR_TITLE_CONFIRM_DELETION -{ - Text [ en-US ] = "Confirm Deletion" ; -}; - -String STR_QUERY_DELETE_TABLE -{ - Text [ en-US ] = "Do you want to delete the table '%1'?" ; -}; - -String STR_QUERY_CONNECTION_LOST -{ - Text [ en-US ] = "The connection to the database has been lost. Do you want to reconnect?" ; -}; - -String STR_OPENTABLES_WARNINGS -{ - Text [ en-US ] = "Warnings encountered"; -}; - -String STR_OPENTABLES_WARNINGS_DETAILS -{ - Text [ en-US ] = "While retrieving the tables, warnings were reported by the database connection."; -}; - -String STR_CONNECTING_DATASOURCE -{ - Text [ en-US ] = "Connecting to \"$name$\" ..."; -}; - -String STR_LOADING_QUERY -{ - Text [ en-US ] = "Loading query $name$ ..."; -}; - -String STR_LOADING_TABLE -{ - Text [ en-US ] = "Loading table $name$ ..."; -}; - -String STR_NO_TABLE_FORMAT_INSIDE -{ - Text [ en-US ] = "No table format could be found." ; -}; - -String STR_COULDNOTCONNECT_DATASOURCE -{ - Text [ en-US ] = "The connection to the data source \"$name$\" could not be established."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index f40df7404bdd..3aa1b9237f56 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -18,6 +18,7 @@ */ #include "sbagrid.hrc" +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" #include "uiservices.hxx" @@ -70,9 +71,10 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <vcl/msgbox.hxx> -#include "dbu_brw.hrc" #include "browserids.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dbu_reghelper.hxx" #include "dbexchange.hxx" #include "TableRowExchange.hxx" @@ -666,13 +668,13 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM case DataType::REF: break; default: - rMenu.InsertItem(ID_BROWSER_COLATTRSET, ModuleRes(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_COLATTRSET, DBA_RES(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_COLATTRSET, HID_BROWSER_COLUMNFORMAT); rMenu.InsertSeparator(OString(), nPos++); } } - rMenu.InsertItem(ID_BROWSER_COLWIDTH, ModuleRes(RID_STR_COLUMN_WIDTH), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_COLWIDTH, DBA_RES(RID_STR_COLUMN_WIDTH), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_COLWIDTH, HID_BROWSER_COLUMNWIDTH); rMenu.InsertSeparator(OString(), nPos++); } @@ -751,17 +753,17 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) if (!IsReadOnlyDB()) { - rMenu.InsertItem(ID_BROWSER_TABLEATTR, ModuleRes(RID_STR_TABLE_FORMAT), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_TABLEATTR, DBA_RES(RID_STR_TABLE_FORMAT), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_TABLEATTR, HID_BROWSER_TABLEFORMAT); - rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, ModuleRes(RID_STR_ROW_HEIGHT), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, DBA_RES(RID_STR_ROW_HEIGHT), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, HID_BROWSER_ROWHEIGHT); rMenu.InsertSeparator(OString(), nPos++); } if ( GetSelectRowCount() > 0 ) { - rMenu.InsertItem(ID_BROWSER_COPY, ModuleRes(RID_STR_COPY), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_COPY, DBA_RES(RID_STR_COPY), MenuItemBits::NONE, OString(), nPos++); rMenu.InsertSeparator(OString(), nPos++); } } @@ -1425,7 +1427,7 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) m_pMasterListener->BeforeDrop(); if(!pImExport->Read()) { - OUString sError = OUString(ModuleRes(STR_NO_COLUMNNAME_MATCHING)); + OUString sError = DBA_RES(STR_NO_COLUMNNAME_MATCHING); throwGenericSQLException(sError,nullptr); } if (m_pMasterListener) @@ -1458,7 +1460,7 @@ OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowse if ( ::svt::BBTYPE_BROWSEBOX == eObjType ) { SolarMutexGuard aGuard; - sRet = OUString(ModuleRes(STR_DATASOURCE_GRIDCONTROL_DESC)); + sRet = DBA_RES(STR_DATASOURCE_GRIDCONTROL_DESC); } else sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition); diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src deleted file mode 100644 index a54584007f4e..000000000000 --- a/dbaccess/source/ui/browser/sbagrid.src +++ /dev/null @@ -1,98 +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 . - */ -#include "dbu_brw.hrc" -#include "dbaccess_helpid.hrc" -#include "browserids.hxx" - -String RID_STR_COLUMN_FORMAT -{ - Text [ en-US ] = "Column ~Format..."; -}; - -String RID_STR_COLUMN_WIDTH -{ - Text [ en-US ] = "Column ~Width..."; -}; - -String RID_STR_TABLE_FORMAT -{ - Text [ en-US ] = "Table Format..."; -}; - -String RID_STR_ROW_HEIGHT -{ - Text [ en-US ] = "Row Height..."; -}; - -String RID_STR_COPY -{ - Text [ en-US ] = "~Copy"; -}; - -String RID_STR_UNDO_MODIFY_RECORD -{ - Text [ en-US ] = "Undo: Data Input"; -}; - -String RID_STR_SAVE_CURRENT_RECORD -{ - Text [ en-US ] = "Save current record"; -}; - -String STR_QRY_TITLE -{ - Text [ en-US ] = "Query #" ; -}; - -String STR_TBL_TITLE -{ - Text [ en-US ] = "Table #" ; -}; - -String STR_VIEW_TITLE -{ - Text [ en-US ] = "View #" ; -}; - -String STR_NAME_ALREADY_EXISTS -{ - Text [ en-US ] = "The name \"#\" already exists."; -}; - -String STR_NO_COLUMNNAME_MATCHING -{ - Text [ en-US ] = "No matching column names were found."; -}; - -String STR_ERROR_OCCURRED_WHILE_COPYING -{ - Text [ en-US ] = "An error occurred. Do you want to continue copying?"; -}; - -String STR_DATASOURCE_GRIDCONTROL_NAME -{ - Text [ en-US ] = "Data source table view"; -}; - -String STR_DATASOURCE_GRIDCONTROL_DESC -{ - Text [ en-US ] = "Shows the selected table or query."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 9d456cc11204..68cecb3f0cd5 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -18,14 +18,15 @@ */ #include "browserids.hxx" +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" #include "dbexchange.hxx" #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" #include "dbtreeview.hxx" -#include "dbu_brw.hrc" #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" #include "dlgsave.hxx" #include "uiservices.hxx" #include "HtmlReader.hxx" @@ -1776,10 +1777,10 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const switch (nCommandType) { case CommandType::TABLE: - sTitle = OUString(ModuleRes(STR_TBL_TITLE)); break; + sTitle = DBA_RES(STR_TBL_TITLE); break; case CommandType::QUERY: case CommandType::COMMAND: - sTitle = OUString(ModuleRes(STR_QRY_TITLE)); break; + sTitle = DBA_RES(STR_QRY_TITLE); break; default: SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: unknown command type!"); } @@ -2026,9 +2027,9 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r SolarMutexGuard aGuard; // initialize the names/images if necessary if (_rQueryName.isEmpty()) - _rQueryName = OUString(ModuleRes(RID_STR_QUERIES_CONTAINER)); + _rQueryName = DBA_RES(RID_STR_QUERIES_CONTAINER); if (_rTableName.isEmpty()) - _rTableName = OUString(ModuleRes(RID_STR_TABLES_CONTAINER)); + _rTableName = DBA_RES(RID_STR_TABLES_CONTAINER); ImageProvider aImageProvider; if (!_rQueryImage) @@ -2202,8 +2203,8 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) if (aWarnings.isValid() && sal_False) { SQLContext aContext; - aContext.Message = String(ModuleRes(STR_OPENTABLES_WARNINGS)); - aContext.Details = String(ModuleRes(STR_OPENTABLES_WARNINGS_DETAILS)); + aContext.Message = DBA_RES(STR_OPENTABLES_WARNINGS); + aContext.Details = DBA_RES(STR_OPENTABLES_WARNINGS_DETAILS); aContext.NextException = aWarnings.get(); aWarnings = aContext; showError(aWarnings); @@ -2613,7 +2614,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) } break; } - OUString sStatus(ModuleRes( CommandType::TABLE == nCommandType ? STR_LOADING_TABLE : STR_LOADING_QUERY )); + OUString sStatus(DBA_RES(CommandType::TABLE == nCommandType ? STR_LOADING_TABLE : STR_LOADING_QUERY)); sStatus = sStatus.replaceFirst("$name$", aName); BrowserViewStatusDisplay aShowStatus(static_cast<UnoDataBrowserView*>(getView()), sStatus); @@ -3316,12 +3317,12 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p if ( !_rConnection.is() && pTreeListData ) { // show the "connecting to ..." status - OUString sConnecting(ModuleRes(STR_CONNECTING_DATASOURCE)); + OUString sConnecting(DBA_RES(STR_CONNECTING_DATASOURCE)); sConnecting = sConnecting.replaceFirst("$name$", aDSName); BrowserViewStatusDisplay aShowStatus(static_cast<UnoDataBrowserView*>(getView()), sConnecting); // build a string showing context information in case of error - OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); + OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE)); sConnectingContext = sConnectingContext.replaceFirst("$name$", aDSName); // connect @@ -3358,9 +3359,9 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortDa const OUString sLeft = m_pTreeView->getListBox().GetEntryText(const_cast<SvTreeListEntry*>(pLHS)); EntryType eLeft = etTableContainer; - if (OUString(ModuleRes(RID_STR_TABLES_CONTAINER)) == sLeft) + if (DBA_RES(RID_STR_TABLES_CONTAINER) == sLeft) eLeft = etTableContainer; - else if (OUString(ModuleRes(RID_STR_QUERIES_CONTAINER)) == sLeft) + else if (DBA_RES(RID_STR_QUERIES_CONTAINER) == sLeft) eLeft = etQueryContainer; if ( eLeft == eRight ) diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index c3a1bb3af524..5c7599bc3ccf 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -22,7 +22,9 @@ #include <unotools/syslocale.hxx> #include <connectivity/dbtools.hxx> #include "UITools.hxx" -#include "dbu_resource.hrc" +#include "core_resource.hxx" +#include "dbu_pageids.hxx" +#include "strings.hrc" #include <comphelper/processfactory.hxx> #include <com/sun/star/util/NumberFormatter.hpp> @@ -39,7 +41,7 @@ OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent ,const Reference<XComponentContext>& _rxContext) : OFieldDescControl(pParent,nullptr) , m_xContext(_rxContext) - , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(true) { diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx index e827fccdda3a..c2b8ee260375 100644 --- a/dbaccess/source/ui/control/FieldControls.cxx +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -19,6 +19,7 @@ #include "FieldControls.hxx" #include "SqlNameEdit.hxx" +#include "core_resource.hxx" #include <vcl/settings.hxx> @@ -38,20 +39,20 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin ) OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent, rtl::OUString& _rAllowedChars, - sal_uInt16 nHelpId, + const char* pHelpId, short nPosition, WinBits nWinStyle) :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } -OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle) :Edit(pParent, nWinStyle) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } void @@ -62,18 +63,18 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly) } -OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle) :NumericField(pParent, nWinStyle) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } -OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle) :ListBox(pParent, nWinStyle) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } } // end namespace dbaui diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index f8ef35fb9650..2a984fa65bae 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "FieldDescControl.hxx" #include "FieldControls.hxx" #include <tools/diagnose_ex.h> @@ -50,8 +51,7 @@ #include <comphelper/numbers.hxx> #include <comphelper/string.hxx> #include "UITools.hxx" -#include "dbu_control.hrc" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include <osl/diagnose.h> using namespace dbaui; @@ -124,8 +124,8 @@ OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* ,m_pHorzScroll( nullptr ) ,m_pPreviousType() ,m_nPos(-1) - ,aYes(ModuleRes(STR_VALUE_YES)) - ,aNo(ModuleRes(STR_VALUE_NO)) + ,aYes(DBA_RES(STR_VALUE_YES)) + ,aNo(DBA_RES(STR_VALUE_NO)) ,m_nOldVThumb( 0 ) ,m_nOldHThumb( 0 ) ,m_nWidth(50) @@ -232,7 +232,7 @@ OUString OFieldDescControl::BoolStringUI(const OUString& rPersistentString) cons if (rPersistentString == "1") return aYes; - return ModuleRes(STR_VALUE_NONE); + return DBA_RES(STR_VALUE_NONE); } void OFieldDescControl::Init() @@ -581,7 +581,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) if(pRequired->GetSelectEntryPos() == 0) // Yes { - pBoolDefault->RemoveEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE)); if (sDef != aYes && sDef != aNo) pBoolDefault->SelectEntryPos(1); // No as a default else @@ -589,7 +589,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) } else if(pBoolDefault->GetEntryCount() < 3) { - pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE)); pBoolDefault->SelectEntry(sDef); } } @@ -869,7 +869,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) InitializeControl(pFormatSample,HID_TAB_ENT_FORMAT_SAMPLE,false); pFormat = VclPtr<PushButton>::Create(this, WB_TABSTOP); - pFormat->SetText(ModuleRes(STR_BUTTON_FORMAT)); + pFormat->SetText(DBA_RES(STR_BUTTON_FORMAT)); const sal_Int32 nControlHeight = GetMaxControlHeight(); pFormat->SetSizePixel(Size(nControlHeight, nControlHeight)); pFormat->SetClickHdl( LINK( this, OFieldDescControl, FormatClickHdl ) ); @@ -887,7 +887,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pBoolDefaultText = CreateText(STR_DEFAULT_VALUE); pBoolDefault = VclPtr<OPropListBoxCtrl>::Create( this, STR_HELP_BOOL_DEFAULT, FIELD_PROPERTY_BOOL_DEFAULT, WB_DROPDOWN ); pBoolDefault->SetDropDownLineCount(3); - pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE)); pBoolDefault->InsertEntry(aYes); pBoolDefault->InsertEntry(aNo); @@ -907,17 +907,17 @@ void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHe _pControl->EnableClipSiblings(); } -VclPtr<FixedText> OFieldDescControl::CreateText(sal_uInt16 _nTextRes) +VclPtr<FixedText> OFieldDescControl::CreateText(const char* pTextRes) { VclPtrInstance<FixedText> pFixedText( this ); - pFixedText->SetText( ModuleRes(_nTextRes) ); + pFixedText->SetText(DBA_RES(pTextRes)); pFixedText->EnableClipSiblings(); return pFixedText; } -VclPtr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId) +VclPtr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(const char* pHelpId, short _nProperty, const OString& _sHelpId) { - VclPtrInstance<OPropNumericEditCtrl> pControl( this, _nHelpStr, _nProperty, WB_BORDER ); + VclPtrInstance<OPropNumericEditCtrl> pControl(this, pHelpId, _nProperty, WB_BORDER); pControl->SetDecimalDigits(0); pControl->SetMin(0); pControl->SetMax(0x7FFFFFFF); // Should be changed outside, if needed @@ -1296,7 +1296,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) { pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); // The type says so - pBoolDefault->RemoveEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE)); if ( sDef != aYes && sDef != aNo ) pBoolDefault->SelectEntryPos(1); // No as a default else @@ -1306,7 +1306,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) } else if(pBoolDefault->GetEntryCount() < 3) { - pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE)); pBoolDefault->SelectEntry(sDef); } else @@ -1413,7 +1413,7 @@ IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) } if (&rControl == pFormat) - strHelpText = ModuleRes(STR_HELP_FORMAT_BUTTON); + strHelpText = DBA_RES(STR_HELP_FORMAT_BUTTON); if (!strHelpText.isEmpty() && (pHelp != nullptr)) pHelp->SetHelpText(strHelpText); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0874d383086c..15c1ce6a6ab2 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include "RelControliFace.hxx" -#include "dbu_control.hrc" +#include "strings.hrc" #include "dbaccess_helpid.hrc" #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 91cd2b3c64b3..00b15258a9e6 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -18,12 +18,13 @@ */ #include "TableGrantCtrl.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> -#include "dbu_control.hrc" +#include "strings.hrc" #include "UITools.hxx" using namespace ::com::sun::star::accessibility; @@ -54,15 +55,15 @@ OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits) { // insert columns sal_uInt16 i=1; - InsertDataColumn( i, OUString(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); + InsertDataColumn( i, DBA_RES(STR_TABLE_PRIV_NAME), 75); FreezeColumn(i++); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_SELECT)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_INSERT)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_DELETE)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_UPDATE)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_ALTER)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_REFERENCE)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_DROP)), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_SELECT), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_INSERT), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_DELETE), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_UPDATE), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_ALTER), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_REFERENCE), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_DROP), 75); while(--i) SetColumnWidth(i,GetAutoColumnWidth(i)); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src deleted file mode 100644 index 5073d49b94e1..000000000000 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ /dev/null @@ -1,62 +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 . - */ - -#include "dbu_control.hrc" - -String STR_TABLE_PRIV_NAME -{ - Text [ en-US ] = "Table name"; -}; - -String STR_TABLE_PRIV_INSERT -{ - Text [ en-US ] = "Insert data"; -}; - -String STR_TABLE_PRIV_DELETE -{ - Text [ en-US ] = "Delete data"; -}; - -String STR_TABLE_PRIV_UPDATE -{ - Text [ en-US ] = "Modify data"; -}; - -String STR_TABLE_PRIV_ALTER -{ - Text [ en-US ] = "Alter structure"; -}; - -String STR_TABLE_PRIV_SELECT -{ - Text [ en-US ] = "Read data"; -}; - -String STR_TABLE_PRIV_REFERENCE -{ - Text [ en-US ] = "Modify references"; -}; - -String STR_TABLE_PRIV_DROP -{ - Text [ en-US ] = "Drop structure"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 2553ed8c9aed..1d0b31fc5601 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -18,7 +18,7 @@ */ #include "dbtreelistbox.hxx" -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" #include "browserids.hxx" #include "listviewitems.hxx" #include "callbacks.hxx" diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 5f4abcd8261c..b9827df00949 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -18,7 +18,7 @@ */ #include "marktree.hxx" -#include "dbu_control.hrc" +#include "strings.hrc" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 6cdab2604fde..2033702c67d9 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -17,16 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "tabletree.hxx" #include "imageprovider.hxx" -#include "moduledbu.hxx" -#include "dbu_control.hrc" +#include "strings.hrc" #include <vcl/layout.hxx> #include <vcl/menu.hxx> #include <vcl/builderfactory.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> @@ -141,7 +141,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn try { Reference< XTablesSupplier > xTableSupp( _rxConnection, UNO_QUERY_THROW ); - sCurrentActionError = ModuleRes(STR_NOTABLEINFO); + sCurrentActionError = DBA_RES(STR_NOTABLEINFO); Reference< XNameAccess > xTables,xViews; @@ -251,12 +251,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn OUString sRootEntryText; if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return !name.second; }) ) - sRootEntryText = ModuleRes(STR_ALL_TABLES); + sRootEntryText = DBA_RES(STR_ALL_TABLES); else if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return name.second; }) ) - sRootEntryText = ModuleRes(STR_ALL_VIEWS); + sRootEntryText = DBA_RES(STR_ALL_VIEWS); else - sRootEntryText = ModuleRes(STR_ALL_TABLES_AND_VIEWS); + sRootEntryText = DBA_RES(STR_ALL_TABLES_AND_VIEWS); InsertEntry( sRootEntryText, nullptr, false, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) ); } diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src deleted file mode 100644 index 6657dd0ef9c9..000000000000 --- a/dbaccess/source/ui/control/tabletree.src +++ /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 . - */ - -#include "dbu_control.hrc" -#include "browserids.hxx" - -String STR_COULDNOTCREATE_DRIVERMANAGER -{ - Text [ en-US ] = "Cannot connect to the SDBC driver manager (#servicename#)."; -}; - -String STR_NOREGISTEREDDRIVER -{ - Text [ en-US ] = "A driver is not registered for the URL #connurl#."; -}; - -String STR_NOTABLEINFO -{ - Text [ en-US ] = "Successfully connected, but information about database tables is not available."; -}; - -String STR_ALL_TABLES -{ - Text [ en-US ] = "All tables"; -}; - -String STR_ALL_VIEWS -{ - Text [ en-US ] = "All views"; -}; - -String STR_ALL_TABLES_AND_VIEWS -{ - Text [ en-US ] = "All tables and views"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src deleted file mode 100644 index f63ff3275705..000000000000 --- a/dbaccess/source/ui/control/undosqledit.src +++ /dev/null @@ -1,27 +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 . - */ - -#include "dbu_control.hrc" - -String STR_QUERY_UNDO_MODIFYSQLEDIT -{ - Text [ en-US ] = "Modify SQL statement(s)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src deleted file mode 100644 index c6539edc6f66..000000000000 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ /dev/null @@ -1,97 +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 . - */ - -#include "dbu_dlg.hrc" - -String STR_DBASE_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the dBASE files"; -}; - -String STR_FLAT_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the text files"; -}; - -String STR_CALC_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the spreadsheet document"; -}; - -String STR_WRITER_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the Writer document"; -}; - -String STR_NAME_OF_ODBC_DATASOURCE -{ - Text[ en-US ] = "Name of the ODBC data source on your system"; -}; - -String STR_MYSQL_DATABASE_NAME -{ - Text[ en-US ] = "Name of the MySQL database"; -}; - -String STR_ORACLE_DATABASE_NAME -{ - Text[ en-US ] = "Name of the Oracle database"; -}; - -String STR_MSACCESS_MDB_FILE -{ - Text[ en-US ] = "Microsoft Access database file"; -}; - -String STR_NO_ADDITIONAL_SETTINGS -{ - Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button."; -}; - -String STR_COMMONURL -{ - Text [ en-US ] = "Datasource URL (e.g. postgresql://host:port/database)" ; -}; - -String STR_HOSTNAME -{ - Text[ en-US ] = "~Host name"; -}; - -String STR_MOZILLA_PROFILE_NAME -{ - Text[ en-US ] = "~Mozilla profile name"; -}; - -String STR_THUNDERBIRD_PROFILE_NAME -{ - Text[ en-US ] = "~Thunderbird profile name"; -}; - -String STR_ADD_TABLES -{ - Text [ en-US ] = "Add Tables"; -}; - -String STR_ADD_TABLE_OR_QUERY -{ - Text [ en-US ] = "Add Table or Query" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 019cb59cabf7..0d92a221646a 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -20,18 +20,20 @@ #include "CollectionView.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include "moduledbu.hxx" -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <comphelper/processfactory.hxx> #include <comphelper/interaction.hxx> #include <cppuhelper/exc_hlp.hxx> +#include "core_resource.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/msgbox.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include "UITools.hxx" #include <com/sun/star/container/XHierarchicalNameContainer.hpp> @@ -179,7 +181,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void) { if ( xNameContainer->hasByName(sName) ) { - ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) ); + ScopedVclPtrInstance< QueryBox > aBox(this, WB_YES_NO, DBA_RES(STR_ALREADYEXISTOVERWRITE)); if ( aBox->Execute() != RET_YES ) return; } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index d6b535a0cd13..5e83545acfda 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dsnItem.hxx" #include "ConnectionHelper.hxx" -#include "dbu_dlg.hrc" -#include "dbu_misc.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <svl/itemset.hxx> #include <unotools/moduleoptions.hxx> #include <sfx2/fcontnr.hxx> @@ -30,7 +31,7 @@ #include <svl/intitem.hxx> #include "dsitems.hxx" #include "dbaccess_helpid.hrc" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <osl/process.h> #include <osl/diagnose.h> #include <vcl/msgbox.hxx> @@ -42,7 +43,7 @@ #include "odbcconfig.hxx" #include "dsselect.hxx" #include <svl/filenotation.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -238,7 +239,7 @@ namespace dbaui case ::dbaccess::DST_MSACCESS: { const OUString sExt("*.mdb;*.mde"); - OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); + OUString sFilterName(DBA_RES (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); aFileDlg.AddFilter(sFilterName,sExt); @@ -249,7 +250,7 @@ namespace dbaui case ::dbaccess::DST_MSACCESS_2007: { const OUString sAccdb("*.accdb;*.accde"); - OUString sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); + OUString sFilterName2(DBA_RES (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); aFileDlg.AddFilter(sFilterName2,sAccdb); @@ -329,7 +330,7 @@ namespace dbaui case ::dbaccess::DST_FIREBIRD: { const OUString sExt("*.fdb"); - OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME)); + OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE); aFileDlg.AddFilter(sFilterName,sExt); @@ -353,7 +354,7 @@ namespace dbaui case ::dbaccess::DST_FIREBIRD: { const OUString sExt("*.fdb"); - OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME)); + OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION); aFileDlg.AddFilter(sFilterName,sExt); @@ -467,7 +468,7 @@ namespace dbaui if (!m_pCollection->supportsDBCreation(m_eType) && (( e_exists == PATH_NOT_EXIST) || ( e_exists == PATH_NOT_KNOWN))) { - OUString sQuery(ModuleRes(STR_ASK_FOR_DIRECTORY_CREATION)); + OUString sQuery(DBA_RES(STR_ASK_FOR_DIRECTORY_CREATION)); OFileNotation aTransformer(_rURL); sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM)); @@ -485,7 +486,7 @@ namespace dbaui { if ( !createDirectoryDeep(_rURL) ) { // could not create the directory - sQuery = ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY); + sQuery = DBA_RES(STR_COULD_NOT_CREATE_DIRECTORY); sQuery = sQuery.replaceFirst("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); m_bUserGrabFocus = false; @@ -679,7 +680,7 @@ namespace dbaui { if( pathExists(sURL, true) == PATH_NOT_EXIST ) { - OUString sFile = ModuleRes( STR_FILE_DOES_NOT_EXIST ); + OUString sFile = DBA_RES( STR_FILE_DOES_NOT_EXIST ); sFile = sFile.replaceFirst("$file$", aTransformer.get(OFileNotation::N_SYSTEM)); ScopedVclPtrInstance<OSQLWarningBox>(this, sFile)->Execute(); setURLNoPrefix(sOldPath); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 7ca9c7096900..a2abf4eb718a 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -19,7 +19,9 @@ #include <config_features.h> #include "ConnectionPage.hxx" -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "dsmeta.hxx" #if HAVE_FEATURE_JAVA #include <jvmaccess/virtualmachine.hxx> @@ -38,11 +40,11 @@ #include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include "sqlmessage.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "odbcconfig.hxx" #include "dsselect.hxx" #include <svl/filenotation.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -138,53 +140,53 @@ namespace dbaui switch( eType ) { case ::dbaccess::DST_DBASE: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_DBASE_PATH_OR_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_DBASE_PATH_OR_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_DBASE_PATH); break; case ::dbaccess::DST_FLAT: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_FLAT_PATH_OR_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_FLAT_PATH_OR_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_FLAT_PATH); break; case ::dbaccess::DST_CALC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_CALC_PATH_OR_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_CALC_PATH_OR_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_CALC_PATH); break; case ::dbaccess::DST_WRITER: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_WRITER_PATH_OR_FILE))); + m_pFT_Connection->SetText((DBA_RES(STR_WRITER_PATH_OR_FILE))); m_pConnectionURL->SetHelpId(HID_DSADMIN_WRITER_PATH); break; case ::dbaccess::DST_ADO: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_COMMONURL))); + m_pFT_Connection->SetText(DBA_RES(STR_COMMONURL)); break; case ::dbaccess::DST_MSACCESS: case ::dbaccess::DST_MSACCESS_2007: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_MSACCESS_MDB_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_MSACCESS_MDB_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); break; case ::dbaccess::DST_MYSQL_NATIVE: case ::dbaccess::DST_MYSQL_JDBC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_MYSQL_DATABASE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_MYSQL_DATABASE_NAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_MYSQL_DATABASE ); break; case ::dbaccess::DST_ORACLE_JDBC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_ORACLE_DATABASE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_ORACLE_DATABASE_NAME)); m_pConnectionURL->SetHelpId(HID_DSADMIN_ORACLE_DATABASE); break; case ::dbaccess::DST_MYSQL_ODBC: case ::dbaccess::DST_ODBC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE))); + m_pFT_Connection->SetText(DBA_RES(STR_NAME_OF_ODBC_DATASOURCE)); m_pConnectionURL->SetHelpId( eType == ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE); break; case ::dbaccess::DST_LDAP: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_HOSTNAME))); + m_pFT_Connection->SetText(DBA_RES(STR_HOSTNAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_LDAP_HOSTNAME ); break; case ::dbaccess::DST_MOZILLA: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_MOZILLA_PROFILE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_MOZILLA_PROFILE_NAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME ); break; case ::dbaccess::DST_THUNDERBIRD: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_THUNDERBIRD_PROFILE_NAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME ); break; case ::dbaccess::DST_OUTLOOK: @@ -194,7 +196,7 @@ namespace dbaui case ::dbaccess::DST_EVOLUTION_LDAP: case ::dbaccess::DST_KAB: case ::dbaccess::DST_MACAB: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_NO_ADDITIONAL_SETTINGS))); + m_pFT_Connection->SetText(DBA_RES(STR_NO_ADDITIONAL_SETTINGS)); { OUString sText = m_pFT_Connection->GetText(); sText = sText.replaceAll("%test",m_pTestConnection->GetText()); @@ -205,7 +207,7 @@ namespace dbaui break; case ::dbaccess::DST_JDBC: default: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_COMMONURL))); + m_pFT_Connection->SetText(DBA_RES(STR_COMMONURL)); break; } @@ -305,9 +307,9 @@ namespace dbaui } #endif - const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); + ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt ); aMsg->Execute(); } bool OConnectionTabPage::checkTestConnection() diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src deleted file mode 100644 index 77078c5cc3d5..000000000000 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ /dev/null @@ -1,63 +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 . - */ - -#include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" - -String STR_CONNECTION_TEST -{ - Text [ en-US ] = "Connection Test"; -}; - -String STR_CONNECTION_SUCCESS -{ - Text [ en-US ] = "The connection was established successfully."; -}; - -String STR_CONNECTION_NO_SUCCESS -{ - Text [ en-US ] = "The connection could not be established."; -}; - -String STR_JDBCDRIVER_SUCCESS -{ - Text [ en-US ] = "The JDBC driver was loaded successfully."; -}; - -String STR_JDBCDRIVER_NO_SUCCESS -{ - Text [ en-US ] = "The JDBC driver could not be loaded."; -}; - -String STR_MSACCESS_FILTERNAME -{ - Text [ en-US ] = "MS Access file"; -}; - -String STR_MSACCESS_2007_FILTERNAME -{ - Text [ en-US ] = "MS Access 2007 file"; -}; - -String STR_FIREBIRD_FILTERNAME -{ - Text [ en-US ] = "Firebird Database"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index e6a067c5cb9c..4305a4c3c5af 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -18,7 +18,9 @@ */ #include "ConnectionPageSetup.hxx" -#include "dbu_dlg.hrc" +#include "strings.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" #include <svl/itemset.hxx> #include <unotools/pathoptions.hxx> #include <svl/stritem.hxx> @@ -32,11 +34,11 @@ #include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include "sqlmessage.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "odbcconfig.hxx" #include "dsselect.hxx" #include <svl/filenotation.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -85,29 +87,29 @@ namespace dbaui VclPtr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { - return VclPtr<OConnectionTabPageSetup>::Create( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL ); + return VclPtr<OConnectionTabPageSetup>::Create(pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, nullptr, nullptr, STR_COMMONURL); } - OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) + OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId) :OConnectionHelper(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) { get(m_pHelpText, "helptext"); get(m_pHeaderText, "header"); - if ( USHRT_MAX != _nHelpTextResId ) + if (pHelpTextResId != nullptr) { - OUString sHelpText = ModuleRes(_nHelpTextResId); + OUString sHelpText = DBA_RES(pHelpTextResId); m_pHelpText->SetText(sHelpText); } else m_pHelpText->Hide(); - if ( USHRT_MAX != _nHeaderResId ) - m_pHeaderText->SetText(ModuleRes(_nHeaderResId)); + if (pHeaderResId != nullptr) + m_pHeaderText->SetText(DBA_RES(pHeaderResId)); - if ( USHRT_MAX != _nUrlResId ) + if (pUrlResId != nullptr) { - OUString sLabelText = ModuleRes(_nUrlResId); + OUString sLabelText = DBA_RES(pUrlResId); m_pFT_Connection->SetText(sLabelText); } else diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 3a34c73f4b8d..b9bf054bf79c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -60,7 +60,7 @@ namespace dbaui virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; protected: - OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); + OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId); virtual bool checkTestConnection() override; // nControlFlags is a combination of the CBTP_xxx-constants }; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 24c5794b6968..b642e5d568f1 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -20,9 +20,11 @@ #include <config_features.h> #include "DBSetupConnectionPages.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" -#include "dbu_dlg.hrc" -#include "dbu_resource.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "dbu_pageids.hxx" #include <svl/itemset.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> @@ -43,14 +45,14 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <svl/filenotation.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> #include <ucbhelper/commandenvironment.hxx> #include "finteraction.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <unotools/pathoptions.hxx> #include <svtools/roadmapwizard.hxx> #include "TextConnectionHelper.hxx" @@ -378,7 +380,7 @@ using namespace ::com::sun::star; } // OMySQLJDBCConnectionPageSetup - OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) + OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, const char* pDefaultPortResId, const char* pHelpTextResId, const char* pHeaderTextResId, const char* pDriverClassId) :OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs) ,m_nPortId(_nPortId) { @@ -396,13 +398,13 @@ using namespace ::com::sun::star; get(m_pETDriverClass, "jdbcDriverEntry"); get(m_pPBTestJavaDriver, "testDriverButton"); - m_pFTDriverClass->SetText(OUString(ModuleRes(_nDriverClassId))); + m_pFTDriverClass->SetText(DBA_RES(pDriverClassId)); - m_pFTDefaultPortNumber->SetText(OUString(ModuleRes(_nDefaultPortResId))); - OUString sHelpText = OUString(ModuleRes(_nHelpTextResId)); + m_pFTDefaultPortNumber->SetText(DBA_RES(pDefaultPortResId)); + OUString sHelpText = DBA_RES(pHelpTextResId); m_pFTHelpText->SetText(sHelpText); //TODO this code snippet is redundant - m_pHeaderText->SetText(ModuleRes(_nHeaderTextResId)); + m_pHeaderText->SetText(DBA_RES(pHeaderTextResId)); m_pETDatabasename->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlEditModifyHdl)); m_pETHostname->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlEditModifyHdl)); @@ -552,9 +554,9 @@ using namespace ::com::sun::star; { } #endif - const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + const char *pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); + ScopedVclPtrInstance<OSQLMessageBox> aMsg(this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt); aMsg->Execute(); } @@ -675,8 +677,8 @@ using namespace ::com::sun::star; #else (void) bSuccess; #endif - sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() ); + const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + ScopedVclPtrInstance<OSQLMessageBox> aMsg(this, DBA_RES(pMessage), OUString()); aMsg->Execute(); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 6c64ee8bd664..4dc43616001f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -133,10 +133,10 @@ namespace dbaui OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId - , sal_uInt16 _nDefaultPortResId - , sal_uInt16 _nHelpTextResId - , sal_uInt16 _nHeaderTextResId - , sal_uInt16 _nDriverClassId ); + , const char* pDefaultPortResId + , const char* pHelpTextResId + , const char* pHeaderTextResId + , const char* pDriverClassId ); virtual ~OGeneralSpecialJDBCConnectionPageSetup() override; virtual void dispose() override; static VclPtr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 848f07bbfaeb..7ef15fe23176 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -28,11 +28,14 @@ #include "DriverSettings.hxx" #include "IItemSetHelper.hxx" #include "UITools.hxx" -#include "dbu_dlg.hrc" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" @@ -245,7 +248,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal } OUString sName = pName ? pName->GetValue() : OUString(); - OUString sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); + OUString sLoginRequest(DBA_RES(STR_ENTER_CONNECTION_PASSWORD)); OUString sTemp = sName; sName = ::dbaui::getStrippedDatabaseName(nullptr,sTemp); if ( !sName.isEmpty() ) @@ -381,7 +384,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString // get the global DriverManager Reference< XConnectionPool > xDriverManager; - OUString sCurrentActionError = ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER); + OUString sCurrentActionError = DBA_RES(STR_COULDNOTCREATE_DRIVERMANAGER); sCurrentActionError = sCurrentActionError.replaceFirst("#servicename#", "com.sun.star.sdbc.ConnectionPool"); try @@ -398,7 +401,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL); if (!xDriver.is()) { - sCurrentActionError = ModuleRes(STR_NOREGISTEREDDRIVER); + sCurrentActionError = DBA_RES(STR_NOREGISTEREDDRIVER); sCurrentActionError = sCurrentActionError.replaceFirst("#connurl#", _sURL); // will be caught and translated into an SQLContext exception throw SQLException(sCurrentActionError, getORB(), "S1000", 0, Any()); diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index de032266f634..398a3926566b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -22,7 +22,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include "dbaccess_helpid.hrc" #include <com/sun/star/sdbc/KeyRule.hpp> diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 8c36806c5e24..c22b06489fff 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -26,7 +26,7 @@ #include "propertysetitem.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 67a8ce11f480..80b7833ea4c3 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -19,11 +19,14 @@ #include <config_features.h> -#include "moduledbu.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include "TextConnectionHelper.hxx" #include "sqlmessage.hxx" -#include "dbu_dlg.hrc" -#include "dbu_resource.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "dbu_pageids.hxx" #include <svl/itemset.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> @@ -57,9 +60,9 @@ namespace dbaui OTextConnectionHelper::OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ) :TabPage(pParent, "TextPage", "dbaccess/ui/textpage.ui") - ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) - ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) - ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) + ,m_aFieldSeparatorList (DBA_RES(STR_AUTOFIELDSEPARATORLIST)) + ,m_aTextSeparatorList (STR_AUTOTEXTSEPARATORLIST) + ,m_aTextNone (DBA_RES(STR_AUTOTEXT_FIELD_SEP_NONE)) ,m_nAvailableSections( _nAvailableSections ) { get(m_pExtensionHeader, "extensionheader"); @@ -248,61 +251,61 @@ namespace dbaui OUString aDelText(m_pFieldSeparator->GetText()); if(aDelText.isEmpty()) { // No FieldSeparator - aErrorText = ModuleRes(STR_AUTODELIMITER_MISSING); + aErrorText = DBA_RES(STR_AUTODELIMITER_MISSING); aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText()); pErrorWin = m_pFieldSeparator; } else if (m_pDecimalSeparator->GetText().isEmpty()) { // No DecimalSeparator - aErrorText = ModuleRes(STR_AUTODELIMITER_MISSING); + aErrorText = DBA_RES(STR_AUTODELIMITER_MISSING); aErrorText = aErrorText.replaceFirst("#1",m_pDecimalSeparatorLabel->GetText()); pErrorWin = m_pDecimalSeparator; } else if (m_pTextSeparator->GetText() == m_pFieldSeparator->GetText()) { // Field and TextSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pFieldSeparatorLabel->GetText()); pErrorWin = m_pTextSeparator; } else if (m_pDecimalSeparator->GetText() == m_pThousandsSeparator->GetText()) { // Thousands and DecimalSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pDecimalSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText()); pErrorWin = m_pDecimalSeparator; } else if (m_pFieldSeparator->GetText() == m_pThousandsSeparator->GetText()) { // Thousands and FieldSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText()); pErrorWin = m_pFieldSeparator; } else if (m_pFieldSeparator->GetText() == m_pDecimalSeparator->GetText()) { // Tenner and FieldSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pDecimalSeparatorLabel->GetText()); pErrorWin = m_pFieldSeparator; } else if (m_pTextSeparator->GetText() == m_pThousandsSeparator->GetText()) { // Thousands and TextSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText()); pErrorWin = m_pTextSeparator; } else if (m_pTextSeparator->GetText() == m_pDecimalSeparator->GetText()) { // Tenner and TextSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pDecimalSeparatorLabel->GetText()); pErrorWin = m_pTextSeparator; } else if ((sExtension.indexOf('*') != -1) || (sExtension.indexOf('?') != -1)) { - aErrorText = ModuleRes(STR_AUTONO_WILDCARDS); + aErrorText = DBA_RES(STR_AUTONO_WILDCARDS); aErrorText = aErrorText.replaceFirst("#1",sExtension); pErrorWin = m_pOwnExtension; } diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 0ebc917a1db7..62d4c3e31edc 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -19,7 +19,7 @@ #include "UserAdmin.hxx" #include "UITools.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> @@ -32,9 +32,12 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XUser.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "dbadmin.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <vcl/layout.hxx> #include <sfx2/passwd.hxx> @@ -100,7 +103,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl, Button*, void) EndDialog( RET_OK ); else { - OUString aErrorMsg( ModuleRes( STR_ERROR_PASSWORDS_NOT_IDENTICAL)); + OUString aErrorMsg( DBA_RES( STR_ERROR_PASSWORDS_NOT_IDENTICAL)); ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aErrorMsg); aErrorBox->Execute(); m_pEDPassword->SetText( OUString() ); @@ -256,7 +259,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void ) Reference<XDrop> xDrop(m_xUsers,UNO_QUERY); if(xDrop.is()) { - ScopedVclPtrInstance< MessageDialog > aQry(this, ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQry(this, DBA_RES(STR_QUERY_USERADMIN_DELETE_USER), VclMessageType::Question, VclButtonsType::YesNo); if(aQry->Execute() == RET_YES) xDrop->dropByName(GetUser()); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src deleted file mode 100644 index a5a3695b053c..000000000000 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ /dev/null @@ -1,38 +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 . - */ - -#include "dbu_dlg.hrc" -#include "dbaccess_helpid.hrc" - -String STR_QUERY_USERADMIN_DELETE_USER -{ - Text[ en-US ] = "Do you really want to delete the user?"; -}; - -String STR_USERADMIN_NOT_AVAILABLE -{ - Text [ en-US ] = "The database does not support user administration." ; -}; - -String STR_ERROR_PASSWORDS_NOT_IDENTICAL -{ - Text [ en-US ] = "The passwords do not match. Please enter the password again."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 9e5b19611f16..e09ad9360c3c 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "adminpages.hxx" #include "DbAdminImpl.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "DriverSettings.hxx" #include "dsitems.hxx" #include "propertysetitem.hxx" @@ -101,8 +103,8 @@ namespace dbaui ::dbtools::DatabaseMetaData aMetaData( createConnection().first ); if ( !aMetaData.supportsUserAdministration( getORB() ) ) { - OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,nullptr, "S1000" ,0,Any()); + OUString sError(DBA_RES(STR_USERADMIN_NOT_AVAILABLE)); + throw SQLException(sError, nullptr, "S1000", 0, Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 082d45b810e7..d6d4b1b091f6 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -18,9 +18,9 @@ */ #include "admincontrols.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include "dsitems.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index ec0ab9518dc9..f13a88ff9f9b 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -18,15 +18,17 @@ */ #include "adminpages.hxx" +#include "core_resource.hxx" #include "dbadmin.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dsitems.hxx" #include "dsselect.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "odbcconfig.hxx" #include "optionalboolitem.hxx" #include "sqlmessage.hxx" @@ -126,7 +128,7 @@ namespace dbaui if (!aEnumeration.isLoaded()) { // show an error message - OUString sError( ModuleRes( STR_COULD_NOT_LOAD_ODBC_LIB ) ); + OUString sError(DBA_RES(STR_COULD_NOT_LOAD_ODBC_LIB)); sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName()); ScopedVclPtrInstance< MessageDialog > aDialog(this, sError); aDialog->Execute(); @@ -252,15 +254,15 @@ namespace dbaui { OSQLMessageBox::MessageType eImage = OSQLMessageBox::Info; OUString aMessage,sTitle; - sTitle = ModuleRes(STR_CONNECTION_TEST); + sTitle = DBA_RES(STR_CONNECTION_TEST); if ( bSuccess ) { - aMessage = ModuleRes(STR_CONNECTION_SUCCESS); + aMessage = DBA_RES(STR_CONNECTION_SUCCESS); } else { eImage = OSQLMessageBox::Error; - aMessage = ModuleRes(STR_CONNECTION_NO_SUCCESS); + aMessage = DBA_RES(STR_CONNECTION_NO_SUCCESS); } ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, sTitle, aMessage, WB_OK, eImage ); aMsg->Execute(); diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 8415d002f48e..76b7d7e117cc 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -21,9 +21,11 @@ #include "sqlmessage.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_resource.hrc" -#include "dbu_dlg.hrc" +#include "dbu_pageids.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <sfx2/sfxsids.hrc> #include "QueryTableView.hxx" #include "QueryDesignView.hxx" @@ -464,9 +466,9 @@ OUString OAddTableDlg::getDialogTitleForContext( IAddTableDialogContext& _rConte OUString sTitle; if ( _rContext.allowQueries() ) - sTitle = ModuleRes( STR_ADD_TABLE_OR_QUERY ); + sTitle = DBA_RES( STR_ADD_TABLE_OR_QUERY ); else - sTitle = ModuleRes( STR_ADD_TABLES ); + sTitle = DBA_RES( STR_ADD_TABLES ); return sTitle; } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 4e741c7b8d42..6b9a5d7371b6 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -23,13 +23,13 @@ #include "advancedsettings.hxx" #include "advancedsettingsdlg.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "dsitems.hxx" #include "DbAdminImpl.hxx" #include "DriverSettings.hxx" #include "optionalboolitem.hxx" -#include "dbu_resource.hrc" -#include "dbu_dlg.hrc" +#include "dbu_pageids.hxx" +#include "dbu_dlg.hxx" #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 209bb50a5c72..016f973c10a5 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -22,14 +22,16 @@ #include "DriverSettings.hxx" #include "adminpages.hxx" #include "dbadmin.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" @@ -96,9 +98,9 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SfxTabDialog::PageCreated(_nId, _rPage); } -void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc) +void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage _pCreateFunc) { - AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, nullptr); + AddTabPage(_nPageId, DBA_RES(pTextId), _pCreateFunc, nullptr); m_aCurrentDetailPages.push(_nPageId); } @@ -157,7 +159,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName case ::dbaccess::DST_USERDEFINE9: case ::dbaccess::DST_USERDEFINE10: { - OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED)); + OUString aTitle(DBA_RES(STR_PAGETITLE_ADVANCED)); AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, nullptr, 1); m_aCurrentDetailPages.push(PAGE_USERDRIVER); } @@ -203,7 +205,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection(); if ( pCollection->determineType(getDatasourceType( *m_pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE ) { - AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr ); + AddTabPage( PAGE_MYSQL_NATIVE, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE, nullptr ); RemoveTabPage("advanced"); m_nMainPageID = PAGE_MYSQL_NATIVE; } diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src deleted file mode 100644 index 9762e7271348..000000000000 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ /dev/null @@ -1,80 +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 . - */ - -#include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" -#include "browserids.hxx" - -String STR_DATABASE_TYPE_CHANGE -{ - Text [ en-US ] = "Database properties" ; -}; - -String STR_PARENTTITLE_GENERAL -{ - Text [ en-US ] = "Data Source Properties: #" ; -}; - -String STR_ERR_USE_CONNECT_TO -{ - Text [ en-US ] = "Please choose 'Connect to an existing database' to connect to an existing database instead."; -}; - -String STR_COULD_NOT_LOAD_ODBC_LIB -{ - Text [ en-US ] = "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available."; -}; - -String STR_UNSUPPORTED_DATASOURCE_TYPE -{ - Text [ en-US ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably will not be able to connect to the database."; -}; - -String STR_AUTOTEXT_FIELD_SEP_NONE -{ - Text[ en-US ] = "{None}"; -}; - -String STR_AUTOTEXTSEPARATORLIST -{ - Text = "\"\t34\t'\t39" ; -}; - -String STR_AUTOFIELDSEPARATORLIST -{ - Text [ x-comment ] = "EM Dec 2002: 'Space' refers to what you get when you hit the space bar on your keyboard."; - Text [ en-US ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ; -}; - -String STR_AUTODELIMITER_MISSING -{ - Text[ en-US ] = "#1 must be set." ; -}; - -String STR_AUTODELIMITER_MUST_DIFFER -{ - Text[ en-US ] = "#1 and #2 must be different." ; -}; - -String STR_AUTONO_WILDCARDS -{ - Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src deleted file mode 100644 index 4d09f3b74f0f..000000000000 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ /dev/null @@ -1,49 +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 . - */ - -#include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" -#include "browserids.hxx" - -String STR_ENTER_CONNECTION_PASSWORD -{ - Text [ en-US ] = "A password is needed to connect to the data source \"$name$\"."; -}; - -String STR_ASK_FOR_DIRECTORY_CREATION -{ - Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?"; -}; - -String STR_COULD_NOT_CREATE_DIRECTORY -{ - Text [ en-US ] = "The directory $name$ could not be created."; -}; - -String STR_ALREADYEXISTOVERWRITE -{ - Text [ en-US ] = "The file already exists. Overwrite?" ; -}; - -String STR_NEW_FOLDER -{ - Text [ en-US ] = "Folder" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src deleted file mode 100644 index a4903c5dc4d1..000000000000 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ /dev/null @@ -1,218 +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 . - */ - -#include "dbu_dlg.hrc" - -String STR_DBWIZARDTITLE -{ - Text[ en-US ] = "Database Wizard" ; -}; - -String STR_PAGETITLE_INTROPAGE -{ - Text[ en-US ] = "Select database" ; -}; - -String STR_PAGETITLE_DBASE -{ - Text[ en-US ] = "Set up dBASE connection" ; -}; - -String STR_PAGETITLE_TEXT -{ - Text[ en-US ] = "Set up a connection to text files" ; -}; - -String STR_PAGETITLE_MSACCESS -{ - Text[ en-US ] = "Set up Microsoft Access connection" ; -}; - -String STR_PAGETITLE_LDAP -{ - Text[ en-US ] = "Set up LDAP connection" ; -}; - -String STR_PAGETITLE_ADO -{ - Text[ en-US ] = "Set up ADO connection" ; -}; - -String STR_PAGETITLE_JDBC -{ - Text[ en-US ] = "Set up JDBC connection" ; -}; - -String STR_PAGETITLE_ORACLE -{ - Text[ en-US ] = "Set up Oracle database connection" ; -}; - -String STR_PAGETITLE_MYSQL -{ - Text[ en-US ] = "Set up MySQL connection" ; -}; - -String STR_PAGETITLE_ODBC -{ - Text[ en-US ] = "Set up ODBC connection" ; -}; - -String STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET -{ - Text[ en-US ] = "Set up Writer Document or Spreadsheet connection" ; -}; - -String STR_PAGETITLE_AUTHENTIFICATION -{ - Text[ en-US ] = "Set up user authentication" ; -}; - -String STR_PAGETITLE_MYSQL_NATIVE -{ - Text [ en-US ] = "Set up MySQL server data"; -}; - -String STR_PAGETITLE_FINAL -{ - Text[ en-US ] = "Save and proceed" ; -}; - -String STR_DATABASEDEFAULTNAME -{ - Text[ en-US ] = "New Database" ; -}; - - -String STR_MYSQLJDBC_HEADERTEXT -{ - Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ; -}; - -String STR_MYSQLJDBC_HELPTEXT -{ - Text[ en-US ] = "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings."; -}; - -String STR_MYSQL_DRIVERCLASSTEXT -{ - Text [ en-US ] = "MySQL JDBC d~river class:"; -}; - -String STR_MYSQL_DEFAULT -{ - Text[ en-US ] = "Default: 3306"; -}; - -String STR_DBASE_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to dBASE files" ; -}; - -String STR_DBASE_HELPTEXT -{ - Text[ en-US ] = "Select the folder where the dBASE files are stored." ; -}; - -String STR_TEXT_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to text files" ; -}; - -String STR_TEXT_HELPTEXT -{ - Text[ en-US ] = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ; -}; - -String STR_TEXT_PATH_OR_FILE -{ - Text[ en-US ] = "Path to text files"; -}; - -String STR_MSACCESS_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to a Microsoft Access database" ; -}; - -String STR_MSACCESS_HELPTEXT -{ - Text[ en-US ] = "Please select the Microsoft Access file you want to access."; -}; - -String STR_ADO_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to an ADO database" ; -}; - -String STR_ADO_HELPTEXT -{ - Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_ODBC_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to an ODBC database" ; -}; - -String STR_ODBC_HELPTEXT{ - Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_JDBC_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to a JDBC database" ; -}; - -String STR_JDBC_HELPTEXT{ - Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_ORACLE_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to an Oracle database"; -}; - -String STR_ORACLE_DEFAULT -{ - Text[ en-US ] = "Default: 1521" ; -}; - -String STR_ORACLE_DRIVERCLASSTEXT -{ - Text [ en-US ] = "Oracle JDBC ~driver class"; -}; - -String STR_ORACLE_HELPTEXT{ - Text[ en-US ] = "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_SPREADSHEET_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to spreadsheets"; -}; - -String STR_SPREADSHEET_HELPTEXT{ - Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ; -}; - -String STR_SPREADSHEETPATH{ - Text[ en-US ] = "~Location and file name" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 9754342c4bff..7e909b93176e 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -22,8 +22,8 @@ #include <osl/file.hxx> #include <tools/config.hxx> #include <sfx2/app.hxx> -#include "moduledbu.hxx" -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" #include <osl/diagnose.h> #include <unotools/localfilehelper.hxx> #include <tools/urlobj.hxx> diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index f9fabf950e11..20d103cce4ab 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -17,15 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dbwiz.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <vcl/msgbox.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "adminpages.hxx" #include "generalpage.hxx" #include "stringlistitem.hxx" @@ -92,7 +95,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent m_pCollection = rCollectionItem.getCollection(); ActivatePage(); - setTitleBase(ModuleRes(STR_DATABASE_TYPE_CHANGE)); + setTitleBase(DBA_RES(STR_DATABASE_TYPE_CHANGE)); } ODbTypeWizDialog::~ODbTypeWizDialog() @@ -230,7 +233,7 @@ void ODbTypeWizDialog::clearPassword() VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState) { - sal_uInt16 nStringId = STR_PAGETITLE_ADVANCED; + const char* pStringId = STR_PAGETITLE_ADVANCED; VclPtr<TabPage> pPage; switch(_nState) { @@ -239,12 +242,12 @@ VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState) pPage = VclPtr<OGeneralPageDialog>::Create(this,*m_pOutSet); OGeneralPage* pGeneralPage = static_cast< OGeneralPage* >( pPage.get() ); pGeneralPage->SetTypeSelectHandler( LINK( this, ODbTypeWizDialog, OnTypeSelected)); - nStringId = STR_PAGETITLE_GENERAL; + pStringId = STR_PAGETITLE_GENERAL; } break; case CONNECTION_PAGE: pPage = OConnectionTabPage::Create(this,m_pOutSet); - nStringId = STR_PAGETITLE_CONNECTION; + pStringId = STR_PAGETITLE_CONNECTION; break; case ADDITIONAL_PAGE_DBASE: @@ -287,7 +290,7 @@ VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState) { static_cast<OGenericAdministrationPage*>(pPage.get())->SetServiceFactory( m_pImpl->getORB() ); static_cast<OGenericAdministrationPage*>(pPage.get())->SetAdminDialog(this,this); - pPage->SetText(ModuleRes(nStringId)); + pPage->SetText(DBA_RES(pStringId)); defaultButton( _nState == START_PAGE ? WizardButtonFlags::NEXT : WizardButtonFlags::FINISH ); enableButtons( WizardButtonFlags::FINISH, _nState != START_PAGE); pPage->Show(); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index deb931d51327..20b4c4575ada 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -17,10 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dbwizsetup.hxx" #include "dsmeta.hxx" #include "DBSetupConnectionPages.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" @@ -29,7 +32,7 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <vcl/msgbox.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "adminpages.hxx" #include <sfx2/docfilt.hxx> #include <unotools/ucbhelper.hxx> @@ -109,20 +112,20 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent , m_pOutSet(nullptr) , m_bIsConnectable( false) - , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) ) - , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) ) - , m_sRM_TextText( ModuleRes( STR_PAGETITLE_TEXT ) ) - , m_sRM_MSAccessText( ModuleRes( STR_PAGETITLE_MSACCESS ) ) - , m_sRM_LDAPText( ModuleRes( STR_PAGETITLE_LDAP ) ) - , m_sRM_ADOText( ModuleRes( STR_PAGETITLE_ADO ) ) - , m_sRM_JDBCText( ModuleRes( STR_PAGETITLE_JDBC ) ) - , m_sRM_MySQLNativePageTitle( ModuleRes( STR_PAGETITLE_MYSQL_NATIVE ) ) - , m_sRM_OracleText( ModuleRes( STR_PAGETITLE_ORACLE ) ) - , m_sRM_MySQLText( ModuleRes( STR_PAGETITLE_MYSQL ) ) - , m_sRM_ODBCText( ModuleRes( STR_PAGETITLE_ODBC ) ) - , m_sRM_DocumentOrSpreadSheetText( ModuleRes( STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET ) ) - , m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) ) - , m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) ) + , m_sRM_IntroText( DBA_RES( STR_PAGETITLE_INTROPAGE ) ) + , m_sRM_dBaseText( DBA_RES( STR_PAGETITLE_DBASE ) ) + , m_sRM_TextText( DBA_RES( STR_PAGETITLE_TEXT ) ) + , m_sRM_MSAccessText( DBA_RES( STR_PAGETITLE_MSACCESS ) ) + , m_sRM_LDAPText( DBA_RES( STR_PAGETITLE_LDAP ) ) + , m_sRM_ADOText( DBA_RES( STR_PAGETITLE_ADO ) ) + , m_sRM_JDBCText( DBA_RES( STR_PAGETITLE_JDBC ) ) + , m_sRM_MySQLNativePageTitle( DBA_RES( STR_PAGETITLE_MYSQL_NATIVE ) ) + , m_sRM_OracleText( DBA_RES( STR_PAGETITLE_ORACLE ) ) + , m_sRM_MySQLText( DBA_RES( STR_PAGETITLE_MYSQL ) ) + , m_sRM_ODBCText( DBA_RES( STR_PAGETITLE_ODBC ) ) + , m_sRM_DocumentOrSpreadSheetText( DBA_RES( STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET ) ) + , m_sRM_AuthentificationText( DBA_RES( STR_PAGETITLE_AUTHENTIFICATION ) ) + , m_sRM_FinalText( DBA_RES( STR_PAGETITLE_FINAL ) ) , m_sWorkPath( SvtPathOptions().GetWorkPath() ) , m_pGeneralPage( nullptr ) , m_pMySQLIntroPage( nullptr ) @@ -173,7 +176,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent m_pFinish->SetHelpId(HID_DBWIZ_FINISH); SetRoadmapInteractive( true ); ActivatePage(); - setTitleBase(ModuleRes(STR_DBWIZARDTITLE)); + setTitleBase(DBA_RES(STR_DBWIZARDTITLE)); } void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) @@ -247,7 +250,7 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const sRoadmapItem = m_sRM_AuthentificationText; break; case PAGE_DBSETUPWIZARD_USERDEFINED: - sRoadmapItem = ModuleRes(STR_PAGETITLE_CONNECTION); + sRoadmapItem = DBA_RES(STR_PAGETITLE_CONNECTION); break; case PAGE_DBSETUPWIZARD_FINAL: sRoadmapItem = m_sRM_FinalText; @@ -793,7 +796,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aWorkURL( m_sWorkPath ); aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::DecodeMechanism::NONE )); - OUString sDefaultName = ModuleRes( STR_DATABASEDEFAULTNAME ); + OUString sDefaultName = DBA_RES( STR_DATABASEDEFAULTNAME ); OUString sExtension = pFilter->GetDefaultExtension(); sDefaultName += sExtension.replaceAt( 0, 1, OUString() ); aWorkURL.Append( sDefaultName ); diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 6cdc6efde692..47620a341e5d 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include "core_resource.hxx" #include "detailpages.hxx" #include "sqlmessage.hxx" #include "dsmeta.hxx" @@ -26,10 +27,11 @@ #include "dsitems.hxx" #include "dbfindex.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <svl/itemset.hxx> #include <svl/stritem.hxx> @@ -540,9 +542,9 @@ namespace dbaui { } #endif - const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); + ScopedVclPtrInstance<OSQLMessageBox> aMsg(this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt); aMsg->Execute(); } void OGeneralSpecialJDBCDetailsPage::callModifiedHdl(void* pControl) diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 72d9cc276b55..ceaee42f1f62 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "directsql.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <vcl/layout.hxx> #include <comphelper/types.hxx> #include <vcl/svapp.hxx> @@ -105,7 +107,7 @@ namespace dbaui "DirectSQLDialog::_disposing: where does this come from?"); { - OUString sMessage(ModuleRes(STR_DIRECTSQL_CONNECTIONLOST)); + OUString sMessage(DBA_RES(STR_DIRECTSQL_CONNECTIONLOST)); ScopedVclPtrInstance< MessageDialog > aError(this, sMessage); aError->Execute(); } @@ -228,7 +230,7 @@ namespace dbaui } // successful - sStatus = ModuleRes(STR_COMMAND_EXECUTED_SUCCESSFULLY); + sStatus = DBA_RES(STR_COMMAND_EXECUTED_SUCCESSFULLY); // dispose the statement ::comphelper::disposeComponent(xStatement); diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src deleted file mode 100644 index 8bb0ed1633c0..000000000000 --- a/dbaccess/source/ui/dlg/directsql.src +++ /dev/null @@ -1,32 +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 . - */ - -#include "dbu_dlg.hrc" - -String STR_COMMAND_EXECUTED_SUCCESSFULLY -{ - Text [ en-US ] = "Command successfully executed." ; -}; - -String STR_DIRECTSQL_CONNECTIONLOST -{ - Text [ en-US ] = "The connection to the database has been lost. This dialog will be closed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index af6113372c5b..b72eabe3c239 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -24,13 +24,13 @@ #include <svx/numinf.hxx> #include <svx/dialogs.hrc> -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include <svl/itemset.hxx> #include <svl/zforlist.hxx> #include <svx/svxids.hrc> #include <svx/flagsdef.hxx> #include <svl/intitem.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 680766a3006a..ec7ab3babded 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -19,7 +19,9 @@ #include "dlgsave.hxx" #include <vcl/msgbox.hxx> -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include "sqlmessage.hxx" @@ -33,7 +35,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "objectnamecheck.hxx" #include <tools/diagnose_ex.h> @@ -83,8 +85,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, SADFlags _nFlags) - : m_aQryLabel(ModuleRes(STR_QRY_LABEL)) - , m_sTblLabel(ModuleRes(STR_TBL_LABEL)) + : m_aQryLabel(DBA_RES(STR_QRY_LABEL)) + , m_sTblLabel(DBA_RES(STR_TBL_LABEL)) , m_aName(rDefault) , m_rObjectNameCheck( _rObjectNameCheck ) , m_nType(_rType) @@ -117,8 +119,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, SADFlags _nFlags) - : m_aQryLabel(ModuleRes(STR_QRY_LABEL)) - , m_sTblLabel(ModuleRes(STR_TBL_LABEL)) + : m_aQryLabel(DBA_RES(STR_QRY_LABEL)) + , m_sTblLabel(DBA_RES(STR_TBL_LABEL)) , m_aName(rDefault) , m_rObjectNameCheck( _rObjectNameCheck ) , m_nType(CommandType::COMMAND) @@ -330,9 +332,9 @@ void OSaveAsDlg::implInit() } if ( SADFlags::TitlePasteAs == ( m_pImpl->m_nFlags & SADFlags::TitlePasteAs ) ) - SetText( ModuleRes( STR_TITLE_PASTE_AS ) ); + SetText( DBA_RES( STR_TITLE_PASTE_AS ) ); else if ( SADFlags::TitleRename == ( m_pImpl->m_nFlags & SADFlags::TitleRename ) ) - SetText( ModuleRes( STR_TITLE_RENAME ) ); + SetText( DBA_RES( STR_TITLE_RENAME ) ); m_pImpl->m_pPB_OK->SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); m_pImpl->m_pTitle->SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 6c2293bf44b2..f34a03e1b202 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -18,8 +18,8 @@ */ #include "dlgsize.hxx" -#include "dbu_dlg.hrc" -#include "moduledbu.hxx" +#include "dbu_dlg.hxx" +#include "core_resource.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 29c5a9314ef8..4e84f26691df 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -18,16 +18,15 @@ */ #include "dsselect.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include <vcl/msgbox.hxx> -#include <tools/rcid.h> #include <com/sun/star/sdbcx/XCreateCatalog.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/extract.hxx> #include <comphelper/types.hxx> diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 8493190d4d56..a90c3842f7bc 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -17,14 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dsnItem.hxx" #include "generalpage.hxx" #include <connectivity/dbexception.hxx> -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "dsitems.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dbadmin.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> #include <vcl/stdtext.hxx> @@ -195,12 +197,12 @@ namespace dbaui if ( eMessage != m_eLastMessage ) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; if ( smUnsupportedType == eMessage ) - nResId = STR_UNSUPPORTED_DATASOURCE_TYPE; + pResId = STR_UNSUPPORTED_DATASOURCE_TYPE; OUString sMessage; - if ( nResId ) - sMessage = ModuleRes( nResId ); + if ( pResId ) + sMessage = DBA_RES(pResId); m_pSpecialMessage->SetText( sMessage ); m_eLastMessage = eMessage; @@ -440,7 +442,7 @@ namespace dbaui const OUString sName = m_pCollection->getTypeDisplayName( _sURLPrefix ); if ( m_pAdminDialog ) { - OUString sMessage = OUString( ModuleRes( STR_PARENTTITLE_GENERAL ) ); + OUString sMessage = DBA_RES(STR_PARENTTITLE_GENERAL); m_pAdminDialog->setTitle( sMessage.replaceAll( "#", sName ) ); } } @@ -715,7 +717,7 @@ namespace dbaui OUString sPath = aFileDlg.GetPath(); if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || !pFilter->GetWildcard().Matches(sPath) ) { - OUString sMessage(ModuleRes(STR_ERR_USE_CONNECT_TO)); + OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO)); ScopedVclPtrInstance< InfoBox > aError(this, sMessage); aError->Execute(); m_pRB_ConnectDatabase->Check(); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 0c287c3ee20a..dbf55cd4501d 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -21,8 +21,10 @@ #include <set> +#include "core_resource.hxx" #include "indexdialog.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include "dbaccess_helpid.hrc" #include "indexfieldscontrol.hxx" @@ -366,7 +368,7 @@ namespace dbaui // get a new unique name for the new index OUString sNewIndexName; - const OUString sNewIndexNameBase(ModuleRes(STR_LOGICAL_INDEX_NAME)); + const OUString sNewIndexNameBase(DBA_RES(STR_LOGICAL_INDEX_NAME)); sal_Int32 i; for ( i = 1; i < 0x7FFFFFFF; ++i ) @@ -411,7 +413,7 @@ namespace dbaui // let the user confirm the drop if (_bConfirm) { - OUString sConfirm(ModuleRes(STR_CONFIRM_DROP_INDEX)); + OUString sConfirm(DBA_RES(STR_CONFIRM_DROP_INDEX)); sConfirm = sConfirm.replaceFirst("$name$", m_pIndexList->GetEntryText(pSelected)); ScopedVclPtrInstance< MessageDialog > aConfirm(this, sConfirm, VclMessageType::Question, VclButtonsType::YesNo); if (RET_YES != aConfirm->Execute()) @@ -615,7 +617,7 @@ namespace dbaui Indexes::const_iterator aSameName = m_pIndexes->find(sNewName); if ((aSameName != aPosition) && (m_pIndexes->end() != aSameName)) { - OUString sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED)); + OUString sError(DBA_RES(STR_INDEX_NAME_ALREADY_USED)); sError = sError.replaceFirst("$name$", sNewName); ScopedVclPtrInstance< MessageDialog > aError(this, sError); aError->Execute(); @@ -678,7 +680,7 @@ namespace dbaui // need at least one field if (0 == _rPos->aFields.size()) { - ScopedVclPtrInstance< MessageDialog > aError(this, ModuleRes(STR_NEED_INDEX_FIELDS)); + ScopedVclPtrInstance< MessageDialog > aError(this, DBA_RES(STR_NEED_INDEX_FIELDS)); aError->Execute(); m_pFields->GrabFocus(); return false; @@ -694,7 +696,7 @@ namespace dbaui if (aExistentFields.end() != aExistentFields.find(aFieldCheck->sFieldName)) { // a column is specified twice ... won't work anyway, so prevent this here and now - OUString sMessage(ModuleRes(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME)); + OUString sMessage(DBA_RES(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME)); sMessage = sMessage.replaceFirst("$name$", aFieldCheck->sFieldName); ScopedVclPtrInstance< MessageDialog > aError(this, sMessage); aError->Execute(); diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src deleted file mode 100644 index 2a9291883a9b..000000000000 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ /dev/null @@ -1,70 +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 . - */ - -#include "dbu_dlg.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - - -String STR_TAB_INDEX_SORTORDER -{ - Text [ en-US ] = "Sort order" ; -}; - -String STR_TAB_INDEX_FIELD -{ - Text [ en-US ] = "Index field" ; -}; - -String STR_ORDER_ASCENDING -{ - Text [ en-US ] = "Ascending" ; -}; - -String STR_ORDER_DESCENDING -{ - Text [ en-US ] = "Descending" ; -}; - -String STR_CONFIRM_DROP_INDEX -{ - Text [ en-US ] = "Do you really want to delete the index '$name$'?"; -}; - -String STR_LOGICAL_INDEX_NAME -{ - Text [ en-US ] = "index"; -}; - -String STR_NEED_INDEX_FIELDS -{ - Text [ en-US ] = "The index must contain at least one field."; -}; - -String STR_INDEX_NAME_ALREADY_USED -{ - Text [ en-US ] = "There is already another index named \"$name$\"."; -}; - -String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME -{ - Text [ en-US ] = "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index b04ed9814cba..990621d212d8 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "indexfieldscontrol.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" #include <vcl/settings.hxx> @@ -199,11 +201,11 @@ namespace dbaui if ( m_bAddIndexAppendix ) { - m_sAscendingText = ModuleRes(STR_ORDER_ASCENDING); - m_sDescendingText = ModuleRes(STR_ORDER_DESCENDING); + m_sAscendingText = DBA_RES(STR_ORDER_ASCENDING); + m_sDescendingText = DBA_RES(STR_ORDER_DESCENDING); // the "sort order" column - OUString sColumnName = ModuleRes(STR_TAB_INDEX_SORTORDER); + OUString sColumnName = DBA_RES(STR_TAB_INDEX_SORTORDER); // the width of the order column is the maximum widths of the texts used // (the title of the column) sal_Int32 nSortOrderColumnWidth = GetTextWidth(sColumnName); @@ -228,7 +230,7 @@ namespace dbaui nFieldNameWidth -= aSystemStyle.GetScrollBarSize(); nFieldNameWidth -= 8; // the "field name" column - OUString sColumnName = ModuleRes(STR_TAB_INDEX_FIELD); + OUString sColumnName = DBA_RES(STR_TAB_INDEX_FIELD); InsertDataColumn(COLUMN_ID_FIELDNAME, sColumnName, nFieldNameWidth, HeaderBarItemBits::STDSTYLE, 0); // create the cell controllers diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index c42e3d70d192..aa230db58365 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -17,15 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "paramdialog.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "commontypes.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <comphelper/processfactory.hxx> #include <connectivity/dbtools.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <vcl/svapp.hxx> #include <vcl/layout.hxx> #include <osl/diagnose.h> @@ -197,7 +200,7 @@ namespace dbaui DBG_UNHANDLED_EXCEPTION(); } - OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM)); + OUString sMessage(DBA_RES(STR_COULD_NOT_CONVERT_PARAM)); sMessage = sMessage.replaceAll( "$name$", sName ); ScopedVclPtrInstance<MessageDialog>(nullptr, sMessage)->Execute(); m_pParam->GrabFocus(); diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src deleted file mode 100644 index bd0bf0be883a..000000000000 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ /dev/null @@ -1,27 +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 . - */ - -#include "dbu_dlg.hrc" - -String STR_COULD_NOT_CONVERT_PARAM -{ - Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\" parameter"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index a2f7c04fdd24..c9678ac2bfda 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -18,7 +18,7 @@ */ #include "queryfilter.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> @@ -35,7 +35,8 @@ #include <osl/diagnose.h> #include <connectivity/sqliterator.hxx> #include <connectivity/dbtools.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 5e3c1205a07c..cdf545f7fd98 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -17,14 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbu_tbl.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "queryorder.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <tools/debug.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <connectivity/sqliterator.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/extract.hxx> @@ -49,7 +51,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) : ModalDialog(pParent, "SortDialog", "dbaccess/ui/sortdialog.ui") - , aSTR_NOENTRY(ModuleRes(STR_VALUE_NONE)) + , aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE)) , m_xQueryComposer(_rxComposer) , m_xColumns(_rxCols) , m_xConnection(_rxConnection) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index b4a95c461dd4..0a8fa07cfd46 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "sqlmessage.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdb/SQLContext.hpp> @@ -34,7 +36,7 @@ #include <sfx2/sfxuno.hxx> #include "dbaccess_helpid.hrc" #include "UITools.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <tools/urlobj.hxx> @@ -82,8 +84,8 @@ namespace private: OUString m_label; public: - explicit LabelProvider( sal_uInt16 _labelResourceID ) - :m_label( ModuleRes( _labelResourceID ) ) + explicit LabelProvider(const char* labelResourceID) + : m_label(DBA_RES(labelResourceID)) { } @@ -137,25 +139,25 @@ namespace std::shared_ptr< LabelProvider > const & getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const { std::shared_ptr< LabelProvider >* ppProvider( &m_pErrorLabel ); - sal_uInt16 nLabelID( STR_EXCEPTION_ERROR ); + const char* pLabelID( STR_EXCEPTION_ERROR ); switch ( _eType ) { case SQLExceptionInfo::TYPE::SQLWarning: ppProvider = &m_pWarningsLabel; - nLabelID = STR_EXCEPTION_WARNING; + pLabelID = STR_EXCEPTION_WARNING; break; case SQLExceptionInfo::TYPE::SQLContext: ppProvider = &m_pInfoLabel; - nLabelID = _bSubLabel ? STR_EXCEPTION_DETAILS : STR_EXCEPTION_INFO; + pLabelID = _bSubLabel ? STR_EXCEPTION_DETAILS : STR_EXCEPTION_INFO; break; default: break; } if ( !ppProvider->get() ) - ppProvider->reset( new LabelProvider( nLabelID ) ); + ppProvider->reset( new LabelProvider( pLabelID ) ); return *ppProvider; } @@ -312,8 +314,8 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti m_pExceptionText->set_width_request(aTextSize.Width()); m_pExceptionText->set_height_request(aTextSize.Height()); - m_sStatusLabel = ModuleRes( STR_EXCEPTION_STATUS ); - m_sErrorCodeLabel = ModuleRes( STR_EXCEPTION_ERRORCODE ); + m_sStatusLabel = DBA_RES( STR_EXCEPTION_STATUS ); + m_sErrorCodeLabel = DBA_RES( STR_EXCEPTION_ERRORCODE ); m_pExceptionList->SetSelectionMode(SelectionMode::Single); m_pExceptionList->SetDragDropMode(DragDropMode::NONE); @@ -342,7 +344,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti ProviderFactory aProviderFactory; ExceptionDisplayInfo aInfo22018; - aInfo22018.sMessage = ModuleRes( STR_EXPLAN_STRINGCONVERSION_ERROR ); + aInfo22018.sMessage = DBA_RES( STR_EXPLAN_STRINGCONVERSION_ERROR ); aInfo22018.pLabelProvider = aProviderFactory.getLabelProvider( SQLExceptionInfo::TYPE::SQLContext, false ); aInfo22018.pImageProvider = aProviderFactory.getImageProvider( SQLExceptionInfo::TYPE::SQLContext ); m_aExceptions.push_back( aInfo22018 ); @@ -690,13 +692,13 @@ IMPL_LINK_NOARG( OSQLMessageBox, ButtonClickHdl, Button *, void ) // OSQLWarningBox OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) - :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) + :OSQLMessageBox( _pParent, DBA_RES( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) { } // OSQLErrorBox OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage ) - :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr ) + :OSQLMessageBox( _pParent, DBA_RES( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr ) { } diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src deleted file mode 100644 index 7a288b5e7f87..000000000000 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ /dev/null @@ -1,58 +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 . - */ - -#include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" - -String STR_EXCEPTION_STATUS -{ - Text [ en-US ] = "SQL Status"; -}; - -String STR_EXCEPTION_ERRORCODE -{ - Text [ en-US ] = "Error code"; -}; - -String STR_EXPLAN_STRINGCONVERSION_ERROR -{ - Text [ en-US ] = "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties."; -}; - -String STR_EXCEPTION_ERROR -{ - Text [ en-US ] = "Error"; -}; - -String STR_EXCEPTION_WARNING -{ - Text [ en-US ] = "Warning"; -}; - -String STR_EXCEPTION_INFO -{ - Text [ en-US ] = "Information"; -}; - -String STR_EXCEPTION_DETAILS -{ - Text [ en-US ] = "Details"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 36be59392b21..88bd74ebb347 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -18,7 +18,7 @@ */ #include "tablespage.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include "dsitems.hxx" #include "browserids.hxx" #include "datasourceconnector.hxx" @@ -28,7 +28,8 @@ #include "stringlistitem.hxx" #include <svl/eitem.hxx> #include <svl/stritem.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/waitobj.hxx> diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 6c741ad71424..f2e0d8b8718a 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -19,10 +19,10 @@ #include "textconnectionsettings.hxx" #include "TextConnectionHelper.hxx" -#include "dbu_resource.hrc" -#include "moduledbu.hxx" +#include "dbu_pageids.hxx" +#include "core_resource.hxx" #include "dsitems.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <vcl/msgbox.hxx> 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/inc/dbadllapi.hxx b/dbaccess/source/ui/inc/dbu_dlg.hxx index 901263bdcf86..2990728ff047 100644 --- a/dbaccess/source/inc/dbadllapi.hxx +++ b/dbaccess/source/ui/inc/dbu_dlg.hxx @@ -16,19 +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_DLG_HRC +#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC -#ifndef INCLUDED_DBACCESS_SOURCE_INC_DBADLLAPI_HXX -#define INCLUDED_DBACCESS_SOURCE_INC_DBADLLAPI_HXX +#include "dbu_pageids.hxx" -#include "sal/config.h" +#define PAGE_X 281 +#define PAGE_Y 215 +#define WIZARD_PAGE_X 225 +#define WIZARD_PAGE_Y 240 -#include "sal/types.h" - -#if defined OOO_DLLIMPLEMENTATION_DBA -#define OOO_DLLPUBLIC_DBA SAL_DLLPUBLIC_EXPORT -#else -#define OOO_DLLPUBLIC_DBA SAL_DLLPUBLIC_IMPORT -#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/sdbtools/inc/sdbt_services.hxx b/dbaccess/source/ui/inc/dbu_pageids.hxx index a6491e2f5cfc..710a582d933a 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_services.hxx +++ b/dbaccess/source/ui/inc/dbu_pageids.hxx @@ -17,14 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX -#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX +#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC +#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC -#include <sal/config.h> +// tab pages -#include <sal/types.h> - -extern "C" void SAL_CALL createRegistryInfo_ConnectionTools(); +#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 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_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc deleted file mode 100644 index f8586e40f8cd..000000000000 --- a/dbaccess/source/ui/inc/dbu_rel.hrc +++ /dev/null @@ -1,39 +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_REL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC - -#include "dbu_resource.hrc" - -#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 - -#if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_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; diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 1e8cc8d585e7..7851fc23e46f 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -18,7 +18,7 @@ */ #include "DExport.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> @@ -33,8 +33,10 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include "dbustrings.hrc" -#include "dbu_misc.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include <connectivity/dbconversion.hxx> #include <osl/thread.h> #include <sfx2/sfxhtml.hxx> @@ -746,7 +748,7 @@ void ODatabaseExport::showErrorDialog(const css::sdbc::SQLException& e) { OUString aMsg = e.Message + "\n" - + OUString(ModuleRes( STR_QRY_CONTINUE )); + + DBA_RES( STR_QRY_CONTINUE ); ScopedVclPtrInstance< OSQLWarningBox > aBox( nullptr, aMsg, WB_YES_NO | WB_DEF_NO ); if (aBox->Execute() == RET_YES) diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index fc14c73d3775..e7fa222acbe8 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -25,11 +25,11 @@ #include <tools/tenccvt.hxx> #include <comphelper/extract.hxx> #include <comphelper/string.hxx> -#include "dbu_misc.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include <sfx2/sfxhtml.hxx> #include <osl/diagnose.h> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> @@ -52,6 +52,7 @@ #include "QEnumTypes.hxx" #include "WCPage.hxx" #include <rtl/tencinfo.h> +#include "core_resource.hxx" #include "UITools.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -390,7 +391,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption ) bool OHTMLReader::CreateTable(HtmlTokenId nToken) { - OUString aTempName(ModuleRes(STR_TBL_TITLE)); + OUString aTempName(DBA_RES(STR_TBL_TITLE)); aTempName = aTempName.getToken(0,' '); aTempName = ::dbtools::createUniqueName(m_xTables, aTempName); @@ -429,7 +430,7 @@ bool OHTMLReader::CreateTable(HtmlTokenId nToken) { aColumnName = comphelper::string::strip(aColumnName, ' ' ); if (aColumnName.isEmpty() || m_bAppendFirstLine ) - aColumnName = ModuleRes(STR_COLUMN_NAME); + aColumnName = DBA_RES(STR_COLUMN_NAME); else if ( !m_sCurrent.isEmpty() ) aColumnName = m_sCurrent; diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 10915243142d..94f6b2182b35 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -21,10 +21,12 @@ #include "TokenWriter.hxx" #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#include "dbu_misc.hrc" +#include "core_resource.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "sqlmessage.hxx" #include <vcl/msgbox.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdbc/XRowUpdate.hpp> #include <functional> @@ -61,7 +63,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference<XResultSetMetaDataSupplier>(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any()); + throw SQLException(DBA_RES(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); @@ -236,7 +238,7 @@ bool ORowSetImportExport::insertNewRow() { if(!m_bAlreadyAsked) { - OUString sAskIfContinue = ModuleRes(STR_ERROR_OCCURRED_WHILE_COPYING); + OUString sAskIfContinue = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING); ScopedVclPtrInstance< OSQLWarningBox > aDlg( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ); if(aDlg->Execute() == RET_YES) m_bAlreadyAsked = true; diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 613af226b697..1cf32f7846f5 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -31,10 +31,11 @@ #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include <svtools/rtftoken.h> #include <toolkit/helper/vclunohelper.hxx> -#include "dbu_misc.hrc" +#include "strings.hrc" #include <vcl/msgbox.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> @@ -42,7 +43,7 @@ #include <comphelper/string.hxx> #include <tools/color.hxx> #include "WExtendPages.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "QEnumTypes.hxx" #include "UITools.hxx" #include <vcl/svapp.hxx> @@ -243,7 +244,7 @@ void ORTFReader::NextToken( int nToken ) bool ORTFReader::CreateTable(int nToken) { - OUString aTableName(ModuleRes(STR_TBL_TITLE)); + OUString aTableName(DBA_RES(STR_TBL_TITLE)); aTableName = aTableName.getToken(0,' '); aTableName = ::dbtools::createUniqueName(m_xTables, aTableName); @@ -274,7 +275,7 @@ bool ORTFReader::CreateTable(int nToken) { aColumnName = comphelper::string::strip(aColumnName, ' '); if (aColumnName.isEmpty() || m_bAppendFirstLine ) - aColumnName = ModuleRes(STR_COLUMN_NAME); + aColumnName = DBA_RES(STR_COLUMN_NAME); CreateDefaultColumn(aColumnName); aColumnName.clear(); @@ -305,7 +306,7 @@ bool ORTFReader::CreateTable(int nToken) if ( !aColumnName.isEmpty() ) { if ( m_bAppendFirstLine ) - aColumnName = ModuleRes(STR_COLUMN_NAME); + aColumnName = DBA_RES(STR_COLUMN_NAME); CreateDefaultColumn(aColumnName); } diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index a52e7c8176ab..9fc346f5440e 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -18,7 +18,10 @@ */ #include "TableCopyHelper.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "sqlmessage.hxx" #include <vcl/msgbox.hxx> #include "WCopyTable.hxx" @@ -35,7 +38,7 @@ #include "TokenWriter.hxx" #include "UITools.hxx" #include <dbaccess/dataview.hxx> -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" #include <unotools/ucbhelper.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> @@ -204,7 +207,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId aTrans.bHtml = SotClipboardFormatId::HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !bOk || !copyTagTable(aTrans,false,_xConnection) ) - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); + m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } catch(const SQLException&) { @@ -216,7 +219,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId } } else - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); + m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData @@ -313,7 +316,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); + m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } } // namespace dbaui diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 83da3ae851a0..8bbf60e1eb56 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -24,7 +24,8 @@ #include <osl/diagnose.h> #include "RtfReader.hxx" #include "HtmlReader.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 7881de2c27df..671be050b77c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -20,8 +20,9 @@ #include "UITools.hxx" #include <sfx2/docfilt.hxx> #include "callbacks.hxx" -#include "dbustrings.hrc" -#include "dbu_resource.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "dbu_pageids.hxx" #include "dlgsave.hxx" #include "dbtreelistbox.hxx" #include "defaultobjectnamecheck.hxx" @@ -87,7 +88,7 @@ #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> -#include "dbu_misc.hrc" +#include "strings.hrc" #include "sqlmessage.hxx" #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/URL.hpp> @@ -227,7 +228,7 @@ Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName, ) ) { - OUString sErrorMessage( ModuleRes( STR_FILE_DOES_NOT_EXIST ) ); + OUString sErrorMessage( DBA_RES( STR_FILE_DOES_NOT_EXIST ) ); OFileNotation aTransformer( e.Message ); sErrorMessage = sErrorMessage.replaceFirst( "$file$", aTransformer.get( OFileNotation::N_SYSTEM ) ); aSQLError = SQLExceptionInfo( sErrorMessage ).get(); @@ -933,7 +934,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection, { if(! ::dbaui::checkDataSourceAvailable(::comphelper::getString(xProp->getPropertyValue(PROPERTY_NAME)),_rxContext)) { - OUString aMessage(ModuleRes(STR_TABLEDESIGN_DATASOURCE_DELETED)); + OUString aMessage(DBA_RES(STR_TABLEDESIGN_DATASOURCE_DELETED)); ScopedVclPtrInstance<OSQLWarningBox>(_pParent, aMessage)->Execute(); bRet = false; } @@ -1204,15 +1205,15 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType return pTypeInfo; } -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) { SolarMutexGuard aGuard; - OUString aMsg = ModuleRes(_nText); + OUString aMsg = DBA_RES(pText); aMsg = aMsg.replaceFirst("%1", _sName); - ScopedVclPtrInstance< OSQLMessageBox > aAsk(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); + ScopedVclPtrInstance<OSQLMessageBox> aAsk(_pParent, DBA_RES(pTitle), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { - aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL); + aAsk->AddButton(DBA_RES(STR_BUTTON_TEXT_ALL), RET_ALL); aAsk->GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL); } return aAsk->Execute(); @@ -1346,8 +1347,8 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo if ( !sNewName.isEmpty() ) sTargetName = sNewName; else - sTargetName = ModuleRes( _bCollection ? STR_NEW_FOLDER : ((_bForm) ? RID_STR_FORM : RID_STR_REPORT)); - sLabel = ModuleRes( _bCollection ? STR_FOLDER_LABEL : ((_bForm) ? STR_FRM_LABEL : STR_RPT_LABEL)); + sTargetName = DBA_RES( _bCollection ? STR_NEW_FOLDER : ((_bForm) ? RID_STR_FORM : RID_STR_REPORT)); + sLabel = DBA_RES( _bCollection ? STR_FOLDER_LABEL : ((_bForm) ? STR_FRM_LABEL : STR_RPT_LABEL)); sTargetName = ::dbtools::createUniqueName(xNameAccess,sTargetName); // here we have everything needed to create a new query object ... @@ -1369,7 +1370,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo } else if ( xNameAccess->hasByName(sNewName) ) { - OUString sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); + OUString sError(DBA_RES(STR_NAME_ALREADY_EXISTS)); sError = sError.replaceFirst("#",sNewName); throw SQLException(sError,nullptr,"S1000",0,Any()); } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 14918971caaf..e76ba60e5c64 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -24,7 +24,8 @@ #include "defaultobjectnamecheck.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_misc.hrc" +#include "strings.hrc" +#include "core_resource.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -35,7 +36,7 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include "UITools.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <cppuhelper/exc_hlp.hxx> using namespace ::dbaui; @@ -95,7 +96,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent) m_pEdKeyName->SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT); } - SetText(ModuleRes(STR_COPYTABLE_TITLE_COPY)); + SetText(DBA_RES(STR_COPYTABLE_TITLE_COPY)); } OCopyTable::~OCopyTable() @@ -169,7 +170,7 @@ bool OCopyTable::LeavePage() SQLExceptionInfo aErrorInfo; if ( !aNameCheck.isNameValid( m_pEdTableName->GetText(), aErrorInfo ) ) { - aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) ); + aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, DBA_RES( STR_SUGGEST_APPEND_TABLE_DATA ) ); m_pParent->showError(aErrorInfo.get()); return false; @@ -189,7 +190,7 @@ bool OCopyTable::LeavePage() sal_Int32 nMaxLength = xMeta->getMaxTableNameLength(); if ( nMaxLength && sTable.getLength() > nMaxLength ) { - m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME_LENGTH)); + m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME_LENGTH)); return false; } @@ -197,7 +198,7 @@ bool OCopyTable::LeavePage() if ( m_pParent->m_bCreatePrimaryKeyColumn && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { - m_pParent->showError(OUString(ModuleRes(STR_WIZ_NAME_ALREADY_DEFINED)) + " " + m_pParent->m_aKeyName); + m_pParent->showError(DBA_RES(STR_WIZ_NAME_ALREADY_DEFINED) + " " + m_pParent->m_aKeyName); return false; } } @@ -228,7 +229,7 @@ bool OCopyTable::LeavePage() if(m_pParent->m_sName.isEmpty()) { - m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME)); + m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME)); return false; } @@ -245,7 +246,7 @@ void OCopyTable::ActivatePage() OUString OCopyTable::GetTitle() const { - return ModuleRes(STR_WIZ_TABLE_COPY); + return DBA_RES(STR_WIZ_TABLE_COPY); } void OCopyTable::Reset() @@ -301,7 +302,7 @@ bool OCopyTable::checkAppendData() if ( !xTable.is() ) { - m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME)); + m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME)); return false; } return true; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 127d6ffee4ef..f9fcff3e4f1f 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -18,17 +18,18 @@ */ #include "WColumnSelect.hxx" -#include "dbu_misc.hrc" +#include "strings.hrc" #include <osl/diagnose.h> #include "WCopyTable.hxx" #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdb/application/CopyTableOperation.hpp> -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include <functional> using namespace ::com::sun::star::uno; @@ -40,7 +41,7 @@ using namespace dbaui; namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; -OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); } +OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITEL); } OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 196da5dfbd3f..40c7b42119ba 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbu_misc.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" #include "UITools.hxx" #include "WColumnSelect.hxx" @@ -509,7 +511,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDef ,m_xFormatter( getNumberFormatter( _xConnection, _rxContext ) ) ,m_xContext(_rxContext) ,m_xInteractionHandler(_xInteractionHandler) - ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_nPageCount(0) ,m_bDeleteSourceColumns(true) ,m_bInterConnectionCopy( _xSourceConnection != _xConnection ) @@ -601,7 +603,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefa ,m_rSourceObject( DummyCopySource::Instance() ) ,m_xFormatter(_xFormatter) ,m_xContext(_rxContext) - ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_nPageCount(0) ,m_bDeleteSourceColumns(false) ,m_bInterConnectionCopy( false ) @@ -651,9 +653,9 @@ void OCopyTableWizard::construct() m_pbNext->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) ); m_pbFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) ); - m_pbPrev->SetText(ModuleRes(STR_WIZ_PB_PREV)); - m_pbNext->SetText(ModuleRes(STR_WIZ_PB_NEXT)); - m_pbFinish->SetText(ModuleRes(STR_WIZ_PB_OK)); + m_pbPrev->SetText(DBA_RES(STR_WIZ_PB_PREV)); + m_pbNext->SetText(DBA_RES(STR_WIZ_PB_NEXT)); + m_pbFinish->SetText(DBA_RES(STR_WIZ_PB_OK)); m_pbHelp->Show(); m_pbCancel->Show(); @@ -878,7 +880,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void) if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() ) { - OUString sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY)); + OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY)); SQLContext aError; aError.Message = sMsg; ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) ); @@ -1543,7 +1545,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName) void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName) { - OUString sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) ); + OUString sMessage( DBA_RES( STR_UNKNOWN_TYPE_FOUND ) ); sMessage = sMessage.replaceFirst("#1",_rColumnName); showError(sMessage); } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 1a5938d3914e..f06388a5e9a9 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -22,7 +22,8 @@ #include "FieldDescriptions.hxx" #include "WCopyTable.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_misc.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include <vcl/scrbar.hxx> #include <vcl/settings.hxx> @@ -201,7 +202,7 @@ bool OWizNameMatching::LeavePage() return true; } -OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); } +OUString OWizNameMatching::GetTitle() const { return DBA_RES(STR_WIZ_NAME_MATCHING_TITEL); } IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) { diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 31c58ed4a6c7..f10fcd592d62 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -18,17 +18,18 @@ */ #include "WTypeSelect.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include "FieldDescriptions.hxx" #include "WCopyTable.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_misc.hrc" +#include "strings.hrc" #include <tools/stream.hxx> #include <svtools/svparser.hxx> #include "UITools.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" #include "FieldControls.hxx" #include <vcl/layout.hxx> @@ -138,7 +139,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) if ( bDoubleName ) { - OUString strMessage = ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME); + OUString strMessage = DBA_RES(STR_TABLEDESIGN_DUPLICATE_NAME); strMessage = strMessage.replaceFirst("$column$", sNewName); pWiz->showError(strMessage); pCurFieldDescr->SetName(sName); @@ -274,7 +275,7 @@ void OWizTypeSelect::dispose() OUString OWizTypeSelect::GetTitle() const { - return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL); + return DBA_RES(STR_WIZ_TYPE_SELECT_TITEL); } IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src deleted file mode 100644 index 5f1b15426ee4..000000000000 --- a/dbaccess/source/ui/misc/WizardPages.src +++ /dev/null @@ -1,83 +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 . - */ - -#include "dbu_misc.hrc" -#include "dbaccess_helpid.hrc" -#include "dbaccess_slotid.hrc" - -String STR_WIZ_COLUMN_SELECT_TITEL -{ - Text [ en-US ] = "Apply columns"; -}; - -String STR_WIZ_TYPE_SELECT_TITEL -{ - Text [ en-US ] = "Type formatting"; -}; - -String STR_WIZ_NAME_ALREADY_DEFINED -{ - Text [ en-US ] = "Enter a unique name for the new primary key data field.\nThe following name is already in use:"; -}; - -String STR_WIZ_NAME_MATCHING_TITEL -{ - Text [ en-US ] = "Assign columns" ; -}; - -String STR_WIZ_PB_PREV -{ - Text [ en-US ] = "< ~Back"; -}; - -String STR_WIZ_PB_NEXT -{ - Text [ en-US ] = "~Next>"; -}; - -String STR_WIZ_PB_OK -{ - Text [ en-US ] = "C~reate"; -}; - -String STR_WIZ_TABLE_COPY -{ - Text [ en-US ] = "Copy table" ; -}; - -String STR_COPYTABLE_TITLE_COPY -{ - Text [ en-US ] = "Copy table" ; -}; - -String STR_INVALID_TABLE_NAME -{ - Text [ en-US ] = "This table name is not valid in the current database."; -}; -String STR_SUGGEST_APPEND_TABLE_DATA -{ - Text [ en-US ] = "Choose the option 'Append data' on the first page to append data to an existing table."; -}; - -String STR_INVALID_TABLE_NAME_LENGTH -{ - Text [ en-US ] = "Please change the table name. It is too long."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index fd5801a5cad7..78f60be945bd 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -18,11 +18,11 @@ */ #include "charsets.hxx" +#include "core_resource.hxx" #include <osl/diagnose.h> -#include "dbu_misc.hrc" +#include "strings.hrc" #include <rtl/tencinfo.h> -#include <tools/rcid.h> -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -30,9 +30,8 @@ namespace dbaui // OCharsetDisplay OCharsetDisplay::OCharsetDisplay() - :OCharsetMap() - ,SvxTextEncodingTable() - , m_aSystemDisplayName(ModuleRes( STR_RSC_CHARSETS )) + : OCharsetMap() + , m_aSystemDisplayName(DBA_RES( STR_RSC_CHARSETS )) { } @@ -44,7 +43,7 @@ namespace dbaui if ( RTL_TEXTENCODING_DONTKNOW == _eEncoding ) return true; - return !GetTextString(_eEncoding).isEmpty(); + return !SvxTextEncodingTable::GetTextString(_eEncoding).isEmpty(); } OCharsetDisplay::const_iterator OCharsetDisplay::begin() const @@ -74,7 +73,7 @@ namespace dbaui rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; if ( _rDisplayName != m_aSystemDisplayName ) { - eEncoding = GetTextEncoding( _rDisplayName ); + eEncoding = SvxTextEncodingTable::GetTextEncoding(_rDisplayName); OSL_ENSURE( RTL_TEXTENCODING_DONTKNOW != eEncoding, "OCharsetDisplay::find: non-empty display name, but DONTKNOW!" ); } @@ -116,7 +115,7 @@ namespace dbaui rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding(); return CharsetDisplayDerefHelper( *m_aPosition, - RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : m_pContainer->GetTextString( eEncoding ) + RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : SvxTextEncodingTable::GetTextString(eEncoding) ); } diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index d92e9b244a81..745d31adc9a5 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -18,7 +18,8 @@ */ #include "databaseobjectview.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "asyncmodaldialog.hxx" #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 174e92c72d86..e0992eb01a15 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "datasourceconnector.hxx" #include <osl/diagnose.h> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> @@ -39,8 +40,9 @@ #include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <cppuhelper/exc_hlp.hxx> -#include "dbu_misc.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -159,7 +161,7 @@ namespace dbaui Any aWarnings( xConnectionWarnings->getWarnings() ); if ( aWarnings.hasValue() ) { - OUString sMessage( ModuleRes( STR_WARNINGS_DURING_CONNECT ) ); + OUString sMessage( DBA_RES( STR_WARNINGS_DURING_CONNECT ) ); sMessage = sMessage.replaceFirst( "$buttontext$", Button::GetStandardText( StandardButtonType::More ) ); sMessage = OutputDevice::GetNonMnemonicString( sMessage ); diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 2e780c7a0b2a..6ef9d424d536 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -19,10 +19,12 @@ #include "browserids.hxx" #include "commontypes.hxx" +#include "core_resource.hxx" #include <dbaccess/dataview.hxx> -#include "dbu_misc.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" +#include "core_resource.hxx" #include <dbaccess/dbsubcomponentcontroller.hxx> #include <com/sun/star/frame/XUntitledNumbers.hpp> @@ -124,7 +126,7 @@ namespace dbaui ::boost::optional< bool > m_aDocScriptSupport; public: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; ::dbtools::SQLExceptionInfo m_aCurrentError; ::comphelper::OInterfaceContainerHelper2 @@ -303,7 +305,7 @@ namespace dbaui bool bReConnect = true; if ( _bUI ) { - ScopedVclPtrInstance< MessageDialog > aQuery(getView(), ModuleRes(STR_QUERY_CONNECTION_LOST), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQuery(getView(), DBA_RES(STR_QUERY_CONNECTION_LOST), VclMessageType::Question, VclButtonsType::YesNo); bReConnect = ( RET_YES == aQuery->Execute() ); } @@ -444,7 +446,7 @@ namespace dbaui } void DBSubComponentController::connectionLostMessage() const { - OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); + OUString aMessage(DBA_RES(RID_STR_CONNECTION_LOST)); Reference< XWindow > xWindow = getTopMostContainerWindow(); vcl::Window* pWin = nullptr; if ( xWindow.is() ) diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src deleted file mode 100644 index 5a4e1c9dd688..000000000000 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ /dev/null @@ -1,88 +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 . - */ - -#include "dbu_misc.hrc" - -String STR_RSC_CHARSETS -{ - Text [ en-US ] = "System"; -}; - -String STR_ERROR_DURING_CREATION -{ - Text [ en-US ] = "Error during creation"; -}; - -String STR_UNEXPECTED_ERROR -{ - Text [ en-US ] = "An unexpected error occurred. The operation could not be performed."; -}; - -String STR_COULDNOTOPEN_LINKEDDOC -{ - Text [ en-US ] = "The document \"$file$\" could not be opened."; -}; - -String STR_MISSING_TABLES_XDROP -{ - Text [ en-US ] = "The table cannot be deleted because the database connection does not support this."; -}; - -String STR_BUTTON_TEXT_ALL -{ - Text [ en-US ] = "~All"; -}; - -String STR_UNDO_COLON -{ - Text [ en-US ] = "Undo:"; -}; - -String STR_REDO_COLON -{ - Text [ en-US ] = "Redo:"; -}; - -String STR_UNKNOWN_TYPE_FOUND -{ - Text [ en-US ] = "No corresponding column type could be found for column '#1'." ; -}; - -String STR_FILE_DOES_NOT_EXIST -{ - Text[ en-US ] = "The file \"$file$\" does not exist."; -}; - -String STR_WARNINGS_DURING_CONNECT -{ - Text [ en-US ] = "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them."; -}; - -String STR_NAMED_OBJECT_ALREADY_EXISTS -{ - Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ; -}; - -String RID_STR_EXTENSION_NOT_PRESENT -{ - // #i96130# use hard coded name - Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index 59f10c042cba..d4325e99090a 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "defaultobjectnamecheck.hxx" -#include "dbu_misc.hrc" +#include "strings.hrc" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/sdb/CommandType.hpp> @@ -61,7 +62,7 @@ namespace dbaui void lcl_fillNameExistsError( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) { SQLException aError; - OUString sErrorMessage = ModuleRes(STR_NAMED_OBJECT_ALREADY_EXISTS); + OUString sErrorMessage = DBA_RES(STR_NAMED_OBJECT_ALREADY_EXISTS); aError.Message = sErrorMessage.replaceAll("$#$", _rObjectName); _out_rErrorToDisplay = aError; } diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 80ceaa47f7e5..cc9de382e17d 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -18,9 +18,9 @@ */ #include "imageprovider.hxx" -#include "dbu_resource.hrc" -#include "moduledbu.hxx" -#include "dbustrings.hrc" +#include "dbu_pageids.hxx" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include <com/sun/star/graphic/XGraphic.hpp> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 0e006a5a95ef..3c70c3f10c8d 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "linkeddocuments.hxx" #include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include <unotools/confignode.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <comphelper/classids.hxx> #include <comphelper/namedvaluecollection.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -36,11 +37,12 @@ #include <comphelper/types.hxx> #include <vcl/msgbox.hxx> #include <ucbhelper/content.hxx> -#include "dbu_misc.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <svl/filenotation.hxx> #include "browserids.hxx" #include <sfx2/new.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <sfx2/app.hxx> #include <basic/sbx.hxx> #include <basic/sbuno.hxx> @@ -319,7 +321,7 @@ namespace dbaui xRet = impl_open( _rLinkName, _xDefinition, _eOpenMode, _rAdditionalArgs ); if ( !xRet.is() ) { - OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); + OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); css::sdbc::SQLException aSQLException; @@ -336,11 +338,11 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - OUString sText( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) ); + OUString sText( DBA_RES( RID_STR_EXTENSION_NOT_PRESENT ) ); sText = sText.replaceFirst("$file$",_rLinkName); aInfo.prepend(sText); - OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); + OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); aInfo.prepend(sMessage); } @@ -358,7 +360,7 @@ namespace dbaui // more like a hack, insert an empty message aInfo.prepend(" \n"); - OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); + OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); aInfo.prepend(sMessage); } diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx deleted file mode 100644 index 340990a2c39e..000000000000 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ /dev/null @@ -1,101 +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 . - */ - -#include <memory> -#include "moduledbu.hxx" - -#include <tools/resmgr.hxx> -#include <svl/solar.hrc> - -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ - ensureImpl() - -namespace dbaui -{ - -// OModuleImpl -/** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner -*/ -class OModuleImpl -{ - std::unique_ptr<ResMgr> m_pResources; - -public: - /// ctor - OModuleImpl(); - - /// get the manager for the resources of the module - ResMgr* getResManager(); -}; - -OModuleImpl::OModuleImpl() - :m_pResources(nullptr) -{ - -} - -ResMgr* OModuleImpl::getResManager() -{ - // note that this method is not threadsafe, which counts for the whole class ! - - if (!m_pResources) - { - // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr("dbu") ); - } - return m_pResources.get(); -} - -// OModule -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = nullptr; -ResMgr* OModule::getResManager() -{ - ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); -} - -void OModule::registerClient() -{ - ::osl::MutexGuard aGuard(s_aMutex); - ++s_nClients; -} - -void OModule::revokeClient() -{ - ::osl::MutexGuard aGuard(s_aMutex); - if (!--s_nClients && s_pImpl) - { - delete s_pImpl; - s_pImpl = nullptr; - } -} - -void OModule::ensureImpl() -{ - if (s_pImpl) - return; - s_pImpl = new OModuleImpl(); -} - -} // namespace dbaui - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index a76c75343ada..4575f44872fe 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -19,11 +19,12 @@ #include <dbaccess/dbaundomanager.hxx> #include <dbaccess/dataview.hxx> +#include "core_resource.hxx" #include "singledoccontroller.hxx" #include "browserids.hxx" -#include "dbu_misc.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "stringconstants.hxx" +#include "core_resource.hxx" #include <svl/undo.hxx> @@ -104,7 +105,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetUndoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sUndo(ModuleRes(STR_UNDO_COLON)); + OUString sUndo(DBA_RES(STR_UNDO_COLON)); sUndo += " "; sUndo += GetUndoManager().GetUndoActionComment(); aReturn.sTitle = sUndo; @@ -115,7 +116,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetRedoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sRedo(ModuleRes(STR_REDO_COLON)); + OUString sRedo(DBA_RES(STR_REDO_COLON)); sRedo += " "; sRedo += GetUndoManager().GetRedoActionComment(); aReturn.sTitle = sRedo; diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 7241301b61c5..bd74faf16769 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -18,10 +18,10 @@ */ #include <sfx2/sfxsids.hrc> -#include "dbu_qry.hrc" +#include "strings.hrc" #include "browserids.hxx" #include <comphelper/types.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index f8573dcec78b..1661a3a6aad1 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -25,7 +25,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include "browserids.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/DataType.hpp> @@ -34,7 +34,7 @@ #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "TableConnectionData.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <comphelper/extract.hxx> #include "UITools.hxx" #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index cf51c60fee1f..9061365658c5 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -21,7 +21,7 @@ #include <osl/diagnose.h> #include "querycontroller.hxx" #include "JoinDesignView.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "TableWindow.hxx" #include "TableWindowListBox.hxx" #include "TableConnection.hxx" diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 83661aa0eb12..7c2a991db627 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -9,10 +9,11 @@ #include <vcl/builderfactory.hxx> #include "LimitBox.hxx" -#include "dbu_qry.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "core_resource.hxx" +#include "core_resource.hxx" -#define ALL_STRING ModuleRes(STR_QUERY_LIMIT_ALL) +#define ALL_STRING DBA_RES(STR_QUERY_LIMIT_ALL) #define ALL_INT -1 namespace global{ diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index c45b2f11a33a..30f98e857eab 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -19,7 +19,7 @@ #include "QTableWindow.hxx" #include "QueryTableView.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" #include "QueryDesignView.hxx" @@ -27,7 +27,8 @@ #include "querycontroller.hxx" #include <vcl/image.hxx> #include "TableWindowListBox.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index 543e6a7ca9b6..582ca7912a32 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX #include "GeneralUndo.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "SelectionBrowseBox.hxx" namespace dbaui @@ -37,7 +37,7 @@ namespace dbaui virtual void Redo() override = 0; public: - OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID); + OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID); virtual ~OQueryDesignFieldUndoAct() override; void SetColumnPosition(sal_uInt16 _nColumnPosition) @@ -92,7 +92,7 @@ namespace dbaui OTableFieldDescRef pDescr; // the deleted column description public: - OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { } + OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, pCommentID) { } void SetTabFieldDescr(OTableFieldDescRef const & pDescription) { pDescr = pDescription; } }; diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index 9166a2e782c4..f5ab95bd49d1 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -32,7 +32,7 @@ namespace dbaui VclPtr<OJoinTableView> m_pOwner; // in this container it all happens public: - OQueryDesignUndoAction(OJoinTableView* pOwner, sal_uInt16 nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { } + OQueryDesignUndoAction(OJoinTableView* pOwner, const char* pCommentID) : OCommentUndoAction(pCommentID), m_pOwner(pOwner) { } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 6cce6ebd7c9a..add95f7cac3a 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -34,7 +34,8 @@ #include <vcl/layout.hxx> #include "browserids.hxx" #include "SelectionBrowseBox.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <unotools/configmgr.hxx> #include <comphelper/extract.hxx> #include <comphelper/string.hxx> @@ -50,7 +51,8 @@ #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "QTableConnectionData.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "UITools.hxx" #include "querycontainerwindow.hxx" #include "sqlmessage.hxx" @@ -265,7 +267,7 @@ namespace if ( !bErg ) { eErrorCode = eColumnNotFound; - OUString sError(ModuleRes(STR_QRY_COLUMN_NOT_FOUND)); + OUString sError(DBA_RES(STR_QRY_COLUMN_NOT_FOUND)); sError = sError.replaceFirst("$name$",aColumnName); _pView->getController().appendError( sError ); @@ -273,7 +275,7 @@ namespace { Reference<XDatabaseMetaData> xMeta = _pView->getController().getConnection()->getMetaData(); if ( xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ) - _pView->getController().appendError( OUString( ModuleRes( STR_QRY_CHECK_CASESENSITIVE ) ) ); + _pView->getController().appendError(DBA_RES(STR_QRY_CHECK_CASESENSITIVE)); } catch(Exception&) { @@ -565,7 +567,7 @@ namespace SQL_ISRULE(pNode->getChild(2),column_ref) && pNode->getChild(1)->getNodeType() == SQLNodeType::Equal)) { - OUString sError(ModuleRes(STR_QRY_JOIN_COLUMN_COMPARE)); + OUString sError(DBA_RES(STR_QRY_JOIN_COLUMN_COMPARE)); _pView->getController().appendError( sError ); return eIllegalJoin; } @@ -749,7 +751,7 @@ namespace { // only show the messagebox the first time if (!bCritsOnAsterikWarning) - ScopedVclPtrInstance<MessageDialog>(_pView, ModuleRes( STR_QRY_CRITERIA_ON_ASTERISK))->Execute(); + ScopedVclPtrInstance<MessageDialog>(_pView, DBA_RES(STR_QRY_CRITERIA_ON_ASTERISK))->Execute(); bCritsOnAsterikWarning = true; continue; } @@ -903,7 +905,7 @@ namespace { // only show the MessageBox the first time if (!bCritsOnAsterikWarning) - ScopedVclPtrInstance<MessageDialog>(_pView, ModuleRes( STR_QRY_ORDERBY_ON_ASTERISK))->Execute(); + ScopedVclPtrInstance<MessageDialog>(_pView, DBA_RES(STR_QRY_ORDERBY_ON_ASTERISK))->Execute(); bCritsOnAsterikWarning = true; continue; } @@ -1396,7 +1398,7 @@ namespace else { eErrorCode = eNoColumnInLike; - OUString sError(ModuleRes(STR_QRY_LIKE_LEFT_NO_COLUMN)); + OUString sError(DBA_RES(STR_QRY_LIKE_LEFT_NO_COLUMN)); _pView->getController().appendError( sError ); } } @@ -2403,47 +2405,46 @@ namespace OUString getParseErrorMessage( SqlParseError _eErrorCode ) { - sal_uInt16 nResId; - switch(_eErrorCode) + const char* pResId; + switch (_eErrorCode) { case eIllegalJoin: - nResId = STR_QRY_ILLEGAL_JOIN; + pResId = STR_QRY_ILLEGAL_JOIN; break; case eStatementTooLong: - nResId = STR_QRY_TOO_LONG_STATEMENT; + pResId = STR_QRY_TOO_LONG_STATEMENT; break; case eNoConnection: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; case eNoSelectStatement: - nResId = STR_QRY_NOSELECT; + pResId = STR_QRY_NOSELECT; break; case eNoColumnInLike: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; case eColumnNotFound: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; case eNativeMode: - nResId = STR_QRY_NATIVE; + pResId = STR_QRY_NATIVE; break; case eTooManyTables: - nResId = STR_QRY_TOO_MANY_TABLES; + pResId = STR_QRY_TOO_MANY_TABLES; break; case eTooManyColumns: - nResId = STR_QRY_TOO_MANY_COLUMNS; + pResId = STR_QRY_TOO_MANY_COLUMNS; break; case eStatementTooComplex: - nResId = STR_QRY_TOOCOMPLEX; + pResId = STR_QRY_TOOCOMPLEX; break; default: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; } ; - return OUString( ModuleRes( nResId ) ); + return DBA_RES(pResId); } - } // end of anonymouse namespace diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index a1790f977a6c..b97ae8b42e10 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX #include "QueryDesignUndoAction.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include <tools/gen.hxx> namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 7cc039a01343..4ea75f11e4bc 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX #include "QueryDesignUndoAction.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 4ce5d3eb75a3..6f7eeec54f96 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -23,7 +23,7 @@ #include "QueryTableView.hxx" #include "QueryAddTabConnUndoAction.hxx" #include "QueryTabWinShowUndoAct.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" using namespace dbaui; @@ -36,8 +36,8 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction() } } -OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID) - :OQueryDesignUndoAction(pOwner, nCommentID) +OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID) + :OQueryDesignUndoAction(pOwner, pCommentID) ,m_pConnection(nullptr) ,m_bOwnerOfConn(false) { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 729153968588..d71068b24ba2 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -33,7 +33,7 @@ namespace dbaui // am I the only owner of the connection? (changes with every redo and undo) public: - OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID); + OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID); virtual ~OQueryTabConnUndoAction() override; virtual void Undo() override = 0; diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 079d7a392bae..8b7ec538d769 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -27,8 +27,8 @@ #include "QueryTableView.hxx" using namespace dbaui; -OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) - : OCommentUndoAction(nCommentID) +OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID) + : OCommentUndoAction(pCommentID) , pOwner(pSelBrwBox) , m_nColumnPosition(BROWSER_INVALIDID) { @@ -39,8 +39,8 @@ OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() pOwner = nullptr; } -OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID) - : OQueryDesignUndoAction(pOwner, nCommentID) +OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, const char* pCommentID) + : OQueryDesignUndoAction(pOwner, pCommentID) , m_pTabWin(nullptr) , m_bOwnerOfObjects(false) { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index e0bfd9658a19..3b637c62d6ce 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -39,7 +39,7 @@ namespace dbaui // am I the only owner of the managed objects? (changes with every redo or undo) public: - OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID); + OQueryTabWinUndoAct(OQueryTableView* pOwner, const char* pCommentID); virtual ~OQueryTabWinUndoAct() override; void SetOwnership(bool bTakeIt) { m_bOwnerOfObjects = bTakeIt; } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 4d84cd288de2..330acaa7a626 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -40,13 +40,14 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/sequence.hxx> #include "querydlg.hxx" #include "JoinExchange.hxx" #include <comphelper/extract.hxx> -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <vcl/msgbox.hxx> #include "svtools/treelistentry.hxx" @@ -696,7 +697,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) OQueryDesignView* pParent = static_cast<OQueryDesignView*>(getDesignView()); SfxUndoManager& rUndoMgr = m_pView->getController().GetUndoManager(); - rUndoMgr.EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0, ViewShellId(-1) ); + rUndoMgr.EnterListAction(DBA_RES(STR_QUERY_UNDO_TABWINDELETE) , OUString(), 0, ViewShellId(-1)); // add the Undo-Action OQueryTabWinDelUndoAct* pUndoAction = new OQueryTabWinDelUndoAct(this); @@ -902,7 +903,7 @@ bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) const void OQueryTableView::onNoColumns_throw() { - OUString sError( ModuleRes( STR_STATEMENT_WITHOUT_RESULT_SET ) ); + OUString sError(DBA_RES(STR_STATEMENT_WITHOUT_RESULT_SET)); ::dbtools::throwSQLException( sError, ::dbtools::StandardSQLState::GENERAL_ERROR, nullptr ); } diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index c92eeaf1dfb6..0ce7d09ab064 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -24,8 +24,8 @@ #include "undosqledit.hxx" #include "browserids.hxx" #include "querycontroller.hxx" -#include "dbu_qry.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 15763e629518..d5463f10415a 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -21,7 +21,7 @@ #include "QueryDesignView.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "browserids.hxx" #include "adtabdlg.hxx" #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3d9f49ec3a7c..4c66586c9a8e 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -30,10 +30,11 @@ #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include "TableFieldInfo.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "dbaccess_helpid.hrc" #include <com/sun/star/container/XNameAccess.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "QTableWindow.hxx" #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> @@ -98,7 +99,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) BrowserMode::HIDECURSOR | BrowserMode::HLINES | BrowserMode::VLINES ) ,m_nSeekRow(0) ,m_nMaxColumns(0) - ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS)) + ,m_aFunctionStrings(DBA_RES(STR_QUERY_FUNCTIONS)) ,m_nVisibleCount(0) ,m_nLastSortColumn(SORT_COLUMN_NONE) ,m_bOrderByUnRelated(true) @@ -135,7 +136,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) aTitleFont.SetFontSize(Size(0, 6)); SetTitleFont(aTitleFont); - OUString aTxt(ModuleRes(STR_QUERY_SORTTEXT)); + OUString aTxt(DBA_RES(STR_QUERY_SORTTEXT)); sal_Int32 nCount = comphelper::string::getTokenCount(aTxt, ';'); for (sal_Int32 nIdx = 0; nIdx < nCount; nIdx++) m_pOrderCell->InsertEntry(aTxt.getToken(nIdx, ';')); @@ -498,11 +499,11 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon for(;aIter != aEnd;++aIter) m_pTableCell->InsertEntry(static_cast<OQueryTableWindow*>(aIter->second.get())->GetAliasName()); - m_pTableCell->InsertEntry(OUString(ModuleRes(STR_QUERY_NOTABLE)), 0); + m_pTableCell->InsertEntry(DBA_RES(STR_QUERY_NOTABLE), 0); if (!pEntry->GetAlias().isEmpty()) m_pTableCell->SelectEntry(pEntry->GetAlias()); else - m_pTableCell->SelectEntry(OUString(ModuleRes(STR_QUERY_NOTABLE))); + m_pTableCell->SelectEntry(DBA_RES(STR_QUERY_NOTABLE)); } } break; case BROW_VIS_ROW: @@ -520,7 +521,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon m_pVisibleCell->GetBox().SaveValue(); m_pVisibleCell->GetBox().Disable(); m_pVisibleCell->GetBox().EnableInput(false); - OUString aMessage(ModuleRes(STR_QRY_ORDERBY_UNRELATED)); + OUString aMessage(DBA_RES(STR_QRY_ORDERBY_UNRELATED)); OQueryDesignView* paDView = getDesignView(); ScopedVclPtrInstance<InfoBox>(paDView, aMessage)->Execute(); } @@ -610,7 +611,7 @@ bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName, const OUSt sal_uInt16 nTabCount = 0; if ( !static_cast<OQueryTableView*>(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occurred: column not in table window { - OUString sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST)); + OUString sErrorMsg(DBA_RES(RID_STR_FIELD_DOESNT_EXIST)); sErrorMsg = sErrorMsg.replaceFirst("$name$",_sColumnName); ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMsg)->Execute(); bError = true; @@ -714,7 +715,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ if ( pParseNode == nullptr ) { // something different which we have to check - OUString sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) ); + OUString sErrorMessage( DBA_RES( STR_QRY_COLUMN_NOT_FOUND ) ); sErrorMessage = sErrorMessage.replaceFirst("$name$",_sFieldName); ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMessage)->Execute(); @@ -870,7 +871,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ if ( i > 0 && !InsertField(aSelEntry,BROWSER_INVALIDID,true,false).is() ) // may we have to append more than one field { // the field could not be inserted - OUString sErrorMessage( ModuleRes( RID_STR_FIELD_DOESNT_EXIST ) ); + OUString sErrorMessage( DBA_RES( RID_STR_FIELD_DOESNT_EXIST ) ); sErrorMessage = sErrorMessage.replaceFirst("$name$",aSelEntry->GetField()); ScopedVclPtrInstance<OSQLErrorBox>(this, sErrorMessage)->Execute(); bError = true; @@ -1231,7 +1232,7 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const tools::Recta { tools::Rectangle aRect(rRect); aRect.TopLeft().Y() -= 2; - OUString aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + OUString aLabel(DBA_RES(STR_QUERY_HANDLETEXT)); // from BROW_CRIT2_ROW onwards all rows are shown "or" sal_Int32 nToken = (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW)) @@ -2127,7 +2128,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const } break; case BROW_ORDER_ROW: if (pEntry->GetOrderDir() != ORDER_NONE) - aText = OUString(ModuleRes(STR_QUERY_SORTTEXT)).getToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()), ';'); + aText = DBA_RES(STR_QUERY_SORTTEXT).getToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()), ';'); break; case BROW_VIS_ROW: break; @@ -2560,7 +2561,7 @@ void OSelectionBrowseBox::DeactivateCell(bool _bUpdate) OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const { - OUString aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + OUString aLabel(DBA_RES(STR_QUERY_HANDLETEXT)); // from BROW_CRIT2_ROW onwards all rows are shown as "or" sal_Int32 nToken = (_nRow >= GetBrowseRow(BROW_CRIT2_ROW)) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 01c7c45465fd..e821efc8b5f6 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -35,8 +35,8 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include "querycontroller.hxx" -#include "dbu_qry.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include <comphelper/extract.hxx> #include "UITools.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 1998abcf86c7..121807118f94 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <comphelper/sequence.hxx> -#include "dbu_qry.hrc" +#include "strings.hrc" namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 06e67b7f7c9b..231952f62f65 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -24,10 +24,10 @@ #include <vcl/help.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "TableWindowListBox.hxx" #include "TableConnection.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "QueryDesignView.hxx" #include "JoinController.hxx" diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4ad0049a1eef..e1a8517e3d35 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -21,7 +21,7 @@ #include "LimitBox.hxx" #include "dbu_reghelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" using namespace ::com::sun::star; diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src deleted file mode 100644 index 6dfe7c0aa48d..000000000000 --- a/dbaccess/source/ui/querydesign/query.src +++ /dev/null @@ -1,241 +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 . - */ -#include "dbu_qry.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - -String STR_QUERY_UNDO_TABWINSHOW -{ - Text [ en-US ] = "Add Table Window" ; -}; - -String STR_QUERY_UNDO_MOVETABWIN -{ - Text [ en-US ] = "Move table window" ; -}; -String STR_QUERY_UNDO_INSERTCONNECTION -{ - Text [ en-US ] = "Insert Join" ; -}; - -String STR_QUERY_UNDO_REMOVECONNECTION -{ - Text [ en-US ] = "Delete Join" ; -}; - -String STR_QUERY_UNDO_SIZETABWIN -{ - Text [ en-US ] = "Resize table window" ; -}; -String STR_QUERY_UNDO_TABFIELDDELETE -{ - Text [ en-US ] = "Delete Column" ; -}; - -String STR_QUERY_UNDO_TABFIELDMOVED -{ - Text [ en-US ] = "Move column"; -}; - -String STR_QUERY_UNDO_TABFIELDCREATE -{ - Text [ en-US ] = "Add Column" ; -}; - -String RID_STR_FIELD_DOESNT_EXIST -{ - Text [ en-US ] = "Invalid expression, field name '$name$' does not exist."; -}; - -String STR_QUERY_UNDO_TABWINDELETE -{ - Text [ en-US ] = "Delete Table Window" ; -}; - -String STR_QUERY_UNDO_MODIFY_CELL -{ - Text [ en-US ] = "Edit Column Description"; -}; - -String STR_QUERY_UNDO_SIZE_COLUMN -{ - Text [ en-US ] = "Adjust column width"; -}; - -String STR_QUERY_SORTTEXT -{ - Text [ en-US ] = "(not sorted);ascending;descending" ; -}; - -String STR_QUERY_FUNCTIONS -{ - Text [ en-US ] = "(no function);Group"; -}; - -String STR_QUERY_NOTABLE -{ - Text [ en-US ] = "(no table)"; -}; - -String STR_QRY_ORDERBY_UNRELATED -{ - Text [ en-US ] = "The database only supports sorting for visible fields."; -}; - -String STR_QUERY_HANDLETEXT -{ - Text [ en-US ] = "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"; -}; - -String STR_QUERY_LIMIT_ALL -{ - Text [ en-US ] = "All"; -}; - -String STR_QRY_TOO_MANY_COLUMNS -{ - Text [ en-US ] = "There are too many columns."; -}; - -String STR_QRY_CRITERIA_ON_ASTERISK -{ - Text [ en-US ] = "A condition cannot be applied to field [*]" ; -}; - -String STR_QRY_TOO_LONG_STATEMENT -{ - Text [ en-US ] = "The SQL statement created is too long."; -}; - -String STR_QRY_TOOCOMPLEX -{ - Text [ en-US ] = "Query is too complex" ; -}; - -String STR_QRY_NOSELECT -{ - Text [ en-US ] = "Nothing has been selected." ; -}; - -String STR_QRY_SYNTAX -{ - Text [ en-US ] = "SQL syntax error" ; -}; - -String STR_QRY_ORDERBY_ON_ASTERISK -{ - Text [ en-US ] = "[*] cannot be used as a sort criterion."; -}; - -String STR_QRY_TOO_MANY_TABLES -{ - Text [ en-US ] = "There are too many tables."; -}; - -String STR_QRY_NATIVE -{ - Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ; -}; - -String STR_QRY_ILLEGAL_JOIN -{ - Text [ en-US ] = "Join could not be processed" ; -}; - -String STR_SVT_SQL_SYNTAX_ERROR -{ - Text [ en-US ] = "Syntax error in SQL statement" ; -}; - -String STR_QUERYDESIGN_NO_VIEW_SUPPORT -{ - Text [ en-US ] = "This database does not support table views."; -}; - -String STR_NO_ALTER_VIEW_SUPPORT -{ - Text [ en-US ] = "This database does not support altering of existing table views."; -}; - -String STR_QUERYDESIGN_NO_VIEW_ASK -{ - Text [ en-US ] = "Do you want to create a query instead?"; -}; - -String STR_DATASOURCE_DELETED -{ - Text [ en-US ] = "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved."; -}; - -String STR_QRY_COLUMN_NOT_FOUND -{ - Text [ en-US ] = "The column '$name$' is unknown."; -}; - -String STR_QRY_JOIN_COLUMN_COMPARE -{ - Text [ en-US ] = "Columns can only be compared using '='."; -}; - -String STR_QRY_LIKE_LEFT_NO_COLUMN -{ - Text [ en-US ] = "You must use a column name before 'LIKE'."; -}; - -String STR_QRY_CHECK_CASESENSITIVE -{ - Text [ en-US ] = "The column could not be found. Please note that the database is case-sensitive."; -}; - -String STR_QUERY_SAVEMODIFIED -{ - Text [ en-US ] = "$object$ has been changed.\nDo you want to save the changes?" ; - Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource will be inserted."; -}; - -String STR_ERROR_PARSING_STATEMENT -{ - Text [ en-US ] = "$object$ is based on an SQL command which could not be parsed."; - Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource " - "(except \"SQL command\", which doesn't make sense here) will be inserted."; -}; - -String STR_INFO_OPENING_IN_SQL_VIEW -{ - Text [ en-US ] = "$object$ will be opened in SQL view."; - Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource " - "(except \"SQL command\", which doesn't make sense here) will be inserted."; -}; - -StringArray RSC_QUERY_OBJECT_TYPE -{ - ItemList [ en-US ] = - { - < "The table view"; >; - < "The query"; >; - < "The SQL statement"; >; - }; -}; - -String STR_STATEMENT_WITHOUT_RESULT_SET -{ - Text [ en-US ] = "The query does not create a result set, and thus cannot be part of another query."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index f6d30e1e3c32..03b504faaa51 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -23,7 +23,8 @@ #include <vcl/settings.hxx> #include "JoinController.hxx" #include <toolkit/helper/vclunohelper.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <sfx2/sfxsids.hrc> #include <vcl/fixed.hxx> #include "UITools.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index f2a3300374e0..4472d9375441 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -19,9 +19,12 @@ #include "adtabdlg.hxx" #include "browserids.hxx" -#include "dbu_qry.hrc" +#include "core_resource.hxx" +#include "strings.hrc" +#include "query.hrc" #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "dbu_pageids.hxx" +#include "stringconstants.hxx" #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "uiservices.hxx" @@ -72,7 +75,6 @@ #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> #include <sfx2/sfxsids.hrc> -#include <tools/resary.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> @@ -209,12 +211,10 @@ namespace dbaui namespace { - OUString lcl_getObjectResourceString( sal_uInt16 _nResId, sal_Int32 _nCommandType ) + OUString lcl_getObjectResourceString(const char* pResId, sal_Int32 _nCommandType) { - OUString sMessageText = ModuleRes( _nResId ); - ModuleRes aResId(RSC_QUERY_OBJECT_TYPE); - ResStringArray aResList(aResId); - OUString sObjectType = aResList.GetString(_nCommandType); + OUString sMessageText = DBA_RES(pResId); + OUString sObjectType = DBA_RES(RSC_QUERY_OBJECT_TYPE[_nCommandType]); sMessageText = sMessageText.replaceFirst( "$object$", sObjectType ); return sMessageText; } @@ -601,7 +601,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || rTabs.begin() == rTabs.end() ) { aError = SQLException( - ModuleRes( STR_QRY_NOSELECT ), + DBA_RES(STR_QRY_NOSELECT), nullptr, "S1000", 1000, @@ -624,7 +624,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& else { aError = SQLException( - ModuleRes( STR_QRY_SYNTAX ), + DBA_RES(STR_QRY_SYNTAX), nullptr, "S1000", 1000, @@ -654,7 +654,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& break; case SID_BROWSER_CLEAR_QUERY: { - GetUndoManager().EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0, ViewShellId(-1) ); + GetUndoManager().EnterListAction(DBA_RES(STR_QUERY_UNDO_TABWINDELETE), OUString(), 0, ViewShellId(-1) ); getContainer()->clear(); GetUndoManager().LeaveListAction(); @@ -938,8 +938,8 @@ void OQueryController::impl_initialize() m_nCommandType = CommandType::QUERY; bool bClose = false; { - OUString aTitle( ModuleRes( STR_QUERYDESIGN_NO_VIEW_SUPPORT ) ); - OUString aMessage( ModuleRes( STR_QUERYDESIGN_NO_VIEW_ASK ) ); + OUString aTitle(DBA_RES(STR_QUERYDESIGN_NO_VIEW_SUPPORT)); + OUString aMessage(DBA_RES(STR_QUERYDESIGN_NO_VIEW_ASK)); ODataView* pWindow = getView(); ScopedVclPtrInstance< OSQLMessageBox > aDlg( pWindow, aTitle, aMessage, WB_YES_NO | WB_DEF_YES, OSQLMessageBox::Query ); bClose = aDlg->Execute() == RET_NO; @@ -956,7 +956,7 @@ void OQueryController::impl_initialize() if ( !( aView >>= m_xAlterView ) ) { throw IllegalArgumentException( - ModuleRes( STR_NO_ALTER_VIEW_SUPPORT ), + DBA_RES(STR_NO_ALTER_VIEW_SUPPORT), *this, 1 ); @@ -1034,7 +1034,7 @@ OUString OQueryController::getPrivateTitle( ) const { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - OUString aDefaultName = ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ); + OUString aDefaultName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE); sName = aDefaultName.getToken(0,' '); sName += OUString::number(getCurrentStartNumber()); } @@ -1331,7 +1331,7 @@ bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElements, b aDefaultName = m_sName; else { - OUString sName = ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ); + OUString sName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE); aDefaultName = sName.getToken(0,' '); aDefaultName = ::dbtools::createUniqueName(_xElements,aDefaultName); } @@ -1365,7 +1365,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs) OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!"); if ( !editingCommand() && !haveDataSource() ) { - OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED)); + OUString aMessage(DBA_RES(STR_DATASOURCE_DELETED)); ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage)->Execute(); return false; } @@ -1715,9 +1715,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange ) } else if(m_sStatement.isEmpty()) { - ModuleRes aModuleRes(STR_QRY_NOSELECT); - OUString sTmpStr(aModuleRes); - showError(SQLException(sTmpStr,nullptr,"S1000",1000,Any())); + showError(SQLException(DBA_RES(STR_QRY_NOSELECT), nullptr, "S1000", 1000, Any())); } else sTranslatedStmt = m_sStatement; @@ -1851,7 +1849,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings { if ( !i_bForceCurrentControllerSettings && !editingView() ) { - OUString aTitle(ModuleRes(STR_SVT_SQL_SYNTAX_ERROR)); + OUString aTitle(DBA_RES(STR_SVT_SQL_SYNTAX_ERROR)); ScopedVclPtrInstance< OSQLMessageBox > aDlg(getView(),aTitle,aErrorMsg); aDlg->Execute(); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 3906b93061f0..9880cfa59349 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -18,10 +18,11 @@ */ #include "querydlg.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include "QTableConnectionData.hxx" +#include "core_resource.hxx" #include "querycontroller.hxx" #include "QueryTableView.hxx" #include "QueryDesignView.hxx" @@ -165,7 +166,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) OUString sFirstWinName = m_pConnData->getReferencingTable()->GetWinName(); OUString sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); const EJoinType eOldJoinType = eJoinType; - sal_uInt16 nResId = 0; + const char* pResId = nullptr; const sal_Int32 nPos = m_pLB_JoinType->GetSelectEntryPos(); const sal_IntPtr nJoinType = reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(nPos)); bool bAddHint = true; @@ -173,17 +174,17 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) { default: case ID_INNER_JOIN: - nResId = STR_QUERY_INNER_JOIN; + pResId = STR_QUERY_INNER_JOIN; bAddHint = false; eJoinType = INNER_JOIN; break; case ID_LEFT_JOIN: - nResId = STR_QUERY_LEFTRIGHT_JOIN; + pResId = STR_QUERY_LEFTRIGHT_JOIN; eJoinType = LEFT_JOIN; break; case ID_RIGHT_JOIN: { - nResId = STR_QUERY_LEFTRIGHT_JOIN; + pResId = STR_QUERY_LEFTRIGHT_JOIN; eJoinType = RIGHT_JOIN; OUString sTemp = sFirstWinName; sFirstWinName = sSecondWinName; @@ -191,12 +192,12 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) } break; case ID_FULL_JOIN: - nResId = STR_QUERY_FULL_JOIN; + pResId = STR_QUERY_FULL_JOIN; eJoinType = FULL_JOIN; break; case ID_CROSS_JOIN: { - nResId = STR_QUERY_CROSS_JOIN; + pResId = STR_QUERY_CROSS_JOIN; eJoinType = CROSS_JOIN; m_pConnData->ResetConnLines(); @@ -223,7 +224,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) m_pTableControl->Invalidate(); - OUString sHelpText = ModuleRes( nResId ); + OUString sHelpText = DBA_RES(pResId); if( nPos ) { sHelpText = sHelpText.replaceFirst( "%1", sFirstWinName ); @@ -232,7 +233,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) if ( bAddHint ) { sHelpText += "\n"; - sHelpText += ModuleRes( STR_JOIN_TYPE_HINT ); + sHelpText += DBA_RES( STR_JOIN_TYPE_HINT ); } m_pML_HelpText->SetText( sHelpText ); diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src deleted file mode 100644 index a7ff1bd957a5..000000000000 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ /dev/null @@ -1,47 +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 . - */ -#include "dbu_qry.hrc" -#include "dbaccess_helpid.hrc" - -String STR_JOIN_TYPE_HINT -{ - Text [ en-US ] = "Please note that some databases may not support this join type."; -}; - -String STR_QUERY_INNER_JOIN -{ - Text [ en-US ] = "Includes only records for which the contents of the related fields of both tables are identical."; -}; - -String STR_QUERY_LEFTRIGHT_JOIN -{ - Text [ en-US ] = "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching."; -}; - -String STR_QUERY_FULL_JOIN -{ - Text [ en-US ] = "Contains ALL records from '%1' and from '%2'."; -}; - -String STR_QUERY_CROSS_JOIN -{ - Text [ en-US ] = "Contains the Cartesian product of ALL records from '%1' and from '%2'."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 1cdcc075e11d..18edc5813369 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -26,10 +26,12 @@ #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/sdbcx/XDrop.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include "dbustrings.hrc" -#include "dbu_rel.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "UITools.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> @@ -373,7 +375,7 @@ xKey.clear(); if ( bDropRelation ) { DropRelation(); - OUString sError(ModuleRes(STR_QUERY_REL_COULD_NOT_CREATE)); + OUString sError(DBA_RES(STR_QUERY_REL_COULD_NOT_CREATE)); ::dbtools::throwGenericSQLException(sError,nullptr); } diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 0f171ef16410..5c9d57ff2cb9 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -25,11 +25,13 @@ #include "dbu_reghelper.hxx" #include "uiservices.hxx" #include <sfx2/sfxsids.hrc> -#include "dbu_rel.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <vcl/svapp.hxx> #include "browserids.hxx" #include <comphelper/types.hxx> -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> @@ -158,7 +160,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!"); if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)), getORB())) { - OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED)); + OUString aMessage(DBA_RES(STR_DATASOURCE_DELETED)); ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage)->Execute(); } else @@ -202,9 +204,9 @@ void ORelationController::impl_initialize() setEditable(false); m_bRelationsPossible = false; { - OUString sTitle(ModuleRes(STR_RELATIONDESIGN)); + OUString sTitle(DBA_RES(STR_RELATIONDESIGN)); sTitle = sTitle.copy(3); - ScopedVclPtrInstance< OSQLMessageBox > aDlg(nullptr,sTitle,ModuleRes(STR_RELATIONDESIGN_NOT_AVAILABLE)); + ScopedVclPtrInstance< OSQLMessageBox > aDlg(nullptr,sTitle,DBA_RES(STR_RELATIONDESIGN_NOT_AVAILABLE)); aDlg->Execute(); } disconnect(); diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 377687dae9e8..56759e745b81 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -24,7 +24,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include "browserids.hxx" -#include "dbu_rel.hrc" +#include "strings.hrc" #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/DataType.hpp> @@ -33,7 +33,7 @@ #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "RTableConnectionData.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <comphelper/extract.hxx> #include "UITools.hxx" diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 9a898328d11c..988347f399cf 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -20,6 +20,7 @@ #include "RelationTableView.hxx" #include "JoinExchange.hxx" #include <comphelper/extract.hxx> +#include "core_resource.hxx" #include "browserids.hxx" #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> @@ -29,7 +30,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <connectivity/dbtools.hxx> #include <comphelper/sequence.hxx> #include "dbaccess_helpid.hrc" @@ -41,7 +42,7 @@ #include "RTableConnectionData.hxx" #include "RelationDlg.hxx" #include "sqlmessage.hxx" -#include "dbu_rel.hrc" +#include "strings.hrc" #include "UITools.hxx" #include <connectivity/dbexception.hxx> #include "RTableWindow.hxx" @@ -322,7 +323,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) { - ScopedVclPtrInstance< OSQLWarningBox > aDlg( this, ModuleRes( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES ); + ScopedVclPtrInstance< OSQLWarningBox > aDlg( this, DBA_RES( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES ); if ( m_bInRemove || aDlg->Execute() == RET_YES ) { m_pView->getController().ClearUndoManager(); @@ -338,13 +339,13 @@ void ORelationTableView::lookForUiActivities() { if(m_pExistingConnection) { - OUString sTitle(ModuleRes(STR_RELATIONDESIGN)); + OUString sTitle(DBA_RES(STR_RELATIONDESIGN)); sTitle = sTitle.copy(3); - ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),OUString(),0); + ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,DBA_RES(STR_QUERY_REL_EDIT_RELATION),OUString(),0); aDlg->SetText(sTitle); aDlg->RemoveButton(aDlg->GetButtonId(0)); - aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus); - aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES); + aDlg->AddButton( DBA_RES(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus); + aDlg->AddButton( DBA_RES(STR_QUERY_REL_CREATE), RET_YES); aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL); sal_uInt16 nRet = aDlg->Execute(); if( nRet == RET_CANCEL) diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src deleted file mode 100644 index d40689dc433c..000000000000 --- a/dbaccess/source/ui/relationdesign/relation.src +++ /dev/null @@ -1,58 +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 . - */ -#include "dbu_rel.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - -String STR_QUERY_REL_EDIT_RELATION -{ - Text [ en-US ] = "This relation already exists. Do you want to edit it or create a new one?" ; -}; - -String STR_QUERY_REL_EDIT -{ - Text [ en-US ] = "Edit..." ; -}; - -String STR_QUERY_REL_CREATE -{ - Text [ en-US ] = "Create..." ; -}; - -String STR_RELATIONDESIGN -{ - Text [ en-US ] = " - %PRODUCTNAME Base: Relation design" ; -}; - -String STR_RELATIONDESIGN_NOT_AVAILABLE -{ - Text [ en-US ] = "The database does not support relations." ; -}; - -String STR_QUERY_REL_DELETE_WINDOW -{ - Text [ en-US ] = "When you delete this table all corresponding relations will be deleted as well. Continue?"; -}; - -String STR_QUERY_REL_COULD_NOT_CREATE -{ - Text [ en-US ] = "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 24b50f0a04c0..13feb588adb2 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -20,9 +20,10 @@ #include "FieldDescriptions.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include "dbu_tbl.hrc" +#include "strings.hrc" +#include "strings.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <comphelper/types.hxx> #include <comphelper/extract.hxx> #include "UITools.hxx" diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 7dc3db669f73..d9f35d6a4a2a 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -26,8 +26,9 @@ #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include "dbu_tbl.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" #include "browserids.hxx" #include "dbaccess_helpid.hrc" #include <comphelper/types.hxx> @@ -107,17 +108,17 @@ void OTableEditorCtrl::Init() SetReadOnly( bRead ); // Insert the columns - InsertDataColumn( FIELD_NAME, ModuleRes(STR_TAB_FIELD_COLUMN_NAME), FIELDNAME_WIDTH ); + InsertDataColumn( FIELD_NAME, DBA_RES(STR_TAB_FIELD_COLUMN_NAME), FIELDNAME_WIDTH ); - InsertDataColumn( FIELD_TYPE, ModuleRes(STR_TAB_FIELD_COLUMN_DATATYPE), FIELDTYPE_WIDTH ); + InsertDataColumn( FIELD_TYPE, DBA_RES(STR_TAB_FIELD_COLUMN_DATATYPE), FIELDTYPE_WIDTH ); ::dbaccess::ODsnTypeCollection aDsnTypes(GetView()->getController().getORB()); bool bShowColumnDescription = aDsnTypes.supportsColumnDescription(::comphelper::getString(GetView()->getController().getDataSource()->getPropertyValue(PROPERTY_URL))); - InsertDataColumn( HELP_TEXT, ModuleRes(STR_TAB_HELP_TEXT), bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH ); + InsertDataColumn( HELP_TEXT, DBA_RES(STR_TAB_HELP_TEXT), bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH ); if ( bShowColumnDescription ) { - InsertDataColumn( COLUMN_DESCRIPTION, ModuleRes(STR_COLUMN_DESCRIPTION), FIELDTYPE_WIDTH ); + InsertDataColumn( COLUMN_DESCRIPTION, DBA_RES(STR_COLUMN_DESCRIPTION), FIELDTYPE_WIDTH ); } InitCellController(); @@ -638,11 +639,11 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) OUString sActionDescription; switch ( nColId ) { - case FIELD_NAME: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_NAME ); break; - case FIELD_TYPE: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_TYPE ); break; + case FIELD_NAME: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_NAME ); break; + case FIELD_TYPE: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_TYPE ); break; case HELP_TEXT: - case COLUMN_DESCRIPTION: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_DESCRIPTION ); break; - default: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_ATTRIBUTE ); break; + case COLUMN_DESCRIPTION: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_DESCRIPTION ); break; + default: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_ATTRIBUTE ); break; } GetUndoManager().EnterListAction( sActionDescription, OUString(), 0, ViewShellId(-1) ); @@ -954,7 +955,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const css::uno case FIELD_PROPERTY_AUTOINC: { sValue = ::comphelper::getString(_rNewData); - pFieldDescr->SetAutoIncrement(sValue == ModuleRes(STR_VALUE_YES)); + pFieldDescr->SetAutoIncrement(sValue == DBA_RES(STR_VALUE_YES)); } break; case FIELD_PROPERTY_SCALE: @@ -991,8 +992,8 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) nRow = GetCurRow(); SetDataPtr( nRow ); - static const OUString strYes(ModuleRes(STR_VALUE_YES)); - static const OUString strNo(ModuleRes(STR_VALUE_NO)); + static const OUString strYes(DBA_RES(STR_VALUE_YES)); + static const OUString strNo(DBA_RES(STR_VALUE_NO)); OUString sValue; // Read out the fields switch( nColId ) diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 4e7865fe1a98..41982efe4631 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -25,9 +25,10 @@ #include "TypeInfo.hxx" #include "UITools.hxx" #include "browserids.hxx" +#include "core_resource.hxx" #include "dbu_reghelper.hxx" -#include "dbu_tbl.hrc" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "dsmeta.hxx" @@ -133,7 +134,7 @@ Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMulti } OTableController::OTableController(const Reference< XComponentContext >& _rM) : OTableController_BASE(_rM) - ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_pTypeInfo() ,m_bAllowAutoIncrementValue(false) ,m_bNew(true) @@ -271,7 +272,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) if (!xTablesSup.is()) { - OUString aMessage(ModuleRes(STR_TABLEDESIGN_CONNECTION_MISSING)); + OUString aMessage(DBA_RES(STR_TABLEDESIGN_CONNECTION_MISSING)); ScopedVclPtrInstance<OSQLWarningBox>(getView(), aMessage )->Execute(); return false; } @@ -299,7 +300,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) aDefaultName = m_sName; else { - OUString aName = ModuleRes(STR_TBL_TITLE); + OUString aName = DBA_RES(STR_TBL_TITLE); aDefaultName = aName.getToken(0,' '); aDefaultName = ::dbtools::createUniqueName(xTables,aDefaultName); } @@ -400,9 +401,9 @@ bool OTableController::doSaveDoc(bool _bSaveAs) } catch(const ElementExistException& ) { - OUString sText( ModuleRes( STR_NAME_ALREADY_EXISTS ) ); + OUString sText( DBA_RES( STR_NAME_ALREADY_EXISTS ) ); sText = sText.replaceFirst( "#" , m_sName); - ScopedVclPtrInstance< OSQLMessageBox > aDlg( getView(), OUString( ModuleRes( STR_ERROR_DURING_CREATION ) ), sText, WB_OK, OSQLMessageBox::Error ); + ScopedVclPtrInstance< OSQLMessageBox > aDlg( getView(), DBA_RES( STR_ERROR_DURING_CREATION ), sText, WB_OK, OSQLMessageBox::Error ); aDlg->Execute(); bError = true; @@ -414,7 +415,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) } if ( aInfo.isValid() ) - aInfo.prepend( OUString( ModuleRes( STR_TABLEDESIGN_SAVE_ERROR ) ) ); + aInfo.prepend( DBA_RES( STR_TABLEDESIGN_SAVE_ERROR ) ); showError(aInfo); if (aInfo.isValid() || bError) @@ -434,7 +435,7 @@ void OTableController::doEditIndexes() // table needs to be saved before editing indexes if (m_bNew || isModified()) { - ScopedVclPtrInstance< MessageDialog > aAsk(getView(), ModuleRes(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aAsk(getView(), DBA_RES(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VclMessageType::Question, VclButtonsType::YesNo); if (RET_YES != aAsk->Execute()) return; @@ -509,7 +510,7 @@ void OTableController::impl_initialize() } catch(const SQLException&) { - ScopedVclPtrInstance<OSQLWarningBox>(getView(), ModuleRes( STR_NO_TYPE_INFO_AVAILABLE ))->Execute(); + ScopedVclPtrInstance<OSQLWarningBox>(getView(), DBA_RES( STR_NO_TYPE_INFO_AVAILABLE ))->Execute(); throw; } try @@ -920,7 +921,7 @@ bool OTableController::checkColumns(bool _bNew) OFieldDescription* pCompareDesc = (*aIter2)->GetActFieldDescr(); if (pCompareDesc && bCase(pCompareDesc->GetName(),pFieldDesc->GetName())) { - OUString strMessage = ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME); + OUString strMessage = DBA_RES(STR_TABLEDESIGN_DUPLICATE_NAME); strMessage = strMessage.replaceFirst("$column$", pFieldDesc->GetName()); ScopedVclPtrInstance<OSQLWarningBox>(getView(), strMessage)->Execute(); return false; @@ -930,8 +931,8 @@ bool OTableController::checkColumns(bool _bNew) } if ( _bNew && !bFoundPKey && aMetaData.supportsPrimaryKeys() ) { - OUString sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD)); - OUString sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY)); + OUString sTitle(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD)); + OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY)); ScopedVclPtrInstance< OSQLMessageBox > aBox(getView(), sTitle,sMsg, WB_YES_NO_CANCEL | WB_DEF_YES); switch ( aBox->Execute() ) @@ -1060,7 +1061,7 @@ void OTableController::alterColumns() { if(xDrop.is() && xAppend.is()) { - OUString aMessage( ModuleRes( STR_TABLEDESIGN_ALTER_ERROR ) ); + OUString aMessage( DBA_RES( STR_TABLEDESIGN_ALTER_ERROR ) ); aMessage = aMessage.replaceFirst( "$column$", pField->GetName() ); SQLExceptionInfo aError( ::cppu::getCaughtException() ); @@ -1119,7 +1120,7 @@ void OTableController::alterColumns() bReload = true; if(xDrop.is() && xAppend.is()) { - OUString aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR)); + OUString aMessage(DBA_RES(STR_TABLEDESIGN_ALTER_ERROR)); aMessage = aMessage.replaceFirst("$column$",pField->GetName()); ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES, &aError); if ( aMsg->Execute() != RET_YES ) @@ -1185,9 +1186,9 @@ void OTableController::alterColumns() { if(xKeyColumns.is() && xKeyColumns->hasByName(*pIter)) // check if this column is a member of the primary key { - OUString aMsgT(ModuleRes(STR_TBL_COLUMN_IS_KEYCOLUMN)); + OUString aMsgT(DBA_RES(STR_TBL_COLUMN_IS_KEYCOLUMN)); aMsgT = aMsgT.replaceFirst("$column$",*pIter); - OUString aTitle(ModuleRes(STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE)); + OUString aTitle(DBA_RES(STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE)); ScopedVclPtrInstance< OSQLMessageBox > aMsg(getView(),aTitle,aMsgT,WB_YES_NO| WB_DEF_YES); if(aMsg->Execute() == RET_YES) { @@ -1206,7 +1207,7 @@ void OTableController::alterColumns() } catch (const SQLException&) { - OUString sError( ModuleRes( STR_TABLEDESIGN_COULD_NOT_DROP_COL ) ); + OUString sError( DBA_RES( STR_TABLEDESIGN_COULD_NOT_DROP_COL ) ); sError = sError.replaceFirst( "$column$", *pIter ); SQLException aNewException; @@ -1489,7 +1490,7 @@ OUString OTableController::getPrivateTitle() const } if ( sTitle.isEmpty() ) { - OUString aName = ModuleRes(STR_TBL_TITLE); + OUString aName = DBA_RES(STR_TBL_TITLE); sTitle = aName.getToken(0,' ') + OUString::number(getCurrentStartNumber()); } } diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 604314e1a6f2..317ebe73a6e2 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -18,7 +18,7 @@ */ #include "TableDesignControl.hxx" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include "TableDesignView.hxx" #include "TableController.hxx" #include "browserids.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index c013589cd796..1ebbccea3b15 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -21,7 +21,8 @@ #include "TableController.hxx" #include "TableDesignView.hxx" #include "TEditControl.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/types.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 2b674638efd4..dced4032fc46 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -20,12 +20,13 @@ #include "TableFieldDescWin.hxx" #include <osl/diagnose.h> #include "FieldDescriptions.hxx" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include "TableDesignHelpBar.hxx" #include <vcl/fixed.hxx> #include <vcl/settings.hxx> #include "dbaccess_helpid.hrc" -#include "moduledbu.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #define STANDARD_MARGIN 6 #define DETAILS_HEADER_HEIGHT 25 @@ -50,7 +51,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent) { // Header m_pHeader = VclPtr<FixedText>::Create( this, WB_CENTER ); - m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) ); + m_pHeader->SetText(DBA_RES(STR_TAB_PROPERTIES)); m_pHeader->Show(); // HelpBar diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index d6aff9b08216..4c121fb6b2d3 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -18,7 +18,7 @@ */ #include "TableUndo.hxx" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include "TEditControl.hxx" #include "TableRow.hxx" #include "browserids.hxx" @@ -31,8 +31,9 @@ using namespace ::svt; // class OTableDesignUndoAct -OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID) - ,m_pTabDgnCtrl( pOwner ) +OTableDesignUndoAct::OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID) + : OCommentUndoAction(pCommentID) + , m_pTabDgnCtrl(pOwner) { m_pTabDgnCtrl->m_nCurUndoActId++; } @@ -108,9 +109,9 @@ void OTableDesignCellUndoAct::Redo() } // class OTableEditorUndoAct -OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 _nCommentID ) : - OTableDesignUndoAct( pOwner ,_nCommentID) - ,pTabEdCtrl(pOwner) +OTableEditorUndoAct::OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID) + : OTableDesignUndoAct(pOwner, pCommentID) + , pTabEdCtrl(pOwner) { } diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 37b990a586f8..3f8abc23a78f 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -40,7 +40,7 @@ namespace dbaui virtual void Undo() override; virtual void Redo() override; public: - OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID); + OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID); virtual ~OTableDesignUndoAct() override; }; @@ -51,7 +51,7 @@ namespace dbaui VclPtr<OTableEditorCtrl> pTabEdCtrl; public: - OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID ); + OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID); virtual ~OTableEditorUndoAct() override; }; diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src deleted file mode 100644 index 0d3375196f9f..000000000000 --- a/dbaccess/source/ui/tabledesign/table.src +++ /dev/null @@ -1,306 +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 . - */ - -#include "dbu_tbl.hrc" -#include "dbaccess_helpid.hrc" -#include "dbaccess_slotid.hrc" -#include "browserids.hxx" - -String STR_TABLEDESIGN_DBFIELDTYPES -{ - Text [ en-US ] = "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)"; -}; - -String STR_TABLEDESIGN_UNDO_PRIMKEY -{ - Text [ en-US ] = "Insert/remove primary key" ; -}; - -String STR_VALUE_YES -{ - Text [ en-US ] = "Yes" ; -}; - -String STR_VALUE_NO -{ - Text [ en-US ] = "No" ; -}; - -String STR_VALUE_NONE -{ - // Note: should somehow fit to the word "value" in other languages as well: value - none .... - Text [ en-US ] = "<none>"; -}; - -String STR_TAB_FIELD_NAME -{ - Text [ en-US ] = "Field name" ; -}; - -String STR_TAB_FIELD_COLUMN_NAME -{ - Text [ en-US ] = "Field Name" ; -}; - -String STR_TAB_FIELD_DATATYPE -{ - Text [ en-US ] = "Field ~type" ; -}; - -String STR_TAB_FIELD_COLUMN_DATATYPE -{ - Text [ en-US ] = "Field Type" ; -}; - -String STR_TAB_HELP_TEXT -{ - Text [ en-US ] = "Description" ; -}; - -String STR_COLUMN_DESCRIPTION -{ - Text [ en-US ] = "Column Description" ; -}; - -String STR_FIELD_AUTOINCREMENT -{ - Text [ en-US ] = "~AutoValue"; -}; - -String STR_TAB_PROPERTIES -{ - Text [ en-US ] = "Field Properties" ; -}; - -String STR_TABED_UNDO_CELLMODIFIED -{ - Text [ en-US ] = "Modify cell" ; -}; - -String STR_TABED_UNDO_ROWDELETED -{ - Text [ en-US ] = "Delete row" ; -}; - -String STR_TABED_UNDO_TYPE_CHANGED -{ - Text [ en-US ] = "Modify field type"; -}; - -String STR_TABED_UNDO_ROWINSERTED -{ - Text [ en-US ] = "Insert row" ; -}; - -String STR_TABED_UNDO_NEWROWINSERTED -{ - Text [ en-US ] = "Insert new row" ; -}; - -String STR_DEFAULT_VALUE -{ - Text [ en-US ] = "~Default value" ; -}; - -String STR_FIELD_REQUIRED -{ - Text [ en-US ] = "~Entry required" ; -}; - -String STR_TEXT_LENGTH -{ - Text [ en-US ] = "~Length" ; -}; - -String STR_NUMERIC_TYPE -{ - Text [ en-US ] = "~Type" ; -}; - -String STR_LENGTH -{ - Text [ en-US ] = "~Length" ; -}; - -String STR_SCALE -{ - Text [ en-US ] = "Decimal ~places" ; -}; - -String STR_FORMAT -{ - Text [ en-US ] = "Format example"; -}; - -String STR_HELP_BOOL_DEFAULT -{ - Text [ en-US ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string."; -}; - -String STR_HELP_DEFAULT_VALUE -{ - Text [ en-US ] = "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ; -}; - -String STR_HELP_FIELD_REQUIRED -{ - Text [ en-US ] = "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ; -}; - -String STR_HELP_TEXT_LENGTH -{ - Text [ en-US ] = "Enter the maximum text length permitted." ; -}; - -String STR_HELP_NUMERIC_TYPE -{ - Text [ en-US ] = "Enter the number format." ; -}; - -String STR_HELP_LENGTH -{ - Text [ en-US ] = "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ; -}; - -String STR_HELP_SCALE -{ - Text [ en-US ] = "Specify the number of decimal places permitted in this field." ; -}; - -String STR_HELP_FORMAT_CODE -{ - Text [ en-US ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format)."; -}; - -String STR_HELP_FORMAT_BUTTON -{ - Text [ en-US ] = "This is where you determine the output format of the data."; -}; - -String STR_HELP_AUTOINCREMENT -{ - Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ; -}; - -String STR_BUTTON_FORMAT -{ - Text [ en-US ] = "~..."; -}; - -String STR_TABLEDESIGN_DUPLICATE_NAME -{ - Text [ en-US ] = "The table cannot be saved because column name \"$column$\" was assigned twice."; -}; - -String STR_TBL_COLUMN_IS_KEYCOLUMN -{ - Text [ en-US ] = "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?"; -}; - -String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE -{ - Text [ en-US ] = "Primary Key Affected"; -}; - -String STR_COLUMN_NAME -{ - Text [ en-US ] = "Column"; -}; - -String STR_QRY_CONTINUE -{ - Text [ en-US ] = "Continue anyway?" ; -}; - -String STR_TABLEDESIGN_CONNECTION_MISSING -{ - Text [ en-US ] = "The table could not be saved due to problems connecting to the database."; -}; - -String STR_TABLEDESIGN_DATASOURCE_DELETED -{ - Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted."; -}; - -String STR_QUERY_SAVE_TABLE_EDIT_INDEXES -{ - Text [ en-US ] = "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?"; -}; - -String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD -{ - Text [ en-US ] = "No primary key" ; -}; - -String STR_TABLEDESIGN_NO_PRIM_KEY -{ - Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ; -}; - -String STR_TABLEDESIGN_ALTER_ERROR -{ - Text [ en-US ] = "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" ; -}; - -String STR_TABLEDESIGN_SAVE_ERROR -{ - Text [ en-US ] = "Error while saving the table design"; -}; - -String STR_TABLEDESIGN_COULD_NOT_DROP_COL -{ - Text [ en-US ] = "The column $column$ could not be deleted."; -}; - -String STR_AUTOINCREMENT_VALUE -{ - Text [ en-US ] = "A~uto-increment statement"; -}; - -String STR_HELP_AUTOINCREMENT_VALUE -{ - Text [ en-US ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created."; -}; - -String STR_NO_TYPE_INFO_AVAILABLE -{ - Text [ en-US ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source."; -}; - -String STR_CHANGE_COLUMN_NAME -{ - Text [ en-US ] = "change field name"; -}; - -String STR_CHANGE_COLUMN_TYPE -{ - Text [ en-US ] = "change field type"; -}; - -String STR_CHANGE_COLUMN_DESCRIPTION -{ - Text [ en-US ] = "change field description"; -}; - -String STR_CHANGE_COLUMN_ATTRIBUTE -{ - Text [ en-US ] = "change field attribute"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index e5b94f995e51..deb5184edf53 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -19,7 +19,7 @@ #include "ColumnControl.hxx" #include "ColumnPeer.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "uiservices.hxx" #include "apitools.hxx" #include <com/sun/star/awt/PosSize.hpp> diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index c42af2059b46..0556c0e6b61a 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -25,7 +25,7 @@ #include <cppuhelper/queryinterface.hxx> #include <comphelper/extract.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dbu_reghelper.hxx" #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/property.hxx> diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 1e7bae1ca536..7ae3187fb240 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -20,7 +20,8 @@ #include "ColumnPeer.hxx" #include "ColumnControlWindow.hxx" #include <vcl/svapp.hxx> -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "FieldDescriptions.hxx" namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 1cdc2984e090..42d71cea3199 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -22,7 +22,7 @@ #include "dbu_reghelper.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "queryfilter.hxx" #include "queryorder.hxx" #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 4d59b432f596..c274edca67b7 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/sdbc/XRowSet.hpp> #include <svtools/genericunodialog.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "apitools.hxx" namespace dbaui @@ -41,7 +41,7 @@ namespace dbaui :public svt::OGenericUnoDialog ,public ComposerDialog_PBASE { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: // <properties> css::uno::Reference< css::sdb::XSingleSelectQueryComposer > diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index f1f81c6d3991..60462ff3781c 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -19,10 +19,12 @@ #include <memory> #include "dbu_reghelper.hxx" -#include "dbu_resource.hrc" -#include "dbu_uno.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "dbu_pageids.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" #include "uiservices.hxx" #include "WCopyTable.hxx" @@ -460,7 +462,7 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) && !OCopyTableWizard::supportsViews( m_xDestConnection ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_NO_VIEWS_SUPPORT ), + DBA_RES( STR_CTW_NO_VIEWS_SUPPORT ), *this, 1 ); @@ -492,7 +494,7 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& if ( _newPrimaryKey.IsPresent && !OCopyTableWizard::supportsPrimaryKey( m_xDestConnection ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_NO_PRIMARY_KEY_SUPPORT ), + DBA_RES( STR_CTW_NO_PRIMARY_KEY_SUPPORT ), *this, 1 ); @@ -657,7 +659,7 @@ Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw if ( !bIsValid ) { throw IllegalArgumentException( - ModuleRes( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ), + DBA_RES( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ), *const_cast< CopyTableWizard* >( this ), _nArgPos + 1 ); @@ -701,7 +703,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X if ( !sUnsupportedSetting.isEmpty() ) { OUString sMessage( - OUString(ModuleRes(STR_CTW_ERROR_UNSUPPORTED_SETTING)). + DBA_RES(STR_CTW_ERROR_UNSUPPORTED_SETTING). replaceFirst("$name$", sUnsupportedSetting)); throw IllegalArgumentException( sMessage, @@ -749,7 +751,7 @@ std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObj break; default: throw IllegalArgumentException( - ModuleRes( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ), + DBA_RES( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ), *const_cast< CopyTableWizard* >( this ), 1 ); @@ -768,7 +770,7 @@ std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObj if ( _out_rCommandType == CommandType::QUERY ) // we cannot copy a query if the connection cannot provide it ... throw IllegalArgumentException( - ModuleRes( STR_CTW_ERROR_NO_QUERY ), + DBA_RES( STR_CTW_ERROR_NO_QUERY ), *const_cast< CopyTableWizard* >( this ), 1 ); @@ -806,7 +808,7 @@ void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPrope if ( !xRowLocate.is() ) { ::dbtools::throwGenericSQLException( - OUString( ModuleRes( STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS ) ), + DBA_RES(STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS), *this ); } @@ -1045,7 +1047,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r { SQLContext aError; aError.Context = *this; - aError.Message = OUString( ModuleRes( STR_ERROR_OCCURRED_WHILE_COPYING ) ); + aError.Message = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING); ::dbtools::SQLExceptionInfo aInfo( _rEvent.Error ); if ( aInfo.isValid() ) @@ -1276,7 +1278,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou default: { - OUString aMessage( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ); + OUString aMessage( DBA_RES( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ); aMessage = aMessage.replaceFirst( "$type$", OUString::number( aSourceColTypes[ nSourceColumn ] ) ); aMessage = aMessage.replaceFirst( "$pos$", OUString::number( nSourceColumn ) ); @@ -1458,7 +1460,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) sal_Int32 nArgCount( _rArguments.getLength() ); if ( ( nArgCount != 2 ) && ( nArgCount != 3 ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_ILLEGAL_PARAMETER_COUNT ), + DBA_RES( STR_CTW_ILLEGAL_PARAMETER_COUNT ), *this, 1 ); @@ -1469,7 +1471,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) { // ->createWithInteractionHandler if ( !( _rArguments[2] >>= m_xInteractionHandler ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ), + DBA_RES( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ), *this, 3 ); @@ -1494,7 +1496,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) catch( const Exception& ) { throw WrappedTargetException( - ModuleRes( STR_CTW_ERROR_DURING_INITIALIZATION ), + DBA_RES( STR_CTW_ERROR_DURING_INITIALIZATION ), *this, ::cppu::getCaughtException() ); diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src deleted file mode 100644 index 4d5a09b6cf01..000000000000 --- a/dbaccess/source/ui/uno/copytablewizard.src +++ /dev/null @@ -1,77 +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 . - */ - -#include "dbu_uno.hrc" - -String STR_CTW_NO_VIEWS_SUPPORT -{ - Text [ en-US ] = "The destination database does not support views."; -}; - -String STR_CTW_NO_PRIMARY_KEY_SUPPORT -{ - Text [ en-US ] = "The destination database does not support primary keys."; -}; - -String STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR -{ - Text [ en-US ] = "no data access descriptor found, or no data access descriptor able to provide all necessary information"; -}; - -String STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT -{ - Text [ en-US ] = "Only tables and queries are supported at the moment."; -}; - -String STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS -{ - Text [ en-US ] = "The copy source's result set must support bookmarks."; -}; - -String STR_CTW_UNSUPPORTED_COLUMN_TYPE -{ - Text [ en-US ] = "Unsupported source column type ($type$) at column position $pos$."; -}; - -String STR_CTW_ILLEGAL_PARAMETER_COUNT -{ - Text [ en-US ] = "Illegal number of initialization parameters."; -}; - -String STR_CTW_ERROR_DURING_INITIALIZATION -{ - Text [ en-US ] = "An error occurred during initialization."; -}; - -String STR_CTW_ERROR_UNSUPPORTED_SETTING -{ - Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$."; -}; - -String STR_CTW_ERROR_NO_QUERY -{ - Text [ en-US ] = "To copy a query, your connection must be able to provide queries."; -}; - -String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER -{ - Text [ en-US ] = "The given interaction handler is invalid."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index f4e413fd1273..119a729f699b 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <com/sun/star/sdb/XInteractionDocumentSave.hpp> #include <sfx2/QuerySaveDocument.hxx> -#include "dbu_uno.hrc" +#include "strings.hrc" #include "paramdialog.hxx" #include <vcl/svapp.hxx> #include "CollectionView.hxx" diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 5166a6bde184..a3ebfeb8100b 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -22,7 +22,7 @@ #include <cppuhelper/implbase.hxx> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "apitools.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -62,7 +62,7 @@ namespace dbaui class BasicInteractionHandler :public BasicInteractionHandler_Base { - const OModuleClient m_aModuleClient; + const dbaccess::OModuleClient m_aModuleClient; const css::uno::Reference< css::uno::XComponentContext > m_xContext; const bool m_bFallbackToGeneric; diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 7f6c4a6eb5e8..7ad3241312f1 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -20,10 +20,10 @@ #include "textconnectionsettings.hxx" #include "uiservices.hxx" #include "dbu_reghelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "apitools.hxx" #include "unoadmin.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "propertystorage.hxx" #include <com/sun/star/beans/XPropertySetInfo.hpp> @@ -63,7 +63,7 @@ namespace dbaui ,public OTextConnectionSettingsDialog_PBASE ,public ::cppu::WeakImplHelper< css::sdb::XTextConnectionSettings > { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; PropertyValues m_aPropertyValues; protected: diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 1858bf9de2ce..3c3360d82268 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/connection/XConnection.hpp> #include <com/sun/star/container/XNamed.hpp> #include "directsql.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "datasourceconnector.hxx" #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 96e198e8a34a..5b1e9d126ff0 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/sdb/XSQLQueryComposer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#include "moduledbu.hxx" +#include "core_resource.hxx" #include <com/sun/star/sdbc/XConnection.hpp> namespace dbaui @@ -40,7 +40,7 @@ namespace dbaui :public ODirectSQLDialog_BASE ,public ODirectSQLDialog_PBASE { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; OUString m_sInitialSelection; css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; protected: diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index fde168b9fa21..59e2647324c6 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include <toolkit/awt/vclxwindow.hxx> #include "dbu_reghelper.hxx" #include "unoadmin.hxx" diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 4494a2eedda3..7d7f003a5f57 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -21,7 +21,8 @@ #include "uiservices.hxx" #include "unosqlmessage.hxx" #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include <comphelper/processfactory.hxx> #include <cppuhelper/typeprovider.hxx> #include <connectivity/dbexception.hxx> |