[Libreoffice-commits] core.git: 8 commits - filter/source framework/source include/vbahelper sd/source vbahelper/source writerfilter/source
Noel Grandin
noel at peralex.com
Fri Oct 10 01:15:02 PDT 2014
filter/source/config/cache/filtercache.cxx | 2 +-
filter/source/config/cache/filtercache.hxx | 2 +-
framework/source/inc/loadenv/loadenv.hxx | 8 ++++----
framework/source/loadenv/loadenv.cxx | 8 ++++----
include/vbahelper/vbadocumentsbase.hxx | 2 +-
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 4 ++--
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 ++++++++++----
8 files changed, 24 insertions(+), 18 deletions(-)
New commits:
commit fb365e63ab46ee58adcb05f9e70cf2c2cc700df0
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 10:12:03 2014 +0200
cid#1244955 Uncaught exception
Change-Id: Iedf06cc78cda022112699be3db650d11c7249adc
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index fc81e53..91430e7 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -111,7 +111,7 @@ namespace sd
protected:
virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) SAL_OVERRIDE;
- virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) SAL_OVERRIDE;
+ virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE;
private:
bool LoadList( XPropertyListType t, const OUString &rPath,
@@ -980,7 +980,7 @@ void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue )
void
DocumentSettings::_getPropertyValues(
const PropertyMapEntry** ppEntries, Any* pValue)
-throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
commit 277e98edce56e0d1c37403dce1f389eeb9018d30
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 10:09:51 2014 +0200
cid#1244948 Uncaught exception
Change-Id: I421f245fd3be90f0e1d08ad92b0723a64121ae12
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 3abba6f..95367eb 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -522,7 +522,7 @@ private:
the whole runtime can't be used any longer.
*/
css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget()
- throw(LoadEnvException, css::uno::RuntimeException);
+ throw(LoadEnvException, css::uno::RuntimeException, std::exception);
/** @short because showing of a frame is needed more than once ...
it's implemented as an separate method .-)
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 570f4d9..f6526dd 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1387,7 +1387,7 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::
}
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
- throw(LoadEnvException, css::uno::RuntimeException)
+ throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
// SAFE -> ..................................
osl::ClearableMutexGuard aReadLock(m_mutex);
commit 71540e1e47bcb1cea34861e13a47a558a88757e1
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 09:45:44 2014 +0200
cid#1244949 Uncaught exception
Change-Id: Ic33d60a435ee875e8e342420046aae436739c123
diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx
index c4e002f..b87702f 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -50,7 +50,7 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE = 0;
protected:
- css::uno::Any createDocument() throw (css::uno::RuntimeException);
+ css::uno::Any createDocument() throw (css::uno::RuntimeException, std::exception);
void closeDocuments() throw (css::uno::RuntimeException);
css::uno::Any openDocument( const OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
};
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 6f8a6a8..1c82657 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -234,7 +234,7 @@ void lclSetupComponent( const uno::Reference< lang::XComponent >& rxComponent, b
} // namespace
-uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException)
+uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException, std::exception)
{
// #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
commit d7ea649b56dd72ca94d6bf175ac9477a6c308f51
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 09:44:09 2014 +0200
cid#1244950 Uncaught exception
Change-Id: I1aa4d437838dac42ac1fc803a2ba2a437fa3addb
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index b7abc79..3abba6f 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -446,7 +446,7 @@ private:
the whole runtime can't be used any longer.
*/
bool impl_handleContent()
- throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException);
+ throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException, std::exception);
/** @short tries to use FrameLoader objects for loading.
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index d64a85d..570f4d9 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -853,7 +853,7 @@ void LoadEnv::impl_detectTypeAndFilter()
}
bool LoadEnv::impl_handleContent()
- throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException)
+ throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception)
{
// SAFE -> -----------------------------------
osl::ClearableMutexGuard aReadLock(m_mutex);
commit d79ca9b29a346e53d1c24b29cce14b6698bd6dd4
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 09:43:03 2014 +0200
cid#1244951 Uncaught exception
Change-Id: I3bb5dc5932f4239507920cb9cafa66caab9ff7e0
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index c5d2228a..b7abc79 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -412,7 +412,7 @@ private:
the whole runtime can't be used any longer.
*/
void impl_detectTypeAndFilter()
- throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException);
+ throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException, std::exception);
/** @short tries to ask user for it's filter decision in case
normal detection failed.
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index a528348..d64a85d 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -735,7 +735,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>&, OUStrin
}
void LoadEnv::impl_detectTypeAndFilter()
- throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException)
+ throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception)
{
static OUString TYPEPROP_PREFERREDFILTER("PreferredFilter");
static OUString FILTERPROP_FLAGS ("Flags");
commit 36ec3ddc0b666c5c35cd7662632a72237b43a810
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 09:41:56 2014 +0200
cid#1244952 Uncaught exception
Change-Id: Ied23e7df1d8ebda9976e63d03c122c058addf274
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 6ad518e..c5d2228a 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -465,7 +465,7 @@ private:
the whole runtime can't be used any longer.
*/
bool impl_loadContent()
- throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException);
+ throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException, std::exception);
/** @short checks if the specified content is already loaded.
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index c17a2e3..a528348 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -999,7 +999,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
}
bool LoadEnv::impl_loadContent()
- throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException)
+ throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception)
{
// SAFE -> -----------------------------------
osl::ClearableMutexGuard aWriteLock(m_mutex);
commit c2621e6482310b5dc2c8dd2c3dc0ea384784b46c
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 09:40:32 2014 +0200
cid#1244954 Uncaught exception
Change-Id: Ica5e88ed8294c4256da2798093cd4a191b7c5313
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index ba84e5c..2fc5cfb 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -444,7 +444,7 @@ void FilterCache::removeItem( EItemType eType,
void FilterCache::setItem( EItemType eType ,
const OUString& sItem ,
const CacheItem& aValue)
- throw(css::uno::Exception)
+ throw(css::uno::Exception, std::exception)
{
// SAFE ->
::osl::ResettableMutexGuard aLock(m_aLock);
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 9a3a96d..c992424 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -503,7 +503,7 @@ class FilterCache : public BaseLock
virtual void setItem( EItemType eType ,
const OUString& sItem ,
const CacheItem& aValue)
- throw(css::uno::Exception);
+ throw(css::uno::Exception, std::exception);
commit 3bbfbed375ffaa9ad5b0e857ef6c57575298baed
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 10 09:37:38 2014 +0200
cid#1244941 Invalid iterator comparison
this is just a false+, but creating a local var will likely fix it
Change-Id: Ia02e04098a70102c70f5fe5ecd156eea6f40d2af
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fbfae7c..f49a14f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1664,13 +1664,19 @@ void DomainMapper_Impl::CheckRedline( uno::Reference< text::XTextRange > const&
// Create the redlines here from lowest (formats) to highest (inserts/removals) priority, since the last one is
// what Writer presents graphically, so this will show deletes as deleted text and not as just formatted text being there.
if( GetTopContextOfType(CONTEXT_PARAGRAPH) )
- for( std::vector<RedlineParamsPtr>::const_iterator it = GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines().begin();
- it != GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines().end(); ++it )
+ {
+ std::vector<RedlineParamsPtr>& avRedLines = GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines();
+ for( std::vector<RedlineParamsPtr>::const_iterator it = avRedLines.begin();
+ it != avRedLines.end(); ++it )
CreateRedline( xRange, *it );
+ }
if( GetTopContextOfType(CONTEXT_CHARACTER) )
- for( std::vector<RedlineParamsPtr>::const_iterator it = GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().begin();
- it != GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().end(); ++it )
+ {
+ std::vector<RedlineParamsPtr>& avRedLines = GetTopContextOfType(CONTEXT_CHARACTER)->Redlines();
+ for( std::vector<RedlineParamsPtr>::const_iterator it = avRedLines.begin();
+ it != avRedLines.end(); ++it )
CreateRedline( xRange, *it );
+ }
std::vector<RedlineParamsPtr>::iterator pIt = m_aRedlines.top().begin( );
for (; pIt != m_aRedlines.top().end( ); ++pIt )
CreateRedline( xRange, *pIt );
More information about the Libreoffice-commits
mailing list