Tag: cws_src680_dba24a User: oj Date: 2007-08-06 06:38:51+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/inc/AppElementType.hxx
Log: #i69740# namedvalue used File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.42.14.2&r2=1.42.14.3 Delta lines: +10 -8 -------------------- --- AppController.cxx 2007-08-03 06:14:16+0000 1.42.14.2 +++ AppController.cxx 2007-08-06 06:38:49+0000 1.42.14.3 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.42.14.2 $ + * $Revision: 1.42.14.3 $ * - * last change: $Author: oj $ $Date: 2007/08/03 06:14:16 $ + * last change: $Author: oj $ $Date: 2007/08/06 06:38:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,6 +113,8 @@ #include <com/sun/star/util/XFlushable.hpp> #endif #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" +#include "com/sun/star/beans/NamedValue.hpp" + /** === end UNO includes === **/ #ifndef _TOOLS_DEBUG_HXX @@ -2524,12 +2526,12 @@ getContainer()->selectElements(aSelection); return sal_True; } - Sequence< PropertyValue > aCurrentSelection; + Sequence< NamedValue > aCurrentSelection; if ( (_aSelection >>= aCurrentSelection) && aCurrentSelection.getLength() ) { ElementType eType = E_NONE; - const PropertyValue* pIter = aCurrentSelection.getConstArray(); - const PropertyValue* pEnd = pIter + aCurrentSelection.getLength(); + const NamedValue* pIter = aCurrentSelection.getConstArray(); + const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); for(;pIter != pEnd;++pIter) { if ( pIter->Name.equalsAscii("Type") ) @@ -2555,15 +2557,15 @@ { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); - Sequence< PropertyValue > aCurrentSelection; + Sequence< NamedValue > aCurrentSelection; if ( getContainer() ) { ::std::vector< ::rtl::OUString> aList; getSelectionElementNames(aList); - PropertyValue aType; + NamedValue aType; aType.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")); aType.Value <<= static_cast<sal_Int32>(getContainer()->getElementType()); - PropertyValue aNames; + NamedValue aNames; aNames.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); if ( !aList.empty() ) aNames.Value <<= Sequence< ::rtl::OUString>(&aList[0],aList.size()); Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: AppElementType.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/AppElementType.hxx?r1=1.4&r2=1.4.20.1 Delta lines: +8 -7 ------------------- --- AppElementType.hxx 2007-06-12 05:34:26+0000 1.4 +++ AppElementType.hxx 2007-08-06 06:38:49+0000 1.4.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppElementType.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.20.1 $ * - * last change: $Author: obo $ $Date: 2007/06/12 05:34:26 $ + * last change: $Author: oj $ $Date: 2007/08/06 06:38:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,6 +34,7 @@ ************************************************************************/ #ifndef DBAUI_APPELEMENTTYPE_HXX #define DBAUI_APPELEMENTTYPE_HXX +#include <com/sun/star/sdb/application/DatabaseObject.hpp> //........................................................................ namespace dbaui { @@ -41,10 +42,10 @@ enum ElementType { - E_FORM = 0, - E_REPORT = 1, - E_QUERY = 2, - E_TABLE = 3, + E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE, + E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY, + E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM, + E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT, E_NONE = 4, E_ELEMENT_TYPE_COUNT = E_NONE --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
