[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk l10ntools/source
Caolán McNamara
caolanm at redhat.com
Wed Jan 29 05:38:54 PST 2014
dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/inc/dbaccess_helpid.hrc | 20 -
dbaccess/source/ui/dlg/advancedsettings.cxx | 161 +++--------
dbaccess/source/ui/dlg/advancedsettings.hxx | 1
dbaccess/source/ui/dlg/advancedsettings.src | 280 --------------------
dbaccess/source/ui/inc/dbu_resource.hrc | 2
dbaccess/uiconfig/ui/specialsettingspage.ui | 389 ++++++++++++++++++++++++++++
l10ntools/source/export.cxx | 3
8 files changed, 448 insertions(+), 409 deletions(-)
New commits:
commit ccb5f1a7914ae857a447a7dceacc62344b8c78af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 29 13:31:52 2014 +0000
coverity#1158098 Explicit null dereferenced
Change-Id: Id21a206df7d9c221fabf8503d959bfe314217214
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5694edf..a1a2bc4 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -853,6 +853,9 @@ void Export::InsertListEntry(const OString &rLine)
{
ResData *pResData = ( nLevel-1 < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
+ if (!pResData)
+ std::exit(EXIT_FAILURE);
+
if( pResData->m_aList.empty() )
nListIndex = 0;
commit 6459d7beb1235ed0cd2381c60f74c6c52479858d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 29 13:27:54 2014 +0000
convert special settings page to .ui
Change-Id: Ic69f35f4bd6c27bffa407c6d6c5046c66ca1173a
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 62f3f3b..4ad2038 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/generalpagewizard \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/rowheightdialog \
+ dbaccess/uiconfig/ui/specialsettingspage \
dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 0204cdb..dcb940d 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -60,7 +60,6 @@
#define HID_DSADMIN_ALL_TABLES "DBACCESS_HID_DSADMIN_ALL_TABLES"
#define HID_DSADMIN_NO_TABLES "DBACCESS_HID_DSADMIN_NO_TABLES"
#define HID_DSADMIN_SELECT_TABLES "DBACCESS_HID_DSADMIN_SELECT_TABLES"
-#define HID_DSADMIN_SUPPRESS_VERSIONCL "DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL"
#define HID_GENERIC_SQL_ERROR "DBACCESS_HID_GENERIC_SQL_ERROR"
@@ -237,7 +236,6 @@
#define HID_BROWSER_SAVE_RECORD "DBACCESS_HID_BROWSER_SAVE_RECORD"
#define HID_BROWSER_UNDO_RECORD "DBACCESS_HID_BROWSER_UNDO_RECORD"
-#define HID_DSADMIN_SQL92CHECK "DBACCESS_HID_DSADMIN_SQL92CHECK"
#define HID_DSADMIN_AUTOINCREMENTVALUE "DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE"
#define HID_DOCUMENT_CREATE_REPWIZ "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
#define HID_TAB_AUTOINCREMENTVALUE "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
@@ -266,9 +264,7 @@
#define HID_DSADMIN_PAGE_MSACCESS "DBACCESS_HID_DSADMIN_PAGE_MSACCESS"
#define HID_DSADMIN_FLAT_PATH "DBACCESS_HID_DSADMIN_FLAT_PATH"
#define HID_DSADMIN_CALC_PATH "DBACCESS_HID_DSADMIN_CALC_PATH"
-#define HID_DSADMIN_BOOLEANCOMPARISON "DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON"
#define HID_DSADMIN_ORACLE_DATABASE "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
-#define HID_DSADMIN_MAXROWSCAN "DBACCESS_HID_DSADMIN_MAXROWSCAN"
#define UID_APP_VIEW "DBACCESS_UID_APP_VIEW"
#define HID_APP_TABLE_TREE "DBACCESS_HID_APP_TABLE_TREE"
@@ -282,9 +278,6 @@
#define UID_APP_SWAP_VIEW "DBACCESS_UID_APP_SWAP_VIEW"
#define HID_APP_SWAP_ICONCONTROL "DBACCESS_HID_APP_SWAP_ICONCONTROL"
-#define HID_DSADMIN_APPENDTABLEALIAS "DBACCESS_HID_DSADMIN_APPENDTABLEALIAS"
-#define HID_DSADMIN_PARAMETERNAMESUBST "DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST"
-#define HID_DSADMIN_IGNOREDRIVER_PRIV "DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV"
#define HID_DSADMIN_HOSTNAME "DBACCESS_HID_DSADMIN_HOSTNAME"
#define HID_DSADMIN_PORTNUMBER "DBACCESS_HID_DSADMIN_PORTNUMBER"
@@ -305,7 +298,6 @@
#define HID_APP_VIEW_PREVIEW_3 "DBACCESS_HID_APP_VIEW_PREVIEW_3"
#define HID_DSADMIN_TYPE_DIALOG "DBACCESS_HID_DSADMIN_TYPE_DIALOG"
-#define HID_DSADMIN_ENABLEOUTERJOIN "DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN"
#define HID_DSADMIN_USERADMIN "DBACCESS_HID_DSADMIN_USERADMIN"
#define HID_DBWIZ_PREVIOUS "DBACCESS_HID_DBWIZ_PREVIOUS"
@@ -314,17 +306,8 @@
#define HID_DBWIZ_FINISH "DBACCESS_HID_DBWIZ_FINISH"
#define UID_DBWIZ_HELP "DBACCESS_UID_DBWIZ_HELP"
-#define HID_DSADMIN_CATALOG "DBACCESS_HID_DSADMIN_CATALOG"
-#define HID_DSADMIN_SCHEMA "DBACCESS_HID_DSADMIN_SCHEMA"
-#define HID_DSADMIN_IGNOREINDEXAPPENDIX "DBACCESS_HID_DSADMIN_IGNOREINDEXAPPENDIX"
-#define HID_DSADMIN_DOSLINEENDS "DBACCESS_HID_DSADMIN_DOSLINEENDS"
-
#define HID_BROWSER_ADMINISTRATE "DBACCESS_HID_BROWSER_ADMINISTRATE"
-#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME "DBACCESS_HID_DSADMIN_AS_BEFORE_CORRELATION_NAME"
-#define HID_DSADMIN_CHECK_REQUIRED_FIELDS "DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS"
-#define HID_DSADMIN_ESCAPE_DATETIME "DBACCESS_HID_DSADMIN_ESCAPE_DATETIME"
-
#define HID_PAGE_DBWIZARD_GENERALPAGE "DBACCESS_HID_PAGE_DBWIZARD_GENERALPAGE"
#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE"
#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE"
@@ -400,10 +383,7 @@
#define HID_EXTENSION_NOT_PRESENT_DLG "DBACCESS_HID_EXTENSION_NOT_PRESENT_DLG"
#define HID_DLG_QRY_JOIN_CONTROL "DBACCESS_HID_DLG_QRY_JOIN_CONTROL"
-#define HID_DSADMIN_IGNORECURRENCY "DBACCESS_HID_DSADMIN_IGNORECURRENCY"
#define HID_MACRO_MIGRATION_BACKUP_LOCATION "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION"
-#define HID_DSADMIN_PRIMARY_KEY_SUPPORT "DBACCESS_HID_DSADMIN_PRIMARY_KEY_SUPPORT"
-#define HID_DSADMIN_RESPECTRESULTSETTYPE "DBACCESS_HID_DSADMIN_RESPECTRESULTSETTYPE"
// this one below have hid in number space HID_SBA_START
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 68c552c..898ddaf 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -51,39 +51,39 @@ namespace dbaui
struct BooleanSettingDesc
{
CheckBox** ppControl; // the dialog's control which displays this setting
- sal_uInt16 nControlResId; // the resource ID to load the control from
- sal_uInt16 nItemId; // the ID of the item (in an SfxItemSet) which corresponds to this setting
+ OString sControlId; // the widget name of the control in the .ui
+ sal_uInt16 nItemId; // the ID of the item (in an SfxItemSet) which corresponds to this setting
bool bInvertedDisplay; // true if and only if the checkbox is checked when the item is sal_False, and vice versa
};
// SpecialSettingsPage
SpecialSettingsPage::SpecialSettingsPage( Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta )
- :OGenericAdministrationPage( pParent, ModuleRes( PAGE_ADVANCED_SETTINGS_SPECIAL ), _rCoreAttrs )
- ,m_aTopLine( this, ModuleRes( FL_DATAHANDLING ) )
- ,m_pIsSQL92Check( NULL )
- ,m_pAppendTableAlias( NULL )
- ,m_pAsBeforeCorrelationName( NULL )
- ,m_pEnableOuterJoin( NULL )
- ,m_pIgnoreDriverPrivileges( NULL )
- ,m_pParameterSubstitution( NULL )
- ,m_pSuppressVersionColumn( NULL )
- ,m_pCatalog( NULL )
- ,m_pSchema( NULL )
- ,m_pIndexAppendix( NULL )
- ,m_pDosLineEnds( NULL )
- ,m_pCheckRequiredFields( NULL )
- ,m_pIgnoreCurrency(NULL)
- ,m_pEscapeDateTime(NULL)
- ,m_pPrimaryKeySupport(NULL)
- ,m_pRespectDriverResultSetType(NULL)
- ,m_pBooleanComparisonModeLabel( NULL )
- ,m_pBooleanComparisonMode( NULL )
- ,m_pMaxRowScanLabel( NULL )
- ,m_pMaxRowScan( NULL )
- ,m_aControlDependencies()
- ,m_aBooleanSettings()
- ,m_bHasBooleanComparisonMode( _rDSMeta.getFeatureSet().has( DSID_BOOLEANCOMPARISON ) )
- ,m_bHasMaxRowScan( _rDSMeta.getFeatureSet().has( DSID_MAX_ROW_SCAN ) )
+ : OGenericAdministrationPage(pParent, "SpecialSettingsPage",
+ "dbaccess/ui/specialsettingspage.ui", _rCoreAttrs)
+ , m_pIsSQL92Check( NULL )
+ , m_pAppendTableAlias( NULL )
+ , m_pAsBeforeCorrelationName( NULL )
+ , m_pEnableOuterJoin( NULL )
+ , m_pIgnoreDriverPrivileges( NULL )
+ , m_pParameterSubstitution( NULL )
+ , m_pSuppressVersionColumn( NULL )
+ , m_pCatalog( NULL )
+ , m_pSchema( NULL )
+ , m_pIndexAppendix( NULL )
+ , m_pDosLineEnds( NULL )
+ , m_pCheckRequiredFields( NULL )
+ , m_pIgnoreCurrency(NULL)
+ , m_pEscapeDateTime(NULL)
+ , m_pPrimaryKeySupport(NULL)
+ , m_pRespectDriverResultSetType(NULL)
+ , m_pBooleanComparisonModeLabel( NULL )
+ , m_pBooleanComparisonMode( NULL )
+ , m_pMaxRowScanLabel( NULL )
+ , m_pMaxRowScan( NULL )
+ , m_aControlDependencies()
+ , m_aBooleanSettings()
+ , m_bHasBooleanComparisonMode( _rDSMeta.getFeatureSet().has( DSID_BOOLEANCOMPARISON ) )
+ , m_bHasMaxRowScan( _rDSMeta.getFeatureSet().has( DSID_MAX_ROW_SCAN ) )
{
impl_initBooleanSettings();
@@ -97,8 +97,7 @@ namespace dbaui
sal_uInt16 nItemId = setting->nItemId;
if ( rFeatures.has( nItemId ) )
{
- sal_uInt16 nResourceId = setting->nControlResId;
- (*setting->ppControl) = new CheckBox( this, ModuleRes( nResourceId ) );
+ get((*setting->ppControl), setting->sControlId);
(*setting->ppControl)->SetClickHdl( getControlModifiedLink() );
// check whether this must be a tristate check box
@@ -112,85 +111,33 @@ namespace dbaui
// make m_pAsBeforeCorrelationName depend on m_pAppendTableAlias
m_aControlDependencies.enableOnCheckMark( *m_pAppendTableAlias, *m_pAsBeforeCorrelationName );
- // move the controls to the appropriate positions
- Point aPos( m_aTopLine.GetPosPixel() );
- aPos.Move( 0, m_aTopLine.GetSizePixel().Height() );
- Size aFirstDistance( LogicToPixel( Size( INDENTED_X, RELATED_CONTROLS ), MAP_APPFONT ) );
- aPos.Move( aFirstDistance.Width(), aFirstDistance.Height() );
-
Size aUnrelatedControls( LogicToPixel( Size( RELATED_CONTROLS, RELATED_CONTROLS ), MAP_APPFONT ) );
- for ( BooleanSettingDescs::const_iterator setting = m_aBooleanSettings.begin();
- setting != m_aBooleanSettings.end();
- ++setting
- )
- {
- if ( !*setting->ppControl )
- continue;
-
- (*setting->ppControl)->SetPosPixel( aPos );
- aPos.Move( 0, (*setting->ppControl)->GetSizePixel().Height() );
- aPos.Move( 0, aUnrelatedControls.Height() );
- }
-
// create the controls for the boolean comparison mode
if ( m_bHasBooleanComparisonMode )
{
- m_pBooleanComparisonModeLabel = new FixedText( this, ModuleRes( FT_BOOLEANCOMPARISON ) );
- m_pBooleanComparisonMode = new ListBox( this, ModuleRes( LB_BOOLEANCOMPARISON ) );
+ get(m_pBooleanComparisonModeLabel, "comparisonft");
+ get(m_pBooleanComparisonMode, "comparison");
m_pBooleanComparisonMode->SetDropDownLineCount( 4 );
m_pBooleanComparisonMode->SetSelectHdl( getControlModifiedLink() );
-
- Point aLabelPos( m_pBooleanComparisonModeLabel->GetPosPixel() );
- Point aControlPos( m_pBooleanComparisonMode->GetPosPixel() );
- long nMoveUp = aControlPos.Y() - aPos.Y();
-
- m_pBooleanComparisonModeLabel->SetPosPixel( Point( aLabelPos.X(), aLabelPos.Y() - nMoveUp ) );
- m_pBooleanComparisonMode->SetPosPixel( Point( aControlPos.X(), aControlPos.Y() - nMoveUp ) );
+ m_pBooleanComparisonModeLabel->Show();
+ m_pBooleanComparisonMode->Show();
}
// create the controls for the max row scan
if ( m_bHasMaxRowScan )
{
- m_pMaxRowScanLabel = new FixedText( this, ModuleRes( FT_MAXROWSCAN ) );
- m_pMaxRowScan = new NumericField( this, ModuleRes( NF_MAXROWSCAN ) );
+ get(m_pMaxRowScanLabel, "rowsft");
+ get(m_pMaxRowScan, "rows");
m_pMaxRowScan->SetModifyHdl(getControlModifiedLink());
m_pMaxRowScan->SetUseThousandSep(sal_False);
-
- Point aLabelPos( m_pMaxRowScanLabel->GetPosPixel() );
- Point aControlPos( m_pMaxRowScan->GetPosPixel() );
- long nMoveUp = aControlPos.Y() - aPos.Y();
-
- m_pMaxRowScanLabel->SetPosPixel( Point( aLabelPos.X(), aLabelPos.Y() - nMoveUp ) );
- m_pMaxRowScan->SetPosPixel( Point( aControlPos.X(), aControlPos.Y() - nMoveUp ) );
+ m_pMaxRowScanLabel->Show();
+ m_pMaxRowScan->Show();
}
-
- FreeResource();
}
SpecialSettingsPage::~SpecialSettingsPage()
{
m_aControlDependencies.clear();
-
- DELETEZ( m_pIsSQL92Check );
- DELETEZ( m_pAppendTableAlias );
- DELETEZ( m_pAsBeforeCorrelationName );
- DELETEZ( m_pParameterSubstitution );
- DELETEZ( m_pIgnoreDriverPrivileges );
- DELETEZ( m_pSuppressVersionColumn );
- DELETEZ( m_pEnableOuterJoin );
- DELETEZ( m_pCatalog );
- DELETEZ( m_pSchema );
- DELETEZ( m_pIndexAppendix );
- DELETEZ( m_pDosLineEnds );
- DELETEZ( m_pCheckRequiredFields );
- DELETEZ( m_pIgnoreCurrency );
- DELETEZ( m_pEscapeDateTime );
- DELETEZ( m_pPrimaryKeySupport );
- DELETEZ( m_pRespectDriverResultSetType );
- DELETEZ( m_pBooleanComparisonModeLabel );
- DELETEZ( m_pBooleanComparisonMode );
- DELETEZ( m_pMaxRowScanLabel );
- DELETEZ( m_pMaxRowScan );
}
void SpecialSettingsPage::impl_initBooleanSettings()
@@ -199,23 +146,23 @@ namespace dbaui
// for easier maintainance, write the table in this form, then copy it to m_aBooleanSettings
BooleanSettingDesc aSettings[] = {
- { &m_pIsSQL92Check, CB_SQL92CHECK, DSID_SQL92CHECK, false },
- { &m_pAppendTableAlias, CB_APPENDTABLEALIAS, DSID_APPEND_TABLE_ALIAS, false },
- { &m_pAsBeforeCorrelationName, CB_AS_BEFORE_CORR_NAME, DSID_AS_BEFORE_CORRNAME, false },
- { &m_pEnableOuterJoin, CB_ENABLEOUTERJOIN, DSID_ENABLEOUTERJOIN, false },
- { &m_pIgnoreDriverPrivileges, CB_IGNOREDRIVER_PRIV, DSID_IGNOREDRIVER_PRIV, false },
- { &m_pParameterSubstitution, CB_PARAMETERNAMESUBST, DSID_PARAMETERNAMESUBST, false },
- { &m_pSuppressVersionColumn, CB_SUPPRESVERSIONCL, DSID_SUPPRESSVERSIONCL, true },
- { &m_pCatalog, CB_CATALOG, DSID_CATALOG, false },
- { &m_pSchema, CB_SCHEMA, DSID_SCHEMA, false },
- { &m_pIndexAppendix, CB_IGNOREINDEXAPPENDIX, DSID_INDEXAPPENDIX, false },
- { &m_pDosLineEnds, CB_DOSLINEENDS, DSID_DOSLINEENDS, false },
- { &m_pCheckRequiredFields, CB_CHECK_REQUIRED, DSID_CHECK_REQUIRED_FIELDS, false },
- { &m_pIgnoreCurrency, CB_IGNORECURRENCY, DSID_IGNORECURRENCY, false },
- { &m_pEscapeDateTime, CB_ESCAPE_DATETIME, DSID_ESCAPE_DATETIME, false },
- { &m_pPrimaryKeySupport, CB_PRIMARY_KEY_SUPPORT, DSID_PRIMARY_KEY_SUPPORT, false },
- { &m_pRespectDriverResultSetType, CB_RESPECTRESULTSETTYPE,DSID_RESPECTRESULTSETTYPE, false },
- { NULL, 0, 0, false }
+ { &m_pIsSQL92Check, "usesql92", DSID_SQL92CHECK, false },
+ { &m_pAppendTableAlias, "append", DSID_APPEND_TABLE_ALIAS, false },
+ { &m_pAsBeforeCorrelationName, "useas", DSID_AS_BEFORE_CORRNAME, false },
+ { &m_pEnableOuterJoin, "useoj", DSID_ENABLEOUTERJOIN, false },
+ { &m_pIgnoreDriverPrivileges, "ignoreprivs", DSID_IGNOREDRIVER_PRIV, false },
+ { &m_pParameterSubstitution, "replaceparams", DSID_PARAMETERNAMESUBST, false },
+ { &m_pSuppressVersionColumn, "displayver", DSID_SUPPRESSVERSIONCL, true },
+ { &m_pCatalog, "usecatalogname", DSID_CATALOG, false },
+ { &m_pSchema, "useschemaname", DSID_SCHEMA, false },
+ { &m_pIndexAppendix, "createindex", DSID_INDEXAPPENDIX, false },
+ { &m_pDosLineEnds, "eol", DSID_DOSLINEENDS, false },
+ { &m_pIgnoreCurrency, "inputchecks", DSID_IGNORECURRENCY, false },
+ { &m_pCheckRequiredFields, "ignorecurrency", DSID_CHECK_REQUIRED_FIELDS, false },
+ { &m_pEscapeDateTime, "useodbcliterals", DSID_ESCAPE_DATETIME, false },
+ { &m_pPrimaryKeySupport, "primarykeys", DSID_PRIMARY_KEY_SUPPORT, false },
+ { &m_pRespectDriverResultSetType, "resulttype", DSID_RESPECTRESULTSETTYPE, false },
+ { NULL, "", 0, false }
};
for ( const BooleanSettingDesc* pCopy = aSettings; pCopy->nItemId != 0; ++pCopy )
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 02fb456..2bcaee3 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -42,7 +42,6 @@ namespace dbaui
class SpecialSettingsPage : public OGenericAdministrationPage
{
protected:
- FixedLine m_aTopLine;
CheckBox* m_pIsSQL92Check;
CheckBox* m_pAppendTableAlias;
CheckBox* m_pAsBeforeCorrelationName;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index d09b5a8..b480710 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -21,256 +21,6 @@
#include "dbu_dlg.hrc"
#include "advancedsettings.hrc"
-//-------------------------------------------------------------------------
-
-#define AUTO_DATAHANDLING(AUTO_Y) \
- FixedLine FL_DATAHANDLING \
- { \
- Pos = MAP_APPFONT ( RELATED_CONTROLS , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "Options"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SQL92CHECK(AUTO_Y) \
- CheckBox CB_SQL92CHECK \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_SQL92CHECK; \
- Text[ en-US ] = "Use SQL92 naming constraints"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_APPENDTABLEALIAS(AUTO_Y) \
- CheckBox CB_APPENDTABLEALIAS \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_APPENDTABLEALIAS; \
- Text[ en-US ] = "Append the table alias name on SELECT statements"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_AS_BEFORE_CORR_NAME(AUTO_Y) \
- CheckBox CB_AS_BEFORE_CORR_NAME \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME; \
- Text[ en-US ] = "Use keyword AS before table alias names"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_ENABLEOUTERJOIN(AUTO_Y) \
- CheckBox CB_ENABLEOUTERJOIN \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_ENABLEOUTERJOIN; \
- Text [ en-US ] = "Use Outer Join syntax '{OJ }'"; \
- };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_IGNOREDRIVER_PRIV(AUTO_Y) \
- CheckBox CB_IGNOREDRIVER_PRIV \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_IGNOREDRIVER_PRIV; \
- Text[ en-US ] = "Ignore the privileges from the database driver"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_PARAMETERNAMESUBST(AUTO_Y) \
- CheckBox CB_PARAMETERNAMESUBST \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_PARAMETERNAMESUBST; \
- Text[ en-US ] = "Replace named parameters with '?'"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SUPPRESVERSIONCOLUMN(AUTO_Y) \
- CheckBox CB_SUPPRESVERSIONCL \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL; \
- Text [ en-US ] = "Display version columns (when available)"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_CATALOG(AUTO_Y) \
- CheckBox CB_CATALOG \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_CATALOG; \
- Text [ en-US ] = "Use catalog name in SELECT statements"; \
- };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SCHEMA(AUTO_Y) \
- CheckBox CB_SCHEMA \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_SCHEMA; \
- Text [ en-US ] = "Use schema name in SELECT statements"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_IGNOREINDEXAPPENDIX(AUTO_Y) \
- CheckBox CB_IGNOREINDEXAPPENDIX \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_IGNOREINDEXAPPENDIX; \
- Text[ en-US ] = "Create index with ASC or DESC statement"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_DOSLINEENDS(AUTO_Y) \
- CheckBox CB_DOSLINEENDS \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_DOSLINEENDS; \
- Text [ en-US ] = "End text lines with CR+LF"; \
- };
-
-//-------------------------------------------------------------------------
-#define AUTO_IGNORECURRENCY(AUTO_Y) \
- CheckBox CB_IGNORECURRENCY \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_IGNORECURRENCY; \
- Text [ en-US ] = "Ignore currency field information"; \
- };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_CHECKREQUIRED(AUTO_Y) \
- CheckBox CB_CHECK_REQUIRED \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_CHECK_REQUIRED_FIELDS; \
- Text [ en-US ] = "Form data input checks for required fields"; \
- };
-
-#define AUTO_ESCAPE_DATETIME(AUTO_Y) \
- CheckBox CB_ESCAPE_DATETIME \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_ESCAPE_DATETIME; \
- Text [ en-US ] = "Use ODBC conformant date/time literals"; \
- };
-
-
-#define AUTO_PRIMARY_KEY_SUPPORT(AUTO_Y) \
- CheckBox CB_PRIMARY_KEY_SUPPORT \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X - 12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_PRIMARY_KEY_SUPPORT; \
- Text [ en-US ] = "Supports primary keys"; \
- };
-
-#define AUTO_RESPECTRESULTSETTYPE(AUTO_Y) \
- CheckBox CB_RESPECTRESULTSETTYPE \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X - 12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_RESPECTRESULTSETTYPE; \
- Text [ en-US ] = "Respect the result set type from the database driver"; \
- };
-
-
-//-------------------------------------------------------------------------
-
-#define WORKAROUND \
- StringList [ en-US ] = \
- { \
- < "Default" ; Default ; > ; \
- < "SQL" ; Default ; > ; \
- < "Mixed" ; Default ; > ; \
- < "MS Access" ; Default ; > ; \
- };
-
-
-#define AUTO_BOOLEANCOMPARISON(AUTO_Y) \
- FixedText FT_BOOLEANCOMPARISON \
- { \
- Pos = MAP_APPFONT ( START_X , AUTO_Y + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) ; \
- Size = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT ); \
- Text [ en-US ] = "Comparison of Boolean values"; \
- }; \
- ListBox LB_BOOLEANCOMPARISON \
- { \
- Pos = MAP_APPFONT ( START_X + 100, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 60 , LISTBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- SvLook = TRUE; \
- DropDown = TRUE; \
- Border = TRUE; \
- HelpId = HID_DSADMIN_BOOLEANCOMPARISON; \
- WORKAROUND \
- }; \
-
-#define AUTO_MAXROWSCAN(AUTO_Y) \
- FixedText FT_MAXROWSCAN \
- { \
- Pos = MAP_APPFONT ( START_X , AUTO_Y + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) ; \
- Size = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT ); \
- Text [ en-US ] = "Rows to scan column types"; \
- }; \
- NumericField NF_MAXROWSCAN \
- { \
- Pos = MAP_APPFONT ( START_X + 100, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 60 , EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- NoThousandSep = TRUE; \
- Border = TRUE; \
- HelpId = HID_DSADMIN_MAXROWSCAN; \
- }; \
-
-
-//-------------------------------------------------------------------------
-
TabPage PAGE_GENERATED_VALUES
{
HelpID = "dbaccess:TabPage:PAGE_GENERATED_VALUES";
@@ -328,34 +78,4 @@ TabPage PAGE_GENERATED_VALUES
};
};
-//-------------------------------------------------------------------------
-
-TabPage PAGE_ADVANCED_SETTINGS_SPECIAL
-{
- HelpID = "dbaccess:TabPage:PAGE_ADVANCED_SETTINGS_SPECIAL";
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
- Hide = TRUE;
- AUTO_DATAHANDLING( RELATED_CONTROLS )
- AUTO_SQL92CHECK( 1*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS )
- AUTO_APPENDTABLEALIAS( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 1*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_AS_BEFORE_CORR_NAME( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_ENABLEOUTERJOIN( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_IGNOREDRIVER_PRIV( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_PARAMETERNAMESUBST( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_SUPPRESVERSIONCOLUMN( 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_CATALOG( 8*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 7*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_SCHEMA( 9*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 8*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_IGNOREINDEXAPPENDIX( 10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 9*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_DOSLINEENDS( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_CHECKREQUIRED( 12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_IGNORECURRENCY( 13*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 12*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_ESCAPE_DATETIME( 14*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 14*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_PRIMARY_KEY_SUPPORT( 15*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 15*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_RESPECTRESULTSETTYPE( 16*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 16*CHECKBOX_HEIGHT + RELATED_CONTROLS )
- AUTO_BOOLEANCOMPARISON( 17*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 15*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 )
- AUTO_MAXROWSCAN( 18*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 15*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 )
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 7ca4ee7..79f1ac4 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -118,7 +118,7 @@
#define PAGE_USERDRIVER RID_PAGE_START + 19
#define PAGE_MYSQL_JDBC RID_PAGE_START + 20
#define PAGE_GENERATED_VALUES RID_PAGE_START + 22
-#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23
+ // FREE
#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24
// FREE
#define PAGE_ORACLE_JDBC RID_PAGE_START + 27
diff --git a/dbaccess/uiconfig/ui/specialsettingspage.ui b/dbaccess/uiconfig/ui/specialsettingspage.ui
new file mode 100644
index 0000000..3574615
--- /dev/null
+++ b/dbaccess/uiconfig/ui/specialsettingspage.ui
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 29 13:37:30 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkFrame" id="SpecialSettingsPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="usesql92">
+ <property name="label" translatable="yes">Use SQL92 naming constraints</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="append">
+ <property name="label" translatable="yes">Append the table alias name on SELECT statements</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="useas">
+ <property name="label" translatable="yes">Use keyword AS before table alias names</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="useoj">
+ <property name="label" translatable="yes">Use Outer Join syntax '{OJ }'</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="ignoreprivs">
+ <property name="label" translatable="yes">Ignore the privileges from the database driver</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="replaceparams">
+ <property name="label" translatable="yes">Replace named parameters with '?'</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="displayver">
+ <property name="label" translatable="yes">Display version columns (when available)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="usecatalogname">
+ <property name="label" translatable="yes">Use catalog name in SELECT statements</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="useschemaname">
+ <property name="label" translatable="yes">Use schema name in SELECT statements</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="createindex">
+ <property name="label" translatable="yes">Create index with ASC or DESC statement</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="eol">
+ <property name="label" translatable="yes">End text lines with CR+LF</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="ignorecurrency">
+ <property name="label" translatable="yes">Ignore currency field information</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="inputchecks">
+ <property name="label" translatable="yes">Form data input checks for required fields</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="useodbcliterals">
+ <property name="label" translatable="yes">Use ODBC conformant date/time literals</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="primarykeys">
+ <property name="label" translatable="yes">Supports primary keys</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">14</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="resulttype">
+ <property name="label" translatable="yes">Respect the result set type from the database driver</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">15</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="comparisonft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Comparison of Boolean values</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">comparison</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="comparison">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <items>
+ <item translatable="yes">Default</item>
+ <item translatable="yes">SQL</item>
+ <item translatable="yes">Mixed</item>
+ <item translatable="yes">MS Access</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="rowsft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Rows to scan column types</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rows</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="rows">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">16</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list