Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:56:59 Modified: dba/dbaccess/source/ui/dlg/dbfindex.cxx
Log: RESYNC: (1.20-1.21); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbfindex.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbfindex.cxx?r1=1.20.4.3&r2=1.20.4.4 Delta lines: +13 -13 --------------------- --- dbfindex.cxx 25 Apr 2006 13:02:54 -0000 1.20.4.3 +++ dbfindex.cxx 4 Jul 2006 07:56:56 -0000 1.20.4.4 @@ -199,6 +199,7 @@ } } + (void)_bMustExist; DBG_ASSERT(!_bMustExist || (aSearch != _rList.end()), "ODbaseIndexDialog::implRemoveIndex : did not find the index!"); return aReturn; } @@ -235,7 +236,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, pButton ) +IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ ) { // let all tables write their INF file @@ -250,7 +251,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, pButton ) +IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ ) { String aSelection = aLB_FreeIndexes.GetSelectEntry(); String aTableName = aCB_Tables.GetText(); @@ -262,7 +263,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, pButton ) +IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ ) { String aSelection = aLB_TableIndexes.GetSelectEntry(); String aTableName = aCB_Tables.GetText(); @@ -274,7 +275,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, pButton ) +IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ ) { sal_uInt16 nCnt = aLB_FreeIndexes.GetEntryCount(); String aTableName = aCB_Tables.GetText(); @@ -288,7 +289,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, pButton ) +IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ ) { sal_uInt16 nCnt = aLB_TableIndexes.GetEntryCount(); String aTableName = aCB_Tables.GetText(); @@ -302,7 +303,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK( ODbaseIndexDialog, OnListEntrySelected, ListBox*, NOTINTERESTEDIN ) +IMPL_LINK( ODbaseIndexDialog, OnListEntrySelected, ListBox*, /*NOTINTERESTEDIN*/ ) { checkButtons(); return 0; @@ -389,10 +390,9 @@ String aExt; const ::rtl::OUString *pBegin = aFolderContent.getConstArray(); const ::rtl::OUString *pEnd = pBegin + aFolderContent.getLength(); + aURL.SetSmartProtocol(INET_PROT_FILE); for(;pBegin != pEnd;++pBegin) { - INetURLObject aURL; - aURL.SetSmartProtocol(INET_PROT_FILE); String aName; ::utl::LocalFileHelper::ConvertURLToPhysicalName(pBegin->getStr(),aName); aURL.SetSmartURL(aName); @@ -573,9 +573,9 @@ } catch (const Exception& e ) { - e; // make compiler happy + (void)e; // make compiler happy // simply silent this. The strange algorithm here does a lot of things even if no files at all were - // created or access, so it's possible that the file we're trying to delete does not even exist, + // created or accessed, so it's possible that the file we're trying to delete does not even exist, // and this is a valid condition. // 2003-05-15 - #109677# - [EMAIL PROTECTED] } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
