dba33d: merge

4 files changed, 2 insertions, 145 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index fbe8eee4c500..d6bd3c2efd8b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -77,6 +77,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
+#include <connectivity/BlobHelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/typeprovider.hxx>
@@ -84,39 +85,6 @@
 #include <svtools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-<<<<<<< local
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
-#include <connectivity/dbexception.hxx>
-#endif
-#include <connectivity/BlobHelper.hxx>
-#ifndef _DBA_CORE_TABLECONTAINER_HXX_
-#include "tablecontainer.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDB_PARAMETERSREQUEST_HPP_
-#include <com/sun/star/sdb/ParametersRequest.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_PARAMETERSREQUEST_HPP_
-#include <com/sun/star/sdb/ParametersRequest.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XPARAMETERSSUPPLIER_HPP_
-#include <com/sun/star/sdb/XParametersSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
-#include <com/sun/star/container/XChild.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#endif
-#ifndef _COMPHELPER_INTERACTION_HXX_
-#include <comphelper/interaction.hxx>
-#endif
-#ifndef _COMPHELPER_PROPERTY_HXX_
-#include <comphelper/property.hxx>
-#endif
-#ifndef _UTL_CONFIGMGR_HXX_
-=======
->>>>>>> other
 #include <unotools/configmgr.hxx>
 
 using namespace utl;
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 4cdb81d2eafa..b1c1d63fd6b6 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -546,18 +546,6 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
     ClearableMutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
 
-    ::rtl::OUString sURL;
-    if ( !getURLForRegisteredObject( _rName, sURL ) )
-        throw NoSuchElementException( _rName, *this );
-
-    if ( m_aDatabaseObjects.find( _rName ) != m_aDatabaseObjects.end() )
-    {
-        OSL_ENSURE( false, "ODatabaseContext::revokeObject: a database document register by name? This shouldn't happen anymore!" );
-            // all the code should have been changed so that registration is by URL only
-        m_aDatasourceProperties[ sURL ] = m_aDatasourceProperties[ _rName ];
-    }
-
-<<<<<<< local
     ::rtl::OUString sURL = getDatabaseLocation( _rName );
 
     revokeDatabaseLocation( _rName );
@@ -572,13 +560,6 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
     ObjectCacheIterator aExistent = m_aDatabaseObjects.find(sURL);
     if ( aExistent != m_aDatabaseObjects.end() )
         m_aDatabaseObjects.erase(aExistent);
-=======
-    OConfigurationTreeRoot aDbRegisteredNamesRoot = OConfigurationTreeRoot::createWithServiceFactory(
-            ::comphelper::getProcessServiceFactory(), getDbRegisteredNamesNodeName(), -1, OConfigurationTreeRoot::CM_UPDATABLE );
-    if ( !aDbRegisteredNamesRoot.removeNode( _rName ) )
-        throw Exception( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An unexpected und unknown error occured." ) ), *this );
-    aDbRegisteredNamesRoot.commit();
->>>>>>> other
 
     // notify our container listeners
     ContainerEvent aEvent( *this, makeAny( _rName ), Any(), Any() );
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index cdcdfbd87107..b0c4536782fe 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -88,7 +88,6 @@
 #define RID_STR_NAME_NOT_FOUND                  ( RID_CORE_STRINGS_START + 45 )
 #define RID_STR_QUERY_DOES_NOT_EXIST            ( RID_CORE_STRINGS_START + 46 )
 #define RID_STR_ERROR_WHILE_SAVING              ( RID_CORE_STRINGS_START + 47 )
-<<<<<<< local
 #define RID_STR_NO_SUB_FOLDER                   ( RID_CORE_STRINGS_START + 48 )
 
 #define RID_STR_NO_DELETE_BEFORE_AFTER          ( RID_CORE_STRINGS_START + 49 )
@@ -111,9 +110,7 @@
 #define RID_STR_CONNECTION_REQUEST              ( RID_CORE_STRINGS_START + 65 )
 #define RID_STR_MISSING_EXTENSION               ( RID_CORE_STRINGS_START + 66 )
 
-=======
-#define RID_NO_SUCH_DATA_SOURCE                 ( RID_CORE_STRINGS_START + 48 )
->>>>>>> other
+#define RID_NO_SUCH_DATA_SOURCE                 ( RID_CORE_STRINGS_START + 67 )
 
 #endif // _DBA_CORE_RESOURCE_HRC_
 
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index eacf142872d5..f8f2170da555 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -325,91 +325,6 @@ namespace
 
         return eErrorCode;
     }
