diff options
Diffstat (limited to 'sc/source')
35 files changed, 104 insertions, 104 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index ed957bbf2db0..5eef8b5a167f 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -586,7 +586,7 @@ void ScHTMLExport::WriteBody() { // Save graphic as (JPG) file aGrfNm = aStreamPath; - sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm, + ErrCode nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm, "JPG", XOutFlags::UseNativeIfPossible ); if( !nErr ) // Contains errors, as we have nothing to output { diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 9b751d3b7ee3..3b9179b081f4 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -185,7 +185,7 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, // Save as a PNG OUString aGrfNm( aStreamPath ); nXOutFlags |= XOutFlags::UseNativeIfPossible; - sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, + ErrCode nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, "PNG", nXOutFlags ); // If it worked, create a URL for the IMG tag diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 41c9d6cd0a5c..5dc06c5a8054 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -47,7 +47,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUStrin bool bConvertDate ) { ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight ); - ErrCode nErr = (ErrCode) aImp.Read( rStream, rBaseURL ); + ErrCode nErr = aImp.Read( rStream, rBaseURL ); ScRange aR = aImp.GetRange(); rRange.aEnd = aR.aEnd; aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate ); diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index fa3e2d8f8f51..87d444436546 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -254,7 +254,7 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser() } } -sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL ) +ErrCode ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL ) { Link<HtmlImportInfo&,void> aOldLink = pEdit->GetHtmlImportHdl(); pEdit->SetHtmlImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) ); @@ -282,7 +282,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL } } - sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes ); + ErrCode nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes ); pEdit->SetHtmlImportHdl( aOldLink ); // Create column width @@ -2828,7 +2828,7 @@ ScHTMLQueryParser::~ScHTMLQueryParser() { } -sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) +ErrCode ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) { SvKeyValueIteratorRef xValues; SvKeyValueIterator* pAttributes = nullptr; @@ -2856,7 +2856,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) Link<HtmlImportInfo&,void> aOldLink = pEdit->GetHtmlImportHdl(); pEdit->SetHtmlImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) ); - sal_uLong nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes ); + ErrCode nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes ); pEdit->SetHtmlImportHdl( aOldLink ); mxGlobTable->Recalc(); diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 75ac0902ca58..c65db788e7d7 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -54,7 +54,7 @@ public: ScEEImport( ScDocument* pDoc, const ScRange& rRange ); virtual ~ScEEImport() override; - virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) override; + virtual ErrCode Read( SvStream& rStream, const OUString& rBaseURL ) override; virtual ScRange GetRange() override { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index b60e633fd9ba..2b19f41672c0 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -118,7 +118,7 @@ public: ScEEParser( EditEngine* ); virtual ~ScEEParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) = 0; + virtual ErrCode Read( SvStream&, const OUString& rBaseURL ) = 0; const ColWidthsMap& GetColWidths() const { return maColWidths; } ColWidthsMap& GetColWidths() { return maColWidths; } diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index f807c06ee604..1598f7d5daae 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -85,7 +85,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser() override; - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0; + virtual ErrCode Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0; ScHTMLStyles& GetStyles() { return maStyles;} ScDocument& GetDoc() { return *mpDoc;} @@ -214,7 +214,7 @@ private: public: ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* ); virtual ~ScHTMLLayoutParser() override; - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; + virtual ErrCode Read( SvStream&, const OUString& rBaseURL ) override; virtual const ScHTMLTable* GetGlobalTable() const override; }; @@ -570,7 +570,7 @@ public: explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLQueryParser() override; - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override; + virtual ErrCode Read( SvStream& rStrm, const OUString& rBaseURL ) override; /** Returns the "global table" which contains the entire HTML document. */ virtual const ScHTMLTable* GetGlobalTable() const override; diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index a22d603d7a5d..9d6b052e62d5 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -73,7 +73,7 @@ private: public: ScRTFParser( EditEngine* ); virtual ~ScRTFParser() override; - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; + virtual ErrCode Read( SvStream&, const OUString& rBaseURL ) override; }; #endif diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index b42265184a21..f1640a3ed8f4 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -26,9 +26,9 @@ #include <tools/solar.h> // Error numbers -#define errUnknownFormat 1 -#define errUnknownID 2 -#define errOutOfMemory 3 +#define errUnknownFormat ErrCode(1) +#define errUnknownID ErrCode(2) +#define errOutOfMemory ErrCode(3) // Identifiers in FileFormat #define ColWidthID 1 @@ -601,10 +601,10 @@ public: class Sc10FontCollection : public ScCollection { protected: - sal_uLong nError; + ErrCode nError; public: Sc10FontCollection( SvStream& rStream ); - sal_uLong GetError() { return nError; } + ErrCode GetError() { return nError; } Sc10FontData* At(sal_uInt16 nIndex) { return static_cast<Sc10FontData*>(ScCollection::At(nIndex)); } private: using ScCollection::At; @@ -635,10 +635,10 @@ public: class Sc10NameCollection : public ScCollection { protected: - sal_uLong nError; + ErrCode nError; public: Sc10NameCollection(SvStream& rStream); - sal_uLong GetError() { return nError; } + ErrCode GetError() { return nError; } Sc10NameData* At(sal_uInt16 nIndex) { return static_cast<Sc10NameData*>(ScCollection::At(nIndex)); } private: using ScCollection::At; @@ -686,10 +686,10 @@ virtual ScDataObject* Clone() const override { return new Sc10PatternData( class Sc10PatternCollection : public ScCollection { protected: - sal_uLong nError; + ErrCode nError; public: Sc10PatternCollection(SvStream& rStream); - sal_uLong GetError() { return nError; } + ErrCode GetError() { return nError; } Sc10PatternData* At(sal_uInt16 nIndex) { return static_cast<Sc10PatternData*>(ScCollection::At(nIndex)); } private: using ScCollection::At; @@ -714,11 +714,11 @@ virtual ScDataObject* Clone() const override { return new Sc10DataBaseData class Sc10DataBaseCollection : public ScCollection { protected: - sal_uLong nError; + ErrCode nError; sal_Char ActName[32]; public: Sc10DataBaseCollection(SvStream& rStream); - sal_uLong GetError() { return nError; } + ErrCode GetError() { return nError; } Sc10DataBaseData* At(sal_uInt16 nIndex) { return static_cast<Sc10DataBaseData*>(ScCollection::At(nIndex)); } private: using ScCollection::At; @@ -760,7 +760,7 @@ class Sc10Import Sc10NameCollection* pNameCollection; Sc10PatternCollection* pPatternCollection; Sc10DataBaseCollection* pDataBaseCollection; - sal_uLong nError; + ErrCode nError; SCTAB nShowTab; ScViewOptions aSc30ViewOpt; ScfStreamProgressBar* pPrgrsBar; @@ -769,7 +769,7 @@ public: Sc10Import( SvStream& rStr, ScDocument* pDocument ); ~Sc10Import(); - sal_uLong Import(); + ErrCode Import(); void LoadFileHeader(); void LoadFileInfo(); void LoadEditStateInfo(); diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 003b82d7c424..9d4dfab84bb3 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -92,7 +92,7 @@ ErrCode ImportLotus::Read() else { eAkt = S_END; // TODO: add here something for <= WK1! - eRet = 0xFFFFFFFF; + eRet = ErrCode(0xFFFFFFFF); } } break; diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx index f9d6c8128765..8a7c8493225b 100644 --- a/sc/source/filter/lotus/lotus.cxx +++ b/sc/source/filter/lotus/lotus.cxx @@ -51,10 +51,10 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocume if( bWithWK3 ) eRet = aLotusImport.Read(); else - eRet = 0xFFFFFFFF; // force WK1 /WKS + eRet = ErrCode(0xFFFFFFFF); // force WK1 /WKS // WARNING: QUICK-HACK for WK1 / WKS <-> WK3 / WK4 - if( eRet == 0xFFFFFFFF ) + if( eRet == ErrCode(0xFFFFFFFF) ) { pStream->Seek( 0UL ); diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 0e6eab3bc56c..87b3a0426809 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -76,9 +76,9 @@ ScEEImport::~ScEEImport() // Is guaranteed as ScEEImport is base class } -sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL ) +ErrCode ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL ) { - sal_uLong nErr = mpParser->Read( rStream, rBaseURL ); + ErrCode nErr = mpParser->Read( rStream, rBaseURL ); SCCOL nEndCol; SCROW nEndRow; diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx index bb269686b693..ecd86a537846 100644 --- a/sc/source/filter/rtf/rtfimp.cxx +++ b/sc/source/filter/rtf/rtfimp.cxx @@ -28,7 +28,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange ) { ScRTFImport aImp( pDoc, rRange ); - ErrCode nErr = (ErrCode) aImp.Read( rStream, rBaseURL ); + ErrCode nErr = aImp.Read( rStream, rBaseURL ); ScRange aR = aImp.GetRange(); rRange.aEnd = aR.aEnd; aImp.WriteToDocument(); diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index d5262fd13a16..523b2ef32c54 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -55,11 +55,11 @@ ScRTFParser::~ScRTFParser() maDefaultList.clear(); } -sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) +ErrCode ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) { Link<RtfImportInfo&,void> aOldLink = pEdit->GetRtfImportHdl(); pEdit->SetRtfImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) ); - sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF ); + ErrCode nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF ); if ( nRtfLastToken == RTF_PAR ) { if ( !maList.empty() ) diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index bd41c17c90f7..c6b9b199a645 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -369,10 +369,10 @@ static OUString lcl_MakeOldPageStyleFormatName( sal_uInt16 i ) return aName; } -template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStream& rStream ) +template < typename T > ErrCode insert_new( ScCollection* pCollection, SvStream& rStream ) { std::unique_ptr<T> pData(new (::std::nothrow) T( rStream)); - sal_uLong nError = rStream.GetError(); + ErrCode nError = rStream.GetError(); if (pData) { if (!nError) @@ -948,7 +948,7 @@ Sc10Import::~Sc10Import() "*Sc10Import::Sc10Import(): Progressbar lebt noch!?" ); } -sal_uLong Sc10Import::Import() +ErrCode Sc10Import::Import() { pPrgrsBar = new ScfStreamProgressBar( rStream, pDoc->GetDocumentShell() ); @@ -2404,7 +2404,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocum { rStream.Seek( 0UL ); Sc10Import aImport( rStream, pDocument ); - return ( ErrCode ) aImport.Import(); + return aImport.Import(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 4d6c02cf7528..89fb12331df3 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4979,7 +4979,7 @@ void ScXMLExport::IncrementProgressBar(bool bFlush, sal_Int32 nInc) } } -sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) +ErrCode ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) { if( getExportFlags() & (SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES| SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) ) diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index a02a6ee3dffe..675b8183fd07 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -256,7 +256,7 @@ public: XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); // Export the document. - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; + virtual ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; // XExporter virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 437264636bc8..2bcbd62b9e69 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -3424,7 +3424,7 @@ sal_Int32 ScXMLImport::GetByteOffset() return nOffset; } -void ScXMLImport::SetRangeOverflowType(sal_uInt32 nType) +void ScXMLImport::SetRangeOverflowType(ErrCode nType) { // #i31130# Overflow is stored in the document, because the ScXMLImport object // isn't available in ScXMLImportWrapper::ImportFromComponent when using the diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index be204c1f8deb..d11e36cc73a5 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1179,7 +1179,7 @@ public: sal_Int32 GetByteOffset(); - void SetRangeOverflowType(sal_uInt32 nType); + void SetRangeOverflowType(ErrCode nType); static sal_Int32 GetRangeType(const OUString& sRangeType); void SetNamedRanges(); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 880c2f5320ea..92295e09f993 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -97,7 +97,7 @@ uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator() return xStatusIndicator; } -sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XComponentContext>& xContext, +ErrCode ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XComponentContext>& xContext, uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XParser>& xParser, xml::sax::InputSource& aParserInput, const OUString& sComponentName, const OUString& sDocName, @@ -158,8 +158,8 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) ); } - sal_uInt32 nReturn = ERRCODE_NONE; - rDoc.SetRangeOverflowType(0); // is modified by the importer if limits are exceeded + ErrCode nReturn = ERRCODE_NONE; + rDoc.SetRangeOverflowType(ERRCODE_NONE); // is modified by the importer if limits are exceeded uno::Reference<xml::sax::XDocumentHandler> xDocHandler( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( @@ -415,7 +415,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) } // #i103539#: always read meta.xml for generator - sal_uInt32 nMetaRetval(0); + ErrCode nMetaRetval(ERRCODE_NONE); if (nMode & ImportFlags::Metadata) { uno::Sequence<uno::Any> aMetaArgs(1); @@ -454,7 +454,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) pStylesArgs[2] <<= xStatusIndicator; pStylesArgs[3] <<= xObjectResolver; - sal_uInt32 nSettingsRetval(0); + ErrCode nSettingsRetval(ERRCODE_NONE); if (nMode & ImportFlags::Settings) { // Settings must be loaded first because of the printer setting, @@ -475,7 +475,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) SAL_INFO( "sc.filter", "settings import end" ); } - sal_uInt32 nStylesRetval(0); + ErrCode nStylesRetval(ERRCODE_NONE); if (nMode & ImportFlags::Styles) { SAL_INFO( "sc.filter", "styles import start" ); @@ -489,7 +489,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) SAL_INFO( "sc.filter", "styles import end" ); } - sal_uInt32 nDocRetval(0); + ErrCode nDocRetval(ERRCODE_NONE); if (nMode & ImportFlags::Content) { if (mrDocShell.GetCreateMode() == SfxObjectCreateMode::INTERNAL) 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(); |