Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:58:41 Modified: dba/dbaccess/source/ui/dlg/dsselect.cxx
Log: RESYNC: (1.14-1.16); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dsselect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.cxx?r1=1.14.8.3&r2=1.14.8.4 Delta lines: +6 -6 ------------------- --- dsselect.cxx 25 Apr 2006 13:02:59 -0000 1.14.8.3 +++ dsselect.cxx 4 Jul 2006 07:58:38 -0000 1.14.8.4 @@ -157,7 +157,7 @@ // move the buttons PushButton* pButtons[] = { &m_aOk, &m_aCancel, &m_aHelp ,&m_aCreateAdabasDB}; - for (sal_Int32 i=0; i<sizeof(pButtons)/sizeof(pButtons[0]); ++i) + for (size_t i=0; i<sizeof(pButtons)/sizeof(pButtons[0]); ++i) { Point aOldPos = pButtons[i]->GetPosPixel(); pButtons[i]->SetPosPixel(Point(aOldPos.X() - nLostPixels, aOldPos.Y())); @@ -190,7 +190,7 @@ return 0; } // ----------------------------------------------------------------------- -IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, pButton ) +IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ ) { try { @@ -254,7 +254,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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
