diff options
Diffstat (limited to 'sc/source/ui/miscdlgs')
| -rw-r--r-- | sc/source/ui/miscdlgs/crnrdlg.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/mtrindlg.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 22 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 82f42c15be6e..c037405ef078 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -742,7 +742,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl, weld::Button&, void) m_xEdAssign->SetText( aStr ); } ScRange aRange( theCurData ); - aRange.aStart.SetRow( std::min( static_cast<long>(theCurArea.aEnd.Row() + 1), static_cast<long>(rDoc.MaxRow()) ) ); + aRange.aStart.SetRow( std::min( static_cast<tools::Long>(theCurArea.aEnd.Row() + 1), static_cast<tools::Long>(rDoc.MaxRow()) ) ); aRange.aEnd.SetRow( rDoc.MaxRow() ); AdjustColRowData( aRange ); } @@ -760,7 +760,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl, weld::Button&, void) m_xEdAssign->SetText( aStr ); } ScRange aRange( theCurData ); - aRange.aStart.SetCol( static_cast<SCCOL>(std::min( static_cast<long>(theCurArea.aEnd.Col() + 1), static_cast<long>(rDoc.MaxCol()) )) ); + aRange.aStart.SetCol( static_cast<SCCOL>(std::min( static_cast<tools::Long>(theCurArea.aEnd.Col() + 1), static_cast<tools::Long>(rDoc.MaxCol()) )) ); aRange.aEnd.SetCol( rDoc.MaxCol() ); AdjustColRowData( aRange ); } diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 3e6aa2d92fec..4226be64eee7 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -23,12 +23,12 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window* pParent, const OString& sDialogName, - long nCurrent, - long nDefault, + tools::Long nCurrent, + tools::Long nDefault, FieldUnit eFUnit, sal_uInt16 nDecimals, - long nMaximum, - long nMinimum) + tools::Long nMaximum, + tools::Long nMinimum) : GenericDialogController(pParent, OStringToOUString("modules/scalc/ui/" + sDialogName.toAsciiLowerCase() + ".ui", RTL_TEXTENCODING_UTF8), sDialogName) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 2da4898cfa48..e3c6b1d751e9 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -374,11 +374,11 @@ void ScOptSolverDlg::ReadConditions() aRowEntry.aRightStr = mpRightEdit[nRow]->GetText(); aRowEntry.nOperator = mpOperator[nRow]->get_active(); - long nVecPos = nScrollPos + nRow; - if ( nVecPos >= static_cast<long>(maConditions.size()) && !aRowEntry.IsDefault() ) + tools::Long nVecPos = nScrollPos + nRow; + if ( nVecPos >= static_cast<tools::Long>(maConditions.size()) && !aRowEntry.IsDefault() ) maConditions.resize( nVecPos + 1 ); - if ( nVecPos < static_cast<long>(maConditions.size()) ) + if ( nVecPos < static_cast<tools::Long>(maConditions.size()) ) maConditions[nVecPos] = aRowEntry; // remove default entries at the end @@ -395,8 +395,8 @@ void ScOptSolverDlg::ShowConditions() { ScOptConditionRow aRowEntry; - long nVecPos = nScrollPos + nRow; - if ( nVecPos < static_cast<long>(maConditions.size()) ) + tools::Long nVecPos = nScrollPos + nRow; + if ( nVecPos < static_cast<tools::Long>(maConditions.size()) ) aRowEntry = maConditions[nVecPos]; mpLeftEdit[nRow]->SetRefString( aRowEntry.aLeftStr ); @@ -405,8 +405,8 @@ void ScOptSolverDlg::ShowConditions() } // allow to scroll one page behind the visible or stored rows - long nVisible = nScrollPos + EDIT_ROW_COUNT; - long nMax = std::max( nVisible, static_cast<long>(maConditions.size()) ); + tools::Long nVisible = nScrollPos + EDIT_ROW_COUNT; + tools::Long nMax = std::max( nVisible, static_cast<tools::Long>(maConditions.size()) ); m_xScrollBar->vadjustment_configure(nScrollPos, 0, nMax + EDIT_ROW_COUNT, 1, EDIT_ROW_COUNT - 1, EDIT_ROW_COUNT); @@ -417,8 +417,8 @@ void ScOptSolverDlg::EnableButtons() { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) { - long nVecPos = nScrollPos + nRow; - mpDelButton[nRow]->set_sensitive(nVecPos < static_cast<long>(maConditions.size())); + tools::Long nVecPos = nScrollPos + nRow; + mpDelButton[nRow]->set_sensitive(nVecPos < static_cast<tools::Long>(maConditions.size())); } } @@ -626,8 +626,8 @@ IMPL_LINK(ScOptSolverDlg, DelBtnHdl, weld::Button&, rBtn, void) bool bHadFocus = rBtn.has_focus(); ReadConditions(); - long nVecPos = nScrollPos + nRow; - if ( nVecPos < static_cast<long>(maConditions.size()) ) + tools::Long nVecPos = nScrollPos + nRow; + if ( nVecPos < static_cast<tools::Long>(maConditions.size()) ) { maConditions.erase( maConditions.begin() + nVecPos ); ShowConditions(); |