diff options
Diffstat (limited to 'dbaccess/inc')
-rw-r--r-- | dbaccess/inc/AsyncronousLink.hxx | 6 | ||||
-rw-r--r-- | dbaccess/inc/IController.hxx | 32 | ||||
-rw-r--r-- | dbaccess/inc/IEnvironment.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/IReference.hxx | 4 | ||||
-rw-r--r-- | dbaccess/inc/ToolBoxHelper.hxx | 22 | ||||
-rw-r--r-- | dbaccess/inc/controllerframe.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/dataview.hxx | 18 | ||||
-rw-r--r-- | dbaccess/inc/dbaccess_helpid.hrc | 794 | ||||
-rw-r--r-- | dbaccess/inc/dbaccess_slotid.hrc | 132 | ||||
-rw-r--r-- | dbaccess/inc/dbaccessdllapi.h | 8 | ||||
-rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 78 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.cxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.hxx | 2 | ||||
-rw-r--r-- | dbaccess/inc/singledoccontroller.hxx | 30 |
14 files changed, 566 insertions, 566 deletions
diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx index 93faab850163..36334a8684d3 100644 --- a/dbaccess/inc/AsyncronousLink.hxx +++ b/dbaccess/inc/AsyncronousLink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,11 +50,11 @@ namespace dbaui protected: ::osl::Mutex m_aEventSafety; ::osl::Mutex m_aDestructionSafety; - ULONG m_nEventId; + ULONG m_nEventId; public: /** constructs the object - @param _rHandler The link to be called asyncronously + @param _rHandler The link to be called asyncronously */ OAsyncronousLink( const Link& _rHandler ); virtual ~OAsyncronousLink(); diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 962782ea5e18..81a358175c88 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,43 +52,43 @@ namespace dbaui { public: /** executes the given command without checking if it is allowed - @param _rCommand the URL of the command + @param _rCommand the URL of the command */ virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command only when it is allowed - @param _rCommand + @param _rCommand the URL of the command */ virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command without checking if it is allowed - @param _nCommandId - the id of the command URL + @param _nCommandId + the id of the command URL */ virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command only when it is allowed - @param _nCommandId - the id of the command URL + @param _nCommandId + the id of the command URL */ virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** checks if the given Command is enabled - @param _nCommandId - the id of the command URL - - @return + @param _nCommandId + the id of the command URL + + @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0; /** checks if the given Command is enabled - @param _rCompleteCommandURL + @param _rCompleteCommandURL the URL of the command - - @return + + @return <TRUE/> if the command is allowed, otherwise <FALSE/>. */ virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0; @@ -108,13 +108,13 @@ namespace dbaui registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0; /** notifyHiContrastChanged will be called when the hicontrast mode changed. - @param _bHiContrast + @param _bHiContrast <TRUE/> when in hicontrast mode. */ virtual void notifyHiContrastChanged() = 0; /** checks if the selected data source is read only - @return + @return <TRUE/> if read only, otherwise <FALSE/> */ virtual sal_Bool isDataSourceReadOnly() const = 0; diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx index 64ad54844912..3033623e76c2 100644 --- a/dbaccess/inc/IEnvironment.hxx +++ b/dbaccess/inc/IEnvironment.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/IReference.hxx b/dbaccess/inc/IReference.hxx index 01534f6063e0..bd2e45927bd1 100644 --- a/dbaccess/inc/IReference.hxx +++ b/dbaccess/inc/IReference.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,6 +41,6 @@ namespace dbaui }; } #endif // DBAUI_IREFERENCE_HXX - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index e95e40a0f4a1..49d41b74959e 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,41 +43,41 @@ namespace dbaui { class DBACCESS_DLLPUBLIC OToolBoxHelper { - sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode - sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps - ToolBox* m_pToolBox; // our toolbox (may be NULL) + sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode + sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps + ToolBox* m_pToolBox; // our toolbox (may be NULL) public: OToolBoxHelper(); virtual ~OToolBoxHelper(); /** will be called when the controls need to be resized. - @param _rDiff + @param _rDiff Contains the difference of the old and new toolbox size. */ virtual void resizeControls(const Size& _rDiff) = 0; /** will be called when the image list is needed. - @param _eSymbolsSize + @param _eSymbolsSize <svtools/imgdef.hxx> - @param _bHiContast + @param _bHiContast <TRUE/> when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0; /** only the member will be set, derived classes can overload this function and do what need to be done. - @param _pTB + @param _pTB The new ToolBox. @attention Must be called after a FreeResource() call. */ - virtual void setToolBox(ToolBox* _pTB); + virtual void setToolBox(ToolBox* _pTB); - inline ToolBox* getToolBox() const { return m_pToolBox; } + inline ToolBox* getToolBox() const { return m_pToolBox; } /** checks if the toolbox needs a new imagelist. */ void checkImageList(); - + inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } protected: DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx index 19daaebb3d69..7fb7bd7c3895 100644 --- a/dbaccess/inc/controllerframe.hxx +++ b/dbaccess/inc/controllerframe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index e3026f15ce56..ac3e56211426 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,19 +40,19 @@ class SvtMiscOptions; namespace dbaui { class IController; - class DBACCESS_DLLPUBLIC ODataView : public Window + class DBACCESS_DLLPUBLIC ODataView : public Window { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with protected: - IController& m_rController; // the controller in where we resides in - FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) + IController& m_rController; // the controller in where we resides in + FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: - ODataView( Window* pParent, + ODataView( Window* pParent, IController& _rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , WinBits nStyle = 0 ); virtual ~ODataView(); @@ -71,8 +71,8 @@ namespace dbaui */ virtual void resizeControls(const Size& /*_rDiff*/) { Resize(); } - void enableSeparator( const sal_Bool _bEnable = sal_True ); - sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; } + void enableSeparator( const sal_Bool _bEnable = sal_True ); + sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; } ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xServiceFactory;} diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 22d1ceb11368..0dcf6d624a00 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,324 +29,324 @@ #define _DBA_DBACCESS_HELPID_HRC_ #ifndef _SOLAR_HRC -#include <svl/solar.hrc> // HID_DBACCESS_START +#include <svl/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_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) -#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279) -#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_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) +#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279) +#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_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) #define HID_BROWSER_ADMINISTRATE (HID_DBACCESS_START + 296) @@ -354,116 +354,116 @@ #define HID_DSADMIN_CHECK_REQUIRED_FIELDS (HID_DBACCESS_START + 298) #define HID_DSADMIN_ESCAPE_DATETIME (HID_DBACCESS_START + 299) -#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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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) #define HID_DSADMIN_PRIMARY_KEY_SUPPORT ( HID_DBACCESS_START + 385) // 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) +#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 diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index c273a67edcbd..6ecd68d05f53 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,82 +32,82 @@ #include <sfx2/sfxsids.hrc> #endif -#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) -#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) -#define SID_DB_NEW ( SID_DBACCESS_START + 2 ) -#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 ) -#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 ) -#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 ) +#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) +#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) +#define SID_DB_NEW ( SID_DBACCESS_START + 2 ) +#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 ) +#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 ) +#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 ) // free -#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 ) -#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 ) -#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 ) -#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 ) -#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 ) -#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 ) -#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 ) -#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 ) -#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 ) -#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 ) -#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 ) -#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 ) -#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 ) -#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 ) -#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 ) -#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 ) -#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 ) +#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 ) +#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 ) +#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 ) +#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 ) +#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 ) +#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 ) +#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 ) +#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 ) +#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 ) +#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 ) +#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 ) +#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 ) +#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 ) +#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 ) +#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 ) +#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 ) +#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 ) -#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 ) -#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 ) -#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 ) -#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 ) +#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 ) +#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 ) +#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 ) +#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 ) -#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 ) -#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 ) -#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 ) -#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 ) +#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 ) +#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 ) +#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 ) +#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 ) -#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 ) -#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 ) -#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 ) -#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 ) +#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 ) +#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 ) +#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 ) +#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 ) -#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 ) -#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 ) -#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 ) -#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 ) +#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 ) +#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 ) +#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 ) +#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 ) -#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 ) -#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 ) -#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 ) -#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 ) +#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 ) +#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 ) +#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 ) +#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 ) -#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 ) -#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 ) -#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 ) -#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 ) -#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 ) -#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 ) -#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 ) -#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 ) -#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 ) -#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 ) -#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 ) -#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 ) +#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 ) +#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 ) +#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 ) +#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 ) +#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 ) +#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 ) +#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 ) +#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 ) +#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 ) +#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 ) +#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 ) +#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 ) // status information -#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 ) -#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 ) -#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 ) -#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 ) +#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 ) +#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 ) +#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 ) +#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 ) -#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 ) -#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) -#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) -#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) -#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) +#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 ) +#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) +#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) +#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) +#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) -#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) +#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) #endif // _DBACCESS_SLOTID_HRC_ diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 7365d0c4c84f..5b28a894fe22 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,18 +28,18 @@ #ifndef INCLUDED_DBACCESSDLLAPI_H #define INCLUDED_DBACCESSDLLAPI_H - + #ifndef _SAL_TYPES_H_ #include "sal/types.h" #endif - + #if defined(DBACCESS_DLLIMPLEMENTATION) #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_DBACCESSDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 510e554e93f6..d31229fbc04f 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ namespace dbaui */ struct FeatureState { - sal_Bool bEnabled; + sal_Bool bEnabled; optional< bool > bChecked; optional< bool > bInvisible; @@ -173,8 +173,8 @@ namespace dbaui { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; - sal_Int32 nId; - sal_Bool bForceBroadcast; + sal_Int32 nId; + sal_Bool bForceBroadcast; }; // .................................................................... @@ -214,15 +214,15 @@ namespace dbaui ,public IController { private: - SupportedFeatures m_aSupportedFeatures; + SupportedFeatures m_aSupportedFeatures; ::comphelper::NamedValueCollection m_aInitParameters; ::std::auto_ptr< OGenericUnoController_Data > m_pData; - ODataView* m_pView; // our (VCL) "main window" + ODataView* m_pView; // our (VCL) "main window" -#ifdef DBG_UTIL +#ifdef DBG_UTIL bool m_bDescribingSupportedFeatures; #endif @@ -231,8 +231,8 @@ namespace dbaui // attributes struct DispatchTarget { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; DispatchTarget() { } DispatchTarget(const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef) : aURL(rURL), xListener(xRef) { } @@ -243,32 +243,32 @@ namespace dbaui FeatureListeners m_aFeaturesToInvalidate; - ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque - StateCache m_aStateCache; // save the current status of feature state - Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes - OAsyncronousLink m_aAsyncInvalidateAll; - OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed + ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque + StateCache m_aStateCache; // save the current status of feature state + Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes + OAsyncronousLink m_aAsyncInvalidateAll; + OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; ControllerFrame m_aCurrentFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper; - sal_Bool m_bPreview; - sal_Bool m_bReadOnly; - - sal_Bool m_bCurrentlyModified : 1; - sal_Bool m_bExternalTitle : 1; + sal_Bool m_bPreview; + sal_Bool m_bReadOnly; + sal_Bool m_bCurrentlyModified : 1; + sal_Bool m_bExternalTitle : 1; + // ---------------------------------------------------------------- // attribute access - ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } - ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } + ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } + ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } // ---------------------------------------------------------------- // methods @@ -278,13 +278,13 @@ namespace dbaui /** open the help agent for the given help id. - @param _nHelpId + @param _nHelpId The help id to dispatch. */ void openHelpAgent(sal_Int32 _nHelpId); /** open the help agent for the given help url. - @param _pHelpStringURL + @param _pHelpStringURL The help url to dispatch. */ void openHelpAgent( const rtl::OUString& _suHelpStringURL ); @@ -300,22 +300,22 @@ namespace dbaui void closeTask(); // if getMenu returns a non empty string than this will be dispatched at the frame - virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); + virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); /** called when our menu has been loaded into our frame, can be used to load sub toolbars @param _xLayoutManager The layout manager. */ - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); + virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); /** describes a feature supported by the controller @@ -337,7 +337,7 @@ namespace dbaui ); /** returns <TRUE/> if the feature is supported, otherwise <FALSE/> - @param _nId + @param _nId The ID of the feature. */ sal_Bool isFeatureSupported( sal_Int32 _nId ); @@ -435,7 +435,7 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); /** get the layout manager - @param _xFrame + @param _xFrame The frame to ask for the layout manager. @return The layout manager of the frame, can be <NULL/> if the frame isn't initialized. @@ -483,9 +483,9 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::frame::XDispatch - virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException); @@ -504,7 +504,7 @@ namespace dbaui virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx index 0fe2c43d1189..a5a4e8af7fa8 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.cxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index daa7a324ab60..dc926527e617 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index 75e146ec2a05..7b61d7fad3db 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,22 +74,22 @@ namespace dbaui ::std::auto_ptr<OSingleDocumentControllerImpl> m_pImpl; protected: - SfxUndoManager m_aUndoManager; + SfxUndoManager m_aUndoManager; private: /** forces usage of a connection which we do not own <p>To be used from within XInitialization::initialize, resp. impl_initialize, only.</p> */ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); protected: // OGenericUnoController - initialization virtual void impl_initialize(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const; @@ -98,8 +98,8 @@ namespace dbaui public: - sal_Bool isReadOnly() const; - sal_Bool isEditable() const; + sal_Bool isReadOnly() const; + sal_Bool isEditable() const; void setEditable(sal_Bool _bEditable); // need for undo's and redo's @@ -107,13 +107,13 @@ namespace dbaui /** addUndoActionAndInvalidate adds an undo action to the undoManager, additionally invalidates the UNDO and REDO slot - @param pAction the undo action to add + @param pAction the undo action to add */ void addUndoActionAndInvalidate(SfxUndoAction *pAction); // ---------------------------------------------------------------- // asking for connection-related stuff - - sal_Bool isConnected() const; + + sal_Bool isConnected() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > getMetaData( ) const; @@ -123,7 +123,7 @@ namespace dbaui ::rtl::OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getDataSource() const; - sal_Bool haveDataSource() const; + sal_Bool haveDataSource() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getDatabaseDocument() const; @@ -171,7 +171,7 @@ namespace dbaui /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); @@ -197,7 +197,7 @@ namespace dbaui virtual void disconnect(); virtual void reconnect( sal_Bool _bUI ); - sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } + sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } /** called when our connection is beeing disposed <p>The default implementation does a reconnect</p> @@ -215,7 +215,7 @@ namespace dbaui virtual void SAL_CALL disposing(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -228,7 +228,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_SINGLEDOCCONTROLLER_HXX |