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

#86628# use composed name instead of tablename

Browse source
This commit is contained in:
Ocke Janssen 2001-05-04 09:56:29 +00:00
parent f03d437f36
commit bc3078d1e7
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dbaccess/source/ui/dlg/RelationDlg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: RelationDlg.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: fs $ $Date: 2001-04-03 14:15:17 $
* last change: $Author: oj $ $Date: 2001-05-04 10:53:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -573,8 +573,8 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
m_pRC_Tables->SetDestDef(pInitialRight->GetTable());
// die in einer ComboBox ausgewaehlte Tabelle darf nicht in der anderen zur Verfuegung stehen
m_strCurrentLeft = pInitialLeft->GetTableName();
m_strCurrentRight = pInitialRight->GetTableName();
m_strCurrentLeft = pInitialLeft->GetComposedName();
m_strCurrentRight = pInitialRight->GetComposedName();
if (pTabWins->size() > 2)
{
m_lmbLeftTable.RemoveEntry(m_strCurrentRight);
@ -790,7 +790,7 @@ IMPL_LINK( ORelationDialog, OnTableChanged, ListBox*, pListBox )
OTableWindow* pSecond = aIter->second;
Reference< XPropertySet> xLeftTable, xRightTable;
if (m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetTableName()))
if (m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetComposedName()))
{
xLeftTable = pFirst->GetTable();
xRightTable = pSecond->GetTable();

12
dbaccess/source/ui/querydesign/TableWindowTitle.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: TableWindowTitle.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: oj $ $Date: 2001-04-02 11:05:23 $
* last change: $Author: oj $ $Date: 2001-05-04 10:56:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -147,13 +147,9 @@ void OTableWindowTitle::LoseFocus()
//------------------------------------------------------------------------------
void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt )
{
Reference<XPropertySet> xProp(m_pTabWin->GetTable(),UNO_QUERY);
if(xProp.is())
if(m_pTabWin)
{
::rtl::OUString aTableName;
xProp->getPropertyValue(PROPERTY_NAME) >>= aTableName;
String aHelpText = aTableName.getStr();
String aHelpText = m_pTabWin->GetComposedName();
if( aHelpText.Len())
{
// Hilfe anzeigen