[Libreoffice-commits] core.git: 12 commits - basctl/source editeng/source filter/source framework/source include/editeng offapi/com sfx2/source svtools/source unusedcode.easy vcl/source vcl/unx xmloff/source
Tsutomu Uchino
hanya at apache.org
Sun Feb 1 14:11:08 PST 2015
basctl/source/dlged/dlgedobj.cxx | 2 -
basctl/source/inc/dlgedobj.hxx | 2 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 3 +
filter/source/config/cache/filtercache.cxx | 2 -
framework/source/accelerators/acceleratorconfiguration.cxx | 13 ++++----
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 12 +++----
include/editeng/AccessibleEditableTextPara.hxx | 2 -
offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl | 3 +
offapi/com/sun/star/ui/XAcceleratorConfiguration.idl | 6 ++-
sfx2/source/doc/objstor.cxx | 3 -
svtools/source/contnr/treelist.cxx | 4 +-
unusedcode.easy | 16 ++++++++--
vcl/source/opengl/OpenGLHelper.cxx | 2 -
vcl/unx/kde4/KDESalGraphics.cxx | 2 -
xmloff/source/forms/elementimport.cxx | 6 +++
xmloff/source/forms/elementimport.hxx | 1
16 files changed, 49 insertions(+), 30 deletions(-)
New commits:
commit f2ae6d2053256e1917104f1c44485099966155be
Author: Tsutomu Uchino <hanya at apache.org>
Date: Sat Jan 31 07:26:19 2015 +0000
Resolves: #i114416# use default service name for scroll bar...
if failed to detect the control-implementation
(cherry picked from commit 23e16b91ad69a123e795d63f2d4862d94412d582)
Conflicts:
xmloff/source/forms/elementimport.cxx
xmloff/source/forms/elementimport.hxx
Change-Id: I0ab4f9ff909ceba18a74d38488f6d0bdb3126110
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 4f50177..608fcb5 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -683,6 +683,7 @@ namespace xmloff
case OControlElement::IMAGE_FRAME: pServiceName = "com.sun.star.form.component.DatabaseImageControl"; break;
case OControlElement::HIDDEN: pServiceName = "com.sun.star.form.component.HiddenControl"; break;
case OControlElement::GRID: pServiceName = "com.sun.star.form.component.GridControl"; break;
+ case OControlElement::VALUERANGE: pServiceName = "com.sun.star.form.component.ScrollBar"; break;
case OControlElement::TIME: pServiceName = "com.sun.star.form.component.TimeField"; break;
case OControlElement::DATE: pServiceName = "com.sun.star.form.component.DateField"; break;
default: break;
@@ -2112,6 +2113,11 @@ namespace xmloff
}
}
+ OUString OFormImport::determineDefaultServiceName() const
+ {
+ return OUString("com.sun.star.form.component.Form");
+ }
+
} // namespace xmloff
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 4d2592a..230ff6d 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -695,6 +695,7 @@ namespace xmloff
sal_uInt16 _nPrefix, const OUString& _rLocalName,
OControlElement::ElementType _eType );
+ virtual OUString determineDefaultServiceName() const SAL_OVERRIDE;
void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue);
};
commit e112dc0df7344e98414f64e70ddb7f764790bd06
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 1 09:06:30 2015 +0000
callcatcher: yet more unused code
Change-Id: I75b8cdffd965c6d99fd3693a6297c023279df76e
diff --git a/unusedcode.easy b/unusedcode.easy
index 51eea3a..fed4585 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2,8 +2,6 @@ BigInt::BigInt(unsigned int)
CalendarWrapper::getDSTOffsetInMillis() const
CalendarWrapper::getZoneOffsetInMillis() const
FontCharMap::GetDefaultMap(bool)
-Interceptor::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)
-Interceptor::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)
LineListBox::Clear()
LineListBox::InsertEntry(rtl::OUString const&, int)
LineListBox::RemoveEntry(int)
@@ -62,10 +60,12 @@ ScUserListItem::GetValueText() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScViewObjectModeItem::GetValueText(unsigned short) const
+SdrUndoObjList::SetOrdNum(unsigned int)
SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, rtl::OUString const&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxBoolItem::GetValueCount() const
SfxFrameItem::GetValueText() const
+SfxObjectShell::DdeExecute(rtl::OUString const&)
SfxObjectShellItem::GetValueText() const
SfxProgress::SetText(rtl::OUString const&)
SfxTemplateDialog_Impl::Command(CommandEvent const&)
@@ -80,6 +80,8 @@ StyleSettings::SetSpinSize(long)
StyleSettings::SetTitleHeight(long)
StyleSettings::SetUseFlatBorders(bool)
StyleSettings::SetUseFlatMenus(bool)
+SvDataPipe_Impl::addMark(unsigned int)
+SvDataPipe_Impl::removeMark(unsigned int)
SvpSalFrame::enableDamageTracker(bool)
SvpSalInstance::PostedEventsInQueue()
SvtListener::IsListening(SvtBroadcaster&) const
@@ -102,10 +104,13 @@ Test::testPerf()
Test::testSharedFormulaMoveBlock()
ToolBox::UserDraw(UserDrawEvent const&)
UnxPluginComm::NPP_GetMIMEDescription()
+VCLXAccessibleList::contains(com::sun::star::awt::Point const&)
X11SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&)
+XclExpChartObj::WriteShapeTransformation(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, bool, bool, int)
XclXmlUtils::ToOString(XclRange const&)
XmlTestTools::parseXml(utl::TempFile&)
accessibility::AccessibleOutlineView::FireEvent(com::sun::star::accessibility::AccessibleEventObject const&)
+accessibility::AccessibleTextHelper_Impl::IsSelected() const
apitest::CellProperties::testRotateReference()
apitest::CellProperties::testVertJustify()
apitest::DataPilotField::testAutoShowInfo()
@@ -263,6 +268,7 @@ dp_registry::backend::RegisteredDb::getEntry(rtl::OUString const&)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::drawingml::TextListStyle::dump() const
+reportdesign::lcl_getControlModelMap()
sc::CLBuildKernelThread::CLBuildKernelThread()
sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::finish()
@@ -276,6 +282,10 @@ sc::FormulaGroupAreaListener::isEndFixed() const
sc::FormulaGroupAreaListener::isStartFixed() const
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
+sd::sidebar::MasterPagesSelector::GetPreferredWidth(int)
+sd::slidesorter::SlideSorter::GetBorder()
+sd::slidesorter::SlideSorterViewShell::DragFinished(signed char)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
-sw::mark::MarkManager::hasMark(rtl::OUString const&) const
+vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+writerfilter::ooxml::OOXMLFastContextHandler::getUnoTunnelId()
commit 9f1ecd3ac35f06746fe2a12ca52899f664679de5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 21:11:57 2015 +0000
coverity#1267678 this is surely backwards (gold)
surely we clone from the source and return the newly created
entry. Presumably this doesn't break all the time because
aCloneLink is generally set ?
coverity#1267678 Resource leak
Change-Id: I3e02dfaef371e006f1510b186cdd881c991ef2cf
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 60a8d27..1da2c98 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -355,8 +355,8 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const
if( aCloneLink.IsSet() )
return reinterpret_cast<SvTreeListEntry*>(aCloneLink.Call( pSource ));
SvTreeListEntry* pEntry = CreateEntry();
- pSource->Clone( pEntry );
- return pSource;
+ pEntry->Clone(pSource);
+ return pEntry;
}
SvTreeListEntry* SvTreeList::CreateEntry() const
commit baa5fca0fe50334d0820941763b5e18a244e9921
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 21:16:43 2015 +0000
coverity#1267676 Identical code for different branches
Change-Id: Ia7abc084acb0f9e8a25e93fa86bf254eee7cda21
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 0c43fd28..f383788 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -46,13 +46,11 @@ QStyle::State vclStateValue2StateFlag( ControlState nControlState,
const ImplControlValue& aValue )
{
QStyle::State nState =
- ( (nControlState & ControlState::DEFAULT)? QStyle::State_None: QStyle::State_None ) |
( (nControlState & ControlState::ENABLED)? QStyle::State_Enabled: QStyle::State_None ) |
( (nControlState & ControlState::FOCUSED)? QStyle::State_HasFocus: QStyle::State_None ) |
( (nControlState & ControlState::PRESSED)? QStyle::State_Sunken: QStyle::State_None ) |
( (nControlState & ControlState::SELECTED)? QStyle::State_Selected : QStyle::State_None ) |
( (nControlState & ControlState::ROLLOVER)? QStyle::State_MouseOver: QStyle::State_None );
- //TODO ( (nControlState & ControlState::HIDDEN)? QStyle::State_: QStyle::State_None ) |
switch ( aValue.getTristateVal() )
{
commit dcf8f9622caa77a7f337d6b8c334605a9693dc26
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 21:14:39 2015 +0000
help coverity out wrt coverity#1267682 String not null terminated
Change-Id: Ib72c0daf8573314d601d7acea3a1fbb3183b4bb6
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index a574366..7ef47c2 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -51,7 +51,7 @@ OString loadShader(const OUString& rFilename)
sal_uInt64 nBytesRead = 0;
aFile.read(content.get(), nSize, nBytesRead);
assert(nSize == nBytesRead);
- content[nBytesRead] = 0;
+ content.get()[nBytesRead] = 0;
return OString(content.get());
}
else
commit 01ed7a331b78e8ca64783fc8d3adefebf782dacb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 21:06:20 2015 +0000
coverity#440978 Dereference before null check
Change-Id: Ib58f88c0756bdcedeb1f478364e0d89640fd3d11
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3de8c49..4c332ae 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1201,8 +1201,7 @@ bool SfxObjectShell::SaveTo_Impl
}
// use UCB for case sensitive/insensitive file name comparison
- if ( pMedium
- && !pMedium->GetName().equalsIgnoreAsciiCase("private:stream")
+ if ( !pMedium->GetName().equalsIgnoreAsciiCase("private:stream")
&& !rMedium.GetName().equalsIgnoreAsciiCase("private:stream")
&& ::utl::UCBContentHelper::EqualURLs( pMedium->GetName(), rMedium.GetName() ) )
{
commit c686be8bb2d4fff469ed753cc3dbf417baa903e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 21:02:47 2015 +0000
coverity#1267688 Uncaught exception
Change-Id: Icaa71c9f5a7766ea2297d63b19ceff36913a3d0b
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 6728df5..730e609 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -170,8 +170,8 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
}
css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw(css::lang::IllegalArgumentException ,
- css::uno::RuntimeException, std::exception )
+ throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index ef94407..290fd0a 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -125,8 +125,8 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener,
css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw(css::lang::IllegalArgumentException ,
- css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
commit ebaa9958f5e816b4f926e6d35223a61f3d1414b0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 21:01:07 2015 +0000
coverity#1267687 Uncaught exception
Change-Id: If7af42b345c876d29d750a29c1a406e862788b06
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index a891be9..6728df5 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -568,8 +568,9 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
+ throw (css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception)
{
SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::setKeyEvent" );
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 784e391..ef94407 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -310,8 +310,8 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4<
virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index 28926c7..9a88b60 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -134,7 +134,8 @@ interface XAcceleratorConfiguration
*/
void setKeyEvent( [in] com::sun::star::awt::KeyEvent aKeyEvent,
[in] string sCommand )
- raises(com::sun::star::lang::IllegalArgumentException);
+ raises(com::sun::star::lang::IllegalArgumentException,
+ com::sun::star::container::NoSuchElementException);
/** remove a key-command-binding from this configuration set.
commit decd61013cba116e343537a50f4b1f6bc785022b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 20:58:44 2015 +0000
coverity#1267685 Uncaught exception
Change-Id: Ia4728352f86a8c1ac2007918708430b5221ea9fe
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 1643bf1..a891be9 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -737,8 +737,8 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
}
css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw(css::lang::IllegalArgumentException ,
- css::uno::RuntimeException, std::exception )
+ throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index d5eaace..784e391 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -323,8 +323,8 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4<
css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw(css::lang::IllegalArgumentException ,
- css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
index e5c32af..28926c7 100644
--- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
+++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl
@@ -212,7 +212,8 @@ interface XAcceleratorConfiguration
because every URL schema can be used here.
*/
sequence< any > getPreferredKeyEventsForCommandList( [in] sequence< string > lCommandList )
- raises(com::sun::star::lang::IllegalArgumentException);
+ raises(com::sun::star::lang::IllegalArgumentException,
+ com::sun::star::container::NoSuchElementException);
/** search for an key-command-binding inside this configuration set,
where the specified command is used.
commit e8870af6955400acf457209e1eb45debc90085ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 20:55:19 2015 +0000
this cannot happen in reality
Change-Id: I6b8b447763cc61e9dfef6d4ba122384482078d84
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 69d6027..83537b7 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -790,7 +790,7 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType)
}
- throw css::uno::Exception("unknown sub container requested.",
+ throw css::uno::RuntimeException("unknown sub container requested.",
css::uno::Reference< css::uno::XInterface >());
// <- SAFE ----------------------------------
}
commit 3c3a53b3d2803395150c88d7bf6cdf6736a185b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 20:49:41 2015 +0000
coverity#1267693 Uncaught exception
Change-Id: Id6ed00e9c23cf0cd48ead203e772450680687762
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 7fc1326..7ed255a8 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2560,7 +2560,8 @@ namespace accessibility
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getRunAttributes(
sal_Int32 nIndex,
const uno::Sequence< OUString >& rRequestedAttributes )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+ throw (beans::UnknownPropertyException, lang::IndexOutOfBoundsException,
+ uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 026ebc9..0ee06ef 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -148,7 +148,7 @@ namespace accessibility
// XAccessibleTextAttributes
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< OUString >& RequestedAttributes ) throw (css::beans::UnknownPropertyException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAccessibleHypertext
virtual ::sal_Int32 SAL_CALL getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
index de07fb0..f8d459b 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleTextAttributes.idl
@@ -86,7 +86,8 @@ interface XAccessibleTextAttributes
sequence<::com::sun::star::beans::PropertyValue>
getRunAttributes ( [in] long Index,
[in] sequence<string> RequestedAttributes )
- raises (::com::sun::star::lang::IndexOutOfBoundsException);
+ raises (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::IndexOutOfBoundsException);
};
commit f08169c775858ddb13947eb8cf90c74b3c7dde87
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 31 20:44:41 2015 +0000
coverity#1267686 Uncaught exception
Change-Id: Iab9067590cd15b3b60cfa2a98ee6be30d2fdf13d
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 0cf8b6b..017bf20 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1121,7 +1121,7 @@ void DlgEdObj::EndListening(bool bRemoveListener)
}
}
-void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
if (isListening())
{
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index ca471f6..c75431c 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -121,7 +121,7 @@ public:
void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException);
// PropertyChangeListener
- void SAL_CALL _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception);
// ContainerListener
void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
More information about the Libreoffice-commits
mailing list