From b0308236d26c4b97532abf40ffd443ebb464ed92 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 20:05:49 +0100 Subject: Remove visual noise from scripting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id9f177a20d911ce1e041407aa556c9cf13f0efc8 Reviewed-on: https://gerrit.libreoffice.org/8305 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- .../ExportSheetsToHTML/exportsheetstohtml.js | 10 ++-- .../javascript/Highlight/ButtonPressHandler.js | 10 ++-- .../examples/javascript/Highlight/ShowDialog.js | 12 ++-- .../star/script/framework/container/Parcel.java | 2 +- .../script/framework/provider/ScriptContext.java | 2 +- .../framework/provider/javascript/template.js | 12 ++-- .../office/filesystem/OpenOfficeDocFileSystem.java | 2 +- scripting/source/basprov/baslibnode.cxx | 12 ++-- scripting/source/basprov/baslibnode.hxx | 12 ++-- scripting/source/basprov/basmethnode.cxx | 12 ++-- scripting/source/basprov/basmethnode.hxx | 12 ++-- scripting/source/basprov/basmodnode.cxx | 12 ++-- scripting/source/basprov/basmodnode.hxx | 12 ++-- scripting/source/basprov/basprov.cxx | 24 ++++---- scripting/source/basprov/basprov.hxx | 12 ++-- scripting/source/basprov/basscript.cxx | 12 ++-- scripting/source/basprov/basscript.hxx | 12 ++-- scripting/source/dlgprov/dlgevtatt.cxx | 20 +++---- scripting/source/dlgprov/dlgevtatt.hxx | 20 +++---- scripting/source/dlgprov/dlgprov.cxx | 28 ++++----- scripting/source/dlgprov/dlgprov.hxx | 16 +++--- scripting/source/inc/bcholder.hxx | 16 +++--- scripting/source/inc/util/MiscUtils.hxx | 2 +- scripting/source/provider/ActiveMSPList.cxx | 2 +- scripting/source/provider/ActiveMSPList.hxx | 4 +- .../source/provider/BrowseNodeFactoryImpl.cxx | 16 +++--- scripting/source/provider/MasterScriptProvider.cxx | 66 +++++++++++----------- scripting/source/provider/ProviderCache.hxx | 2 +- scripting/source/provider/ScriptImpl.cxx | 6 +- scripting/source/provider/ScriptingContext.cxx | 6 +- scripting/source/provider/ScriptingContext.hxx | 2 +- scripting/source/stringresource/stringresource.cxx | 62 ++++++++++---------- scripting/source/stringresource/stringresource.hxx | 16 +++--- scripting/source/vbaevents/service.cxx | 14 ++--- scripting/workben/installer/IdeUpdater.java | 2 +- scripting/workben/installer/XmlUpdater.java | 4 +- 36 files changed, 243 insertions(+), 243 deletions(-) (limited to 'scripting') diff --git a/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js b/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js index cc7a4cdf5c9b..37f9e5afb33f 100755 --- a/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js +++ b/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js @@ -39,15 +39,15 @@ oDoc = XSCRIPTCONTEXT.getDocument(); xSDoc = UnoRuntime.queryInterface(XSpreadsheetDocument, oDoc); //get the XModel interface from the document xModel = UnoRuntime.queryInterface(XModel,oDoc); -//get the XIndexAccess interface used to access each sheet +//get the XIndexAccess interface used to access each sheet xSheetsIndexAccess = UnoRuntime.queryInterface(XIndexAccess, xSDoc.getSheets()); //get the XStorable interface used to save the document xStorable = UnoRuntime.queryInterface(XStorable,xSDoc); -//get the XModifiable interface used to indicate if the document has been +//get the XModifiable interface used to indicate if the document has been //changed xModifiable = UnoRuntime.queryInterface(XModifiable,xSDoc); -//set up an array of PropertyValue objects used to save each sheet in the +//set up an array of PropertyValue objects used to save each sheet in the //document storeProps = new Array;//PropertyValue[1]; storeProps[0] = new PropertyValue(); @@ -68,7 +68,7 @@ for(var i=0;i& rxContext, const OUString& sScriptingContext, BasicManager* pBasicManager, @@ -133,8 +133,8 @@ namespace basprov -//......................................................................... + } // namespace basprov -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx index 561d4b88ede8..7705b35fd014 100644 --- a/scripting/source/basprov/baslibnode.hxx +++ b/scripting/source/basprov/baslibnode.hxx @@ -29,14 +29,14 @@ class BasicManager; -//......................................................................... + namespace basprov { -//......................................................................... - // ---------------------------------------------------- + + // class BasicLibraryNodeImpl - // ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::browse::XBrowseNode > BasicLibraryNodeImpl_BASE; @@ -72,9 +72,9 @@ namespace basprov throw (::com::sun::star::uno::RuntimeException); }; -//......................................................................... + } // namespace basprov -//......................................................................... + #endif // SCRIPTING_BASLIBNODE_HXX diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index 1837e6a5b4cb..9ae84194a7ee 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -49,14 +49,14 @@ using namespace ::sf_misc; #define BASPROV_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY -//......................................................................... + namespace basprov { -//......................................................................... - // ============================================================================= + + // BasicMethodNodeImpl - // ============================================================================= + BasicMethodNodeImpl::BasicMethodNodeImpl( const Reference< XComponentContext >& rxContext, const OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript ) @@ -330,8 +330,8 @@ namespace basprov -//......................................................................... + } // namespace basprov -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index b2cd2461b469..88f2076318dc 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -34,14 +34,14 @@ class SbMethod; -//......................................................................... + namespace basprov { -//......................................................................... - // ---------------------------------------------------- + + // class BasicMethodNodeImpl - // ---------------------------------------------------- + typedef ::cppu::WeakImplHelper2< ::com::sun::star::script::browse::XBrowseNode, @@ -117,9 +117,9 @@ namespace basprov throw (::com::sun::star::uno::RuntimeException); }; -//......................................................................... + } // namespace basprov -//......................................................................... + #endif // SCRIPTING_BASMETHNODE_HXX diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index 3a94833ab26a..0b18fcfaf693 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -34,14 +34,14 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; -//......................................................................... + namespace basprov { -//......................................................................... - // ============================================================================= + + // BasicModuleNodeImpl - // ============================================================================= + BasicModuleNodeImpl::BasicModuleNodeImpl( const Reference< XComponentContext >& rxContext, const OUString& sScriptingContext, SbModule* pModule, bool isAppScript ) @@ -138,8 +138,8 @@ namespace basprov -//......................................................................... + } // namespace basprov -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx index 75b330fec634..e34424386397 100644 --- a/scripting/source/basprov/basmodnode.hxx +++ b/scripting/source/basprov/basmodnode.hxx @@ -28,14 +28,14 @@ class SbModule; -//......................................................................... + namespace basprov { -//......................................................................... - // ---------------------------------------------------- + + // class BasicModuleNodeImpl - // ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::browse::XBrowseNode > BasicModuleNodeImpl_BASE; @@ -66,9 +66,9 @@ namespace basprov throw (::com::sun::star::uno::RuntimeException); }; -//......................................................................... + } // namespace basprov -//......................................................................... + #endif // SCRIPTING_BASMODNODE_HXX diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index f7f4bd9320a8..d048e6677c9a 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -58,14 +58,14 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::document; using namespace ::sf_misc; -//......................................................................... + namespace basprov { -//......................................................................... - // ============================================================================= + + // component operations - // ============================================================================= + static OUString getImplementationName_BasicProviderImpl() { @@ -103,9 +103,9 @@ namespace basprov return *pNames; } - // ============================================================================= + // BasicProviderImpl - // ============================================================================= + BasicProviderImpl::BasicProviderImpl( const Reference< XComponentContext >& xContext ) :m_pAppBasicManager( 0 ) @@ -515,9 +515,9 @@ namespace basprov return browse::BrowseNodeTypes::CONTAINER; } - // ============================================================================= + // component operations - // ============================================================================= + static Reference< XInterface > SAL_CALL create_BasicProviderImpl( Reference< XComponentContext > const & xContext ) @@ -540,14 +540,14 @@ namespace basprov -//......................................................................... + } // namespace basprov -//......................................................................... -// ============================================================================= + + // component exports -// ============================================================================= + extern "C" { diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx index fcb72bcf9afc..18efd31ac6ac 100644 --- a/scripting/source/basprov/basprov.hxx +++ b/scripting/source/basprov/basprov.hxx @@ -33,14 +33,14 @@ class BasicManager; -//......................................................................... + namespace basprov { -//......................................................................... - // ---------------------------------------------------- + + // class BasicProviderImpl - // ---------------------------------------------------- + typedef ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo, @@ -100,9 +100,9 @@ namespace basprov throw (::com::sun::star::uno::RuntimeException); }; -//......................................................................... + } // namespace basprov -//......................................................................... + #endif // SCRIPTING_BASPROV_HXX diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 482a64e81e87..87cf73ccc4b7 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -42,10 +42,10 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; -//......................................................................... + namespace basprov { -//......................................................................... + #define BASSCRIPT_PROPERTY_ID_CALLER 1 #define BASSCRIPT_PROPERTY_CALLER OUString( "Caller" ) @@ -53,9 +53,9 @@ namespace basprov typedef ::std::map< sal_Int16, Any, ::std::less< sal_Int16 > > OutParamMap; - // ============================================================================= + // BasicScriptImpl - // ============================================================================= + @@ -291,8 +291,8 @@ namespace basprov -//......................................................................... + } // namespace basprov -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index 50cbc28e0980..7d02d386140c 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -31,14 +31,14 @@ class BasicManager; -//......................................................................... + namespace basprov { -//......................................................................... - // ---------------------------------------------------- + + // class BasicScriptImpl - // ---------------------------------------------------- + typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE; @@ -103,9 +103,9 @@ namespace basprov virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -//......................................................................... + } // namespace basprov -//......................................................................... + #endif // SCRIPTING_BASSCRIPT_HXX diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 741e2450b743..09cc8d8e56d1 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::reflection; -//......................................................................... + namespace dlgprov { @@ -147,11 +147,11 @@ namespace dlgprov } } -//......................................................................... - // ============================================================================= + + // DialogEventsAttacherImpl - // ============================================================================= + DialogEventsAttacherImpl::DialogEventsAttacherImpl( const Reference< XComponentContext >& rxContext, const Reference< frame::XModel >& rxModel, const Reference< awt::XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< beans::XIntrospectionAccess >& rxIntrospect, bool bProviderMode, const Reference< script::XScriptListener >& rxRTLListener, const OUString& sDialogLibName ) :mbUseFakeVBAEvents( false ), m_xContext( rxContext ) @@ -371,9 +371,9 @@ namespace dlgprov } - // ============================================================================= + // DialogAllListenerImpl - // ============================================================================= + DialogAllListenerImpl::DialogAllListenerImpl( const Reference< XScriptListener >& rxListener, const OUString& rScriptType, const OUString& rScriptCode ) @@ -443,9 +443,9 @@ namespace dlgprov } - // ============================================================================= + // DialogScriptListenerImpl - // ============================================================================= + DialogUnoScriptListenerImpl::DialogUnoScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< ::com::sun::star::frame::XModel >& rxModel, @@ -684,8 +684,8 @@ namespace dlgprov -//......................................................................... + } // namespace dlgprov -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index c1d4cb801792..310f2fee8b3e 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -34,14 +34,14 @@ #include -//......................................................................... + namespace dlgprov { -//......................................................................... - // ============================================================================= + + // class DialogEventsAttacherImpl - // ============================================================================= + typedef boost::unordered_map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >, OUStringHash, @@ -85,9 +85,9 @@ namespace dlgprov }; - // ============================================================================= + // class DialogAllListenerImpl - // ============================================================================= + typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::XAllListener > DialogAllListenerImpl_BASE; @@ -119,9 +119,9 @@ namespace dlgprov }; - // ============================================================================= + // class DialogScriptListenerImpl - // ============================================================================= + typedef ::cppu::WeakImplHelper1< ::com::sun::star::script::XScriptListener > DialogScriptListenerImpl_BASE; @@ -148,9 +148,9 @@ namespace dlgprov }; -//......................................................................... + } // namespace dlgprov -//......................................................................... + #endif // SCRIPTING_DLGEVT_HXX diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 94cce4377276..8d615c1e38d1 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -83,10 +83,10 @@ namespace comp_DialogModelProvider return static_cast< ::cppu::OWeakObject * >(new dlgprov::DialogModelProvider(context)); } } // closing component helper namespace -//......................................................................... + namespace dlgprov { -//......................................................................... + static OUString aResourceResolverPropName("ResourceResolver"); @@ -160,9 +160,9 @@ static OUString aResourceResolverPropName("ResourceResolver"); return xDialogModel; } - // ============================================================================= + // component operations - // ============================================================================= + static OUString getImplementationName_DialogProviderImpl() { @@ -200,9 +200,9 @@ static OUString aResourceResolverPropName("ResourceResolver"); } - // ============================================================================= + // mutex - // ============================================================================= + ::osl::Mutex& getMutex() { @@ -220,9 +220,9 @@ static OUString aResourceResolverPropName("ResourceResolver"); } - // ============================================================================= + // DialogProviderImpl - // ============================================================================= + DialogProviderImpl::DialogProviderImpl( const Reference< XComponentContext >& rxContext ) :m_xContext( rxContext ) @@ -789,9 +789,9 @@ static OUString aResourceResolverPropName("ResourceResolver"); } - // ============================================================================= + // component operations - // ============================================================================= + static Reference< XInterface > SAL_CALL create_DialogProviderImpl( Reference< XComponentContext > const & xContext ) @@ -811,14 +811,14 @@ static OUString aResourceResolverPropName("ResourceResolver"); -//......................................................................... + } // namespace dlgprov -//......................................................................... -// ============================================================================= + + // component exports -// ============================================================================= + extern "C" { diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index ac201e844c40..9a8abc831268 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -39,21 +39,21 @@ #include #include -//......................................................................... + namespace dlgprov { -//......................................................................... - // ============================================================================= + + // mutex - // ============================================================================= + ::osl::Mutex& getMutex(); - // ============================================================================= + // class DialogProviderImpl - // ============================================================================= + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext); ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const OUString& i_sURL); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel( @@ -150,9 +150,9 @@ namespace dlgprov throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; -//......................................................................... + } // namespace dlgprov -//......................................................................... + #endif // SCRIPTING_DLGPROV_HXX diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx index 6d842ff00571..9209e0584c8f 100644 --- a/scripting/source/inc/bcholder.hxx +++ b/scripting/source/inc/bcholder.hxx @@ -24,14 +24,14 @@ #include -//......................................................................... + namespace scripting_helper { -//......................................................................... - // ---------------------------------------------------- + + // class OMutexHolder - // ---------------------------------------------------- + class OMutexHolder { @@ -39,9 +39,9 @@ namespace scripting_helper ::osl::Mutex m_aMutex; }; - // ---------------------------------------------------- + // class OBroadcastHelperHolder - // ---------------------------------------------------- + class OBroadcastHelperHolder { @@ -55,9 +55,9 @@ namespace scripting_helper const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return m_aBHelper; } }; -//......................................................................... + } // namespace scripting_helper -//......................................................................... + #endif // SCRIPTING_BCHOLDER_HXX diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 5780964460ec..91641cf93b03 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -154,6 +154,6 @@ static OUString parseLocationName( const OUString& location ) }; } // namespace sf_misc -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 089062bd2dff..ba2810c54240 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -242,7 +242,7 @@ ActiveMSPList::addActiveMSP( const Reference< uno::XInterface >& xComponent, } } -//************************************************************************* + void SAL_CALL ActiveMSPList::disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ) diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index 3705660ef64d..aacf54650b72 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -40,7 +40,7 @@ namespace func_provider { //Typedefs -//============================================================================= + typedef ::std::map < css::uno::Reference< css::uno::XInterface > @@ -75,7 +75,7 @@ public: SAL_THROW(( css::lang::IllegalArgumentException, css::uno::RuntimeException )); //XEventListener - //====================================================================== + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException ); diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 7aa42630ce4f..5c6f623a4cde 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -663,9 +663,9 @@ BrowseNodeFactoryImpl::~BrowseNodeFactoryImpl() } -//############################################################################ + // Implementation of XBrowseNodeFactory -//############################################################################ + /* * The selector hierarchy is the standard hierarchy for organizers with the @@ -704,13 +704,13 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() Reference< browse::XBrowseNode > xRet = new DefaultRootBrowseNode( m_xComponentContext ); return xRet; } -//############################################################################ + // Helper methods -//############################################################################ -//############################################################################ + + // Namespace global methods for setting up BrowseNodeFactory service -//############################################################################ + Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames( ) @@ -738,9 +738,9 @@ bnf_create( Reference< XComponentContext > const & xComponentContext ) new BrowseNodeFactoryImpl( xComponentContext ) ); } -//############################################################################ + // Implementation of XServiceInfo -//############################################################################ + OUString SAL_CALL BrowseNodeFactoryImpl::getImplementationName() diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 1879a1987dac..ea64cb786aef 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -55,9 +55,9 @@ using namespace ::sf_misc; namespace func_provider { -//************************************************************************* + // Definitions for MasterScriptProviderFactory global methods. -//************************************************************************* + OUString SAL_CALL mspf_getImplementationName() ; Reference< XInterface > SAL_CALL mspf_create( Reference< XComponentContext > const & xComponentContext ); @@ -77,10 +77,10 @@ bool endsWith( const OUString& target, } /* should be available in some central location. */ -//************************************************************************* + // XScriptProvider implementation -// -//************************************************************************* + + MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ) throw ( RuntimeException ): m_xContext( xContext ), m_bIsValid( false ), m_bInitialised( false ), m_bIsPkgMSP( false ), m_pPCache( 0 ) @@ -91,7 +91,7 @@ MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > m_bIsValid = true; } -//************************************************************************* + MasterScriptProvider::~MasterScriptProvider() { if ( m_pPCache ) @@ -101,7 +101,7 @@ MasterScriptProvider::~MasterScriptProvider() m_pPCache = 0; } -//************************************************************************* + void SAL_CALL MasterScriptProvider::initialize( const Sequence < Any >& args ) throw ( Exception, RuntimeException ) { @@ -125,7 +125,7 @@ throw ( Exception, RuntimeException ) // check if first parameter is a string // if it is, this implies that this is a MSP created // with a user or share ctx ( used for browse functionality ) - // + if ( args[ 0 ] >>= m_sCtxString ) { invokeArgs[ 0 ] = args[ 0 ]; @@ -213,7 +213,7 @@ throw ( Exception, RuntimeException ) } -//************************************************************************* + void MasterScriptProvider::createPkgProvider() { try @@ -240,7 +240,7 @@ void MasterScriptProvider::createPkgProvider() } } -//************************************************************************* + Reference< provider::XScript > MasterScriptProvider::getScript( const OUString& scriptURI ) throw ( provider::ScriptFrameworkErrorException, @@ -369,14 +369,14 @@ throw ( provider::ScriptFrameworkErrorException, return xScript; } -//************************************************************************* + bool MasterScriptProvider::isValid() { return m_bIsValid; } -//************************************************************************* + ProviderCache* MasterScriptProvider::providerCache() { @@ -403,7 +403,7 @@ MasterScriptProvider::providerCache() } -//************************************************************************* + OUString SAL_CALL MasterScriptProvider::getName() throw ( css::uno::RuntimeException ) @@ -433,7 +433,7 @@ MasterScriptProvider::getName() return m_sNodeName; } -//************************************************************************* + Sequence< Reference< browse::XBrowseNode > > SAL_CALL MasterScriptProvider::getChildNodes() throw ( css::uno::RuntimeException ) @@ -463,7 +463,7 @@ MasterScriptProvider::getChildNodes() return children; } -//************************************************************************* + sal_Bool SAL_CALL MasterScriptProvider::hasChildNodes() throw ( css::uno::RuntimeException ) @@ -471,7 +471,7 @@ MasterScriptProvider::hasChildNodes() return sal_True; } -//************************************************************************* + sal_Int16 SAL_CALL MasterScriptProvider::getType() throw ( css::uno::RuntimeException ) @@ -479,7 +479,7 @@ MasterScriptProvider::getType() return browse::BrowseNodeTypes::CONTAINER; } -//************************************************************************* + OUString MasterScriptProvider::parseLocationName( const OUString& location ) @@ -493,7 +493,7 @@ MasterScriptProvider::parseLocationName( const OUString& location ) return temp; } -//************************************************************************* + // Register Package void SAL_CALL MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException) @@ -573,7 +573,7 @@ MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) } } -//************************************************************************* + // Revoke Package void SAL_CALL MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) @@ -648,7 +648,7 @@ MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::No } } -//************************************************************************* + void SAL_CALL MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { @@ -662,7 +662,7 @@ MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement Reference< XInterface >() ); } } -//************************************************************************* + Any SAL_CALL MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException) { @@ -677,7 +677,7 @@ MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSu } return result; } -//************************************************************************* + sal_Bool SAL_CALL MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException) { @@ -750,7 +750,7 @@ MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException return result; } -//************************************************************************* + Sequence< OUString > SAL_CALL MasterScriptProvider::getElementNames( ) throw ( RuntimeException) { @@ -763,7 +763,7 @@ MasterScriptProvider::getElementNames( ) throw ( RuntimeException) } return names; } -//************************************************************************* + Type SAL_CALL MasterScriptProvider::getElementType( ) throw ( RuntimeException) { @@ -771,7 +771,7 @@ MasterScriptProvider::getElementType( ) throw ( RuntimeException) Type t; return t; } -//************************************************************************* + sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException) { // TODO needs implementing @@ -783,7 +783,7 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException return false; } -//************************************************************************* + Sequence< Reference< provider::XScriptProvider > > SAL_CALL MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) { @@ -801,7 +801,7 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) } -//************************************************************************* + OUString SAL_CALL MasterScriptProvider::getImplementationName( ) throw( RuntimeException ) { @@ -814,7 +814,7 @@ throw( RuntimeException ) return cppu::supportsService(this, serviceName); } -//************************************************************************* + Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) throw( RuntimeException ) { @@ -839,14 +839,14 @@ Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames(); namespace scripting_runtimemgr { -//************************************************************************* + Reference< XInterface > SAL_CALL sp_create( const Reference< XComponentContext > & xCompC ) { return ( cppu::OWeakObject * ) new ::func_provider::MasterScriptProvider( xCompC ); } -//************************************************************************* + Sequence< OUString > sp_getSupportedServiceNames( ) SAL_THROW(()) { @@ -859,7 +859,7 @@ Sequence< OUString > sp_getSupportedServiceNames( ) return Sequence< OUString >( names, 3 ); } -//************************************************************************* + OUString sp_getImplementationName( ) SAL_THROW(()) { @@ -922,9 +922,9 @@ static const struct cppu::ImplementationEntry s_entries [] = }; } -//############################################################################ + //#### EXPORTED ############################################################## -//############################################################################ + extern "C" { diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 398214d8eff6..2d15e88007f4 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -39,7 +39,7 @@ namespace func_provider { //Typedefs -//============================================================================= + struct ProviderDetails { diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx index bb815977e266..f06075164287 100644 --- a/scripting/source/provider/ScriptImpl.cxx +++ b/scripting/source/provider/ScriptImpl.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::script::framework; namespace func_provider { -//************************************************************************* + ScriptImpl::ScriptImpl( const Reference< beans::XPropertySet > & scriptingContext, const Reference< runtime::XScriptInvocation > & runtimeMgr, @@ -43,13 +43,13 @@ throw ( RuntimeException ) : SAL_INFO("scripting.provider", "" ); } -//************************************************************************* + ScriptImpl::~ScriptImpl() { SAL_INFO("scripting.provider", "" ); } -//************************************************************************* + Any SAL_CALL ScriptImpl::invoke( const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx index 1884c572b1e0..1e02748f543b 100644 --- a/scripting/source/provider/ScriptingContext.cxx +++ b/scripting/source/provider/ScriptingContext.cxx @@ -38,10 +38,10 @@ using namespace com::sun::star::uno; namespace func_provider { -//************************************************************************* + // XScriptingContext implementation -// -//************************************************************************* + + ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xContext ) : //ScriptingContextImpl_BASE( GetMutex()), OPropertyContainer( GetBroadcastHelper() ), m_xContext( xContext, UNO_SET_THROW ) diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx index 259959ae7fa9..ef2db2a72bb1 100644 --- a/scripting/source/provider/ScriptingContext.hxx +++ b/scripting/source/provider/ScriptingContext.hxx @@ -37,7 +37,7 @@ namespace func_provider { //Typedefs -//============================================================================= + //typedef ::cppu::WeakImplHelper1< css::beans::XPropertySet > ScriptingContextImpl_BASE; class ScriptingContext : public ::comphelper::OMutexAndBroadcastHelper, public ::comphelper::OPropertyContainer, diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index ef8ad4965a92..7d306dd83a11 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -48,14 +48,14 @@ using namespace ::com::sun::star::embed; using namespace ::com::sun::star::container; -//......................................................................... + namespace stringresource { -//......................................................................... -// ============================================================================= + + // mutex -// ============================================================================= + ::osl::Mutex& getMutex() { @@ -73,9 +73,9 @@ namespace stringresource } -// ============================================================================= + // StringResourceImpl -// ============================================================================= + // component operations static Sequence< OUString > getSupportedServiceNames_StringResourceImpl() @@ -98,7 +98,7 @@ static Reference< XInterface > SAL_CALL create_StringResourceImpl( } -// ============================================================================= + StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ) @@ -112,7 +112,7 @@ StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rx { } -// ============================================================================= + StringResourceImpl::~StringResourceImpl() { @@ -130,7 +130,7 @@ StringResourceImpl::~StringResourceImpl() } -// ============================================================================= + // XServiceInfo OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException) @@ -149,7 +149,7 @@ Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (Run } -// ============================================================================= + // XModifyBroadcaster void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& aListener ) @@ -173,7 +173,7 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener } -// ============================================================================= + // XStringResourceResolver OUString StringResourceImpl::implResolveString @@ -321,7 +321,7 @@ Sequence< Locale > StringResourceImpl::getLocales( ) } -// ============================================================================= + // XStringResourceManager void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) @@ -641,7 +641,7 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) } -// ============================================================================= + // Private helper methods LocaleItem* StringResourceImpl::getItemForLocale @@ -723,7 +723,7 @@ void StringResourceImpl::implNotifyListeners( void ) } -// ============================================================================= + // Loading bool StringResourceImpl::loadLocale( LocaleItem* pLocaleItem ) @@ -758,9 +758,9 @@ Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory } -// ============================================================================= + // StringResourcePersistenceImpl -// ============================================================================= + StringResourcePersistenceImpl::StringResourcePersistenceImpl( const Reference< XComponentContext >& rxContext ) : StringResourcePersistenceImpl_BASE( rxContext ) @@ -1658,7 +1658,7 @@ void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& } -// ============================================================================= + // Private helper methods bool checkNamingSceme( const OUString& aName, const OUString& aNameBase, @@ -2263,9 +2263,9 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale } -// ============================================================================= + // StringResourceWithStorageImpl -// ============================================================================= + // component operations static Sequence< OUString > getSupportedServiceNames_StringResourceWithStorageImpl() @@ -2544,9 +2544,9 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto } -// ============================================================================= + // Private helper methods -// ============================================================================= + // Scan locale properties files void StringResourceWithStorageImpl::implScanLocales( void ) @@ -2590,9 +2590,9 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) } -// ============================================================================= + // StringResourceWithLocationImpl -// ============================================================================= + // component operations static Sequence< OUString > getSupportedServiceNames_StringResourceWithLocationImpl() @@ -2899,9 +2899,9 @@ void StringResourceWithLocationImpl::setURL( const OUString& URL ) } -// ============================================================================= + // Private helper methods -// ============================================================================= + // Scan locale properties files void StringResourceWithLocationImpl::implScanLocales( void ) @@ -2957,9 +2957,9 @@ const Reference< ucb::XSimpleFileAccess3 > StringResourceWithLocationImpl::getFi } -// ============================================================================= + // component export operations -// ============================================================================= + static const struct ::cppu::ImplementationEntry s_component_entries [] = { @@ -2985,14 +2985,14 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = }; -//......................................................................... + } // namespace dlgprov -//......................................................................... -// ============================================================================= + + // component exports -// ============================================================================= + extern "C" { diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index d8e2968f44d2..097326228505 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -36,21 +36,21 @@ #include #include -//......................................................................... + namespace stringresource { -//......................................................................... -// ============================================================================= + + // mutex -// ============================================================================= + ::osl::Mutex& getMutex(); -// ============================================================================= + // class stringresourceImpl -// ============================================================================= + // Hashtable to map string ids to string struct hashName_Impl @@ -671,9 +671,9 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); }; -//......................................................................... + } // namespace stringtable -//......................................................................... + #endif // SCRIPTING_DLGPROV_HXX diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 9baec6f24a60..a628e3755161 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -21,17 +21,17 @@ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/registry/XRegistryKey.hpp" -// ============================================================================= + // component exports -// ============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; namespace evtlstner { - // ============================================================================= + // component operations - // ============================================================================= + uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) @@ -49,9 +49,9 @@ namespace evtlstner namespace ooevtdescgen { - // ============================================================================= + // component operations - // ============================================================================= + uno::Reference< XInterface > SAL_CALL create( Reference< XComponentContext > const & xContext ) @@ -69,7 +69,7 @@ namespace ooevtdescgen - // ============================================================================= + const ::cppu::ImplementationEntry s_component_entries [] = { diff --git a/scripting/workben/installer/IdeUpdater.java b/scripting/workben/installer/IdeUpdater.java index 63cb0c2d389b..a09d0657bf1e 100644 --- a/scripting/workben/installer/IdeUpdater.java +++ b/scripting/workben/installer/IdeUpdater.java @@ -85,7 +85,7 @@ public class IdeUpdater extends Thread { try { wait(); } catch (InterruptedException eInt) { - //... + } } } diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java index 884c0e323ece..d9f9832bc4b8 100644 --- a/scripting/workben/installer/XmlUpdater.java +++ b/scripting/workben/installer/XmlUpdater.java @@ -125,7 +125,7 @@ public class XmlUpdater extends Thread { try { wait(); } catch (InterruptedException eInt) { - //... + } } } @@ -330,7 +330,7 @@ public class XmlUpdater extends Thread { return; } - //-------------------------------- + progressBar.setString("Registering Scripting Framework"); progressBar.setValue(3); -- cgit