Tag: cws_src680_bgdlremove
User: kso     
Date: 2007-05-18 09:03:16+0000
Modified:
   dba/dbaccess/source/core/dataaccess/ContentHelper.cxx
   dba/dbaccess/source/core/dataaccess/databasecontext.cxx
   dba/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
   dba/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
   dba/dbaccess/source/core/dataaccess/myucp_resultset.cxx
   dba/dbaccess/source/core/dataaccess/myucp_resultset.hxx
   dba/dbaccess/source/filter/xml/dbloader2.cxx
   dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx
   dba/dbaccess/source/ui/dlg/ConnectionHelper.hxx
   dba/dbaccess/source/ui/dlg/dbfindex.cxx
   dba/dbaccess/source/ui/misc/UITools.cxx

Log:
 #i77419# - cleanup of ucbhelper namespaces.

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: ContentHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ContentHelper.cxx?r1=1.8&r2=1.8.98.1
Delta lines:  +5 -5
-------------------
--- ContentHelper.cxx   2006-09-17 06:37:36+0000        1.8
+++ ContentHelper.cxx   2007-05-18 09:03:13+0000        1.8.98.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ContentHelper.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.8.98.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:37:36 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -159,7 +159,7 @@
        }
 
        sContentId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:")) + 
sContentId;
-       return new ::ucb::ContentIdentifier(m_xORB,sContentId);
+       return new ::ucbhelper::ContentIdentifier(m_xORB,sContentId);
        //      return Reference< XContentIdentifier >();
 }
 // 
