[Libreoffice-commits] core.git: 6 commits - include/vcl sc/source svx/source vcl/source
Caolán McNamara
caolanm at redhat.com
Sun Jul 12 08:38:03 PDT 2015
include/vcl/printerinfomanager.hxx | 5 +++--
sc/source/ui/vba/vbarange.cxx | 4 ++--
sc/source/ui/vba/vbarange.hxx | 4 ++--
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 5 ++++-
vcl/source/control/combobox.cxx | 11 ++++++++++-
vcl/source/window/menufloatingwindow.cxx | 13 +++++++++----
6 files changed, 30 insertions(+), 12 deletions(-)
New commits:
commit d5bce6d1cd7ca09de283dc012bb777cc937f9c12
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 12 16:10:37 2015 +0100
coverity#1311654 Uninitialized scalar field
Change-Id: I48d9aebfba7bcd6d8ac00fcc2c76ec49216f4a0d
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 9249acb..5d97fd3 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -63,7 +63,16 @@ struct ComboBox::Impl
Link<> m_DoubleClickHdl;
boost::signals2::scoped_connection m_AutocompleteConnection;
- Impl(ComboBox & rThis) : m_rThis(rThis) {}
+ Impl(ComboBox & rThis)
+ : m_rThis(rThis)
+ , m_nDDHeight(0)
+ , m_cMultiSep(0)
+ , m_isDDAutoSize(false)
+ , m_isSyntheticModify(false)
+ , m_isMatchCase(false)
+ , m_nMaxWidthChars(0)
+ {
+ }
void ImplInitComboBoxData();
void ImplUpdateFloatSelection();
commit 1fb6688e8674c8a35e859d0ea37534777618f4d1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 12 16:08:16 2015 +0100
coverity#1311650 Dereference after null check
Change-Id: I06e9c28f49f4231a02a7f21940ea55ef41836b67
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 4dbd276..3fb24dd 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1111,11 +1111,16 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
sal_uInt16 nDuplicates = 0;
MenuItemData* pData = (nCharCode && pMenu) ?
pMenu->GetItemList()->SearchItem(nCharCode, rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem) : NULL;
+ bool bConsume = false;
bool accel = ImplGetSVData()->maNWFData.mbEnableAccel;
- Menu *men = pMenu;
- while (!men->IsMenuBar())
- men = men->pStartedFrom;
- if ( pData && (static_cast<MenuBarWindow*>(men->pWindow.get()))->GetMBWMenuKey () && accel )
+ if (pData && accel)
+ {
+ Menu *men = pMenu;
+ while (!men->IsMenuBar())
+ men = men->pStartedFrom;
+ bConsume = (static_cast<MenuBarWindow*>(men->pWindow.get()))->GetMBWMenuKey();
+ }
+ if (bConsume)
{
if ( pData->pSubMenu || nDuplicates > 1 )
{
commit fd14aa9dc2ce2b24392dbb510d302ec46a2fecbf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 12 15:58:07 2015 +0100
coverity#1311655 Uninitialized scalar field
Change-Id: I377bca31f33398754ff48e15ffa29d43fc584f3b
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index a027abc..45ca003 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -71,7 +71,10 @@ ShadowPropertyPanel::ShadowPropertyPanel(
maShadowXDistanceController(SID_ATTR_SHADOW_XDISTANCE, *pBindings, *this),
maShadowYDistanceController(SID_ATTR_SHADOW_YDISTANCE, *pBindings, *this),
mxFrame(rxFrame),
- mpBindings(pBindings)
+ mpBindings(pBindings),
+ nX(0),
+ nY(0),
+ nXY(0)
{
get(mpShowShadow,"SHOW_SHADOW");
get(mpFTAngle,"angle");
commit ca1a5ebf49d377d93c6c8c57a14d64460babf176
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 12 15:56:40 2015 +0100
coverity#1311653 Uninitialized scalar field
Change-Id: Ib1cc81ce30752a3794a009ee8cae826abdb9fc03
diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 52245c4..3f1debf 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -52,8 +52,9 @@ struct PrinterInfo : JobData
OUString m_aFeatures;
bool m_bPapersizeFromSetup;
- PrinterInfo() :
- JobData()
+ PrinterInfo()
+ : JobData()
+ , m_bPapersizeFromSetup(false)
{}
};
commit 2749d86cd951e784105c02b6cd07e1a439c1e56b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 12 15:54:42 2015 +0100
coverity#1311652 Uncaught exception
Change-Id: I7def0c77506a80360e40f5392eb4e3652702550c
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index bccd042..e136d0b 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2678,7 +2678,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::Ru
return Range( Cell1, Cell2, false );
}
uno::Reference< excel::XRange >
-ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException)
+ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException, std::exception)
{
uno::Reference< table::XCellRange > xCellRange = mxRange;
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index e8a181f..fcde9b1 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -228,7 +228,7 @@ public:
virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE ;
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException);
+ css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException, std::exception);
virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException);
virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
commit e9efd04ae5b63cdcfafc88d0e9f6a6193d6e1d5f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 12 15:53:44 2015 +0100
coverity#1311651 Uncaught exception
Change-Id: Id371de2657692f7382c9f124162ac15641600826
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index dc5b1f2..bccd042 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1362,7 +1362,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC
css::uno::Reference< excel::XRange >
ScVbaRange::getRangeObjectForName(
const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName,
- ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException )
+ ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException, std::exception )
{
table::CellRangeAddress refAddr;
return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv );
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 35faac7..e8a181f 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -141,7 +141,7 @@ public:
static css::uno::Reference< ov::excel::XRange > getRangeObjectForName(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const OUString& sRangeName, ScDocShell* pDocSh,
- formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( css::uno::RuntimeException );
+ formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( css::uno::RuntimeException, std::exception );
static css::uno::Reference< ov::excel::XRange > CellsHelper(
const css::uno::Reference< ov::XHelperInterface >& xParent,
More information about the Libreoffice-commits
mailing list