From a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 9 Feb 2016 18:16:42 +1100 Subject: Remove excess newlines A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- extensions/source/abpilot/admininvokationimpl.cxx | 1 - extensions/source/abpilot/datasourcehandling.cxx | 1 - extensions/source/abpilot/datasourcehandling.hxx | 2 - extensions/source/abpilot/fieldmappingimpl.cxx | 4 -- extensions/source/abpilot/fieldmappingimpl.hxx | 5 -- extensions/source/activex/SOActionsApproval.cxx | 2 - extensions/source/activex/SOActiveX.cxx | 4 -- extensions/source/activex/SOComWindowPeer.cxx | 2 - .../source/activex/SODispatchInterceptor.cxx | 2 - extensions/source/activex/so_activex.cxx | 3 -- extensions/source/bibliography/bibconfig.hxx | 1 - extensions/source/bibliography/bibload.cxx | 1 - extensions/source/bibliography/bibresid.hxx | 1 - extensions/source/bibliography/bibview.cxx | 1 - extensions/source/bibliography/datman.cxx | 1 - extensions/source/bibliography/datman.hxx | 1 - extensions/source/bibliography/toolbar.cxx | 2 - extensions/source/bibliography/toolbar.hxx | 2 - extensions/source/config/ldap/componentdef.cxx | 1 - extensions/source/config/ldap/ldapaccess.cxx | 2 - extensions/source/dbpilots/commonpagesdbp.hxx | 1 - extensions/source/dbpilots/dbptools.hxx | 1 - extensions/source/inc/componentmodule.cxx | 1 - extensions/source/ole/jscriptclasses.hxx | 1 - extensions/source/ole/ole2uno.hxx | 1 - extensions/source/ole/oleobjw.cxx | 4 -- extensions/source/ole/oleobjw.hxx | 1 - extensions/source/ole/servprov.cxx | 3 -- extensions/source/ole/unoconversionutilities.hxx | 3 -- extensions/source/ole/unoobjw.hxx | 2 - extensions/source/ole/unotypewrapper.cxx | 1 - extensions/source/ole/windata.cxx | 1 - extensions/source/ole/windata.hxx | 1 - extensions/source/propctrlr/browserlistbox.cxx | 1 - extensions/source/propctrlr/browserview.hxx | 1 - extensions/source/propctrlr/composeduiupdate.cxx | 1 - .../source/propctrlr/defaulthelpprovider.hxx | 1 - .../source/propctrlr/editpropertyhandler.hxx | 1 - extensions/source/propctrlr/enumrepresentation.hxx | 1 - extensions/source/propctrlr/eventhandler.hxx | 1 - extensions/source/propctrlr/fontdialog.cxx | 2 - extensions/source/propctrlr/fontdialog.hxx | 1 - .../source/propctrlr/formcomponenthandler.cxx | 2 - .../source/propctrlr/formcomponenthandler.hxx | 1 - extensions/source/propctrlr/formcontroller.hxx | 1 - extensions/source/propctrlr/formlinkdialog.cxx | 1 - extensions/source/propctrlr/formmetadata.cxx | 1 - extensions/source/propctrlr/handlerhelper.hxx | 1 - .../source/propctrlr/inspectorhelpwindow.hxx | 1 - extensions/source/propctrlr/linedescriptor.hxx | 1 - extensions/source/propctrlr/newdatatype.cxx | 1 - .../source/propctrlr/objectinspectormodel.cxx | 1 - extensions/source/propctrlr/pcrunodialogs.cxx | 2 - extensions/source/propctrlr/pcrunodialogs.hxx | 1 - extensions/source/propctrlr/propcontroller.cxx | 2 - .../source/propctrlr/propcontrolobserver.hxx | 1 - extensions/source/propctrlr/propertycomposer.hxx | 1 - .../source/propctrlr/propertycontrolextender.cxx | 1 - .../source/propctrlr/propertycontrolextender.hxx | 1 - extensions/source/propctrlr/propertyeditor.cxx | 3 -- extensions/source/propctrlr/propertyinfo.hxx | 1 - .../source/propctrlr/propeventtranslation.hxx | 1 - extensions/source/propctrlr/proplinelistener.hxx | 1 - .../source/propctrlr/pushbuttonnavigation.hxx | 1 - extensions/source/propctrlr/selectlabeldialog.hxx | 1 - extensions/source/propctrlr/standardcontrol.hxx | 1 - .../source/propctrlr/stringrepresentation.cxx | 1 - extensions/source/propctrlr/submissionhandler.hxx | 1 - extensions/source/propctrlr/taborder.hxx | 2 - extensions/source/propctrlr/unourl.hxx | 1 - extensions/source/propctrlr/usercontrol.hxx | 1 - extensions/source/propctrlr/xsddatatypes.hxx | 1 - extensions/source/scanner/grid.cxx | 6 --- extensions/source/update/check/download.cxx | 9 ---- extensions/source/update/check/updatecheck.cxx | 54 ---------------------- .../source/update/check/updatecheckconfig.hxx | 3 -- extensions/source/update/check/updatecheckjob.cxx | 12 ----- extensions/source/update/check/updatehdl.cxx | 3 -- extensions/source/update/check/updateprotocol.cxx | 2 - .../source/update/check/updateprotocoltest.cxx | 1 - .../source/update/feed/test/updatefeedtest.cxx | 1 - extensions/source/update/feed/updatefeed.cxx | 19 -------- extensions/source/update/ui/updatecheckui.cxx | 13 ------ extensions/test/ole/OleClient/axhost.cxx | 1 - extensions/test/ole/OleClient/clientTest.cxx | 14 ------ extensions/test/ole/OleConverterVar1/convTest.cxx | 3 -- extensions/test/ole/cpnt/cpnt.cxx | 6 --- extensions/test/ole/cppToUno/testcppuno.cxx | 4 -- extensions/workben/pythonautotest.cxx | 5 -- extensions/workben/pythontest.cxx | 7 --- extensions/workben/testcomponent.cxx | 1 - extensions/workben/testframecontrol.cxx | 5 -- extensions/workben/testresource.cxx | 1 - 93 files changed, 276 deletions(-) (limited to 'extensions') diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 97706e295dcb..821b1656ef0d 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -30,7 +30,6 @@ #include - namespace abp { diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 382a397217a1..45247e50af4e 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -91,7 +91,6 @@ namespace abp struct PackageAccessControl { }; - static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext ) { Reference xContext = DatabaseContext::create(_rxContext); diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 96fed7569bb9..893dc57a2e7c 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace vcl { class Window; } - namespace abp { @@ -171,7 +170,6 @@ namespace abp css::uno::Reference< css::beans::XPropertySet > getDataSource() const; - /** set a new data source.

