From a9e18b9a9314656f516ac80a0ed7c8f029901bc0 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 16 Jan 2007 15:31:47 +0000 Subject: INTEGRATION: CWS ab33 (1.20.42); FILE MERGED 2007/01/10 16:34:46 ab 1.20.42.1: #i69280# Removed warnings --- basctl/source/basicide/bastype3.cxx | 8 +++++--- basctl/source/basicide/iderdll.cxx | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'basctl/source') diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index a59342fd8040..3830b692b1ea 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bastype3.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:27:33 $ + * last change: $Author: vg $ $Date: 2007-01-16 16:31:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,7 +60,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 ); +SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 ) SV_IMPL_VARARR( EntryArray, SvLBoxEntry*); @@ -411,6 +411,7 @@ USHORT BasicTreeListBox::ConvertType( BasicEntryType eType ) nType = BASICIDE_TYPE_METHOD; } break; + default: ; } return nType; @@ -457,6 +458,7 @@ bool BasicTreeListBox::IsValidEntry( SvLBoxEntry* pEntry ) bIsValid = BasicIDE::HasMethod( pShell, aLibName, aName, aMethodName ); } break; + default: ; } return bIsValid; diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 9f96922f4516..ded5e96cb6a0 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -4,9 +4,9 @@ * * $RCSfile: iderdll.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:28:27 $ + * last change: $Author: vg $ $Date: 2007-01-16 16:31:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -114,6 +114,7 @@ void BasicIDEDLL::Init() return; SfxObjectFactory* pFact = &BasicDocShell::Factory(); + (void)pFact; ByteString aResMgrName( "basctl" ); aResMgrName += ByteString::CreateFromInt32( SOLARUPD ); @@ -252,7 +253,6 @@ IMPL_LINK( BasicIDEData, ExecuteMacroEvent, void *, pData ) SbMethod* pMethod = (SbMethod*)pData; // Ist es eine StarScript-Methode? Am Parent erkennen - SbModule* pModule = pMethod->GetModule(); DBG_ASSERT( pMethod->GetParent()->GetFlags() & SBX_EXTSEARCH, "Kein EXTSEARCH!" ); BasicIDE::RunMethod( pMethod ); pMethod->ReleaseRef(); // muss vorher inkrementiert worden sein! -- cgit