summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx')
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx100
1 files changed, 50 insertions, 50 deletions
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 223c00cfbd2a..8113cbc2ed6e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -352,15 +352,15 @@ BrowserHeader* OSelectionBrowseBox::imp_CreateHeaderBar(BrowseBox* /*pParent*/)
return new OSelectionBrwBoxHeader(this);
}
// -----------------------------------------------------------------------------
-void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo )
+void OSelectionBrowseBox::ColumnMoved( sal_uInt16 nColId,sal_Bool _bCreateUndo )
{
EditBrowseBox::ColumnMoved( nColId );
// swap the two columns
- USHORT nNewPos = GetColumnPos( nColId );
+ sal_uInt16 nNewPos = GetColumnPos( nColId );
OTableFields& rFields = getFields();
- if ( rFields.size() > USHORT(nNewPos-1) )
+ if ( rFields.size() > sal_uInt16(nNewPos-1) )
{
- USHORT nOldPos = 0;
+ sal_uInt16 nOldPos = 0;
OTableFields::iterator aEnd = rFields.end();
OTableFields::iterator aIter = rFields.begin();
for (; aIter != aEnd && ( (*aIter)->GetColumnId() != nColId ); ++aIter,++nOldPos)
@@ -533,7 +533,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
OSL_ENSURE(nColId != BROWSER_INVALIDID,"An Invalid Id was set!");
if ( nColId == BROWSER_INVALIDID )
return;
- USHORT nPos = GetColumnPos(nColId);
+ sal_uInt16 nPos = GetColumnPos(nColId);
if ( nPos == 0 || nPos == BROWSER_INVALIDID || nPos > getFields().size() )
return;
OTableFieldDescRef pEntry = getFields()[nPos-1];
@@ -605,7 +605,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
} break;
case BROW_ORDER_ROW:
m_pOrderCell->SelectEntryPos(
- sal::static_int_cast< USHORT >(pEntry->GetOrderDir()));
+ sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()));
enableControl(pEntry,m_pOrderCell);
break;
case BROW_COLUMNALIAS_ROW:
@@ -623,14 +623,14 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
Controller()->ClearModified();
}
// -----------------------------------------------------------------------------
-void OSelectionBrowseBox::notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId)
+void OSelectionBrowseBox::notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
{
appendUndoAction(_sOldAlias,_sAlias,BROW_TABLE_ROW,_bListAction);
if ( m_bVisibleRow[BROW_TABLE_ROW] )
RowModified(GetBrowseRow(BROW_TABLE_ROW), _nColumnId);
}
// -----------------------------------------------------------------------------
-void OSelectionBrowseBox::notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId)
+void OSelectionBrowseBox::notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
{
appendUndoAction(_sOldFunctionName,_sFunctionName,BROW_FUNCTION_ROW,_bListAction);
if ( !m_bVisibleRow[BROW_FUNCTION_ROW] )
@@ -638,7 +638,7 @@ void OSelectionBrowseBox::notifyFunctionFieldChanged(const String& _sOldFunction
RowModified(GetBrowseRow(BROW_FUNCTION_ROW), _nColumnId);
}
// -----------------------------------------------------------------------------
-void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId)
+void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
{
if ( isFieldNameAsterix( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) )
{
@@ -803,14 +803,14 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
::comphelper::UStringMixEqual bCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
OTableFieldDescRef aSelEntry = _pEntry;
- USHORT nColumnId = aSelEntry->GetColumnId();
+ sal_uInt16 nColumnId = aSelEntry->GetColumnId();
sal_uInt32 nCount = pSelection->count();
for (sal_uInt32 i = 0; i < nCount; ++i)
{
if ( i > 0 ) // may we have to append more than one field
{
- USHORT nColumnPostion;
+ sal_uInt16 nColumnPostion;
aSelEntry = FindFirstFreeCol(nColumnPostion);
if ( !aSelEntry.isValid() )
{
@@ -968,8 +968,8 @@ sal_Bool OSelectionBrowseBox::SaveModified()
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
OTableFieldDescRef pEntry = NULL;
- USHORT nCurrentColumnPos = GetColumnPos(GetCurColumnId());
- if(getFields().size() > static_cast<USHORT>(nCurrentColumnPos - 1))
+ sal_uInt16 nCurrentColumnPos = GetColumnPos(GetCurColumnId());
+ if(getFields().size() > static_cast<sal_uInt16>(nCurrentColumnPos - 1))
pEntry = getEntry(nCurrentColumnPos - 1);
sal_Bool bWasEmpty = pEntry.isValid() ? pEntry->IsEmpty() : sal_False;
@@ -1023,7 +1023,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
if ( !m_bInUndoMode )
rController.GetUndoManager().EnterListAction(String(),String());
- USHORT nPos = m_pFieldCell->GetEntryPos(aFieldName);
+ sal_uInt16 nPos = m_pFieldCell->GetEntryPos(aFieldName);
String aAliasName = pEntry->GetAlias();
if ( nPos != COMBOBOX_ENTRY_NOTFOUND && !aAliasName.Len() && aFieldName.GetTokenCount('.') > 1 )
{ // special case, we have a table field so we must cut the table name
@@ -1255,7 +1255,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
if ( bAppendRow )
{
- RowInserted( GetRowCount()-1, 1, TRUE );
+ RowInserted( GetRowCount()-1, 1, sal_True );
m_bVisibleRow.push_back(sal_True);
++m_nVisibleCount;
}
@@ -1277,7 +1277,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
RowModified(BROW_VIS_ROW, GetCurColumnId());
// wenn noetig neue freie Spalten anlegen
- USHORT nDummy;
+ sal_uInt16 nDummy;
CheckFreeColumns(nDummy);
}
@@ -1307,7 +1307,7 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
rDev.SetClipRegion( rRect );
OTableFieldDescRef pEntry = NULL;
- USHORT nPos = GetColumnPos(nColumnId);
+ sal_uInt16 nPos = GetColumnPos(nColumnId);
if(getFields().size() > sal_uInt16(nPos - 1))
pEntry = getFields()[nPos - 1];
@@ -1339,12 +1339,12 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r
}
//------------------------------------------------------------------------------
-void OSelectionBrowseBox::RemoveColumn(USHORT _nColumnId)
+void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
- USHORT nPos = GetColumnPos(_nColumnId);
+ sal_uInt16 nPos = GetColumnPos(_nColumnId);
// das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
DBG_ASSERT((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::RemoveColumn : invalid parameter nColId");
// ColId ist bei mir gleichbedeutend mit Position, und da sollte die Bedingung natuerlich zutreffen
@@ -1379,7 +1379,7 @@ void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId )
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
- USHORT nPos = GetColumnPos(nColumnId);
+ sal_uInt16 nPos = GetColumnPos(nColumnId);
OSL_ENSURE(getFields().size() > sal_uInt16(nPos-1),"ID is to great!");
OTableFieldDescRef pDesc = getEntry((sal_uInt32)(nPos - 1)) ;
@@ -1521,7 +1521,7 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt)
{
OTableFieldDescRef pEmptyEntry = new OTableFieldDesc();
getFields().push_back(pEmptyEntry);
- USHORT nColumnId = sal::static_int_cast< USHORT >(getFields().size());
+ sal_uInt16 nColumnId = sal::static_int_cast< sal_uInt16 >(getFields().size());
pEmptyEntry->SetColumnId( nColumnId );
InsertDataColumn( nColumnId , String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND);
@@ -1545,7 +1545,7 @@ void OSelectionBrowseBox::DeleteFields(const String& rAliasName)
OTableFields::reverse_iterator aIter = getFields().rbegin();
OTableFieldDescRef pEntry = NULL;
- for(USHORT nPos=sal::static_int_cast< USHORT >(getFields().size());aIter != getFields().rend();++aIter,--nPos)
+ for(sal_uInt16 nPos=sal::static_int_cast< sal_uInt16 >(getFields().size());aIter != getFields().rend();++aIter,--nPos)
{
pEntry = *aIter;
if ( pEntry->GetAlias().equals( rAliasName ) )
@@ -1597,7 +1597,7 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
}
//------------------------------------------------------------------------------
-void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColumnPostion)
+void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _nColumnPostion)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
// das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
@@ -1610,14 +1610,14 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
DeactivateCell();
// remember the column id of the current positon
- USHORT nColumnId = GetColumnId(_nColumnPostion);
+ sal_uInt16 nColumnId = GetColumnId(_nColumnPostion);
// Wenn zu klein oder zu gross, auf Ende der Liste setzen
if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size())) // Anhaengen des Feldes
{
if (FindFirstFreeCol(_nColumnPostion) == NULL) // keine freie Column mehr
{
AppendNewCol(1);
- _nColumnPostion = sal::static_int_cast< USHORT >(
+ _nColumnPostion = sal::static_int_cast< sal_uInt16 >(
getFields().size());
}
else
@@ -1630,14 +1630,14 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
// check if the column ids are identical, if not we have to move
if ( pEntry->GetColumnId() != nColumnId )
{
- USHORT nOldPosition = GetColumnPos(pEntry->GetColumnId());
+ sal_uInt16 nOldPosition = GetColumnPos(pEntry->GetColumnId());
OSL_ENSURE( nOldPosition != 0,"Old position was 0. Not possible!");
SetColumnPos(pEntry->GetColumnId(),_nColumnPostion);
// we have to delete an empty field for the fields list, because the columns must have equal length
if ( nOldPosition > 0 && nOldPosition <= getFields().size() )
getFields()[nOldPosition - 1] = pEntry;
- ColumnMoved(pEntry->GetColumnId(),FALSE);
+ ColumnMoved(pEntry->GetColumnId(),sal_False);
} // if ( pEntry->GetColumnId() != nColumnId )
if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) )
@@ -1661,7 +1661,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
}
//------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, USHORT _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
+OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, sal_uInt16 _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(jxdSource.pListBox->GetTabWin());
@@ -1687,7 +1687,7 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd
}
//------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, USHORT _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
+OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, sal_uInt16 _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
@@ -1733,7 +1733,7 @@ sal_uInt16 OSelectionBrowseBox::FieldsCount()
}
//------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(USHORT& _rColumnPosition )
+OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(sal_uInt16& _rColumnPosition )
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
OTableFields::iterator aIter = getFields().begin();
@@ -1754,7 +1754,7 @@ OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(USHORT& _rColumnPositio
}
//------------------------------------------------------------------------------
-void OSelectionBrowseBox::CheckFreeColumns(USHORT& _rColumnPosition)
+void OSelectionBrowseBox::CheckFreeColumns(sal_uInt16& _rColumnPosition)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
if (FindFirstFreeCol(_rColumnPosition) == NULL)
@@ -1838,7 +1838,7 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel)
pEntry->SetCriteria( nNewLevel, sValue);
if ( nNewLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1) )
{
- RowInserted( GetRowCount()-1, 1, TRUE );
+ RowInserted( GetRowCount()-1, 1, sal_True );
m_bVisibleRow.push_back(sal_True);
++m_nVisibleCount;
}
@@ -1887,7 +1887,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
pEntry->SetCriteria( nLevel, rValue);
if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
{
- RowInserted( GetRowCount()-1, 1, TRUE );
+ RowInserted( GetRowCount()-1, 1, sal_True );
m_bVisibleRow.push_back(sal_True);
++m_nVisibleCount;
}
@@ -1915,7 +1915,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
pLastEntry->SetCriteria( nLevel, sCriteria);
if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
{
- RowInserted( GetRowCount()-1, 1, TRUE );
+ RowInserted( GetRowCount()-1, 1, sal_True );
m_bVisibleRow.push_back(sal_True);
++m_nVisibleCount;
}
@@ -1932,7 +1932,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
pTmp->SetCriteria( nLevel, rValue);
if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
{
- RowInserted( GetRowCount()-1, 1, TRUE );
+ RowInserted( GetRowCount()-1, 1, sal_True );
m_bVisibleRow.push_back(sal_True);
++m_nVisibleCount;
}
@@ -2073,7 +2073,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
if ( 1 == GetSelectColumnCount() )
{
sal_uInt16 nSelId = GetColumnId(
- sal::static_int_cast< USHORT >(
+ sal::static_int_cast< sal_uInt16 >(
FirstSelectedColumn() ) );
::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
@@ -2196,8 +2196,8 @@ void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis)
//------------------------------------------------------------------------------
long OSelectionBrowseBox::GetBrowseRow(long nRowId) const
{
- USHORT nCount(0);
- for(USHORT i = 0 ; i < nRowId ; ++i)
+ sal_uInt16 nCount(0);
+ for(sal_uInt16 i = 0 ; i < nRowId ; ++i)
{
if ( m_bVisibleRow[i] )
++nCount;
@@ -2262,7 +2262,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
- USHORT nPos = GetColumnPos(nColId);
+ sal_uInt16 nPos = GetColumnPos(nColId);
OTableFieldDescRef pEntry = getFields()[nPos-1];
DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... ");
@@ -2289,7 +2289,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
} break;
case BROW_ORDER_ROW:
if (pEntry->GetOrderDir() != ORDER_NONE)
- aText = String(ModuleRes(STR_QUERY_SORTTEXT) ).GetToken(sal::static_int_cast< USHORT >(pEntry->GetOrderDir()));
+ aText = String(ModuleRes(STR_QUERY_SORTTEXT) ).GetToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()));
break;
case BROW_VIS_ROW:
break;
@@ -2381,14 +2381,14 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin
return bErg;
}
//------------------------------------------------------------------------------
-String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
+String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nColId)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
// DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross");
if ( GetCurColumnId() == nColId && !m_bInUndoMode )
SaveModified();
- USHORT nPos = GetColumnPos(nColId);
+ sal_uInt16 nPos = GetColumnPos(nColId);
OTableFieldDescRef pEntry = getFields()[nPos - 1];
DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::GetCellContents : invalid column id, prepare for GPF ... ");
@@ -2409,14 +2409,14 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
}
//------------------------------------------------------------------------------
-void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const String& strNewText)
+void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, const String& strNewText)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
- sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(static_cast<USHORT>(nRow)) && (GetCurRow() == static_cast<USHORT>(GetBrowseRow(nRow)));
+ sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(static_cast<sal_uInt16>(nRow)) && (GetCurRow() == static_cast<sal_uInt16>(GetBrowseRow(nRow)));
if (bWasEditing)
DeactivateCell();
- USHORT nPos = GetColumnPos(nColId);
+ sal_uInt16 nPos = GetColumnPos(nColId);
OTableFieldDescRef pEntry = getEntry(nPos - 1);
DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... ");
@@ -2466,7 +2466,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S
}
long nCellIndex = GetRealRow(nRow);
- if(IsRowVisible(static_cast<USHORT>(nRow)))
+ if(IsRowVisible(static_cast<sal_uInt16>(nRow)))
RowModified(nCellIndex, nColId);
// die entsprechende Feld-Beschreibung ist jetzt leer -> Visible auf sal_False (damit das konsistent mit normalen leeren Spalten ist)
@@ -2500,7 +2500,7 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
// but the changes aren't permanent ...
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
- USHORT nPos = GetColumnPos(nColId);
+ sal_uInt16 nPos = GetColumnPos(nColId);
DBG_ASSERT(nPos <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!");
OTableFieldDescRef pEntry = getEntry(nPos-1);
DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::ColumnResized : keine FieldDescription !");
@@ -2525,7 +2525,7 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
- USHORT nPos = GetColumnPos(nColId);
+ sal_uInt16 nPos = GetColumnPos(nColId);
DBG_ASSERT((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::GetTotalCellWidth : invalid parameter nColId");
OTableFieldDescRef pEntry = getFields()[nPos-1];
@@ -2695,7 +2695,7 @@ OTableFields& OSelectionBrowseBox::getFields() const
// -----------------------------------------------------------------------------
void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl)
{
- BOOL bEnable = !_rEntry->isCondition();
+ sal_Bool bEnable = !_rEntry->isCondition();
_pControl->Enable(bEnable);
_pControl->EnableInput(bEnable);
}
@@ -2735,7 +2735,7 @@ OTableFieldDescRef OSelectionBrowseBox::getEntry(OTableFields::size_type _nPos)
{
pEntry = new OTableFieldDesc();
pEntry->SetColumnId(
- GetColumnId(sal::static_int_cast< USHORT >(_nPos+1)));
+ GetColumnId(sal::static_int_cast< sal_uInt16 >(_nPos+1)));
aFields[_nPos] = pEntry;
}
return pEntry;