Anonymous avatar Anonymous committed 8706725

#i99305#,#i99132# remove DOS lineends, remove solenv/unxmacxp/inc/poll.h

Comments (0)

Files changed (65)

connectivity/source/commontools/ParamterSubstitution.cxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "precompiled_connectivity.hxx"
-#include "ParameterSubstitution.hxx"
-#include "connectivity/sqlparse.hxx"
-#include <comphelper/sequenceashashmap.hxx>
-
-namespace connectivity
-{
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::sdbc;
-    using namespace ::com::sun::star::lang;
-    using namespace ::com::sun::star;
-
-    ParameterSubstitution::ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
-    {
-    }
-    void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException)
-    {
-        ::osl::MutexGuard aGuard(m_aMutex);
-        comphelper::SequenceAsHashMap aArgs(_aArguments);
-        uno::Reference< sdbc::XConnection > xConnection;
-        xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection);
-        m_xConnection = xConnection;
-    }
-    //------------------------------------------------------------------------------
-	rtl::OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
-	{
-		return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution"));
-	}
-	//------------------------------------------------------------------------------
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
+ * $Revision: 1.24 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include "precompiled_connectivity.hxx"
+#include "ParameterSubstitution.hxx"
+#include "connectivity/sqlparse.hxx"
+#include <comphelper/sequenceashashmap.hxx>
+
+namespace connectivity
+{
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::sdbc;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    ParameterSubstitution::ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
+    {
+    }
+    void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard(m_aMutex);
+        comphelper::SequenceAsHashMap aArgs(_aArguments);
+        uno::Reference< sdbc::XConnection > xConnection;
+        xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection);
+        m_xConnection = xConnection;
+    }
+    //------------------------------------------------------------------------------
+	rtl::OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
+	{
+		return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution"));
+	}
+	//------------------------------------------------------------------------------
 	::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName(  ) throw(RuntimeException)
 	{
 		return getImplementationName_Static();
 	Sequence< ::rtl::OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  ) throw(RuntimeException)
 	{
 		return getSupportedServiceNames_Static();
-	}
-    //------------------------------------------------------------------
-    Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
-	{
-		Sequence< ::rtl::OUString > aSNS( 1 );
-		aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ParameterSubstitution");
-		return aSNS;
-	}
-
-	//------------------------------------------------------------------
-    Reference< XInterface >  ParameterSubstitution::create(const Reference< XComponentContext >& _xContext)
-    {
-        return *(new ParameterSubstitution(_xContext));
-    }
-	//------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::substituteVariables( const ::rtl::OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
-    {
-        ::rtl::OUString sRet = _sText;
-        uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
-        if ( xConnection.is() )
-        {
-            try
-		    {
-                uno::Reference< XMultiServiceFactory> xFac(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW);
-			    OSQLParser aParser( xFac );
-			    ::rtl::OUString sErrorMessage;
-			    ::rtl::OUString sNewSql;
-			    OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText);
-			    if(pNode)
-			    {	// special handling for parameters
-				    OSQLParseNode::substituteParameterNames(pNode);
-				    pNode->parseNodeToStr( sNewSql, xConnection );
-				    delete pNode;
-				    sRet = sNewSql;
-			    }
-		    }
-		    catch(const Exception&)
-		    {
-		    }
-        }
-        return sRet;
-    }
-	//------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const ::rtl::OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)
-    {
-        return _sText;
-    }
-	//------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const ::rtl::OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
-    {
-        throw container::NoSuchElementException();
-    }
-    //------------------------------------------------------------------
-
-
-// ==================================
-} // connectivity
-// ==================================
+	}
+    //------------------------------------------------------------------
+    Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+	{
+		Sequence< ::rtl::OUString > aSNS( 1 );
+		aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ParameterSubstitution");
+		return aSNS;
+	}
+
+	//------------------------------------------------------------------
+    Reference< XInterface >  ParameterSubstitution::create(const Reference< XComponentContext >& _xContext)
+    {
+        return *(new ParameterSubstitution(_xContext));
+    }
+	//------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ParameterSubstitution::substituteVariables( const ::rtl::OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
+    {
+        ::rtl::OUString sRet = _sText;
+        uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
+        if ( xConnection.is() )
+        {
+            try
+		    {
+                uno::Reference< XMultiServiceFactory> xFac(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW);
+			    OSQLParser aParser( xFac );
+			    ::rtl::OUString sErrorMessage;
+			    ::rtl::OUString sNewSql;
+			    OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText);
+			    if(pNode)
+			    {	// special handling for parameters
+				    OSQLParseNode::substituteParameterNames(pNode);
+				    pNode->parseNodeToStr( sNewSql, xConnection );
+				    delete pNode;
+				    sRet = sNewSql;
+			    }
+		    }
+		    catch(const Exception&)
+		    {
+		    }
+        }
+        return sRet;
+    }
+	//------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const ::rtl::OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return _sText;
+    }
+	//------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const ::rtl::OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
+    {
+        throw container::NoSuchElementException();
+    }
+    //------------------------------------------------------------------
+
+
+// ==================================
+} // connectivity
+// ==================================

