sc/inc/cellsuno.hxx | 9 ++++++---
sc/inc/chart2uno.hxx | 3 ++-
sc/inc/dapiuno.hxx | 21 ++++++++++++---------
sc/source/ui/unoobj/cellsuno.cxx | 10 ++++++----
sc/source/ui/unoobj/chart2uno.cxx | 2 +-
sc/source/ui/unoobj/dapiuno.cxx | 10 +++++++---
vcl/osx/printaccessoryview.mm | 8 ++++----
vcl/osx/printview.mm | 5 ++---
vcl/osx/salframe.cxx | 6 +++---
vcl/osx/salframeview.mm | 2 +-
vcl/osx/salinst.cxx | 6 ++----
vcl/osx/salnsmenu.mm | 10 ++++------
vcl/osx/salobj.cxx | 8 ++++----
vcl/osx/saltimer.cxx | 3 +--
14 files changed, 55 insertions(+), 48 deletions(-)
New commits:
commit 42837a066b2347effa75926104f3f3ffc96206b7
Author: Herbert Dürr <h...@apache.org>
Date: Mon Feb 24 09:08:02 2014 +0000
Resolves: #i123840# prefer NSZero* constants over open coded alternatives
(cherry picked from commit a8c471a7003fdac7d5e1c97e903f669da6bcf0c7)
Conflicts:
vcl/osx/salframe.cxx
vcl/osx/salframeview.mm
vcl/osx/salnsmenu.mm
vcl/osx/salobj.cxx
Change-Id: I379d80355d741dd28aad2e6119a8b82ac10159f5
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index fd77619..40e9036 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -640,7 +640,7 @@ static void adjustViewAndChildren( NSView* pNSView, NSSize&
rMaxSize,
NSArray* pSubViews = [pNSView subviews];
unsigned int nViews = [pSubViews count];
- NSRect aUnion = { { 0, 0 }, { 0, 0 } };
+ NSRect aUnion = NSZeroRect;
// get the combined frame of all subviews
for( unsigned int n = 0; n < nViews; n++ )
@@ -709,7 +709,7 @@ static void adjustTabViews( NSTabView* pTabView, NSSize
aTabSize )
static NSControl* createLabel( const rtl::OUString& i_rText )
{
NSString* pText = CreateNSString( i_rText );
- NSRect aTextRect = { { 0, 0 }, {20, 15} };
+ NSRect aTextRect = { NSZeroPoint, {20, 15} };
NSTextField* pTextView = [[NSTextField alloc] initWithFrame: aTextRect];
[pTextView setFont: [NSFont controlContentFontOfSize: 0]];
[pTextView setEditable: NO];
@@ -1100,9 +1100,9 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
NSView* pCurParent = 0;
long nCurY = 0;
long nCurX = 0;
- NSRect aViewFrame = { { 0, 0 }, {600, 400 } };
+ NSRect aViewFrame = { NSZeroPoint, {600, 400 } };
NSRect aTabViewFrame = { { 190, 0 }, {410, 400 } };
- NSSize aMaxTabSize = { 0, 0 };
+ NSSize aMaxTabSize = NSZeroSize;
NSView* pAccessoryView = [[NSView alloc] initWithFrame: aViewFrame];
NSTabView* pTabView = [[NSTabView alloc] initWithFrame: aTabViewFrame];
[pAccessoryView addSubview: [pTabView autorelease]];
diff --git a/vcl/osx/printview.mm b/vcl/osx/printview.mm
index d2f4ac0..8b324b9 100644
--- a/vcl/osx/printview.mm
+++ b/vcl/osx/printview.mm
@@ -26,7 +26,7 @@
@implementation AquaPrintView
-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter:
(AquaSalInfoPrinter*)pInfoPrinter
{
- NSRect aRect = { { 0, 0 }, [pInfoPrinter->getPrintInfo() paperSize] };
+ NSRect aRect = { NSZeroPoint, [pInfoPrinter->getPrintInfo() paperSize] };
if( (self = [super initWithFrame: aRect]) != nil )
{
mpController = pController;
@@ -56,8 +56,7 @@
-(NSPoint)locationOfPrintRect: (NSRect)aRect
{
(void)aRect;
- NSPoint aPoint = { 0, 0 };
- return aPoint;
+ return NSZeroPoint;
}
-(void)drawRect: (NSRect)rect
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 71a951c..e49df67 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -207,7 +207,7 @@ void AquaSalFrame::initWindowAndView()
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
- NSRect aRect = { { 0,0 }, { static_cast<CGFloat>(maGeometry.nWidth),
static_cast<CGFloat>(maGeometry.nHeight) } };
+ const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
maSysData.mpNSView = mpNSView;
@@ -743,7 +743,7 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen,
sal_Int32 nDisplay )
// which is always on index 0 according to documentation
bool bHideMenu = (nDisplay == 0);
- NSRect aNewContentRect = { { 0, 0 }, { 0, 0 } };
+ NSRect aNewContentRect = NSZeroRect;
// get correct screen
NSScreen* pScreen = nil;
NSArray* pScreens = [NSScreen screens];
@@ -1621,7 +1621,7 @@ void AquaSalFrame::UpdateFrameGeometry()
// release old track rect
[mpNSView removeTrackingRect: mnTrackingRectTag];
// install the new track rect
- NSRect aTrackRect = { { 0, 0 }, aContentRect.size };
+ NSRect aTrackRect = { NSZeroPoint, aContentRect.size };
mnTrackingRectTag = [mpNSView addTrackingRect: aTrackRect owner: mpNSView
userData: nil assumeInside: NO];
// convert to vcl convention
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index a84f5aa..e521957 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -490,7 +490,7 @@ static AquaSalFrame* getMouseContainerFrame()
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
{
// FIXME: does this leak the returned NSCursor of getCurrentCursor ?
- NSRect aRect = { { 0, 0 }, {
static_cast<CGFloat>(mpFrame->maGeometry.nWidth),
static_cast<CGFloat>(mpFrame->maGeometry.nHeight) } };
+ const NSRect aRect = { NSZeroPoint, NSMakeSize(
mpFrame->maGeometry.nWidth, mpFrame->maGeometry.nHeight) };
[self addCursorRect: aRect cursor: mpFrame->getCurrentCursor()];
}
}
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b8172e1..fcec7b6 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -194,9 +194,8 @@ sal_Bool ImplSVMainHook( int * pnInit )
bNoSVMain = false;
initNSApp();
- NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: aPt
+ location: NSZeroPoint
modifierFlags: 0
timestamp: 0
windowNumber: 0
@@ -422,9 +421,8 @@ void AquaSalInstance::wakeupYield()
if( mbWaitingYield )
{
SalData::ensureThreadAutoreleasePool();
- NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: aPt
+ location: NSZeroPoint
modifierFlags: 0
timestamp: 0
windowNumber: 0
diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm
index 796b05c..d2aaed9 100644
--- a/vcl/osx/salnsmenu.mm
+++ b/vcl/osx/salnsmenu.mm
@@ -131,9 +131,8 @@
NSRect aImgRect = { { 2, 0 }, { 0, 0 } };
for( size_t i = 0; i < rButtons.size(); ++i )
{
- NSRect aFromRect = { { 0, 0 },
- {
static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()),
-
static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } };
+ const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
+ const NSRect aFromRect = { NSZeroPoint, NSMakeSize(
aPixSize.Width(), aPixSize.Height()) };
aImgRect.origin.y = floor((aFrame.size.height -
aFromRect.size.height)/2);
aImgRect.size = aFromRect.size;
if( rButtons[i].mpNSImage )
@@ -155,9 +154,8 @@
NSPoint aMousePt = [pEvent locationInWindow];
for( size_t i = 0; i < rButtons.size(); ++i )
{
- NSRect aFromRect = { { 0, 0 },
- {
static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Width()),
-
static_cast<CGFloat>(rButtons[i].maButton.maImage.GetSizePixel().Height()) } };
+ const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
+ const NSRect aFromRect = { NSZeroPoint, NSMakeSize(
aPixSize.Width(), aPixSize.Height()) };
aImgRect.origin.y = (aFrame.size.height - aFromRect.size.height)/2;
aImgRect.size = aFromRect.size;
if( aMousePt.x >= aImgRect.origin.x && aMousePt.x <=
(aImgRect.origin.x+aImgRect.size.width) &&
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 350903f..d749233 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -41,7 +41,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
maSysData.nSize = sizeof( maSysData );
maSysData.mpNSView = NULL;
- NSRect aInitFrame = { { 0, 0 }, { 20, 20 } };
+ NSRect aInitFrame = { NSZeroPoint, { 20, 20 } };
mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
if( mpClipView )
{
@@ -168,15 +168,15 @@ void AquaSalObject::SetPosSize( long nX, long nY, long
nWidth, long nHeight )
void AquaSalObject::setClippedPosSize()
{
- NSRect aViewRect = { { 0, 0 }, { static_cast<CGFloat>(mnWidth),
static_cast<CGFloat>(mnHeight) } };
+ NSRect aViewRect = { NSZeroPoint, NSMakeSize( mnWidth, mnHeight) };
if( maSysData.mpNSView )
{
NSView* pNSView = maSysData.mpNSView;
[pNSView setFrame: aViewRect];
}
- NSRect aClipViewRect = { { static_cast<CGFloat>(mnX),
static_cast<CGFloat>(mnY) }, { static_cast<CGFloat>(mnWidth),
static_cast<CGFloat>(mnHeight) } };
- NSPoint aClipPt = { 0, 0 };
+ NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight);
+ NSPoint aClipPt = NSZeroPoint;
if( mbClip )
{
aClipViewRect.origin.x += mnClipX;
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index ad09590..df8396b 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -65,9 +65,8 @@ void ImplSalStartTimer( sal_uLong nMS )
{
SalData::ensureThreadAutoreleasePool();
// post an event so we can get into the main thread
- NSPoint aPt = { 0, 0 };
NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: aPt
+ location: NSZeroPoint
modifierFlags: 0
timestamp: [NSDate
timeIntervalSinceReferenceDate]
windowNumber: 0
commit 93f3f72d18e551c8edd6a010cb78d9cbe404f8ef
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 13:16:42 2014 +0000
coverity#737499 Uncaught exception
Change-Id: If4599fa76914b472ee6734f48941898f420519c3
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index ca6b8cd..ec96ae7 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -595,7 +595,8 @@ public:
virtual com::sun::star::uno::Reference <
com::sun::star::sheet::XDataPilotField > SAL_CALL
createDateGroup(const com::sun::star::sheet::DataPilotFieldGroupInfo&
rInfo)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException);
+ ::com::sun::star::lang::IllegalArgumentException,
+ std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 38fca57..36fba0c 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -2709,7 +2709,8 @@ Reference< XDataPilotField > SAL_CALL
ScDataPilotFieldObj::createNameGroup( cons
}
Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup(
const DataPilotFieldGroupInfo& rInfo )
- throw (RuntimeException, IllegalArgumentException)
+ throw (RuntimeException, IllegalArgumentException,
+ std::exception)
{
SolarMutexGuard aGuard;
using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy;
commit 1a48456f8beca6cb0606de75bb0c95f5ae9bc160
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 13:15:46 2014 +0000
coverity#737497 Uncaught exception
Change-Id: I1dc0acda818f1b520f74c282bdd17a195591e860
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 09f44f4..ca6b8cd 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -901,11 +901,12 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
-
throw(::com::sun::star::beans::UnknownPropertyException,
-
::com::sun::star::beans::PropertyVetoException,
-
::com::sun::star::lang::IllegalArgumentException,
-
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw
(::com::sun::star::beans::UnknownPropertyException,
+
::com::sun::star::beans::PropertyVetoException,
+
::com::sun::star::lang::IllegalArgumentException,
+
::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 0c5ce5d..38fca57 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -3410,7 +3410,9 @@ Reference< XPropertySetInfo >
}
void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString&
aPropertyName, const Any& aValue )
- throw(UnknownPropertyException, PropertyVetoException,
IllegalArgumentException, WrappedTargetException, RuntimeException)
+ throw (UnknownPropertyException, PropertyVetoException,
+ IllegalArgumentException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScDPObject* pDPObj = 0;
commit 146a5e95ad19a7093867a4d82b69b8b26d9aa2a7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 13:12:51 2014 +0000
coverity#737495 Uncaught exception
Change-Id: I8a5e7111a0ddf1e651c25bd52c6af462d9075f93
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index a5c0791..09f44f4 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -217,9 +217,10 @@ public:
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName )
-
throw(::com::sun::star::beans::UnknownPropertyException,
-
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw
(::com::sun::star::beans::UnknownPropertyException,
+
::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 664aa01..0c5ce5d 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -3463,7 +3463,8 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const
OUString& aPropertyNam
}
Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString&
aPropertyName )
- throw(UnknownPropertyException, WrappedTargetException,
RuntimeException)
+ throw (UnknownPropertyException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
Any aRet;
commit a3a227b5b8cac1dba31e72212a910b775e446007
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 13:11:03 2014 +0000
coverity#737469 Uncaught exception
Change-Id: Ic090878483f2fbfc000bfc248bb52764e4e9727e
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index c229204..411e1af 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -343,7 +343,8 @@ public:
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeModifyListener(
const ::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener >& aListener )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 009b860..a0d9e88 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3387,7 +3387,7 @@ uno::Reference< util::XCloneable > SAL_CALL
ScChart2DataSequence::createClone()
// XModifyBroadcaster ========================================================
void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference<
util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// like ScCellRangesBase::addModifyListener
SolarMutexGuard aGuard;
commit 6bc58bbd2a64dea3fe21cb1cf067514aadceac21
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 12:56:18 2014 +0000
coverity#737458 Uncaught exception
Change-Id: Ida42725016395d9629bb97bd8cf0b660195c4f1c
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index a9b2922..8527f6f 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -964,7 +964,8 @@ public:
// XFormulaTokens
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens()
- throw
(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setTokens( const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken >&
aTokens )
throw
(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 27e39cf..b63d368 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -6623,7 +6623,8 @@ sal_Int32 SAL_CALL ScCellObj::getError()
throw(uno::RuntimeException)
// XFormulaTokens
-uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens()
throw(uno::RuntimeException)
+uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Sequence<sheet::FormulaToken> aSequence;
commit 0a3526f61f7983934dc8a33f2f6e35ca777bc9f3
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 12:55:01 2014 +0000
coverity#737430 Uncaught exception
Change-Id: I1db24114b331970d75b01c0869708b1656be3836
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 2cd70c1..a9b2922 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -472,7 +472,8 @@ public:
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener( const
::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener >&
aListener )
- throw
(::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL removeModifyListener( const
::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyListener >&
aListener )
throw
(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index cd4f082..27e39cf 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3395,8 +3395,8 @@ sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double
nNumber ) throw(uno::Ru
// XModifyBroadcaster
-void SAL_CALL ScCellRangesBase::addModifyListener( const
uno::Reference<util::XModifyListener>& aListener )
- throw(uno::RuntimeException)
+void SAL_CALL ScCellRangesBase::addModifyListener(const
uno::Reference<util::XModifyListener>& aListener)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( aRanges.empty() )
commit 8fca5e299c8cf4342728485708744de0caffb18e
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 24 12:53:51 2014 +0000
coverity#737424 Uncaught exception
Change-Id: I8779bf79dd2342f183643767c4c424e7a5500cca
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index e75d7f7..2cd70c1 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -1200,7 +1200,8 @@ public:
std::exception);
virtual void SAL_CALL ungroup( const
::com::sun::star::table::CellRangeAddress& aRange,
::com::sun::star::table::TableOrientation
nOrientation )
-
throw(::com::sun::star::uno::RuntimeException);
+ throw
(::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL autoOutline( const
::com::sun::star::table::CellRangeAddress& aRange )
throw(::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a095dbb..cd4f082 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7874,7 +7874,8 @@ void SAL_CALL ScTableSheetObj::group( const
table::CellRangeAddress& rGroupRange
void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress&
rGroupRange,
table::TableOrientation nOrientation )
- throw(uno::RuntimeException)
+ throw (uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
