longparas: lift 16bit max edit length

Change-Id: Ide74f0a48f06cbe9539f16ef6c6d04bba043dcf9

4 files changed, 10 insertions, 10 deletions

diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 40b2f4b612cd..9f761052c932 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -896,7 +896,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
             return;
         m_nPos++;
         {
-            sal_uInt32 nMax = EDIT_NOLIMIT;
+            sal_Int32 nMax = EDIT_NOLIMIT;
             OUString aTmpString;
             try
             {
@@ -907,7 +907,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
                     aTmpString = xMetaData->getExtraNameCharacters();
                 }
             }
-            catch(Exception&)
+            catch (const Exception&)
             {
                 DBG_UNHANDLED_EXCEPTION();
             }
@@ -917,7 +917,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
                                                     STR_HELP_DEFAULT_VALUE,
                                                     FIELD_PRPOERTY_COLUMNNAME,
                                                     WB_BORDER );
-            m_pColumnName->SetMaxTextLen(xub_StrLen( nMax ? nMax : EDIT_NOLIMIT));
+            m_pColumnName->SetMaxTextLen(nMax ? nMax : EDIT_NOLIMIT);
             m_pColumnName->setCheck( isSQL92CheckEnabled(getConnection()) );
         }
 
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index c7d63f7dbca3..ce21f4dda4f2 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -271,7 +271,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
                 m_pImpl->m_aPB_CANCEL.SetPosPixel(Point(m_pImpl->m_aPB_CANCEL.GetPosPixel().X(),aPos.Y()));
                 m_pImpl->m_aPB_HELP.SetPosPixel(Point(m_pImpl->m_aPB_HELP.GetPosPixel().X(),aPos.Y()));
 
-                sal_uInt16 nLength =  m_pImpl->m_xMetaData.is() ? static_cast<sal_uInt16>(m_pImpl->m_xMetaData->getMaxTableNameLength()) : 0;
+                sal_Int32 nLength =  m_pImpl->m_xMetaData.is() ? m_pImpl->m_xMetaData->getMaxTableNameLength() : 0;
                 nLength = nLength ? nLength : EDIT_NOLIMIT;
 
                 m_pImpl->m_aTitle.SetMaxTextLen(nLength);
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 67c4eb26b55f..ad6439f56833 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -71,7 +71,7 @@ OCopyTable::OCopyTable( Window * pParent )
 {
     DBG_CTOR(OCopyTable,NULL);
 
-    m_edTableName.SetMaxTextLen( EDIT_NOLIMIT );
+    m_edTableName.SetMaxTextLen(EDIT_NOLIMIT);
 
     if ( m_pParent->m_xDestConnection.is() )
     {
@@ -98,7 +98,7 @@ OCopyTable::OCopyTable( Window * pParent )
         m_edKeyName.SetText(sKeyName);
 
         sal_Int32 nMaxLen = m_pParent->getMaxColumnNameLength();
-        m_edKeyName.SetMaxTextLen(nMaxLen ? (xub_StrLen)nMaxLen : EDIT_NOLIMIT);
+        m_edKeyName.SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT);
     }
 
     FreeResource();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 6156cd366c56..820ba0f279d0 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -219,7 +219,7 @@ void OTableEditorCtrl::InitCellController()
 {
     DBG_CHKTHIS(OTableEditorCtrl,NULL);
     // Cell Field name
-    xub_StrLen nMaxTextLen = EDIT_NOLIMIT;
+    sal_Int32 nMaxTextLen = EDIT_NOLIMIT;
     OUString sExtraNameChars;
     Reference<XConnection> xCon;
     try
@@ -227,7 +227,7 @@ void OTableEditorCtrl::InitCellController()
         xCon = GetView()->getController().getConnection();
         Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
 
-        nMaxTextLen = ((xub_StrLen)xMetaData.is() ? static_cast<xub_StrLen>(xMetaData->getMaxColumnNameLength()) : 0);
+        nMaxTextLen = xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0;
 
         if( nMaxTextLen == 0 )
             nMaxTextLen = EDIT_NOLIMIT;
@@ -312,7 +312,7 @@ sal_Bool OTableEditorCtrl::SetDataPtr( long nRow )
     if(nRow == -1)
         return sal_False;
 
-    OSL_ENSURE((xub_StrLen)nRow < m_pRowList->size(),"Row is greater than size!");
+    OSL_ENSURE(nRow < (long)m_pRowList->size(),"Row is greater than size!");
     if(nRow >= (long)m_pRowList->size())
         return sal_False;
     pActRow = (*m_pRowList)[nRow];
@@ -806,7 +806,7 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName )
     Reference<XConnection> xCon = GetView()->getController().getConnection();
     Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
 
-    xub_StrLen nMaxTextLen((xub_StrLen)( xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0));
+    sal_Int32 nMaxTextLen(xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0);
 
     if( (rName.getLength()+2) >nMaxTextLen )
         aBaseName = rName.copy( 0, nMaxTextLen-2 );