[Libreoffice-commits] core.git: 15 commits - chart2/source framework/inc framework/source include/svtools include/svx include/vbahelper include/vcl sc/source sd/source sfx2/source svtools/source svx/source sw/source ucb/source unusedcode.easy vcl/source writerfilter/source
Caolán McNamara
caolanm at redhat.com
Mon Jun 2 09:00:29 PDT 2014
chart2/source/view/charttypes/GL3DBarChart.cxx | 2 +
framework/inc/uielement/progressbarwrapper.hxx | 2 -
framework/source/loadenv/loadenv.cxx | 11 ++++----
framework/source/uielement/progressbarwrapper.cxx | 2 -
include/svtools/svmedit2.hxx | 1
include/svx/unopage.hxx | 2 -
include/vbahelper/vbaeventshelperbase.hxx | 4 ++-
include/vcl/imgctrl.hxx | 1
sc/source/ui/vba/vbaeventshelper.cxx | 3 +-
sc/source/ui/vba/vbaeventshelper.hxx | 2 -
sd/source/ui/framework/module/ModuleController.cxx | 3 +-
sd/source/ui/inc/facreg.hxx | 2 -
sfx2/source/doc/objxtor.cxx | 26 ++++++++++-----------
svtools/source/edit/svmedit2.cxx | 7 -----
svx/source/unodraw/unopage.cxx | 3 +-
sw/source/core/doc/textboxhelper.cxx | 2 -
sw/source/core/fields/reffld.cxx | 6 +++-
ucb/source/ucp/tdoc/tdoc_content.cxx | 9 ++++---
ucb/source/ucp/tdoc/tdoc_content.hxx | 10 ++++----
ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 +--
ucb/source/ucp/webdav-neon/NeonSession.hxx | 2 -
unusedcode.easy | 4 ---
vcl/source/control/imgctrl.cxx | 6 ----
writerfilter/source/filter/ImportFilter.cxx | 2 -
24 files changed, 56 insertions(+), 60 deletions(-)
New commits:
commit eea173edaa70959c36085d659b9c6786c2002849
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:28:41 2014 +0100
coverity#704885 Unchecked dynamic_cast
Change-Id: I748a73523b6b1908d89663e90f7cab378920110d
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 17a1dba..f3205df 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -236,9 +236,11 @@ bool SwGetRefField::IsRefToNumItemCrossRefBookmark() const
const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
{
- SwDoc* pDoc = dynamic_cast<SwGetRefFieldType*>(GetTyp())->GetDoc();
+ SwGetRefFieldType *pTyp = dynamic_cast<SwGetRefFieldType*>(GetTyp());
+ if (!pTyp)
+ return NULL;
sal_Int32 nDummy = -1;
- return SwGetRefFieldType::FindAnchor( pDoc, sSetRefName, nSubType, nSeqNo, &nDummy );
+ return SwGetRefFieldType::FindAnchor( pTyp->GetDoc(), sSetRefName, nSubType, nSeqNo, &nDummy );
}
// #i85090#
commit 09188ebfc44af4a7a3e4747c80f1a49f3c2c288d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:25:11 2014 +0100
coverity#706959 Uncaught exception
Change-Id: I6b18bd2df7ef190b39ceacd625bf2b62a53892fa
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index 0f1b42c..8641f06 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -135,7 +135,9 @@ protected:
/** Derived classes have to return the name of the Basic document module. */
virtual OUString implGetDocumentModuleName(
const EventHandlerInfo& rInfo,
- const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) = 0;
+ const css::uno::Sequence< css::uno::Any >& rArgs ) const
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException) = 0;
private:
typedef ::std::map< sal_Int32, OUString > ModulePathMap;
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index e8ebdb2..c506dde 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -780,7 +780,8 @@ void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue,
}
OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& rInfo,
- const uno::Sequence< uno::Any >& rArgs ) const throw (lang::IllegalArgumentException)
+ const uno::Sequence< uno::Any >& rArgs ) const
+ throw (lang::IllegalArgumentException, uno::RuntimeException)
{
bool bSheetEvent = false;
rInfo.maUserData >>= bSheetEvent;
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx
index 3a04e5f..93c9467 100644
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -41,7 +41,7 @@ protected:
virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) SAL_OVERRIDE;
virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
- virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) SAL_OVERRIDE;
+ virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) SAL_OVERRIDE;
private:
/** Checks if selection has been changed compared to selection of last call.
commit 12402d250325f23e709b9b266de2d74ac4b4eab4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:17:14 2014 +0100
coverity#707427 Uncaught exception
Change-Id: Ic381e74ffd862ab4d94f9d3ada02af05b30e6484
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 2f392224..5b3b042 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -2846,7 +2846,8 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream(
ContentProvider * pProvider,
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest )
+ task::DocumentPasswordRequest,
+ uno::RuntimeException )
{
OUString aPassword;
bool bPasswordRequested = false;
commit 778b8ea885a244fff79654fc06b95aea6085c132
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:16:42 2014 +0100
coverity#707428 Uncaught exception
Change-Id: I7e30f163743fc6bd05b5e795b299a76e0c51d8c0
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 229f91a..2f392224 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -2802,7 +2802,8 @@ static OUString obtainPassword(
uno::Reference< io::XInputStream > Content::getInputStream(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest )
+ task::DocumentPasswordRequest,
+ uno::RuntimeException )
{
OUString aUri;
OUString aPassword;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 4522ae9..8b5c5b7 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -222,8 +222,9 @@ private:
getInputStream( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment > &
xEnv )
- throw ( ::com::sun::star::ucb::CommandFailedException,
- ::com::sun::star::task::DocumentPasswordRequest );
+ throw ( css::ucb::CommandFailedException,
+ css::task::DocumentPasswordRequest,
+ css::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
getTruncatedOutputStream(
commit ade1049186ed4eea724e43c42c13500f8416eb9e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:15:34 2014 +0100
coverity#707430 Uncaught exception
Change-Id: I56269273b20ac48fca5a2abeb2ba2cbf7d1da0c8
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index b8199ec..229f91a 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -2890,7 +2890,8 @@ uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream(
uno::Reference< io::XStream > Content::getStream(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest )
+ task::DocumentPasswordRequest,
+ uno::RuntimeException )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index d7e7cec..4522ae9 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -238,8 +238,9 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
getStream( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment > & xEnv )
- throw ( ::com::sun::star::ucb::CommandFailedException,
- ::com::sun::star::task::DocumentPasswordRequest );
+ throw ( css::ucb::CommandFailedException,
+ css::task::DocumentPasswordRequest,
+ css::uno::RuntimeException );
public:
// Create existing content. Fail, if not already exists.
commit 630d48121011529675c493a618090252ad63cc3b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:13:59 2014 +0100
coverity#1213461 Uncaught exception
Change-Id: I4c0a28ea11e0d38837a3b338928073d32d2b6abe
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 62961d4..8dc123b 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -96,7 +96,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun:
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception);
- static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = NULL, SvxDrawPage *pPage = NULL, OUString const & referer = OUString() ) throw();
+ static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = NULL, SvxDrawPage *pPage = NULL, OUString const & referer = OUString() ) throw (css::uno::RuntimeException);
// The following method is called if a SvxShape object is to be created.
// Derived classes can create a derivation or an SvxShape aggregating object.
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 21e5736..d6e2386 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -611,7 +611,8 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor,
}
}
-SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer ) throw()
+SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer )
+ throw (css::uno::RuntimeException)
{
SvxShape* pRet = NULL;
switch( nInventor )
commit 074079b9093b0b393fb7308db03ee91e5f081d67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 2 15:11:43 2014 +0100
coverity#1219786 Dereference after null check
Change-Id: I95608ce08b9fffada10bc1a1f6903b50aa78fe9a
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index e8411da..b732af1 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -226,7 +226,7 @@ Rectangle SwTextBoxHelper::getTextRectangle(SwFrmFmt* pShape, bool bAbsolute)
xLockable->setActionLocks(nLocks);
}
- if (!bAbsolute)
+ if (!bAbsolute && pCustomShape)
{
// Relative, so count the logic (reference) rectangle, see the EnhancedCustomShape2d ctor.
Point aPoint(pCustomShape->GetSnapRect().Center());
commit 6fa618722e4c4546e6ad429883d380c9fc313a0f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 22:06:32 2014 +0100
coverity#1219793 Uncaught exception
and hopefully a gadzillion others
Change-Id: I853e997aa6510ed99c1af39eecfd80dba2d5c2a9
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index fabd427..2a7e4c5 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -687,29 +687,29 @@ namespace
}
#endif
-
-
BasicManager* SfxObjectShell::GetBasicManager() const
{
-#ifdef DISABLE_SCRIPTING
- return NULL;
-#else
- BasicManager* pBasMgr = lcl_getBasicManagerForDocument( *this );
- if ( !pBasMgr )
- pBasMgr = SFX_APP()->GetBasicManager();
- return pBasMgr;
+ BasicManager* pBasMgr = NULL;
+#ifndef DISABLE_SCRIPTING
+ try
+ {
+ pBasMgr = lcl_getBasicManagerForDocument( *this );
+ if ( !pBasMgr )
+ pBasMgr = SFX_APP()->GetBasicManager();
+ }
+ catch (const css::ucb::ContentCreationException& e)
+ {
+ SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ }
#endif
+ return pBasMgr;
}
-
-
void SfxObjectShell::SetHasNoBasic()
{
pImp->m_bNoBasicCapabilities = true;
}
-
-
bool SfxObjectShell::HasBasic() const
{
#ifdef DISABLE_SCRIPTING
commit a4e5020f890abfbb4b95b299e70dd194502e7a2f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 14:34:55 2014 +0100
coverity#1219792 Uncaught exception
Change-Id: Ibbcfb5cda4ce4f23f80ef4ba610e4fda6f8df41f
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 6a9a349..e93d288 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -617,7 +617,7 @@ NeonSession::~NeonSession( )
}
void NeonSession::Init( const DAVRequestEnvironment & rEnv )
- throw ( std::exception )
+ throw (css::uno::RuntimeException, std::exception)
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
m_aEnv = rEnv;
@@ -625,7 +625,7 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv )
}
void NeonSession::Init()
- throw (css::uno::RuntimeException, std::exception )
+ throw (css::uno::RuntimeException, std::exception)
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 7a24757..f2e9ae1 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -236,7 +236,7 @@ private:
throw (css::uno::RuntimeException, std::exception);
void Init( const DAVRequestEnvironment & rEnv )
- throw ( std::exception );
+ throw (css::uno::RuntimeException, std::exception);
// ret: true => retry request.
void HandleError( int nError,
commit a921f41a26e5cddb345ef9e8d7a961211fb88bb5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 14:33:36 2014 +0100
coverity#1219795 Uncaught exception
Change-Id: I24f5abd0e0b28c11c22c7871e10f42abb9908775
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 72d2e98..88b9b17 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -68,7 +68,8 @@ public:
Reference<XInterface> SAL_CALL ModuleController_createInstance (
- const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
+ const Reference<XComponentContext>& rxContext)
+ throw (css::uno::Exception, std::exception)
{
return Reference<XInterface>(ModuleController::CreateInstance(rxContext), UNO_QUERY);
}
diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx
index d6be721..ba6ae29 100644
--- a/sd/source/ui/inc/facreg.hxx
+++ b/sd/source/ui/inc/facreg.hxx
@@ -76,7 +76,7 @@ css::uno::Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServic
css::uno::Reference<css::uno::XInterface> SAL_CALL ModuleController_createInstance(
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
- throw(css::uno::Exception);
+ throw(css::uno::Exception, std::exception);
OUString ModuleController_getImplementationName(void) throw (css::uno::RuntimeException);
css::uno::Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
throw (css::uno::RuntimeException);
commit d9e7a359ef8adeb1f79927a33d09a6f503e3d4de
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 14:32:04 2014 +0100
coverity#1219797 Uncaught exception
Change-Id: I597fb90d677e7cade71bf6cbf7f7bce9d3bd05f6
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 15fec13..cc1887d4 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -51,7 +51,7 @@ class ProgressBarWrapper : public UIElementWrapperBase
void end() throw (css::uno::RuntimeException, std::exception);
void setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception);
void setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception);
- void reset() throw (::com::sun::star::uno::RuntimeException);
+ void reset() throw (css::uno::RuntimeException, std::exception);
// UNO interfaces
// XComponent
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 2b2bfaa..011e244 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -237,7 +237,7 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
}
void ProgressBarWrapper::reset()
-throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
setText( OUString() );
setValue( 0 );
commit 495726247340b02792c956cf4a16140c34087bb2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 14:28:34 2014 +0100
coverity#1219799 Uncaught exception
Change-Id: Id1903def4869bccef18f8a1132521d4f24fed551
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 30deba7..2c02d4d 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1183,13 +1183,14 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
css::uno::Reference< css::container::XEnumeration > xSet = xLoaderFactory->createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
{
- // try everyone ...
- // Ignore any loader, which makes trouble :-)
- ::comphelper::SequenceAsHashMap lLoaderProps(xSet->nextElement());
- OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
- css::uno::Reference< css::uno::XInterface > xLoader;
try
{
+ // try everyone ...
+ // Ignore any loader, which makes trouble :-)
+ ::comphelper::SequenceAsHashMap lLoaderProps(xSet->nextElement());
+ OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
+ css::uno::Reference< css::uno::XInterface > xLoader;
+
xLoader = xLoaderFactory->createInstance(sLoader);
if (xLoader.is())
return xLoader;
commit f630705f09fc757f55459dae91530cb466bfa03b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 14:24:46 2014 +0100
callcatcher: update unusedcode
Change-Id: I73ff045699113778892db6a534433a70e0e9c8e1
diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx
index fcba12e..9c9a6ae 100644
--- a/include/svtools/svmedit2.hxx
+++ b/include/svtools/svmedit2.hxx
@@ -28,7 +28,6 @@ class SVT_DLLPUBLIC ExtMultiLineEdit : public MultiLineEdit
{
public:
ExtMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
- ExtMultiLineEdit( Window* pParent, const ResId& rResId );
virtual ~ExtMultiLineEdit();
// methods of TextView
diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx
index dfd42c1..bbe9cb4 100644
--- a/include/vcl/imgctrl.hxx
+++ b/include/vcl/imgctrl.hxx
@@ -36,7 +36,6 @@ private:
public:
ImageControl( Window* pParent, WinBits nStyle = 0 );
- ImageControl( Window* pParent, const ResId& rResId );
// set/get the scale mode. This is one of the css.awt.ImageScaleMode constants
void SetScaleMode( const ::sal_Int16 _nMode );
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index c2c2dff..a50a4a6 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -28,13 +28,6 @@ ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, WinBits nWinStyle ) :
{
}
-ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, const ResId& rResId ) :
-
- MultiLineEdit( pParent, rResId )
-
-{
-}
-
ExtMultiLineEdit::~ExtMultiLineEdit()
{
}
diff --git a/unusedcode.easy b/unusedcode.easy
index 8bfb2a0..b9bb988 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -181,10 +181,6 @@ basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon c
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-chart::opengl3D::OpenGL3DRenderer::GetTime()
-chart::opengl3D::OpenGL3DRenderer::RenderClickPos(Point)
-chart::opengl3D::OpenGL3DRenderer::RenderFPS(float)
-chart::opengl3D::OpenGL3DRenderer::RenderTexture(unsigned int)
chart::opengl3D::Text::getSize() const
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index e49af86..54b97f4 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -31,12 +31,6 @@ ImageControl::ImageControl( Window* pParent, WinBits nStyle )
{
}
-ImageControl::ImageControl( Window* pParent, const ResId& rResId )
- :FixedImage( pParent, rResId )
- ,mnScaleMode( ImageScaleMode::ANISOTROPIC )
-{
-}
-
void ImageControl::SetScaleMode( const ::sal_Int16 _nMode )
{
if ( _nMode != mnScaleMode )
commit cec90913e86ef8d4605eae6c0af428fcf9434207
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 1 14:22:35 2014 +0100
coverity#1219805 Uninitialized scalar field
Change-Id: I1b4343f06118b352df8ceac0404b9ffff39e8b67
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index f2ec238..334b740 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -34,6 +34,8 @@ GL3DBarChart::GL3DBarChart(
mpTextCache(new opengl3D::TextCache()),
mnStep(0),
mnStepsTotal(0),
+ mnMaxX(0),
+ mnMaxY(0),
mnCornerId(0),
mbBlockUserInput(false),
mbNeedsNewRender(true)
commit e2cb56e852de6e5d4d43e9d2cf205ee8ba449cbf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat May 31 18:36:22 2014 +0100
fix debug=2 build
Change-Id: I46b7bdfe4c467d52c9304ee880d74c7d88779b43
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 765234e..353565f 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -78,7 +78,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
return sal_False;
#ifdef DEBUG_IMPORT
- OUString sURL = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() );
+ OUString sURL = aMediaDesc.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
writerfilter::TagLogger::Pointer_t debugLogger
More information about the Libreoffice-commits
mailing list