Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:32:12+0000 Modified: dba/dbaccess/source/ui/dlg/adtabdlg.cxx
Log: RESYNC: (1.27-1.29); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adtabdlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adtabdlg.cxx?r1=1.24.46.4&r2=1.24.46.5 Delta lines: +9 -12 -------------------- --- adtabdlg.cxx 2006-12-18 07:55:16+0000 1.24.46.4 +++ adtabdlg.cxx 2008-01-17 02:32:09+0000 1.24.46.5 @@ -65,9 +65,6 @@ #ifndef _SFXSIDS_HRC #include <sfx2/sfxsids.hrc> #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef DBAUI_QUERYTABLEVIEW_HXX #include "QueryTableView.hxx" #endif @@ -319,13 +316,13 @@ //------------------------------------------------------------------------------ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) :ModelessDialog( pParent, ModuleRes(DLG_JOIN_TABADD) ) - ,m_aCaseTables( this, ResId( RB_CASE_TABLES ) ) - ,m_aCaseQueries( this, ResId( RB_CASE_QUERIES ) ) - ,m_aTableList( this, NULL, ResId( LB_TABLE_OR_QUERY ), sal_False ) - ,m_aQueryList( this, ResId( LB_TABLE_OR_QUERY ) ) - ,aAddButton( this, ResId( PB_ADDTABLE ) ) - ,aCloseButton( this, ResId( PB_CLOSE ) ) - ,aHelpButton( this, ResId( PB_HELP ) ) + ,m_aCaseTables( this, ModuleRes( RB_CASE_TABLES ) ) + ,m_aCaseQueries( this, ModuleRes( RB_CASE_QUERIES ) ) + ,m_aTableList( this, NULL, ModuleRes( LB_TABLE_OR_QUERY ), sal_False ) + ,m_aQueryList( this, ModuleRes( LB_TABLE_OR_QUERY ) ) + ,aAddButton( this, ModuleRes( PB_ADDTABLE ) ) + ,aCloseButton( this, ModuleRes( PB_CLOSE ) ) + ,aHelpButton( this, ModuleRes( PB_HELP ) ) ,m_rContext( _rContext ) { // der Close-Button hat schon einen Standard-Help-Text, den ich aber hier nicht haben moechte, also den Text ruecksetzen @@ -492,9 +489,9 @@ ::svt::OLocalResourceAccess aLocalRes( ModuleRes( DLG_JOIN_TABADD ), RSC_MODELESSDIALOG ); if ( _rContext.allowQueries() ) - sTitle = String( ResId( STR_ADD_TABLE_OR_QUERY ) ); + sTitle = String( ModuleRes( STR_ADD_TABLE_OR_QUERY ) ); else - sTitle = String( ResId( STR_ADD_TABLES ) ); + sTitle = String( ModuleRes( STR_ADD_TABLES ) ); return sTitle; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