-----------------------------------------------------------------------------
@@ -481,7 +481,7 @@
 {
        // Note: Empty sequence means "get values of all supported properties".
 
-    rtl::Reference< ::ucb::PropertyValueSet > xRow = new 
::ucb::PropertyValueSet( m_xORB );
+    rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new 
::ucbhelper::PropertyValueSet( m_xORB );
 
        sal_Int32 nCount = rProperties.getLength();
        if ( nCount )

File [changed]: databasecontext.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasecontext.cxx?r1=1.35&r2=1.35.98.1
Delta lines:  +4 -4
-------------------
--- databasecontext.cxx 2006-09-17 06:39:14+0000        1.35
+++ databasecontext.cxx 2007-05-18 09:03:13+0000        1.35.98.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: databasecontext.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.35.98.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:39:14 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -355,7 +355,7 @@
 
        try
        {
-               ::ucb::Content aContent(_sURL,Reference< 
::com::sun::star::ucb::XCommandEnvironment >());
+               ::ucbhelper::Content aContent(_sURL,Reference< 
::com::sun::star::ucb::XCommandEnvironment >());
                if ( !aContent.isDocument() )
                        throw InteractiveIOException(
                 _sURL, *this, InteractionClassification_ERROR, 
IOErrorCode_NO_FILE

File [changed]: myucp_datasupplier.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx?r1=1.6.98.1&r2=1.6.98.2
Delta lines:  +17 -17
---------------------
--- myucp_datasupplier.cxx      2007-05-11 07:45:35+0000        1.6.98.1
+++ myucp_datasupplier.cxx      2007-05-18 09:03:13+0000        1.6.98.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: myucp_datasupplier.cxx,v $
  *
- *  $Revision: 1.6.98.1 $
+ *  $Revision: 1.6.98.2 $
  *
- *  last change: $Author: kso $ $Date: 2007/05/11 07:45:35 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -172,7 +172,7 @@
 
 //=========================================================================
 // virtual
-rtl::OUString DataSupplier::queryContentIdentifierString( sal_Int32 nIndex )
+rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
 {
        osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -205,7 +205,7 @@
 //=========================================================================
 // virtual
 Reference< XContentIdentifier > 
-DataSupplier::queryContentIdentifier( sal_Int32 nIndex )
+DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
 {
        osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -222,7 +222,7 @@
        rtl::OUString aId = queryContentIdentifierString( nIndex );
        if ( aId.getLength() )
        {
-               Reference< XContentIdentifier > xId = new 
::ucb::ContentIdentifier( aId );
+               Reference< XContentIdentifier > xId = new 
::ucbhelper::ContentIdentifier( aId );
                m_pImpl->m_aResults[ nIndex ]->xId = xId;
                return xId;
        }
@@ -232,7 +232,7 @@
 //=========================================================================
 // virtual
 Reference< XContent > 
-DataSupplier::queryContent( sal_Int32 _nIndex )
+DataSupplier::queryContent( sal_uInt32 _nIndex )
 {
        osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -271,7 +271,7 @@
 
 //=========================================================================
 // virtual
-sal_Bool DataSupplier::getResult( sal_Int32 nIndex )
+sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
 {
        osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -288,13 +288,13 @@
 
        // Try to obtain result...
 
-       sal_Int32 nOldCount = m_pImpl->m_aResults.size();
+       sal_uInt32 nOldCount = m_pImpl->m_aResults.size();
        sal_Bool bFound = sal_False;
-       sal_Int32 nPos = nOldCount;
+       sal_uInt32 nPos = nOldCount;
 
        // @@@ Obtain data and put it into result list...
        Sequence< ::rtl::OUString> aSeq = 
m_pImpl->m_xContent->getElementNames();
-       if ( nIndex < aSeq.getLength() )
+       if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) )
        {
                const ::rtl::OUString* pIter = aSeq.getConstArray();
                const ::rtl::OUString* pEnd       = pIter + aSeq.getLength();
@@ -315,7 +315,7 @@
        if ( !bFound )
                m_pImpl->m_bCountFinal = sal_True;
 
-       rtl::Reference< ::ucb::ResultSet > xResultSet = getResultSet().get();
+       rtl::Reference< ::ucbhelper::ResultSet > xResultSet = 
getResultSet().get();
        if ( xResultSet.is() )
        {
                // Callbacks follow!
@@ -334,14 +334,14 @@
 
 //=========================================================================
 // virtual
-sal_Int32 DataSupplier::totalCount()
+sal_uInt32 DataSupplier::totalCount()
 {
        osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
        if ( m_pImpl->m_bCountFinal )
                return m_pImpl->m_aResults.size();
 
-       sal_Int32 nOldCount = m_pImpl->m_aResults.size();
+       sal_uInt32 nOldCount = m_pImpl->m_aResults.size();
 
        // @@@ Obtain data and put it into result list...
        Sequence< ::rtl::OUString> aSeq = 
m_pImpl->m_xContent->getElementNames();
@@ -353,7 +353,7 @@
 
        m_pImpl->m_bCountFinal = sal_True;
 
-       rtl::Reference< ::ucb::ResultSet > xResultSet = getResultSet().get();
+       rtl::Reference< ::ucbhelper::ResultSet > xResultSet = 
getResultSet().get();
        if ( xResultSet.is() )
        {
                // Callbacks follow!
@@ -371,7 +371,7 @@
 
 //=========================================================================
 // virtual
-sal_Int32 DataSupplier::currentCount()
+sal_uInt32 DataSupplier::currentCount()
 {
        return m_pImpl->m_aResults.size();
 }
@@ -386,7 +386,7 @@
 //=========================================================================
 // virtual
 Reference< XRow > 
-DataSupplier::queryPropertyValues( sal_Int32 nIndex  )
+DataSupplier::queryPropertyValues( sal_uInt32 nIndex  )
 {
        osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -415,7 +415,7 @@
 
 //=========================================================================
 // virtual
-void DataSupplier::releasePropertyValues( sal_Int32 nIndex )
+void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
 {
        osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 

File [changed]: myucp_datasupplier.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx?r1=1.4&r2=1.4.150.1
Delta lines:  +12 -12
---------------------
--- myucp_datasupplier.hxx      2006-06-20 02:45:59+0000        1.4
+++ myucp_datasupplier.hxx      2007-05-18 09:03:13+0000        1.4.150.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: myucp_datasupplier.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.4.150.1 $
  *
- *  last change: $Author: hr $ $Date: 2006/06/20 02:45:59 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@
 struct DataSupplier_Impl;
 class OContentHelper;
 
-class DataSupplier : public ucb::ResultSetDataSupplier
+class DataSupplier : public ucbhelper::ResultSetDataSupplier
 {
        ::std::auto_ptr<DataSupplier_Impl> m_pImpl;
 
@@ -63,22 +63,22 @@
                                  sal_Int32 nOpenMode );
        virtual ~DataSupplier();
 
-       virtual rtl::OUString queryContentIdentifierString( sal_Int32 nIndex );
+       virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex );
        virtual com::sun::star::uno::Reference<
                                com::sun::star::ucb::XContentIdentifier >
-       queryContentIdentifier( sal_Int32 nIndex );
+       queryContentIdentifier( sal_uInt32 nIndex );
        virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
-       queryContent( sal_Int32 nIndex );
+       queryContent( sal_uInt32 nIndex );
 
-       virtual sal_Bool getResult( sal_Int32 nIndex );
+       virtual sal_Bool getResult( sal_uInt32 nIndex );
 
-       virtual sal_Int32 totalCount();
-       virtual sal_Int32 currentCount();
+       virtual sal_uInt32 totalCount();
+       virtual sal_uInt32 currentCount();
        virtual sal_Bool isCountFinal();
 
        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
-       queryPropertyValues( sal_Int32 nIndex  );
-       virtual void releasePropertyValues( sal_Int32 nIndex );
+       queryPropertyValues( sal_uInt32 nIndex  );
+       virtual void releasePropertyValues( sal_uInt32 nIndex );
 
        virtual void close();
 

File [changed]: myucp_resultset.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/myucp_resultset.cxx?r1=1.5&r2=1.5.98.1
Delta lines:  +15 -15
---------------------
--- myucp_resultset.cxx 2006-09-17 06:41:05+0000        1.5
+++ myucp_resultset.cxx 2007-05-18 09:03:13+0000        1.5.98.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: myucp_resultset.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.5.98.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:41:05 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -91,7 +91,7 @@
 void DynamicResultSet::initStatic()
 {
        m_xResultSet1
-               = new ::ucb::ResultSet( m_xSMgr,
+               = new ::ucbhelper::ResultSet( m_xSMgr,
                                                                
m_aCommand.Properties,
                                                                new 
DataSupplier(       m_xSMgr,
                                                                                
                        m_xContent,
@@ -103,7 +103,7 @@
 void DynamicResultSet::initDynamic()
 {
        m_xResultSet1
-               = new ::ucb::ResultSet( m_xSMgr,
+               = new ::ucbhelper::ResultSet( m_xSMgr,
                                                                
m_aCommand.Properties,
                                                                new 
DataSupplier(       m_xSMgr,
                                                                                
                        m_xContent,

File [changed]: myucp_resultset.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/myucp_resultset.hxx?r1=1.3&r2=1.3.278.1
Delta lines:  +4 -4
-------------------
--- myucp_resultset.hxx 2005-09-08 13:32:08+0000        1.3
+++ myucp_resultset.hxx 2007-05-18 09:03:13+0000        1.3.278.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: myucp_resultset.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.3.278.1 $
  *
- *  last change: $Author: rt $ $Date: 2005/09/08 13:32:08 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,7 @@
 // @@@ Adjust namespace name.
 namespace dbaccess {
 
-class DynamicResultSet : public ::ucb::ResultSetImplHelper
+class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
 {
        rtl::Reference< ODocumentContainer > m_xContent;
        com::sun::star::uno::Reference<

Directory: /dba/dbaccess/source/filter/xml/
===========================================

File [changed]: dbloader2.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.25&r2=1.25.84.1
Delta lines:  +4 -4
-------------------
--- dbloader2.cxx       2006-10-12 13:33:34+0000        1.25
+++ dbloader2.cxx       2007-05-18 09:03:13+0000        1.25.84.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbloader2.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.25.84.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/10/12 13:33:34 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -177,7 +177,7 @@
 #include <vcl/msgbox.hxx>
 #endif
 
-using namespace ::ucb;
+using namespace ::ucbhelper;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: ConnectionHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.12&r2=1.12.4.1
Delta lines:  +12 -12
---------------------
--- ConnectionHelper.cxx        2007-04-26 07:55:47+0000        1.12
+++ ConnectionHelper.cxx        2007-05-18 09:03:13+0000        1.12.4.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ConnectionHelper.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.12.4.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/04/26 07:55:47 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -695,17 +695,17 @@
 
 
        
//-------------------------------------------------------------------------
-       StringBag OConnectionHelper::getInstalledAdabasDBDirs(const String& 
_rPath,const ::ucb::ResultSetInclude& _reResultSetInclude)
+       StringBag OConnectionHelper::getInstalledAdabasDBDirs(const String& 
_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude)
        {
                INetURLObject aNormalizer;
                aNormalizer.SetSmartProtocol(INET_PROT_FILE);
                aNormalizer.SetSmartURL(_rPath);
                String sAdabasConfigDir = 
aNormalizer.GetMainURL(INetURLObject::NO_DECODE);
 
-               ::ucb::Content aAdabasConfigDir;
+               ::ucbhelper::Content aAdabasConfigDir;
                try
                {
-                       aAdabasConfigDir = ::ucb::Content(sAdabasConfigDir, 
Reference< ::com::sun::star::ucb::XCommandEnvironment >());
+                       aAdabasConfigDir = 
::ucbhelper::Content(sAdabasConfigDir, Reference< 
::com::sun::star::ucb::XCommandEnvironment >());
                }
                catch(::com::sun::star::ucb::ContentCreationException&)
                {
@@ -766,8 +766,8 @@
                StringBag aInstalledDBs;
                // collect the names of the installed databases
                StringBag aConfigDBs,aWrkDBs;
-               aConfigDBs      = 
getInstalledAdabasDBDirs(sAdabasConfigDir,::ucb::INCLUDE_DOCUMENTS_ONLY);
-               aWrkDBs         = 
getInstalledAdabasDBDirs(sAdabasWorkDir,::ucb::INCLUDE_FOLDERS_ONLY);
+               aConfigDBs      = 
getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY);
+               aWrkDBs         = 
getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY);
                ConstStringBagIterator aOuter = aConfigDBs.begin();
                for(;aOuter != aConfigDBs.end();++aOuter)
                {
@@ -786,7 +786,7 @@
        // #106016# 
-------------------------------------------------------------------
        IS_PATH_EXIST OConnectionHelper::pathExists(const ::rtl::OUString& 
_rURL, sal_Bool bIsFile) const
        {
-               ::ucb::Content aCheckExistence;
+               ::ucbhelper::Content aCheckExistence;
                sal_Bool bExists = sal_False;
                IS_PATH_EXIST eExists = PATH_NOT_EXIST;
                Reference< ::com::sun::star::task::XInteractionHandler > 
xInteractionHandler = Reference< ::com::sun::star::task::XInteractionHandler >(
@@ -794,10 +794,10 @@
                OFilePickerInteractionHandler* pHandler = new 
OFilePickerInteractionHandler(xInteractionHandler);
                xInteractionHandler = pHandler;
 
-               Reference< XCommandEnvironment > xCmdEnv = new 
::ucb::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() 
);
+               Reference< XCommandEnvironment > xCmdEnv = new 
::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< 
XProgressHandler >() );
                try
                {
-                       aCheckExistence = ::ucb::Content(_rURL, xCmdEnv );
+                       aCheckExistence = ::ucbhelper::Content(_rURL, xCmdEnv );
                        bExists = bIsFile? aCheckExistence.isDocument(): 
aCheckExistence.isFolder();
                        eExists = bExists? PATH_EXIST: PATH_NOT_EXIST;
                }
@@ -867,7 +867,7 @@
                {
                        // the parent content
                        Reference< XCommandEnvironment > xEmptyEnv;
-                       ::ucb::Content 
aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv);
+                       ::ucbhelper::Content 
aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv);
 
                        ::rtl::OUString sContentType;
                        if ( INET_PROT_FILE == eProtocol )

File [changed]: ConnectionHelper.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.hxx?r1=1.4&r2=1.4.278.1
Delta lines:  +4 -4
-------------------
--- ConnectionHelper.hxx        2005-09-08 14:44:18+0000        1.4
+++ ConnectionHelper.hxx        2007-05-18 09:03:13+0000        1.4.278.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ConnectionHelper.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.4.278.1 $
  *
- *  last change: $Author: rt $ $Date: 2005/09/08 14:44:18 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -138,7 +138,7 @@
                void            setURL( const String& _rURL );
                String          implGetURL( sal_Bool _bPrefix ) const;
                void            implSetURL( const String& _rURL, sal_Bool 
_bPrefix );
-               StringBag getInstalledAdabasDBDirs(const String &_rPath,const 
::ucb::ResultSetInclude& _reResultSetInclude);
+               StringBag getInstalledAdabasDBDirs(const String &_rPath,const 
::ucbhelper::ResultSetInclude& _reResultSetInclude);
                StringBag getInstalledAdabasDBs(const String &_rConfigDir,const 
String &_rWorkDir);
                virtual bool checkTestConnection();
     private:

File [changed]: dbfindex.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbfindex.cxx?r1=1.23&r2=1.23.6.1
Delta lines:  +6 -6
-------------------
--- dbfindex.cxx        2007-04-26 07:58:18+0000        1.23
+++ dbfindex.cxx        2007-05-18 09:03:13+0000        1.23.6.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbfindex.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.23.6.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/04/26 07:58:18 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -369,11 +369,11 @@
 
        //      String aFileName = aURL.PathToFileName();
        m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE);
-       ::ucb::Content aFile;
+       ::ucbhelper::Content aFile;
        sal_Bool bFolder=sal_True;
        try
        {
-               aFile = ::ucb::Content(m_aDSN,Reference< 
::com::sun::star::ucb::XCommandEnvironment >());
+               aFile = ::ucbhelper::Content(m_aDSN,Reference< 
::com::sun::star::ucb::XCommandEnvironment >());
                bFolder = aFile.isFolder();
        }
        catch(Exception&)
@@ -572,7 +572,7 @@
        {
         try
         {
-                   ::ucb::Content 
aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>());
+                   ::ucbhelper::Content 
aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>());
                    aContent.executeCommand( rtl::OUString::createFromAscii( 
"delete" ),makeAny( sal_Bool( sal_True ) ) );
         }
         catch (const Exception& e )

Directory: /dba/dbaccess/source/ui/misc/
========================================

File [changed]: UITools.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.68&r2=1.68.52.1
Delta lines:  +4 -4
-------------------
--- UITools.cxx 2006-12-13 16:53:01+0000        1.68
+++ UITools.cxx 2007-05-18 09:03:14+0000        1.68.52.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: UITools.cxx,v $
  *
- *  $Revision: 1.68 $
+ *  $Revision: 1.68.52.1 $
  *
- *  last change: $Author: kz $ $Date: 2006/12/13 16:53:01 $
+ *  last change: $Author: kso $ $Date: 2007/05/18 09:03:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1479,7 +1479,7 @@
 
                try
                {
-                       ::ucb::Content aCnt( INetURLObject( _rURL ).GetMainURL( 
INetURLObject::NO_DECODE ),
+                       ::ucbhelper::Content aCnt( INetURLObject( _rURL 
).GetMainURL( INetURLObject::NO_DECODE ),
                                                                 Reference< 
::com::sun::star::ucb::XCommandEnvironment > () );
                        if ( ( aCnt.getPropertyValue( 
::rtl::OUString::createFromAscii( "AnchorName" ) ) >>= sAnchor ) )
                        {




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to