diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-11-05 15:57:31 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-11-05 18:27:41 +0100 |
commit | 47ef2aa3709b248475e9c462667434f59f4cf2cd (patch) | |
tree | 29869d03728229e261daea25479572c4c5a11e2f /extensions | |
parent | 0e45f8318ee73361fecb049b33b0662fabe295d3 (diff) |
-Werror,-Wdeprecated-declarations (sprintf, macOS 13 SDK): extensions
Change-Id: I5ff1ad95c452c9e4b902ab547d84e6c2064db8ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142325
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/scanner/grid.cxx | 6 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index c727c8c92a5a..0082d04e5def 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> @@ -446,7 +446,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 +459,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) ); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 8486195c93e6..63c8ea79050f 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <stdio.h> #include <stdlib.h> +#include <o3tl/sprintf.hxx> #include <tools/config.hxx> #include <unotools/resmgr.hxx> #include <vcl/bitmapex.hxx> @@ -745,7 +745,7 @@ IMPL_LINK(SaneDlg, ModifyHdl, weld::Entry&, rEdit, void) fValue = mfMin; else if( fValue > mfMax ) fValue = mfMax; - sprintf( pBuf, "%g", fValue ); + o3tl::sprintf( pBuf, "%g", fValue ); mxNumericEdit->set_text( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) ); } mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement ); @@ -757,7 +757,7 @@ IMPL_LINK(SaneDlg, ModifyHdl, weld::Entry&, rEdit, void) if( mrSane.GetOptionValue( mnCurrentOption, fValue, mnCurrentElement )) { char pBuf[256]; - sprintf( pBuf, "%g", fValue ); + o3tl::sprintf( pBuf, "%g", fValue ); OUString aValue( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ); mxNumericEdit->set_text( aValue ); mxQuantumRangeBox->set_active_text( aValue ); @@ -1002,13 +1002,13 @@ void SaneDlg::EstablishQuantumRange() mfMax = mpRange[ nValues-1 ]; for( int i = 0; i < nValues; i++ ) { - sprintf( pBuf, "%g", mpRange[ i ] ); + o3tl::sprintf( pBuf, "%g", mpRange[ i ] ); mxQuantumRangeBox->append_text( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) ); } double fValue; if( mrSane.GetOptionValue( mnCurrentOption, fValue, mnCurrentElement ) ) { - sprintf( pBuf, "%g", fValue ); + o3tl::sprintf( pBuf, "%g", fValue ); mxQuantumRangeBox->set_active_text( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) ); } mxQuantumRangeBox->show(); @@ -1033,12 +1033,12 @@ void SaneDlg::EstablishNumericOption() aText += mrSane.GetOptionUnitName( mnCurrentOption ); if( mfMin != mfMax ) { - sprintf( pBuf, " < %g ; %g >", mfMin, mfMax ); + o3tl::sprintf( pBuf, " < %g ; %g >", mfMin, mfMax ); aText += OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ); } mxOptionDescTxt->set_label( aText ); mxOptionDescTxt->show(); - sprintf( pBuf, "%g", fValue ); + o3tl::sprintf( pBuf, "%g", fValue ); mxNumericEdit->set_text( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) ); mxNumericEdit->show(); } @@ -1398,7 +1398,7 @@ void SaneDlg::SaveState() break; if( n > 0 ) aString.append(':'); - sprintf( buf, "%lg", fValue ); + o3tl::sprintf( buf, "%lg", fValue ); aString.append(buf); } if( n >= mrSane.GetOptionElements( nOption ) ) |