Tag: cws_src680_qiq User: fs Date: 2006/06/27 05:02:14 Modified: dba/dbaccess/source/core/dataaccess/documentcontainer.cxx
Log: RESYNC: (1.17-1.18); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.17.52.4&r2=1.17.52.5 Delta lines: +23 -24 --------------------- --- documentcontainer.cxx 16 Jun 2006 11:47:39 -0000 1.17.52.4 +++ documentcontainer.cxx 27 Jun 2006 12:02:12 -0000 1.17.52.5 @@ -171,7 +171,7 @@ // ----------------------------------------------------------------------------- Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (Exception, RuntimeException) { - return Reference< XInterface >(); + return createInstanceWithArguments( aServiceSpecifier, Sequence< Any >() ); } // ----------------------------------------------------------------------------- Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException) @@ -329,31 +329,31 @@ if ( xCopyFrom.is() ) { Sequence< ::rtl::OUString> aSeq = xCopyFrom->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* elements = aSeq.getConstArray(); + const ::rtl::OUString* elementsEnd = elements + aSeq.getLength(); Reference<XContent> xObjectToCopy; Reference<XMultiServiceFactory> xORB(xContent,UNO_QUERY); OSL_ENSURE(xORB.is(),"No service factory given"); if ( xORB.is() ) { - for(;pIter != pEnd;++pIter) + for(;elements != elementsEnd;++elements) { - xCopyFrom->getByName(*pIter) >>= xObjectToCopy; + xCopyFrom->getByName(*elements) >>= xObjectToCopy; Sequence< Any > aArguments(3); - PropertyValue aValue; + PropertyValue aArgument; // set as folder - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); - aValue.Value <<= *pIter; - aArguments[0] <<= aValue; + aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); + aArgument.Value <<= *elements; + aArguments[0] <<= aArgument; //parent - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); - aValue.Value <<= xContent; - aArguments[1] <<= aValue; - - aValue.Name = PROPERTY_EMBEDDEDOBJECT; - aValue.Value <<= xObjectToCopy; - aArguments[2] <<= aValue; + aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent")); + aArgument.Value <<= xContent; + aArguments[1] <<= aArgument; + + aArgument.Name = PROPERTY_EMBEDDEDOBJECT; + aArgument.Value <<= xObjectToCopy; + aArguments[2] <<= aArgument; ::rtl::OUString sServiceName = (Reference<XNameAccess>(xObjectToCopy,UNO_QUERY).is() ? (m_bFormsContainer ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); @@ -361,7 +361,7 @@ Reference<XContent > xNew(xORB->createInstanceWithArguments(sServiceName,aArguments),UNO_QUERY); Reference<XNameContainer> xNameContainer(xContent,UNO_QUERY); if ( xNameContainer.is() ) - xNameContainer->insertByName(*pIter,makeAny(xNew)); + xNameContainer->insertByName(*elements,makeAny(xNew)); } } } @@ -488,8 +488,8 @@ } // ----------------------------------------------------------------------------- Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const ::rtl::OUString& _sURL - , const ::rtl::OUString& TargetFrameName - , sal_Int32 SearchFlags + , const ::rtl::OUString& /*TargetFrameName*/ + , sal_Int32 /*SearchFlags*/ , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -554,7 +554,6 @@ if ( lcl_queryContent(_sName,xNameContainer,aContent,sName) ) return aContent; throw NoSuchElementException(_sName,*this); - return Any(); } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const ::rtl::OUString& _sName ) throw (RuntimeException) @@ -629,7 +628,7 @@ return pContent; } // ----------------------------------------------------------------------------- -Any ODocumentContainer::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const +Any ODocumentContainer::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/ ) const { return Any(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
