comphelper/source/property/MasterPropertySet.cxx | 4 ++--
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 6 +-----
connectivity/source/inc/odbc/OPreparedStatement.hxx | 2 +-
include/sfx2/basedlgs.hxx | 8 +++-----
sfx2/source/dialog/basedlgs.cxx | 14 +-------------
5 files changed, 8 insertions(+), 26 deletions(-)
New commits:
commit 455404320614f56c2e840ab0c9baf70596bde559
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jul 12 21:14:52 2014 +0100
SfxModelessDialog ResId ctor bites the dust
Change-Id: Ia1bc255de0f38c058a3ab622d87af8b346a2075f
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 67670bd..f718f22 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -100,11 +100,9 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public
ModelessDialog
void Init(SfxBindings *pBindinx, SfxChildWindow *pCW);
protected:
- SfxModelessDialog( SfxBindings*, SfxChildWindow*,
- Window*, const ResId& );
- SfxModelessDialog( SfxBindings*, SfxChildWindow*,
- Window*, const OString& rID, const OUString&
rUIXMLDescription );
- virtual ~SfxModelessDialog();
+ SfxModelessDialog( SfxBindings*, SfxChildWindow*,
+ Window*, const OString& rID, const OUString& rUIXMLDescription );
+ virtual ~SfxModelessDialog();
virtual bool Close() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
virtual void Move() SAL_OVERRIDE;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e464e61..a22f5fb 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -322,14 +322,6 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl)
return 0;
}
-SfxModelessDialog::SfxModelessDialog(SfxBindings *pBindinx,
- SfxChildWindow *pCW, Window *pParent, const ResId& rResId)
- : ModelessDialog(pParent, rResId)
-{
- Init(pBindinx, pCW);
- SetHelpId("");
-}
-
SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx,
SfxChildWindow *pCW, Window *pParent, const OString& rID,
const OUString& rUIXMLDescription)
@@ -351,16 +343,12 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx,
SfxChildWindow *pCW)
pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl));
}
-
-
-bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
-
/* [Description]
If a ModelessDialog is enabled its ViewFrame wil be activated.
This is necessary by PluginInFrames.
*/
-
+bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
{
if ( rEvt.GetType() == EVENT_GETFOCUS )
{
commit 55dac4ff40be49dd256e6d3e4b080613259d337b
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 11 20:21:39 2014 +0100
coverity#706364 Uncaught exception
Change-Id: I4a6f7a2aa76d2a998bb6392de35fa1d25c85b3ce
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 686c40f..cf737a0 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -831,18 +831,14 @@ void OPreparedStatement::putParamData (sal_Int32 index)
}
}
-
-
// setStream
// Sets an input stream as a parameter, using the given SQL type
-
-
void OPreparedStatement::setStream(
sal_Int32 ParameterIndex,
const Reference< XInputStream>& x,
SQLLEN length,
sal_Int32 _nType)
- throw(SQLException)
+ throw (SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 7f3aded..5996883 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -75,7 +75,7 @@ namespace connectivity
void putParamData (sal_Int32 index)
throw (css::sdbc::SQLException, css::uno::RuntimeException);
void setStream (sal_Int32 ParameterIndex,const
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x,
- SQLLEN
length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException);
+ SQLLEN
length,sal_Int32 SQLtype) throw (css::sdbc::SQLException,
css::uno::RuntimeException);
SQLLEN* getLengthBuf (sal_Int32 index);
void* allocBindBuf ( sal_Int32 index, sal_Int32 bufLen);
void initBoundParam () throw(::com::sun::star::sdbc::SQLException);
commit 136fa5432d5d10743373488de9de39a6198b8690
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 11 20:19:37 2014 +0100
coverity#706282 Uncaught exception
Change-Id: Icca233fdc6d841d1bf51f918b83f3eef2cd5952e
diff --git a/comphelper/source/property/MasterPropertySet.cxx
b/comphelper/source/property/MasterPropertySet.cxx
index 50f3b39..a4fa976 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -227,7 +227,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const
Sequence< OUString >&
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException( *pString, static_cast<
XPropertySet* >( this ) );
+ throw RuntimeException( *pString, static_cast< XPropertySet*
>( this ) );
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
_setSingleValue( *((*aIter).second->mpInfo), *pAny );
commit b03675889d426cbafa302e7ed6dc385d2bf2708e
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 11 20:17:26 2014 +0100
coverity#706281 Uncaught exception
Change-Id: I469b812c666801db5e3a6fac1d6152afd80cf39a
diff --git a/comphelper/source/property/MasterPropertySet.cxx
b/comphelper/source/property/MasterPropertySet.cxx
index c5a59da..50f3b39 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -292,7 +292,7 @@ Sequence< Any > SAL_CALL
MasterPropertySet::getPropertyValues( const Sequence< O
{
aIter = mpInfo->maMap.find ( *pString );
if ( aIter == aEnd )
- throw UnknownPropertyException( *pString, static_cast<
XPropertySet* >( this ) );
+ throw RuntimeException( *pString, static_cast< XPropertySet*
>( this ) );
if ( (*aIter).second->mnMapId == 0 ) // 0 means it's one of ours !
_getSingleValue( *((*aIter).second->mpInfo), *pAny );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
