Tag: cws_src680_bgdlremove User: kso Date: 2007-05-11 07:45:38+0000 Modified: dba/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx dba/dbaccess/source/filter/xml/xmlTable.cxx dba/dbaccess/source/filter/xml/xmlfilter.cxx dba/dbaccess/util/makefile.mk
Log: #i76911# - ucbhelper lib no longer uses VOS. (vos::ORef => rtl::Reference, vos::OMutex => osl::Mutex, ...) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: myucp_datasupplier.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx?r1=1.6&r2=1.6.98.1 Delta lines: +5 -5 ------------------- --- myucp_datasupplier.cxx 2006-09-17 06:40:51+0000 1.6 +++ myucp_datasupplier.cxx 2007-05-11 07:45:35+0000 1.6.98.1 @@ -4,9 +4,9 @@ * * $RCSfile: myucp_datasupplier.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.98.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 06:40:51 $ + * last change: $Author: kso $ $Date: 2007/05/11 07:45:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -315,7 +315,7 @@ if ( !bFound ) m_pImpl->m_bCountFinal = sal_True; - rtl::Reference< ::ucb::ResultSet > xResultSet = getResultSet().getBodyPtr(); + rtl::Reference< ::ucb::ResultSet > xResultSet = getResultSet().get(); if ( xResultSet.is() ) { // Callbacks follow! @@ -353,7 +353,7 @@ m_pImpl->m_bCountFinal = sal_True; - rtl::Reference< ::ucb::ResultSet > xResultSet = getResultSet().getBodyPtr(); + rtl::Reference< ::ucb::ResultSet > xResultSet = getResultSet().get(); if ( xResultSet.is() ) { // Callbacks follow! Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlTable.cxx?r1=1.6&r2=1.6.98.1 Delta lines: +12 -11 --------------------- --- xmlTable.cxx 2006-09-17 06:48:23+0000 1.6 +++ xmlTable.cxx 2007-05-11 07:45:36+0000 1.6.98.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlTable.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.98.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 06:48:23 $ + * last change: $Author: kso $ $Date: 2007/05/11 07:45:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,6 +81,7 @@ namespace dbaxml { using namespace ::rtl; + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::xml::sax; @@ -89,8 +90,8 @@ OXMLTable::OXMLTable( ODBFilter& _rImport ,sal_uInt16 nPrfx ,const OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer + ,const uno::Reference< XAttributeList > & _xAttrList + ,const uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ,const ::rtl::OUString& _sServiceName ) :SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -158,7 +159,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const Reference< XAttributeList > & xAttrList ) + const uno::Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap(); @@ -183,8 +184,8 @@ case XML_TOK_COLUMNS: { GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - Reference< XColumnsSupplier > xColumnsSup(m_xTable,UNO_QUERY); - Reference< XNameAccess > xColumns; + uno::Reference< XColumnsSupplier > xColumnsSup(m_xTable,UNO_QUERY); + uno::Reference< XNameAccess > xColumns; if ( xColumnsSup.is() ) { xColumns = xColumnsSup->getColumns(); @@ -205,7 +206,7 @@ return static_cast<ODBFilter&>(GetImport()); } // ----------------------------------------------------------------------------- -void OXMLTable::setProperties(Reference< XPropertySet > & _xProp ) +void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp ) { try { @@ -227,7 +228,7 @@ // ----------------------------------------------------------------------------- void OXMLTable::EndElement() { - Reference<XNameContainer> xNameContainer(m_xParentContainer,UNO_QUERY); + uno::Reference<XNameContainer> xNameContainer(m_xParentContainer,UNO_QUERY); if ( xNameContainer.is() ) { try @@ -262,7 +263,7 @@ // ----------------------------------------------------------------------------- void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/ ,const ::rtl::OUString& /*_sLocalName*/ - ,const Reference< XAttributeList > & _xAttrList + ,const uno::Reference< XAttributeList > & _xAttrList , ::rtl::OUString& _rsCommand ,::rtl::OUString& _rsTableName ,::rtl::OUString& _rsTableSchema File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.14&r2=1.14.98.1 Delta lines: +23 -23 --------------------- --- xmlfilter.cxx 2006-09-17 06:49:04+0000 1.14 +++ xmlfilter.cxx 2007-05-11 07:45:36+0000 1.14.98.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.98.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 06:49:04 $ + * last change: $Author: kso $ $Date: 2007/05/11 07:45:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,10 +145,10 @@ using namespace ::com::sun::star::util; /// read a component (file + filter version) sal_Int32 ReadThroughComponent( - const Reference<XInputStream>& xInputStream, - const Reference<XComponent>& xModelComponent, - const Reference<XMultiServiceFactory> & rFactory, - const Reference< XDocumentHandler >& _xFilter ) + const uno::Reference<XInputStream>& xInputStream, + const uno::Reference<XComponent>& xModelComponent, + const uno::Reference<XMultiServiceFactory> & rFactory, + const uno::Reference< XDocumentHandler >& _xFilter ) { DBG_ASSERT(xInputStream.is(), "input stream missing"); DBG_ASSERT(xModelComponent.is(), "document missing"); @@ -161,7 +161,7 @@ aParserInput.aInputStream = xInputStream; // get parser - Reference< XParser > xParser( + uno::Reference< XParser > xParser( rFactory->createInstance( OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), UNO_QUERY ); @@ -179,7 +179,7 @@ xParser->setDocumentHandler( _xFilter ); // connect model and filter - Reference < XImporter > xImporter( _xFilter, UNO_QUERY ); + uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY ); xImporter->setTargetDocument( xModelComponent ); @@ -236,11 +236,11 @@ /// read a component (storage version) sal_Int32 ReadThroughComponent( uno::Reference< embed::XStorage > xStorage, - const Reference<XComponent>& xModelComponent, + const uno::Reference<XComponent>& xModelComponent, const sal_Char* pStreamName, const sal_Char* pCompatibilityStreamName, - const Reference<XMultiServiceFactory> & rFactory, - const Reference< XDocumentHandler >& _xFilter) + const uno::Reference<XMultiServiceFactory> & rFactory, + const uno::Reference< XDocumentHandler >& _xFilter) { DBG_ASSERT( xStorage.is(), "Need storage!"); DBG_ASSERT(NULL != pStreamName, "Please, please, give me a name!"); @@ -285,7 +285,7 @@ return 1; // TODO/LATER: error handling } - Reference< XInputStream > xInputStream = xDocStream->getInputStream(); + uno::Reference< XInputStream > xInputStream = xDocStream->getInputStream(); // read from the stream return ReadThroughComponent( xInputStream ,xModelComponent @@ -302,7 +302,7 @@ // ------------- DBG_NAME(ODBFilter) -ODBFilter::ODBFilter( const Reference< XMultiServiceFactory >& _rxMSF ) +ODBFilter::ODBFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF ) :SvXMLImport(_rxMSF) { DBG_CTOR(ODBFilter,NULL); @@ -331,7 +331,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; + uno::Reference< ::com::sun::star::awt::XWindow > xWindow; { ::vos::OGuard aGuard(Application::GetSolarMutex()); Window* pFocusWindow = Application::GetFocusWindow(); @@ -373,7 +373,7 @@ sal_Bool bRet = (sFileName.getLength() != 0); if ( bRet ) { - Reference<XComponent> xCom(GetModel(),UNO_QUERY); + uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); SfxMediumRef pMedium = new SfxMedium( sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 ); @@ -393,14 +393,14 @@ OSL_ENSURE(xStorage.is(),"No Storage for read!"); if ( xStorage.is() ) { - Reference<sdb::XOfficeDatabaseDocument> xOfficeDoc(GetModel(),UNO_QUERY_THROW); + uno::Reference<sdb::XOfficeDatabaseDocument> xOfficeDoc(GetModel(),UNO_QUERY_THROW); m_xDataSource.set(xOfficeDoc->getDataSource(),UNO_QUERY_THROW); OSL_ENSURE(m_xDataSource.is(),"DataSource is NULL!"); - Reference< XNumberFormatsSupplier > xNum(m_xDataSource->getPropertyValue(PROPERTY_NUMBERFORMATSSUPPLIER),UNO_QUERY); + uno::Reference< XNumberFormatsSupplier > xNum(m_xDataSource->getPropertyValue(PROPERTY_NUMBERFORMATSSUPPLIER),UNO_QUERY); SetNumberFormatsSupplier(xNum); - Reference<XComponent> xModel(GetModel(),UNO_QUERY); + uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY); sal_Int32 nRet = ReadThroughComponent( xStorage ,xModel ,"settings.xml" @@ -422,7 +422,7 @@ if ( bRet ) { - Reference< XModifiable > xModi(GetModel(),UNO_QUERY); + uno::Reference< XModifiable > xModi(GetModel(),UNO_QUERY); if ( xModi.is() ) xModi->setModified(sal_False); } @@ -454,7 +454,7 @@ // ----------------------------------------------------------------------------- SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, - const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) + const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { SvXMLImportContext *pContext = 0; @@ -512,7 +512,7 @@ { Sequence<PropertyValue> aWindows; pIter->Value >>= aWindows; - Reference<XPropertySet> xProp(getDataSource()); + uno::Reference<XPropertySet> xProp(getDataSource()); if ( xProp.is() ) xProp->setPropertyValue(PROPERTY_LAYOUTINFORMATION,makeAny(aWindows)); } @@ -732,7 +732,7 @@ } // ----------------------------------------------------------------------------- SvXMLImportContext* ODBFilter::CreateStylesContext(const ::rtl::OUString& rLocalName, - const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) + const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) { SvXMLImportContext *pContext = NULL; if (!pContext) Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.29&r2=1.29.16.1 Delta lines: +5 -4 ------------------- --- makefile.mk 2007-03-26 14:07:20+0000 1.29 +++ makefile.mk 2007-05-11 07:45:36+0000 1.29.16.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.29.16.1 $ # -# last change: $Author: vg $ $Date: 2007/03/26 14:07:20 $ +# last change: $Author: kso $ $Date: 2007/05/11 07:45:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -73,7 +73,8 @@ $(SVLLIB) \ $(CPPULIB) \ $(VOSLIB) \ - $(SALLIB) + $(SALLIB) \ + $(SALHELPERLIB) SHL1LIBS=$(LIB1TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
