diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 14:00:17 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 14:00:17 +0000 |
| commit | 5a605b0f34f6976eb08aadb48539fe5016c02049 (patch) | |
| tree | 62e2cfa1d0055b68b81b1e4c7afb987b6a3d1ceb /ucbhelper/workben/myucp/myucp_resultset.cxx | |
| parent | 0dd2b8b0a1e73d0483ec0a062f770ac454c01364 (diff) | |
INTEGRATION: CWS bgdlremove (1.5.28); FILE MERGED
2007/05/30 10:50:31 kso 1.5.28.2: #i37864# - Cleanup.
2007/05/18 11:38:07 kso 1.5.28.1: #i77419# - cleanup of ucbhelper namespaces.
Diffstat (limited to 'ucbhelper/workben/myucp/myucp_resultset.cxx')
| -rw-r--r-- | ucbhelper/workben/myucp/myucp_resultset.cxx | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/ucbhelper/workben/myucp/myucp_resultset.cxx b/ucbhelper/workben/myucp/myucp_resultset.cxx index f76b4a60999b..76512f71501e 100644 --- a/ucbhelper/workben/myucp/myucp_resultset.cxx +++ b/ucbhelper/workben/myucp/myucp_resultset.cxx @@ -4,9 +4,9 @@ * * $RCSfile: myucp_resultset.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:26:17 $ + * last change: $Author: ihi $ $Date: 2007-06-05 15:00:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,21 +45,13 @@ *************************************************************************/ -// @@@ Adjust multi-include-protection-ifdef and header file name. -#ifndef _MYUCP_DATASUPPLIER_HXX #include "myucp_datasupplier.hxx" -#endif -// @@@ Adjust multi-include-protection-ifdef and header file name. -#ifndef _MYUCP_RESULTSET_HXX #include "myucp_resultset.hxx" -#endif - -using namespace com::sun; using namespace com::sun::star; // @@@ Adjust namespace name. -using namespace myucp; +namespace myucp { //========================================================================= //========================================================================= @@ -70,10 +62,10 @@ using namespace myucp; //========================================================================= 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 uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< Content >& rxContent, + const ucb::OpenCommandArgument2& rCommand, + const uno::Reference< ucb::XCommandEnvironment >& rxEnv ) : ResultSetImplHelper( rxSMgr, rCommand ), m_xContent( rxContent ), m_xEnv( rxEnv ) @@ -89,24 +81,25 @@ 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; } +} |