diff options
Diffstat (limited to 'extensions/source/scanner/grid.cxx')
| -rw-r--r-- | extensions/source/scanner/grid.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 110779c55080..5b5a12d6d389 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -18,9 +18,9 @@ */ #include <sal/config.h> +#include <o3tl/sprintf.hxx> #include <osl/thread.h> #include <rtl/math.hxx> -#include <cstdio> #include <bitmaps.hlst> #include <cmath> @@ -205,12 +205,11 @@ void GridWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) } GridDialog::GridDialog(weld::Window* pParent, double* pXValues, double* pYValues, int nValues) - : GenericDialogController(pParent, "modules/scanner/ui/griddialog.ui", "GridDialog") - , m_xOKButton(m_xBuilder->weld_button("ok")) - , m_xResetTypeBox(m_xBuilder->weld_combo_box("resetTypeCombobox")) - , m_xResetButton(m_xBuilder->weld_button("resetButton")) + : GenericDialogController(pParent, u"modules/scanner/ui/griddialog.ui"_ustr, u"GridDialog"_ustr) + , m_xResetTypeBox(m_xBuilder->weld_combo_box(u"resetTypeCombobox"_ustr)) + , m_xResetButton(m_xBuilder->weld_button(u"resetButton"_ustr)) , m_xGridWindow(new GridWindow) - , m_xGridWindowWND(new weld::CustomWeld(*m_xBuilder, "gridwindow", *m_xGridWindow)) + , m_xGridWindowWND(new weld::CustomWeld(*m_xBuilder, u"gridwindow"_ustr, *m_xGridWindow)) { m_xGridWindow->Init(pXValues, pYValues, nValues, true/*bCutValues*/, BitmapEx(RID_SCANNER_HANDLE)); m_xResetTypeBox->set_active(0); @@ -446,7 +445,7 @@ void GridWindow::drawGrid(vcl::RenderContext& rRenderContext) drawLine(rRenderContext, fX, m_fMinY, fX, m_fMaxY); // draw tickmarks Point aPt = transform(fX, m_fMinY); - std::sprintf(pBuf, "%g", fX); + o3tl::sprintf(pBuf, "%g", fX); OUString aMark(pBuf, strlen(pBuf), osl_getThreadTextEncoding()); Size aTextSize(rRenderContext.GetTextWidth(aMark), rRenderContext.GetTextHeight()); aPt.AdjustX( -(aTextSize.Width() / 2) ); @@ -459,7 +458,7 @@ void GridWindow::drawGrid(vcl::RenderContext& rRenderContext) drawLine(rRenderContext, m_fMinX, fY, m_fMaxX, fY); // draw tickmarks Point aPt = transform(m_fMinX, fY); - std::sprintf(pBuf, "%g", fY); + o3tl::sprintf(pBuf, "%g", fY); OUString aMark(pBuf, strlen(pBuf), osl_getThreadTextEncoding()); Size aTextSize(rRenderContext.GetTextWidth(aMark), rRenderContext.GetTextHeight()); aPt.AdjustX( -(aTextSize.Width() + 2) ); @@ -648,7 +647,7 @@ void GridWindow::ChangeMode(ResetType nType) { for( int i = 0; i < m_nValues; i++ ) { - m_pNewYValues[ i ] = m_fMinY + (m_fMaxY-m_fMinY)*(rtl::math::expm1((m_pXValues[i]-m_fMinX)/(m_fMaxX-m_fMinX)))/(M_E-1.0); + m_pNewYValues[ i ] = m_fMinY + (m_fMaxY-m_fMinY)*(std::expm1((m_pXValues[i]-m_fMinX)/(m_fMaxX-m_fMinX)))/(M_E-1.0); } } break; |