-<<<<<<< local
-    //------------------------------------------------------------------------------
-    ::rtl::OUString QuoteField( const OQueryDesignView* _pView,const ::rtl::OUString& rValue, sal_Int32 aType )
-    {
-        ::rtl::OUString rNewValue;
-        switch (rValue.toChar())
-        {
-            case '?':
-                if (rValue.getLength() != 1)
-                    break;
-            case '\'':  // ::rtl::OUString Quotierung oder Datum
-            //case '#': // Datumsquotierung // jetengine
-            case ':':   // Parameter
-            case '[':   // Parameter
-                return rValue;
-        }
-
-        Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
-        Reference< XDatabaseMetaData >  xMetaData;
-        if(xConnection.is())
-            xMetaData = xConnection->getMetaData();
-        ::rtl::OUString aQuote;
-        try
-        {
-            if(xMetaData.is())
-                aQuote = xMetaData->getIdentifierQuoteString();
-
-            switch( aType )
-            {
-                case DataType::DATE:
-                case DataType::TIME:
-                case DataType::TIMESTAMP:
-                    if (rValue.toChar() != '{') // nur quoten, wenn kein Access Datum
-                        rNewValue = ::dbtools::quoteName(aQuote,rValue);
-                    else
-                        rNewValue = rValue;
-                    break;
-                case DataType::CHAR:
-                case DataType::VARCHAR:
-                case DataType::LONGVARCHAR:
-                case DataType::CLOB:
-                    rNewValue = ::dbtools::quoteName(aQuote,rValue);
-                    break;
-                case DataType::DECIMAL:
-                case DataType::NUMERIC:
-                case DataType::TINYINT:
-                case DataType::SMALLINT:
-                case DataType::INTEGER:
-                case DataType::BIGINT:
-                case DataType::REAL:
-                case DataType::DOUBLE:
-                case DataType::BINARY:
-                case DataType::VARBINARY:
-                case DataType::LONGVARBINARY:
-                case DataType::BLOB:
-                    rNewValue = rValue;
-                    break;
-                case DataType::BIT:
-                case DataType::BOOLEAN:
-                    {
-                        if(xMetaData.is())
-                        {
-                            ::comphelper::UStringMixEqual bCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
-                            if (bCase(rValue, String(ModuleRes(STR_QUERY_TRUE))))
-                                rNewValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TRUE"));
-                            else if (bCase(rValue, String(ModuleRes(STR_QUERY_FALSE))))
-                                rNewValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FALSE"));
-                            else
-                                rNewValue = rValue;
-                        }
-                    }
-                    break;
-                default:
-                    DBG_ERROR( "QuoteField: illegal type" );
-                break;
-            }
-        }
-        catch(SQLException&)
-        {
-            DBG_ERROR( "QuoteField: Exception" );
-        }
-        return rNewValue;
-    }
-=======
->>>>>>> other
     // -----------------------------------------------------------------------------
 
     /** FillDragInfo fills the field description out of the table
@@ -1387,11 +1302,7 @@ namespace
             GetInnerJoinCriteria(_pView,pNodeTmp);
             // now simplify again, join are checked in ComparisonPredicate
             ::connectivity::OSQLParseNode::absorptions(pNodeTmp);
-<<<<<<< local
-            pNodeTmp = pNode->getChild(1);
-=======
             pNodeTmp = pNode->getChild(1);
->>>>>>> other
 
             // it could happen that pCondition is not more valid
             eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pNodeTmp, rLevel);