dbaccess/inc/dbaccess_helpid.hrc

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dbaccess_helpid.hrc,v $
- * $Revision: 1.73 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DBA_DBACCESS_HELPID_HRC_
-#define _DBA_DBACCESS_HELPID_HRC_
-
-#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>	// HID_DBACCESS_START
-#endif
-
-#define HID_DSADMIN_CHARSET							(HID_DBACCESS_START +  9)
-
-#define HID_DLG_FILTERCRIT							(HID_DBACCESS_START + 15)
-#define HID_DLG_ORDERCRIT							(HID_DBACCESS_START + 16)
-
-#define HID_DATABROWSE_HEADER						(HID_DBACCESS_START + 17)
-#define HID_CTL_TABBROWSER							(HID_DBACCESS_START + 18)
-#define UID_DATABROWSE_DATAWINDOW					(HID_DBACCESS_START + 19)
-#define HID_CTL_TREEVIEW							(HID_DBACCESS_START + 20)
-#define UID_CTL_CONTENT								(HID_DBACCESS_START + 21)
-#define HID_TLB_TABBROWSER							(HID_DBACCESS_START + 22)
-#define HID_TLB_TREELISTBOX							(HID_DBACCESS_START + 23)
-#define HID_DSADMIN_DIALOG							(HID_DBACCESS_START + 24)
-
-
-#define HID_DSADMIN_TABCONTROL						(HID_DBACCESS_START + 27)
-#define HID_DSADMIN_PAGE_GENERAL					(HID_DBACCESS_START + 28)
-#define HID_DSADMIN_PAGE_DBASE						(HID_DBACCESS_START + 29)
-#define HID_DSADMIN_PAGE_JDBC						(HID_DBACCESS_START + 30)
-#define HID_DSADMIN_PAGE_ODBC						(HID_DBACCESS_START + 31)
-#define HID_DSADMIN_PAGE_ADABAS						(HID_DBACCESS_START + 32)
-#define HID_DSADMIN_PAGE_TEXT						(HID_DBACCESS_START + 33)
-#define HID_DSADMIN_TABLE_SUBSCRIPTION				(HID_DBACCESS_START + 34)
-#define HID_DSADMIN_DSACTIONS_NEWDS					(HID_DBACCESS_START + 35)
-#define HID_DSADMIN_DSACTIONS_DELETEDS				(HID_DBACCESS_START + 36)
-#define HID_DSADMIN_DSACTIONS_RESTOREDS				(HID_DBACCESS_START + 37)
-#define HID_DSADMIN_DSNAME							(HID_DBACCESS_START + 38)
-#define HID_DSADMIN_DSTYPE							(HID_DBACCESS_START + 39)
-#define HID_DSADMIN_URL_GENERAL						(HID_DBACCESS_START + 40)
-#define HID_DSADMIN_BROWSECONN						(HID_DBACCESS_START + 41)
-#define HID_DSADMIN_LOGINTIMEOUT_NUMBER				(HID_DBACCESS_START + 42)
-#define HID_DSADMIN_LOGINTIMEOUT_UNIT				(HID_DBACCESS_START + 43)
-#define HID_DSADMIN_SHOWDELETED						(HID_DBACCESS_START + 44)
-#define HID_DSADMIN_ALLOWLONG						(HID_DBACCESS_START + 45)
-#define HID_DSADMIN_DBASE_INDICIES					(HID_DBACCESS_START + 46)
-#define HID_DSADMIN_DRIVERCLASS						(HID_DBACCESS_START + 47)
-#define HID_DSADMIN_ODBC_OPTIONS					(HID_DBACCESS_START + 48)
-#define HID_DSADMIN_TEXT_HEADER						(HID_DBACCESS_START + 49)
-#define HID_DSADMIN_FIELD_SEPARATOR					(HID_DBACCESS_START + 50)
-#define HID_DSADMIN_TEXT_SEPARATOR					(HID_DBACCESS_START + 51)
-#define HID_DSADMIN_DECIMAL_SEPARATOR				(HID_DBACCESS_START + 52)
-#define HID_DSADMIN_THOUSANDS_SEPARATOR				(HID_DBACCESS_START + 53)
-#define HID_DSADMIN_EXTENSION						(HID_DBACCESS_START + 54)
-#define HID_DSADMIN_ALL_TABLES						(HID_DBACCESS_START + 55)
-#define HID_DSADMIN_NO_TABLES						(HID_DBACCESS_START + 56)
-#define HID_DSADMIN_SELECT_TABLES					(HID_DBACCESS_START + 57)
-#define HID_DSADMIN_TABLE_SELECTOR					(HID_DBACCESS_START + 58)
-#define HID_DSADMIN_SUPPRESS_VERSIONCL				(HID_DBACCESS_START + 59)
-
-#define	HID_GENERIC_SQL_ERROR						(HID_DBACCESS_START + 60)
-
-#define HID_BROWSER_COLUMNFORMAT					(HID_DBACCESS_START + 61)
-#define HID_BROWSER_COLUMNWIDTH						(HID_DBACCESS_START + 62)
-#define HID_BROWSER_TABLEFORMAT						(HID_DBACCESS_START + 63)
-#define HID_BROWSER_ROWHEIGHT						(HID_DBACCESS_START + 64)
-#define HID_BROWSER_EDIT_DATABASE                   (HID_DBACCESS_START + 65)
-#define HID_BROWSER_CLOSECONN						(HID_DBACCESS_START + 66)
-#define HID_BROWSER_REFRESHCONN						(HID_DBACCESS_START + 67)
-
-#define	HID_DLG_ROWHEIGHT							(HID_DBACCESS_START + 68)
-#define	HID_DLG_COLWIDTH							(HID_DBACCESS_START + 69)
-
-
-#define	HID_TLB_QUERYDESIGN							(HID_DBACCESS_START + 70)
-#define	HID_CTL_QRYSQLEDIT							(HID_DBACCESS_START + 71)
-#define	HID_DSADMIN_SPECIAL_MESSAGE					(HID_DBACCESS_START + 72)
-
-#define	HID_BROWSER_QUERY_CREATE_TEXT				(HID_DBACCESS_START + 73)
-
-#define HID_DLG_ERROR								(HID_DBACCESS_START + 74)
-#define HID_DLG_TEXT								(HID_DBACCESS_START + 75)
-#define UID_SQLERROR_BUTTONMORE						(HID_DBACCESS_START + 76)
-#define HID_DLG_SAVE_AS								(HID_DBACCESS_START + 77)
-
-#define HID_BROWSER_QUERY_EDIT						(HID_DBACCESS_START + 78)
-#define HID_BROWSER_QUERY_DELETE					(HID_DBACCESS_START + 79)
-
-#define	HID_DSADMIN_USER_ADO						(HID_DBACCESS_START + 80)
-#define	HID_DSADMIN_PWDREC_ADO						(HID_DBACCESS_START + 81)
-#define	HID_DSADMIN_CONNURL_ADOPAGE					(HID_DBACCESS_START + 82)
-#define	HID_DSADMIN_PAGE_ADO						(HID_DBACCESS_START + 83)
-
-
-#define	HID_JOINSH_ADDTAB_CLOSE						(HID_DBACCESS_START + 84)
-#define	HID_JOINSH_ADDTAB_TABLELIST					(HID_DBACCESS_START + 85)
-#define	HID_CTL_QRYDGNTAB							(HID_DBACCESS_START + 86)
-#define	HID_DLG_QRY_JOIN							(HID_DBACCESS_START + 87)
-#define	HID_DLG_QRY_JOINTYPE						(HID_DBACCESS_START + 88)
-#define	HID_JOINSH_ADDTAB_QUERYLIST                 (HID_DBACCESS_START + 89)
-#define	HID_DLG_QRY_HELPTEXT						(HID_DBACCESS_START + 92)
-
-#define	HID_CTL_QRYDGNCRIT							(HID_DBACCESS_START + 93)
-#define	HID_QRYDGN_ROW_VISIBLE						(HID_DBACCESS_START + 94)
-#define	HID_QRYDGN_ROW_TABLE						(HID_DBACCESS_START + 95)
-#define	HID_QRYDGN_ROW_FIELD						(HID_DBACCESS_START + 96)
-#define	HID_QRYDGN_ROW_ORDER						(HID_DBACCESS_START + 97)
-#define	HID_QRYDGN_ROW_FUNCTION						(HID_DBACCESS_START + 98)
-#define	HID_QRYDGN_ROW_ALIAS						(HID_DBACCESS_START + 99)
-#define	HID_QRYDGN_ROW_CRIT							(HID_DBACCESS_START + 100)
-
-#define	HID_QUERY_FUNCTION							(HID_DBACCESS_START + 101)
-#define	HID_QUERY_TABLENAME							(HID_DBACCESS_START + 102)
-#define	HID_QUERY_ALIASNAME							(HID_DBACCESS_START + 103)
-#define	HID_QUERY_DISTINCT							(HID_DBACCESS_START + 104)
-
-#define	HID_BROWSER_QUERY_CREATE_DESIGN				(HID_DBACCESS_START + 105)
-
-#define	HID_DSADMIN_QUERIES							(HID_DBACCESS_START + 106)
-#define	HID_DSADMIN_QUERIES_NEW						(HID_DBACCESS_START + 107)
-#define	HID_DSADMIN_QUERIES_EDIT					(HID_DBACCESS_START + 108)
-#define	HID_DSADMIN_QUERIES_DELETE					(HID_DBACCESS_START + 109)
-#define	HID_DSADMIN_QUERYADMINISTRATION				(HID_DBACCESS_START + 110)
-
-
-#define	HID_TAB_DESIGN_TABLE_DESC					(HID_DBACCESS_START + 111)
-#define	HID_TAB_DESIGN_FIELDCONTROL					(HID_DBACCESS_START + 112)
-#define	HID_TABLE_DESIGN_HELP_WINDOW				(HID_DBACCESS_START + 113)
-#define	HID_TAB_DESIGN_DESCWIN						(HID_DBACCESS_START + 114)
-#define	HID_TAB_DESIGN_TABLE_PROPS					(HID_DBACCESS_START + 115)
-#define	HID_TABDESIGN_BACKGROUND					(HID_DBACCESS_START + 116)
-#define	HID_CTL_TABLEEDIT							(HID_DBACCESS_START + 117)
-#define	HID_TABDESIGN_NAMECELL						(HID_DBACCESS_START + 118)
-#define	HID_TABDESIGN_TYPECELL						(HID_DBACCESS_START + 119)
-#define	HID_TABDESIGN_COMMENTCELL					(HID_DBACCESS_START + 120)
-#define	SID_TABLEDESIGN_INSERTROWS					(HID_DBACCESS_START + 121)
-#define	SID_TABLEDESIGN_TABED_PRIMARYKEY			(HID_DBACCESS_START + 122)
-#define	HID_TLB_TABLEDESIGN							(HID_DBACCESS_START + 123)
-#define	HID_TAB_DESIGN_HELP_TEXT_FRAME				(HID_DBACCESS_START + 124)
-#define	HID_TABLE_DESIGN_TABPAGE_GENERAL			(HID_DBACCESS_START + 125)
-#define	HID_TAB_ENT_DEFAULT							(HID_DBACCESS_START + 126)
-#define	HID_TAB_ENT_FORMAT_SAMPLE					(HID_DBACCESS_START + 127)
-#define	HID_TAB_ENT_FORMAT							(HID_DBACCESS_START + 128)
-#define	HID_TAB_ENT_BOOL_DEFAULT					(HID_DBACCESS_START + 129)
-#define	HID_TAB_ENT_REQUIRED						(HID_DBACCESS_START + 130)
-#define	HID_TAB_ENT_AUTOINCREMENT					(HID_DBACCESS_START + 131)
-#define	HID_TAB_ENT_TEXT_LEN						(HID_DBACCESS_START + 132)
-#define	HID_TAB_ENT_TYPE							(HID_DBACCESS_START + 133)
-#define	HID_TAB_ENT_COLUMNNAME						(HID_DBACCESS_START + 134)
-#define	HID_TAB_ENT_NUMTYP							(HID_DBACCESS_START + 135)
-#define	HID_TAB_ENT_LEN								(HID_DBACCESS_START + 136)
-#define	HID_TAB_ENT_SCALE							(HID_DBACCESS_START + 137)
-#define	HID_BROWSER_TABLE_CREATE_DESIGN				(HID_DBACCESS_START + 138)
-#define	HID_BROWSER_TABLE_EDIT						(HID_DBACCESS_START + 139)
-#define	HID_BROWSER_TABLE_DELETE					(HID_DBACCESS_START + 140)
-#define HID_SQLERROR_EXCHAIN_ERRORS					(HID_DBACCESS_START + 141)
-#define HID_SQLERROR_EXCHAIN_TEXT					(HID_DBACCESS_START + 142)
-#define HID_TAB_WIZ_COLUMN_SELECT					(HID_DBACCESS_START + 146)
-#define HID_TAB_WIZ_TYPE_SELECT						(HID_DBACCESS_START + 147)
-#define HID_TAB_NAMEMATCHING_COLS_AVAIL				(HID_DBACCESS_START + 148)
-#define HID_TAB_NAMEMATCHING_COLS_ASSIGN			(HID_DBACCESS_START + 149)
-#define HID_TAB_WIZ_COPYTABLE						(HID_DBACCESS_START + 150)
-#define HID_TAB_WIZ_TABLENAME_EDIT					(HID_DBACCESS_START + 151)
-#define HID_CTL_RELATIONTAB							(HID_DBACCESS_START + 152)
-#define HID_TLB_RELATIONDESIGN 						(HID_DBACCESS_START + 153)
-#define HID_RELATIONDIALOG_LEFTFIELDCELL			(HID_DBACCESS_START + 154)
-#define HID_RELATIONDIALOG_RIGHTFIELDCELL			(HID_DBACCESS_START + 155)
-#define HID_RELDLG_KEYFIELDS						(HID_DBACCESS_START + 156)
-#define HID_BROWSER_RELATION_DESIGN					(HID_DBACCESS_START + 157)
-#define HID_TABLE_DESIGN_NO_CONNECTION				(HID_DBACCESS_START + 158)
-#define HID_DSADMIN_CREATEDATABASE					(HID_DBACCESS_START + 159)
-#define HID_BROWSER_COLUMNINFO						(HID_DBACCESS_START + 160)
-#define HID_DSADMIN_USECATALOG						(HID_DBACCESS_START + 161)
-#define HID_BROWSER_VIEW_CREATE_DESIGN				(HID_DBACCESS_START + 162)
-#define HID_DSADMIN_DOCUMENTS						(HID_DBACCESS_START + 166)
-#define HID_DSADMIN_DOCUMENTLINKS					(HID_DBACCESS_START + 167)
-#define HID_DSADMIN_FILTER_EXPLANATION				(HID_DBACCESS_START + 168)
-#define HID_CONFIRM_DROP_BUTTON_ALL					(HID_DBACCESS_START + 169)
-#define HID_DSBROWSER_BOOKMARK_SELECTED				(HID_DBACCESS_START + 170)
-#define HID_DSADMIN_TABLE_TOOLBOX					(HID_DBACCESS_START + 171)
-#define HID_DSADMIN_QUERY_TOOLBOX					(HID_DBACCESS_START + 172)
-#define HID_DSADMIN_BOOKMARK_TOOLBOX				(HID_DBACCESS_START + 173)
-#define HID_DSADMIN_PAGE_LDAP						(HID_DBACCESS_START + 174)
-#define HID_DSADMIN_LDAP_HOSTNAME					(HID_DBACCESS_START + 175)
-#define HID_DSADMIN_LDAP_BASEDN						(HID_DBACCESS_START + 176)
-#define HID_DSADMIN_LDAP_PORTNUMBER					(HID_DBACCESS_START + 177)
-#define HID_DSBROWSER_BOOKMARKSELECTED				(HID_DBACCESS_START + 178)
-#define HID_DSBROWSER_DISCONNECTING					(HID_DBACCESS_START + 179)
-#define HID_TAB_PAGE_USERADMIN						(HID_DBACCESS_START + 180)
-#define HID_TAB_PAGE_PBUSER							(HID_DBACCESS_START + 181)
-#define HID_TAB_PAGE_PBCHGPWD						(HID_DBACCESS_START + 182)
-#define HID_TAB_PAGE_PBUSERDELETE					(HID_DBACCESS_START + 183)
-#define HID_TAB_PAGE_TBLGRANTS						(HID_DBACCESS_START + 184)
-#define HID_TAB_PAGE_LBUSER							(HID_DBACCESS_START + 185)
-#define HID_DSBROWSER_DIRECTSQL						(HID_DBACCESS_START + 186)
-#define HID_DSADMIN_LDAP_ROWCOUNT					(HID_DBACCESS_START + 187)
-#define HID_BROWSER_QUERY_EDITSQL					(HID_DBACCESS_START + 189)
-#define HID_DSADMIN_PAGE_MOZILLA					(HID_DBACCESS_START + 190)
-#define HID_DSADMIN_MOZILLA_PROFILE_NAME			(HID_DBACCESS_START + 191)
-#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME		(HID_DBACCESS_START + 192)
-#define HID_BROWSER_OPEN_DOCUMENT					(HID_DBACCESS_START + 193)
-#define HID_BROWSER_EDIT_DOCUMENT					(HID_DBACCESS_START + 194)
-#define HID_BROWSER_BEW_DOCUMENT					(HID_DBACCESS_START + 195)
-#define HID_DLG_PASSWORD							(HID_DBACCESS_START + 196)
-
-#define HID_DLGIDX_NEWINDEX							(HID_DBACCESS_START + 197)
-#define HID_DLGIDX_DROPINDEX						(HID_DBACCESS_START + 198)
-#define HID_DLGIDX_RENAMEINDEX						(HID_DBACCESS_START + 199)
-#define HID_DLGIDX_SAVEINDEX						(HID_DBACCESS_START + 200)
-#define HID_DLGIDX_RESETINDEX						(HID_DBACCESS_START + 201)
-#define HID_DLGIDX_INDEXLIST						(HID_DBACCESS_START + 202)
-#define UID_DLGINDEX_INDEXDETAILS_BACK				(HID_DBACCESS_START + 203)
-#define UID_DLGINDEX_INDEXDETAILS_MAIN				(HID_DBACCESS_START + 204)
-#define HID_DLGINDEX_INDEXDETAILS_FIELD				(HID_DBACCESS_START + 205)
-#define HID_DLGINDEX_INDEXDETAILS_SORTORDER			(HID_DBACCESS_START + 206)
-
-#define HID_DOCLINKEDIT_URL							(HID_DBACCESS_START + 207)
-#define HID_QUERY_SQLMODE							(HID_DBACCESS_START + 208)
-
-#define HID_BROWSER_REFRESH_REBUILDVIEW				(HID_DBACCESS_START + 209)
-#define HID_BROWSER_RENAME_ENTRY					(HID_DBACCESS_START + 210)
-
-#define HID_QUERY_EDIT_JOINCONNECTION				(HID_DBACCESS_START + 211)
-
-#define HID_DLG_QRY_WINDOW_CONTROL					(HID_DBACCESS_START + 212)
-#define HID_DLG_QRY_LEFT_TABLE						(HID_DBACCESS_START + 213)
-#define HID_DLG_QRY_RIGHT_TABLE						(HID_DBACCESS_START + 214)
-
-#define HID_DLG_REL_CASC_DEL						(HID_DBACCESS_START + 215)
-#define HID_DLG_REL_NO_CASC_DEL						(HID_DBACCESS_START + 216)
-#define HID_DLG_REL_CASC_DEL_NULL					(HID_DBACCESS_START + 217)
-#define HID_DLG_REL_CASC_DEL_DEFAULT				(HID_DBACCESS_START + 218)
-
-#define HID_DLG_REL_CASC_UPD						(HID_DBACCESS_START + 219)
-#define HID_DLG_REL_NO_CASC_UPD						(HID_DBACCESS_START + 220)
-#define HID_DLG_REL_CASC_UPD_NULL					(HID_DBACCESS_START + 221)
-#define HID_DLG_REL_CASC_UPD_DEFAULT				(HID_DBACCESS_START + 222)
-#define HID_BROWSER_SAVE_RECORD						(HID_DBACCESS_START + 223)
-#define HID_BROWSER_UNDO_RECORD						(HID_DBACCESS_START + 224)
-
-#define HID_DSADMIN_SQL92CHECK						(HID_DBACCESS_START + 225)
-#define HID_DSADMIN_AUTOINCREMENTVALUE				(HID_DBACCESS_START + 226)
-#define HID_DOCUMENT_CREATE_REPWIZ					(HID_DBACCESS_START + 227)
-#define HID_TAB_AUTOINCREMENTVALUE					(HID_DBACCESS_START + 228)
-#define HID_DSADMIN_RETRIEVE_AUTO					(HID_DBACCESS_START + 229)
-#define HID_DSADMIN_AUTORETRIEVEENABLED				(HID_DBACCESS_START + 230)
-
-#define HID_DSADMIN_PAGE_MYSQL_ODBC					(HID_DBACCESS_START + 231)
-#define HID_TAB_PAGE_TABLEPRIVILEGES				(HID_DBACCESS_START + 232)
-
-#define HID_DSADMIN_PAGE_USERDRIVER					(HID_DBACCESS_START + 233)
-#define HID_DSADMIN_USER_DEFINED					(HID_DBACCESS_START + 234)
-#define HID_DSADMIN_USERDEF_OPTIONS					(HID_DBACCESS_START + 235)
-#define HID_DSADMIN_CHARSET_USERDEF					(HID_DBACCESS_START + 236)
-#define HID_DSADMIN_USER_LDAP				        (HID_DBACCESS_START + 237)
-#define HID_DSADMIN_PWDREC_LDAP						(HID_DBACCESS_START + 238)
-#define HID_DSADMIN_USESSL_LDAP						(HID_DBACCESS_START + 239)
-#define HID_BROWSER_QUERY_WIZARD					(HID_DBACCESS_START + 237)
-
-#define HID_DLG_RENAME							    (HID_DBACCESS_START + 237)
-
-#define HID_DSADMIN_PAGE_MYSQL_JDBC					(HID_DBACCESS_START + 238)
-
-#define HID_DSADMIN_DBASE_PATH						(HID_DBACCESS_START + 239)
-#define HID_DSADMIN_MYSQL_DATABASE					(HID_DBACCESS_START + 240)
-#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE			(HID_DBACCESS_START + 241)
-#define HID_DSADMIN_ODBC_DATASOURCE					(HID_DBACCESS_START + 242)
-#define HID_DSADMIN_ADABAS_DATABASE					(HID_DBACCESS_START + 243)
-#define HID_DSADMIN_MSACCESS_MDB_FILE				(HID_DBACCESS_START + 244)
-#define HID_DSADMIN_PAGE_MSACCESS					(HID_DBACCESS_START + 245)
-#define HID_DSADMIN_FLAT_PATH						(HID_DBACCESS_START + 246)
-#define HID_DSADMIN_CALC_PATH						(HID_DBACCESS_START + 247)
-#define HID_DSADMIN_ADVANCED						(HID_DBACCESS_START + 248)
-#define HID_DSADMIN_BOOLEANCOMPARISON				(HID_DBACCESS_START + 249)
-#define HID_DSADMIN_ORACLE_DATABASE					(HID_DBACCESS_START + 250)
-
-#define UID_APP_VIEW							    (HID_DBACCESS_START + 251)
-#define HID_APP_TABLE_TREE						    (HID_DBACCESS_START + 252)
-#define HID_APP_FORM_TREE						    (HID_DBACCESS_START + 253)
-#define HID_APP_QUERY_TREE						    (HID_DBACCESS_START + 254)
-#define HID_APP_REPORT_TREE						    (HID_DBACCESS_START + 255)
-#define UID_APP_DETAIL_VIEW						    (HID_DBACCESS_START + 256)
-#define UID_APP_VIEW_VERT_SPLIT						(HID_DBACCESS_START + 257)
-#define UID_APP_VIEW_BORDER_WIN						(HID_DBACCESS_START + 258)
-#define HID_APP_CREATION_LIST						(HID_DBACCESS_START + 259)
-#define UID_APP_SWAP_VIEW						    (HID_DBACCESS_START + 260)
-#define UID_DLG_TABLE_FILTER						(HID_DBACCESS_START + 261)
-#define HID_APP_SWAP_ICONCONTROL					(HID_DBACCESS_START + 262)
-
-#define HID_DSADMIN_APPENDTABLEALIAS				(HID_DBACCESS_START + 263)
-#define HID_DSADMIN_PARAMETERNAMESUBST				(HID_DBACCESS_START + 264)
-#define HID_DSADMIN_IGNOREDRIVER_PRIV				(HID_DBACCESS_START + 265)
-#define HID_DSADMIN_HOSTNAME						(HID_DBACCESS_START + 266)
-#define HID_DSADMIN_PORTNUMBER						(HID_DBACCESS_START + 267)
-
-#define HID_APP_HELP_TEXT						    (HID_DBACCESS_START + 268)
-#define HID_EXPLORERDLG_COLLECTION					(HID_DBACCESS_START + 269)
-#define UID_APP_DATABASE_VIEW						(HID_DBACCESS_START + 270)
-#define UID_APP_TASKS_VIEW						    (HID_DBACCESS_START + 271)
-#define UID_APP_CONTAINER_VIEW						(HID_DBACCESS_START + 272)
-#define UID_APP_TASKS_WINDOW						(HID_DBACCESS_START + 273)
-#define HID_APP_DESCRIPTION_TEXT					(HID_DBACCESS_START + 274)
-#define UID_APP_DETAILPAGE_HELPER					(HID_DBACCESS_START + 275)
-#define HID_APP_VIEW_PREVIEW_CB						(HID_DBACCESS_START + 276)
-#define HID_APP_VIEW_PREVIEW_1						(HID_DBACCESS_START + 277)
-#define HID_APP_VIEW_PREVIEW_2						(HID_DBACCESS_START + 278)
-// free
-#define UID_APP_VIEW_HORZ_SPLIT						(HID_DBACCESS_START + 280)
-#define UID_APP_VIEW_PREVIEW_1						(HID_DBACCESS_START + 281)
-#define HID_APP_VIEW_PREVIEW_3						(HID_DBACCESS_START + 282)
-
-#define HID_DSADMIN_TYPE_DIALOG						(HID_DBACCESS_START + 283)
-#define HID_DSADMIN_ENABLEOUTERJOIN					(HID_DBACCESS_START + 284)
-#define HID_DSADMIN_ADABASADMIN						(HID_DBACCESS_START + 285)
-#define HID_DSADMIN_USERADMIN						(HID_DBACCESS_START + 286)
-
-#define HID_DBWIZ_PREVIOUS							(HID_DBACCESS_START + 287)
-#define HID_DBWIZ_NEXT								(HID_DBACCESS_START + 288)
-#define HID_DBWIZ_CANCEL							(HID_DBACCESS_START + 289)
-#define HID_DBWIZ_FINISH							(HID_DBACCESS_START + 290)
-#define UID_DBWIZ_HELP								(HID_DBACCESS_START + 291)
-
-#define HID_DSADMIN_CATALOG							(HID_DBACCESS_START + 292)
-#define HID_DSADMIN_SCHEMA							(HID_DBACCESS_START + 293)
-#define HID_DSADMIN_IGNOREINDEXAPPENDIX             (HID_DBACCESS_START + 294)
-#define HID_DSADMIN_DOSLINEENDS						(HID_DBACCESS_START + 295)
-
-#define HID_BROWSER_ADMINISTRATE                    (HID_DBACCESS_START + 296)
-
-#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME      (HID_DBACCESS_START + 297)
-#define HID_DSADMIN_CHECK_REQUIRED_FIELDS           (HID_DBACCESS_START + 298)
-
-#define HID_PAGE_DBWIZARD_GENERALPAGE  			                (HID_DBACCESS_START + 300)
-#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE  			(HID_DBACCESS_START + 301)
-#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE  		(HID_DBACCESS_START + 302)
-
-#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION  			    (HID_DBACCESS_START + 304)
-#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION  			    (HID_DBACCESS_START + 305)
-
-
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES  		        (HID_DBACCESS_START + 307)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES  		        (HID_DBACCESS_START + 308)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES 		        (HID_DBACCESS_START + 309)
-#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION  		        (HID_DBACCESS_START + 310)
-
-
-#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE  			(HID_DBACCESS_START + 311)
-#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE  			(HID_DBACCESS_START + 312)
-#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR  			    (HID_DBACCESS_START + 313)
-#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR  			    (HID_DBACCESS_START + 314)
-#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR  			(HID_DBACCESS_START + 315)
-#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR  			(HID_DBACCESS_START + 316)
-
-#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION  		(HID_DBACCESS_START + 317)
-#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION  		(HID_DBACCESS_START + 318)
-
-#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER  				    (HID_DBACCESS_START + 319)
-#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN  				        (HID_DBACCESS_START + 320)
-#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER  				    (HID_DBACCESS_START + 321)
-#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL  				        (HID_DBACCESS_START + 322)
-#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION  			(HID_DBACCESS_START + 323)
-
-#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME  			    (HID_DBACCESS_START + 326)
-#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME  			    (HID_DBACCESS_START + 327)
-
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC  			    (HID_DBACCESS_START + 329)
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC  			    (HID_DBACCESS_START + 330)
-
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME  			    (HID_DBACCESS_START + 333)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER  			(HID_DBACCESS_START + 334)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT  			    (HID_DBACCESS_START + 335)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS  			    (HID_DBACCESS_START + 336)
-#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS  			(HID_DBACCESS_START + 337)
-
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL  						(HID_DBACCESS_START + 340)
-#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL  						(HID_DBACCESS_START + 341)
-
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS  					(HID_DBACCESS_START + 342)
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS  				(HID_DBACCESS_START + 343)
-
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME  					(HID_DBACCESS_START + 344)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER  				(HID_DBACCESS_START + 345)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT  					(HID_DBACCESS_START + 346)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS  					(HID_DBACCESS_START + 347)
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS  				(HID_DBACCESS_START + 348)
-
-
-#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL  						(HID_DBACCESS_START + 349)
-#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL  						(HID_DBACCESS_START + 350)
-#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION  			(HID_DBACCESS_START + 351)
-
-#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE  		(HID_DBACCESS_START + 355)
-#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE  		(HID_DBACCESS_START + 356)
-
-#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH  		(HID_DBACCESS_START + 359)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH  		(HID_DBACCESS_START + 360)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED  	(HID_DBACCESS_START + 361)
-
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED  	(HID_DBACCESS_START + 365)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME  		(HID_DBACCESS_START + 366)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION  		(HID_DBACCESS_START + 367)
-
-#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE		    (HID_DBACCESS_START + 373)
-#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE       (HID_DBACCESS_START + 374)
-#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD  		    (HID_DBACCESS_START + 375)
-#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS  			    (HID_DBACCESS_START + 376)
-
-#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE  				(HID_DBACCESS_START + 377)
-#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE  					(HID_DBACCESS_START + 378)
-#define HID_INDEX_DIALOG_ACTION_TB                              (HID_DBACCESS_START + 379)
-
-#define HID_DLG_DATABASE_WIZARD				  	                (HID_DBACCESS_START + 380)
-
-#define HID_EXTENSION_NOT_PRESENT_DLG		                    ( HID_DBACCESS_START +  381)
-#define HID_DLG_QRY_JOIN_CONTROL    		                    ( HID_DBACCESS_START +  382)
-#define HID_DSADMIN_IGNORECURRENCY  		                    ( HID_DBACCESS_START +  383)
-
-#define HID_MACRO_MIGRATION_BACKUP_LOCATION                     ( HID_DBACCESS_START +  384)
-
-// this one below have hid in number space HID_SBA_START
-#define HID_DLG_ADABAS_NEWDB						(HID_SBA_START +  0)
-#define HID_DLG_ADABAS_DBNAME						(HID_SBA_START +  1)
-#define HID_DLG_ADABAS_SYSUSR						(HID_SBA_START +  2)
-#define HID_DLG_ADABAS_SYSPWD						(HID_SBA_START +  3)
-#define HID_DLG_ADABAS_CONUSR						(HID_SBA_START +  4)
-#define HID_DLG_ADABAS_CONPWD						(HID_SBA_START +  5)
-#define HID_DLG_ADABAS_DATADEVSPACE_SIZE			(HID_SBA_START +  6)
-#define HID_DLG_ADABAS_CACHE_SIZE					(HID_SBA_START +  7)
-#define HID_DLG_ADABAS_USR							(HID_SBA_START +  8)
-#define HID_DLG_ADABAS_DOMAINPWD					(HID_SBA_START +  9)
-#define HID_DLG_ADABAS_RESTORE						(HID_SBA_START +  10)
-#define HID_DLG_ADABAS_PBRESTORE					(HID_SBA_START +  11)
-#define HID_DLG_ADABAS_SYSDEVSPACE					(HID_SBA_START +  12)
-#define HID_DLG_ADABAS_PBSYSDEVSPACE				(HID_SBA_START +  13)
-#define HID_DLG_ADABAS_TRANSACTIONLOG				(HID_SBA_START +  14)
-#define HID_DLG_ADABAS_PBTRANSACTIONLOG				(HID_SBA_START +  15)
-#define HID_DLG_ADABAS_DATADEVSPACE					(HID_SBA_START +  16)
-#define HID_DLG_ADABAS_PBDATADEVSPACE				(HID_SBA_START +  18)
-#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE			(HID_SBA_START +  19)
-#define HID_DLG_ADABAS_CON_PWD						(HID_SBA_START +  20)
-#define HID_DLG_ADABAS_SYS_PWD						(HID_SBA_START +  21)
-#define HID_DLG_ADABAS_DOMAIN_PWD					(HID_SBA_START +  22)
-//end of HID_SBA_START
-
-// don't forget to update the file util/hidother.src
-
-
-
-#endif // _DBA_DBACCESS_HELPID_HRC_
-
-
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dbaccess_helpid.hrc,v $
+ * $Revision: 1.73 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _DBA_DBACCESS_HELPID_HRC_
+#define _DBA_DBACCESS_HELPID_HRC_
+
+#ifndef _SOLAR_HRC
+#include <svtools/solar.hrc>	// HID_DBACCESS_START
+#endif
+
+#define HID_DSADMIN_CHARSET							(HID_DBACCESS_START +  9)
+
+#define HID_DLG_FILTERCRIT							(HID_DBACCESS_START + 15)
+#define HID_DLG_ORDERCRIT							(HID_DBACCESS_START + 16)
+
+#define HID_DATABROWSE_HEADER						(HID_DBACCESS_START + 17)
+#define HID_CTL_TABBROWSER							(HID_DBACCESS_START + 18)
+#define UID_DATABROWSE_DATAWINDOW					(HID_DBACCESS_START + 19)
+#define HID_CTL_TREEVIEW							(HID_DBACCESS_START + 20)
+#define UID_CTL_CONTENT								(HID_DBACCESS_START + 21)
+#define HID_TLB_TABBROWSER							(HID_DBACCESS_START + 22)
+#define HID_TLB_TREELISTBOX							(HID_DBACCESS_START + 23)
+#define HID_DSADMIN_DIALOG							(HID_DBACCESS_START + 24)
+
+
+#define HID_DSADMIN_TABCONTROL						(HID_DBACCESS_START + 27)
+#define HID_DSADMIN_PAGE_GENERAL					(HID_DBACCESS_START + 28)
+#define HID_DSADMIN_PAGE_DBASE						(HID_DBACCESS_START + 29)
+#define HID_DSADMIN_PAGE_JDBC						(HID_DBACCESS_START + 30)
+#define HID_DSADMIN_PAGE_ODBC						(HID_DBACCESS_START + 31)
+#define HID_DSADMIN_PAGE_ADABAS						(HID_DBACCESS_START + 32)
+#define HID_DSADMIN_PAGE_TEXT						(HID_DBACCESS_START + 33)
+#define HID_DSADMIN_TABLE_SUBSCRIPTION				(HID_DBACCESS_START + 34)
+#define HID_DSADMIN_DSACTIONS_NEWDS					(HID_DBACCESS_START + 35)
+#define HID_DSADMIN_DSACTIONS_DELETEDS				(HID_DBACCESS_START + 36)
+#define HID_DSADMIN_DSACTIONS_RESTOREDS				(HID_DBACCESS_START + 37)
+#define HID_DSADMIN_DSNAME							(HID_DBACCESS_START + 38)
+#define HID_DSADMIN_DSTYPE							(HID_DBACCESS_START + 39)
+#define HID_DSADMIN_URL_GENERAL						(HID_DBACCESS_START + 40)
+#define HID_DSADMIN_BROWSECONN						(HID_DBACCESS_START + 41)
+#define HID_DSADMIN_LOGINTIMEOUT_NUMBER				(HID_DBACCESS_START + 42)
+#define HID_DSADMIN_LOGINTIMEOUT_UNIT				(HID_DBACCESS_START + 43)
+#define HID_DSADMIN_SHOWDELETED						(HID_DBACCESS_START + 44)
+#define HID_DSADMIN_ALLOWLONG						(HID_DBACCESS_START + 45)
+#define HID_DSADMIN_DBASE_INDICIES					(HID_DBACCESS_START + 46)
+#define HID_DSADMIN_DRIVERCLASS						(HID_DBACCESS_START + 47)
+#define HID_DSADMIN_ODBC_OPTIONS					(HID_DBACCESS_START + 48)
+#define HID_DSADMIN_TEXT_HEADER						(HID_DBACCESS_START + 49)
+#define HID_DSADMIN_FIELD_SEPARATOR					(HID_DBACCESS_START + 50)
+#define HID_DSADMIN_TEXT_SEPARATOR					(HID_DBACCESS_START + 51)
+#define HID_DSADMIN_DECIMAL_SEPARATOR				(HID_DBACCESS_START + 52)
+#define HID_DSADMIN_THOUSANDS_SEPARATOR				(HID_DBACCESS_START + 53)
+#define HID_DSADMIN_EXTENSION						(HID_DBACCESS_START + 54)
+#define HID_DSADMIN_ALL_TABLES						(HID_DBACCESS_START + 55)
+#define HID_DSADMIN_NO_TABLES						(HID_DBACCESS_START + 56)
+#define HID_DSADMIN_SELECT_TABLES					(HID_DBACCESS_START + 57)
+#define HID_DSADMIN_TABLE_SELECTOR					(HID_DBACCESS_START + 58)
+#define HID_DSADMIN_SUPPRESS_VERSIONCL				(HID_DBACCESS_START + 59)
+
+#define	HID_GENERIC_SQL_ERROR						(HID_DBACCESS_START + 60)
+
+#define HID_BROWSER_COLUMNFORMAT					(HID_DBACCESS_START + 61)
+#define HID_BROWSER_COLUMNWIDTH						(HID_DBACCESS_START + 62)
+#define HID_BROWSER_TABLEFORMAT						(HID_DBACCESS_START + 63)
+#define HID_BROWSER_ROWHEIGHT						(HID_DBACCESS_START + 64)
+#define HID_BROWSER_EDIT_DATABASE                   (HID_DBACCESS_START + 65)
+#define HID_BROWSER_CLOSECONN						(HID_DBACCESS_START + 66)
+#define HID_BROWSER_REFRESHCONN						(HID_DBACCESS_START + 67)
+
+#define	HID_DLG_ROWHEIGHT							(HID_DBACCESS_START + 68)
+#define	HID_DLG_COLWIDTH							(HID_DBACCESS_START + 69)
+
+
+#define	HID_TLB_QUERYDESIGN							(HID_DBACCESS_START + 70)
+#define	HID_CTL_QRYSQLEDIT							(HID_DBACCESS_START + 71)
+#define	HID_DSADMIN_SPECIAL_MESSAGE					(HID_DBACCESS_START + 72)
+
+#define	HID_BROWSER_QUERY_CREATE_TEXT				(HID_DBACCESS_START + 73)
+
+#define HID_DLG_ERROR								(HID_DBACCESS_START + 74)
+#define HID_DLG_TEXT								(HID_DBACCESS_START + 75)
+#define UID_SQLERROR_BUTTONMORE						(HID_DBACCESS_START + 76)
+#define HID_DLG_SAVE_AS								(HID_DBACCESS_START + 77)
+
+#define HID_BROWSER_QUERY_EDIT						(HID_DBACCESS_START + 78)
+#define HID_BROWSER_QUERY_DELETE					(HID_DBACCESS_START + 79)
+
+#define	HID_DSADMIN_USER_ADO						(HID_DBACCESS_START + 80)
+#define	HID_DSADMIN_PWDREC_ADO						(HID_DBACCESS_START + 81)
+#define	HID_DSADMIN_CONNURL_ADOPAGE					(HID_DBACCESS_START + 82)
+#define	HID_DSADMIN_PAGE_ADO						(HID_DBACCESS_START + 83)
+
+
+#define	HID_JOINSH_ADDTAB_CLOSE						(HID_DBACCESS_START + 84)
+#define	HID_JOINSH_ADDTAB_TABLELIST					(HID_DBACCESS_START + 85)
+#define	HID_CTL_QRYDGNTAB							(HID_DBACCESS_START + 86)
+#define	HID_DLG_QRY_JOIN							(HID_DBACCESS_START + 87)
+#define	HID_DLG_QRY_JOINTYPE						(HID_DBACCESS_START + 88)
+#define	HID_JOINSH_ADDTAB_QUERYLIST                 (HID_DBACCESS_START + 89)
+#define	HID_DLG_QRY_HELPTEXT						(HID_DBACCESS_START + 92)
+
+#define	HID_CTL_QRYDGNCRIT							(HID_DBACCESS_START + 93)
+#define	HID_QRYDGN_ROW_VISIBLE						(HID_DBACCESS_START + 94)
+#define	HID_QRYDGN_ROW_TABLE						(HID_DBACCESS_START + 95)
+#define	HID_QRYDGN_ROW_FIELD						(HID_DBACCESS_START + 96)
+#define	HID_QRYDGN_ROW_ORDER						(HID_DBACCESS_START + 97)
+#define	HID_QRYDGN_ROW_FUNCTION						(HID_DBACCESS_START + 98)
+#define	HID_QRYDGN_ROW_ALIAS						(HID_DBACCESS_START + 99)
+#define	HID_QRYDGN_ROW_CRIT							(HID_DBACCESS_START + 100)
+
+#define	HID_QUERY_FUNCTION							(HID_DBACCESS_START + 101)
+#define	HID_QUERY_TABLENAME							(HID_DBACCESS_START + 102)
+#define	HID_QUERY_ALIASNAME							(HID_DBACCESS_START + 103)
+#define	HID_QUERY_DISTINCT							(HID_DBACCESS_START + 104)
+
+#define	HID_BROWSER_QUERY_CREATE_DESIGN				(HID_DBACCESS_START + 105)
+
+#define	HID_DSADMIN_QUERIES							(HID_DBACCESS_START + 106)
+#define	HID_DSADMIN_QUERIES_NEW						(HID_DBACCESS_START + 107)
+#define	HID_DSADMIN_QUERIES_EDIT					(HID_DBACCESS_START + 108)
+#define	HID_DSADMIN_QUERIES_DELETE					(HID_DBACCESS_START + 109)
+#define	HID_DSADMIN_QUERYADMINISTRATION				(HID_DBACCESS_START + 110)
+
+
+#define	HID_TAB_DESIGN_TABLE_DESC					(HID_DBACCESS_START + 111)
+#define	HID_TAB_DESIGN_FIELDCONTROL					(HID_DBACCESS_START + 112)
+#define	HID_TABLE_DESIGN_HELP_WINDOW				(HID_DBACCESS_START + 113)
+#define	HID_TAB_DESIGN_DESCWIN						(HID_DBACCESS_START + 114)
+#define	HID_TAB_DESIGN_TABLE_PROPS					(HID_DBACCESS_START + 115)
+#define	HID_TABDESIGN_BACKGROUND					(HID_DBACCESS_START + 116)
+#define	HID_CTL_TABLEEDIT							(HID_DBACCESS_START + 117)
+#define	HID_TABDESIGN_NAMECELL						(HID_DBACCESS_START + 118)
+#define	HID_TABDESIGN_TYPECELL						(HID_DBACCESS_START + 119)
+#define	HID_TABDESIGN_COMMENTCELL					(HID_DBACCESS_START + 120)
+#define	SID_TABLEDESIGN_INSERTROWS					(HID_DBACCESS_START + 121)
+#define	SID_TABLEDESIGN_TABED_PRIMARYKEY			(HID_DBACCESS_START + 122)
+#define	HID_TLB_TABLEDESIGN							(HID_DBACCESS_START + 123)
+#define	HID_TAB_DESIGN_HELP_TEXT_FRAME				(HID_DBACCESS_START + 124)
+#define	HID_TABLE_DESIGN_TABPAGE_GENERAL			(HID_DBACCESS_START + 125)
+#define	HID_TAB_ENT_DEFAULT							(HID_DBACCESS_START + 126)
+#define	HID_TAB_ENT_FORMAT_SAMPLE					(HID_DBACCESS_START + 127)
+#define	HID_TAB_ENT_FORMAT							(HID_DBACCESS_START + 128)
+#define	HID_TAB_ENT_BOOL_DEFAULT					(HID_DBACCESS_START + 129)
+#define	HID_TAB_ENT_REQUIRED						(HID_DBACCESS_START + 130)
+#define	HID_TAB_ENT_AUTOINCREMENT					(HID_DBACCESS_START + 131)
+#define	HID_TAB_ENT_TEXT_LEN						(HID_DBACCESS_START + 132)
+#define	HID_TAB_ENT_TYPE							(HID_DBACCESS_START + 133)
+#define	HID_TAB_ENT_COLUMNNAME						(HID_DBACCESS_START + 134)
+#define	HID_TAB_ENT_NUMTYP							(HID_DBACCESS_START + 135)
+#define	HID_TAB_ENT_LEN								(HID_DBACCESS_START + 136)
+#define	HID_TAB_ENT_SCALE							(HID_DBACCESS_START + 137)
+#define	HID_BROWSER_TABLE_CREATE_DESIGN				(HID_DBACCESS_START + 138)
+#define	HID_BROWSER_TABLE_EDIT						(HID_DBACCESS_START + 139)
+#define	HID_BROWSER_TABLE_DELETE					(HID_DBACCESS_START + 140)
+#define HID_SQLERROR_EXCHAIN_ERRORS					(HID_DBACCESS_START + 141)
+#define HID_SQLERROR_EXCHAIN_TEXT					(HID_DBACCESS_START + 142)
+#define HID_TAB_WIZ_COLUMN_SELECT					(HID_DBACCESS_START + 146)
+#define HID_TAB_WIZ_TYPE_SELECT						(HID_DBACCESS_START + 147)
+#define HID_TAB_NAMEMATCHING_COLS_AVAIL				(HID_DBACCESS_START + 148)
+#define HID_TAB_NAMEMATCHING_COLS_ASSIGN			(HID_DBACCESS_START + 149)
+#define HID_TAB_WIZ_COPYTABLE						(HID_DBACCESS_START + 150)
+#define HID_TAB_WIZ_TABLENAME_EDIT					(HID_DBACCESS_START + 151)
+#define HID_CTL_RELATIONTAB							(HID_DBACCESS_START + 152)
+#define HID_TLB_RELATIONDESIGN 						(HID_DBACCESS_START + 153)
+#define HID_RELATIONDIALOG_LEFTFIELDCELL			(HID_DBACCESS_START + 154)
+#define HID_RELATIONDIALOG_RIGHTFIELDCELL			(HID_DBACCESS_START + 155)
+#define HID_RELDLG_KEYFIELDS						(HID_DBACCESS_START + 156)
+#define HID_BROWSER_RELATION_DESIGN					(HID_DBACCESS_START + 157)
+#define HID_TABLE_DESIGN_NO_CONNECTION				(HID_DBACCESS_START + 158)
+#define HID_DSADMIN_CREATEDATABASE					(HID_DBACCESS_START + 159)
+#define HID_BROWSER_COLUMNINFO						(HID_DBACCESS_START + 160)
+#define HID_DSADMIN_USECATALOG						(HID_DBACCESS_START + 161)
+#define HID_BROWSER_VIEW_CREATE_DESIGN				(HID_DBACCESS_START + 162)
+#define HID_DSADMIN_DOCUMENTS						(HID_DBACCESS_START + 166)
+#define HID_DSADMIN_DOCUMENTLINKS					(HID_DBACCESS_START + 167)
+#define HID_DSADMIN_FILTER_EXPLANATION				(HID_DBACCESS_START + 168)
+#define HID_CONFIRM_DROP_BUTTON_ALL					(HID_DBACCESS_START + 169)
+#define HID_DSBROWSER_BOOKMARK_SELECTED				(HID_DBACCESS_START + 170)
+#define HID_DSADMIN_TABLE_TOOLBOX					(HID_DBACCESS_START + 171)
+#define HID_DSADMIN_QUERY_TOOLBOX					(HID_DBACCESS_START + 172)
+#define HID_DSADMIN_BOOKMARK_TOOLBOX				(HID_DBACCESS_START + 173)
+#define HID_DSADMIN_PAGE_LDAP						(HID_DBACCESS_START + 174)
+#define HID_DSADMIN_LDAP_HOSTNAME					(HID_DBACCESS_START + 175)
+#define HID_DSADMIN_LDAP_BASEDN						(HID_DBACCESS_START + 176)
+#define HID_DSADMIN_LDAP_PORTNUMBER					(HID_DBACCESS_START + 177)
+#define HID_DSBROWSER_BOOKMARKSELECTED				(HID_DBACCESS_START + 178)
+#define HID_DSBROWSER_DISCONNECTING					(HID_DBACCESS_START + 179)
+#define HID_TAB_PAGE_USERADMIN						(HID_DBACCESS_START + 180)
+#define HID_TAB_PAGE_PBUSER							(HID_DBACCESS_START + 181)
+#define HID_TAB_PAGE_PBCHGPWD						(HID_DBACCESS_START + 182)
+#define HID_TAB_PAGE_PBUSERDELETE					(HID_DBACCESS_START + 183)
+#define HID_TAB_PAGE_TBLGRANTS						(HID_DBACCESS_START + 184)
+#define HID_TAB_PAGE_LBUSER							(HID_DBACCESS_START + 185)
+#define HID_DSBROWSER_DIRECTSQL						(HID_DBACCESS_START + 186)
+#define HID_DSADMIN_LDAP_ROWCOUNT					(HID_DBACCESS_START + 187)
+#define HID_BROWSER_QUERY_EDITSQL					(HID_DBACCESS_START + 189)
+#define HID_DSADMIN_PAGE_MOZILLA					(HID_DBACCESS_START + 190)
+#define HID_DSADMIN_MOZILLA_PROFILE_NAME			(HID_DBACCESS_START + 191)
+#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME		(HID_DBACCESS_START + 192)
+#define HID_BROWSER_OPEN_DOCUMENT					(HID_DBACCESS_START + 193)
+#define HID_BROWSER_EDIT_DOCUMENT					(HID_DBACCESS_START + 194)
+#define HID_BROWSER_BEW_DOCUMENT					(HID_DBACCESS_START + 195)
+#define HID_DLG_PASSWORD							(HID_DBACCESS_START + 196)
+
+#define HID_DLGIDX_NEWINDEX							(HID_DBACCESS_START + 197)
+#define HID_DLGIDX_DROPINDEX						(HID_DBACCESS_START + 198)
+#define HID_DLGIDX_RENAMEINDEX						(HID_DBACCESS_START + 199)
+#define HID_DLGIDX_SAVEINDEX						(HID_DBACCESS_START + 200)
+#define HID_DLGIDX_RESETINDEX						(HID_DBACCESS_START + 201)
+#define HID_DLGIDX_INDEXLIST						(HID_DBACCESS_START + 202)
+#define UID_DLGINDEX_INDEXDETAILS_BACK				(HID_DBACCESS_START + 203)
+#define UID_DLGINDEX_INDEXDETAILS_MAIN				(HID_DBACCESS_START + 204)
+#define HID_DLGINDEX_INDEXDETAILS_FIELD				(HID_DBACCESS_START + 205)
+#define HID_DLGINDEX_INDEXDETAILS_SORTORDER			(HID_DBACCESS_START + 206)
+
+#define HID_DOCLINKEDIT_URL							(HID_DBACCESS_START + 207)
+#define HID_QUERY_SQLMODE							(HID_DBACCESS_START + 208)
+
+#define HID_BROWSER_REFRESH_REBUILDVIEW				(HID_DBACCESS_START + 209)
+#define HID_BROWSER_RENAME_ENTRY					(HID_DBACCESS_START + 210)
+
+#define HID_QUERY_EDIT_JOINCONNECTION				(HID_DBACCESS_START + 211)
+
+#define HID_DLG_QRY_WINDOW_CONTROL					(HID_DBACCESS_START + 212)
+#define HID_DLG_QRY_LEFT_TABLE						(HID_DBACCESS_START + 213)
+#define HID_DLG_QRY_RIGHT_TABLE						(HID_DBACCESS_START + 214)
+
+#define HID_DLG_REL_CASC_DEL						(HID_DBACCESS_START + 215)
+#define HID_DLG_REL_NO_CASC_DEL						(HID_DBACCESS_START + 216)
+#define HID_DLG_REL_CASC_DEL_NULL					(HID_DBACCESS_START + 217)
+#define HID_DLG_REL_CASC_DEL_DEFAULT				(HID_DBACCESS_START + 218)
+
+#define HID_DLG_REL_CASC_UPD						(HID_DBACCESS_START + 219)
+#define HID_DLG_REL_NO_CASC_UPD						(HID_DBACCESS_START + 220)
+#define HID_DLG_REL_CASC_UPD_NULL					(HID_DBACCESS_START + 221)
+#define HID_DLG_REL_CASC_UPD_DEFAULT				(HID_DBACCESS_START + 222)
+#define HID_BROWSER_SAVE_RECORD						(HID_DBACCESS_START + 223)
+#define HID_BROWSER_UNDO_RECORD						(HID_DBACCESS_START + 224)
+
+#define HID_DSADMIN_SQL92CHECK						(HID_DBACCESS_START + 225)
+#define HID_DSADMIN_AUTOINCREMENTVALUE				(HID_DBACCESS_START + 226)
+#define HID_DOCUMENT_CREATE_REPWIZ					(HID_DBACCESS_START + 227)
+#define HID_TAB_AUTOINCREMENTVALUE					(HID_DBACCESS_START + 228)
+#define HID_DSADMIN_RETRIEVE_AUTO					(HID_DBACCESS_START + 229)
+#define HID_DSADMIN_AUTORETRIEVEENABLED				(HID_DBACCESS_START + 230)
+
+#define HID_DSADMIN_PAGE_MYSQL_ODBC					(HID_DBACCESS_START + 231)
+#define HID_TAB_PAGE_TABLEPRIVILEGES				(HID_DBACCESS_START + 232)
+
+#define HID_DSADMIN_PAGE_USERDRIVER					(HID_DBACCESS_START + 233)
+#define HID_DSADMIN_USER_DEFINED					(HID_DBACCESS_START + 234)
+#define HID_DSADMIN_USERDEF_OPTIONS					(HID_DBACCESS_START + 235)
+#define HID_DSADMIN_CHARSET_USERDEF					(HID_DBACCESS_START + 236)
+#define HID_DSADMIN_USER_LDAP				        (HID_DBACCESS_START + 237)
+#define HID_DSADMIN_PWDREC_LDAP						(HID_DBACCESS_START + 238)
+#define HID_DSADMIN_USESSL_LDAP						(HID_DBACCESS_START + 239)
+#define HID_BROWSER_QUERY_WIZARD					(HID_DBACCESS_START + 237)
+
+#define HID_DLG_RENAME							    (HID_DBACCESS_START + 237)
+
+#define HID_DSADMIN_PAGE_MYSQL_JDBC					(HID_DBACCESS_START + 238)
+
+#define HID_DSADMIN_DBASE_PATH						(HID_DBACCESS_START + 239)
+#define HID_DSADMIN_MYSQL_DATABASE					(HID_DBACCESS_START + 240)
+#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE			(HID_DBACCESS_START + 241)
+#define HID_DSADMIN_ODBC_DATASOURCE					(HID_DBACCESS_START + 242)
+#define HID_DSADMIN_ADABAS_DATABASE					(HID_DBACCESS_START + 243)
+#define HID_DSADMIN_MSACCESS_MDB_FILE				(HID_DBACCESS_START + 244)
+#define HID_DSADMIN_PAGE_MSACCESS					(HID_DBACCESS_START + 245)
+#define HID_DSADMIN_FLAT_PATH						(HID_DBACCESS_START + 246)
+#define HID_DSADMIN_CALC_PATH						(HID_DBACCESS_START + 247)
+#define HID_DSADMIN_ADVANCED						(HID_DBACCESS_START + 248)
+#define HID_DSADMIN_BOOLEANCOMPARISON				(HID_DBACCESS_START + 249)
+#define HID_DSADMIN_ORACLE_DATABASE					(HID_DBACCESS_START + 250)
+
+#define UID_APP_VIEW							    (HID_DBACCESS_START + 251)
+#define HID_APP_TABLE_TREE						    (HID_DBACCESS_START + 252)
+#define HID_APP_FORM_TREE						    (HID_DBACCESS_START + 253)
+#define HID_APP_QUERY_TREE						    (HID_DBACCESS_START + 254)
+#define HID_APP_REPORT_TREE						    (HID_DBACCESS_START + 255)
+#define UID_APP_DETAIL_VIEW						    (HID_DBACCESS_START + 256)
+#define UID_APP_VIEW_VERT_SPLIT						(HID_DBACCESS_START + 257)
+#define UID_APP_VIEW_BORDER_WIN						(HID_DBACCESS_START + 258)
+#define HID_APP_CREATION_LIST						(HID_DBACCESS_START + 259)
+#define UID_APP_SWAP_VIEW						    (HID_DBACCESS_START + 260)
+#define UID_DLG_TABLE_FILTER						(HID_DBACCESS_START + 261)
+#define HID_APP_SWAP_ICONCONTROL					(HID_DBACCESS_START + 262)
+
+#define HID_DSADMIN_APPENDTABLEALIAS				(HID_DBACCESS_START + 263)
+#define HID_DSADMIN_PARAMETERNAMESUBST				(HID_DBACCESS_START + 264)
+#define HID_DSADMIN_IGNOREDRIVER_PRIV				(HID_DBACCESS_START + 265)
+#define HID_DSADMIN_HOSTNAME						(HID_DBACCESS_START + 266)
+#define HID_DSADMIN_PORTNUMBER						(HID_DBACCESS_START + 267)
+
+#define HID_APP_HELP_TEXT						    (HID_DBACCESS_START + 268)
+#define HID_EXPLORERDLG_COLLECTION					(HID_DBACCESS_START + 269)
+#define UID_APP_DATABASE_VIEW						(HID_DBACCESS_START + 270)
+#define UID_APP_TASKS_VIEW						    (HID_DBACCESS_START + 271)
+#define UID_APP_CONTAINER_VIEW						(HID_DBACCESS_START + 272)
+#define UID_APP_TASKS_WINDOW						(HID_DBACCESS_START + 273)
+#define HID_APP_DESCRIPTION_TEXT					(HID_DBACCESS_START + 274)
+#define UID_APP_DETAILPAGE_HELPER					(HID_DBACCESS_START + 275)
+#define HID_APP_VIEW_PREVIEW_CB						(HID_DBACCESS_START + 276)
+#define HID_APP_VIEW_PREVIEW_1						(HID_DBACCESS_START + 277)
+#define HID_APP_VIEW_PREVIEW_2						(HID_DBACCESS_START + 278)
+// free
+#define UID_APP_VIEW_HORZ_SPLIT						(HID_DBACCESS_START + 280)
+#define UID_APP_VIEW_PREVIEW_1						(HID_DBACCESS_START + 281)
+#define HID_APP_VIEW_PREVIEW_3						(HID_DBACCESS_START + 282)
+
+#define HID_DSADMIN_TYPE_DIALOG						(HID_DBACCESS_START + 283)
+#define HID_DSADMIN_ENABLEOUTERJOIN					(HID_DBACCESS_START + 284)
+#define HID_DSADMIN_ADABASADMIN						(HID_DBACCESS_START + 285)
+#define HID_DSADMIN_USERADMIN						(HID_DBACCESS_START + 286)
+
+#define HID_DBWIZ_PREVIOUS							(HID_DBACCESS_START + 287)
+#define HID_DBWIZ_NEXT								(HID_DBACCESS_START + 288)
+#define HID_DBWIZ_CANCEL							(HID_DBACCESS_START + 289)
+#define HID_DBWIZ_FINISH							(HID_DBACCESS_START + 290)
+#define UID_DBWIZ_HELP								(HID_DBACCESS_START + 291)
+
+#define HID_DSADMIN_CATALOG							(HID_DBACCESS_START + 292)
+#define HID_DSADMIN_SCHEMA							(HID_DBACCESS_START + 293)
+#define HID_DSADMIN_IGNOREINDEXAPPENDIX             (HID_DBACCESS_START + 294)
+#define HID_DSADMIN_DOSLINEENDS						(HID_DBACCESS_START + 295)
+
+#define HID_BROWSER_ADMINISTRATE                    (HID_DBACCESS_START + 296)
+
+#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME      (HID_DBACCESS_START + 297)
+#define HID_DSADMIN_CHECK_REQUIRED_FIELDS           (HID_DBACCESS_START + 298)
+
+#define HID_PAGE_DBWIZARD_GENERALPAGE  			                (HID_DBACCESS_START + 300)
+#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE  			(HID_DBACCESS_START + 301)
+#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE  		(HID_DBACCESS_START + 302)
+
+#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION  			    (HID_DBACCESS_START + 304)
+#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION  			    (HID_DBACCESS_START + 305)
+
+
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES  		        (HID_DBACCESS_START + 307)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES  		        (HID_DBACCESS_START + 308)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES 		        (HID_DBACCESS_START + 309)
+#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION  		        (HID_DBACCESS_START + 310)
+
+
+#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE  			(HID_DBACCESS_START + 311)
+#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE  			(HID_DBACCESS_START + 312)
+#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR  			    (HID_DBACCESS_START + 313)
+#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR  			    (HID_DBACCESS_START + 314)
+#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR  			(HID_DBACCESS_START + 315)
+#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR  			(HID_DBACCESS_START + 316)
+
+#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION  		(HID_DBACCESS_START + 317)
+#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION  		(HID_DBACCESS_START + 318)
+
+#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER  				    (HID_DBACCESS_START + 319)
+#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN  				        (HID_DBACCESS_START + 320)
+#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER  				    (HID_DBACCESS_START + 321)
+#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL  				        (HID_DBACCESS_START + 322)
+#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION  			(HID_DBACCESS_START + 323)
+
+#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME  			    (HID_DBACCESS_START + 326)
+#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME  			    (HID_DBACCESS_START + 327)
+
+#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC  			    (HID_DBACCESS_START + 329)
+#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC  			    (HID_DBACCESS_START + 330)
+
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME  			    (HID_DBACCESS_START + 333)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER  			(HID_DBACCESS_START + 334)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT  			    (HID_DBACCESS_START + 335)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS  			    (HID_DBACCESS_START + 336)
+#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS  			(HID_DBACCESS_START + 337)
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL  						(HID_DBACCESS_START + 340)
+#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL  						(HID_DBACCESS_START + 341)
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS  					(HID_DBACCESS_START + 342)
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS  				(HID_DBACCESS_START + 343)
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME  					(HID_DBACCESS_START + 344)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER  				(HID_DBACCESS_START + 345)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT  					(HID_DBACCESS_START + 346)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS  					(HID_DBACCESS_START + 347)
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS  				(HID_DBACCESS_START + 348)
+
+
+#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL  						(HID_DBACCESS_START + 349)
+#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL  						(HID_DBACCESS_START + 350)
+#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION  			(HID_DBACCESS_START + 351)
+
+#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE  		(HID_DBACCESS_START + 355)
+#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE  		(HID_DBACCESS_START + 356)
+
+#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH  		(HID_DBACCESS_START + 359)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH  		(HID_DBACCESS_START + 360)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED  	(HID_DBACCESS_START + 361)
+
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED  	(HID_DBACCESS_START + 365)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME  		(HID_DBACCESS_START + 366)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION  		(HID_DBACCESS_START + 367)
+
+#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE		    (HID_DBACCESS_START + 373)
+#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE       (HID_DBACCESS_START + 374)
+#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD  		    (HID_DBACCESS_START + 375)
+#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS  			    (HID_DBACCESS_START + 376)
+
+#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE  				(HID_DBACCESS_START + 377)
+#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE  					(HID_DBACCESS_START + 378)
+#define HID_INDEX_DIALOG_ACTION_TB                              (HID_DBACCESS_START + 379)
+
+#define HID_DLG_DATABASE_WIZARD				  	                (HID_DBACCESS_START + 380)
+
+#define HID_EXTENSION_NOT_PRESENT_DLG		                    ( HID_DBACCESS_START +  381)
+#define HID_DLG_QRY_JOIN_CONTROL    		                    ( HID_DBACCESS_START +  382)
+#define HID_DSADMIN_IGNORECURRENCY  		                    ( HID_DBACCESS_START +  383)
+
+#define HID_MACRO_MIGRATION_BACKUP_LOCATION                     ( HID_DBACCESS_START +  384)
+
+// this one below have hid in number space HID_SBA_START
+#define HID_DLG_ADABAS_NEWDB						(HID_SBA_START +  0)
+#define HID_DLG_ADABAS_DBNAME						(HID_SBA_START +  1)
+#define HID_DLG_ADABAS_SYSUSR						(HID_SBA_START +  2)
+#define HID_DLG_ADABAS_SYSPWD						(HID_SBA_START +  3)
+#define HID_DLG_ADABAS_CONUSR						(HID_SBA_START +  4)
+#define HID_DLG_ADABAS_CONPWD						(HID_SBA_START +  5)
+#define HID_DLG_ADABAS_DATADEVSPACE_SIZE			(HID_SBA_START +  6)
+#define HID_DLG_ADABAS_CACHE_SIZE					(HID_SBA_START +  7)
+#define HID_DLG_ADABAS_USR							(HID_SBA_START +  8)
+#define HID_DLG_ADABAS_DOMAINPWD					(HID_SBA_START +  9)
+#define HID_DLG_ADABAS_RESTORE						(HID_SBA_START +  10)
+#define HID_DLG_ADABAS_PBRESTORE					(HID_SBA_START +  11)
+#define HID_DLG_ADABAS_SYSDEVSPACE					(HID_SBA_START +  12)
+#define HID_DLG_ADABAS_PBSYSDEVSPACE				(HID_SBA_START +  13)
+#define HID_DLG_ADABAS_TRANSACTIONLOG				(HID_SBA_START +  14)
+#define HID_DLG_ADABAS_PBTRANSACTIONLOG				(HID_SBA_START +  15)
+#define HID_DLG_ADABAS_DATADEVSPACE					(HID_SBA_START +  16)
+#define HID_DLG_ADABAS_PBDATADEVSPACE				(HID_SBA_START +  18)
+#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE			(HID_SBA_START +  19)
+#define HID_DLG_ADABAS_CON_PWD						(HID_SBA_START +  20)
+#define HID_DLG_ADABAS_SYS_PWD						(HID_SBA_START +  21)
+#define HID_DLG_ADABAS_DOMAIN_PWD					(HID_SBA_START +  22)
+//end of HID_SBA_START
+
+// don't forget to update the file util/hidother.src
+
+
+
+#endif // _DBA_DBACCESS_HELPID_HRC_
+
+

