strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#97321# remove views out of table filter when they appear in the views too

Browse source
This commit is contained in:
Ocke Janssen 2002-07-11 07:54:04 +00:00
parent 1e52b19068
commit 05cf419401
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dbaccess/source/ui/dlg/adtabdlg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: adtabdlg.cxx,v $
*
* $Revision: 1.9 $
* $Revision: 1.10 $
*
* last change: $Author: oj $ $Date: 2002-05-07 05:45:13 $
* last change: $Author: oj $ $Date: 2002-07-11 08:54:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -252,16 +252,31 @@ void OAddTableDlg::UpdateTableList(BOOL bViewsAllowed)
Sequence< ::rtl::OUString> sTables,sViews;
if (xTables.is())
sTables = xTables->getElementNames();
if(bViewsAllowed)
xViewSupp = Reference< XViewsSupplier >(xTableSupp, UNO_QUERY);
if (xViewSupp.is())
{
xViewSupp = Reference< XViewsSupplier >(xTableSupp, UNO_QUERY);
if (xViewSupp.is())
{
xViews = xViewSupp->getViews();
if (xViews.is())
sViews = xViews->getElementNames();
}
xViews = xViewSupp->getViews();
if (xViews.is())
sViews = xViews->getElementNames();
}
// if no views are allowed remove the views also out the table name filter
if ( !bViewsAllowed )
{
const ::rtl::OUString* pTableBegin = sTables.getConstArray();
const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength();
::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd);
const ::rtl::OUString* pViewBegin = sViews.getConstArray();
const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength();
::comphelper::TStringMixEqualFunctor aEqualFunctor;
for(;pViewBegin != pViewEnd;++pViewBegin)
aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::not1(::std::bind2nd(aEqualFunctor,*pViewBegin))));
sTables = Sequence< ::rtl::OUString>(aTables.begin(),aTables.size());
sViews = Sequence< ::rtl::OUString>();
}
aTableList.UpdateTableList(Reference< XConnection>(xTableSupp,UNO_QUERY)->getMetaData(),sTables,sViews);
}
// -----------------------------------------------------------------------------