comphelper/source/container/containermultiplexer.cxx | 12 +-
comphelper/source/misc/SelectionMultiplex.cxx | 3
comphelper/source/property/propmultiplex.cxx | 3
include/comphelper/SelectionMultiplex.hxx | 3
include/comphelper/containermultiplexer.hxx | 16 ++-
include/comphelper/propmultiplex.hxx | 3
reportdesign/source/ui/dlg/Navigator.cxx | 18 ++-
sd/source/ui/unoidl/unomodule.cxx | 6 -
sd/source/ui/unoidl/unomodule.hxx | 6 -
sw/source/ui/inc/unotxvw.hxx | 93 ++++++++++++++-----
sw/source/ui/uno/unotxvw.cxx | 62 ++++++++----
sw/source/ui/vba/vbaselection.cxx | 3
sw/source/ui/vba/vbaselection.hxx | 4
writerfilter/source/dmapper/DomainMapper.cxx | 7 +
14 files changed, 170 insertions(+), 69 deletions(-)
New commits:
commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Tue Feb 25 13:16:12 2014 +0000
Related: #i124106# correct handling of page break attributes
i.e. those which are providing the default value explicitly
(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx
Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f110e83..87c8761 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -984,7 +984,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
SectionPropertyMap * pSectionContext = m_pImpl->GetSectionContext();
Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue->getInt();
- OUString sStringValue = pValue->getString();
+ const OUString sStringValue = pValue->getString();
PropertyNameSupplier& rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
switch(nSprmId)
@@ -1002,7 +1002,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ?
true : false) );
break;
case NS_ooxml::LN_CT_PPrBase_pageBreakBefore:
- rContext->Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+ if ( nIntValue == 1 )
+ {
+ rContext->Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+ }
break;
case NS_ooxml::LN_CT_NumPr_ilvl:
if (nIntValue < 0 || 10 <= nIntValue) // Writer can't do everything
commit 011df3eeee8bb218af4a6e3b1df40a7f03202fbc
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:58:00 2014 +0000
coverity#983796 Uncaught exception
Change-Id: Idba161eb74fb9b474b2f41fbc0fdf0eef55b7599
diff --git a/sd/source/ui/unoidl/unomodule.cxx
b/sd/source/ui/unoidl/unomodule.cxx
index eef013d..abf56f2 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -114,7 +114,8 @@ uno::Sequence< uno::Reference< frame::XDispatch > >
SAL_CALL SdUnoModule::queryD
}
// XDispatchProvider
-uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const
util::URL& aURL, const OUString&, sal_Int32 ) throw( uno::RuntimeException )
+uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const
util::URL& aURL, const OUString&, sal_Int32 )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
SdDLL::Init();
diff --git a/sd/source/ui/unoidl/unomodule.hxx
b/sd/source/ui/unoidl/unomodule.hxx
index 01a28af..123656b 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -70,7 +70,8 @@ public:
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
SAL_CALL queryDispatches( const css::uno::Sequence<
css::frame::DispatchDescriptor >& seqDescriptor ) throw(
css::uno::RuntimeException ) ;
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch( const css::util::URL & aURL ,
const OUString &
sTargetFrameName,
- sal_Int32
eSearchFlags ) throw( css::uno::RuntimeException ) ;
+ sal_Int32
eSearchFlags )
+ throw (css::uno::RuntimeException, std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(css::uno::RuntimeException);
commit 6fbe00f9b6ae8211bc6f2a0e78120548d7b38432
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:54:52 2014 +0000
coverity#983702 Uncaught exception
Change-Id: I3a0b4c8fe4208d0945860f6b4e1b31852aef8502
diff --git a/comphelper/source/container/containermultiplexer.cxx
b/comphelper/source/container/containermultiplexer.cxx
index d74b62f..d8c4162 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -50,22 +50,26 @@ namespace comphelper
}
- void OContainerListener::_elementInserted( const ContainerEvent&
/*_rEvent*/ ) throw(RuntimeException)
+ void OContainerListener::_elementInserted( const ContainerEvent&
/*_rEvent*/ )
+ throw (RuntimeException, std::exception)
{
}
- void OContainerListener::_elementRemoved( const ContainerEvent& )
throw(RuntimeException)
+ void OContainerListener::_elementRemoved( const ContainerEvent& )
+ throw (RuntimeException, std::exception)
{
}
- void OContainerListener::_elementReplaced( const ContainerEvent&
/*_rEvent*/ ) throw(RuntimeException)
+ void OContainerListener::_elementReplaced( const ContainerEvent&
/*_rEvent*/ )
+ throw (RuntimeException, std::exception)
{
}
- void OContainerListener::_disposing(const EventObject& ) throw(
RuntimeException)
+ void OContainerListener::_disposing(const EventObject& )
+ throw (RuntimeException, std::exception)
{
}
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx
b/comphelper/source/misc/SelectionMultiplex.cxx
index de24434..335cbf9 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -41,7 +41,8 @@ OSelectionChangeListener::~OSelectionChangeListener()
}
-void OSelectionChangeListener::_disposing(const EventObject&) throw(
RuntimeException)
+void OSelectionChangeListener::_disposing(const EventObject&)
+ throw (RuntimeException, std::exception)
{
// nothing to do here
}
diff --git a/comphelper/source/property/propmultiplex.cxx
b/comphelper/source/property/propmultiplex.cxx
index f04a4cc..dbeee36 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -40,7 +40,8 @@ OPropertyChangeListener::~OPropertyChangeListener()
}
-void OPropertyChangeListener::_disposing(const EventObject&) throw(
RuntimeException)
+void OPropertyChangeListener::_disposing(const EventObject&)
+ throw (RuntimeException, std::exception)
{
// nothing to do here
}
diff --git a/include/comphelper/SelectionMultiplex.hxx
b/include/comphelper/SelectionMultiplex.hxx
index e9ceb1b..c4675ed 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -53,7 +53,8 @@ namespace comphelper
virtual ~OSelectionChangeListener();
virtual void _selectionChanged( const
::com::sun::star::lang::EventObject& aEvent ) throw
(::com::sun::star::uno::RuntimeException) = 0;
- virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource) throw( ::com::sun::star::uno::RuntimeException);
+ virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource)
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
protected:
// pseudo-private. Making it private now could break compatibility
diff --git a/include/comphelper/containermultiplexer.hxx
b/include/comphelper/containermultiplexer.hxx
index 3ae623f..eaaaa4d 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -50,10 +50,18 @@ namespace comphelper
OContainerListener(::osl::Mutex& _rMutex);
virtual ~OContainerListener();
- virtual void _elementInserted( const
::com::sun::star::container::ContainerEvent& _rEvent )
throw(::com::sun::star::uno::RuntimeException);
- virtual void _elementRemoved( const
::com::sun::star::container::ContainerEvent& _Event )
throw(::com::sun::star::uno::RuntimeException);
- virtual void _elementReplaced( const
::com::sun::star::container::ContainerEvent& _rEvent )
throw(::com::sun::star::uno::RuntimeException);
- virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource) throw( ::com::sun::star::uno::RuntimeException);
+ virtual void _elementInserted( const
::com::sun::star::container::ContainerEvent& _rEvent )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
+ virtual void _elementRemoved( const
::com::sun::star::container::ContainerEvent& _Event )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
+ virtual void _elementReplaced( const
::com::sun::star::container::ContainerEvent& _rEvent )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
+ virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
protected:
void setAdapter(OContainerListenerAdapter* _pAdapter);
diff --git a/include/comphelper/propmultiplex.hxx
b/include/comphelper/propmultiplex.hxx
index 83b9a90..d00550b 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -52,7 +52,8 @@ namespace comphelper
virtual ~OPropertyChangeListener();
virtual void _propertyChanged(const
::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw(
::com::sun::star::uno::RuntimeException) = 0;
- virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource) throw( ::com::sun::star::uno::RuntimeException);
+ virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource)
+ throw( ::com::sun::star::uno::RuntimeException, std::exception);
protected:
/** If the derivee also owns the mutex which we know as reference,
then call this within your
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx
b/reportdesign/source/ui/dlg/Navigator.cxx
index c949185..47e5371 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -133,7 +133,8 @@ class NavigatorTree : public ::cppu::BaseMutex
// OContainerListener
virtual void _elementInserted( const container::ContainerEvent&
_rEvent ) throw(uno::RuntimeException);
- virtual void _elementRemoved( const container::ContainerEvent& _Event
) throw(uno::RuntimeException);
+ virtual void _elementRemoved( const container::ContainerEvent& _Event )
+ throw (uno::RuntimeException, std::exception);
virtual void _elementReplaced( const container::ContainerEvent&
_rEvent ) throw(uno::RuntimeException);
virtual void _disposing(const lang::EventObject& _rSource)
throw (uno::RuntimeException, std::exception);
@@ -167,7 +168,8 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt );
// OSelectionChangeListener
- virtual void _disposing(const lang::EventObject& _rSource) throw(
uno::RuntimeException);
+ virtual void _disposing(const lang::EventObject& _rSource)
+ throw (uno::RuntimeException, std::exception);
// OPropertyChangeListener
virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent)
throw( uno::RuntimeException);
@@ -843,7 +845,8 @@ void NavigatorTree::UserData::_elementInserted( const
container::ContainerEvent&
m_pTree->_elementInserted( _rEvent );
}
-void NavigatorTree::UserData::_elementRemoved( const
container::ContainerEvent& _rEvent ) throw(uno::RuntimeException)
+void NavigatorTree::UserData::_elementRemoved( const
container::ContainerEvent& _rEvent )
+ throw (uno::RuntimeException, std::exception)
{
m_pTree->_elementRemoved( _rEvent );
}
@@ -853,7 +856,8 @@ void NavigatorTree::UserData::_elementReplaced( const
container::ContainerEvent&
m_pTree->_elementReplaced( _rEvent );
}
-void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource)
throw( uno::RuntimeException)
+void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource)
+ throw (uno::RuntimeException, std::exception)
{
m_pTree->_disposing( _rSource );
}
diff --git a/sd/source/ui/unoidl/unomodule.cxx
b/sd/source/ui/unoidl/unomodule.cxx
index 23518f4..eef013d 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -52,7 +52,8 @@ uno::Reference< uno::XInterface > SAL_CALL
SdUnoModule_createInstance(
}
// XNotifyingDispatch
-void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL,
const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference<
frame::XDispatchResultListener >& xListener ) throw (uno::RuntimeException)
+void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL,
const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference<
frame::XDispatchResultListener >& xListener )
+ throw (uno::RuntimeException, std::exception)
{
// there is no guarantee, that we are holded alive during this method!
// May the outside dispatch container will be updated by a CONTEXT_CHANGED
diff --git a/sd/source/ui/unoidl/unomodule.hxx
b/sd/source/ui/unoidl/unomodule.hxx
index 206da27..01a28af 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -58,7 +58,8 @@ public:
{}
// XnotifyingDispatch
- virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL,
const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const
css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) throw
(css::uno::RuntimeException);
+ virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL,
const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const
css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
+ throw (css::uno::RuntimeException, std::exception);
// XDispatch
virtual void SAL_CALL dispatch( const css::util::URL& aURL, const
css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(
css::uno::RuntimeException );
commit 5da1ef56f7b88e360010c981ab12a60720ac46e5
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:53:18 2014 +0000
coverity#983700 Uncaught exception
Change-Id: Iee09cbebf1fa6f0c0af8dddfd5f8fdbb7cd63df7
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx
b/reportdesign/source/ui/dlg/Navigator.cxx
index b551087..c949185 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -135,7 +135,8 @@ class NavigatorTree : public ::cppu::BaseMutex
virtual void _elementInserted( const container::ContainerEvent&
_rEvent ) throw(uno::RuntimeException);
virtual void _elementRemoved( const container::ContainerEvent& _Event
) throw(uno::RuntimeException);
virtual void _elementReplaced( const container::ContainerEvent&
_rEvent ) throw(uno::RuntimeException);
- virtual void _disposing(const lang::EventObject& _rSource) throw(
uno::RuntimeException);
+ virtual void _disposing(const lang::EventObject& _rSource)
+ throw (uno::RuntimeException, std::exception);
};
enum DROP_ACTION { DA_SCROLLUP, DA_SCROLLDOWN, DA_EXPANDNODE };
@@ -728,7 +729,8 @@ void NavigatorTree::_elementReplaced( const
container::ContainerEvent& _rEvent )
}
}
-void NavigatorTree::_disposing(const lang::EventObject& _rSource)throw(
uno::RuntimeException)
+void NavigatorTree::_disposing(const lang::EventObject& _rSource)
+ throw (uno::RuntimeException, std::exception)
{
removeEntry(find(_rSource.Source));
}
commit 12f08b699d76821e40d2e8672973239098647c72
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:50:24 2014 +0000
coverity#738459 Uncaught exception
Change-Id: Ibc862bcd8d179c6d3b10844746a70acecadacd7a
diff --git a/sw/source/ui/vba/vbaselection.cxx
b/sw/source/ui/vba/vbaselection.cxx
index 3a10c07..befe183 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -1116,7 +1116,8 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw
(uno::RuntimeException)
return getRange()->InRange( Range );
}
-void SAL_CALL SwVbaSelection::SplitTable( ) throw (uno::RuntimeException)
+void SAL_CALL SwVbaSelection::SplitTable()
+ throw (uno::RuntimeException, std::exception)
{
if( !IsInTable() )
throw uno::RuntimeException();
diff --git a/sw/source/ui/vba/vbaselection.hxx
b/sw/source/ui/vba/vbaselection.hxx
index d6a0b74..1778c30 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -100,7 +100,9 @@ public:
virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw
(css::uno::RuntimeException);
virtual void SAL_CALL WholeStory( ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL InRange( const css::uno::Reference<
::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException);
- virtual void SAL_CALL SplitTable( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL SplitTable()
+ throw (css::uno::RuntimeException,
+ std::exception);
virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex )
throw (css::uno::RuntimeException);
// XHelperInterface
commit 4cc356bfa83810297926a8b2fadd59220204bd45
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:42:07 2014 +0000
coverity#738451 Uncaught exception
Change-Id: I43473afc753a7d348273e58121f2446974d43957
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 7205792..ca61659 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -244,7 +244,9 @@ public:
virtual OUString SAL_CALL getString()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL setString(const OUString& aString) throw(
::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setString(const OUString& aString)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XScreenCursor
virtual sal_Bool SAL_CALL screenDown()
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 0f665d1..41725f8 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1461,7 +1461,8 @@ OUString SwXTextViewCursor::getString()
return uRet;
}
-void SwXTextViewCursor::setString(const OUString& aString) throw(
uno::RuntimeException )
+void SwXTextViewCursor::setString(const OUString& aString)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 334e99c08214563bb208448d1045f95e664d4c3e
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:41:14 2014 +0000
coverity#738449 Uncaught exception
Change-Id: I74c125c9a7aca1f9e2f23f83878d9ba1797eee34
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 56965e1..7205792 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -205,7 +205,9 @@ public:
virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL gotoStart( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL gotoStart( sal_Bool bExpand )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 21c7137..0f665d1 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1191,7 +1191,8 @@ void SwXTextViewCursor::gotoRange(
}
-void SwXTextViewCursor::gotoStart(sal_Bool bExpand) throw(
uno::RuntimeException )
+void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 544d618c5bef63ca9ffa336f3c4dac1a5030dd34
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:40:00 2014 +0000
coverity#738447 Uncaught exception
Change-Id: I66d00eb490d30fa08aaa658072b2a12d165be6f7
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index b03dc63..56965e1 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -209,7 +209,9 @@ public:
virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XPageCursor
virtual sal_Bool SAL_CALL jumpToFirstPage()
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 5e1efb9..21c7137 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1052,7 +1052,7 @@ sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount,
sal_Bool bExpand)
void SwXTextViewCursor::gotoRange(
const uno::Reference< text::XTextRange > & xRange,
sal_Bool bExpand)
- throw(RuntimeException)
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView && xRange.is())
commit 67593fd5107a7445fc983c22daad213268fa781e
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:39:07 2014 +0000
coverit#738445 Uncaught exception
Change-Id: Ib4b7abfbf8f3c2bd853c72ffe399abdeb9ecf945
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index b34c3c1..b03dc63 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -237,7 +237,9 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual OUString SAL_CALL getString(void) throw(
::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getString()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setString(const OUString& aString) throw(
::com::sun::star::uno::RuntimeException );
//XScreenCursor
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 4e90305..5e1efb9 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1428,7 +1428,8 @@ uno::Reference< text::XTextRange >
SwXTextViewCursor::getEnd()
return xRet;
}
-OUString SwXTextViewCursor::getString(void) throw( uno::RuntimeException )
+OUString SwXTextViewCursor::getString()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString uRet;
commit a007379220a585d7a43189c729bf672972b0a7c1
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:37:37 2014 +0000
coverity#738442 Uncaught exception
Change-Id: I932b9afe1842a3b834e749268ae211ca928026f1
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index fda452f..b34c3c1 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -244,7 +244,9 @@ public:
virtual sal_Bool SAL_CALL screenDown()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual sal_Bool SAL_CALL screenUp(void) throw(
::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL screenUp()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XViewCursor
virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 26ca558..4e90305 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1351,7 +1351,8 @@ sal_Bool SwXTextViewCursor::screenDown()
return bRet;
}
-sal_Bool SwXTextViewCursor::screenUp(void) throw( uno::RuntimeException )
+sal_Bool SwXTextViewCursor::screenUp()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 75b61186dcd21cfa5f9ac1547226522a31428423
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:35:15 2014 +0000
coverity#738440 Uncaught exception
Change-Id: I9c8b9f9cc8dc0df224d64cf50c5d0982c7852049
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 75c4eae..fda452f 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -231,7 +231,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
SAL_CALL getText()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw(
::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getStart()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 44497d9..26ca558 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1387,7 +1387,8 @@ uno::Reference< text::XText >
SwXTextViewCursor::getText()
return xRet;
}
-uno::Reference< text::XTextRange > SwXTextViewCursor::getStart(void) throw(
uno::RuntimeException )
+uno::Reference< text::XTextRange > SwXTextViewCursor::getStart()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference< text::XTextRange > xRet;
commit b5363ca990da0265f74f28578e506103ff430a45
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:33:55 2014 +0000
coverity#738439 Uncaught exception
Change-Id: Id41ca6a0c254777fec3894c11fc755d9087af51a
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 855dc64..75c4eae 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -206,7 +206,9 @@ public:
throw (::com::sun::star::uno::RuntimeException,
std::exception);
virtual void SAL_CALL gotoStart( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
//XPageCursor
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 4a2e76e..44497d9 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1205,7 +1205,8 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
throw( uno::RuntimeException
throw uno::RuntimeException();
}
-void SwXTextViewCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException
)
+void SwXTextViewCursor::gotoEnd(sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit 904f20574667eee6afff2626401832745a7eed4d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:32:54 2014 +0000
coverity#738437 Uncaught exception
Change-Id: I90cf43d9d39c7c1b8da4123edaeeec200e6353a7
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 6906125..855dc64 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -202,7 +202,9 @@ public:
virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL gotoStart( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 57191b8..4a2e76e 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1030,7 +1030,8 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount,
sal_Bool bExpand)
return bRet;
}
-sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand) throw(
uno::RuntimeException )
+sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 24b1935680168773a0b612a581097d87a3d8e55d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:31:57 2014 +0000
coverity#738435 Uncaught exception
Change-Id: I8e6c6c79b96f03cc8d3ac93ce0bd1f9208981bfa
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index af79d45..6906125 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -224,7 +224,9 @@ public:
std::exception);
//XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
SAL_CALL getText()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw(
::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index a8e393b..57191b8 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1365,7 +1365,8 @@ sal_Bool SwXTextViewCursor::screenUp(void) throw(
uno::RuntimeException )
return bRet;
}
-uno::Reference< text::XText > SwXTextViewCursor::getText(void) throw(
uno::RuntimeException )
+uno::Reference< text::XText > SwXTextViewCursor::getText()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference< text::XText > xRet;
commit ba6720f633770c833a85392df05ff15bad126afd
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:30:57 2014 +0000
coverity#738434 Uncaught exception
Change-Id: I90f99cb563e65dedfb973aa0c54a7124c699d32b
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 0ef11ec..af79d45 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -219,7 +219,9 @@ public:
virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw(
::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL jumpToEndOfPage(void) throw(
::com::sun::star::uno::RuntimeException );
virtual sal_Bool SAL_CALL jumpToStartOfPage(void) throw(
::com::sun::star::uno::RuntimeException );
- virtual sal_Int16 SAL_CALL getPage(void) throw(
::com::sun::star::uno::RuntimeException );
+ virtual sal_Int16 SAL_CALL getPage()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XTextRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 370a868..a8e393b 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1316,7 +1316,8 @@ sal_Bool SwXTextViewCursor::jumpToStartOfPage(void)
throw( uno::RuntimeException
return bRet;
}
-sal_Int16 SwXTextViewCursor::getPage(void) throw( uno::RuntimeException )
+sal_Int16 SwXTextViewCursor::getPage()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Int16 nRet = 0;
commit 6ee74484e54a6de5d3ac51d0a1e757b92a7ad354
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:29:56 2014 +0000
coverity#738433 Uncaught exception
Change-Id: I6022d88ec96fcd4f8221ac361e34c488f4fb8839
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index b42ec90..0ef11ec 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -199,7 +199,9 @@ public:
virtual sal_Bool SAL_CALL isCollapsed()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL gotoStart( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 63d91ae..370a868 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1012,7 +1012,8 @@ sal_Bool SwXTextViewCursor::isCollapsed()
}
-sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand) throw(
uno::RuntimeException )
+sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit eaf83bb2089ad9aa82df2b77f69e7a55b7acd44c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:28:43 2014 +0000
coverity#738431 Uncaught exception
Change-Id: I32aab64372133f3b5cdcad0d5c9952d685be7223
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 6008913..b42ec90 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -235,7 +235,9 @@ public:
virtual sal_Bool SAL_CALL screenUp(void) throw(
::com::sun::star::uno::RuntimeException );
//XViewCursor
- virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand)
throw (::com::sun::star::uno::RuntimeException,
std::exception);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 3422c9e..63d91ae 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1616,7 +1616,8 @@ Any SwXTextViewCursor::getPropertyDefault( const
OUString& rPropertyName )
return aRet;
}
-sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) throw(
uno::RuntimeException )
+sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 5364f4fda2dbc593541005b10434fb2254374da9
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:16:01 2014 +0000
coverity#38429 Uncaught exception
Change-Id: Ie4d5e38313156279f77ba17f91aba0bddb0c1478
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index ea32a51..6008913 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -222,7 +222,9 @@ public:
//XTextRange
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw(
::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw(
::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > SAL_CALL getEnd()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual OUString SAL_CALL getString(void) throw(
::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setString(const OUString& aString) throw(
::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 8567135..3422c9e 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1401,7 +1401,8 @@ uno::Reference< text::XTextRange >
SwXTextViewCursor::getStart(void) throw( uno
return xRet;
}
-uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd(void) throw(
uno::RuntimeException )
+uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference< text::XTextRange > xRet;
commit 7412cb83094633be85bd86851b9ddd14c46ecb77
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:15:19 2014 +0000
coverity#738428 Uncaught exception
Change-Id: I282ecb5b7659d98cfe91b7e89c14e822105a7323
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index cb4b8ec..ea32a51 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -234,9 +234,9 @@ public:
//XViewCursor
virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) throw(
::com::sun::star::uno::RuntimeException );
-// virtual sal_Bool goLeft(sal_Int16 nCount, sal_Bool bExpand) throw(
::com::sun::star::uno::RuntimeException );
-// virtual sal_Bool goRight(sal_Int16 nCount, sal_Bool bExpand) throw(
::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
//XLineCursor
virtual sal_Bool SAL_CALL isAtStartOfLine()
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index c32ee91..8567135 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1632,7 +1632,8 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount,
sal_Bool bExpand) throw( un
return bRet;
}
-sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw(
uno::RuntimeException )
+sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
commit 8c91a82e8d5b02b91c4fdfad6d297a55149847f3
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:13:07 2014 +0000
coverity#738426 Uncaught exception
Change-Id: I0a31715a79cde61ceb104e82dc05c5a752f9085d
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 7f83015..cb4b8ec 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -280,7 +280,10 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const
OUString& aPropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 9929ece..c32ee91 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1586,7 +1586,8 @@ Sequence< PropertyState >
SwXTextViewCursor::getPropertyStates(
}
void SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName )
- throw(UnknownPropertyException,
RuntimeException)
+ throw (UnknownPropertyException, RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit d719713cd8d8779f2ecb39382cd6ddc29d7bd6ef
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:11:41 2014 +0000
coverity#738423 Uncaught exception
Change-Id: I7cdfd3e6331d0e600a022bc93be60df5e9bceaee
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index d431048..7f83015 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -281,7 +281,11 @@ public:
::com::sun::star::uno::RuntimeException,
std::exception);
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const
OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const
OUString& aPropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
//XServiceInfo
virtual OUString SAL_CALL getImplementationName(void) throw(
::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 8baf94f..9929ece 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1599,7 +1599,8 @@ void SwXTextViewCursor::setPropertyToDefault( const
OUString& rPropertyName )
}
Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName )
- throw(UnknownPropertyException,
WrappedTargetException, RuntimeException)
+ throw (UnknownPropertyException, WrappedTargetException,
+ RuntimeException, std::exception)
{
Any aRet;
SolarMutexGuard aGuard;
commit 9fa17abcf6e01d65b6151db9858fa0e25272c63d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:09:32 2014 +0000
coverity#738420 Uncaught exception
Change-Id: I3470c6981463b27ffa9cd9fbc79f96c41a43b847
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 6d3d053..d431048 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -276,7 +276,10 @@ public:
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException,
std::exception);
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const
::com::sun::star::uno::Sequence< OUString >& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const
::com::sun::star::uno::Sequence< OUString >& aPropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const
OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index bde63cf..8baf94f 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1569,7 +1569,9 @@ PropertyState SwXTextViewCursor::getPropertyState( const
OUString& rPropertyNam
}
Sequence< PropertyState > SwXTextViewCursor::getPropertyStates(
- const Sequence< OUString >& rPropertyNames )
throw(UnknownPropertyException, RuntimeException)
+ const Sequence< OUString >& rPropertyNames )
+ throw (UnknownPropertyException, RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
Sequence< PropertyState > aRet;
commit e13c43a8aa7402697b0fbf956ce27ce8fd2c78a3
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:04:52 2014 +0000
coverity#738419 Uncaught exception
Change-Id: I6a8a0b9038c5845cb04f6b9e43d8dce997442dc7
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index eb4a9ac..6d3d053 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -254,7 +254,13 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
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);
+ 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,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 1245ee4..bde63cf 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1487,8 +1487,9 @@ uno::Reference< XPropertySetInfo >
SwXTextViewCursor::getPropertySetInfo( ) th
}
void SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName,
const Any& aValue )
- throw(UnknownPropertyException,
PropertyVetoException,
- IllegalArgumentException,
WrappedTargetException, RuntimeException)
+ throw (UnknownPropertyException, PropertyVetoException,
+ IllegalArgumentException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if(m_pView)
commit f0e85649211101710a100379a05a5a115a7401b7
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 15:02:39 2014 +0000
coverity#738418 Uncaught exception
Change-Id: I2b0149795b28325ecfbf7738c30181337d5a3187
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 2b340c8..eb4a9ac 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -255,7 +255,11 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
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);
- 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);
+ 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,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 712408b..1245ee4 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1509,7 +1509,8 @@ void SwXTextViewCursor::setPropertyValue( const
OUString& rPropertyName, const
}
Any SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName )
- throw(UnknownPropertyException, WrappedTargetException,
RuntimeException)
+ throw (UnknownPropertyException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
Any aRet;
commit 579d077dbdba7ca22c745581c1cf4714812ced9e
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 25 14:59:08 2014 +0000
coverity#738417 Uncaught exception
Change-Id: I654883e6e2e1826fba8bb922faff84a0b2541024
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 67df9de..2b340c8 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -262,7 +262,10 @@ public:
virtual void SAL_CALL removeVetoableChangeListener( const OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(
const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(
const OUString& PropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const
::com::sun::star::uno::Sequence< OUString >& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const
OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 9e89c32..712408b 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -1549,7 +1549,8 @@ void SwXTextViewCursor::removeVetoableChangeListener(
}
PropertyState SwXTextViewCursor::getPropertyState( const OUString&
rPropertyName )
- throw(UnknownPropertyException, RuntimeException)
+ throw (UnknownPropertyException, RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
PropertyState eState;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
