summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /basic
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'basic')
-rw-r--r--basic/inc/sbobjmod.hxx2
-rw-r--r--basic/inc/sbprop.hxx2
-rw-r--r--basic/qa/cppunit/basic_coverage.cxx6
-rw-r--r--basic/source/basmgr/basmgr.cxx4
-rw-r--r--basic/source/classes/propacc.cxx6
-rw-r--r--basic/source/classes/sb.cxx18
-rw-r--r--basic/source/classes/sbunoobj.cxx32
-rw-r--r--basic/source/classes/sbxmod.cxx16
-rw-r--r--basic/source/comp/parser.cxx2
-rw-r--r--basic/source/comp/sbcomp.cxx8
-rw-r--r--basic/source/comp/token.cxx2
-rw-r--r--basic/source/inc/codegen.hxx4
-rw-r--r--basic/source/inc/dlgcont.hxx12
-rw-r--r--basic/source/inc/errobject.hxx2
-rw-r--r--basic/source/inc/expr.hxx2
-rw-r--r--basic/source/inc/namecont.hxx16
-rw-r--r--basic/source/inc/parser.hxx2
-rw-r--r--basic/source/inc/propacc.hxx8
-rw-r--r--basic/source/inc/runtime.hxx20
-rw-r--r--basic/source/inc/sbintern.hxx8
-rw-r--r--basic/source/inc/sbtrace.hxx4
-rw-r--r--basic/source/inc/sbunoobj.hxx44
-rw-r--r--basic/source/inc/scanner.hxx4
-rw-r--r--basic/source/inc/scriptcont.hxx8
-rw-r--r--basic/source/inc/symtbl.hxx4
-rw-r--r--basic/source/inc/token.hxx2
-rw-r--r--basic/source/runtime/iosys.cxx6
-rw-r--r--basic/source/runtime/methods.cxx8
-rw-r--r--basic/source/runtime/methods1.cxx2
-rw-r--r--basic/source/runtime/runtime.cxx2
-rw-r--r--basic/source/sbx/sbxdec.cxx10
-rw-r--r--basic/source/sbx/sbxdec.hxx8
-rw-r--r--basic/source/sbx/sbxscan.cxx2
-rw-r--r--basic/source/sbx/sbxvar.cxx8
-rw-r--r--basic/source/uno/dlgcont.cxx8
-rw-r--r--basic/source/uno/namecont.cxx6
-rw-r--r--basic/source/uno/scriptcont.cxx10
37 files changed, 154 insertions, 154 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 0f586a9e3a66..cd673bfd71bd 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -78,7 +78,7 @@ public:
void triggerLayoutEvent();
void triggerResizeEvent();
- bool getInitState( void )
+ bool getInitState()
{ return mbInit; }
void setInitState( bool bInit )
{ mbInit = bInit; }
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx
index 20126eaaa25b..83347e5622aa 100644
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -56,7 +56,7 @@ public:
{}
TYPEINFO_OVERRIDE();
- bool isSet( void )
+ bool isSet()
{ return mbSet; }
void setSet( bool bSet )
{ mbSet = bSet; }
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index 7e8fd225239d..1c4cb3a8ef52 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -26,8 +26,8 @@ private:
OUString m_sCurrentTest;
void process_directory(const OUString& sDirName);
void run_test(const OUString& sFileName);
- void test_failed(void);
- void test_success(void);
+ void test_failed();
+ void test_success();
StringVec get_subdirnames( const OUString& sDirName );
public:
@@ -136,7 +136,7 @@ void Coverage::process_directory(const OUString& sDirName)
fprintf(stderr,"end process directory\n");
}
-void Coverage::Coverage_Iterator(void)
+void Coverage::Coverage_Iterator()
{
OUString sDirName = getURLFromSrc("/basic/qa/basic_coverage/");
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 795b97207ef4..070ece1b4ede 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -116,7 +116,7 @@ struct BasicManagerImpl
boost::ptr_vector<BasicLibInfo> aLibs;
OUString aBasicLibPath;
- BasicManagerImpl( void )
+ BasicManagerImpl()
: mpManagerStream( NULL )
, mppLibStreams( NULL )
, mnLibStreamCount( 0 )
@@ -429,7 +429,7 @@ public:
static BasicLibInfo* Create( SotStorageStream& rSStream );
- uno::Reference< script::XLibraryContainer > GetLibraryContainer( void )
+ uno::Reference< script::XLibraryContainer > GetLibraryContainer()
{ return mxScriptCont; }
void SetLibraryContainer( const uno::Reference< script::XLibraryContainer >& xScriptCont )
{ mxScriptCont = xScriptCont; }
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 281ee8d3b906..20b1fda7ac6c 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -62,7 +62,7 @@ SbPropertyValues::~SbPropertyValues()
-Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() throw( RuntimeException, std::exception )
{
// create on demand?
if (!m_xInfo.is())
@@ -159,7 +159,7 @@ void SbPropertyValues::removeVetoableChangeListener(
-Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception)
+Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
Sequence<PropertyValue> aRet( m_aPropVals.size() );
for (size_t n = 0; n < m_aPropVals.size(); ++n)
@@ -244,7 +244,7 @@ SbPropertySetInfo::~SbPropertySetInfo()
-Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException, std::exception )
+Sequence< Property > SbPropertySetInfo::getProperties() throw( RuntimeException, std::exception )
{
return aImpl.getProperties();
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 08fc825797ce..c78880ef32ea 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -802,7 +802,7 @@ SbxVariable* SbClassModuleObject::Find( const OUString& rName, SbxClassType t )
return pRes;
}
-void SbClassModuleObject::triggerInitializeEvent( void )
+void SbClassModuleObject::triggerInitializeEvent()
{
if( mbInitializeEventDone )
{
@@ -820,7 +820,7 @@ void SbClassModuleObject::triggerInitializeEvent( void )
}
}
-void SbClassModuleObject::triggerTerminateEvent( void )
+void SbClassModuleObject::triggerTerminateEvent()
{
if( !mbInitializeEventDone || GetSbData()->bRunInit )
{
@@ -836,18 +836,18 @@ void SbClassModuleObject::triggerTerminateEvent( void )
}
-SbClassData::SbClassData( void )
+SbClassData::SbClassData()
{
mxIfaces = new SbxArray();
}
-void SbClassData::clear( void )
+void SbClassData::clear()
{
mxIfaces->Clear();
maRequiredTypes.clear();
}
-SbClassFactory::SbClassFactory( void )
+SbClassFactory::SbClassFactory()
{
OUString aDummyName;
xClassModules = new SbxObject( aDummyName );
@@ -1164,7 +1164,7 @@ struct ClassModuleRunInitItem
bool m_bProcessing;
bool m_bRunInitDone;
- ClassModuleRunInitItem( void )
+ ClassModuleRunInitItem()
: m_pModule( NULL )
, m_bProcessing( false )
, m_bRunInitDone( false )
@@ -1286,7 +1286,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
// #88329 Put modules back to not initialised state to
// force reinitialisation at next start
-void StarBASIC::DeInitAllModules( void )
+void StarBASIC::DeInitAllModules()
{
// Deinit own modules
for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
@@ -1637,7 +1637,7 @@ struct BasicStringList_Impl : private Resource
~BasicStringList_Impl() { FreeResource(); }
OUString GetString(){ return aResId.toString(); }
- bool IsErrorTextAvailable( void )
+ bool IsErrorTextAvailable()
{ return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
};
@@ -1853,7 +1853,7 @@ void StarBASIC::SetGlobalBreakHdl( const Link& rLink )
GetSbData()->aBreakHdl = rLink;
}
-SbxArrayRef StarBASIC::getUnoListeners( void )
+SbxArrayRef StarBASIC::getUnoListeners()
{
if( !xUnoListeners.Is() )
{
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 9c39792d25d1..e49e63822719 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -169,14 +169,14 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj )
}
// save CoreReflection statically
-Reference< XIdlReflection > getCoreReflection_Impl( void )
+Reference< XIdlReflection > getCoreReflection_Impl()
{
return css::reflection::theCoreReflection::get(
comphelper::getProcessComponentContext());
}
// save CoreReflection statically
-Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Impl( void )
+Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Impl()
{
static Reference< XHierarchicalNameAccess > xCoreReflection_HierarchicalNameAccess;
@@ -193,7 +193,7 @@ Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Im
}
// Hold TypeProvider statically
-Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void )
+Reference< XHierarchicalNameAccess > getTypeProvider_Impl()
{
static Reference< XHierarchicalNameAccess > xAccess;
@@ -219,7 +219,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void )
}
// Hold TypeConverter statically
-Reference< XTypeConverter > getTypeConverter_Impl( void )
+Reference< XTypeConverter > getTypeConverter_Impl()
{
static Reference< XTypeConverter > xTypeConverter;
@@ -465,7 +465,7 @@ struct ObjectItem
typedef std::vector< ObjectItem > NativeObjectWrapperVector;
class GaNativeObjectWrapperVector : public rtl::Static<NativeObjectWrapperVector, GaNativeObjectWrapperVector> {};
-void clearNativeObjectWrapperVector( void )
+void clearNativeObjectWrapperVector()
{
GaNativeObjectWrapperVector::get().clear();
}
@@ -2426,7 +2426,7 @@ SbUnoObject::~SbUnoObject()
// pass the introspection on Demand
-void SbUnoObject::doIntrospection( void )
+void SbUnoObject::doIntrospection()
{
if( !bNeedIntrospection )
return;
@@ -2523,7 +2523,7 @@ void clearUnoMethodsForBasic( StarBASIC* pBasic )
}
}
-void clearUnoMethods( void )
+void clearUnoMethods()
{
SbUnoMethod* pMeth = pFirst;
while( pMeth )
@@ -2596,7 +2596,7 @@ SbxInfo* SbUnoMethod::GetInfo()
return pInfo;
}
-const Sequence<ParamInfo>& SbUnoMethod::getParamInfos( void )
+const Sequence<ParamInfo>& SbUnoMethod::getParamInfos()
{
if (!pParamInfoSeq)
{
@@ -2800,7 +2800,7 @@ SbxVariable* SbUnoObject::Find( const OUString& rName, SbxClassType t )
// help method to create the dbg_-Properties
-void SbUnoObject::implCreateDbgProperties( void )
+void SbUnoObject::implCreateDbgProperties()
{
Property aProp;
@@ -2817,7 +2817,7 @@ void SbUnoObject::implCreateDbgProperties( void )
QuickInsert( (SbxVariable*)xVarRef );
}
-void SbUnoObject::implCreateAll( void )
+void SbUnoObject::implCreateAll()
{
// throw away all existing methods and properties
pMethods = new SbxArray;
@@ -2882,7 +2882,7 @@ void SbUnoObject::implCreateAll( void )
// output the value
-Any SbUnoObject::getUnoAny( void )
+Any SbUnoObject::getUnoAny()
{
Any aRetAny;
if( bNeedIntrospection ) doIntrospection();
@@ -3770,7 +3770,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
static SbUnoServiceCtor* pFirstCtor = NULL;
-void clearUnoServiceCtors( void )
+void clearUnoServiceCtors()
{
SbUnoServiceCtor* pCtor = pFirstCtor;
while( pCtor )
@@ -4006,7 +4006,7 @@ public:
const Reference< XAllListener >& AllListener, const Any& Helper );
// XInvocation
- virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) SAL_OVERRIDE;
virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
@@ -4057,7 +4057,7 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper
}
-Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void)
+Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection()
throw( RuntimeException, std::exception )
{
return Reference< XIntrospectionAccess >();
@@ -4899,7 +4899,7 @@ SbxVariable* SbUnoStructRefObject::Find( const OUString& rName, SbxClassType t )
}
// help method to create the dbg_-Properties
-void SbUnoStructRefObject::implCreateDbgProperties( void )
+void SbUnoStructRefObject::implCreateDbgProperties()
{
Property aProp;
@@ -4944,7 +4944,7 @@ void SbUnoStructRefObject::implCreateAll()
}
// output the value
-Any SbUnoStructRefObject::getUnoAny( void )
+Any SbUnoStructRefObject::getUnoAny()
{
return maMemberInfo.getValue();
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 36c852042847..4aeb38e700cb 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1416,7 +1416,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
}
}
-void StarBASIC::ClearAllModuleVars( void )
+void StarBASIC::ClearAllModuleVars()
{
// Initialise the own module
for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
@@ -1470,7 +1470,7 @@ void SbModule::GlobalRunInit( bool bBasicStart )
}
}
-void SbModule::GlobalRunDeInit( void )
+void SbModule::GlobalRunDeInit()
{
StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent());
if( pBasic )
@@ -2519,20 +2519,20 @@ void SbUserFormModule::triggerMethod( const OUString& aMethodToRun, Sequence< An
}
}
-void SbUserFormModule::triggerActivateEvent( void )
+void SbUserFormModule::triggerActivateEvent()
{
SAL_INFO("basic", "**** entering SbUserFormModule::triggerActivate");
triggerMethod( "UserForm_Activate" );
SAL_INFO("basic", "**** leaving SbUserFormModule::triggerActivate");
}
-void SbUserFormModule::triggerDeactivateEvent( void )
+void SbUserFormModule::triggerDeactivateEvent()
{
SAL_INFO("basic", "**** SbUserFormModule::triggerDeactivate");
triggerMethod( "Userform_Deactivate" );
}
-void SbUserFormModule::triggerInitializeEvent( void )
+void SbUserFormModule::triggerInitializeEvent()
{
if ( mbInit )
return;
@@ -2541,19 +2541,19 @@ void SbUserFormModule::triggerInitializeEvent( void )
mbInit = true;
}
-void SbUserFormModule::triggerTerminateEvent( void )
+void SbUserFormModule::triggerTerminateEvent()
{
SAL_INFO("basic", "**** SbUserFormModule::triggerTerminateEvent");
triggerMethod(OUString( "Userform_Terminate" ));
mbInit=false;
}
-void SbUserFormModule::triggerLayoutEvent( void )
+void SbUserFormModule::triggerLayoutEvent()
{
triggerMethod(OUString( "Userform_Layout" ));
}
-void SbUserFormModule::triggerResizeEvent( void )
+void SbUserFormModule::triggerResizeEvent()
{
triggerMethod(OUString("Userform_Resize"));
}
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index b38154b1b534..faafb0d5eb22 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -849,7 +849,7 @@ inline void addStringConst( SbiSymPool& rPool, const char* pSym, const char* pSt
addStringConst( rPool, pSym, OUString::createFromAscii( pStr ) );
}
-void SbiParser::AddConstants( void )
+void SbiParser::AddConstants()
{
// #113063 Create constant RTL symbols
addStringConst( aPublics, "vbCr", "\x0D" );
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index b02ca86eb8b3..99dc47890626 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -348,7 +348,7 @@ struct FunctionItem
bool m_bBlockAll;
bool m_bBlockSteps;
- FunctionItem( void )
+ FunctionItem()
: m_dTotalTime( 0.0 )
, m_dNetTime( 0.0 )
, m_nCallCount( 0 )
@@ -367,7 +367,7 @@ bool compareFunctionNetTime( FunctionItem* p1, FunctionItem* p2 )
return (p1->m_dNetTime > p2->m_dNetTime);
}
-void lcl_printTimeOutput( void )
+void lcl_printTimeOutput()
{
// Overall time output
lcl_lineOut( "" );
@@ -428,7 +428,7 @@ void lcl_printTimeOutput( void )
static bool GbInitTraceAlreadyCalled = false;
-void dbg_InitTrace( void )
+void dbg_InitTrace()
{
if( GbInitOnlyAtOfficeStart && GbInitTraceAlreadyCalled )
{
@@ -466,7 +466,7 @@ void dbg_InitTrace( void )
#endif
}
-void dbg_DeInitTrace( void )
+void dbg_DeInitTrace()
{
GbTraceOn = GbSavTraceOn;
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 3d5e048ddcee..553de30f7d28 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -183,7 +183,7 @@ static const TokenTable aTokTable_Basic [] = {
// #i109076
-TokenLabelInfo::TokenLabelInfo( void )
+TokenLabelInfo::TokenLabelInfo()
{
m_pTokenCanBeLabelTab = new bool[VBASUPPORT+1];
for( int i = 0 ; i <= VBASUPPORT ; ++i )
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index 4304713e55b5..1b928cca5114 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -50,8 +50,8 @@ public:
void Save();
// #29955 service for-loop-level
- void IncForLevel( void ) { nForLevel++; }
- void DecForLevel( void ) { nForLevel--; }
+ void IncForLevel() { nForLevel++; }
+ void DecForLevel() { nForLevel--; }
static sal_uInt32 calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset );
static sal_uInt16 calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset );
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 13a10dc92693..c3084be98896 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -59,7 +59,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE;
- virtual SfxLibraryContainer* createInstanceImpl( void ) SAL_OVERRIDE;
+ virtual SfxLibraryContainer* createInstanceImpl() SAL_OVERRIDE;
virtual void onNewRootStorage() SAL_OVERRIDE;
@@ -69,7 +69,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
virtual const sal_Char* SAL_CALL getLibrariesDir() const SAL_OVERRIDE;
public:
- SfxDialogLibraryContainer( void );
+ SfxDialogLibraryContainer();
SfxDialogLibraryContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
// Methods XStorageBasedLibraryContainer
@@ -107,8 +107,8 @@ class SfxDialogLibrary :public SfxLibrary
OUString m_aName;
// Provide modify state including resources
- virtual bool isModified( void ) SAL_OVERRIDE;
- virtual void storeResources( void ) SAL_OVERRIDE;
+ virtual bool isModified() SAL_OVERRIDE;
+ virtual void storeResources() SAL_OVERRIDE;
virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE;
virtual void storeResourcesToURL( const OUString& URL,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE;
@@ -142,11 +142,11 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver >
SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- OUString getName( void )
+ OUString getName()
{ return m_aName; }
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence >
- getStringResourcePersistence( void )
+ getStringResourcePersistence()
{
return m_xStringResourcePersistence;
}
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index f76b8d2de421..588a69ef3de8 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -31,7 +31,7 @@ class SbxErrObject : public SbUnoObject
SbxErrObject( const OUString& aName_, const com::sun::star::uno::Any& aUnoObj_ );
virtual ~SbxErrObject();
- class ErrObject* getImplErrObject( void )
+ class ErrObject* getImplErrObject()
{ return m_pErrObject; }
public:
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 9f4b5adc1fff..4994df661875 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -116,7 +116,7 @@ class SbiExprNode { // operators (and operands)
void GenElement( SbiOpcode );
void BaseInit( SbiParser* p ); // help function for Ctor, from 17.12.95
public:
- SbiExprNode( void );
+ SbiExprNode();
SbiExprNode( SbiParser*, double, SbxDataType );
SbiExprNode( SbiParser*, const OUString& );
SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL );
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 9e20a0865363..82b9ddf9b80c 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -293,7 +293,7 @@ protected:
virtual SfxLibrary* SAL_CALL implCreateLibraryLink
( const OUString& aName, const OUString& aLibInfoFileURL,
const OUString& StorageURL, bool ReadOnly ) = 0;
- virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) = 0;
+ virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement() = 0;
virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const = 0;
virtual void SAL_CALL writeLibraryElement
(
@@ -331,11 +331,11 @@ protected:
// #56666, Creates another library container
// instance of the same derived class
- virtual SfxLibraryContainer* createInstanceImpl( void ) = 0;
+ virtual SfxLibraryContainer* createInstanceImpl() = 0;
// Interface to get the BasicManager (Hack for password implementation)
- BasicManager* getBasicManager( void );
+ BasicManager* getBasicManager();
OUString createAppLibraryFolder( SfxLibrary* pLib, const OUString& aName );
void init( const OUString& rInitialDocumentURL,
@@ -375,10 +375,10 @@ protected:
private:
void init_Impl( const OUString& rInitialDocumentURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage );
- void implScanExtensions( void );
+ void implScanExtensions();
public:
- SfxLibraryContainer( void );
+ SfxLibraryContainer();
virtual ~SfxLibraryContainer();
@@ -600,8 +600,8 @@ private:
// Additional functionality for localisation
// Provide modify state including resources
- virtual bool isModified( void ) = 0;
- virtual void storeResources( void ) = 0;
+ virtual bool isModified() = 0;
+ virtual void storeResources() = 0;
virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) = 0;
virtual void storeResourcesToURL( const OUString& URL,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) = 0;
@@ -744,7 +744,7 @@ public:
class ScriptExtensionIterator
{
public:
- ScriptExtensionIterator( void );
+ ScriptExtensionIterator();
OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib );
protected:
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 018b8955a2e2..1d277b4b22fd 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -88,7 +88,7 @@ public:
// from 31.3.1996, search symbol in the runtime-library
SbiSymDef* CheckRTLForSym( const OUString& rSym, SbxDataType eType );
- void AddConstants( void );
+ void AddConstants();
bool HasGlobalCode();
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index db0bc7454af3..61f246d1c64a 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -51,7 +51,7 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue)
@@ -82,7 +82,7 @@ public:
throw (std::exception) SAL_OVERRIDE;
// XPropertyAccess
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -104,7 +104,7 @@ public:
PropertySetInfoImpl( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProps );
// XPropertySetInfo
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) throw () { return _aProps;}
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw () { return _aProps;}
::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name)
throw( ::com::sun::star::uno::RuntimeException );
bool SAL_CALL hasPropertyByName(const OUString& Name)
@@ -120,7 +120,7 @@ public:
virtual ~SbPropertySetInfo();
// XPropertySetInfo
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void)
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name)
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 33758e30d252..fc7d093d26c6 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -69,7 +69,7 @@ struct SbiForStack { // for/next stack:
sal_Int32* pArrayUpperBounds;
css::uno::Reference< css::container::XEnumeration > xEnumeration;
- SbiForStack( void )
+ SbiForStack()
: pNext(NULL)
, eForType(FOR_TO)
, nCurCollectionIndex(0)
@@ -176,18 +176,18 @@ public:
OUString GetErrorMsg() { return aErrorMsg; }
sal_Int32 GetErl() { return nErl; }
void EnableReschedule( bool bEnable ) { bReschedule = bEnable; }
- bool IsReschedule( void ) { return bReschedule; }
+ bool IsReschedule() { return bReschedule; }
void EnableCompatibility( bool bEnable ) { bCompatibility = bEnable; }
- bool IsCompatibility( void ) { return bCompatibility; }
+ bool IsCompatibility() { return bCompatibility; }
- ComponentVector_t& getComponentVector( void ) { return ComponentVector; }
+ ComponentVector_t& getComponentVector() { return ComponentVector; }
SbMethod* GetCaller( sal_uInt16 );
SbModule* GetActiveModule();
SbiIoSystem* GetIoSystem() { return pIosys; }
SbiDdeControl* GetDdeControl() { return pDdeCtrl; }
- StarBASIC* GetBasic( void ) { return pBasic; }
+ StarBASIC* GetBasic() { return pBasic; }
SbiDllMgr* GetDllMgr();
SbiRTLData* GetRTLData() const { return const_cast<SbiRTLData*>(&aRTLData); }
@@ -282,7 +282,7 @@ class SbiRuntime
pItem->xRef = pVar;
pRefSaveList = pItem;
}
- void ClearRefs( void )
+ void ClearRefs()
{
while( pRefSaveList )
{
@@ -398,8 +398,8 @@ public:
void DumpPCode();
bool Step(); // single step (one opcode)
void Stop() { bRun = false; }
- void block( void ) { bBlocked = true; }
- void unblock( void ) { bBlocked = false; }
+ void block() { bBlocked = true; }
+ void unblock() { bBlocked = false; }
SbMethod* GetMethod() { return pMeth; }
SbModule* GetModule() { return pMod; }
sal_uInt16 GetDebugFlags() { return nFlags; }
@@ -437,12 +437,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic );
// no DDE functionality, no DLLCALL) in basic because
// of portal "virtual" users (portal user != UNIX user)
// (Implemented in iosys.cxx)
-bool needSecurityRestrictions( void );
+bool needSecurityRestrictions();
// Returns true if UNO is available, otherwise the old
// file system implementation has to be used
// (Implemented in iosys.cxx)
-bool hasUno( void );
+bool hasUno();
// Converts possibly relative paths to absolute paths
// according to the setting done by ChDir/ChDrive
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index e03517c4b75f..e36873d1c20b 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -53,10 +53,10 @@ struct SbClassData
// needed for initialization order of class modules
StringVector maRequiredTypes;
- SbClassData( void );
- ~SbClassData( void )
+ SbClassData();
+ ~SbClassData()
{ clear(); }
- void clear( void );
+ void clear();
};
// #115824: Factory class to create class objects (type command)
@@ -66,7 +66,7 @@ class BASIC_DLLPUBLIC SbClassFactory : public SbxFactory
SbxObjectRef xClassModules;
public:
- SbClassFactory( void );
+ SbClassFactory();
virtual ~SbClassFactory();
void AddClassModule( SbModule* pClassModule );
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
index e52a27ceaa60..a12b302aa9f6 100644
--- a/basic/source/inc/sbtrace.hxx
+++ b/basic/source/inc/sbtrace.hxx
@@ -36,8 +36,8 @@
//#define DBG_TRACE_PROFILING
#ifdef DBG_TRACE_BASIC
-void dbg_InitTrace( void );
-void dbg_DeInitTrace( void );
+void dbg_InitTrace();
+void dbg_DeInitTrace();
void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl );
void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave = false );
void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl );
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index cac1d4b1c336..12b9cd73ef96 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -92,7 +92,7 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
// Force creation of all properties for debugging
- void createAllProperties( void )
+ void createAllProperties()
{ implCreateAll(); }
// give out value
@@ -112,11 +112,11 @@ class SbUnoObject: public SbxObject
::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
::boost::shared_ptr< SbUnoStructRefObject > maStructInfo;
// help method to establish the dbg_-properties
- void implCreateDbgProperties( void );
+ void implCreateDbgProperties();
// help method to establish all properties and methods
// (on the on-demand-mechanism required for the dbg_-properties)
- void implCreateAll( void );
+ void implCreateAll();
public:
static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
@@ -125,35 +125,35 @@ public:
virtual ~SbUnoObject();
// #76470 do introspection on demand
- void doIntrospection( void );
+ void doIntrospection();
// override Find to support e. g. NameAccess
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
// Force creation of all properties for debugging
- void createAllProperties( void )
+ void createAllProperties()
{ implCreateAll(); }
// give out value
- ::com::sun::star::uno::Any getUnoAny( void );
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess( void ) { return mxUnoAccess; }
- ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void ) { return mxInvocation; }
+ ::com::sun::star::uno::Any getUnoAny();
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess() { return mxUnoAccess; }
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation() { return mxInvocation; }
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE;
- bool isNativeCOMObject( void )
+ bool isNativeCOMObject()
{ return bNativeCOMObject; }
};
typedef tools::SvRef<SbUnoObject> SbUnoObjectRef;
// #67781 delete return values of the uno-methods
-void clearUnoMethods( void );
+void clearUnoMethods();
void clearUnoMethodsForBasic( StarBASIC* pBasic );
class SbUnoMethod : public SbxMethod
{
friend class SbUnoObject;
- friend void clearUnoMethods( void );
+ friend void clearUnoMethods();
friend void clearUnoMethodsForBasic( StarBASIC* pBasic );
::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > m_xUnoMethod;
@@ -175,11 +175,11 @@ public:
virtual ~SbUnoMethod();
virtual SbxInfo* GetInfo() SAL_OVERRIDE;
- const ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >& getParamInfos( void );
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >& getParamInfos();
- bool isInvocationBased( void )
+ bool isInvocationBased()
{ return mbInvocation; }
- bool needsDirectInvocation( void )
+ bool needsDirectInvocation()
{ return mbDirectInvocation; }
};
@@ -206,7 +206,7 @@ public:
const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
bool isUnoStruct() { return mbUnoStruct; }
- bool isInvocationBased( void )
+ bool isInvocationBased()
{ return mbInvocation; }
SbxDataType getRealType() { return mRealType; }
};
@@ -238,7 +238,7 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass( void ) { return m_xClass; }
+ const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass() { return m_xClass; }
};
@@ -271,12 +271,12 @@ public:
SbUnoService* findUnoService( const OUString& rName );
-void clearUnoServiceCtors( void );
+void clearUnoServiceCtors();
class SbUnoServiceCtor : public SbxMethod
{
friend class SbUnoService;
- friend void clearUnoServiceCtors( void );
+ friend void clearUnoServiceCtors();
::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > m_xServiceCtorDesc;
@@ -289,7 +289,7 @@ public:
virtual ~SbUnoServiceCtor();
virtual SbxInfo* GetInfo() SAL_OVERRIDE;
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > getServiceCtorDesc( void )
+ ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > getServiceCtorDesc()
{ return m_xServiceCtorDesc; }
};
@@ -321,7 +321,7 @@ public:
, mVal( rVal )
{}
- const ::com::sun::star::uno::Any& getValue( void )
+ const ::com::sun::star::uno::Any& getValue()
{ return mVal; }
TYPEINFO_OVERRIDE();
@@ -340,7 +340,7 @@ public:
: maNameSeq( nSeqSize )
{}
- ::com::sun::star::uno::Sequence< OUString >& getNames( void )
+ ::com::sun::star::uno::Sequence< OUString >& getNames()
{ return maNameSeq; }
};
@@ -359,7 +359,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, bool bWrite );
void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, bool bWrite );
void disposeComVariablesForBasic( StarBASIC* pBasic );
-void clearNativeObjectWrapperVector( void );
+void clearNativeObjectWrapperVector();
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 82ea17cc0331..43bab7bcbbbc 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -82,8 +82,8 @@ public:
sal_Int32 GetCol2() { return nCol2; }
void SetCol1( sal_Int32 n ) { nCol1 = n; }
StarBASIC* GetBasic() { return pBasic; }
- void SaveLine(void) { pSaveLine = pLine; }
- void RestoreLine(void) { pLine = pSaveLine; }
+ void SaveLine() { pSaveLine = pLine; }
+ void RestoreLine() { pLine = pSaveLine; }
void LockColumn();
void UnlockColumn();
bool DoesColonFollow();
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 5b5f496fc165..c3662775cea8 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -59,7 +59,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE;
- virtual SfxLibraryContainer* createInstanceImpl( void ) SAL_OVERRIDE;
+ virtual SfxLibraryContainer* createInstanceImpl() SAL_OVERRIDE;
// Password encryption
@@ -92,7 +92,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
virtual const sal_Char* SAL_CALL getLibrariesDir() const SAL_OVERRIDE;
public:
- SfxScriptLibraryContainer( void );
+ SfxScriptLibraryContainer();
SfxScriptLibraryContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
@@ -139,8 +139,8 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
ModuleInfoMap mModuleInfos;
// Provide modify state including resources
- virtual bool isModified( void ) SAL_OVERRIDE;
- virtual void storeResources( void ) SAL_OVERRIDE;
+ virtual bool isModified() SAL_OVERRIDE;
+ virtual void storeResources() SAL_OVERRIDE;
virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE;
virtual void storeResourcesToURL( const OUString& URL,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE;
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 0f759f947591..3c67c8d7af83 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -145,7 +145,7 @@ public:
void SetDefinedAs() { bAs = true; }
void SetGlobal(bool b){ bGlobal = b; }
void SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
- sal_uInt16 GetDefaultId( void ) { return nDefaultId; }
+ sal_uInt16 GetDefaultId() { return nDefaultId; }
bool IsOptional() const{ return bOpt; }
bool IsParamArray() const{ return bParamArray; }
bool IsWithEvents() const{ return bWithEvents; }
@@ -155,7 +155,7 @@ public:
bool IsNew() const { return bNew; }
bool IsDefinedAs() const { return bAs; }
bool IsGlobal() const { return bGlobal; }
- short GetFixedStringLength( void ) const { return nFixedStringLength; }
+ short GetFixedStringLength() const { return nFixedStringLength; }
void SetFixedStringLength( short n ) { nFixedStringLength = n; }
SbiSymPool& GetPool();
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 0b6482ac98ff..a136f39293f1 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -120,7 +120,7 @@ class TokenLabelInfo
bool* m_pTokenCanBeLabelTab;
public:
- TokenLabelInfo( void );
+ TokenLabelInfo();
TokenLabelInfo( const TokenLabelInfo& rInfo )
: m_pTokenCanBeLabelTab( NULL )
{ (void)rInfo; }
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 76020c585b4f..ae6d03e256fc 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -209,7 +209,7 @@ OUString findUserInDescription( const OUString& aDescription )
return user;
}
-bool needSecurityRestrictions( void )
+bool needSecurityRestrictions()
{
static bool bNeedInit = true;
static bool bRetVal = true;
@@ -276,7 +276,7 @@ bool needSecurityRestrictions( void )
// Returns sal_True if UNO is available, otherwise the old file
// system implementation has to be used
// #89378 New semantic: Don't just ask for UNO but for UCB
-bool hasUno( void )
+bool hasUno()
{
static bool bNeedInit = true;
static bool bRetVal = true;
@@ -929,7 +929,7 @@ SbiStream* SbiIoSystem::GetStream( short nChannel ) const
return pRet;
}
-void SbiIoSystem::CloseAll(void)
+void SbiIoSystem::CloseAll()
{
for( short i = 1; i < CHANNELS; i++ )
{
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 623b092c6651..17e2c5f0c712 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -121,7 +121,7 @@ static void FilterWhiteSpace( OUString& rStr )
static long GetDayDiff( const Date& rDate );
-static const CharClass& GetCharClass( void )
+static const CharClass& GetCharClass()
{
static bool bNeedsInit = true;
static LanguageTag aLanguageTag( LANGUAGE_SYSTEM);
@@ -161,7 +161,7 @@ OUString getFullPath( const OUString& aRelPath )
}
// TODO: -> SbiGlobals
-static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess( void )
+static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess()
{
static uno::Reference< ucb::XSimpleFileAccess3 > xSFI;
if( !xSFI.is() )
@@ -2379,7 +2379,7 @@ double Now_Impl()
return aSerial;
}
-// Date Now(void)
+// Date Now()
RTLFUNC(Now)
{
@@ -2388,7 +2388,7 @@ RTLFUNC(Now)
rPar.Get(0)->PutDate( Now_Impl() );
}
-// Date Time(void)
+// Date Time()
RTLFUNC(Time)
{
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 86aed45c93c2..be21232d68f0 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -67,7 +67,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::sheet;
using namespace com::sun::star::uno;
-static Reference< XCalendar4 > getLocaleCalendar( void )
+static Reference< XCalendar4 > getLocaleCalendar()
{
static Reference< XCalendar4 > xCalendar;
if( !xCalendar.is() )
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 122b8fccaad8..fc3b7f844a5c 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1771,7 +1771,7 @@ struct DimAsNewRecoverItem
SbxObject* m_pObjParent;
SbModule* m_pClassModule;
- DimAsNewRecoverItem( void )
+ DimAsNewRecoverItem()
: m_pObjParent( NULL )
, m_pClassModule( NULL )
{}
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index ba2fc8a40a2e..267bee9a3c0a 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -26,7 +26,7 @@
#include <boost/scoped_array.hpp>
// Implementation SbxDecimal
-SbxDecimal::SbxDecimal( void )
+SbxDecimal::SbxDecimal()
{
setInt( 0 );
mnRefCount = 0;
@@ -118,14 +118,14 @@ bool SbxDecimal::operator *= ( const SbxDecimal &r )
return bRet;
}
-bool SbxDecimal::neg( void )
+bool SbxDecimal::neg()
{
HRESULT hResult = VarDecNeg( &maDec, &maDec );
bool bRet = ( hResult == S_OK );
return bRet;
}
-bool SbxDecimal::isZero( void )
+bool SbxDecimal::isZero()
{
SbxDecimal aZeroDec;
aZeroDec.setLong( 0 );
@@ -306,12 +306,12 @@ bool SbxDecimal::operator *= ( const SbxDecimal &r )
return false;
}
-bool SbxDecimal::neg( void )
+bool SbxDecimal::neg()
{
return false;
}
-bool SbxDecimal::isZero( void )
+bool SbxDecimal::isZero()
{
return false;
}
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 1e6c91bfddfc..a821c96f9011 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -51,13 +51,13 @@ class SbxDecimal
sal_Int32 mnRefCount;
public:
- SbxDecimal( void );
+ SbxDecimal();
SbxDecimal( const SbxDecimal& rDec );
SbxDecimal( const com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
~SbxDecimal();
- void addRef( void )
+ void addRef()
{ mnRefCount++; }
void fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
@@ -98,9 +98,9 @@ public:
bool operator += ( const SbxDecimal &r );
bool operator /= ( const SbxDecimal &r );
bool operator *= ( const SbxDecimal &r );
- bool neg( void );
+ bool neg();
- bool isZero( void );
+ bool isZero();
enum CmpResult { LT, EQ, GT };
friend CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight );
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index f22df239205f..6ba986d97bab 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -563,7 +563,7 @@ bool SbxValue::Scan( const OUString& rSrc, sal_uInt16* pLen )
}
-ResMgr* implGetResMgr( void )
+ResMgr* implGetResMgr()
{
static ResMgr* pResMgr = NULL;
if( !pResMgr )
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 56f88c29e7cb..0771c71bc203 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -47,7 +47,7 @@ class SbxVariableImpl
Reference< XInterface > m_xComListener;
StarBASIC* m_pComListenerParentBasic;
- SbxVariableImpl( void )
+ SbxVariableImpl()
: m_pComListenerParentBasic( NULL )
{}
SbxVariableImpl( const SbxVariableImpl& r )
@@ -430,7 +430,7 @@ void SbxVariable::SetParent( SbxObject* p )
pParent = p;
}
-SbxVariableImpl* SbxVariable::getImpl( void )
+SbxVariableImpl* SbxVariable::getImpl()
{
if( mpSbxVariableImpl == NULL )
{
@@ -439,7 +439,7 @@ SbxVariableImpl* SbxVariable::getImpl( void )
return mpSbxVariableImpl;
}
-const OUString& SbxVariable::GetDeclareClassName( void )
+const OUString& SbxVariable::GetDeclareClassName()
{
SbxVariableImpl* pImpl = getImpl();
return pImpl->m_aDeclareClassName;
@@ -462,7 +462,7 @@ void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::
#endif
}
-void SbxVariable::ClearComListener( void )
+void SbxVariable::ClearComListener()
{
SbxVariableImpl* pImpl = getImpl();
pImpl->m_xComListener.clear();
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 5876bed79035..66becfa53f3c 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -71,7 +71,7 @@ const sal_Char* SAL_CALL SfxDialogLibraryContainer::getLibElementFileExtension()
const sal_Char* SAL_CALL SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; }
// Ctor for service
-SfxDialogLibraryContainer::SfxDialogLibraryContainer( void )
+SfxDialogLibraryContainer::SfxDialogLibraryContainer()
{
// all initialisation has to be done
// by calling XInitialization::initialize
@@ -340,7 +340,7 @@ void SAL_CALL SfxDialogLibraryContainer::importFromOldStorage( const OUString& )
// Nothing to do here, old dialogs cannot be imported
}
-SfxLibraryContainer* SfxDialogLibraryContainer::createInstanceImpl( void )
+SfxLibraryContainer* SfxDialogLibraryContainer::createInstanceImpl()
{
return new SfxDialogLibraryContainer();
}
@@ -495,7 +495,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxDialogLibrary, SfxLibrary, SfxDialogLibrary_BA
IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxDialogLibrary, SfxLibrary, SfxDialogLibrary_BASE );
// Provide modify state including resources
-bool SfxDialogLibrary::isModified( void )
+bool SfxDialogLibrary::isModified()
{
bool bRet = implIsModified();
@@ -506,7 +506,7 @@ bool SfxDialogLibrary::isModified( void )
return bRet;
}
-void SfxDialogLibrary::storeResources( void )
+void SfxDialogLibrary::storeResources()
{
if( m_xStringResourcePersistence.is() )
m_xStringResourcePersistence->store();
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index adc6905a43bb..8b6510e49d30 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -376,7 +376,7 @@ bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScri
}
// Ctor
-SfxLibraryContainer::SfxLibraryContainer( void )
+SfxLibraryContainer::SfxLibraryContainer()
: SfxLibraryContainer_BASE( maMutex )
, maVBAScriptListeners( maMutex )
@@ -1265,7 +1265,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
}
}
-void SfxLibraryContainer::implScanExtensions( void )
+void SfxLibraryContainer::implScanExtensions()
{
#if HAVE_FEATURE_EXTENSIONS
ScriptExtensionIterator aScriptIt;
@@ -3284,7 +3284,7 @@ void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListen
#define sBasicLibMediaType "application/vnd.sun.star.basic-library"
#define sDialogLibMediaType "application/vnd.sun.star.dialog-library"
-ScriptExtensionIterator::ScriptExtensionIterator( void )
+ScriptExtensionIterator::ScriptExtensionIterator()
: m_xContext( comphelper::getProcessComponentContext() )
, m_eState( USER_EXTENSIONS )
, m_bUserPackagesLoaded( false )
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index a422f2a6a840..cedd2e553eeb 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -128,7 +128,7 @@ bool SfxScriptLibraryContainer::hasLibraryPassword( const OUString& rLibraryName
}
// Ctor for service
-SfxScriptLibraryContainer::SfxScriptLibraryContainer( void )
+SfxScriptLibraryContainer::SfxScriptLibraryContainer()
:maScriptLanguage( "StarBasic" )
{
// all initialisation has to be done
@@ -160,7 +160,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString& aN
return pRet;
}
-Any SAL_CALL SfxScriptLibraryContainer::createEmptyLibraryElement( void )
+Any SAL_CALL SfxScriptLibraryContainer::createEmptyLibraryElement()
{
OUString aMod;
Any aRetAny;
@@ -354,7 +354,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
return aRetAny;
}
-SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl( void )
+SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl()
{
return new SfxScriptLibraryContainer();
}
@@ -1237,12 +1237,12 @@ bool SfxScriptLibrary::isLoadedStorable()
}
// Provide modify state including resources
-bool SfxScriptLibrary::isModified( void )
+bool SfxScriptLibrary::isModified()
{
return implIsModified(); // No resources
}
-void SfxScriptLibrary::storeResources( void )
+void SfxScriptLibrary::storeResources()
{
// No resources
}