diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-05-27 13:33:32 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-05-27 13:33:32 +0200 |
| commit | bbb275dbbdb179e02773e9cdc9d360f929c6548a (patch) | |
| tree | d0214e8ab389efe06b9ba7cf271e874435397a93 /dbaccess | |
| parent | ffc0666792f90f2c95fbad065f956cc98dcd5b92 (diff) | |
| parent | be101214146938344e96a5c3a854cf268e554a59 (diff) | |
cws tl79: merge with DEV300_m79
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 14 | ||||
| -rw-r--r-- | dbaccess/uiconfig/dbapp/menubar/menubar.xml | 14 |
2 files changed, 15 insertions, 13 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 04bef19278b1..9d5188ceffc4 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -367,15 +367,17 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O } Sequence< ::rtl::OUString> aBestColumnNames; - if ( aBestRowColumnNames.empty() ) + if ( !aBestRowColumnNames.empty() ) { - if ( xKeyColumns.is() ) - aBestColumnNames = xKeyColumns->getElementNames(); - } - else aBestColumnNames = Sequence< ::rtl::OUString>(&aBestRowColumnNames[0],aBestRowColumnNames.size()); + ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames)); + } - ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames)); + if (m_pKeyColumnNames->empty() && xKeyColumns.is()) + { + aBestColumnNames = xKeyColumns->getElementNames(); + ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames)); + } ::dbaccess::getColumnPositions(xSup->getColumns(),xSourceColumns->getElementNames(),m_sUpdateTableName,(*m_pColumnNames)); ::dbaccess::getColumnPositions(xSup->getColumns(),aParameterColumns,m_sUpdateTableName,(*m_pParameterNames)); diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 629aa199f353..baafddcae8ad 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -59,10 +59,10 @@ <menu:menupopup> <menu:menu menu:id=".uno:DBDatabaseObjectsMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:DBViewTables"/> - <menu:menuitem menu:id=".uno:DBViewQueries"/> - <menu:menuitem menu:id=".uno:DBViewForms"/> - <menu:menuitem menu:id=".uno:DBViewReports"/> + <menu:menuitem menu:id=".uno:DBViewTables" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DBViewQueries" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DBViewForms" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DBViewReports" menu:style="radio"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> @@ -70,9 +70,9 @@ <menu:menuitem menu:id=".uno:StatusBarVisible"/> <menu:menu menu:id=".uno:DBPreview"> <menu:menupopup> - <menu:menuitem menu:id=".uno:DBDisablePreview"/> - <menu:menuitem menu:id=".uno:DBShowDocInfoPreview"/> - <menu:menuitem menu:id=".uno:DBShowDocPreview"/> + <menu:menuitem menu:id=".uno:DBDisablePreview" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DBShowDocInfoPreview" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DBShowDocPreview" menu:style="radio"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> |