diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-08 08:36:06 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-08 08:36:06 +0200 |
| commit | c64e4838dafb56e940389271c1a1f851e44dab8e (patch) | |
| tree | 35b36db614bb01702bc245d777b5e942ff3b1d2d | |
| parent | ec4d6cbcbb8f4c4c6c0120b72fd43ec62c6798ae (diff) | |
| parent | ea243b9f6ce216be900b3a0b3a4b379789a614a3 (diff) | |
Automated merge with http://x42-so4:8009/ooo
| -rw-r--r-- | dbaccess/prj/build.lst | 2 | ||||
| -rwxr-xr-x | dbaccess/qa/complex/dbaccess/makefile.mk | 5 | ||||
| -rw-r--r-- | dbaccess/source/core/api/KeySet.cxx | 16 | ||||
| -rw-r--r-- | dbaccess/uiconfig/dbapp/menubar/menubar.xml | 14 |
4 files changed, 17 insertions, 20 deletions
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index d5c6eacc7..f8b050257 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,4 +1,4 @@ -ba dbaccess : l10n BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript NULL +ba dbaccess : l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript NULL ba dbaccess usr1 - all ba_mkout NULL ba dbaccess\inc nmake - all ba_inc NULL ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL diff --git a/dbaccess/qa/complex/dbaccess/makefile.mk b/dbaccess/qa/complex/dbaccess/makefile.mk index d950100a7..56a24c029 100755 --- a/dbaccess/qa/complex/dbaccess/makefile.mk +++ b/dbaccess/qa/complex/dbaccess/makefile.mk @@ -40,7 +40,6 @@ all: .INCLUDE : target.mk .ELSE -.IF "$(BUILD_QADEVOOO)" == "YES" #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar @@ -76,8 +75,4 @@ run: $(CLASSDIR)$/$(JARTARGET) run_%: $(CLASSDIR)$/$(JARTARGET) +$(RUNNER_CALL) $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//) -.ELSE -.INCLUDE : target.mk -.ENDIF # "$(BUILD_QADEVOOO)" == "YES" - .ENDIF # "$(SOLAR_JAVA)" == "" diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 24d519038..2ab840502 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 629aa199f..baafddcae 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/> |