[Libreoffice-commits] core.git: 9 commits - configmgr/source include/tools sc/source sfx2/source starmath/source tools/source vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Oct 2 01:15:18 PDT 2014
configmgr/source/parsemanager.cxx | 2 -
include/tools/globname.hxx | 8 +++++-
sc/source/ui/pagedlg/tptable.cxx | 4 +--
sc/source/ui/view/tabview3.cxx | 4 +--
sfx2/source/appl/app.cxx | 24 ++++++--------------
sfx2/source/appl/newhelp.cxx | 2 -
starmath/source/view.cxx | 2 -
tools/source/ref/globname.cxx | 45 ++++++++++++++++++++------------------
vcl/source/control/tabctrl.cxx | 5 ++--
vcl/source/window/builder.cxx | 2 -
10 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 2267dbba29a261c2cff7e86215d3eab10b637b3d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 21:21:16 2014 +0100
coverity#1242421 Dereference after null check
Change-Id: Iaeac53bd0a9c70cd8445e336400d51bf90b69fed
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0a1eabf..f7ab58f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1746,7 +1746,7 @@ vcl::Window *VclBuilder::insertObject(vcl::Window *pParent, const OString &rClas
//toplevels default to resizable and apparently you can't change them
//afterwards, so we need to wait until now before we can truly
//initialize the dialog.
- if (pParent->IsSystemWindow())
+ if (pParent && pParent->IsSystemWindow())
{
SystemWindow *pSysWin = static_cast<SystemWindow*>(pCurrentChild);
pSysWin->doDeferredInit(extractDeferredBits(rProps));
commit 17dded391d0e3e9045b80095c51cb43a43319857
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 21:19:12 2014 +0100
coverity#1242420 Dereference after null check
Change-Id: I3ccfcc618b936cab520926adb3a3ff770d000aed
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index f0aa4db..446f072 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -123,7 +123,7 @@ void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
if( IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL) )
EnableChildTransparentMode( true );
- if ( pParent->IsDialog() )
+ if (pParent && pParent->IsDialog())
pParent->AddChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) );
}
@@ -192,7 +192,8 @@ TabControl::TabControl( vcl::Window* pParent, WinBits nStyle ) :
TabControl::~TabControl()
{
- if ( GetParent()->IsDialog() )
+ Window *pParent = GetParent();
+ if (pParent && pParent->IsDialog())
GetParent()->RemoveChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) );
ImplFreeLayoutData();
commit 15174068034af1bd04a394a067350f9aeb6f4d90
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 21:13:58 2014 +0100
coverity#1242417 Logically dead code
this looked a little less odd before
commit 6dda3d45c902d64323a085ea1604a993521f313d
Date: Wed Apr 23 11:08:48 2014 +0200
sc: sal_Bool->bool
so simplifying it now
Change-Id: Ibadfc140581f186ba4c98874b740a18d19b77970
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 6779366..9382f9a 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -269,8 +269,8 @@ bool ScTablePage::FillItemSet( SfxItemSet* rCoreSet )
bool bUseValue = m_pBtnPageNo->IsChecked();
if ( WAS_DEFAULT(nWhichPageNo,rOldSet)
- && ( (!bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue())
- || ( bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue()
+ && ( (!bUseValue && 0 == m_pBtnPageNo->GetSavedValue())
+ || ( bUseValue && 1 == m_pBtnPageNo->GetSavedValue()
&& ! m_pEdPageNo->IsValueChangedFromSaved() ) ) )
{
rCoreSet->ClearItem( nWhichPageNo );
commit c15ae864977a1be8ff225a8cca97ee584b22bfd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 21:08:39 2014 +0100
coverity#982429 Division or modulo by zero
Change-Id: I0c75bb8729b359390fb4026496c085f2056230ba
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 66555ec..4ee115d 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2753,7 +2753,7 @@ void SfxHelpWindow_Impl::LoadConfig()
nExpandWidth = nWidth;
nCollapseWidth = nExpandWidth * nTextSize / 100;
}
- else
+ else if (nTextSize != 0)
{
nCollapseWidth = nWidth;
nExpandWidth = nCollapseWidth * 100 / nTextSize;
commit f63e2ac112a1a94392f7d4a8922e40f9fd951daf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 21:06:32 2014 +0100
coverity#735819 Unchecked dynamic_cast
Change-Id: I4e8834a2cdc979757ae6d37730a89fc20bcc6b26
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index ba35eb8..028a5ff 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1742,9 +1742,9 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
sal_uInt16 nCurRefDlgId=pScMod->GetCurRefDlgId();
SfxViewFrame* pViewFrm = aViewData.GetViewShell()->GetViewFrame();
SfxChildWindow* pChildWnd = pViewFrm->GetChildWindow( nCurRefDlgId );
- if ( pChildWnd )
+ IAnyRefDialog* pRefDlg = pChildWnd ? dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow()) : NULL;
+ if (pRefDlg)
{
- IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
pRefDlg->ViewShellChanged();
}
}
commit 5c7e5d28019406a9e72c58050a85ff51529f8341
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 21:00:56 2014 +0100
coverity#735498 Logically dead code
Change-Id: Ia2a6df4aef944d81be41593ed001156d3f1ea054
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index b66e733..edf81ea 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -478,7 +478,7 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt)
case KEY_DELETE:
{
if(!rCursor.HasSelection()){
- rCursor.Move(this, nCode == KEY_DELETE ? MoveRight : MoveLeft, false);
+ rCursor.Move(this, MoveRight, false);
if(rCursor.HasComplexSelection()) break;
}
rCursor.Delete();
commit fa16d060236346beb80ecb3596186ae9df469432
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 20:57:33 2014 +0100
coverity#705707 Resource leak
and
coverity#705706 Resource leak
Change-Id: Ia18954acb430464c94c5dd608abf9d6e8214058a
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 0516b0b..78054f4 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -487,16 +487,12 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
#else
#ifndef DISABLE_DYNLOADING
- // get basctl dllname
- static OUString aLibName( SVLIBRARY( "basctl" ) );
-
- // load module
- oslModule handleMod = osl_loadModuleRelative(
- &thisModule, aLibName.pData, 0 );
+ // load basctl module
+ osl::Module aMod;
+ aMod.loadRelative(&thisModule, SVLIBRARY("basctl"), 0);
// get symbol
- OUString aSymbol( "basicide_handle_basic_error" );
- basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData );
+ basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) aMod.getFunctionSymbol("basicide_handle_basic_error");
// call basicide_handle_basic_error in basctl
long nRet = pSymbol ? pSymbol( pStarBasic ) : 0;
@@ -587,16 +583,12 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId )
#else
#ifndef DISABLE_DYNLOADING
- // get basctl dllname
- static OUString aLibName( SVLIBRARY( "basctl" ) );
-
- // load module
- oslModule handleMod = osl_loadModuleRelative(
- &thisModule, aLibName.pData, 0 );
+ // load basctl module
+ osl::Module aMod;
+ aMod.loadRelative(&thisModule, SVLIBRARY("basctl"), 0);
// get symbol
- OUString aSymbol( "basicide_macro_organizer" );
- basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData );
+ basicide_macro_organizer pSymbol = (basicide_macro_organizer) aMod.getFunctionSymbol("basicide_macro_organizer");
SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!");
if (!pSymbol)
commit a24ef8484090f4f5304caa4a508c6bc9689bcbb8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 20:49:19 2014 +0100
coverity#707682 Uninitialized scalar field
Change-Id: I1230c42c76aee4e9a2a149a27ef11e163753865a
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index 8768fcb..fcbb190 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,7 +35,7 @@ namespace configmgr {
ParseManager::ParseManager(
OUString const & url, rtl::Reference< Parser > const & parser)
- : reader_(url), parser_(parser)
+ : reader_(url), parser_(parser), itemNamespaceId_(-1)
{
assert(parser.is());
int id;
commit 173234f394105756b3530f789fb68dec53689a93
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 1 20:47:48 2014 +0100
coverity#708208 Uninitialized scalar field
Change-Id: I5f1e889746067bad478d8fa3acd8c41c893b135a
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 4defc52..6796c3b 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -39,10 +39,14 @@ struct ImpSvGlobalName
enum Empty { EMPTY };
- ImpSvGlobalName()
+ ImpSvGlobalName(const SvGUID &rData)
+ : szData(rData)
+ , nRefCount(0)
{
- nRefCount = 0;
}
+ ImpSvGlobalName(sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
+ sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
+ sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15);
ImpSvGlobalName( const ImpSvGlobalName & rObj );
ImpSvGlobalName( Empty );
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index aaa8b3f..5bb60de 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -27,26 +27,42 @@
#include <tools/globname.hxx>
// ImpSvGlobalName ------------------------------------------------------------
-
ImpSvGlobalName::ImpSvGlobalName( const ImpSvGlobalName & rObj )
+ : szData(rObj.szData)
+ , nRefCount(0)
{
- nRefCount = 0;
- szData = rObj.szData;
}
ImpSvGlobalName::ImpSvGlobalName( Empty )
+ : nRefCount(1)
{
- nRefCount = 1;
memset( &szData, 0, sizeof( szData ) );
}
+ImpSvGlobalName::ImpSvGlobalName(sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
+ sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
+ sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15)
+ : nRefCount(0)
+{
+ szData.Data1 = n1;
+ szData.Data2 = n2;
+ szData.Data3 = n3;
+ szData.Data4[0] = b8;
+ szData.Data4[1] = b9;
+ szData.Data4[2] = b10;
+ szData.Data4[3] = b11;
+ szData.Data4[4] = b12;
+ szData.Data4[5] = b13;
+ szData.Data4[6] = b14;
+ szData.Data4[7] = b15;
+}
+
bool ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const
{
return !memcmp( &szData, &rObj.szData, sizeof( szData ) );
}
// SvGlobalName ----------------------------------------------------------------
-
SvGlobalName::SvGlobalName()
{
static ImpSvGlobalName aNoName( ImpSvGlobalName::EMPTY );
@@ -57,28 +73,16 @@ SvGlobalName::SvGlobalName()
SvGlobalName::SvGlobalName( const SvGUID & rId )
{
- pImp = new ImpSvGlobalName();
+ pImp = new ImpSvGlobalName(rId);
pImp->nRefCount++;
- pImp->szData = rId;
}
SvGlobalName::SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
{
- pImp = new ImpSvGlobalName();
+ pImp = new ImpSvGlobalName(n1, n2, n3, b8, b9, b10, b11, b12, b13, b14, b15);
pImp->nRefCount++;
- pImp->szData.Data1 = n1;
- pImp->szData.Data2 = n2;
- pImp->szData.Data3 = n3;
- pImp->szData.Data4[0] = b8;
- pImp->szData.Data4[1] = b9;
- pImp->szData.Data4[2] = b10;
- pImp->szData.Data4[3] = b11;
- pImp->szData.Data4[4] = b12;
- pImp->szData.Data4[5] = b13;
- pImp->szData.Data4[6] = b14;
- pImp->szData.Data4[7] = b15;
}
SvGlobalName::~SvGlobalName()
@@ -315,9 +319,8 @@ SvGlobalName::SvGlobalName( const com::sun::star::uno::Sequence < sal_Int8 >& aS
aResult.Data4[nInd] = ( sal_uInt8 )aSeq[nInd+8];
}
- pImp = new ImpSvGlobalName();
+ pImp = new ImpSvGlobalName(aResult);
pImp->nRefCount++;
- pImp->szData = aResult;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list