diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:17:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:17:54 +0000 |
| commit | 5297f3ada229c334e1a9fcf6d998c15e2df71f39 (patch) | |
| tree | a4c381c4956d526dc6c578b0932cb26776c87ffa /ucb/source/ucp/package | |
| parent | aa4b7fc1cb77872b77d657e30989191e6d039f88 (diff) | |
INTEGRATION: CWS bgdlremove (1.4.40); FILE MERGED
2007/05/18 11:37:18 kso 1.4.40.1: #i77419# - cleanup of ucbhelper namespaces.
Diffstat (limited to 'ucb/source/ucp/package')
| -rw-r--r-- | ucb/source/ucp/package/pkgresultset.cxx | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx index 9cc4e867456d..b14ebcd7ddda 100644 --- a/ucb/source/ucp/package/pkgresultset.cxx +++ b/ucb/source/ucp/package/pkgresultset.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pkgresultset.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-17 14:00:17 $ + * last change: $Author: ihi $ $Date: 2007-06-05 18:14:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,6 @@ #include "pkgresultset.hxx" #endif -using namespace com::sun; using namespace com::sun::star; using namespace package_ucp; @@ -68,8 +67,8 @@ using namespace package_ucp; DynamicResultSet::DynamicResultSet( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const rtl::Reference< Content >& rxContent, - const star::ucb::OpenCommandArgument2& rCommand, - const uno::Reference< star::ucb::XCommandEnvironment >& rxEnv ) + const ucb::OpenCommandArgument2& rCommand, + const uno::Reference< ucb::XCommandEnvironment >& rxEnv ) : ResultSetImplHelper( rxSMgr, rCommand ), m_xContent( rxContent ), m_xEnv( rxEnv ) @@ -85,24 +84,24 @@ DynamicResultSet::DynamicResultSet( void DynamicResultSet::initStatic() { m_xResultSet1 - = new ::ucb::ResultSet( m_xSMgr, - m_aCommand.Properties, - new DataSupplier( m_xSMgr, - m_xContent, - m_aCommand.Mode ), - m_xEnv ); + = new ::ucbhelper::ResultSet( m_xSMgr, + m_aCommand.Properties, + new DataSupplier( m_xSMgr, + m_xContent, + m_aCommand.Mode ), + m_xEnv ); } //========================================================================= void DynamicResultSet::initDynamic() { m_xResultSet1 - = new ::ucb::ResultSet( m_xSMgr, - m_aCommand.Properties, - new DataSupplier( m_xSMgr, - m_xContent, - m_aCommand.Mode ), - m_xEnv ); + = new ::ucbhelper::ResultSet( m_xSMgr, + m_aCommand.Properties, + new DataSupplier( m_xSMgr, + m_xContent, + m_aCommand.Mode ), + m_xEnv ); m_xResultSet2 = m_xResultSet1; } |