connectivity/source/drivers/mysqlc/mysqlc_connection.hxx | 6 ++++++
vcl/source/graphic/UnoGraphicProvider.cxx | 5 +++--
vcl/win/app/salinst.cxx | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 6e15a3e2e45c21d947d36f47bfcb66d9f02b8c63
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 20 20:19:33 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 21 20:12:15 2018 +0200
pvs-studio: A part of conditional expression is always true: !pIStm
Change-Id: I32af1d0041cebdb195e6433a0b44fa6ea271275c
Reviewed-on: https://gerrit.libreoffice.org/62105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx
b/vcl/source/graphic/UnoGraphicProvider.cxx
index ef0fd14c0149..09e911c7bc3a 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -297,7 +297,6 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL
GraphicProvider::queryGraphic( co
{
uno::Reference< ::graphic::XGraphic > xRet;
OUString aPath;
- std::unique_ptr<SvStream> pIStm;
uno::Reference< io::XInputStream > xIStm;
uno::Reference< awt::XBitmap >xBtm;
@@ -307,7 +306,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL
GraphicProvider::queryGraphic( co
bool bLazyRead = false;
bool bLoadAsLink = false;
- for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !pIStm &&
!xRet.is(); ++i )
+ for (sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !xRet.is();
++i)
{
const OUString aName( rMediaProperties[ i ].Name );
const uno::Any aValue( rMediaProperties[ i ].Value );
@@ -365,6 +364,8 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL
GraphicProvider::queryGraphic( co
SolarMutexGuard g;
+ std::unique_ptr<SvStream> pIStm;
+
if( xIStm.is() )
{
pIStm = ::utl::UcbStreamHelper::CreateStream( xIStm );
commit f222cec758f62537b96d7681671f60212cc62a89
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 20 19:37:58 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 21 20:12:03 2018 +0200
pvs-studio: Not all members of a class are initialized inside the
constructor
Change-Id: I914c715c96a6701995212fdb76615a19c984a128
Reviewed-on: https://gerrit.libreoffice.org/62113
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
index 6c8632c29492..ed96d5e42290 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
@@ -65,12 +65,18 @@ typedef css::uno::Reference<css::container::XNameAccess>
my_XNameAccessRef;
typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection,
css::sdbc::XWarningsSupplier,
css::lang::XServiceInfo>
OMetaConnection_BASE;
+
struct ConnectionSettings
{
rtl_TextEncoding encoding;
rtl::OUString schema;
rtl::OUString connectionURL;
bool readOnly;
+ ConnectionSettings()
+ : encoding(RTL_TEXTENCODING_DONTKNOW)
+ , readOnly(false)
+ {
+ }
};
class MysqlCDriver;
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index d5fca66f6bd2..7011f8b2404b 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -388,6 +388,7 @@ VCLPLUG_WIN_PUBLIC SalInstance* create_SalInstance()
WinSalInstance::WinSalInstance()
: SalInstance(o3tl::make_unique<SalYieldMutex>())
+ , mhInst( nullptr )
, mhComWnd( nullptr )
, m_nNoYieldLock( 0 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
