diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/qa/unit/xoutdev.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/imapdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/items/svxerr.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx index a680bd4ebac2..2cc088609104 100644 --- a/svx/qa/unit/xoutdev.cxx +++ b/svx/qa/unit/xoutdev.cxx @@ -47,7 +47,7 @@ void XOutdevTest::testPdfGraphicExport() test::Directories aDirectories; OUString aURL = aDirectories.getURLFromSrc("svx/qa/unit/data/graphic.pdf"); SvFileStream aStream(aURL, StreamMode::READ); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(ERRCODE_NONE), GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aURL, aStream)); + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aURL, aStream)); // Export it. utl::TempFile aTempFile; diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 6c6cb6467bf9..e64dd30470d9 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -475,7 +475,7 @@ void SvxIMapDlg::DoOpen() if( pIStm->GetError() ) { - SfxErrorContext eEC(ERRCODE_SFX_GENERAL,this); + SfxErrorContext eEC(ERRCTX_ERROR, this); ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); } else diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx index fff31650fb4b..308f70ae5f9b 100644 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -26,7 +26,7 @@ SvxErrorHandler::SvxErrorHandler() : SfxErrorHandler( - RID_SVXERRCODE, ERRCODE_AREA_SVX, ERRCODE_AREA_SVX_END, &DIALOG_MGR() ) + RID_SVXERRCODE, ErrCode(ERRCODE_AREA_SVX), ErrCode(ERRCODE_AREA_SVX_END), &DIALOG_MGR() ) { } diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index e82242591617..065b656cdb5a 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -204,7 +204,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) { Graphic aGraphic; EnterWait(); - int nError = aDlg.GetGraphic( aGraphic ); + ErrCode nError = aDlg.GetGraphic( aGraphic ); LeaveWait(); if( nError == ERRCODE_NONE ) { diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index c0bf4332cbbe..41ba358aefb1 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1058,7 +1058,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes lContinuations[0].set(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY); GraphicFilterRequest aErrorCode; - aErrorCode.ErrCode = nStatus; + aErrorCode.ErrCode = sal_uInt32(nStatus); aInteraction <<= aErrorCode; aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) ); } diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 07619419abfe..a611baff4bf8 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -375,7 +375,7 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, OUString& rOUString) aMimeType = "image/png"; break; } - sal_uLong nErr = GraphicConverter::Export(aOStm,rGraphic,aCvtType); + ErrCode nErr = GraphicConverter::Export(aOStm,rGraphic,aCvtType); if ( nErr ) { SAL_WARN("svx", "XOutBitmap::GraphicToBase64() invalid Graphic? error: " << nErr ); |