From 6a38eace8c0936c507cb02b8d0dd09e837a183fd Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 17:41:32 +0100 Subject: Remove visual noise from basic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I10865b94f67de39e9dbcbe71ede42aa94d81db61 Reviewed-on: https://gerrit.libreoffice.org/8234 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basic/source/basmgr/basicmanagerrepository.cxx | 28 ++++++++++----------- basic/source/basmgr/basmgr.cxx | 28 ++++++++++----------- basic/source/basmgr/vbahelper.cxx | 10 ++++---- basic/source/classes/eventatt.cxx | 4 +-- basic/source/classes/propacc.cxx | 2 +- basic/source/classes/sb.cxx | 10 ++++---- basic/source/classes/sbunoobj.cxx | 34 +++++++++++++------------- basic/source/classes/sbxmod.cxx | 2 +- basic/source/comp/codegen.cxx | 2 +- basic/source/inc/codegen.hxx | 4 +-- basic/source/inc/dlgcont.hxx | 4 +-- basic/source/inc/namecont.hxx | 18 +++++++------- basic/source/inc/propacc.hxx | 6 ++--- basic/source/inc/sbunoobj.hxx | 2 +- basic/source/inc/scriptcont.hxx | 6 ++--- basic/source/runtime/methods.cxx | 4 +-- basic/source/runtime/runtime.cxx | 12 ++++----- basic/source/sbx/sbxbase.cxx | 6 ++--- basic/source/sbx/sbxcurr.cxx | 2 +- basic/source/sbx/sbxform.cxx | 10 ++++---- basic/source/sbx/sbxvals.cxx | 2 +- basic/source/sbx/sbxvalue.cxx | 12 ++++----- basic/source/sbx/sbxvar.cxx | 20 +++++++-------- basic/source/uno/dlgcont.cxx | 6 ++--- basic/source/uno/namecont.cxx | 10 ++++---- basic/source/uno/sbmodule.cxx | 8 +++--- basic/source/uno/sbmodule.hxx | 8 +++--- basic/source/uno/sbservices.cxx | 8 +++--- basic/source/uno/scriptcont.cxx | 8 +++--- 29 files changed, 138 insertions(+), 138 deletions(-) (limited to 'basic') diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 0e483d698177..316007537c76 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -46,10 +46,10 @@ #include -//........................................................................ + namespace basic { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -73,9 +73,9 @@ namespace basic typedef ::std::vector< BasicManagerCreationListener* > CreationListeners; - //==================================================================== + //= BasicManagerCleaner - //==================================================================== + /// is the only instance which is allowed to delete a BasicManager instance class BasicManagerCleaner { @@ -87,9 +87,9 @@ namespace basic } }; - //==================================================================== + //= ImplRepository - //==================================================================== + class ImplRepository : public ::utl::OEventListenerAdapter, public SfxListener { private: @@ -207,9 +207,9 @@ namespace basic StarBASIC* impl_getDefaultAppBasicLibrary(); }; - //==================================================================== + //= CreateImplRepository - //==================================================================== + struct CreateImplRepository { ImplRepository* operator()() @@ -220,9 +220,9 @@ namespace basic }; - //==================================================================== + //= ImplRepository - //==================================================================== + ImplRepository::ImplRepository() { @@ -609,9 +609,9 @@ namespace basic } } - //==================================================================== + //= BasicManagerRepository - //==================================================================== + BasicManager* BasicManagerRepository::getDocumentBasicManager( const Reference< XModel >& _rxDocumentModel ) { @@ -642,8 +642,8 @@ namespace basic ImplRepository::Instance().revokeCreationListener( _rListener ); } -//........................................................................ + } // namespace basic -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 60f6804bd0bc..3a79a7460e53 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -134,9 +134,9 @@ BasicManagerImpl::~BasicManagerImpl() } } -//============================================================================ + // BasMgrContainerListenerImpl -//============================================================================ + typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerHelper; @@ -170,9 +170,9 @@ public: }; -//============================================================================ + // BasMgrContainerListenerImpl -//============================================================================ + void BasMgrContainerListenerImpl::insertLibraryImpl( const uno::Reference< script::XLibraryContainer >& xScriptCont, BasicManager* pMgr, uno::Any aLibAny, OUString aLibName ) @@ -373,7 +373,7 @@ BasicError::BasicError( const BasicError& rErr ) : } -//===================================================================== + class BasicLibInfo { @@ -437,7 +437,7 @@ public: }; -//===================================================================== + class BasicLibs { @@ -525,7 +525,7 @@ BasicLibInfo* BasicLibs::Remove( BasicLibInfo* LibInfo ) } -//===================================================================== + BasicLibInfo::BasicLibInfo() { @@ -1845,7 +1845,7 @@ ErrCode BasicManager::ExecuteMacro( OUString const& i_fullyQualifiedName, OUStri return SbxBase::GetError(); } -//===================================================================== + class ModuleInfo_Impl : public ModuleInfoHelper { @@ -1867,7 +1867,7 @@ public: }; -//===================================================================== + class DialogInfo_Impl : public DialogInfoHelper { @@ -1886,7 +1886,7 @@ public: }; -//===================================================================== + class LibraryInfo_Impl : public LibraryInfoHelper { @@ -1930,7 +1930,7 @@ public: { return maLinkTargetURL; } }; -//===================================================================== + class ModuleContainer_Impl : public NameContainerHelper { @@ -2056,7 +2056,7 @@ void ModuleContainer_Impl::removeByName( const OUString& Name ) } -//===================================================================== + uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog ) { @@ -2239,7 +2239,7 @@ void DialogContainer_Impl::removeByName( const OUString& Name ) } -//===================================================================== + class LibraryContainer_Impl : public NameContainerHelper @@ -2385,7 +2385,7 @@ void LibraryContainer_Impl::removeByName( const OUString& Name ) mpMgr->RemoveLib( nLibId ); } -//===================================================================== + typedef WeakImplHelper1< script::XStarBasicAccess > StarBasicAccessHelper; diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index d9dfaa9a9dc7..7434ba56a36a 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -36,7 +36,7 @@ namespace vba { using namespace ::com::sun::star; -// ============================================================================ + namespace { @@ -180,21 +180,21 @@ struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool } // namespace -// ============================================================================ + void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers ) { lclIterateDocuments( &lclLockControllers, rxModel, bLockControllers ); } -// ============================================================================ + void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows ) { lclIterateDocuments( &lclEnableContainerWindows, rxModel, bEnableWindows ); } -// ============================================================================ + void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, const OUString& rPath ) { @@ -215,7 +215,7 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c } } -// ============================================================================ + } // namespace vba } // namespace basic diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 7df636f4312c..b9d44ac26139 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -47,7 +47,7 @@ #include #include -//================================================================================================== + #include #include @@ -564,6 +564,6 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit } -//=================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 9f00c8d6dbde..3ca1e296c0a9 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -197,7 +197,7 @@ void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPrope } } -//============================================================================ + //PropertySetInfoImpl PropertySetInfoImpl::PropertySetInfoImpl() diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 5d9a6f858f4b..a0ffd4cc3bfc 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -64,7 +64,7 @@ using com::sun::star::uno::Any; using com::sun::star::uno::UNO_QUERY; using com::sun::star::lang::XMultiServiceFactory; -// ============================================================================ + class DocBasicItem : public ::cppu::WeakImplHelper1< util::XCloseListener > { @@ -208,7 +208,7 @@ StarBASIC* lclGetDocBasicForModule( SbModule* pModule ) } // namespace -// ============================================================================ + SbxObject* StarBASIC::getVBAGlobals( ) { @@ -468,7 +468,7 @@ SbxObject* SbOLEFactory::CreateObject( const OUString& rClassName ) } -//======================================================================== + // SbFormFactory, show user forms by: dim as new class SbFormFactory : public SbxFactory @@ -512,7 +512,7 @@ SbxObject* SbFormFactory::CreateObject( const OUString& rClassName ) } -//======================================================================== + // SbTypeFactory SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ) @@ -2009,7 +2009,7 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic ) } -//======================================================================== + // #118116 Implementation Collection object TYPEINIT1(BasicCollection,SbxObject) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 8e8c2aac9af3..2bc4c57a0ce5 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3891,7 +3891,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, } -//======================================================================== + // Implementation of an EventAttacher-drawn AllListener, which // solely transmits several events to an general AllListener @@ -3915,18 +3915,18 @@ public: }; -//======================================================================== + BasicAllListener_Impl::BasicAllListener_Impl(const OUString& aPrefixName_) : aPrefixName( aPrefixName_ ) { } -//======================================================================== + BasicAllListener_Impl::~BasicAllListener_Impl() { } -//======================================================================== + void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet ) { @@ -3991,7 +3991,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( return aRetAny; } -//======================================================================== + // Methods of XEventListener void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException ) { @@ -4002,10 +4002,10 @@ void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeExcep -//************************************************************************* + // class InvocationToAllListenerMapper // helper class to map XInvocation to XAllListener (also in project eventattacher!) -//************************************************************************* + class InvocationToAllListenerMapper : public WeakImplHelper1< XInvocation > { public: @@ -4063,14 +4063,14 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper { } -//************************************************************************* + Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void) throw( RuntimeException ) { return Reference< XIntrospectionAccess >(); } -//************************************************************************* + Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw( IllegalArgumentException, CannotConvertException, @@ -4124,7 +4124,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, return aRet; } -//************************************************************************* + void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value) throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException ) @@ -4133,7 +4133,7 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa (void)Value; } -//************************************************************************* + Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException ) { @@ -4142,7 +4142,7 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam return Any(); } -//************************************************************************* + sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) throw( RuntimeException ) { @@ -4150,7 +4150,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) return xMethod.is(); } -//************************************************************************* + sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name) throw( RuntimeException ) { @@ -4158,7 +4158,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam return xField.is(); } -//======================================================================== + // create Uno-Service // 1. Parameter == Prefix-Name of the macro // 2. Parameter == fully qualified name of the listener @@ -4221,7 +4221,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite refVar->PutObject( p->xSbxObj ); } -//======================================================================== + // Represents the DefaultContext property of the ProcessServiceManager // in the Basic runtime system. void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) @@ -4237,7 +4237,7 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWr refVar->PutObject( (SbUnoObject*)xUnoObj ); } -//======================================================================== + // Creates a Basic wrapper object for a strongly typed Uno value // 1. parameter: Uno type as full qualified type name, e.g. "byte[]" void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite ) @@ -4324,7 +4324,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite refVar->PutObject( xUnoAnyObject ); } -//========================================================================== + namespace { class OMutexBasis diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index b840f23c1551..2768ef98b497 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2027,7 +2027,7 @@ sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const } -///////////////////////////////////////////////////////////////////////// + SbMethod::SbMethod( const OUString& r, SbxDataType t, SbModule* p ) : SbxMethod( r, t ), pMod( p ) diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 207fd9159bfb..029175b22b8f 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -512,7 +512,7 @@ public: nOp1 = static_cast( convertBufferOffSet(m_pStart, nOp1) ); break; default: - break; // + break; } m_ConvertedBuf += (S)nOp1; diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx index 06baef243e8b..37c779904f0e 100644 --- a/basic/source/inc/codegen.hxx +++ b/basic/source/inc/codegen.hxx @@ -61,10 +61,10 @@ public: template < class T, class S > class PCodeBuffConvertor { - T m_nSize; // + T m_nSize; sal_uInt8* m_pStart; sal_uInt8* m_pCnvtdBuf; - S m_nCnvtdSize; // + S m_nCnvtdSize; // Disable usual copying symantics and bodgy default ctor PCodeBuffConvertor(); diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 5688a6046880..a22fdb872e36 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -31,7 +31,7 @@ namespace basic { -//============================================================================ + class SfxDialogLibraryContainer : public SfxLibraryContainer { @@ -97,7 +97,7 @@ public: throw( ::com::sun::star::uno::Exception ); }; -//============================================================================ + typedef ::cppu::ImplHelper1 < ::com::sun::star::resource::XStringResourceSupplier > SfxDialogLibrary_BASE; diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 0568a9814631..a2066cf69aa6 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -67,7 +67,7 @@ typedef ::cppu::WeakImplHelper3< ::com::sun::star::container::XContainer, ::com::sun::star::util::XChangesNotifier > NameContainer_BASE; -//============================================================================ + class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE { @@ -147,7 +147,7 @@ public: throw (::com::sun::star::uno::RuntimeException); }; -//============================================================================ + class ModifiableHelper { @@ -178,7 +178,7 @@ public: } }; -//============================================================================ + typedef ::comphelper::OListenerContainerBase< ::com::sun::star::script::vba::XVBAScriptListener, @@ -196,7 +196,7 @@ private: throw (::com::sun::star::uno::Exception); }; -//============================================================================ + class SfxLibrary; @@ -527,7 +527,7 @@ public: throw (::com::sun::star::uno::RuntimeException); }; -//============================================================================ + class LibraryContainerMethodGuard { @@ -546,7 +546,7 @@ public: } }; -//============================================================================ + class SfxLibrary : public ::com::sun::star::container::XNameContainer @@ -705,7 +705,7 @@ protected: virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const = 0; }; -//============================================================================ + class ScriptSubPackageIterator { @@ -729,7 +729,7 @@ public: com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > getNextScriptSubPackage( bool& rbPureDialogLib ); }; -//============================================================================ + class ScriptExtensionIterator { @@ -775,7 +775,7 @@ protected: }; // end class ScriptExtensionIterator -//============================================================================ + } // namespace basic diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index c6ba98ec9ebf..0253cb0a217a 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -35,7 +35,7 @@ typedef ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XPropertyAccess > SbPropertyValuesHelper; -//========================================================================== + class SbPropertyValues: public SbPropertyValuesHelper { @@ -86,7 +86,7 @@ public: virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; -//========================================================================== + typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo > SbPropertySetInfoHelper; @@ -128,7 +128,7 @@ public: throw( ::com::sun::star::uno::RuntimeException ); }; -//========================================================================= + class StarBASIC; class SbxArray; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 12b62e5907a5..e7c20b8b452b 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -364,7 +364,7 @@ void disposeComVariablesForBasic( StarBASIC* pBasic ); void clearNativeObjectWrapperVector( void ); -//======================================================================== + // #118116 Collection object class BasicCollection : public SbxObject diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 357c66336b6e..6c2bc5b07538 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -28,7 +28,7 @@ namespace basic { -//============================================================================ + class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword { @@ -131,7 +131,7 @@ public: }; -//============================================================================ + typedef boost::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash, ::std::equal_to< OUString > > ModuleInfoMap; typedef ::cppu::ImplHelper1< ::com::sun::star::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE; @@ -186,7 +186,7 @@ protected: virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const; }; -//============================================================================ + } // namespace basic diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index c7552ccc2607..4f456199fa7e 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3783,8 +3783,8 @@ OUString getBasicTypeName( SbxDataType eType ) "Boolean", // SbxBOOL "Variant", // SbxVARIANT "DataObject", // SbxDATAOBJECT - "Unknown Type", // - "Unknown Type", // + "Unknown Type", + "Unknown Type", "Char", // SbxCHAR "Byte", // SbxBYTE "UShort", // SbxUSHORT diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 2adbc6124f0a..3ee4b93c2ed7 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -244,7 +244,7 @@ SbiRuntime::pStep2 SbiRuntime::aStep2[] = {// all opcodes with two operands }; -// SbiRTLData // +// SbiRTLData SbiRTLData::SbiRTLData() { @@ -261,7 +261,7 @@ SbiRTLData::~SbiRTLData() delete pWildCard; } -// SbiInstance // +// SbiInstance // 16.10.96: #31460 new concept for StepInto/Over/Out // The decision whether StepPoint shall be called is done with the help of @@ -563,7 +563,7 @@ SbMethod* SbiInstance::GetCaller( sal_uInt16 nLevel ) return p ? p->GetCaller() : NULL; } -// SbiInstance // +// SbiInstance // Attention: pMeth can also be NULL (on a call of the init-code) @@ -1294,8 +1294,8 @@ SbiForStack* SbiRuntime::FindForStackItemForCollection( class BasicCollection* p } -////////////////////////////////////////////////////////////////////////// -// + + // DLL-calls void SbiRuntime::DllCall @@ -2988,7 +2988,7 @@ void SbiRuntime::StepJUMPF( sal_uInt32 nOp1 ) // ONJUMP 2 // JUMP target1 // JUMP target2 -// ... + // if 0x8000 is set in the operand, push the return address (ON..GOSUB) void SbiRuntime::StepONJUMP( sal_uInt32 nOp1 ) diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 7b50b63a0531..cd72554a3c0e 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -48,7 +48,7 @@ SbxAppData::~SbxAppData() } -//////////////////////////////// SbxBase ///////////////////////////////// +//////////////////////////////// SbxBase DBG_NAME(SbxBase); @@ -330,7 +330,7 @@ sal_Bool SbxBase::StoreCompleted() return sal_True; } -//////////////////////////////// SbxFactory //////////////////////////////// +//////////////////////////////// SbxFactory SbxFactory::~SbxFactory() { @@ -346,7 +346,7 @@ SbxObject* SbxFactory::CreateObject( const OUString& ) return NULL; } -///////////////////////////////// SbxInfo ////////////////////////////////// +///////////////////////////////// SbxInfo SbxInfo::~SbxInfo() {} diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index aac9e3399d26..1634ad8057e5 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -86,7 +86,7 @@ static OUString ImpCurrencyToString( const sal_Int64 &rVal ) // but more natural as only the necessary digits // to the right of the decimal places are displayed // It would be great to conditionally be able to display like that too - // + // Val OOo (Cur) VBA (Cur) // --- --------- --------- // 0 0.0000 0 diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index 315b94db2ea2..dbc11a5bc805 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -40,9 +40,9 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings #include #include -//================================================================= + //=========================== DEFINES ============================= -//================================================================= + #define _NO_DIGIT -1 @@ -87,7 +87,7 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings // Comment: the character @ means that thousand-separators shall // be generated. That's a StarBasic 'extension'. -//================================================================= + double get_number_of_digits( double dNumber ) @@ -99,9 +99,9 @@ double get_number_of_digits( double dNumber ) return floor( log10( fabs( dNumber ) ) ); } -//================================================================= + //======================= IMPLEMENTATION ========================== -//================================================================= + SbxBasicFormater::SbxBasicFormater( sal_Unicode _cDecPoint, sal_Unicode _cThousandSep, OUString _sOnStrg, diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx index 654f63f95987..649084fe3969 100644 --- a/basic/source/sbx/sbxvals.cxx +++ b/basic/source/sbx/sbxvals.cxx @@ -22,7 +22,7 @@ #include #include -///////////////////////////// BigInt/Currency ////////////////////////////// +///////////////////////////// BigInt/Currency SbxValues::SbxValues( const BigInt &rBig ) : eType(SbxCURRENCY) { diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 5245d86b90d5..ac8ed662130e 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -27,7 +27,7 @@ TYPEINIT1(SbxValue,SbxBase) -///////////////////////////// constructors ////////////////////////////// +///////////////////////////// constructors SbxValue::SbxValue() : SbxBase() { @@ -220,7 +220,7 @@ void SbxValue::Clear() void SbxValue::Broadcast( sal_uIntPtr ) {} -//////////////////////////// Readout data ////////////////////////////// +//////////////////////////// Readout data // Detect the "right" variables. If it is an object, will be addressed either // the object itself or its default property. @@ -460,7 +460,7 @@ GET( GetUInt64, SbxSALUINT64, sal_uInt64, uInt64 ) GET( GetDecimal, SbxDECIMAL, SbxDecimal*, pDecimal ) -//////////////////////////// Write data ///////////////////////////// +//////////////////////////// Write data sal_Bool SbxValue::Put( const SbxValues& rVal ) { @@ -703,7 +703,7 @@ PUT( PutInt64, SbxSALINT64, sal_Int64, nInt64 ) PUT( PutUInt64, SbxSALUINT64, sal_uInt64, uInt64 ) PUT( PutDecimal, SbxDECIMAL, SbxDecimal*, pDecimal ) -////////////////////////// Setting of the data type /////////////////////////// +////////////////////////// Setting of the data type sal_Bool SbxValue::IsFixed() const { @@ -867,7 +867,7 @@ sal_Bool SbxValue::Convert( SbxDataType eTo ) else return sal_False; } -////////////////////////////////// Calculating ///////////////////////////////// +////////////////////////////////// Calculating sal_Bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) { @@ -1400,7 +1400,7 @@ sal_Bool SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const return bRes; } -///////////////////////////// Reading/Writing //////////////////////////// +///////////////////////////// Reading/Writing sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) { diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index fa1e66a487ae..18c219b72e13 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -29,7 +29,7 @@ #include using namespace com::sun::star::uno; -///////////////////////////// SbxVariable ////////////////////////////// +///////////////////////////// SbxVariable TYPEINIT1(SbxVariable,SbxValue) TYPEINIT1(SbxHint,SfxSimpleHint) @@ -38,7 +38,7 @@ TYPEINIT1(SbxHint,SfxSimpleHint) static sal_uIntPtr nVar = 0; #endif -///////////////////////////// SbxVariableImpl //////////////////////////// +///////////////////////////// SbxVariableImpl class SbxVariableImpl { @@ -59,7 +59,7 @@ class SbxVariableImpl }; -///////////////////////////// Constructors ////////////////////////////// +///////////////////////////// Constructors SbxVariable::SbxVariable() : SbxValue() { @@ -149,7 +149,7 @@ SbxVariable::~SbxVariable() delete pCst; } -////////////////////////////// Broadcasting ////////////////////////////// +////////////////////////////// Broadcasting SfxBroadcaster& SbxVariable::GetBroadcaster() { @@ -234,7 +234,7 @@ void SbxVariable::SetParameters( SbxArray* p ) } -/////////////////////////// Name of the variables /////////////////////////// +/////////////////////////// Name of the variables void SbxVariable::SetName( const OUString& rName ) { @@ -369,7 +369,7 @@ sal_uInt16 SbxVariable::MakeHashCode( const OUString& rName ) return n; } -////////////////////////////// Operators //////////////////////////////// +////////////////////////////// Operators SbxVariable& SbxVariable::operator=( const SbxVariable& r ) { @@ -392,7 +392,7 @@ SbxVariable& SbxVariable::operator=( const SbxVariable& r ) return *this; } -//////////////////////////////// Conversion //////////////////////////////// +//////////////////////////////// Conversion SbxDataType SbxVariable::GetType() const { @@ -499,7 +499,7 @@ void SbxVariable::ClearComListener( void ) } -////////////////////////////// Loading/Saving ///////////////////////////// +////////////////////////////// Loading/Saving sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { @@ -667,7 +667,7 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const } } -////////////////////////////// SbxInfo /////////////////////////////////// +////////////////////////////// SbxInfo SbxInfo::SbxInfo() : aHelpFile(), nHelpId( 0 ), aParams() {} @@ -676,7 +676,7 @@ SbxInfo::SbxInfo( const OUString& r, sal_uInt32 n ) : aHelpFile( r ), nHelpId( n ), aParams() {} -////////////////////////////// SbxAlias ////////////////////////////////// +////////////////////////////// SbxAlias SbxAlias::SbxAlias( const SbxAlias& r ) : SvRefBase( r ), SbxVariable( r ), diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index a7ced3816d5d..016c0ffdb5f3 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -63,7 +63,7 @@ using namespace osl; using com::sun::star::uno::Reference; -//============================================================================ + // Implementation class SfxDialogLibraryContainer const sal_Char* SAL_CALL SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; } @@ -447,7 +447,7 @@ SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) thr { return sal_False; // dialog library has no executable code } -//============================================================================ + // Service void createRegistryInfo_SfxDialogLibraryContainer() @@ -487,7 +487,7 @@ Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Refere } -//============================================================================ + // Implementation class SfxDialogLibrary // Ctor diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index fdb21052b87a..2c3295f90a77 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -93,7 +93,7 @@ using ::rtl::Uri; // #i34411: Flag for error handling during migration static bool GbMigrationSuppressErrors = false; -//============================================================================ + // Implementation class NameContainer // Methods XElementAccess @@ -331,7 +331,7 @@ void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesLis maChangesListeners.removeInterface( xListener ); } -//============================================================================ + // ModifiableHelper void ModifiableHelper::setModified( sal_Bool _bModified ) @@ -350,7 +350,7 @@ void ModifiableHelper::setModified( sal_Bool _bModified ) m_aModifyListeners.notifyEach( &XModifyListener::modified, aModifyEvent ); } -//============================================================================ + VBAScriptListenerContainer::VBAScriptListenerContainer( ::osl::Mutex& rMutex ) : VBAScriptListenerContainer_BASE( rMutex ) @@ -364,7 +364,7 @@ bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScri return true; // notify all other listeners too } -//============================================================================ + // Implementation class SfxLibraryContainer DBG_NAME( SfxLibraryContainer ) @@ -3260,7 +3260,7 @@ void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListen maNameContainer.removeChangesListener( xListener ); } -//============================================================================ + // Implementation class ScriptExtensionIterator #define sBasicLibMediaType "application/vnd.sun.star.basic-library" diff --git a/basic/source/uno/sbmodule.cxx b/basic/source/uno/sbmodule.cxx index 56fb9a3b1b61..cbe37423aebd 100644 --- a/basic/source/uno/sbmodule.cxx +++ b/basic/source/uno/sbmodule.cxx @@ -20,10 +20,10 @@ #include "sbmodule.hxx" #include -//........................................................................ + namespace basic { -//........................................................................ + struct BasicModuleCreator { @@ -44,9 +44,9 @@ namespace basic return theBasicModuleInstance::get().m_aBasicModule; } -//........................................................................ + } // namespace basic -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx index acab12210bcc..f7eb2e522d97 100644 --- a/basic/source/uno/sbmodule.hxx +++ b/basic/source/uno/sbmodule.hxx @@ -22,10 +22,10 @@ #include -//........................................................................ + namespace basic { -//........................................................................ + class BasicModule : public ::comphelper::OModule { @@ -77,9 +77,9 @@ namespace basic } }; -//........................................................................ + } // namespace basic -//........................................................................ + #endif // INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx index 6c3478b8435c..bc4dcb5f1862 100644 --- a/basic/source/uno/sbservices.cxx +++ b/basic/source/uno/sbservices.cxx @@ -19,10 +19,10 @@ #include "sbmodule.hxx" -//........................................................................ + namespace basic { -//........................................................................ + extern void createRegistryInfo_SfxDialogLibraryContainer(); @@ -42,9 +42,9 @@ namespace basic } } -//........................................................................ + } // namespace basic -//........................................................................ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sb_component_getFactory( const sal_Char* pImplementationName, void*, void* ) diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index dbea90488dc3..57b07e5e4d8a 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -73,7 +73,7 @@ using namespace com::sun::star; using namespace cppu; using namespace osl; -//============================================================================ + // Implementation class SfxScriptLibraryContainer const sal_Char* SAL_CALL SfxScriptLibraryContainer::getInfoFileName() const { return "script"; } @@ -1193,7 +1193,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& return sal_True; } -//============================================================================ + // Service void createRegistryInfo_SfxScriptLibraryContainer() { @@ -1233,7 +1233,7 @@ Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::Create( const Refere return xRet; } -//============================================================================ + // Implementation class SfxScriptLibrary // Ctor @@ -1351,7 +1351,7 @@ void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName ) } -//============================================================================ + } // namespace basic -- cgit