User: kz Date: 2008-03-06 18:10:12+0000 Modified: dba/dbaccess/source/ui/app/AppControllerDnD.cxx
Log: INTEGRATION: CWS odbmacros2 (1.23.2); FILE MERGED 2008/03/06 10:45:47 fs 1.23.2.6: manual resync to 1.25 to prevent conflicts at integration time 2008/02/20 13:27:59 fs 1.23.2.5.2.1: some DBG_UNHANDLED_EXCEPTIONs 2008/02/06 21:45:57 fs 1.23.2.5: #i49133# use our document's isModified instead of m_bCurrentlyModified - the lattter is only for controllers which do not have an own model 2008/02/04 22:31:46 fs 1.23.2.4: #i10000# 2008/02/04 13:07:47 fs 1.23.2.3: RESYNC: (1.23-1.24); FILE MERGED 2008/01/26 21:18:52 fs 1.23.2.2: #new include necessary 2007/12/19 13:26:40 fs 1.23.2.1: getDataSourceName_displayError: database context arg is not necessary File Changes: 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.25&r2=1.26 Delta lines: +5 -11 -------------------- --- AppControllerDnD.cxx 2008-03-05 16:52:05+0000 1.25 +++ AppControllerDnD.cxx 2008-03-06 18:10:04+0000 1.26 @@ -75,9 +75,6 @@ #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> #endif -#ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_ -#include <com/sun/star/util/XModifiable.hpp> -#endif #ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_ #include <com/sun/star/container/XHierarchicalNameContainer.hpp> #endif @@ -226,6 +223,9 @@ #ifndef DBACCESS_SOURCE_UI_MISC_DEFAULTOBJECTNAMECHECK_HXX #include "defaultobjectnamecheck.hxx" #endif +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif //........................................................................ namespace dbaui @@ -570,12 +570,6 @@ return xElements; } // ----------------------------------------------------------------------------- -void OApplicationController::impl_initialize() -{ - Reference<XModifiable> xModi(m_xModel,UNO_QUERY); - m_bCurrentlyModified = (xModi.is() && xModi->isModified()); -} -// ----------------------------------------------------------------------------- void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames) const { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); @@ -633,7 +627,7 @@ OSL_ENSURE(xNameAccess.is(),"Data source doesn't return a name access -> GPF"); return ::std::auto_ptr<OLinkedDocumentsAccess>( - new OLinkedDocumentsAccess( getView(), m_xCurrentFrame,getORB(), xNameAccess, xConnection, getDatabaseName() ) ); + new OLinkedDocumentsAccess( getView(), m_aCurrentFrame.getFrame(), getORB(), xNameAccess, xConnection, getDatabaseName() ) ); } // ----------------------------------------------------------------------------- TransferableHelper* OApplicationController::copyObject() @@ -760,7 +754,7 @@ try { // the concrete query - Reference<XQueryDefinitionsSupplier> xSourceQuerySup(getDataSourceByName_displayError( m_xDatabaseContext, sDataSourceName, getView(), getORB(), true ),UNO_QUERY); + Reference<XQueryDefinitionsSupplier> xSourceQuerySup(getDataSourceByName_displayError( sDataSourceName, getView(), getORB(), true ),UNO_QUERY); if ( xSourceQuerySup.is() ) xQueries.set(xSourceQuerySup->getQueryDefinitions(),UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
