Tag: cws_src680_qiq User: fs Date: 06/06/19 02:26:23 Modified: /dba/dbaccess/source/ui/dlg/ adtabdlg.cxx, adtabdlg.hrc, adtabdlg.src
Log: #i51143# 'Add Tables' or 'Add Table or Query' decision now publicly available 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.22.68.2&r2=1.22.68.3 Delta lines: +22 -5 -------------------- --- adtabdlg.cxx 24 May 2006 06:49:24 -0000 1.22.68.2 +++ adtabdlg.cxx 19 Jun 2006 09:26:20 -0000 1.22.68.3 @@ -4,9 +4,9 @@ * * $RCSfile: adtabdlg.cxx,v $ * - * $Revision: 1.22.68.2 $ + * $Revision: 1.22.68.3 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:24 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:26:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,9 @@ #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> #endif +#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ +#include <svtools/localresaccess.hxx> +#endif #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif @@ -364,11 +367,11 @@ aListSize.Height() += nPixelDiff; m_aTableList.SetPosSizePixel( aListPos, aListSize ); - - SetText( String( ResId( STR_ADD_TABLES ) ) ); } FreeResource(); + + SetText( getDialogTitleForContext( m_rContext ) ); } //------------------------------------------------------------------------------ @@ -473,6 +476,20 @@ bool OAddTableDlg::impl_isAddAllowed() { return m_rContext.allowAddition(); +} + +//------------------------------------------------------------------------------ +String OAddTableDlg::getDialogTitleForContext( IAddTableDialogContext& _rContext ) +{ + String sTitle; + + ::svt::OLocalResourceAccess aLocalRes( ModuleRes( DLG_JOIN_TABADD ), RSC_MODELESSDIALOG ); + if ( _rContext.allowQueries() ) + sTitle = String( ResId( STR_ADD_TABLE_OR_QUERY ) ); + else + sTitle = String( ResId( STR_ADD_TABLES ) ); + + return sTitle; } // ----------------------------------------------------------------------------- File [changed]: adtabdlg.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adtabdlg.hrc?r1=1.3.124.1&r2=1.3.124.2 Delta lines: +4 -3 ------------------- --- adtabdlg.hrc 12 May 2006 11:09:27 -0000 1.3.124.1 +++ adtabdlg.hrc 19 Jun 2006 09:26:20 -0000 1.3.124.2 @@ -4,9 +4,9 @@ * * $RCSfile: adtabdlg.hrc,v $ * - * $Revision: 1.3.124.1 $ + * $Revision: 1.3.124.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 11:09:27 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:26:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,6 +48,7 @@ #define RB_CASE_QUERIES 2 #define STR_ADD_TABLES 1 +#define STR_ADD_TABLE_OR_QUERY 2 #endif // DBAUI_ADTABDLG_HRC File [changed]: adtabdlg.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adtabdlg.src?r1=1.30.118.1&r2=1.30.118.2 Delta lines: +8 -4 ------------------- --- adtabdlg.src 12 May 2006 11:09:28 -0000 1.30.118.1 +++ adtabdlg.src 19 Jun 2006 09:26:21 -0000 1.30.118.2 @@ -4,9 +4,9 @@ * * $RCSfile: adtabdlg.src,v $ * - * $Revision: 1.30.118.1 $ + * $Revision: 1.30.118.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 11:09:28 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:26:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,8 +48,6 @@ SVLook = TRUE ; HelpID = DLG_JOIN_TABADD ; Size = MAP_APPFONT ( 178 , 147 ) ; - Text [ de ] = "Tabelle oder Abfrage hinzufügen" ; - Text [ en-US ] = "Add Table or Query" ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE ; @@ -111,4 +109,10 @@ Text [ de ] = "Tabellen hinzufügen"; Text [ en-US ] = "Add Tables"; }; + + String STR_ADD_TABLE_OR_QUERY + { + Text [ de ] = "Tabelle oder Abfrage hinzufügen" ; + Text [ en-US ] = "Add Table or Query" ; + }; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
