diff options
author | Chris Laplante <mostthingsweb@gmail.com> | 2014-08-16 21:27:34 -0400 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-16 22:19:55 -0500 |
commit | b0e02e72c20f3c921fed34367f8184604387572b (patch) | |
tree | 1dca8a5615fad9d044d08c4ba6bf8fd4d4700f89 /svl | |
parent | fdo#80453 (part) Help button for insert random # (diff) | |
download | core-b0e02e72c20f3c921fed34367f8184604387572b.tar.gz core-b0e02e72c20f3c921fed34367f8184604387572b.zip |
svl: Remove ASCII art and pointless comments
Change-Id: Idd8ea0cb7e7d58a29dbfcae084558320efe5fe43
Reviewed-on: https://gerrit.libreoffice.org/10945
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/ignores.persist | bin | 0 -> 12288 bytes | |||
-rw-r--r-- | svl/source/config/cjkoptions.cxx | 5 | ||||
-rw-r--r-- | svl/source/config/ctloptions.cxx | 6 | ||||
-rw-r--r-- | svl/source/config/languageoptions.cxx | 8 | ||||
-rw-r--r-- | svl/source/fsstor/fsstorage.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/globalnameitem.cxx | 5 | ||||
-rw-r--r-- | svl/source/items/itemprop.cxx | 6 | ||||
-rw-r--r-- | svl/source/items/itemset.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/poolitem.cxx | 6 | ||||
-rw-r--r-- | svl/source/items/slstitm.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/srchitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 3 | ||||
-rw-r--r-- | svl/source/misc/adrparse.cxx | 4 | ||||
-rw-r--r-- | svl/source/misc/filenotation.cxx | 1 | ||||
-rw-r--r-- | svl/source/misc/inethist.cxx | 81 | ||||
-rw-r--r-- | svl/source/misc/urihelper.cxx | 16 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 7 | ||||
-rw-r--r-- | svl/source/svdde/ddecli.cxx | 49 | ||||
-rw-r--r-- | svl/source/svdde/ddedata.cxx | 20 | ||||
-rw-r--r-- | svl/source/svdde/ddeinf.cxx | 2 | ||||
-rw-r--r-- | svl/source/svdde/ddestrg.cxx | 10 | ||||
-rw-r--r-- | svl/source/svdde/ddesvr.cxx | 106 |
22 files changed, 16 insertions, 327 deletions
diff --git a/svl/ignores.persist b/svl/ignores.persist Binary files differnew file mode 100644 index 000000000000..69ae8569c7f0 --- /dev/null +++ b/svl/ignores.persist diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index b8c978809225..eb472265bb4e 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -378,15 +378,12 @@ bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const return bReadOnly; } -// global ---------------------------------------------------------------- +// global static SvtCJKOptions_Impl* pCJKOptions = NULL; static sal_Int32 nCJKRefCount = 0; namespace { struct theCJKOptionsMutex : public rtl::Static< ::osl::Mutex , theCJKOptionsMutex >{}; } - -// class SvtCJKOptions -------------------------------------------------- - SvtCJKOptions::SvtCJKOptions(bool bDontLoad) { // Global access, must be guarded (multithreading) diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index b6c3967f42db..a75ba608b124 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -37,8 +37,6 @@ using namespace ::com::sun::star::uno; #define CFG_READONLY_DEFAULT false -// SvtCJKOptions_Impl ---------------------------------------------------------- - class SvtCTLOptions_Impl : public utl::ConfigItem { private: @@ -377,14 +375,12 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer NotifyListeners(0); } } -// global ---------------------------------------------------------------- +// global static SvtCTLOptions_Impl* pCTLOptions = NULL; static sal_Int32 nCTLRefCount = 0; namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; } -// class SvtCTLOptions -------------------------------------------------- - SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) { // Global access, must be guarded (multithreading) diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 72c53385228a..06d438271e05 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -33,12 +33,10 @@ #endif using namespace ::com::sun::star; -// global ---------------------------------------------------------------------- +// global namespace { struct ALMutex : public rtl::Static< ::osl::Mutex, ALMutex > {}; } -// class SvtLanguageOptions ---------------------------------------------------- - SvtLanguageOptions::SvtLanguageOptions( bool _bDontLoad ) { // Global access, must be guarded (multithreading) @@ -60,7 +58,7 @@ SvtLanguageOptions::~SvtLanguageOptions() delete m_pCJKOptions; delete m_pCTLOptions; } -// CJK options ----------------------------------------------------------------- +// CJK options bool SvtLanguageOptions::IsCJKFontEnabled() const { return m_pCJKOptions->IsCJKFontEnabled(); @@ -85,7 +83,7 @@ bool SvtLanguageOptions::IsAnyEnabled() const { return m_pCJKOptions->IsAnyEnabled(); } -// CTL options ----------------------------------------------------------------- +// CTL options void SvtLanguageOptions::SetCTLFontEnabled( bool _bEnabled ) { m_pCTLOptions->SetCTLFontEnabled( _bEnabled ); diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index b2eb88f2a93c..9eb5547aee02 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -122,8 +122,6 @@ FSStorage_Impl::~FSStorage_Impl() delete m_pContent; } -// FSStorage implementation - FSStorage::FSStorage( const ::ucbhelper::Content& aContent, sal_Int32 nMode, uno::Reference< uno::XComponentContext > xContext ) diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 077e8b9aca0a..faf8f72b647d 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -27,10 +27,7 @@ #include <svl/globalnameitem.hxx> -// STATIC DATA ----------------------------------------------------------- - - - +// STATIC DATA TYPEINIT1_AUTOFACTORY(SfxGlobalNameItem, SfxPoolItem); diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 4179c649652a..9b1de9e2289d 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -24,9 +24,9 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <boost/scoped_ptr.hpp> #include <boost/unordered_map.hpp> -/************************************************************************* - UNO III Implementation -*************************************************************************/ +/* + * UNO III Implementation + */ using namespace com::sun::star; using namespace com::sun::star::beans; using namespace com::sun::star::lang; diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 964c8afc188f..1de26e063407 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -33,7 +33,7 @@ #include <tools/solar.h> #include <rtl/string.hxx> -// STATIC DATA ----------------------------------------------------------- +// STATIC DATA static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0' #if OSL_DEBUG_LEVEL > 1 diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 4b1fc9df8c64..c73f583f8f71 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -40,7 +40,6 @@ const char* pw5 = "Wow! 10.000.000 items!"; IMPL_PTRHINT(SfxPoolItemHint,SfxPoolItem) -// SfxPoolItem ----------------------------------------------------------- SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich) : m_nRefCount(0) , m_nWhich(nWhich) @@ -207,13 +206,11 @@ bool SfxPoolItem::GetPresentation return false; } -// SfxVoidItem ------------------------------------------------------------ SfxVoidItem::SfxVoidItem( sal_uInt16 which ): SfxPoolItem(which) { } -// SfxVoidItem ------------------------------------------------------------ SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy): SfxPoolItem(rCopy) { @@ -250,9 +247,8 @@ SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const return new SfxVoidItem(*this); } -// SfxInvalidItem --------------------------------------------------------- +// SfxInvalidItem -// SfxItemHandle ---------------------------------------------------------- SfxItemHandle::SfxItemHandle(SfxPoolItem &rItem): pRef(new sal_uInt16(1)), pItem(rItem.Clone()) diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index e15106367511..163dd11909a7 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -44,8 +44,6 @@ SfxImpStringList::~SfxImpStringList() nRefCount = 0xffff; } -// class SfxStringListItem ----------------------------------------------- - SfxStringListItem::SfxStringListItem() : pImp(NULL) { diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index bcd8266fcf79..e2bc8c696d1d 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -54,7 +54,7 @@ using namespace com::sun::star::util; #define SRCH_PARA_CONTENT "Content" #define SRCH_PARA_ASIANOPT "AsianOptions" -// STATIC DATA ----------------------------------------------------------- +// STATIC DATA TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0)); diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 7340f16ad16f..541fa95cbcbc 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -958,9 +958,6 @@ SfxStyleSheetBase* SfxStyleSheetPool::Create( const SfxStyleSheet& r ) return new SfxStyleSheet( r ); } -/** - * class SfxUnoStyleSheet - */ SfxUnoStyleSheet::SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ) : ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >( _rName, _rPool, _eFamily, _nMaske ) { diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index 07488a7c2d28..52d22ac36d44 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -722,10 +722,6 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser, } } - -// SvAddressParser - - SvAddressParser::SvAddressParser(const OUString& rInput) : m_bHasFirst(false) { diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index ded51973251e..a6cf323c947b 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -25,7 +25,6 @@ namespace svt { - //= OFileNotation OFileNotation::OFileNotation( const OUString& _rUrlOrPath ) { construct( _rUrlOrPath ); diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 13909b44698c..fa96e4b693d0 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -29,11 +29,9 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> -/*======================================================================== - * +/* * INetURLHistory internals. - * - *======================================================================*/ + */ #define INETHIST_DEF_FTP_PORT 21 #define INETHIST_DEF_HTTP_PORT 80 #define INETHIST_DEF_HTTPS_PORT 443 @@ -46,15 +44,8 @@ */ IMPL_PTRHINT (INetURLHistoryHint, const INetURLObject); -/*======================================================================== - * - * INetURLHistory_Impl interface. - * - *======================================================================*/ class INetURLHistory_Impl: private boost::noncopyable { - /** head_entry. - */ struct head_entry { /** Representation. @@ -73,8 +64,6 @@ class INetURLHistory_Impl: private boost::noncopyable } }; - /** hash_entry. - */ struct hash_entry { /** Representation. @@ -104,8 +93,6 @@ class INetURLHistory_Impl: private boost::noncopyable } }; - /** lru_entry. - */ struct lru_entry { /** Representation. @@ -134,30 +121,20 @@ class INetURLHistory_Impl: private boost::noncopyable */ void initialize (void); - /** capacity. - */ sal_uInt16 capacity (void) const { return (sal_uInt16)(INETHIST_SIZE_LIMIT); } - /** crc32. - */ sal_uInt32 crc32 (OUString const & rData) const { return rtl_crc32 (0, rData.getStr(), rData.getLength() * sizeof(sal_Unicode)); } - /** find. - */ sal_uInt16 find (sal_uInt32 nHash) const; - /** move. - */ void move (sal_uInt16 nSI, sal_uInt16 nDI); - /** backlink. - */ void backlink (sal_uInt16 nThis, sal_uInt16 nTail) { lru_entry &rThis = m_pList[nThis]; @@ -169,8 +146,6 @@ class INetURLHistory_Impl: private boost::noncopyable m_pList[rTail.m_nPrev].m_nNext = nTail; } - /** unlink. - */ void unlink (sal_uInt16 nThis) { lru_entry &rThis = m_pList[nThis]; @@ -191,29 +166,15 @@ public: bool queryUrl (const OUString &rUrl); }; -/*======================================================================== - * - * INetURLHistory_Impl implementation. - * - *======================================================================*/ -/* - * INetURLHistory_Impl. - */ INetURLHistory_Impl::INetURLHistory_Impl (void) { initialize(); } -/* - * ~INetURLHistory_Impl. - */ INetURLHistory_Impl::~INetURLHistory_Impl (void) { } -/* - * initialize. - */ void INetURLHistory_Impl::initialize (void) { m_aHead.initialize(); @@ -227,9 +188,6 @@ void INetURLHistory_Impl::initialize (void) backlink (m_aHead.m_nNext, i); } -/* - * find. - */ sal_uInt16 INetURLHistory_Impl::find (sal_uInt32 nHash) const { sal_uInt16 l = 0; @@ -250,9 +208,6 @@ sal_uInt16 INetURLHistory_Impl::find (sal_uInt32 nHash) const return l; } -/* - * move. - */ void INetURLHistory_Impl::move (sal_uInt16 nSI, sal_uInt16 nDI) { hash_entry e = m_pHash[nSI]; @@ -275,9 +230,6 @@ void INetURLHistory_Impl::move (sal_uInt16 nSI, sal_uInt16 nDI) m_pHash[nDI] = e; } -/* - * putUrl. - */ void INetURLHistory_Impl::putUrl (const OUString &rUrl) { sal_uInt32 h = crc32 (rUrl); @@ -332,9 +284,6 @@ void INetURLHistory_Impl::putUrl (const OUString &rUrl) } } -/* - * queryUrl. - */ bool INetURLHistory_Impl::queryUrl (const OUString &rUrl) { sal_uInt32 h = crc32 (rUrl); @@ -351,32 +300,19 @@ bool INetURLHistory_Impl::queryUrl (const OUString &rUrl) } } -/*======================================================================== - * +/* * INetURLHistory::StaticInstance implementation. - * - *======================================================================*/ + */ INetURLHistory * INetURLHistory::StaticInstance::operator ()() { static INetURLHistory g_aInstance; return &g_aInstance; } -/*======================================================================== - * - * INetURLHistory implementation. - * - *======================================================================*/ -/* - * INetURLHistory. - */ INetURLHistory::INetURLHistory() : m_pImpl (new INetURLHistory_Impl()) { } -/* - * ~INetURLHistory. - */ INetURLHistory::~INetURLHistory() { DELETEZ (m_pImpl); @@ -393,9 +329,6 @@ INetURLHistory* INetURLHistory::GetOrCreate() StaticInstance(), osl::GetGlobalMutex()); } -/* - * NormalizeUrl_Impl. - */ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) { switch (rUrl.GetProtocol()) @@ -432,9 +365,6 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl) } } -/* - * PutUrl_Impl. - */ void INetURLHistory::PutUrl_Impl (const INetURLObject &rUrl) { DBG_ASSERT (m_pImpl, "PutUrl_Impl(): no Implementation"); @@ -457,9 +387,6 @@ void INetURLHistory::PutUrl_Impl (const INetURLObject &rUrl) } } -/* - * QueryUrl_Impl. - */ bool INetURLHistory::QueryUrl_Impl (const INetURLObject &rUrl) { DBG_ASSERT (m_pImpl, "QueryUrl_Impl(): no Implementation"); diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 11fb9c0a263a..bbb3e9ebcaa2 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -46,10 +46,6 @@ using namespace com::sun::star; - -// SmartRel2Abs - - OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, OUString const & rTheRelURIRef, Link const & rMaybeFileHdl, @@ -104,10 +100,6 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, return aAbsURIRef.GetMainURL(eDecodeMechanism, eCharset); } - -// SetMaybeFileHdl - - namespace { struct MaybeFileHdl : public rtl::Static< Link, MaybeFileHdl > {}; } void URIHelper::SetMaybeFileHdl(Link const & rTheMaybeFileHdl) @@ -115,10 +107,6 @@ void URIHelper::SetMaybeFileHdl(Link const & rTheMaybeFileHdl) MaybeFileHdl::get() = rTheMaybeFileHdl; } - -// GetMaybeFileHdl - - Link URIHelper::GetMaybeFileHdl() { return MaybeFileHdl::get(); @@ -727,10 +715,6 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, return OUString(); } - -// removePassword - - OUString URIHelper::removePassword(OUString const & rURI, INetURLObject::EncodeMechanism eEncodeMechanism, INetURLObject::DecodeMechanism eDecodeMechanism, diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 0225b5ffce25..883d9a25e724 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -187,9 +187,6 @@ sal_uInt16 SvNumberFormatter::nSystemCurrencyPosition = 0; // language dependent. #define NF_BANKSYMBOL_FIX_POSITION 1 - -/************* SvNumberFormatter functions **************************/ - const sal_uInt16 SvNumberFormatter::UNLIMITED_PRECISION = ::std::numeric_limits<sal_uInt16>::max(); const sal_uInt16 SvNumberFormatter::INPUTSTRING_PRECISION = ::std::numeric_limits<sal_uInt16>::max()-1; @@ -3921,10 +3918,6 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr return nDefault; } - -//--- NfCurrencyEntry ---------------------------------------------------- - - NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, LanguageType eLang ) { aSymbol = rLocaleData.getCurrSymbol(); diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 78e10c6de239..279c27d60753 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -52,8 +52,6 @@ struct DdeImp long nStatus; }; -// --- DdeInternat::CliCallback() ---------------------------------- - HDDEDATA CALLBACK DdeInternal::CliCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ, HSZ hText2, HDDEDATA hData, DWORD nInfo1, DWORD ) @@ -141,8 +139,6 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( WORD nCode, WORD nCbType, return nRet; } -// --- DdeConnection::DdeConnection() ------------------------------ - DdeConnection::DdeConnection( const OUString& rService, const OUString& rTopic ) { pImp = new DdeImp; @@ -177,8 +173,6 @@ DdeConnection::DdeConnection( const OUString& rService, const OUString& rTopic ) pInst->aConnections.push_back( this ); } -// --- DdeConnection::~DdeConnection() ----------------------------- - DdeConnection::~DdeConnection() { if ( pImp->hConv ) @@ -210,8 +204,6 @@ DdeConnection::~DdeConnection() delete pImp; } -// --- DdeConnection::IsConnected() -------------------------------- - bool DdeConnection::IsConnected() { CONVINFO c; @@ -227,22 +219,16 @@ bool DdeConnection::IsConnected() } } -// --- DdeConnection::GetServiceName() ----------------------------- - const OUString DdeConnection::GetServiceName() { return pService->toOUString(); } -// --- DdeConnection::GetTopicName() ------------------------------- - const OUString DdeConnection::GetTopicName() { return pTopic->toOUString(); } -// --- DdeConnection::GetConvId() ---------------------------------- - sal_IntPtr DdeConnection::GetConvId() { return (sal_IntPtr)pImp->hConv; @@ -255,8 +241,6 @@ const std::vector<DdeConnection*>& DdeConnection::GetConnections() return pInst->aConnections; } -// --- DdeTransaction::DdeTransaction() ---------------------------- - DdeTransaction::DdeTransaction( DdeConnection& d, const OUString& rItemName, long n ) : rDde( d ) @@ -271,8 +255,6 @@ DdeTransaction::DdeTransaction( DdeConnection& d, const OUString& rItemName, rDde.aTransactions.push_back( this ); } -// --- DdeTransaction::~DdeTransaction() --------------------------- - DdeTransaction::~DdeTransaction() { if ( nId && rDde.pImp->hConv ) @@ -286,8 +268,6 @@ DdeTransaction::~DdeTransaction() rDde.aTransactions.end(),this)); } -// --- DdeTransaction::Execute() ----------------------------------- - void DdeTransaction::Execute() { HSZ hItem = *pName; @@ -339,16 +319,11 @@ void DdeTransaction::Execute() } } -// --- DdeTransaction::GetName() ----------------------------------- - const OUString DdeTransaction::GetName() const { return pName->toOUString(); } -// --- DdeTransaction::Data() -------------------------------------- - - void DdeTransaction::Data( const DdeData* p ) { if ( ::tools::SolarMutex::Acquire() ) @@ -358,62 +333,46 @@ void DdeTransaction::Data( const DdeData* p ) } } -// --- DdeTransaction::Done() -------------------------------------- - void DdeTransaction::Done( bool bDataValid ) { const sal_uIntPtr nDataValid(bDataValid); aDone.Call( reinterpret_cast<void*>(nDataValid) ); } -// --- DdeLink::DdeLink() ------------------------------------------ - DdeLink::DdeLink( DdeConnection& d, const OUString& aItemName, long n ) : DdeTransaction (d, aItemName, n) { } -// --- DdeLink::~DdeLink() ----------------------------------------- - DdeLink::~DdeLink() { nType = (sal_uInt16)XTYP_ADVSTOP; nTime = 0; } -// --- DdeLink::Notify() ----------------------------------------- - void DdeLink::Notify() { aNotify.Call( NULL ); } -// --- DdeRequest::DdeRequest() ------------------------------------ - DdeRequest::DdeRequest( DdeConnection& d, const OUString& i, long n ) : DdeTransaction( d, i, n ) { nType = XTYP_REQUEST; } -// --- DdeWarmLink::DdeWarmLink() ---------------------------------- - DdeWarmLink::DdeWarmLink( DdeConnection& d, const OUString& i, long n ) : DdeLink( d, i, n ) { nType = XTYP_ADVSTART | XTYPF_NODATA; } -// --- DdeHotLink::DdeHotLink() ------------------------------------ - DdeHotLink::DdeHotLink( DdeConnection& d, const OUString& i, long n ) : DdeLink( d, i, n ) { nType = XTYP_ADVSTART; } -// --- DdePoke::DdePoke() ------------------------------------------ - DdePoke::DdePoke( DdeConnection& d, const OUString& i, const char* p, long l, sal_uLong f, long n ) : DdeTransaction( d, i, n ) @@ -422,8 +381,6 @@ DdePoke::DdePoke( DdeConnection& d, const OUString& i, const char* p, nType = XTYP_POKE; } -// --- DdePoke::DdePoke() ------------------------------------------ - DdePoke::DdePoke( DdeConnection& d, const OUString& i, const OUString& rData, long n ) : DdeTransaction( d, i, n ) @@ -432,8 +389,6 @@ DdePoke::DdePoke( DdeConnection& d, const OUString& i, const OUString& rData, nType = XTYP_POKE; } -// --- DdePoke::DdePoke() ------------------------------------------ - DdePoke::DdePoke( DdeConnection& d, const OUString& i, const DdeData& rData, long n ) : DdeTransaction( d, i, n ) @@ -442,8 +397,6 @@ DdePoke::DdePoke( DdeConnection& d, const OUString& i, const DdeData& rData, nType = XTYP_POKE; } -// --- DdeExecute::DdeExecute() ------------------------------------ - DdeExecute::DdeExecute( DdeConnection& d, const OUString& rData, long n ) : DdeTransaction( d, OUString(), n ) { @@ -451,8 +404,6 @@ DdeExecute::DdeExecute( DdeConnection& d, const OUString& rData, long n ) nType = XTYP_EXECUTE; } -// --- DdeConnection::GetError() ----------------------------------- - long DdeConnection::GetError() { return pImp->nStatus; diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 85c60ac99a1f..d7568543485e 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -30,8 +30,6 @@ #include <osl/thread.h> -// --- DdeData::DdeData() ------------------------------------------ - DdeData::DdeData() { pImp = new DdeDataImp; @@ -41,8 +39,6 @@ DdeData::DdeData() pImp->nFmt = CF_TEXT; } -// --- DdeData::DdeData() ------------------------------------------ - DdeData::DdeData( const void* p, long n, sal_uLong f ) { pImp = new DdeDataImp; @@ -52,8 +48,6 @@ DdeData::DdeData( const void* p, long n, sal_uLong f ) pImp->nFmt = f; } -// --- DdeData::DdeData() ------------------------------------------ - DdeData::DdeData( const OUString& s ) { pImp = new DdeDataImp; @@ -63,8 +57,6 @@ DdeData::DdeData( const OUString& s ) pImp->nFmt = CF_TEXT; } -// --- DdeData::DdeData() ------------------------------------------ - DdeData::DdeData( const DdeData& rData ) { pImp = new DdeDataImp; @@ -75,8 +67,6 @@ DdeData::DdeData( const DdeData& rData ) Lock(); } -// --- DdeData::~DdeData() ----------------------------------------- - DdeData::~DdeData() { if ( pImp && pImp->hData ) @@ -84,16 +74,12 @@ DdeData::~DdeData() delete pImp; } -// --- DdeData::Lock() --------------------------------------------- - void DdeData::Lock() { if ( pImp->hData ) pImp->pData = DdeAccessData( pImp->hData, (LPDWORD) &pImp->nData ); } -// --- DdeData::GetFormat() ---------------------------------------- - sal_uLong DdeData::GetFormat() const { return pImp->nFmt; @@ -104,22 +90,16 @@ void DdeData::SetFormat( sal_uLong nFmt ) pImp->nFmt = nFmt; } -// --- DdeData::operator const char*() ----------------------------- - DdeData::operator const void*() const { return pImp->pData; } -// --- DdeData::operator long() ------------------------------------ - DdeData::operator long() const { return pImp->nData; } -// --- DdeData::operator =() --------------------------------------- - DdeData& DdeData::operator = ( const DdeData& rData ) { if ( &rData != this ) diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index 743d0b338ecc..d4b0702af6c7 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.cxx @@ -24,8 +24,6 @@ #include "ddeimp.hxx" #include <svl/svdde.hxx> -// --- DdeInternal::InfCallback() ---------------------------------- - HDDEDATA CALLBACK DdeInternal::InfCallback( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) { diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index 0a07a77e0fe8..40287dab93fd 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.cxx @@ -23,8 +23,6 @@ #include "ddeimp.hxx" #include <svl/svdde.hxx> -// --- DdeString::DdeString() -------------------------------------- - DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) : m_aString(p) { @@ -32,8 +30,6 @@ DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) hInst = hDdeInst; } -// --- DdeString::DdeString() -------------------------------------- - DdeString::DdeString( DWORD hDdeInst, const OUString& r) : m_aString(r) { @@ -41,23 +37,17 @@ DdeString::DdeString( DWORD hDdeInst, const OUString& r) hInst = hDdeInst; } -// --- DdeString::~DdeString() ------------------------------------- - DdeString::~DdeString() { if ( hString ) DdeFreeStringHandle( hInst, hString ); } -// --- DdeString::operator==() ------------------------------------- - int DdeString::operator==( HSZ h ) { return( !DdeCmpStringHandles( hString, h ) ); } -// --- DdeString::operator HSZ() ----------------------------------- - DdeString::operator HSZ() { return hString; diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 2fb7bee1b382..54a83d411666 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -44,8 +44,6 @@ struct DdeItemImpData class DdeItemImp : public std::vector<DdeItemImpData> {}; -// --- DdeInternat::SvrCallback() ---------------------------------- - HDDEDATA CALLBACK DdeInternal::SvrCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, DWORD, DWORD ) @@ -356,8 +354,6 @@ found: return (HDDEDATA)NULL; } -// --- DdeInternat::FindService() ---------------------------------- - DdeService* DdeInternal::FindService( HSZ hService ) { DdeService* s; @@ -372,8 +368,6 @@ DdeService* DdeInternal::FindService( HSZ hService ) return NULL; } -// --- DdeInternat::FindTopic() ------------------------------------ - DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic ) { std::vector<DdeTopic*>::iterator iter; @@ -405,8 +399,6 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic ) return 0; } -// --- DdeInternal::FindItem() ------------------------------------- - DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem ) { std::vector<DdeItem*>::iterator iter; @@ -437,8 +429,6 @@ DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem ) return 0; } -// --- DdeService::DdeService() ------------------------------------ - DdeService::DdeService( const OUString& rService ) { DdeInstData* pInst = ImpGetInstData(); @@ -484,8 +474,6 @@ DdeService::DdeService( const OUString& rService ) AddTopic( *pSysTopic ); } -// --- DdeService::~DdeService() ----------------------------------- - DdeService::~DdeService() { DdeInstData* pInst = ImpGetInstData(); @@ -512,15 +500,11 @@ DdeService::~DdeService() delete pConv; } -// --- DdeService::GetName() --------------------------------------- - const OUString DdeService::GetName() const { return pName->toOUString(); } -// --- DdeService::GetServices() ----------------------------------- - DdeServices& DdeService::GetServices() { DdeInstData* pInst = ImpGetInstData(); @@ -528,16 +512,12 @@ DdeServices& DdeService::GetServices() return *(pInst->pServicesSvr); } -// --- DdeService::AddTopic() -------------------------------------- - void DdeService::AddTopic( const DdeTopic& rTopic ) { RemoveTopic( rTopic ); aTopics.push_back((DdeTopic *) &rTopic); } -// --- DdeService::RemoveTopic() ----------------------------------- - void DdeService::RemoveTopic( const DdeTopic& rTopic ) { std::vector<DdeTopic*>::iterator iter; @@ -564,8 +544,6 @@ void DdeService::RemoveTopic( const DdeTopic& rTopic ) } } -// --- DdeService::HasCbFormat() ----------------------------------- - bool DdeService::HasCbFormat( sal_uInt16 nFmt ) { for ( size_t i = 0, n = aFormats.size(); i < n; ++i ) @@ -574,15 +552,11 @@ bool DdeService::HasCbFormat( sal_uInt16 nFmt ) return false; } -// --- DdeService::HasFormat() ------------------------------------- - bool DdeService::HasFormat( sal_uLong nFmt ) { return HasCbFormat( (sal_uInt16)DdeData::GetExternalFormat( nFmt )); } -// --- DdeService::AddFormat() ------------------------------------- - void DdeService::AddFormat( sal_uLong nFmt ) { nFmt = DdeData::GetExternalFormat( nFmt ); @@ -592,8 +566,6 @@ void DdeService::AddFormat( sal_uLong nFmt ) aFormats.push_back( nFmt ); } -// --- DdeService::RemoveFormat() ---------------------------------- - void DdeService::RemoveFormat( sal_uLong nFmt ) { nFmt = DdeData::GetExternalFormat( nFmt ); @@ -607,8 +579,6 @@ void DdeService::RemoveFormat( sal_uLong nFmt ) } } -// --- DdeTopic::DdeTopic() ---------------------------------------- - DdeTopic::DdeTopic( const OUString& rName ) { DdeInstData* pInst = ImpGetInstData(); @@ -616,8 +586,6 @@ DdeTopic::DdeTopic( const OUString& rName ) pName = new DdeString( pInst->hDdeInstSvr, rName ); } -// --- DdeTopic::~DdeTopic() --------------------------------------- - DdeTopic::~DdeTopic() { std::vector<DdeItem*>::iterator iter; @@ -630,22 +598,16 @@ DdeTopic::~DdeTopic() delete pName; } -// --- DdeTopic::GetName() ----------------------------------------- - const OUString DdeTopic::GetName() const { return pName->toOUString(); } -// --- DdeTopic::IsSystemTopic() ----------------------------------- - bool DdeTopic::IsSystemTopic() { return GetName() == reinterpret_cast<const sal_Unicode*>(SZDDESYS_TOPIC); } -// --- DdeTopic::AddItem() ----------------------------------------- - DdeItem* DdeTopic::AddItem( const DdeItem& r ) { DdeItem* s; @@ -662,8 +624,6 @@ DdeItem* DdeTopic::AddItem( const DdeItem& r ) return s; } -// --- DdeTopic::InsertItem() ----------------------------------------- - void DdeTopic::InsertItem( DdeItem* pNew ) { if( pNew ) @@ -673,8 +633,6 @@ void DdeTopic::InsertItem( DdeItem* pNew ) } } -// --- DdeTopic::RemoveItem() -------------------------------------- - void DdeTopic::RemoveItem( const DdeItem& r ) { std::vector<DdeItem*>::iterator iter; @@ -692,8 +650,6 @@ void DdeTopic::RemoveItem( const DdeItem& r ) } } -// --- DdeTopic::NotifyClient() ------------------------------------ - void DdeTopic::NotifyClient( const OUString& rItem ) { std::vector<DdeItem*>::iterator iter; @@ -709,22 +665,16 @@ void DdeTopic::NotifyClient( const OUString& rItem ) } } -// --- DdeTopic::Connect() ----------------------------------------- - void DdeTopic::Connect( sal_IntPtr nId ) { aConnectLink.Call( (void*)nId ); } -// --- DdeTopic::Disconnect() -------------------------------------- - void DdeTopic::Disconnect( sal_IntPtr nId ) { aDisconnectLink.Call( (void*)nId ); } -// --- DdeTopic::_Disconnect() -------------------------------------- - void DdeTopic::_Disconnect( sal_IntPtr nId ) { std::vector<DdeItem*>::iterator iter; @@ -734,8 +684,6 @@ void DdeTopic::_Disconnect( sal_IntPtr nId ) Disconnect( nId ); } -// --- DdeTopic::Get() --------------------------------------------- - DdeData* DdeTopic::Get( sal_uIntPtr nFmt ) { if ( aGetLink.IsSet() ) @@ -744,8 +692,6 @@ DdeData* DdeTopic::Get( sal_uIntPtr nFmt ) return NULL; } -// --- DdeTopic::Put() --------------------------------------------- - bool DdeTopic::Put( const DdeData* r ) { if ( aPutLink.IsSet() ) @@ -754,8 +700,6 @@ bool DdeTopic::Put( const DdeData* r ) return false; } -// --- DdeTopic::Execute() ----------------------------------------- - bool DdeTopic::Execute( const OUString* r ) { if ( aExecLink.IsSet() ) @@ -764,8 +708,6 @@ bool DdeTopic::Execute( const OUString* r ) return false; } -// --- DdeTopic::GetConvId() --------------------------------------- - long DdeTopic::GetConvId() { DdeInstData* pInst = ImpGetInstData(); @@ -773,22 +715,16 @@ long DdeTopic::GetConvId() return pInst->hCurConvSvr; } -// --- DdeTopic::StartAdviseLoop() --------------------------------- - bool DdeTopic::StartAdviseLoop() { return false; } -// --- DdeTopic::StopAdviseLoop() ---------------------------------- - bool DdeTopic::StopAdviseLoop() { return false; } -// --- DdeItem::DdeItem() ------------------------------------------ - DdeItem::DdeItem( const sal_Unicode* p ) { DdeInstData* pInst = ImpGetInstData(); @@ -799,8 +735,6 @@ DdeItem::DdeItem( const sal_Unicode* p ) pImpData = 0; } -// --- DdeItem::DdeItem() ------------------------------------------ - DdeItem::DdeItem( const OUString& r) { DdeInstData* pInst = ImpGetInstData(); @@ -811,8 +745,6 @@ DdeItem::DdeItem( const OUString& r) pImpData = 0; } -// --- DdeItem::DdeItem() ------------------------------------------ - DdeItem::DdeItem( const DdeItem& r) { DdeInstData* pInst = ImpGetInstData(); @@ -823,8 +755,6 @@ DdeItem::DdeItem( const DdeItem& r) pImpData = 0; } -// --- DdeItem::~DdeItem() ----------------------------------------- - DdeItem::~DdeItem() { if( pMyTopic ) @@ -834,15 +764,11 @@ DdeItem::~DdeItem() delete pImpData; } -// --- DdeItem::GetName() ------------------------------------------ - const OUString DdeItem::GetName() const { return pName->toOUString(); } -// --- DdeItem::NotifyClient() ------------------------------------------ - void DdeItem::NotifyClient() { if( pMyTopic && pImpData ) @@ -853,8 +779,6 @@ void DdeItem::NotifyClient() } } -// --- DdeItem::IncMonitor() ------------------------------------------ - void DdeItem::IncMonitor( sal_uLong nHCnv ) { if( !pImpData ) @@ -876,8 +800,6 @@ void DdeItem::IncMonitor( sal_uLong nHCnv ) pImpData->push_back( DdeItemImpData( nHCnv ) ); } -// --- DdeItem::DecMonitor() ------------------------------------------ - void DdeItem::DecMonitor( sal_uLong nHCnv ) { if( pImpData ) @@ -906,8 +828,6 @@ void DdeItem::DecMonitor( sal_uLong nHCnv ) } } -// --- DdeItem::GetLinks() ------------------------------------------ - short DdeItem::GetLinks() { short nCnt = 0; @@ -921,54 +841,38 @@ short DdeItem::GetLinks() return nCnt; } -// --- DdeGetPutItem::DdeGetPutItem() ------------------------------ - DdeGetPutItem::DdeGetPutItem( const sal_Unicode* p ) : DdeItem( p ) { nType = DDEGETPUTITEM; } -// --- DdeGetPutItem::DdeGetPutItem() ------------------------------ - DdeGetPutItem::DdeGetPutItem( const OUString& rStr ) : DdeItem( rStr ) { nType = DDEGETPUTITEM; } -// --- DdeGetPutItem::DdeGetPutItem() ------------------------------ - DdeGetPutItem::DdeGetPutItem( const DdeItem& rItem ) : DdeItem( rItem ) { nType = DDEGETPUTITEM; } - -// --- DdeGetPutData::Get() ---------------------------------------- - DdeData* DdeGetPutItem::Get( sal_uLong ) { return 0; } -// --- DdeGetPutData::Put() ---------------------------------------- - bool DdeGetPutItem::Put( const DdeData* ) { return false; } -// --- DdeGetPutData::AdviseLoop() --------------------------------- - void DdeGetPutItem::AdviseLoop( bool ) { } - -// --- DdeService::SysItems() -------------------------------------- - OUString DdeService::SysItems() { OUString s; @@ -992,8 +896,6 @@ OUString DdeService::SysItems() return s; } -// --- DdeService::Topics() ---------------------------------------- - OUString DdeService::Topics() { OUString s; @@ -1011,8 +913,6 @@ OUString DdeService::Topics() return s; } -// --- DdeService::Formats() --------------------------------------- - OUString DdeService::Formats() { OUString s; @@ -1048,22 +948,16 @@ OUString DdeService::Formats() return s; } -// --- DdeService::Status() ---------------------------------------- - OUString DdeService::Status() { return IsBusy() ? OUString("Busy\r\n") : OUString("Ready\r\n"); } -// --- DdeService::IsBusy() ---------------------------------------- - bool DdeService::IsBusy() { return false; } -// --- DdeService::GetHelp() ---------------------------------------- - OUString DdeService::GetHelp() { return OUString(); |