[Libreoffice-commits] core.git: 5 commits - cui/source sc/source vcl/source
Norbert Thiebaud
nthiebaud at gmail.com
Sat Oct 4 13:08:27 PDT 2014
cui/source/dialogs/thesdlg.cxx | 11 +++++------
sc/source/ui/condformat/colorformat.cxx | 2 +-
sc/source/ui/condformat/condformatdlgentry.cxx | 12 +++++++-----
vcl/source/window/window.cxx | 9 ++++++---
4 files changed, 19 insertions(+), 15 deletions(-)
New commits:
commit ced24ffba2fa1754c466b7944b0ee06d21292706
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 4 14:58:02 2014 -0500
coverity#1242365: Unchecked return value
Change-Id: Iddb8b1bad29bf372f9485514e2cde195237e3cc3
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 27beb71..8b52d5c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1292,8 +1292,11 @@ SalGraphics* Window::ImplGetFrameGraphics() const
}
else
{
- OutputDevice *pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
- pFrameWinOutDev->AcquireGraphics();
+ OutputDevice* pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
+ if ( ! pFrameWinOutDev->AcquireGraphics() )
+ {
+ return NULL;
+ }
}
mpWindowImpl->mpFrameWindow->mpGraphics->ResetClipRegion();
return mpWindowImpl->mpFrameWindow->mpGraphics;
commit 9ae4b6b996d6d1c4924be3a2c507f8c29fcbbb23
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 4 14:50:43 2014 -0500
coverity#1242366: Unchecked return value
Change-Id: I3f3b5b5a7ce5e387dc2acddc086d9f8a2fa2b12b
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d230bb5..27beb71 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1124,7 +1124,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
SetBackground( Wallpaper( rStyleSettings.GetWindowColor() ) );
}
- ImplUpdatePos();
+ (void)ImplUpdatePos();
// calculate app font res (except for the Intro Window or the default window)
if ( mpWindowImpl->mbFrame && !pSVData->maGDIData.mnAppFontX && ! (nStyle & (WB_INTROWIN|WB_DEFAULTWIN)) )
commit 873f0e07087f80dac2f4a09633ccc3be72640dfd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 4 14:47:03 2014 -0500
coverity#1242368: Unchecked return value
Change-Id: I6aaad60cf08349aee6c07621764a1a6c071ad2b6
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 5f92b61..ce1db4d 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -674,10 +674,6 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType,
void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const Edit& rValue, ScDocument* pDoc, const ScAddress& rPos, bool bDataBar )
{
- sal_uInt32 nIndex = 0;
- double nVal = 0;
- SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
- pNumberFormatter->IsNumberFormat(rValue.GetText(), nIndex, nVal);
// color scale does not have the automatic entry
sal_Int32 nPos = rType.GetSelectEntryPos();
@@ -694,7 +690,13 @@ void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const
case COLORSCALE_PERCENTILE:
case COLORSCALE_VALUE:
case COLORSCALE_PERCENT:
- pEntry->SetValue(nVal);
+ {
+ sal_uInt32 nIndex = 0;
+ double nVal = 0;
+ SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+ (void)pNumberFormatter->IsNumberFormat(rValue.GetText(), nIndex, nVal);
+ pEntry->SetValue(nVal);
+ }
break;
case COLORSCALE_FORMULA:
pEntry->SetFormula(rValue.GetText(), pDoc, rPos);
commit 35f66cb2f2fb4316e52fa579c3629071088b3f40
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 4 14:42:28 2014 -0500
coverity#1242369: Unchecked return value
Change-Id: Ib5a938d9a8a0ac1f2f5dfb299c948951bb845349
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index b3fa94e..4590ea3 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -39,7 +39,7 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* pEntry,
case COLORSCALE_PERCENTILE:
case COLORSCALE_VALUE:
case COLORSCALE_PERCENT:
- pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal );
+ (void)pNumberFormatter->IsNumberFormat( rEd.GetText(), nIndex, nVal );
pEntry->SetValue(nVal);
break;
case COLORSCALE_FORMULA:
commit 22ca3bf1b9dedec65a57ac70a124bf69cd242e0e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 4 14:36:24 2014 -0500
coverity#1242370: Unchecked return value
Change-Id: I11d80ddea4a38ce69ad7076af6da0bf173bd8551
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index a9d30d6..1a67ee8 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -476,13 +476,12 @@ SvxThesaurusDialog::SvxThesaurusDialog(
aLookUpHistory.push( rWord );
OUString aTmp( rWord );
- linguistic::RemoveHyphens( aTmp );
- linguistic::ReplaceControlChars( aTmp );
- OUString aTmp2( aTmp );
- m_pReplaceEdit->SetText( aTmp2 );
- m_pWordCB->InsertEntry( aTmp2 );
+ (void)linguistic::RemoveHyphens( aTmp );
+ (void)linguistic::ReplaceControlChars( aTmp );
+ m_pReplaceEdit->SetText( aTmp );
+ m_pWordCB->InsertEntry( aTmp );
- LookUp( aTmp2 );
+ LookUp( aTmp );
m_pAlternativesCT->GrabFocus();
m_pLeftBtn->Enable( false );
More information about the Libreoffice-commits
mailing list