diff options
Diffstat (limited to 'dbaccess/source/ui/querydesign')
27 files changed, 110 insertions, 393 deletions
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: */ |