[Libreoffice-commits] core.git: 4 commits - dbaccess/source include/vbahelper sc/source sw/source vbahelper/source
Caolán McNamara
caolanm at redhat.com
Wed Jul 9 01:59:33 PDT 2014
dbaccess/source/core/api/querycontainer.cxx | 10 ++
include/vbahelper/vbahelper.hxx | 13 ++-
sc/source/ui/vba/vbaapplication.cxx | 9 +-
sc/source/ui/vba/vbaapplication.hxx | 2
sc/source/ui/vba/vbaaxes.cxx | 4 -
sc/source/ui/vba/vbaaxis.cxx | 86 ++++++++++++------------
sc/source/ui/vba/vbacondition.cxx | 2
sc/source/ui/vba/vbaformat.cxx | 70 +++++++++----------
sc/source/ui/vba/vbaformatcondition.cxx | 10 +-
sc/source/ui/vba/vbaformatconditions.cxx | 18 ++---
sc/source/ui/vba/vbapagebreak.cxx | 2
sc/source/ui/vba/vbapagebreaks.cxx | 8 +-
sc/source/ui/vba/vbapagesetup.cxx | 28 +++----
sc/source/ui/vba/vbarange.cxx | 32 ++++----
sc/source/ui/vba/vbastyle.cxx | 18 ++---
sc/source/ui/vba/vbastyles.cxx | 14 +--
sc/source/ui/vba/vbawindow.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 2
sw/source/ui/vba/vbadocument.cxx | 2
sw/source/ui/vba/vbafield.cxx | 2
sw/source/ui/vba/vbaoptions.cxx | 2
sw/source/ui/vba/vbaparagraphformat.cxx | 20 ++---
sw/source/ui/vba/vbarange.cxx | 8 +-
sw/source/ui/vba/vbarange.hxx | 2
sw/source/ui/vba/vbarangehelper.cxx | 6 -
sw/source/ui/vba/vbarows.cxx | 2
sw/source/ui/vba/vbaselection.cxx | 10 +-
sw/source/ui/vba/vbaselection.hxx | 2
sw/source/ui/vba/vbastyles.cxx | 2
sw/source/ui/vba/vbatabstops.cxx | 2
sw/source/ui/vba/vbaview.cxx | 12 +--
sw/source/ui/vba/vbawrapformat.cxx | 4 -
sw/source/ui/vba/vbawrapformat.hxx | 2
vbahelper/source/vbahelper/vbahelper.cxx | 28 ++++++-
vbahelper/source/vbahelper/vbapagesetupbase.cxx | 2
vbahelper/source/vbahelper/vbashape.cxx | 4 -
36 files changed, 238 insertions(+), 204 deletions(-)
New commits:
commit 98921d4c37a7c312b1b15a153de56fc4e442262e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 9 09:46:36 2014 +0100
coverity#738460 Uncaught exception
Change-Id: I39d0665131432ce963b434925e23b9eab2e739ca
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 930ede4..9f855ae 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -224,7 +224,7 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw (
}
void
-SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend, word::E_DIRECTION eDirection ) throw ( uno::RuntimeException )
+SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend, word::E_DIRECTION eDirection ) throw ( css::script::BasicErrorException, uno::RuntimeException )
{
sal_Int32 nUnit = word::WdUnits::wdCharacter;
sal_Int32 nCount = 1;
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index 9d416a2..daccd7c 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -41,7 +41,7 @@ private:
css::uno::Reference< ooo::vba::word::XRange > mxRange;
private:
- void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException);
+ void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection )
throw (css::script::BasicErrorException, css::uno::RuntimeException);
css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException );
commit 92fe8838f7c6e2bd411b381a77f0fc4c43272b1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 9 09:05:50 2014 +0100
coverity#707382 Uncaught exception
and
coverity#707383 Uncaught exception
coverity#707384 Uncaught exception
coverity#707385 Uncaught exception
coverity#707386 Uncaught exception
coverity#707387 Uncaught exception
coverity#707388 Uncaught exception
coverity#707389 Uncaught exception
coverity#707390 Uncaught exception
coverity#707391 Uncaught exception
coverity#707409 Uncaught exception
coverity#707411 Uncaught exception
coverity#707413 Uncaught exception
coverity#707414 Uncaught exception
coverity#706919 Uncaught exception
coverity#706920 Uncaught exception
coverity#706933 Uncaught exception
coverity#706935 Uncaught exception
coverity#706968 Uncaught exception
coverity#706970 Uncaught exception
coverity#706973 Uncaught exception
coverity#706974 Uncaught exception
coverity#707032 Uncaught exception
coverity#707044 Uncaught exception
coverity#738455 Uncaught exception
coverity#738456 Uncaught exception
Change-Id: Ifd4c0a2b6b4ddcb5df01a951b8d56435ee32d754
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index e40357d..3e9fa21 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -240,11 +240,18 @@ public:
class VBAHELPER_DLLPUBLIC DebugHelper
{
public:
- static void exception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException );
+ static void basicexception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException );
- static void exception( int err, const OUString& additionalArgument ) throw( css::script::BasicErrorException );
+ static void basicexception( int err, const OUString& additionalArgument ) throw( css::script::BasicErrorException );
+
+ static void basicexception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException );
+
+ static void runtimeexception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::uno::RuntimeException );
+
+ static void runtimeexception( int err, const OUString& additionalArgument ) throw( css::uno::RuntimeException );
+
+ static void runtimeexception( const css::uno::Exception& ex ) throw( css::uno::RuntimeException );
- static void exception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException );
};
} // vba
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 6426232..db47c7f 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -867,7 +867,8 @@ static uno::Reference< util::XPathSettings > lcl_getPathSettingsService( const u
}
return xPathSettings;
}
-OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( uno::RuntimeException, script::BasicErrorException )
+
+OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (uno::RuntimeException)
{
OUString sRetPath;
uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext );
@@ -884,7 +885,7 @@ OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( u
}
catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::runtimeexception(SbERR_METHOD_FAILED, OUString());
}
return sRetPath;
}
@@ -1109,7 +1110,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect(
throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
if( !rArg1.is() || !rArg2.is() )
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception( SbERR_BAD_PARAMETER, OUString() );
// initialize the result list with 1st parameter, join its ranges together
ListOfScRange aList;
@@ -1163,7 +1164,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union(
throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
if( !rArg1.is() || !rArg2.is() )
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception( SbERR_BAD_PARAMETER, OUString() );
ListOfScRange aList;
lclAddToListOfScRange( aList, uno::Any( rArg1 ) );
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 0e69474..a9ea9dc 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -37,7 +37,7 @@ private:
// note: member variables moved to struct "ScVbaAppSettings", see cxx file, to be shared by all application instances
ScVbaAppSettings& mrAppSettings;
- OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException, css::script::BasicErrorException );
+ OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException );
protected:
virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE;
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 9d36249..ca76ea4 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -69,11 +69,11 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno:
if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue)))
{
if ((nAxisGroup != xlPrimary) && (nAxisGroup != xlSecondary))
- throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString());
+ DebugHelper::runtimeexception(SbERR_METHOD_FAILED, OUString());
xAxisPropertySet.set( pChart->getAxisPropertySet(nType, nAxisGroup), uno::UNO_QUERY_THROW );
}
else
- throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString());
+ DebugHelper::runtimeexception(SbERR_METHOD_FAILED, OUString());
uno::Reference< XHelperInterface > xParent( xChart, uno::UNO_QUERY_THROW );
return new ScVbaAxis( xParent, xContext, xAxisPropertySet, nType, nAxisGroup);
}
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 8ed9bfe..a7779b3 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -47,7 +47,7 @@ ScVbaAxis::isValueAxis() throw( script::BasicErrorException )
{
if ( getType() == xlCategory )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return true;
}
@@ -94,7 +94,7 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
return xAxisTitle;
@@ -103,13 +103,13 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce
void SAL_CALL
ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
}
::sal_Int32 SAL_CALL
ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
return -1;
}
@@ -143,7 +143,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
::sal_Int32 SAL_CALL
@@ -175,7 +175,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
return nCrosses;
}
@@ -191,7 +191,7 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
}
@@ -205,7 +205,7 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return fCrosses;
}
@@ -244,7 +244,7 @@ ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
}
@@ -270,7 +270,7 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
return bHasTitle;
}
@@ -285,7 +285,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -300,7 +300,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return fMinor;
}
@@ -315,7 +315,7 @@ ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::Basic
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -330,9 +330,9 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
mxPropertySet->getPropertyValue("AutoStepHelp") >>= bIsAuto;
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return bIsAuto;
}
@@ -340,13 +340,13 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
void SAL_CALL
ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
}
sal_Bool SAL_CALL
ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
return false;
}
@@ -360,9 +360,9 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException
mxPropertySet->setPropertyValue("StepMain", uno::makeAny(_fMajorUnit));
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -375,9 +375,9 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce
if (isValueAxis())
mxPropertySet->getPropertyValue("StepMain") >>= fMax;
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
return fMax;
}
@@ -392,9 +392,9 @@ ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::Basic
mxPropertySet->setPropertyValue("AutoStepMain", uno::makeAny( _bMajorUnitIsAuto ));
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -409,9 +409,9 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
mxPropertySet->getPropertyValue("AutoStepMain") >>= bIsAuto;
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return bIsAuto;
}
@@ -426,9 +426,9 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc
mxPropertySet->setPropertyValue("Max", uno::makeAny(_fMaximumScale));
}
}
- catch ( uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -443,9 +443,9 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE
mxPropertySet->getPropertyValue("Max") >>= fMax;
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return fMax;
@@ -460,9 +460,9 @@ ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script:
mxPropertySet->setPropertyValue("AutoMax", uno::makeAny( _bMaximumScaleIsAuto ));
}
- catch ( uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -475,9 +475,9 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
if (isValueAxis())
mxPropertySet->getPropertyValue("AutoMax") >>= bIsAuto;
}
- catch ( uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception( SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception( SbERR_METHOD_FAILED, OUString() );
}
return bIsAuto;
}
@@ -492,7 +492,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc
}
catch ( uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -507,7 +507,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
return fMin;
}
@@ -522,9 +522,9 @@ ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script:
mxPropertySet->setPropertyValue("AutoMin", uno::makeAny(_bMinimumScaleIsAuto));
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -539,9 +539,9 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
mxPropertySet->getPropertyValue("AutoMin") >>= bIsAuto;
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return bIsAuto;
}
@@ -573,9 +573,9 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce
}
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -595,9 +595,9 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce
nScaleType = xlScaleLinear;
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return nScaleType;
}
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 54d320c..3e475d8 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script:
}
case sheet::ConditionOperator_NONE:
default:
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString("Operator not supported"));
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString("Operator not supported"));
break;
}
return retvalue;
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index b914ab6..3cab632 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -55,13 +55,13 @@ ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xPar
try
{
if ( !mxModel.is() )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") );
// mxServiceInfo is unused,
// mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats.
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -97,9 +97,9 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s
}
mxPropertySet->setPropertyValue( OUString( SC_UNONAME_CELLVJUS ), aVal );
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -135,7 +135,7 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException,
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return aResult;
}
@@ -175,7 +175,7 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment )
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -216,7 +216,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
return NRetAlignment;
}
@@ -255,7 +255,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
template< typename Ifc1 >
@@ -292,7 +292,7 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return NRetOrientation;
}
@@ -307,7 +307,7 @@ ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::Basi
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -324,9 +324,9 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt
aWrap = mxPropertySet->getPropertyValue(aPropName);
}
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
return aWrap;
}
@@ -383,9 +383,9 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException,
}
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return aRet;
@@ -416,7 +416,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -446,7 +446,7 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -469,9 +469,9 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi
mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ;
mxPropertySet->setPropertyValue( OUString( SC_UNONAME_PINDENT ), uno::makeAny( sal_Int16(nLevel * 352.8) ) );
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -492,9 +492,9 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R
NRetIndentLevel = uno::makeAny( sal_Int32(0) );
}
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return NRetIndentLevel;
}
@@ -514,9 +514,9 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr
aCellProtection.IsLocked = bIsLocked;
mxPropertySet->setPropertyValue(sCellProt, uno::makeAny( aCellProtection ) );
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -534,9 +534,9 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri
aCellProtection.IsFormulaHidden = bIsFormulaHidden;
mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection));
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception( SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception( SbERR_METHOD_FAILED, OUString() );
}
}
@@ -567,9 +567,9 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim
}
}
}
- catch (const uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return aCellProtection;
}
@@ -602,7 +602,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno:
}
catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return aBoolRet;
}
@@ -617,7 +617,7 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString() );
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString() );
}
}
@@ -635,7 +635,7 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
}
return aRet;
}
@@ -659,16 +659,16 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script
aVal = uno::makeAny( text::WritingMode_RL_TB );
break;
case excel::Constants::xlContext:
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
break;
default:
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
mxPropertySet->setPropertyValue( OUString( SC_UNONAME_WRITING ), aVal );
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -699,7 +699,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno::
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
}
return NRetReadingOrder;
@@ -727,7 +727,7 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return aFormat;
}
@@ -744,7 +744,7 @@ ScVbaFormat<Ifc1>::isAmbiguous(const OUString& _sPropertyName) throw ( script::B
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return bResult;
}
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 623d6ea..683a3c9 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -28,7 +28,7 @@ lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions
{
ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() );
if ( !pFormatConditions )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
return pFormatConditions;
}
@@ -65,9 +65,9 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co
pFormatConditions->removeFormatCondition(msStyleName, false);
pFormatConditions->Add(_nType, _aOperator, _aFormula1, _aFormula2, mxStyle);
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
@@ -101,7 +101,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference<
aAPIType = sheet::ConditionOperator_NONE;
break;
default:
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
return aAPIType;
}
@@ -151,7 +151,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
}
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index 0aca559..10fbede 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -44,7 +44,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti
{
ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() );
if ( !pStyles )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
sal_Int32 nCount = mxSheetConditionalEntries->getCount();
for (sal_Int32 i = nCount - 1; i >= 0; i--)
{
@@ -56,7 +56,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -185,7 +185,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
catch (uno::Exception& )
{
}
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
return xFormatCondition;
}
@@ -204,7 +204,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException )
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -214,7 +214,7 @@ ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( scri
// #TODO, #FIXME hook-in proper formula conversion detection & logic
OUString sFormula;
if ( !( _aFormula >>= sFormula ) )
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString() );
return sFormula;
}
@@ -223,7 +223,7 @@ ScVbaFormatConditions::getStyleName()
{
ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() );
if ( !pStyles )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
uno::Sequence< OUString > sCellStyleNames = pStyles->getStyleNames();
return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, OUString("_"));
}
@@ -244,16 +244,16 @@ ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool
{
ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() );
if ( !pStyles )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
pStyles->Delete( _sStyleName );
}
return;
}
}
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index d2bc61b..96e507e 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx
@@ -56,7 +56,7 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException)
(type != excel::XlPageBreak::xlPageBreakManual) &&
(type != excel::XlPageBreak::xlPageBreakAutomatic) )
{
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
if( type == excel::XlPageBreak::xlPageBreakNone )
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index 0f4c6d4..47a8feb 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -71,7 +71,7 @@ public:
return xIndexAccess;
}
- sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw ( script::BasicErrorException, uno::RuntimeException);
+ sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException);
uno::Any Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException);
// XIndexAccess
@@ -133,7 +133,7 @@ uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::In
throw lang::IndexOutOfBoundsException();
}
-sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw ( script::BasicErrorException, uno::RuntimeException)
+sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException)
{
sal_Int32 index = -1;
sheet::TablePageBreakData aTablePageBreakData;
@@ -149,7 +149,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI
aTablePageBreakData = aTablePageBreakDataList[i];
sal_Int32 nPos = aTablePageBreakData.Position;
if( nPos > nUsedEnd + 1 )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::runtimeexception(SbERR_METHOD_FAILED, OUString());
index++;
if( index == nAPIItemIndex )
return aTablePageBreakData;
@@ -164,7 +164,7 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script
Before >>= xRange;
if( !xRange.is() )
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
}
sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange );
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index 7f91a80..6f9d7ee 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -200,7 +200,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru
zoom >>= aValue;
if( aValue )
{
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
}
else
@@ -208,7 +208,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru
zoom >>= pageScale;
if(( pageScale < ZOOM_IN )||( pageScale > ZOOM_MAX ))
{
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -218,14 +218,14 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru
mxPageProps->setPropertyValue("ScaleToPagesX", uno::makeAny( nScale ));
mxPageProps->setPropertyValue("ScaleToPagesY", uno::makeAny( nScale ));
}
- catch( beans::UnknownPropertyException& )
+ catch (const beans::UnknownPropertyException&)
{
if( pageScale == 0 )
{
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
@@ -467,7 +467,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException,
return order;
}
-void SAL_CALL ScVbaPageSetup::setOrder( sal_Int32 order) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::RuntimeException, std::exception)
{
bool bOrder = true;
switch( order )
@@ -478,14 +478,14 @@ void SAL_CALL ScVbaPageSetup::setOrder( sal_Int32 order) throw (css::uno::Runtim
bOrder = false;
break;
default:
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
try
{
mxPageProps->setPropertyValue("PrintDownFirst", uno::makeAny( bOrder ));
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
}
@@ -521,7 +521,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr
aValue <<= (sal_Int16)firstPageNumber;
mxPageProps->setPropertyValue("FirstPageNumber", aValue );
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
}
@@ -534,7 +534,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime
uno::Any aValue = mxPageProps->getPropertyValue("CenterVertically");
aValue >>= centerVertically;
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
return centerVertically;
@@ -546,7 +546,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th
{
mxPageProps->setPropertyValue("CenterVertically", uno::makeAny( centerVertically ));
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
}
@@ -559,7 +559,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti
uno::Any aValue = mxPageProps->getPropertyValue("CenterHorizontally");
aValue >>= centerHorizontally;
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
return centerHorizontally;
@@ -571,7 +571,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally
{
mxPageProps->setPropertyValue("CenterHorizontally", uno::makeAny( centerHorizontally ));
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
}
@@ -584,7 +584,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc
uno::Any aValue = mxPageProps->getPropertyValue("PrintHeaders");
aValue >>= printHeadings;
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
return printHeadings;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index bf8a374..0908823 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4690,7 +4690,7 @@ ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException,
// throw an error
if ( !( mbIsColumns || mbIsRows ) )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
ScDocShell* pDocShell = getDocShellFromRange( mxRange );
if ( pDocShell )
{
@@ -5125,7 +5125,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B
if ( mbIsRows || mbIsColumns )
{
if ( column.hasValue() )
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString() );
uno::Reference< excel::XRange > xRange;
if ( mbIsColumns )
xRange = Columns( row );
@@ -5142,7 +5142,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce
// #TODO #FIXME needs to check for summary row/col ( whatever they are )
// not valid for multi Area Addresses
if ( m_Areas->getCount() > 1 )
- DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
// So needs to either span an entire Row or a just be a single cell
// ( that contains a summary RowColumn )
// also the Single cell cause doesn't seem to be handled specially in
@@ -5157,7 +5157,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce
xSheetOutline->autoOutline( thisAddress );
}
else
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
void SAL_CALL
@@ -5182,7 +5182,7 @@ void
ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException )
{
if ( m_Areas->getCount() > 1 )
- DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
table::TableOrientation nOrient = table::TableOrientation_ROWS;
if ( mbIsColumns )
nOrient = table::TableOrientation_COLUMNS;
@@ -5349,13 +5349,13 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
uno::Reference< excel::XRange > xUsedRange( getWorksheet()->getUsedRange() );
sal_Int32 nType = 0;
if ( !( _oType >>= nType ) )
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString() );
switch(nType)
{
case excel::XlCellType::xlCellTypeSameFormatConditions:
case excel::XlCellType::xlCellTypeAllValidation:
case excel::XlCellType::xlCellTypeSameValidation:
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
break;
case excel::XlCellType::xlCellTypeBlanks:
case excel::XlCellType::xlCellTypeComments:
@@ -5413,11 +5413,11 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
break;
}
default:
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString() );
break;
}
if ( !pRangeToUse )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
return pRangeToUse->SpecialCellsImpl( nType, _oValue );
}
@@ -5443,7 +5443,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script
nRes = sheet::FormulaResult::STRING;
break;
default:
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString() );
}
return nRes;
}
@@ -5465,7 +5465,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
case excel::XlCellType::xlCellTypeSameValidation:
// Shouldn't get here ( should be filtered out by
// ScVbaRange::SpecialCells()
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
break;
case excel::XlCellType::xlCellTypeBlanks:
xLocSheetCellRanges = xQuery->queryEmptyCells();
@@ -5488,7 +5488,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
xLocSheetCellRanges = xQuery->queryVisibleCells();
break;
default:
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString() );
break;
}
if (xLocSheetCellRanges.is())
@@ -5498,7 +5498,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_NOCELLSWEREFOUND);
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_NOCELLSWEREFOUND);
}
return xRange;
}
@@ -5568,16 +5568,16 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::
aColumns[i].Function = sheet::GeneralFunction_VARP;
break;
default:
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString()) ;
+ DebugHelper::basicexception(SbERR_BAD_PARAMETER, OUString()) ;
return;
}
}
xSubDesc->addNew(aColumns, _nGroupBy - 1);
xSub->applySubTotals(xSubDesc, bDoReplace);
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 16d05e7..173a0c6 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -44,11 +44,11 @@ lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XMod
void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException )
{
if (!mxModel.is() )
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") );
uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW );
if ( !xServiceInfo->supportsService("com.sun.star.style.CellStyle") )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
mxStyle.set( mxPropertySet, uno::UNO_QUERY_THROW );
@@ -65,7 +65,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -77,7 +77,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -108,7 +108,7 @@ ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorE
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
}
@@ -122,7 +122,7 @@ ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeExcep
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString() );
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString() );
}
return sName;
}
@@ -136,20 +136,20 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException,
}
catch (const uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
void SAL_CALL
ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
}
uno::Any SAL_CALL
ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException)
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString());
+ DebugHelper::basicexception(SbERR_NOT_IMPLEMENTED, OUString());
return uno::Any();
}
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index 87f852e..79fe5c1 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -41,7 +41,7 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
@@ -110,12 +110,12 @@ ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (scr
}
else
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString() );
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString() );
}
}
else
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
}
}
@@ -131,9 +131,9 @@ ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (scr
}
aRet.set( Item( uno::makeAny( _sName ), uno::Any() ), uno::UNO_QUERY_THROW );
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
return aRet;
}
@@ -146,9 +146,9 @@ ScVbaStyles::Delete(const OUString& _sStyleName) throw ( script::BasicErrorExcep
if (mxNameContainerCellStyles->hasByName( _sStyleName ) )
mxNameContainerCellStyles->removeByName( _sStyleName );
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 417a425..b5daf6c 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -815,7 +815,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std::
nSlot = FID_PAGEBREAKMODE;
break;
default:
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
// !! TODO !! get view shell from controller
ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index ad5a4a3..ccf2d02 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -370,7 +370,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx
(nSelection != excel::XlEnableSelection::xlUnlockedCells) &&
(nSelection != excel::XlEnableSelection::xlNoSelection) )
{
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index f3c26cb..b3979f5 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -118,7 +118,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd )
}
catch(const uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, OUString());
+ DebugHelper::basicexception(SbERR_METHOD_FAILED, OUString());
}
}
return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 3b27aa3..4c59b40 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -366,7 +366,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUS
aReadParam.SkipToNextToken();
break;
default:
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
break;
}
}
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index a2d4591..95e0fa1 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -83,7 +83,7 @@ SwVbaOptions::DefaultFilePath( sal_Int32 _path )
}
default:
{
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
+ DebugHelper::basicexception( SbERR_NOT_IMPLEMENTED, OUString() );
break;
}
}
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index dc19f1e..976200d 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -86,7 +86,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -106,7 +106,7 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -126,7 +126,7 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -174,7 +174,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -233,7 +233,7 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -324,7 +324,7 @@ void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontr
}
else
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
@@ -402,7 +402,7 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacingFromRule( sal_Int32 _l
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
break;
}
}
@@ -467,7 +467,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
return wdLineSpacing;
@@ -507,7 +507,7 @@ sal_Int32 SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment )
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception( SbERR_BAD_PARAMETER, OUString() );
}
}
return nParaAjust;
@@ -540,7 +540,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment )
}
default:
{
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception( SbERR_BAD_PARAMETER, OUString() );
}
}
return wdAlignment;
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index d6ef73c..fca5ae1 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -193,10 +193,10 @@ void SAL_CALL SwVbaRange::InsertBreak(const uno::Any& _breakType)
case word::WdBreakType::wdSectionBreakNextPage:
case word::WdBreakType::wdSectionBreakOddPage:
case word::WdBreakType::wdTextWrappingBreak:
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
+ DebugHelper::basicexception( SbERR_NOT_IMPLEMENTED, OUString() );
break;
default:
- DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::basicexception( SbERR_BAD_PARAMETER, OUString() );
}
if( eBreakType != style::BreakType_NONE )
@@ -269,7 +269,7 @@ void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw
}
if( aStyleType.isEmpty() )
{
- DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() );
+ DebugHelper::runtimeexception( SbERR_INTERNAL_ERROR, OUString() );
}
}
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 0e897ba..e4e1b92 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -102,7 +102,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
if( !bGotTextCursor || !xTextCursor.is() )
@@ -115,7 +115,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
}
@@ -128,7 +128,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref
}
catch (const uno::Exception& e)
{
- DebugHelper::exception(e);
+ DebugHelper::basicexception(e);
}
}
return xTextCursor;
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 5f7cb92..aedad5b 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -222,7 +222,7 @@ void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::runtimeexception(SbERR_BAD_ARGUMENT, OUString());
}
}
}
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 0360615..930ede4 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -248,7 +248,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
{
if( nExtend == word::WdMovementType::wdExtend )
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
return;
}
NextCell( nCount, eDirection );
@@ -358,7 +358,7 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection)
xCursorProps->getPropertyValue("Cell") >>= xCell;
if( !xTextTable.is() || !xCell.is() )
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
return;
}
uno::Reference< beans::XPropertySet > xCellProps( xCell, uno::UNO_QUERY_THROW );
@@ -390,7 +390,7 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection)
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
return;
}
}
@@ -558,7 +558,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w
{
sal_Int32 nWhat = 0;
if( !( _what >>= nWhat ) )
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::basicexception(SbERR_BAD_ARGUMENT, OUString());
switch( nWhat )
{
case word::WdGoToItem::wdGoToBookmark:
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 530677f..66cd12c 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -328,7 +328,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 )
break;
}
default:
- DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() );
+ DebugHelper::basicexception( SbERR_INTERNAL_ERROR, OUString() );
}
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index 259516f..128b664 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -144,7 +144,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co
case word::WdTabAlignment::wdAlignTabBar:
case word::WdTabAlignment::wdAlignTabList:
{
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
+ DebugHelper::basicexception( SbERR_NOT_IMPLEMENTED, OUString() );
break;
}
default:
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index b47188c..3cf95f4 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -148,7 +148,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
}
else
{
- DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() );
+ DebugHelper::runtimeexception( SbERR_NO_ACTIVE_OBJECT, OUString() );
}
break;
}
@@ -163,7 +163,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
}
else
{
- DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, OUString() );
+ DebugHelper::runtimeexception( SbERR_NO_ACTIVE_OBJECT, OUString() );
}
break;
}
@@ -235,7 +235,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::
break;
}
default:
- DebugHelper::exception( SbERR_NOT_IMPLEMENTED, OUString() );
+ DebugHelper::runtimeexception( SbERR_NOT_IMPLEMENTED, OUString() );
}
}
@@ -316,7 +316,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) );
if( !hasNextPage )
- DebugHelper::exception( SbERR_BAD_ACTION, OUString() );
+ DebugHelper::basicexception( SbERR_BAD_ACTION, OUString() );
}
break;
}
@@ -356,7 +356,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
if( nType == word::WdSeekView::wdSeekEvenPagesFooter
|| nType == word::WdSeekView::wdSeekEvenPagesHeader )
{
- DebugHelper::exception( SbERR_BAD_ACTION, OUString() );
+ DebugHelper::basicexception( SbERR_BAD_ACTION, OUString() );
}
xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
}
@@ -364,7 +364,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
mxModel->unlockControllers();
if( !xText.is() )
{
- DebugHelper::exception( SbERR_INTERNAL_ERROR, OUString() );
+ DebugHelper::basicexception( SbERR_INTERNAL_ERROR, OUString() );
}
uno::Reference< text::XTextRange > xTextRange = word::getFirstObjectPosition( xText );
return xTextRange;
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index 251e415..6944558 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -31,7 +31,7 @@ SwVbaWrapFormat::SwVbaWrapFormat( uno::Sequence< uno::Any > const& aArgs, uno::R
m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
}
-void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException, script::BasicErrorException)
+void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
{
text::WrapTextMode eTextMode = text::WrapTextMode_NONE;
if( mnSide == word::WdWrapSideType::wdWrapLeft )
@@ -73,7 +73,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException, script::BasicErro
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::runtimeexception(SbERR_BAD_ARGUMENT, OUString());
}
}
}
diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx
index d72cb05..14a701d 100644
--- a/sw/source/ui/vba/vbawrapformat.hxx
+++ b/sw/source/ui/vba/vbawrapformat.hxx
@@ -34,7 +34,7 @@ private:
sal_Int32 mnSide;
private:
- void makeWrap() throw (css::uno::RuntimeException, css::script::BasicErrorException);
+ void makeWrap() throw (css::uno::RuntimeException);
float getDistance( const OUString& sName ) throw (css::uno::RuntimeException);
void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 828bd6c..78b071a 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -1076,21 +1076,39 @@ void ShapeHelper::setTop(double _fTop)
xShape->setPosition(aPoint);
}
-void DebugHelper::exception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
+void DebugHelper::basicexception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
{
// #TODO #FIXME ( do we want to support additionalArg here )
throw css::script::BasicErrorException( DetailedMessage.concat( " " ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, OUString() );
}
-void DebugHelper::exception( int err, const OUString& additionalArgument ) throw( css::script::BasicErrorException )
+void DebugHelper::basicexception( int err, const OUString& additionalArgument ) throw( css::script::BasicErrorException )
{
- exception( OUString(), css::uno::Exception(), err, additionalArgument );
+ basicexception( OUString(), css::uno::Exception(), err, additionalArgument );
}
-void DebugHelper::exception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException )
+
+void DebugHelper::basicexception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException )
+{
+ basicexception( OUString(), ex, SbERR_INTERNAL_ERROR, OUString() );
+}
+
+void DebugHelper::runtimeexception( const OUString& DetailedMessage, const css::uno::Exception& ex, int err, const OUString& /*additionalArgument*/ ) throw( css::uno::RuntimeException )
+{
+ // #TODO #FIXME ( do we want to support additionalArg here )
+ throw css::uno::RuntimeException( DetailedMessage.concat( " " ).concat( ex.Message ).concat(" ").concat(OUString::number(err)), css::uno::Reference< css::uno::XInterface >() );
+}
+
+void DebugHelper::runtimeexception( int err, const OUString& additionalArgument ) throw( css::uno::RuntimeException )
+{
+ runtimeexception( OUString(), css::uno::Exception(), err, additionalArgument );
+}
+
+void DebugHelper::runtimeexception( const css::uno::Exception& ex ) throw( css::uno::RuntimeException )
{
- exception( OUString(), ex, SbERR_INTERNAL_ERROR, OUString() );
+ runtimeexception( OUString(), ex, SbERR_INTERNAL_ERROR, OUString() );
}
+
Millimeter::Millimeter():m_nMillimeter(0) {}
Millimeter::Millimeter(double mm):m_nMillimeter(mm) {}
diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
index 7d5be23..46e8203 100644
--- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
+++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
@@ -279,7 +279,7 @@ void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (c
if( ( orientation != mnOrientPortrait ) &&
( orientation != mnOrientLandscape ) )
{
- DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() );
+ DebugHelper::runtimeexception(SbERR_BAD_PARAMETER, OUString() );
}
try
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index c48a2ca..c31388b 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -604,7 +604,7 @@ ScVbaShape::setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalpositio
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::runtimeexception(SbERR_BAD_ARGUMENT, OUString());
}
}
m_xPropertySet->setPropertyValue( "HoriOrientRelation" , uno::makeAny( nType ) );
@@ -676,7 +676,7 @@ ScVbaShape::setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition)
}
default:
{
- DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
+ DebugHelper::runtimeexception(SbERR_BAD_ARGUMENT, OUString());
}
}
m_xPropertySet->setPropertyValue( "VertOrientRelation" , uno::makeAny( nType ) );
commit ed8678f3f810d096f00b2dc4053d519ab487be69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 9 09:17:00 2014 +0100
coverity#707392 Uncaught exception
Change-Id: I184df03332187bd97ae715e8a2a7966e7f09a21d
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index f34df15..d6ef73c 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -63,7 +63,7 @@ SwVbaRange::~SwVbaRange()
{
}
-void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (uno::RuntimeException)
+void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, uno::RuntimeException)
{
if( !mxText.is() )
{
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 33fffd4..a81f7ae 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -41,7 +41,7 @@ private:
bool mbMaySpanEndOfDocument;
private:
- void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::uno::RuntimeException);
+ void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException );
public:
SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException);
commit 2acf20d41dd49a534ec498eb0da9e58a445b5d43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 8 20:59:27 2014 +0100
coverity#706384 Uncaught exception
Change-Id: I337e948609f66dc9f0002b67cc0ac581a634478a
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index fcf016f..a68d3c4 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XContainerApproveBroadcaster.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/QueryDefinition.hpp>
@@ -181,7 +182,14 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet
}
implAppend( sNewObjectName, xNewObject );
- notifyByName( aGuard, sNewObjectName, xNewObject, NULL, E_INSERTED, ContainerListemers );
+ try
+ {
+ notifyByName( aGuard, sNewObjectName, xNewObject, NULL, E_INSERTED, ContainerListemers );
+ }
+ catch (const WrappedTargetException& e)
+ {
+ throw WrappedTargetRuntimeException(e.Message, e.Context, e.TargetException);
+ }
}
// XDrop
More information about the Libreoffice-commits
mailing list