Tag: cws_src680_dba203c User: fs Date: 06/03/29 03:35:46 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionHelper.cxx, ConnectionPage.cxx, TextConnectionHelper.cxx, adminpages.cxx, dbadmin.cxx, dbwiz.cxx, dsselect.cxx, generalpage.cxx, paramdialog.cxx /dba/dbaccess/source/ui/inc/ localresaccess.hxx /dba/dbaccess/source/ui/misc/ charsets.cxx /dba/dbaccess/source/ui/querydesign/ querycontroller.cxx
Log: #133638# renamed ambiguous ::dbui::OLocalResourceAccess to LocalresourceAccess File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.8&r2=1.8.100.1 Delta lines: +5 -5 ------------------- --- ConnectionHelper.cxx 23 Sep 2005 12:25:19 -0000 1.8 +++ ConnectionHelper.cxx 29 Mar 2006 11:35:41 -0000 1.8.100.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.100.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:25:19 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -229,7 +229,7 @@ m_aET_Connection.ShowPrefix(DST_JDBC == m_eType ); m_aPB_Connection.Show(sal_True); - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); m_aPB_Connection.Show(bEnableBrowseButton); @@ -401,7 +401,7 @@ } else { - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); String sError = String(ResId(STR_NO_ADABASE_DATASOURCES)); ErrorBox aBox(this, WB_OK, sError); aBox.Execute(); File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.13&r2=1.13.58.1 Delta lines: +4 -4 ------------------- --- ConnectionPage.cxx 19 Dec 2005 17:16:11 -0000 1.13 +++ ConnectionPage.cxx 29 Mar 2006 11:35:41 -0000 1.13.58.1 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.58.1 $ * - * last change: $Author: obo $ $Date: 2005/12/19 17:16:11 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -244,7 +244,7 @@ OConnectionHelper::implInitControls( _rSet, _bSaveValue); sal_Bool bShowUser = sal_True; - OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); switch( m_eType ) { case DST_DBASE: File [changed]: TextConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx?r1=1.5&r2=1.5.104.1 Delta lines: +4 -4 ------------------- --- TextConnectionHelper.cxx 23 Sep 2005 12:27:25 -0000 1.5 +++ TextConnectionHelper.cxx 29 Mar 2006 11:35:41 -0000 1.5.104.1 @@ -4,9 +4,9 @@ * * $RCSfile: TextConnectionHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.104.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:27:25 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -305,7 +305,7 @@ // ----------------------------------------------------------------------- sal_Bool OTextConnectionHelper::checkItems() { - OLocalResourceAccess aStringResAccess(PAGE_TEXT, RSC_TABPAGE); + LocalResourceAccess aStringResAccess(PAGE_TEXT, RSC_TABPAGE); // for accessing the strings which are local to our own resource block String sExtension = GetExtension(); String aErrorText; File [changed]: adminpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.cxx?r1=1.41&r2=1.41.104.1 Delta lines: +4 -4 ------------------- --- adminpages.cxx 23 Sep 2005 12:28:13 -0000 1.41 +++ adminpages.cxx 29 Mar 2006 11:35:42 -0000 1.41.104.1 @@ -4,9 +4,9 @@ * * $RCSfile: adminpages.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.41.104.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:28:13 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -222,7 +222,7 @@ if (!aEnumeration.isLoaded()) { // show an error message - OLocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE ); + LocalResourceAccess aLocRes( PAGE_GENERAL, RSC_TABPAGE ); String sError(ResId(STR_COULDNOTLOAD_ODBCLIB)); sError.SearchAndReplaceAscii("#lib#", aEnumeration.getLibraryName()); ErrorBox aDialog(this, WB_OK, sError); File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.95&r2=1.95.104.1 Delta lines: +5 -5 ------------------- --- dbadmin.cxx 23 Sep 2005 12:29:11 -0000 1.95 +++ dbadmin.cxx 29 Mar 2006 11:35:42 -0000 1.95.104.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbadmin.cxx,v $ * - * $Revision: 1.95 $ + * $Revision: 1.95.104.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:29:11 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -175,7 +175,7 @@ void ODbAdminDialog::addDetailPage(USHORT _nPageId, USHORT _nTextId, CreateTabPage _pCreateFunc) { // open our own resource block, as the page titles are strings local to this block - OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); + LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); AddTabPage(_nPageId, String(ResId(_nTextId)), _pCreateFunc, NULL); m_aCurrentDetailPages.push(_nPageId); @@ -245,7 +245,7 @@ case DST_USERDEFINE9: case DST_USERDEFINE10: { - OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); + LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); String aTitle(ResId(STR_PAGETITLE_ADVANCED)); AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, sal_False, 1); m_aCurrentDetailPages.push(PAGE_USERDRIVER); File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.9&r2=1.9.60.1 Delta lines: +4 -4 ------------------- --- dbwiz.cxx 19 Dec 2005 17:16:54 -0000 1.9 +++ dbwiz.cxx 29 Mar 2006 11:35:42 -0000 1.9.60.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.60.1 $ * - * last change: $Author: obo $ $Date: 2005/12/19 17:16:54 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -388,7 +388,7 @@ static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory(m_pImpl->getORB()); static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); // open our own resource block, as the page titles are strings local to this block - OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); + LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); pPage->SetText(String(ResId(nStringId))); defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH ); File [changed]: dsselect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.cxx?r1=1.14&r2=1.14.108.1 Delta lines: +4 -4 ------------------- --- dsselect.cxx 8 Sep 2005 15:02:46 -0000 1.14 +++ dsselect.cxx 29 Mar 2006 11:35:42 -0000 1.14.108.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsselect.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.108.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:02:46 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -257,7 +257,7 @@ if (!aOdbcConfig.isLoaded()) { // show an error message - OLocalResourceAccess aLocRes(DLG_DATASOURCE_SELECTION, RSC_MODALDIALOG); + LocalResourceAccess aLocRes(DLG_DATASOURCE_SELECTION, RSC_MODALDIALOG); String sError(ModuleRes(STR_COULDNOTLOAD_CONFIGLIB)); sError.SearchAndReplaceAscii("#lib#", aOdbcConfig.getLibraryName()); ErrorBox aDialog(this, WB_OK, sError); File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.46&r2=1.46.80.1 Delta lines: +5 -5 ------------------- --- generalpage.cxx 24 Oct 2005 08:31:44 -0000 1.46 +++ generalpage.cxx 29 Mar 2006 11:35:42 -0000 1.46.80.1 @@ -4,9 +4,9 @@ * * $RCSfile: generalpage.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.46.80.1 $ * - * last change: $Author: rt $ $Date: 2005/10/24 08:31:44 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -266,7 +266,7 @@ Dialog* pDialog = reinterpret_cast<Dialog*>(m_pAdminDialog); if ( m_pAdminDialog ) { - OLocalResourceAccess aStringResAccess( PAGE_GENERAL, RSC_TABPAGE ); + LocalResourceAccess aStringResAccess( PAGE_GENERAL, RSC_TABPAGE ); String sMessage = String(ResId(STR_PARENTTITLE)); sMessage.SearchAndReplaceAscii("#",sName); m_pAdminDialog->setTitle(sMessage); @@ -314,7 +314,7 @@ String sMessage; if ( nResId ) { - OLocalResourceAccess aStringResAccess( PAGE_GENERAL, RSC_TABPAGE ); + LocalResourceAccess aStringResAccess( PAGE_GENERAL, RSC_TABPAGE ); sMessage = String(ResId(nResId)); } m_aSpecialMessage.SetText(sMessage); File [changed]: paramdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/paramdialog.cxx?r1=1.11&r2=1.11.104.1 Delta lines: +4 -4 ------------------- --- paramdialog.cxx 23 Sep 2005 12:31:50 -0000 1.11 +++ paramdialog.cxx 29 Mar 2006 11:35:42 -0000 1.11.104.1 @@ -4,9 +4,9 @@ * * $RCSfile: paramdialog.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.104.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:31:50 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -268,7 +268,7 @@ String sMessage; { - OLocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG); + LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG); sMessage = String(ResId(STR_COULD_NOT_CONVERT_PARAM)); } sMessage.SearchAndReplaceAll(String::CreateFromAscii("$name$"), sName.getStr()); Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: localresaccess.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/localresaccess.hxx?r1=1.3&r2=1.3.110.1 Delta lines: +6 -6 ------------------- --- localresaccess.hxx 8 Sep 2005 15:58:19 -0000 1.3 +++ localresaccess.hxx 29 Mar 2006 11:35:43 -0000 1.3.110.1 @@ -4,9 +4,9 @@ * * $RCSfile: localresaccess.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.110.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:58:19 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,15 +49,15 @@ //......................................................................... //========================================================================= -//= OLocalResourceAccess +//= LocalResourceAccess //========================================================================= /** helper class for acessing local resources */ typedef ::svt::OLocalResourceAccess LRA_Base; -class OLocalResourceAccess : protected LRA_Base +class LocalResourceAccess : protected LRA_Base { public: - inline OLocalResourceAccess( sal_uInt16 _nId, RESOURCE_TYPE _rType ) + inline LocalResourceAccess( sal_uInt16 _nId, RESOURCE_TYPE _rType ) :LRA_Base( ModuleRes( _nId ), _rType ) { } Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: charsets.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/charsets.cxx?r1=1.8&r2=1.8.110.1 Delta lines: +4 -4 ------------------- --- charsets.cxx 8 Sep 2005 16:11:47 -0000 1.8 +++ charsets.cxx 29 Mar 2006 11:35:43 -0000 1.8.110.1 @@ -4,9 +4,9 @@ * * $RCSfile: charsets.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.110.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:11:47 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ ,SvxTextEncodingTable() { { - OLocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE ); + LocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE ); m_aSystemDisplayName = String( ResId( 1 ) ); } } Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.102&r2=1.102.104.1 Delta lines: +7 -4 ------------------- --- querycontroller.cxx 23 Sep 2005 12:44:40 -0000 1.102 +++ querycontroller.cxx 29 Mar 2006 11:35:43 -0000 1.102.104.1 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.102 $ + * $Revision: 1.102.104.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:44:40 $ + * last change: $Author: fs $ $Date: 2006/03/29 11:35:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -173,6 +173,9 @@ #ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" #endif +#ifndef _DBAUI_LOCALRESACCESS_HXX_ +#include "localresaccess.hxx" +#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -1532,7 +1535,7 @@ String sMessageText( ModuleRes( STR_QUERY_SAVEMODIFIED ) ); String sObjectType; { - ::svt::OLocalResourceAccess aLocalRes( ModuleRes( RSC_QUERY_OBJECT_TYPE ), RSC_RESOURCE ); + LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE ); sObjectType = String( ResId( m_bIndependent ? 3 : m_bCreateView ? 2 : 1 ) ); } sMessageText.SearchAndReplace( String::CreateFromAscii( "$object$" ), sObjectType ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