Available to selected clients only

*/ diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 9215b7e3ff19..4d7b07c8562a 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -58,7 +58,6 @@ namespace abp { - bool invokeDialog( const Reference< XComponentContext >& _rxORB, class vcl::Window* _pParent, const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) { @@ -279,12 +278,10 @@ namespace abp } // namespace fieldmapping - namespace addressconfig { - void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext, const OUString& _rDataSourceName, const OUString& _rTableName ) { @@ -322,7 +319,6 @@ namespace abp } // namespace addressconfig - } // namespace abp diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index 5f1b539dd46a..3cbe2919bb3a 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -43,12 +43,10 @@ namespace abp { - namespace fieldmapping { - /** invokes the field mapping dialog @param _rxORB service factory to use for creating UNO services @@ -88,12 +86,10 @@ namespace abp } // namespace fieldmapping - namespace addressconfig { - /** writes the data source / table name given into the configuration, to where the template documents expect it. */ @@ -113,7 +109,6 @@ namespace abp } // namespace addressconfig - } // namespace abp diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index a59108e41491..b6b6d5986380 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -26,8 +26,6 @@ #include - - STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 74d82632f8c4..940de35dc8a6 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -34,8 +34,6 @@ #define STAROFFICE_WINDOWCLASS "SOParentWindow" - - void OutputError_Impl( HWND hw, HRESULT ErrorCode ) { void* sMessage; @@ -1163,6 +1161,4 @@ HRESULT CSOActiveX::GetURL( const OLECHAR* url, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx index 86d15046c723..e752685e25f8 100644 --- a/extensions/source/activex/SOComWindowPeer.cxx +++ b/extensions/source/activex/SOComWindowPeer.cxx @@ -25,8 +25,6 @@ #include - - STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index ef151481c98a..4dda82cee137 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -28,8 +28,6 @@ #include - - STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 51ff33232c1a..b5e9daf9892f 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -359,7 +359,6 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit, co } - // DllUnregisterServer - Removes entries from the system registry HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess ) { @@ -479,7 +478,6 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) } - // DllRegisterServerDoc - Adds entries to the system registry #define SUPPORTED_MSEXT_NUM 7 @@ -582,7 +580,6 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) } - // DllUnregisterServerDoc - Removes entries from the system registry STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 590e90759515..c260f8efcbd0 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -28,7 +28,6 @@ struct Mapping; typedef std::vector > MappingArray; - #define COLUMN_COUNT 31 #define IDENTIFIER_POS 0 #define AUTHORITYTYPE_POS 1 diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 9828ae669be0..ce8774189af4 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -679,5 +679,4 @@ void BibliographyLoader::removeVetoableChangeListener( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index 808b815219da..f3a393c3b576 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -23,7 +23,6 @@ #include - class BibResId : public ResId { public: diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 88ac20693f62..74de227ff6de 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -46,7 +46,6 @@ namespace bib { - BibView::BibView( vcl::Window* _pParent, BibDataManager* _pManager, WinBits _nStyle ) :BibWindow( _pParent, _nStyle ) ,m_pDatMan( _pManager ) diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 10541f57fbf6..fb24272e7bb5 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -235,7 +235,6 @@ class MappingDialog_Impl : public ModalDialog bool bModified; - DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index a2968b9f5c20..782cdc810e0a 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -132,7 +132,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - css::uno::Reference< css::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc); css::uno::Reference< css::awt::XControlModel > updateGridModel(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 23bda2b9b629..cf581286e8a4 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -551,7 +551,6 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) } - IMPL_LINK_NOARG_TYPED( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) { // Check if toolbar button size have changed and we have to use system settings @@ -572,7 +571,6 @@ void BibToolBar::RebuildToolbar() } - void BibToolBar::ApplyImageList() { ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 8137d2508f40..dd3d4bdda772 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -173,8 +173,6 @@ class BibToolBar: public ToolBox }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index a93ea4014049..2795146649d0 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -24,7 +24,6 @@ using namespace extensions::config::ldap ; - static uno::Reference SAL_CALL createLdapUserProfileBe( const uno::Reference& aContext) { return * new LdapUserProfileBe(aContext) ; diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 79e96350623f..206514c8a70e 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -251,7 +251,6 @@ void LdapConnection::initConnection() } - OUStringBuffer filter( "(&(objectclass=" ); filter.append( mLdapDefinition.mUserObjectClass ).append(")(") ; @@ -298,7 +297,6 @@ void LdapConnection::initConnection() } - } } } // extensions.config.ldap /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 48704397be63..ffe47dad7baf 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -124,7 +124,6 @@ namespace dbp } // namespace dbp - #endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_COMMONPAGESDBP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index 63c035596d53..548949e8bfa9 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.hxx @@ -35,7 +35,6 @@ namespace dbp } // namespace dbp - #endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 87414f1a4de0..de212fe81ba1 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -269,7 +269,6 @@ namespace COMPMOD_NAMESPACE } - } // namespace COMPMOD_NAMESPACE diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx index 281ac5f4c622..c483d8ac7b29 100644 --- a/extensions/source/ole/jscriptclasses.hxx +++ b/extensions/source/ole/jscriptclasses.hxx @@ -25,7 +25,6 @@ #include "comifaces.hxx" - // Sequences are represented by prepending "[]", e.g. []char, [][]byte, [][][]object, etc. // To make a JScriptValue object to an out parameter, call diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index d341b45e6e21..c30cb7e543f6 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -84,7 +84,6 @@ Mutex* getBridgeMutex(); } // end namespace - #endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 57e1395d14cc..e019cee7d233 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -1176,8 +1176,6 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, } - - // XInitialization void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) { @@ -1549,7 +1547,6 @@ Reference IUnknownWrapper_Impl::createComWrapperInstance() } - void IUnknownWrapper_Impl::getMethodInfo(const OUString& sName, TypeDescription& methodInfo) { TypeDescription desc= getInterfaceMemberDescOfCurrentCall(sName); @@ -1641,7 +1638,6 @@ sal_Bool IUnknownWrapper_Impl::isJScriptObject() } - /** @internal The function ultimately calls IDispatch::Invoke on the wrapped COM object. The COM object does not implement UNO Interfaces ( via IDispatch). This diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 2abd1e48b371..0b617cb61ad6 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -50,7 +50,6 @@ namespace ole_adapter { - typedef std::unordered_map, OUStringHash> DispIdMap; typedef std::unordered_multimap TLBFuncIndexMap; diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index e88a5b60aa2c..6d3d5fa38f30 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -493,7 +493,6 @@ Reference< XInterface > OleConverter_Impl2::createComWrapperInstance() } - /***************************************************************************** class implementation OleClient_Impl @@ -622,7 +621,6 @@ Reference< XInterface > OleClient_Impl::createComWrapperInstance( ) } - /***************************************************************************** class implementation OleServer_Impl @@ -697,7 +695,6 @@ sal_Bool OleServer_Impl::provideInstance(const Reference& xInst, GUI } - } // end namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index ea857fffafde..742fe809c58a 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -89,8 +89,6 @@ inline void reduceRange( Any& any); #endif - - // createUnoObjectWrapper gets a wrapper instance by calling createUnoWrapperInstance // and initializes it via XInitialization. The wrapper object is required to implement // XBridgeSupplier so that it can convert itself to IDispatch. @@ -266,7 +264,6 @@ bool convertSelfToCom( T& unoInterface, VARIANT * pVar) } - // Gets the invocation factory depending on the Type in the Any. // The factory can be created by a local or remote multi service factory. // In case there is a remote multi service factory available there are diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index 67c725cb83f2..af067eb66db3 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.hxx @@ -49,7 +49,6 @@ namespace ole_adapter { - struct hash_IUnknown_Impl { size_t operator()(const IUnknown* p) const @@ -67,7 +66,6 @@ struct equal_to_IUnknown_Impl }; - struct MemberInfo { MemberInfo() : flags(0), name() {} diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index dd6364b76633..6d46ab8991a2 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -167,5 +167,4 @@ STDMETHODIMP UnoTypeWrapper::get_Name(BSTR *pVal) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/windata.cxx b/extensions/source/ole/windata.cxx index a2455e6ed055..98afa2b623a1 100644 --- a/extensions/source/ole/windata.cxx +++ b/extensions/source/ole/windata.cxx @@ -24,7 +24,6 @@ namespace ole_adapter { - } diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx index 8e942d626feb..5e1a2157e4fc 100644 --- a/extensions/source/ole/windata.hxx +++ b/extensions/source/ole/windata.hxx @@ -201,7 +201,6 @@ public: }; - } #endif diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 76bc7941064d..0c14e3f5aeb3 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1276,5 +1276,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 7e09dd24ff44..5be841cc2faa 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -64,7 +64,6 @@ namespace pcr }; - } // namespace pcr diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index be669773863f..8181405d8411 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -223,7 +223,6 @@ namespace pcr } - void CachedInspectorUI::checkDisposed() const { if ( isDisposed() ) diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index e1b1c6a59f9a..0bac31f580c3 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -34,7 +34,6 @@ namespace pcr { - //= DefaultHelpProvider typedef ::cppu::WeakImplHelper < css::inspection::XPropertyControlObserver diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index e8e04da8f641..a7fe7a551f2e 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= EditPropertyHandler class EditPropertyHandler; diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index fe8d7da6e9af..f88ae0365e67 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= IPropertyEnumRepresentation class SAL_NO_VTABLE IPropertyEnumRepresentation : public salhelper::SimpleReferenceObject diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index fb4e0befc9f9..e33c6f3f2e32 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -37,7 +37,6 @@ namespace pcr { - //= EventDescription typedef sal_Int32 EventId; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 21ccc921856d..4d73a202a2e8 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -396,7 +396,6 @@ namespace pcr } - // font wordline mode eState = _rSet.GetItemState(CFID_WORDLINEMODE); @@ -409,7 +408,6 @@ namespace pcr } - // text color eState = _rSet.GetItemState(CFID_CHARCOLOR); diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index 458905115fe2..707a35e4d2f8 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -29,7 +29,6 @@ namespace pcr { - //= ControlCharacterDialog class ControlCharacterDialog : public SfxTabDialog diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index f0602f9fc02b..b544f622c4f2 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -993,7 +993,6 @@ namespace pcr } - LineDescriptor aDescriptor; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); aDescriptor.DisplayName = sDisplayName; @@ -1004,7 +1003,6 @@ namespace pcr aDescriptor.Control.clear(); - bool bNeedDefaultStringIfVoidAllowed = false; TypeClass eType = aProperty.Type.getTypeClass(); diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index c6f7586104e3..b3e6c76504a8 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -42,7 +42,6 @@ namespace pcr { - //= ComponentClassification enum ComponentClassification diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 49decd0f0a81..b08276bef45a 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -30,7 +30,6 @@ namespace pcr { - //= ServiceDescriptor struct ServiceDescriptor diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index c499dcb6b72e..fbd6eb28fd6f 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -46,7 +46,6 @@ #include - namespace pcr { diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 8bb948ff06b5..8df6deee9e15 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -549,7 +549,6 @@ namespace pcr } - const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // Initialization diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index afe4c0cf44af..ada62ff30687 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -41,7 +41,6 @@ namespace pcr { - //= PropertyHandlerHelper class PropertyHandlerHelper diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index 1b27429a9323..11ba385a040e 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= InspectorHelpWindow class InspectorHelpWindow : public vcl::Window diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 2f1f564fc465..00b4e37fec23 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= OLineDescriptor struct OLineDescriptor : public css::inspection::LineDescriptor diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 64c69c2087ef..d7c6d2041971 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -25,7 +25,6 @@ namespace pcr { - //= NewDataTypeDialog diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index a31a5bcbe912..65b60ab8c10a 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -220,7 +220,6 @@ namespace pcr } // namespace pcr - extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() { ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration; diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index d45d3e5d3a22..d14964f58416 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -162,8 +162,6 @@ namespace pcr } - - } // namespace pcr diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 15499438f091..65db4dd16f37 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -29,7 +29,6 @@ namespace pcr { - //= OTabOrderDialog class OTabOrderDialog; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 80a24fdd3abd..7a478149a8cc 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1141,7 +1141,6 @@ namespace pcr _rDescriptor.assignFrom( handler->second->describePropertyLine( _rProperty.Name, this ) ); - _rDescriptor.xPropertyHandler = handler->second; _rDescriptor.sName = _rProperty.Name; _rDescriptor.aValue = _rDescriptor.xPropertyHandler->getPropertyValue( _rProperty.Name ); @@ -1747,5 +1746,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx index 61ba188e72fa..982e812475b3 100644 --- a/extensions/source/propctrlr/propcontrolobserver.hxx +++ b/extensions/source/propctrlr/propcontrolobserver.hxx @@ -26,7 +26,6 @@ namespace pcr { - //= IPropertyControlObserver /** non-UNO version of the XPropertyControlObserver diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index a05298b40746..5d86adc8e502 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -41,7 +41,6 @@ namespace pcr { - //= PropertyComposer typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index 6f90086f9695..3c9cfc39d69c 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -126,7 +126,6 @@ namespace pcr } - } // namespace pcr diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index efdcb18e59ee..aa615184f77c 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= PropertyControlExtender struct PropertyControlExtender_Data; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 095fd326da14..0d7113cc1d34 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -344,8 +344,6 @@ namespace pcr } - - void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { sal_uInt16 nCount = m_aTabControl->GetPageCount(); @@ -532,5 +530,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index dc5dba484fe9..7b1ee3b2b2de 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -30,7 +30,6 @@ namespace pcr { - //= IPropertyInfoService class SAL_NO_VTABLE IPropertyInfoService diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index 0eff3c10a42b..dcf52e4d10b2 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= PropertyEventTranslation typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 447f3c99ee75..cd9ee5f3fca3 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -27,7 +27,6 @@ namespace pcr { - class IPropertyLineListener { public: diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx index a293c3ecb134..6a8ee54248bd 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.hxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= PushButtonNavigation class PushButtonNavigation diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 0d993c46c14e..36ede0e9d998 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -33,7 +33,6 @@ namespace pcr { - // OSelectLabelDialog class OSelectLabelDialog diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 9988994041ae..a339c7112a72 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -44,7 +44,6 @@ namespace pcr { - //= ListLikeControlWithModifyHandler /** Very small helper class which adds a SetModifyHdl to a ListBox-derived class, diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 1be13ed9f42b..10618afd9feb 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -614,7 +614,6 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString } // pcr - // component helper namespace namespace comp_StringRepresentation { diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 1969013405c7..7a64cc35ba07 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -36,7 +36,6 @@ namespace pcr { - //= SubmissionHelper class SubmissionHelper : public EFormsHelper diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 48decec8e889..c254ade89c9c 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -40,7 +40,6 @@ namespace pcr { - //= TabOrderListBox class TabOrderListBox : public SvTreeListBox @@ -59,7 +58,6 @@ namespace pcr }; - //= TabOrderDialog class TabOrderDialog : public ModalDialog diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index 5dccb7a860da..809d168ad494 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= UnoURL class UnoURL diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 2c21bf7cefaa..b320a9345040 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= NumberFormatSampleField class NumberFormatSampleField : public FormattedField diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index b08c65eed05c..0732abb1f5ae 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -38,7 +38,6 @@ namespace pcr { - //= XSDDataType class XSDDataType : public salhelper::SimpleReferenceObject diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 4bc1b999046b..a4e6ab76580f 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -262,7 +262,6 @@ double GridWindow::findMinY() } - double GridWindow::findMaxX() { if( ! m_pXValues ) @@ -275,7 +274,6 @@ double GridWindow::findMaxX() } - double GridWindow::findMaxY() { if( ! m_pNewYValues ) @@ -288,7 +286,6 @@ double GridWindow::findMaxY() } - void GridWindow::computeExtremes() { if( m_nValues && m_pXValues && m_pOrigYValues ) @@ -311,7 +308,6 @@ void GridWindow::computeExtremes() } - Point GridWindow::transform( double x, double y ) { Point aRet; @@ -368,7 +364,6 @@ void GridWindow::computeChunk( double fMin, double fMax, double& fChunkOut, doub } - void GridWindow::computeNew() { if(2L == m_aHandles.size()) @@ -414,7 +409,6 @@ void GridWindow::computeNew() } - double GridWindow::interpolate( double x, double* pNodeX, diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 292df2011e64..bb485b52b2c3 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -58,7 +58,6 @@ struct OutData }; - static void openFile( OutData& out ) { char * effective_url; @@ -102,7 +101,6 @@ static void openFile( OutData& out ) } - static inline OString getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) { @@ -113,7 +111,6 @@ getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, cons } - static inline sal_Int32 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName, sal_Int32 nDefault=-1) @@ -127,7 +124,6 @@ getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, } - static size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream ) { @@ -145,7 +141,6 @@ write_function( void *ptr, size_t size, size_t nmemb, void *stream ) } - static int progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow ) { @@ -178,7 +173,6 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, } - void Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const { @@ -222,7 +216,6 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) } - bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort) { /* Need to investigate further whether it is necessary to call @@ -340,7 +333,6 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal } - bool Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir) { @@ -428,7 +420,6 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe } - void Download::stop() { diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 4f93a77d3d8d..0a813fc9a02f 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -95,7 +95,6 @@ OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloa } - namespace { @@ -117,15 +116,12 @@ static inline OUString getBaseInstallation() #endif - inline bool isObsoleteUpdateInfo(const OUString& rBuildId) { return !rBuildId.equals(getBuildId()) && !rBuildId.isEmpty(); } - - OUString getImageFromFileName(const OUString& aFile) { #ifndef WNT @@ -200,8 +196,6 @@ OUString getImageFromFileName(const OUString& aFile) } - - static uno::Reference< beans::XPropertySet > createMenuBarUI( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< task::XJob >& xJob) @@ -226,9 +220,6 @@ static uno::Reference< beans::XPropertySet > createMenuBarUI( } - - - typedef sal_Bool (* OnlineCheckFunc) (); class UpdateCheckThread : public WorkerThread @@ -355,7 +346,6 @@ private: }; - UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition, const uno::Reference& xContext ) : m_aCondition(rCondition), @@ -368,14 +358,11 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition, } - UpdateCheckThread::~UpdateCheckThread() { } - - void SAL_CALL UpdateCheckThread::terminate() { @@ -386,7 +373,6 @@ UpdateCheckThread::terminate() } - void SAL_CALL UpdateCheckThread::join() { @@ -400,7 +386,6 @@ UpdateCheckThread::join() } - void UpdateCheckThread::cancel() { @@ -411,7 +396,6 @@ UpdateCheckThread::cancel() } - bool UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) { @@ -450,7 +434,6 @@ UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) } - void SAL_CALL UpdateCheckThread::onTerminated() { @@ -458,7 +441,6 @@ UpdateCheckThread::onTerminated() } - void SAL_CALL UpdateCheckThread::run() { @@ -564,7 +546,6 @@ UpdateCheckThread::run() } - void SAL_CALL ManualUpdateCheckThread::run() { @@ -581,14 +562,12 @@ ManualUpdateCheckThread::run() } - MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck) : m_aUpdateCheck(rUpdateCheck) { }; - uno::Any SAL_CALL MenuBarButtonJob::execute(const uno::Sequence& ) throw (lang::IllegalArgumentException, uno::Exception, std::exception) @@ -602,7 +581,6 @@ MenuBarButtonJob::execute(const uno::Sequence& ) } - DownloadThread::DownloadThread(osl::Condition& rCondition, const uno::Reference& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler, @@ -616,13 +594,11 @@ DownloadThread::DownloadThread(osl::Condition& rCondition, } - DownloadThread::~DownloadThread() { } - void SAL_CALL DownloadThread::run() { @@ -671,7 +647,6 @@ DownloadThread::run() } - void DownloadThread::cancel() { m_aDownload.stop(); @@ -682,7 +657,6 @@ void DownloadThread::cancel() } - void SAL_CALL DownloadThread::suspend() { osl::Thread::suspend(); @@ -690,7 +664,6 @@ void SAL_CALL DownloadThread::suspend() } - void SAL_CALL DownloadThread::onTerminated() { delete this; @@ -736,7 +709,6 @@ void SAL_CALL ShutdownThread::onTerminated() } - } // anonymous namespace UpdateCheck::UpdateCheck() @@ -849,7 +821,6 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, } - void UpdateCheck::cancel() { @@ -867,7 +838,6 @@ UpdateCheck::cancel() } - void UpdateCheck::download() { @@ -896,7 +866,6 @@ UpdateCheck::download() } - void UpdateCheck::install() { @@ -940,7 +909,6 @@ UpdateCheck::install() } - void UpdateCheck::pause() { @@ -957,7 +925,6 @@ UpdateCheck::pause() } - void UpdateCheck::resume() { @@ -974,7 +941,6 @@ UpdateCheck::resume() } - void UpdateCheck::closeAfterFailure() { @@ -989,7 +955,6 @@ UpdateCheck::closeAfterFailure() } - void UpdateCheck::shutdownThread(bool join) { @@ -1013,7 +978,6 @@ UpdateCheck::shutdownThread(bool join) } - void UpdateCheck::enableAutoCheck(bool enable) { @@ -1024,7 +988,6 @@ UpdateCheck::enableAutoCheck(bool enable) } - void UpdateCheck::enableDownload(bool enable, bool paused) { @@ -1051,7 +1014,6 @@ UpdateCheck::enableDownload(bool enable, bool paused) } - bool UpdateCheck::downloadTargetExists(const OUString& rFileName) { @@ -1112,7 +1074,6 @@ bool UpdateCheck::checkDownloadDestination( const OUString& rFileName ) } - void UpdateCheck::downloadStalled(const OUString& rErrorMessage) { @@ -1125,7 +1086,6 @@ UpdateCheck::downloadStalled(const OUString& rErrorMessage) } - void UpdateCheck::downloadProgressAt(sal_Int8 nPercent) { @@ -1138,7 +1098,6 @@ UpdateCheck::downloadProgressAt(sal_Int8 nPercent) } - void UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize) { @@ -1157,7 +1116,6 @@ UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize } - void UpdateCheck::downloadFinished(const OUString& rLocalFileName) { @@ -1180,7 +1138,6 @@ UpdateCheck::downloadFinished(const OUString& rLocalFileName) } - void UpdateCheck::cancelDownload() { @@ -1207,7 +1164,6 @@ UpdateCheck::cancelDownload() } - void UpdateCheck::showDialog(bool forceCheck) { @@ -1269,7 +1225,6 @@ UpdateCheck::showDialog(bool forceCheck) } - void UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) { @@ -1350,7 +1305,6 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) } - void UpdateCheck::setCheckFailedState() { @@ -1447,7 +1401,6 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) } - UpdateState UpdateCheck::getUIState(const UpdateInfo& rInfo) { @@ -1465,7 +1418,6 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo) } - void UpdateCheck::showReleaseNote(const OUString& rURL) const { @@ -1479,7 +1431,6 @@ UpdateCheck::showReleaseNote(const OUString& rURL) const } - bool UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL) { @@ -1546,7 +1497,6 @@ void UpdateCheck::showExtensionDialog() } - rtl::Reference UpdateCheck::getUpdateHandler() { @@ -1559,7 +1509,6 @@ UpdateCheck::getUpdateHandler() } - uno::Reference< task::XInteractionHandler > UpdateCheck::getInteractionHandler() const { @@ -1574,7 +1523,6 @@ UpdateCheck::getInteractionHandler() const } - bool UpdateCheck::isDialogShowing() const { @@ -1583,7 +1531,6 @@ UpdateCheck::isDialogShowing() const }; - void UpdateCheck::autoCheckStatusChanged(bool enabled) { @@ -1602,7 +1549,6 @@ UpdateCheck::autoCheckStatusChanged(bool enabled) }; - void UpdateCheck::autoCheckIntervalChanged() { diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index d4a9a55094ce..42b46cf4fdb4 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -71,7 +71,6 @@ private: }; - /* This class implements the non published UNO service com.sun.star.setup.UpdateCheckConfig, * which primary use is to be able to track changes done in the Tools -> Options page of this * component, as this is not supported by the OOo configuration for extendable groups. @@ -202,8 +201,6 @@ private: }; - - template T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const sal_Char * pszName ) throw (css::uno::RuntimeException) diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index b2051c86ceba..ba41067d047a 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -109,8 +109,6 @@ private: }; - - InitUpdateCheckJobThread::InitUpdateCheckJobThread( const uno::Reference< uno::XComponentContext > &xContext, const uno::Sequence< beans::NamedValue > &xParameters, @@ -158,7 +156,6 @@ UpdateCheckJob::~UpdateCheckJob() } - uno::Sequence< OUString > UpdateCheckJob::getServiceNames() { @@ -167,7 +164,6 @@ UpdateCheckJob::getServiceNames() }; - OUString UpdateCheckJob::getImplName() { @@ -175,8 +171,6 @@ UpdateCheckJob::getImplName() } - - uno::Any UpdateCheckJob::execute(const uno::Sequence& namedValues) throw (lang::IllegalArgumentException, uno::Exception, std::exception) @@ -259,7 +253,6 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa } - OUString SAL_CALL UpdateCheckJob::getImplementationName() throw (uno::RuntimeException, std::exception) { @@ -267,7 +260,6 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException, std::excep } - uno::Sequence< OUString > SAL_CALL UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { @@ -315,7 +307,6 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) } // anonymous namespace - static uno::Reference SAL_CALL createJobInstance(const uno::Reference& xContext) { @@ -327,7 +318,6 @@ createJobInstance(const uno::Reference& xContext) } - static uno::Reference SAL_CALL createConfigInstance(const uno::Reference& xContext) { @@ -335,7 +325,6 @@ createConfigInstance(const uno::Reference& xContext) } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -358,7 +347,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index d4e03b3bac74..40939ec6042c 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -504,8 +504,6 @@ void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& ) } - - void UpdateHandler::updateState( UpdateState eState ) { if ( meLastState == eState ) @@ -721,7 +719,6 @@ void UpdateHandler::loadStrings() } - void UpdateHandler::startThrobber( bool bStart ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index f2aaa4940f37..f68e5b1b8b9c 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -44,7 +44,6 @@ namespace task = css::task ; namespace xml = css::xml ; - static bool getBootstrapData( uno::Sequence< OUString > & rRepositoryList, @@ -74,7 +73,6 @@ getBootstrapData( } - // Returns 'true' if successfully connected to the update server bool checkForUpdates( diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index e74ead2fc36a..070f930af160 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -32,7 +32,6 @@ namespace task = ::com::sun::star::task; namespace uno = ::com::sun::star::uno; - SAL_IMPLEMENT_MAIN() { (void) argv; diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index c205732dc2fe..083c095d8b0c 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -38,7 +38,6 @@ namespace uno = ::com::sun::star::uno; namespace xml = ::com::sun::star::xml; - SAL_IMPLEMENT_MAIN() { (void) argv; diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 1e459c999259..87d170fad167 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -68,8 +68,6 @@ namespace xml = com::sun::star::xml ; namespace sdbc = com::sun::star::sdbc ; - - namespace { @@ -116,7 +114,6 @@ public: #endif - class ActiveDataSink : public ::cppu::WeakImplHelper< io::XActiveDataSink > { uno::Reference< io::XInputStream > m_xStream; @@ -131,7 +128,6 @@ public: }; - class UpdateInformationProvider : public ::cppu::WeakImplHelper< deployment::XUpdateInformationProvider, ucb::XWebDAVCommandEnvironment, @@ -225,7 +221,6 @@ private: }; - class UpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { public: @@ -292,7 +287,6 @@ private: }; - class SingleUpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { public: @@ -534,7 +528,6 @@ UpdateInformationProvider::load(const OUString& rURL) } - // TODO: docu content node uno::Reference< xml::dom::XElement > @@ -581,7 +574,6 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode } - uno::Reference< xml::dom::XNode > UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const OUString& rName) @@ -596,7 +588,6 @@ UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& } - uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, @@ -667,7 +658,6 @@ UpdateInformationProvider::getUpdateInformationEnumeration( } - uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( uno::Sequence< OUString > const & repositories, @@ -712,7 +702,6 @@ UpdateInformationProvider::getUpdateInformation( } - void SAL_CALL UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception) { @@ -724,7 +713,6 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception } - void SAL_CALL UpdateInformationProvider::setInteractionHandler( uno::Reference< task::XInteractionHandler > const & handler ) @@ -735,7 +723,6 @@ UpdateInformationProvider::setInteractionHandler( } - uno::Reference< task::XInteractionHandler > SAL_CALL UpdateInformationProvider::getInteractionHandler() throw ( uno::RuntimeException, std::exception ) @@ -776,7 +763,6 @@ UpdateInformationProvider::getServiceNames() }; - OUString UpdateInformationProvider::getImplName() { @@ -784,7 +770,6 @@ UpdateInformationProvider::getImplName() } - OUString SAL_CALL UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, std::exception) { @@ -792,7 +777,6 @@ UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, } - uno::Sequence< OUString > SAL_CALL UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { @@ -808,7 +792,6 @@ UpdateInformationProvider::supportsService( OUString const & serviceName ) throw } // anonymous namespace - static uno::Reference SAL_CALL createInstance(uno::Reference const & xContext) { @@ -816,7 +799,6 @@ createInstance(uno::Reference const & xContext) } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -831,7 +813,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index e2a7375f55d1..f8f9e9f00a10 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star; - static uno::Sequence< OUString > getServiceNames() { uno::Sequence< OUString > aServiceList { "com.sun.star.setup.UpdateCheckUI" }; @@ -74,14 +73,12 @@ static uno::Sequence< OUString > getServiceNames() } - static OUString getImplementationName() { return OUString("vnd.sun.UpdateCheckUI"); } - namespace { @@ -512,9 +509,6 @@ void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyNam } - - - BubbleWindow * UpdateCheckUI::GetBubbleWindow() { if ( !mpIconSysWin ) @@ -736,8 +730,6 @@ IMPL_LINK_TYPED( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, vo } - - #define TIP_HEIGHT 15 #define TIP_WIDTH 7 #define TIP_RIGHT_OFFSET 18 @@ -947,12 +939,9 @@ void BubbleWindow::RecalcTextRects() } - - } // anonymous namespace - static uno::Reference SAL_CALL createInstance(const uno::Reference& xContext) { @@ -960,7 +949,6 @@ createInstance(const uno::Reference& xContext) } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -975,7 +963,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/extensions/test/ole/OleClient/axhost.cxx b/extensions/test/ole/OleClient/axhost.cxx index d79ff7b31a10..a163a6a7de4a 100644 --- a/extensions/test/ole/OleClient/axhost.cxx +++ b/extensions/test/ole/OleClient/axhost.cxx @@ -41,5 +41,4 @@ LRESULT HostWin::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, B } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 5759baa24428..d2700be2f1f3 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -189,7 +189,6 @@ bool doParameterTest(const Reference & inv) Sequence seqMix2Out(arArgs1, 3); - //in args + out, optional, positional----------------------------------------- //first general test seqIndices.realloc(0); @@ -872,7 +871,6 @@ bool doSimpleTest(const Reference & inv) return false; - // mixed parameter // mixed1 @@ -1104,11 +1102,6 @@ HRESULT doTest() } - - - - - // // in multi Sequences // // inMulDimArrayLong @@ -1188,14 +1181,9 @@ HRESULT doTest() inv->invoke( OUString(L"inMulDimArrayByte2"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut); - - - - // Tests with a MFC ActiveX control, ( pure dispinterface) - // in parameter MFC ActiveX // unsigned char is not supported by MFC @@ -1286,7 +1274,6 @@ HRESULT doTest() MessageBox( NULL, buff, _T("clientTest"), MB_OK); - // Sequence parameter MFC ActiveX // Sequences are not directly supported. @@ -1298,7 +1285,6 @@ HRESULT doTest() } - //VARIANT_TRUE VT_UI1 diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 00cbcc3e276a..112f8dee4b10 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -60,8 +60,6 @@ void printResultVariantArray( VARIANT & var); void printVariant( VARIANT & var); - - int SAL_CALL _tmain( int argc, _TCHAR * argv[] ) { HRESULT hr; @@ -220,7 +218,6 @@ HRESULT doTest() DISPATCH_METHOD | DISPATCH_PROPERTYGET, ¶ms, &varRet, NULL, NULL); - CComVariant varByteArray; varByteArray.vt= VT_ARRAY | VT_I1; varByteArray.parray= (SAFEARRAY*)arByte; diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index dba797d49699..d61919ea3ec8 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -60,7 +60,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::reflection; - #define IMPL_NAME L"oletest.OleTestImpl" // oletest.OleTestImpl in applicat.rdb #define SERVICE_NAME L"oletest.OleTest" #define KEY1 L"/oletest.OleTestImpl/UNO/SERVICES" @@ -559,7 +558,6 @@ Sequence< Sequence > > SAL_CALL OComponent::methodXEv } - Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte() throw( RuntimeException) { return m_seqByte; @@ -710,7 +708,6 @@ void SAL_CALL OComponent::setAttrXInterface( const Sequence< Reference< XInterfa } - ::sal_Int8 SAL_CALL OComponent::getAByte() throw (RuntimeException) { return m_attr_int8; @@ -1221,7 +1218,6 @@ void SAL_CALL OComponent::setAttrAny2(const Any& AttrAny2_) throw( RuntimeExcept } - // XTestStruct ======================================================================================= void SAL_CALL OComponent::methodStruct(const Property& aProp) throw( RuntimeException ) @@ -1894,8 +1890,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac break; - - } } diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx index 1d067bd04552..89764491cfaf 100644 --- a/extensions/test/ole/cppToUno/testcppuno.cxx +++ b/extensions/test/ole/cppToUno/testcppuno.cxx @@ -36,7 +36,6 @@ #include - using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::script; @@ -72,8 +71,6 @@ int SAL_CALL _tmain( int /*argc*/, _TCHAR * /*argv[]*/ ) } - - HRESULT doTest() { HRESULT hr= S_OK; @@ -166,7 +163,6 @@ HRESULT doTest() } - } SafeArrayDestroy( par); } diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index 3fe5365210de..e4804608bf5e 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -38,9 +38,6 @@ using ::rtl::StringToOUString; #define USTRING_TO_PCHAR(x) OUStringToString(x , CHARSET_DONTKNOW ).GetCharStr() - - - /***** * * A Test root object ! @@ -271,7 +268,6 @@ protected: }; - void TestListener::cmdLine() { // Condition is set by running listener @@ -390,7 +386,6 @@ BOOL PythonCodeLibrary::queryInterface( Uik aUik, XInterfaceRef & rOut ) } - /* * main. */ diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index e6b972931b30..b7174dbe12ab 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -39,7 +39,6 @@ using ::rtl::StringToOUString; #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) - class NullEngineListenerRef : public XEngineListenerRef { virtual void interrupt(const InterruptEngineEvent& Evt) THROWS( (UsrSystemException) ) {} @@ -149,7 +148,6 @@ protected: }; - void CmdDebugger::cmdLine() { char pcLine[80]; @@ -454,10 +452,6 @@ BOOL CmdDebugger::queryInterface( Uik aUik, XInterfaceRef & rOut ) } - - - - /* * main. */ @@ -520,7 +514,6 @@ int SAL_CALL main (int argc, char **argv) xEngine->runAsync( UString( L"x=x+1\nprint 4\n") , XInterfaceRef(), args , XEngineListenerRef() ); - } else if( argc >1 && ! strcmp( argv[1] , "3" ) ) { diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 721d2b05990b..47eedfa23669 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -18,7 +18,6 @@ */ - // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. // Example : testcomponent com.sun.star.io.Pipe stm diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 5cfa08c2c2a5..593ea72897b1 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -185,7 +185,6 @@ void Listener_Impl::windowPaint( const PaintEvent& evt ) void Listener_Impl::disposing( const EventObject& evt ) {} - class FrameControlApplication : public Application { @@ -233,9 +232,6 @@ void FrameControlApplication::init() } - - - XInterfaceRef xInst = xMgr->createInstance( L"stardiv.one.frame.FrameControl" ); if (xInst->queryInterface( XControl::getSmartUik(), _xControl )) { @@ -276,7 +272,6 @@ void FrameControlApplication::deinit() } - void FrameControlApplication::Main() { // void TestErrcodes(); diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index e31420824349..65be9b946b23 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.cxx @@ -38,7 +38,6 @@ public: MyApp aMyApp; - void MyApp::Main() { XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); -- cgit