summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/app/scmod.cxx4
-rw-r--r--sc/source/ui/docshell/docsh.cxx18
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/docshell/docsh8.cxx16
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx2
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/inc/docsh.hxx6
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx4
-rw-r--r--sc/source/ui/unoobj/warnpassword.cxx4
-rw-r--r--sc/source/ui/vba/vbachart.cxx32
-rw-r--r--sc/source/ui/vba/vbachartobject.cxx6
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx2
-rw-r--r--sc/source/ui/vba/vbatitle.hxx8
-rw-r--r--sc/source/ui/view/tabvwshb.cxx2
15 files changed, 55 insertions, 55 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 60324562b4d1..db43a50e0268 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -176,8 +176,8 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
// Between OfficeApplication::Init and ScGlobal::Init
SvxErrorHandler::ensure();
pErrorHdl = new SfxErrorHandler( RID_ERRHDLSC,
- ERRCODE_AREA_SC,
- ERRCODE_AREA_APP2-1,
+ ErrCode(ERRCODE_AREA_SC),
+ ErrCode(ERRCODE_AREA_APP2-1),
GetResMgr() );
aSpellIdle.SetPriority(TaskPriority::LOWER);
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 8ccfffa058a9..36ce03fdf3f2 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1128,7 +1128,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (!GetError())
SetError(eError);
- if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
+ if( eError.IsWarning() )
bRet = true;
}
else
@@ -1284,7 +1284,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
ScDocRowHeightUpdater::TabRanges aRecalcRanges(0);
- sal_uLong eError = DBaseImport( rMedium.GetPhysicalName(),
+ ErrCode eError = DBaseImport( rMedium.GetPhysicalName(),
ScGlobal::GetCharsetValue(sItStr), aColWidthParam, *aRecalcRanges.mpRanges );
aRecalcRowRangesArray.push_back(aRecalcRanges);
@@ -1331,7 +1331,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (!GetError())
SetError(eError);
- if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
+ if( eError.IsWarning() )
bRet = true;
}
else
@@ -1377,7 +1377,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
{
if (!GetError())
SetError(eError);
- if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
+ if( eError.IsWarning() )
bRet = true;
}
else
@@ -1404,7 +1404,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (!GetError())
SetError(eError);
- if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
+ if( eError.IsWarning() )
bRet = true;
}
else
@@ -1456,7 +1456,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (!GetError())
SetError(eError);
- if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
+ if( eError.IsWarning() )
bRet = true;
}
else
@@ -2288,7 +2288,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
SetError(eError);
// don't return false for warnings
- bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == ERRCODE_NONE);
+ bRet = eError.IsWarning() || (eError == ERRCODE_NONE);
}
else
{
@@ -2353,10 +2353,10 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
rMed.CloseOutStream();
bool bHasMemo = false;
- sal_uLong eError = DBaseExport(
+ ErrCode eError = DBaseExport(
rMed.GetPhysicalName(), ScGlobal::GetCharsetValue(sCharSet), bHasMemo);
- if ( eError != ERRCODE_NONE && (eError & ERRCODE_WARNING_MASK) )
+ if ( eError != ERRCODE_NONE && eError.IsWarning() )
{
eError = ERRCODE_NONE;
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 869513e6f0b0..513fc1467eb8 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -739,7 +739,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
ScDocShell* pOtherDocSh = new ScDocShell;
SfxObjectShellLock aDocShTablesRef = pOtherDocSh;
pOtherDocSh->DoLoad( pMed );
- sal_uLong nErr = pOtherDocSh->GetErrorCode();
+ ErrCode nErr = pOtherDocSh->GetErrorCode();
if (nErr)
ErrorHandler::HandleError( nErr ); // also warnings
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 85d73f4070d7..170c94213a66 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -104,7 +104,7 @@ using ::std::vector;
namespace
{
- sal_uLong lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager2>& _rDrvMgr, uno::Reference<sdbc::XConnection>& _rConnection, OUString& _rTabName, const OUString& rFullFileName, rtl_TextEncoding eCharSet)
+ ErrCode lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager2>& _rDrvMgr, uno::Reference<sdbc::XConnection>& _rConnection, OUString& _rTabName, const OUString& rFullFileName, rtl_TextEncoding eCharSet)
{
INetURLObject aURL;
aURL.SetSmartProtocol( INetProtocol::File );
@@ -147,7 +147,7 @@ namespace
}));
_rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps );
- return 0L;
+ return ERRCODE_NONE;
}
}
@@ -287,7 +287,7 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales
#endif // HAVE_FEATURE_DBCONNECTIVITY
-sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
+ErrCode ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc )
{
#if !HAVE_FEATURE_DBCONNECTIVITY
@@ -299,7 +299,7 @@ sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncodi
return ERRCODE_IO_GENERAL;
#else
- sal_uLong nErr = ERRCODE_NONE;
+ ErrCode nErr = ERRCODE_NONE;
// Try to get the Text Encoding from the driver
if( eCharSet == RTL_TEXTENCODING_IBM_850 )
@@ -312,7 +312,7 @@ sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncodi
OUString aTabName;
uno::Reference<sdbc::XDriverManager2> xDrvMan;
uno::Reference<sdbc::XConnection> xConnection;
- sal_uLong nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
+ ErrCode nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
if ( !xConnection.is() || !xDrvMan.is() )
return nRet;
::utl::DisposableComponent aConnectionHelper(xConnection);
@@ -755,7 +755,7 @@ inline void lcl_getLongVarCharString(
#endif // HAVE_FEATURE_DBCONNECTIVITY
-sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo )
+ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo )
{
#if !HAVE_FEATURE_DBCONNECTIVITY
(void) rFullFileName;
@@ -768,7 +768,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi
INetURLObject aDeleteObj( rFullFileName, INetProtocol::File );
KillFile( aDeleteObj );
- sal_uLong nErr = ERRCODE_NONE;
+ ErrCode nErr = ERRCODE_NONE;
SCCOL nFirstCol, nLastCol;
SCROW nFirstRow, nLastRow;
@@ -811,7 +811,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi
{
uno::Reference<sdbc::XDriverManager2> xDrvMan;
uno::Reference<sdbc::XConnection> xConnection;
- sal_uLong nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
+ ErrCode nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
if ( !xConnection.is() || !xDrvMan.is() )
return nRet;
::utl::DisposableComponent aConnectionHelper(xConnection);
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index a48ec836a83f..ba26384d9f55 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -254,7 +254,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
if( aDlg.Execute() == ERRCODE_NONE )
{
Graphic aGraphic;
- int nError = aDlg.GetGraphic(aGraphic);
+ ErrCode nError = aDlg.GetGraphic(aGraphic);
if( nError == ERRCODE_NONE )
{
OUString aFileName = aDlg.GetPath();
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 5f7a264850fc..75d45567bcf3 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -308,7 +308,7 @@ void ScGraphicShell::ExecuteChangePicture( SAL_UNUSED_PARAMETER SfxRequest& /*rR
if( aDlg.Execute() == ERRCODE_NONE )
{
Graphic aGraphic;
- int nError = aDlg.GetGraphic(aGraphic);
+ ErrCode nError = aDlg.GetGraphic(aGraphic);
if( nError == ERRCODE_NONE )
{
SdrGrafObj* pNewObject = pGraphicObj->Clone();
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 5e2cbb8a5db2..b7f1016c8f49 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -131,10 +131,10 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE static bool SaveCurrentChart( SfxMedium& rMedium );
- SAL_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
+ SAL_DLLPRIVATE ErrCode DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
- SAL_DLLPRIVATE sal_uLong DBaseExport(
- const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo );
+ SAL_DLLPRIVATE ErrCode DBaseExport(
+ const OUString& rFullFileName, rtl_TextEncoding eCharSet, bool& bHasMemo );
SAL_DLLPRIVATE static bool MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
SAL_DLLPRIVATE static bool KillFile( const INetURLObject& rURL );
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 27e6ff5f56dc..cab40f8976c1 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -333,7 +333,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
pDocShTables->DoLoad( pMed );
SetPointer( aOldPtr );
- sal_uLong nErr = pDocShTables->GetErrorCode();
+ ErrCode nErr = pDocShTables->GetErrorCode();
if ( nErr )
ErrorHandler::HandleError( nErr ); // warnings, too
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 180e089f305e..2e214d14271b 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -141,7 +141,7 @@ void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const OUString& rFilt
pSourceShell = aLoader.GetDocShell();
if ( pSourceShell )
{
- sal_uLong nErr = pSourceShell->GetErrorCode();
+ ErrCode nErr = pSourceShell->GetErrorCode();
if (nErr)
ErrorHandler::HandleError( nErr ); // including warnings
@@ -226,7 +226,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg,
aSourceRef = pSourceShell;
pSourceShell->DoLoad( pMed );
- sal_uLong nErr = pSourceShell->GetErrorCode();
+ ErrCode nErr = pSourceShell->GetErrorCode();
if (nErr)
ErrorHandler::HandleError( nErr ); // including warnings
diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx
index 6e1583df4506..befa90aedd61 100644
--- a/sc/source/ui/unoobj/warnpassword.cxx
+++ b/sc/source/ui/unoobj/warnpassword.cxx
@@ -42,10 +42,10 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium )
Reference< XInteractionHandler > xHandler( rMedium.GetInteractionHandler());
if( xHandler.is() )
{
- Any aException( makeAny(InteractiveAppException("",
+ Any aException( InteractiveAppException("",
Reference <XInterface> (),
InteractionClassification_QUERY,
- ERRCODE_SVX_EXPORT_FILTER_CRYPT)));
+ sal_uInt32(ERRCODE_SVX_EXPORT_FILTER_CRYPT)));
rtl::Reference< ucbhelper::SimpleInteractionRequest > xRequest
= new ucbhelper::SimpleInteractionRequest(
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 0d49bde2def7..1d48529ffb00 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -212,7 +212,7 @@ ScVbaChart::getChartType()
}
catch ( const uno::Exception& )
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return nChartType;
}
@@ -336,7 +336,7 @@ try
}
break;
default:
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_CONVERSION, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_CONVERSION), OUString() );
}
switch (_nChartType)
@@ -538,7 +538,7 @@ try
}
catch ( const uno::Exception& )
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -554,7 +554,7 @@ ScVbaChart::Activate()
if ( pChartObj )
pChartObj->Activate();
else
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "no ChartObject as parent" );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), "no ChartObject as parent" );
}
void SAL_CALL
@@ -617,7 +617,7 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -655,12 +655,12 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy )
mxDiagramPropertySet->setPropertyValue( DATAROWSOURCE, uno::makeAny( chart::ChartDataRowSource_COLUMNS) );
break;
default:
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -682,7 +682,7 @@ ScVbaChart::getPlotBy( )
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -698,7 +698,7 @@ ScVbaChart::setDiagram( const OUString& _sDiagramType )
}
catch ( const uno::Exception& )
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -814,7 +814,7 @@ ScVbaChart::getHasTitle( )
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return bHasTitle;
}
@@ -828,7 +828,7 @@ ScVbaChart::setHasTitle( sal_Bool bTitle )
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -843,7 +843,7 @@ ScVbaChart::getHasLegend( )
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return bHasLegend;
}
@@ -857,7 +857,7 @@ ScVbaChart::setHasLegend( sal_Bool bLegend )
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -948,7 +948,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _
}
catch (const uno::Exception&)
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
@@ -971,7 +971,7 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown)
catch (const uno::Exception&)
{
OUString aTemp; // temporary needed for g++ 3.3.5
- script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return _nNotUpDown;
}
@@ -989,7 +989,7 @@ ScVbaChart::hasMarkers()
catch (const uno::Exception&)
{
OUString aTemp; // temporary needed for g++ 3.3.5
- script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return bHasMarkers;
}
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index d512895f791c..0cf8f2dd7f7c 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -72,7 +72,7 @@ ScVbaChartObject::setShape()
}
catch (uno::Exception& )
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return nullptr;
}
@@ -99,7 +99,7 @@ ScVbaChartObject::Delete()
if (pChartObjectsImpl)
pChartObjectsImpl->removeByName( getPersistName() );
else
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "Parent is not ChartObjects" );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), "Parent is not ChartObjects" );
}
void
@@ -116,7 +116,7 @@ ScVbaChartObject::Activate()
}
catch (uno::Exception& )
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, "ChartObject Activate internal error" );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), "ChartObject Activate internal error" );
}
}
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 185e597e257a..970c9802442d 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -120,7 +120,7 @@ ScVbaChartObjects::getChartObjectNames()
}
catch (uno::Exception& )
{
- throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return sChartNames;
}
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index a4da150287c7..972579f41d49 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -70,7 +70,7 @@ public:
}
catch ( css::uno::Exception& )
{
- throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
OUString SAL_CALL getText( ) SAL_OVERRIDE
@@ -82,7 +82,7 @@ public:
}
catch ( css::uno::Exception& )
{
- throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return sText;
}
@@ -111,7 +111,7 @@ public:
}
catch (css::uno::Exception& )
{
- throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
}
::sal_Int32 SAL_CALL getOrientation( ) SAL_OVERRIDE
@@ -123,7 +123,7 @@ public:
}
catch (css::uno::Exception& )
{
- throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
+ throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() );
}
return static_cast< sal_Int32 >(nSOOrientation / 100) ;
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index a1b196d6e0dc..0123464a3252 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -158,7 +158,7 @@ void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
if ( !pClient )
pClient = new ScClient( this, pWin, GetSdrView()->GetModel(), pObj );
- if ( !(nErr & ERRCODE_ERROR_MASK) && xObj.is() )
+ if ( !nErr.IgnoreWarning() && xObj.is() )
{
tools::Rectangle aRect = pObj->GetLogicRect();
generated by cgit (git 2.34.1) at 2024-07-25 21:07:42 +0000