dbaccess/source/core/dataaccess/ModelImpl.cxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ModelImpl.cxx,v $
- * $Revision: 1.25.6.12 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
-
-#include "commandcontainer.hxx"
-#include "connection.hxx"
-#include "core_resource.hrc"
-#include "core_resource.hxx"
-#include "databasecontext.hxx"
-#include "databasedocument.hxx"
-#include "datasource.hxx"
-#include "dbastrings.hrc"
-#include "ModelImpl.hxx"
-#include "userinformation.hxx"
-
-/** === begin UNO includes === **/
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
-#include <com/sun/star/sdb/BooleanComparisonMode.hpp>
-#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
-#include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
-/** === end UNO includes === **/
-
-#include <comphelper/interaction.hxx>
-#include <comphelper/mediadescriptor.hxx>
-#include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/seqstream.hxx>
-#include <comphelper/sequence.hxx>
-#include <connectivity/dbexception.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <rtl/digest.h>
-#include <sfx2/signaturestate.hxx>
-#include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
-#include <tools/errcode.hxx>
-#include <tools/urlobj.hxx>
-#include <unotools/sharedunocomponent.hxx>
-
-#include <algorithm>
-
-using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdb;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::embed;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::view;
-using namespace ::com::sun::star::task;
-using namespace ::com::sun::star::reflection;
-using namespace ::com::sun::star::script;
-using namespace ::cppu;
-using namespace ::osl;
-using namespace ::vos;
-using namespace ::dbtools;
-using namespace ::comphelper;
-namespace css = ::com::sun::star;
-
-//........................................................................
-namespace dbaccess
-{
-//........................................................................
-
-//============================================================
-//= VosMutexFacade
-//============================================================
-//------------------------------------------------------------------------
-VosMutexFacade::VosMutexFacade( ::osl::Mutex& _rMutex )
-    :m_rMutex( _rMutex )
-{
-}
-
-//------------------------------------------------------------------------
-void SAL_CALL VosMutexFacade::acquire()
-{
-    m_rMutex.acquire();
-}
-
-//------------------------------------------------------------------------
-sal_Bool SAL_CALL VosMutexFacade::tryToAcquire()
-{
-    return m_rMutex.tryToAcquire();
-}
-
-//------------------------------------------------------------------------
-void SAL_CALL VosMutexFacade::release()
-{
-    m_rMutex.release();
-}
-
-//============================================================
-//= DocumentStorageAccess
-//============================================================
-DBG_NAME( DocumentStorageAccess )
-class DocumentStorageAccess : public ::cppu::WeakImplHelper2<   XDocumentSubStorageSupplier
-                                                            ,   XTransactionListener >
-{
-    typedef ::std::map< ::rtl::OUString, Reference< XStorage > >    NamedStorages;
-
-    ::osl::Mutex        m_aMutex;
-    /// all sub storages which we ever gave to the outer world
-    NamedStorages       m_aExposedStorages;
-    ODatabaseModelImpl* m_pModelImplementation;
-    bool                m_bPropagateCommitToRoot;
-
-public:
-    DocumentStorageAccess( ODatabaseModelImpl& _rModelImplementation )
-        :m_pModelImplementation( &_rModelImplementation )
-        ,m_bPropagateCommitToRoot( true )
-    {
-        DBG_CTOR( DocumentStorageAccess, NULL );
-    }
-
-protected:
-    ~DocumentStorageAccess()
-    {
-        DBG_DTOR( DocumentStorageAccess, NULL );
-    }
-
-public:
-    void dispose();
-
-    void    suspendCommitPropagation()
-    {
-        DBG_ASSERT( m_bPropagateCommitToRoot, "DocumentStorageAccess:: suspendCommitPropagation: already suspended" );
-        m_bPropagateCommitToRoot = false;
-    }
-    void    resumeCommitPropagation()
-    {
-        DBG_ASSERT( !m_bPropagateCommitToRoot, "DocumentStorageAccess:: suspendCommitPropagation: already suspended" );
-        m_bPropagateCommitToRoot = true;
-    }
-
-    // XDocumentSubStorageSupplier
-    virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 nMode ) throw (RuntimeException);
-    virtual Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames(  ) throw (IOException, RuntimeException);
-
-    // XTransactionListener
-    virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL commited( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL preRevert( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL reverted( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-
-    // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
-};
-
-//--------------------------------------------------------------------------
-void DocumentStorageAccess::dispose()
-{
-    ::osl::MutexGuard aGuard( m_aMutex );
-
-    for (   NamedStorages::iterator loop = m_aExposedStorages.begin();
-            loop != m_aExposedStorages.end();
-            ++loop
-        )
-    {
-        try
-        {
-            Reference< XTransactionBroadcaster > xBroadcaster( loop->second, UNO_QUERY );
-	        if ( xBroadcaster.is() )
-		        xBroadcaster->removeTransactionListener( this );
-        }
-        catch( const Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-        }
-    }
-
-    m_aExposedStorages.clear();
-
-    m_pModelImplementation = NULL;
-}
-
-//--------------------------------------------------------------------------
-Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 nMode ) throw (RuntimeException)
-{
-    ::osl::MutexGuard aGuard( m_aMutex );
-    NamedStorages::iterator pos = m_aExposedStorages.find( aStorageName );
-    if ( pos == m_aExposedStorages.end() )
-    {
-	    Reference< XStorage > xResult = m_pModelImplementation->getStorage( aStorageName, nMode );
-        Reference< XTransactionBroadcaster > xBroadcaster( xResult, UNO_QUERY );
-	    if ( xBroadcaster.is() )
-		    xBroadcaster->addTransactionListener( this );
-
-        pos = m_aExposedStorages.insert( NamedStorages::value_type( aStorageName, xResult ) ).first;
-    }
-
-    return pos->second;
-}
-
-//--------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames(  ) throw (IOException, RuntimeException)
-{
-    Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() );
-    if ( !xRootStor.is() )
-        return Sequence< ::rtl::OUString >();
-
-    ::std::vector< ::rtl::OUString > aNames;
-
-    Reference< XNameAccess > xNames( xRootStor, UNO_QUERY_THROW );
-    Sequence< ::rtl::OUString > aElementNames( xNames->getElementNames() );
-    for ( sal_Int32 i=0; i<aElementNames.getLength(); ++i )
-    {
-        if ( xRootStor->isStorageElement( aElementNames[i] ) )
-            aNames.push_back( aElementNames[i] );
-    }
-    return aNames.empty()
-        ?  Sequence< ::rtl::OUString >()
-        :  Sequence< ::rtl::OUString >( &aNames[0], aNames.size() );
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException)
-{
-	// not interested in
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent ) throw (RuntimeException)
-{
-	::osl::MutexGuard aGuard( m_aMutex );
-
-    if ( m_pModelImplementation )
-        m_pModelImplementation->setModified( sal_True );
-
-    if ( m_pModelImplementation && m_bPropagateCommitToRoot )
-    {
-        Reference< XStorage > xStorage( aEvent.Source, UNO_QUERY );
-        if ( m_pModelImplementation->isDatabaseStorage( xStorage ) )
-	    {
-            m_pModelImplementation->commitRootStorage();
-        }
-    }
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException)
-{
-	// not interested in
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (RuntimeException)
-{
-	// not interested in
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source ) throw ( RuntimeException )
-{
-    ODatabaseModelImpl* pImpl = m_pModelImplementation;
-    if ( pImpl )
-        pImpl->disposing( Source );
-
-    for (   NamedStorages::iterator find = m_aExposedStorages.begin();
-            find != m_aExposedStorages.end();
-            ++find
-        )
-        if ( find->second == Source.Source )
-        {
-            m_aExposedStorages.erase( find );
-            break;
-        }
-}
-
-//============================================================
-//= ODatabaseModelImpl
-//============================================================
-DBG_NAME(ODatabaseModelImpl)
-//--------------------------------------------------------------------------
-ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >& _rxFactory, ODatabaseContext& _rDBContext )
-            :m_xModel()
-            ,m_xDataSource()
-            ,m_pStorageAccess( NULL )
-            ,m_aMutex()
-            ,m_aMutexFacade( m_aMutex )
-            ,m_aContainer(4)
-            ,m_aStorages()
-            ,m_aMacroMode( *this )
-			,m_nImposedMacroExecMode( MacroExecMode::NEVER_EXECUTE )
-			,m_pDBContext( &_rDBContext )
-            ,m_refCount(0)
-            ,m_bHasAnyObjectWithMacros( false )
-            ,m_bModificationLock( false )
-            ,m_bDocumentInitialized( false )
-			,m_aContext( _rxFactory )
-			,m_nLoginTimeout(0)
-            ,m_bReadOnly(sal_False)
-			,m_bPasswordRequired(sal_False)
-			,m_bSuppressVersionColumns(sal_True)
-			,m_bModified(sal_False)
-			,m_bDocumentReadOnly(sal_False)
-            ,m_bDisposingSubStorages( sal_False )
-			,m_pSharedConnectionManager(NULL)
-			,m_nControllerLockCount(0)
-{
-	// some kind of default
-	DBG_CTOR(ODatabaseModelImpl,NULL);
-	m_sConnectURL = ::rtl::OUString::createFromAscii("jdbc:");
-	m_aTableFilter.realloc(1);
-	m_aTableFilter[0] = ::rtl::OUString::createFromAscii("%");
-	impl_construct_nothrow();
-}
-
-//--------------------------------------------------------------------------
-ODatabaseModelImpl::ODatabaseModelImpl(
-					const ::rtl::OUString& _rRegistrationName,
-					const Reference< XMultiServiceFactory >& _rxFactory,
-					ODatabaseContext& _rDBContext
-					)
-            :m_xModel()
-            ,m_xDataSource()
-            ,m_pStorageAccess( NULL )
-            ,m_aMutex()
-            ,m_aMutexFacade( m_aMutex )
-            ,m_aContainer(4)
-            ,m_aStorages()
-            ,m_aMacroMode( *this )
-			,m_nImposedMacroExecMode( MacroExecMode::NEVER_EXECUTE )
-			,m_pDBContext( &_rDBContext )
-            ,m_refCount(0)
-            ,m_bHasAnyObjectWithMacros( false )
-            ,m_bModificationLock( false )
-            ,m_bDocumentInitialized( false )
-			,m_aContext( _rxFactory )
-            ,m_sName(_rRegistrationName)
-			,m_nLoginTimeout(0)
-			,m_bReadOnly(sal_False)
-			,m_bPasswordRequired(sal_False)
-			,m_bSuppressVersionColumns(sal_True)
-			,m_bModified(sal_False)
-			,m_bDocumentReadOnly(sal_False)
-            ,m_bDisposingSubStorages( sal_False )
-			,m_pSharedConnectionManager(NULL)
-			,m_nControllerLockCount(0)
-{
-	DBG_CTOR(ODatabaseModelImpl,NULL);
-	impl_construct_nothrow();
-}
-
-//--------------------------------------------------------------------------
-ODatabaseModelImpl::~ODatabaseModelImpl()
-{
-	DBG_DTOR(ODatabaseModelImpl,NULL);
-}
-
-// -----------------------------------------------------------------------------
-void ODatabaseModelImpl::impl_construct_nothrow()
-{
-    // create the property bag to hold the settings (also known as "Info" property)
-    try
-    {
-        // the set of property value types in the bag is limited:
-        Sequence< Type > aAllowedTypes(6);
-        Type* pAllowedType = aAllowedTypes.getArray();
-        *pAllowedType++ = ::getCppuType( static_cast< sal_Bool* >( NULL ) );
-        *pAllowedType++ = ::getCppuType( static_cast< double* >( NULL ) );
-        *pAllowedType++ = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) );
-        *pAllowedType++ = ::getCppuType( static_cast< sal_Int32* >( NULL ) );
-        *pAllowedType++ = ::getCppuType( static_cast< sal_Int16* >( NULL ) );
-        *pAllowedType++ = ::getCppuType( static_cast< Sequence< Any >* >( NULL ) );
-
-        Sequence< Any > aInitArgs( 2 );
-        aInitArgs[0] <<= NamedValue(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutomaticAddition" ) ),
-            makeAny( (sal_Bool)sal_True )
-        );
-        aInitArgs[1] <<= NamedValue(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowedTypes" ) ),
-            makeAny( aAllowedTypes )
-        );
-
-        m_xSettings.set( m_aContext.createComponentWithArguments( "com.sun.star.beans.PropertyBag", aInitArgs ), UNO_QUERY_THROW );
-
-        // insert the default settings
-        Reference< XPropertyContainer > xContainer( m_xSettings, UNO_QUERY_THROW );
-        const AsciiPropertyValue* pSettings = getDefaultDataSourceSettings();
-        for ( ; pSettings->AsciiName; ++pSettings )
-        {
-            xContainer->addProperty(
-                ::rtl::OUString::createFromAscii( pSettings->AsciiName ),
-                PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT,
-                pSettings->DefaultValue
-            );
-        }
-    }
-    catch( const Exception& )
-    {
-        DBG_UNHANDLED_EXCEPTION();
-    }
-}
-
-// -----------------------------------------------------------------------------
-namespace
-{
-    // .........................................................................
-    ::rtl::OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType )
-    {
-        const sal_Char* pAsciiName( NULL );
-        switch ( _eType )
-        {
-        case ODatabaseModelImpl::E_FORM:   pAsciiName = "forms"; break;
-        case ODatabaseModelImpl::E_REPORT: pAsciiName = "reports"; break;
-        case ODatabaseModelImpl::E_QUERY:  pAsciiName = "queries"; break;
-        case ODatabaseModelImpl::E_TABLE:  pAsciiName = "tables"; break;
-        default:
-            throw RuntimeException();
-        }
-        return ::rtl::OUString::createFromAscii( pAsciiName );
-    }
-
-    // .........................................................................
-    bool lcl_hasObjectWithMacros_throw( const ODefinitionContainer_Impl& _rObjectDefinitions, const Reference< XStorage >& _rxContainerStorage )
-    {
-        bool bSomeDocHasMacros = false;
-
-        for (   ODefinitionContainer_Impl::const_iterator object = _rObjectDefinitions.begin();
-                ( object != _rObjectDefinitions.end() ) && !bSomeDocHasMacros;
-                ++object
-            )
-        {
-#if OSL_DEBUG_LEVEL > 0
-            const ::rtl::OUString& rName( object->first ); (void)rName;
-#endif
-
-            const TContentPtr& rDefinition( object->second );
-            const ::rtl::OUString& rPersistentName( rDefinition->m_aProps.sPersistentName );
-
-            if ( !rPersistentName.getLength() )
-            {   // it's a logical sub folder used to organize the real objects
-                const ODefinitionContainer_Impl& rSubFoldersObjectDefinitions( dynamic_cast< const ODefinitionContainer_Impl& >( *rDefinition.get() ) );
-                bSomeDocHasMacros = lcl_hasObjectWithMacros_throw( rSubFoldersObjectDefinitions, _rxContainerStorage );
-                continue;
-            }
-
-            bSomeDocHasMacros = ODatabaseModelImpl::objectHasMacros( _rxContainerStorage, rPersistentName );
-        }
-        return bSomeDocHasMacros;
-    }
-
-    // .........................................................................
-    bool lcl_hasObjectsWithMacros_nothrow( ODatabaseModelImpl& _rModel, const ODatabaseModelImpl::ObjectType _eType )
-    {
-        bool bSomeDocHasMacros = false;
-
-        const OContentHelper_Impl& rContainerData( *_rModel.getObjectContainer( _eType ).get() );
-        const ODefinitionContainer_Impl& rObjectDefinitions = dynamic_cast< const ODefinitionContainer_Impl& >( rContainerData );
-
-        try
-        {
-            Reference< XStorage > xContainerStorage( _rModel.getStorage(
-                _rModel.getObjectContainerStorageName( _eType ), ElementModes::READWRITE ) );
-            // note the READWRITE here: If the storage already existed before, then the OpenMode will
-            // be ignored, anyway.
-            // If the storage did not yet exist, then it will be created. If the database document
-            // is read-only, the OpenMode will be automatically downgraded to READ. Otherwise,
-            // the storage will in fact be created as READWRITE. While this is not strictly necessary
-            // for this particular use case here, it is required since the storage is *cached*, and
-            // later use cases will need the READWRITE mode.
-
-            if ( xContainerStorage.is() )
-                bSomeDocHasMacros = lcl_hasObjectWithMacros_throw( rObjectDefinitions, xContainerStorage );
-        }
-        catch( const Exception& )
-        {
-        	DBG_UNHANDLED_EXCEPTION();
-            // be on the safe side: If we can't reliably determine whether there are macros,
-            // assume there actually are. Better this way, than the other way round.
-            bSomeDocHasMacros = true;
-        }
-
-        return bSomeDocHasMacros;
-    }
-}
-
-// -----------------------------------------------------------------------------
-bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const ::rtl::OUString& _rPersistentName )
-{
-    OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" );
-
-    bool bHasMacros = true;
-    try
-    {
-        if ( !_rxContainerStorage->hasByName( _rPersistentName ) )
-            return false;
-
-        Reference< XStorage > xObjectStor( _rxContainerStorage->openStorageElement(
-            _rPersistentName, ElementModes::READ ) );
-
-        bHasMacros = ::sfx2::DocumentMacroMode::storageHasMacros( xObjectStor );
-    }
-    catch( const Exception& )
-    {
-    	DBG_UNHANDLED_EXCEPTION();
-    }
-    return bHasMacros;
-}
-
-// -----------------------------------------------------------------------------
-void ODatabaseModelImpl::reset()
-{
-	m_bReadOnly = sal_False;
-    ::std::vector< TContentPtr > aEmptyContainers( 4 );
-    m_aContainer.swap( aEmptyContainers );
-
-    if ( m_pStorageAccess )
-    {
-        m_pStorageAccess->dispose();
-        m_pStorageAccess->release();
-        m_pStorageAccess = NULL;
-    }
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL ODatabaseModelImpl::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
-{
-	Reference<XConnection> xCon(Source.Source,UNO_QUERY);
-	if ( xCon.is() )
-	{
-		bool bStore = false;
-		OWeakConnectionArray::iterator aEnd = m_aConnections.end();
-		for (OWeakConnectionArray::iterator i = m_aConnections.begin(); aEnd != i; ++i)
-		{
-			if ( xCon == i->get() )
-			{
-				*i = OWeakConnection();
-                bStore = true;
-                break;
-			}
-		}
-
-		if ( bStore )
-            commitRootStorage();
-	}
-	else // storage
-	{
-        if ( !m_bDisposingSubStorages )
-        {
-		    Reference<XStorage> xStorage(Source.Source,UNO_QUERY);
-		    TStorages::iterator aFind = ::std::find_if(m_aStorages.begin(),m_aStorages.end(),
-											    ::std::compose1(::std::bind2nd(::std::equal_to<Reference<XStorage> >(),xStorage),::std::select2nd<TStorages::value_type>()));
-		    if ( aFind != m_aStorages.end() )
-			    m_aStorages.erase(aFind);
-        }
-	}
-}
-//------------------------------------------------------------------------------
-void ODatabaseModelImpl::clearConnections()
-{
-    OWeakConnectionArray aConnections;
-    aConnections.swap( m_aConnections );
-
-	Reference< XConnection > xConn;
-	for ( OWeakConnectionArray::iterator i = aConnections.begin(); aConnections.end() != i; ++i )
-	{
-		xConn = *i;
-		if ( xConn.is() )
-		{
-			try
-			{
-				xConn->close();
-			}
-			catch(const Exception&)
-			{
-				DBG_UNHANDLED_EXCEPTION();
-			}
-		}
-	}
-
-    m_pSharedConnectionManager = NULL;
-	m_xSharedConnectionManager = NULL;
-}
-//------------------------------------------------------------------------------
-void ODatabaseModelImpl::dispose()
-{
-    // dispose the data source and the model
-    try
-    {
-        Reference< XDataSource > xDS( m_xDataSource );
-		::comphelper::disposeComponent( xDS );
-
-        Reference< XModel > xModel( m_xModel );
-        ::comphelper::disposeComponent( xModel );
-    }
-    catch( const Exception& )
-    {
-        DBG_UNHANDLED_EXCEPTION();
-    }
-	m_xDataSource = WeakReference<XDataSource>();
-    m_xModel = WeakReference< XModel >();
-
-	::std::vector<TContentPtr>::iterator aIter = m_aContainer.begin();
-	::std::vector<TContentPtr>::iterator aEnd = m_aContainer.end();
-	for (;aIter != aEnd ; ++aIter)
-	{
-		if ( aIter->get() )
-			(*aIter)->m_pDataSource = NULL;
-	}
-	m_aContainer.clear();
-
-	clearConnections();
-
-	m_xNumberFormatsSupplier = NULL;
-
-    try
-	{
-        sal_Bool bStore = commitEmbeddedStorage();
-        disposeStorages();
-        if ( bStore )
-            commitRootStorage();
-
-        impl_switchToStorage_throw( NULL );
-	}
-	catch( const Exception& )
-	{
-        DBG_UNHANDLED_EXCEPTION();
-	}
-
-    if ( m_pStorageAccess )
-    {
-        m_pStorageAccess->dispose();
-        m_pStorageAccess->release();
-        m_pStorageAccess = NULL;
-    }
-}
-// -----------------------------------------------------------------------------
-const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormatsSupplier()
-{
-	if (!m_xNumberFormatsSupplier.is())
-	{
-		// the arguments : the locale of the current user
-		UserInformation aUserInfo;
-		Sequence< Any > aArguments(1);
-		aArguments.getArray()[0] <<= aUserInfo.getUserLanguage();
-
-        m_xNumberFormatsSupplier.set(
-            m_aContext.createComponentWithArguments( "com.sun.star.util.NumberFormatsSupplier", aArguments ), UNO_QUERY_THROW );
-		DBG_ASSERT(m_xNumberFormatsSupplier.is(), "ODatabaseModelImpl::getNumberFormatsSupplier : could not instantiate the formats supplier !");
-	}
-	return m_xNumberFormatsSupplier;
-}
-// -----------------------------------------------------------------------------
-void ODatabaseModelImpl::attachResource( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArgs )
-{
-    ::comphelper::NamedValueCollection aMediaDescriptor( _rArgs );
-
-    ::rtl::OUString sDocumentLocation( aMediaDescriptor.getOrDefault( "SalvagedFile", _rURL ) );
-    if ( !sDocumentLocation.getLength() )
-        // this indicates "the document is being recovered, but _rURL already is the real document URL,
-        // not the temporary document location"
-        sDocumentLocation = _rURL;
-
-    if ( aMediaDescriptor.has( "SalvagedFile" ) )
-        aMediaDescriptor.remove( "SalvagedFile" );
-
-    m_aArgs = stripLoadArguments( aMediaDescriptor );
-
-    switchToURL( sDocumentLocation, _rURL );
-}
-
-// -----------------------------------------------------------------------------
-Sequence< PropertyValue > ODatabaseModelImpl::stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments )
-{
-    OSL_ENSURE( !_rArguments.has( "Model" ), "ODatabaseModelImpl::stripLoadArguments: this is suspicious (1)!" );
-    OSL_ENSURE( !_rArguments.has( "ViewName" ), "ODatabaseModelImpl::stripLoadArguments: this is suspicious (2)!" );
-
-    ::comphelper::NamedValueCollection aMutableArgs( _rArguments );
-    aMutableArgs.remove( "Model" );
-    aMutableArgs.remove( "ViewName" );
-    return aMutableArgs.getPropertyValues();
-}
-
-// -----------------------------------------------------------------------------
-void ODatabaseModelImpl::disposeStorages() SAL_THROW(())
-{
-    m_bDisposingSubStorages = sal_True;
-
-	TStorages::iterator aEnd = m_aStorages.end();
-	for ( TStorages::iterator aIter = m_aStorages.begin();
-          aIter != aEnd ;
-          ++aIter
-        )
-	{
-        try
-        {
-		    ::comphelper::disposeComponent( aIter->second );
-        }
-        catch( const Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-        }
-	}
-	m_aStorages.clear();
-
-    m_bDisposingSubStorages = sal_False;
-}
-// -----------------------------------------------------------------------------
-Reference< XSingleServiceFactory > ODatabaseModelImpl::createStorageFactory() const
-{
-    return Reference< XSingleServiceFactory >( m_aContext.createComponent( "com.sun.star.embed.StorageFactory" ), UNO_QUERY_THROW );
-}
-// -----------------------------------------------------------------------------
-void ODatabaseModelImpl::commitRootStorage()
-{
-    Reference< XStorage > xStorage( getOrCreateRootStorage() );
-#if OSL_DEBUG_LEVEL > 0
-    bool bSuccess =
-#endif
-    commitStorageIfWriteable_ignoreErrors( xStorage );
-    OSL_ENSURE( bSuccess || !xStorage.is(),
-        "ODatabaseModelImpl::commitRootStorage: could commit the storage!" );
-}
-// -----------------------------------------------------------------------------
-Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
-{
-	if ( !m_xDocumentStorage.is() )
-	{
-		Reference< XSingleServiceFactory> xStorageFactory = createStorageFactory();
-        if ( xStorageFactory.is() )
-		{
-            Any aSource;
-            ::comphelper::NamedValueCollection aArgs( m_aArgs );
-
-            aSource = aArgs.get( "Stream" );
-            if ( !aSource.hasValue() )
-                aSource = aArgs.get( "InputStream" );
-            if ( !aSource.hasValue() && m_sDocFileLocation.getLength() )
-                aSource <<= m_sDocFileLocation;
-            // TODO: shouldn't we also check URL?
-
-            OSL_ENSURE( aSource.hasValue(), "ODatabaseModelImpl::getOrCreateRootStorage: no source to create the storage from!" );
-
-            if ( aSource.hasValue() )
-            {
-			    Sequence< Any > aStorageCreationArgs(2);
-                aStorageCreationArgs[0] = aSource;