diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
| commit | 41bc9ff8d750b4af10d20a36539c57da14695dcf (patch) | |
| tree | dc2ee437c54daba12ac442fd0e10baf97eadf184 /dbaccess/source/ui/dlg/DbAdminImpl.cxx | |
| parent | f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (diff) | |
| parent | e35c56815d43a06c53488e3efa35f062a6a2d60c (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
dbaccess/source/core/misc/services.cxx
dbaccess/source/filter/migration/cfgimport.cxx
reportdesign/source/core/api/ReportDefinition.cxx
Diffstat (limited to 'dbaccess/source/ui/dlg/DbAdminImpl.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/DbAdminImpl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 6b102c394253..968fc0127157 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -108,7 +108,7 @@ using namespace com::sun::star::frame; //------------------------------------------------------------------------- namespace { - sal_Bool implCheckItemType( SfxItemSet& _rSet, const USHORT _nId, const TypeId _nExpectedItemType ) + sal_Bool implCheckItemType( SfxItemSet& _rSet, const sal_uInt16 _nId, const TypeId _nExpectedItemType ) { sal_Bool bCorrectType = sal_False; @@ -726,7 +726,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r ++aDirect ) { - const SfxPoolItem* pCurrentItem = _rSource.GetItem((USHORT)aDirect->first); + const SfxPoolItem* pCurrentItem = _rSource.GetItem((sal_uInt16)aDirect->first); if (pCurrentItem) { sal_Int16 nAttributes = PropertyAttribute::READONLY; @@ -785,7 +785,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::std::vector< sal_Int32>::iterator aDetailsEnd = aDetailIds.end(); for (::std::vector< sal_Int32>::iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter) { - const SfxPoolItem* pCurrent = _rSource.GetItem((USHORT)*aIter); + const SfxPoolItem* pCurrent = _rSource.GetItem((sal_uInt16)*aIter); aTranslation = m_aIndirectPropTranslator.find(*aIter); if ( pCurrent && (m_aIndirectPropTranslator.end() != aTranslation) ) { @@ -1118,7 +1118,7 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection(); OSL_ENSURE(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!"); - USHORT nPortNumberId = 0; + sal_uInt16 nPortNumberId = 0; sal_Int32 nPortNumber = -1; String sNewHostName; String sUrlPart; |