diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /dbaccess/source/ui/querydesign/JoinTableView.cxx | |
| parent | Add some check to renewpo (diff) | |
| parent | oox: ZipStorage: better exception tracing (diff) | |
| download | core-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'dbaccess/source/ui/querydesign/JoinTableView.cxx')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 022f38668a91..de041132fb80 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -968,8 +968,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) pSourceBox->SelectAll(sal_False); pDestBox->SelectAll(sal_False); - SvLBoxEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); - SvLBoxEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); + SvTreeListEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); + SvTreeListEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); const ::std::vector<OConnectionLine*>* pLines = pConn->GetConnLineList(); ::std::vector<OConnectionLine*>::const_reverse_iterator aIter = pLines->rbegin(); @@ -977,14 +977,14 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) { if ((*aIter)->IsValid()) { - SvLBoxEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName()); + SvTreeListEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName()); if (pSourceEntry) { pSourceBox->Select(pSourceEntry, sal_True); pSourceBox->MakeVisible(pSourceEntry); } - SvLBoxEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName()); + SvTreeListEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName()); if (pDestEntry) { pDestBox->Select(pDestEntry, sal_True); |