Tag: cws_src680_dba201b User: fs Date: 05/07/11 06:56:48 Modified: /dba/dbaccess/source/filter/xml/ makefile.mk, xmlDataSourceSetting.cxx, xmlfilter.cxx /dba/dbaccess/source/ui/app/ AppControllerDnD.cxx /dba/dbaccess/source/ui/dlg/ adodatalinks.cxx
Log: merging CWS dba201a into CWS dba201b File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/makefile.mk?r1=1.2&r2=1.2.146.1 Delta lines: +3 -2 ------------------- --- makefile.mk 2 Aug 2004 15:18:11 -0000 1.2 +++ makefile.mk 11 Jul 2005 13:56:42 -0000 1.2.146.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.146.1 $ # -# last change: $Author: hr $ $Date: 2004/08/02 15:18:11 $ +# last change: $Author: fs $ $Date: 2005/07/11 13:56:42 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -133,6 +133,7 @@ $(VCLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ + $(TKLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ File [changed]: xmlDataSourceSetting.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx?r1=1.5.44.1&r2=1.5.44.2 Delta lines: +3 -2 ------------------- --- xmlDataSourceSetting.cxx 11 Jul 2005 13:37:05 -0000 1.5.44.1 +++ xmlDataSourceSetting.cxx 11 Jul 2005 13:56:42 -0000 1.5.44.2 @@ -2,9 +2,9 @@ * * $RCSfile: xmlDataSourceSetting.cxx,v $ * - * $Revision: 1.5.44.1 $ + * $Revision: 1.5.44.2 $ * - * last change: $Author: fs $ $Date: 2005/07/11 13:37:05 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:56:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,6 +137,7 @@ { s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.9.38.2&r2=1.9.38.3 Delta lines: +21 -8 -------------------- --- xmlfilter.cxx 11 Jul 2005 13:37:07 -0000 1.9.38.2 +++ xmlfilter.cxx 11 Jul 2005 13:56:43 -0000 1.9.38.3 @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.9.38.2 $ + * $Revision: 1.9.38.3 $ * - * last change: $Author: fs $ $Date: 2005/07/11 13:37:07 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:56:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,6 +149,9 @@ #ifndef _SFXECODE_HXX #include <svtools/sfxecode.hxx> #endif +#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ +#include <toolkit/helper/vclunohelper.hxx> +#endif using namespace ::com::sun::star; @@ -350,17 +353,27 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; + { + ::vos::OGuard aGuard(Application::GetSolarMutex()); Window* pFocusWindow = Application::GetFocusWindow(); - sal_Bool bRet = sal_False; - + xWindow = VCLUnoHelper::GetInterface( pFocusWindow ); if( pFocusWindow ) pFocusWindow->EnterWait(); + } + sal_Bool bRet = sal_False; if ( GetModel().is() ) bRet = implImport( rDescriptor ); + if ( xWindow.is() ) + { + ::vos::OGuard aGuard(Application::GetSolarMutex()); + Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pFocusWindow ) pFocusWindow->LeaveWait(); + } + return bRet; } Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.10&r2=1.10.38.1 Delta lines: +20 -19 --------------------- --- AppControllerDnD.cxx 18 Mar 2005 10:07:23 -0000 1.10 +++ AppControllerDnD.cxx 11 Jul 2005 13:56:44 -0000 1.10.38.1 @@ -2,9 +2,9 @@ * * $RCSfile: AppControllerDnD.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.38.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 10:07:23 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:56:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -771,7 +771,8 @@ xMetaData = xConnection->getMetaData(); ::rtl::OUString sName = getContainer()->getQualifiedName(NULL,xMetaData); - OSL_ENSURE(sName.getLength(),"NO name given!"); + if ( sName.getLength() ) + { ::rtl::OUString sDataSource = getDatabaseName(); if ( eType == E_TABLE ) @@ -782,7 +783,7 @@ { pData = new ODataClipboard(sDataSource, CommandType::QUERY, sName, getNumberFormatter(xConnection,getORB()), getORB()); } - + } } break; case E_FORM: @@ -791,7 +792,7 @@ ::std::vector< ::rtl::OUString> aList; getSelectionElementNames(aList); Reference< XHierarchicalNameAccess > xElements(getElements(eType),UNO_QUERY); - if ( xElements.is() ) + if ( xElements.is() && !aList.empty() ) { Reference< XContent> xContent(xElements->getByHierarchicalName(*aList.begin()),UNO_QUERY); pData = new OComponentTransferable(m_sDatabaseName,xContent); @@ -818,7 +819,6 @@ { try { - ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); if ( _eType == E_QUERY ) { sal_Int32 nCommandType = CommandType::TABLE; @@ -838,6 +838,7 @@ // plausibility check sal_Bool bValidDescriptor = sal_False; + ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); if (CommandType::QUERY == nCommandType) bValidDescriptor = sDataSourceName.getLength() && sCommand.getLength(); else if (CommandType::COMMAND == nCommandType) @@ -948,7 +949,7 @@ OSL_TRACE("There should be a sequence in it!"); return sal_True; } - else // forms or reports + else if ( _rPasteData.has(daComponent) ) // forms or reports { Reference<XContent> xContent; _rPasteData[daComponent] >>= xContent; Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adodatalinks.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adodatalinks.cxx?r1=1.2&r2=1.2.198.1 Delta lines: +2 -4 ------------------- --- adodatalinks.cxx 17 Mar 2004 10:44:03 -0000 1.2 +++ adodatalinks.cxx 11 Jul 2005 13:56:45 -0000 1.2.198.1 @@ -2,9 +2,9 @@ * * $RCSfile: adodatalinks.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.198.1 $ * - * last change: $Author: obo $ $Date: 2004/03/17 10:44:03 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:56:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,8 +120,6 @@ return connstr; } - VARIANT_BOOL pbSuccess; - // Prompt for connection information. hr = dlPrompt->PromptNew((IDispatch **)&piTmpConnection); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
