[Libreoffice-commits] core.git: 2 commits - vcl/unx xmlscript/source xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Wed May 20 12:41:19 PDT 2015
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 8 ++++----
xmlscript/source/xml_helper/xml_byteseq.cxx | 4 ++--
xmlscript/source/xmldlg_imexp/exp_share.hxx | 6 +++---
xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 5 +++--
xmlscript/source/xmlmod_imexp/imp_share.hxx | 2 +-
xmlsecurity/source/component/certificatecontainer.hxx | 4 ++--
xmlsecurity/source/component/documentdigitalsignatures.hxx | 2 +-
xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +-
xmlsecurity/source/framework/encryptionengine.hxx | 2 +-
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2 +-
10 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit b04c9cac994e39d28f5f715f560e97edcca0e666
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 20 20:39:09 2015 +0100
gtk3: fix borders
Change-Id: I7ea1198d08333d0ce95c2e6b5d7dcf8928a11838
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 8ed73fe..b59ccde 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1375,10 +1375,10 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
int y2 = aEditRect.Bottom();
rNativeBoundingRegion = aEditRect;
- rNativeContentRegion = Rectangle(x1 + padding.left + border.left,
- y1 + padding.top + border.top,
- x2 - padding.right + border.right,
- y2 - padding.bottom + border.bottom);
+ rNativeContentRegion = Rectangle(x1 + (padding.left + border.left),
+ y1 + (padding.top + border.top),
+ x2 - (padding.right + border.right),
+ y2 - (padding.bottom + border.bottom));
gtk_style_context_restore(mpFrameInStyle);
return true;
commit dcee23b7f8004c47cbab320e1a07bf518a385fce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 20 15:59:12 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: Idcf5460ec59cfb6f13055652c094d460c15da5ed
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 9e88ff9..6fc7c40 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -38,7 +38,7 @@ class BSeqInputStream
sal_Int32 _nPos;
public:
- inline BSeqInputStream( ByteSequence const & rSeq )
+ explicit BSeqInputStream( ByteSequence const & rSeq )
: _seq( rSeq )
, _nPos( 0 )
{}
@@ -103,7 +103,7 @@ class BSeqOutputStream
ByteSequence * _seq;
public:
- inline BSeqOutputStream( ByteSequence * seq )
+ explicit BSeqOutputStream( ByteSequence * seq )
: _seq( seq )
{}
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index c67853c..8dc886c 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -56,7 +56,7 @@ struct Style
OUString _id;
- Style( short all_ )
+ explicit Style( short all_ )
: _backgroundColor(0)
, _textColor(0)
, _textLineColor(0)
@@ -94,7 +94,7 @@ class ElementDescriptor
css::uno::Reference< css::frame::XModel > _xDocument;
public:
- inline ElementDescriptor(
+ ElementDescriptor(
css::uno::Reference< css::beans::XPropertySet > const & xProps,
css::uno::Reference< css::beans::XPropertyState > const & xPropState,
OUString const & name, css::uno::Reference< css::frame::XModel > const & xDocument )
@@ -103,7 +103,7 @@ public:
, _xPropState( xPropState )
, _xDocument( xDocument )
{}
- inline ElementDescriptor(
+ explicit ElementDescriptor(
OUString const & name )
: XMLElement( name )
{}
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index 6e770e8..bc4ff47 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -41,9 +41,10 @@ class InputStreamProvider
ByteSequence _bytes;
public:
- inline InputStreamProvider( ByteSequence const & rBytes )
+ explicit InputStreamProvider( ByteSequence const & rBytes )
: _bytes( rBytes )
- {}
+ {
+ }
// XInputStreamProvider
virtual Reference< io::XInputStream > SAL_CALL createInputStream()
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index 9ea39c1..ddcbea3 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -53,7 +53,7 @@ struct ModuleImport
sal_Int32 XMLNS_XLINK_UID;
public:
- ModuleImport(ModuleDescriptor& rModuleDesc)
+ explicit ModuleImport(ModuleDescriptor& rModuleDesc)
: mrModuleDesc(rModuleDesc)
, XMLNS_SCRIPT_UID(0)
, XMLNS_LIBRARY_UID(0)
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index 9d5b216..3dcbaa1 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -45,8 +45,8 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XService
public:
- CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {};
- virtual ~CertificateContainer(){};
+ explicit CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {}
+ virtual ~CertificateContainer() {}
virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index ab674f3..2c72474 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -57,7 +57,7 @@ private:
com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplVerifySignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (::com::sun::star::uno::RuntimeException);
public:
- DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx );
+ explicit DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx );
// for service registration...
static OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 1142b1d..b607fa3 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -359,7 +359,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB()
class TrustCertLB : public SvSimpleTable
{
public:
- TrustCertLB(SvSimpleTableContainer &rContainer)
+ explicit TrustCertLB(SvSimpleTableContainer &rContainer)
: SvSimpleTable(rContainer, 0)
{
}
diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx
index 020d1c8..e8cdda4 100644
--- a/xmlsecurity/source/framework/encryptionengine.hxx
+++ b/xmlsecurity/source/framework/encryptionengine.hxx
@@ -72,7 +72,7 @@ protected:
sal_Int32 m_nIdOfBlocker;
protected:
- EncryptionEngine( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext );
+ explicit EncryptionEngine( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext );
virtual ~EncryptionEngine(){};
virtual void tryToPerform( )
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 793f709..b610a0f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -84,7 +84,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3<
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
public :
- SecurityEnvironment_MSCryptImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ;
+ explicit SecurityEnvironment_MSCryptImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ;
virtual ~SecurityEnvironment_MSCryptImpl() ;
//Methods from XSecurityEnvironment
More information about the Libreoffice-commits
mailing list