diff options
| author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
|---|---|---|
| committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
| commit | 8b35f0adebc482200cc5ff6622f81c9cc4067035 (patch) | |
| tree | 3db8f52e1af776a06fe97549877caa0ace10e406 /dbaccess/source/ui/dlg/DriverSettings.cxx | |
| parent | f720ab73332799d3a19fd5f077ca05c93c0ebcf7 (diff) | |
| parent | b1708ffb49872b51c2b7d82380efeb1282d73b1c (diff) | |
chart52: merge with DEV300_m100
Diffstat (limited to 'dbaccess/source/ui/dlg/DriverSettings.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/DriverSettings.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index cecdc49aff8e..b94db6114e8e 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -77,7 +77,7 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR } } #endif - typedef ::std::pair<USHORT, ::rtl::OUString> TProperties; + typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties; TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted"))) ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet"))) ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter"))) |