diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-07-14 11:20:36 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-17 09:19:38 +0000 |
| commit | e179af1576a7763f3aeb112a41a640057d02c4f0 (patch) | |
| tree | 4b1b6246f1aa508c8d3ca8971d711c7d8020ae34 | |
| parent | 4e0656ac0bc5be3306ad016a1a494577ad2ef8b8 (diff) | |
fdo#62475 removed pointless comments
Change-Id: Id9d579960a9b641b7b2cdf05eabea8bfbfc06bd6
Reviewed-on: https://gerrit.libreoffice.org/4901
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
52 files changed, 0 insertions, 772 deletions
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 70c4f477453c..84ffcf68e0cd 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -88,13 +88,11 @@ public: bool IsReadOnly(SvtCTLOptions::EOption eOption) const; }; -//------------------------------------------------------------------------------ namespace { struct PropertyNames : public rtl::Static< Sequence< OUString >, PropertyNames > {}; } -//------------------------------------------------------------------------------ bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const { bool bReadOnly = CFG_READONLY_DEFAULT; @@ -110,7 +108,6 @@ bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const } return bReadOnly; } -//------------------------------------------------------------------------------ SvtCTLOptions_Impl::SvtCTLOptions_Impl() : utl::ConfigItem("Office.Common/I18N/CTL"), @@ -131,7 +128,6 @@ SvtCTLOptions_Impl::SvtCTLOptions_Impl() : m_bROCTLTextNumerals ( CFG_READONLY_DEFAULT ) { } -//------------------------------------------------------------------------------ SvtCTLOptions_Impl::~SvtCTLOptions_Impl() { if ( IsModified() == sal_True ) @@ -329,7 +325,6 @@ void SvtCTLOptions_Impl::Load() m_bIsLoaded = sal_True; } -//------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLFontEnabled( bool _bEnabled ) { if(!m_bROCTLFontEnabled && m_bCTLFontEnabled != _bEnabled) @@ -339,7 +334,6 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( bool _bEnabled ) NotifyListeners(0); } } -//------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLSequenceChecking( bool _bEnabled ) { if(!m_bROCTLSequenceChecking && m_bCTLSequenceChecking != _bEnabled) @@ -349,7 +343,6 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( bool _bEnabled ) NotifyListeners(0); } } -//------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( bool _bEnabled ) { if(!m_bROCTLRestricted && m_bCTLRestricted != _bEnabled) @@ -359,7 +352,6 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( bool _bEnabled ) NotifyListeners(0); } } -//------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( bool _bEnabled ) { if(!m_bROCTLTypeAndReplace && m_bCTLTypeAndReplace != _bEnabled) @@ -369,7 +361,6 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( bool _bEnabled ) NotifyListeners(0); } } -//------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eMovement ) { if (!m_bROCTLCursorMovement && m_eCTLCursorMovement != _eMovement ) @@ -379,7 +370,6 @@ void SvtCTLOptions_Impl::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eM NotifyListeners(0); } } -//------------------------------------------------------------------------------ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals ) { if (!m_bROCTLTextNumerals && m_eCTLTextNumerals != _eNumerals ) diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 6b7b25c28f5f..129fecac6fdf 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -31,7 +31,6 @@ #include <tools/debug.hxx> -//----------------------------------------------- ItemHolder2::ItemHolder2() : ItemHolderMutexBase() { @@ -64,27 +63,23 @@ ItemHolder2::ItemHolder2() #endif } -//----------------------------------------------- ItemHolder2::~ItemHolder2() { impl_releaseAllItems(); } -//----------------------------------------------- void ItemHolder2::holdConfigItem(EItem eItem) { static ItemHolder2* pHolder = new ItemHolder2(); pHolder->impl_addItem(eItem); } -//----------------------------------------------- void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException) { impl_releaseAllItems(); } -//----------------------------------------------- void ItemHolder2::impl_addItem(EItem eItem) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -106,7 +101,6 @@ void ItemHolder2::impl_addItem(EItem eItem) m_lItems.push_back(aNewItem); } -//----------------------------------------------- void ItemHolder2::impl_releaseAllItems() { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -122,7 +116,6 @@ void ItemHolder2::impl_releaseAllItems() m_lItems.clear(); } -//----------------------------------------------- void ItemHolder2::impl_newItem(TItemInfo& rItem) { switch(rItem.eItem) @@ -145,7 +138,6 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) } } -//----------------------------------------------- void ItemHolder2::impl_deleteItem(TItemInfo& rItem) { if (rItem.pItem) diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index 1e0db6bfa715..7e8c596acc02 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.hxx @@ -27,13 +27,11 @@ class ItemHolder2 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > { - //........................................... // member private: TItems m_lItems; - //........................................... // c++ interface public: @@ -41,14 +39,12 @@ class ItemHolder2 : private ItemHolderMutexBase virtual ~ItemHolder2(); static void holdConfigItem(EItem eItem); - //........................................... // uno interface public: virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); - //........................................... // helper private: diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 687c99a81d3a..8d094276e2d4 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -49,7 +49,6 @@ SvtLanguageOptions::SvtLanguageOptions( sal_Bool _bDontLoad ) m_pCTLOptions->AddListener(this); m_pCJKOptions->AddListener(this); } -//------------------------------------------------------------------------------ SvtLanguageOptions::~SvtLanguageOptions() { // Global access, must be guarded (multithreading) @@ -61,51 +60,40 @@ SvtLanguageOptions::~SvtLanguageOptions() delete m_pCJKOptions; delete m_pCTLOptions; } -//------------------------------------------------------------------------------ // CJK options ----------------------------------------------------------------- -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsCJKFontEnabled() const { return m_pCJKOptions->IsCJKFontEnabled(); } -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsVerticalTextEnabled() const { return m_pCJKOptions->IsVerticalTextEnabled(); } -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsAsianTypographyEnabled() const { return m_pCJKOptions->IsAsianTypographyEnabled(); } -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsJapaneseFindEnabled() const { return m_pCJKOptions->IsJapaneseFindEnabled(); } -//------------------------------------------------------------------------------ void SvtLanguageOptions::SetAll( sal_Bool _bSet ) { m_pCJKOptions->SetAll( _bSet ); } -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsAnyEnabled() const { return m_pCJKOptions->IsAnyEnabled(); } -//------------------------------------------------------------------------------ // CTL options ----------------------------------------------------------------- -//------------------------------------------------------------------------------ void SvtLanguageOptions::SetCTLFontEnabled( sal_Bool _bEnabled ) { m_pCTLOptions->SetCTLFontEnabled( _bEnabled ); } -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsCTLFontEnabled() const { return m_pCTLOptions->IsCTLFontEnabled(); } -//------------------------------------------------------------------------------ void SvtLanguageOptions::SetCTLSequenceChecking( sal_Bool _bEnabled ) { m_pCTLOptions->SetCTLSequenceChecking( _bEnabled ); @@ -121,7 +109,6 @@ void SvtLanguageOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable m_pCTLOptions->SetCTLSequenceCheckingTypeAndReplace( _bEnable ); } -//------------------------------------------------------------------------------ sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) const { sal_Bool bReadOnly = sal_False; diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx index 5bca8b2a0ffe..2b7724785661 100644 --- a/svl/source/filepicker/pickerhistory.cxx +++ b/svl/source/filepicker/pickerhistory.cxx @@ -21,10 +21,8 @@ #include <cppuhelper/weakref.hxx> #include <vector> -//......................................................................... namespace svt { -//......................................................................... using namespace ::com::sun::star::uno; namespace @@ -52,7 +50,6 @@ namespace svt if ( !_rxPicker.is() ) return; - //============================================================= // first, check which of the objects we hold in s_aHistory can be removed { InterfaceArray aCleanedHistory; @@ -73,26 +70,21 @@ namespace svt _rHistory.swap( aCleanedHistory ); } - //============================================================= // then push_back the picker _rHistory.push_back( InterfaceAdapter( _rxPicker ) ); } } - //--------------------------------------------------------------------- void addFolderPicker( const Reference< XInterface >& _rxPicker ) { implPushBackPicker( getFolderPickerHistory(), _rxPicker ); } - //--------------------------------------------------------------------- void addFilePicker( const Reference< XInterface >& _rxPicker ) { implPushBackPicker( getFilePickerHistory(), _rxPicker ); } -//......................................................................... } // namespace svt -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 1787bf86fcb7..697c5229e910 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -20,7 +20,6 @@ #include <svl/filerec.hxx> #include <osl/endian.h> -//======================================================================== /* Die folgenden Makros extrahieren Teilbereiche aus einem sal_uInt32 Wert. Diese sal_uInt32-Werte werden anstelle der einzelnen Werte gestreamt, @@ -36,7 +35,6 @@ #define SFX_REC_CONTENT_VER(n) ( ((n) & 0x000000FF) ) #define SFX_REC_CONTENT_OFS(n) ( ((n) & 0xFFFFFF00) >> 8 ) -//------------------------------------------------------------------------- /* Die folgenden Makros setzen Teilbereiche zu einem sal_uInt32 Wert zusammen. Diese sal_uInt32-Werte werden anstelle der einzelnen Werte gestreamt, @@ -56,7 +54,6 @@ ( sal_uInt32(nContentVer) | \ sal_uInt32( nCurStartPos - n1StStartPos ) << 8 ) -//========================================================================= sal_uInt32 SfxMiniRecordWriter::Close ( @@ -227,7 +224,6 @@ SfxMiniRecordReader::SfxMiniRecordReader } } -//========================================================================= SfxSingleRecordWriter::SfxSingleRecordWriter ( @@ -248,7 +244,6 @@ SfxSingleRecordWriter::SfxSingleRecordWriter *pStream << SFX_REC_HEADER(nRecordType, nContentTag, nContentVer); } -//========================================================================= inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes ) @@ -282,7 +277,6 @@ inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes ) return bRet; } -//------------------------------------------------------------------------- bool SfxSingleRecordReader::FindHeader_Impl ( @@ -348,7 +342,6 @@ bool SfxSingleRecordReader::FindHeader_Impl return sal_False; } -//========================================================================= SfxMultiFixRecordWriter::SfxMultiFixRecordWriter ( @@ -370,7 +363,6 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter pStream->SeekRel( + SFX_REC_HEADERSIZE_MULTI ); } -//------------------------------------------------------------------------ sal_uInt32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) @@ -397,7 +389,6 @@ sal_uInt32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) return 0; } -//========================================================================= SfxMultiVarRecordWriter::SfxMultiVarRecordWriter ( @@ -417,7 +408,6 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter { } -//------------------------------------------------------------------------- SfxMultiVarRecordWriter::SfxMultiVarRecordWriter ( @@ -445,7 +435,6 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter { } -//------------------------------------------------------------------------- SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter() @@ -462,7 +451,6 @@ SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter() Close(); } -//------------------------------------------------------------------------- void SfxMultiVarRecordWriter::FlushContent_Impl() @@ -480,7 +468,6 @@ void SfxMultiVarRecordWriter::FlushContent_Impl() SFX_REC_CONTENT_HEADER(_nContentVer,_nStartPos,_nContentStartPos)); } -//------------------------------------------------------------------------- void SfxMultiVarRecordWriter::NewContent() @@ -496,7 +483,6 @@ void SfxMultiVarRecordWriter::NewContent() ++_nContentCount; } -//------------------------------------------------------------------------- sal_uInt32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) @@ -537,7 +523,6 @@ sal_uInt32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) return 0; } -//========================================================================= void SfxMultiMixRecordWriter::NewContent ( @@ -564,7 +549,6 @@ void SfxMultiMixRecordWriter::NewContent _nContentVer = nContentVer; } -//========================================================================= bool SfxMultiRecordReader::ReadHeader_Impl() @@ -607,7 +591,6 @@ bool SfxMultiRecordReader::ReadHeader_Impl() return !_pStream->GetError(); } -//------------------------------------------------------------------------- SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream, sal_uInt16 nTag ) : _pContentOfs(0) @@ -632,14 +615,12 @@ SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream, sal_uInt16 nTag ) } } -//------------------------------------------------------------------------- SfxMultiRecordReader::~SfxMultiRecordReader() { delete[] _pContentOfs; } -//------------------------------------------------------------------------- bool SfxMultiRecordReader::GetContent() diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 2379cf1858f3..52c599e68d3b 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------- uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); @@ -45,20 +44,17 @@ uno::Sequence< OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServ return aRet; } -//------------------------------------------------------------------------- OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName() { return OUString("com.sun.star.comp.embed.FileSystemStorageFactory"); } -//------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { return uno::Reference< uno::XInterface >( *new FSStorageFactory( comphelper::getComponentContext(xServiceManager) ) ); } -//------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() throw ( uno::Exception, uno::RuntimeException ) @@ -82,7 +78,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() uno::UNO_QUERY ); } -//------------------------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, @@ -164,14 +159,12 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA uno::UNO_QUERY ); } -//------------------------------------------------------------------------- OUString SAL_CALL FSStorageFactory::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } -//------------------------------------------------------------------------- sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { @@ -184,14 +177,12 @@ sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName return sal_False; } -//------------------------------------------------------------------------- uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); } -//------------------------------------------------------------------------- extern "C" { diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 5d5bfefe1616..fd8dd260528a 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star; -//========================================================= // TODO: move to a standard helper sal_Bool isLocalFile_Impl( OUString aURL ) @@ -84,7 +83,6 @@ sal_Bool isLocalFile_Impl( OUString aURL ) } -//========================================================= struct FSStorage_Impl { @@ -124,7 +122,6 @@ struct FSStorage_Impl ~FSStorage_Impl(); }; -//========================================================= FSStorage_Impl::~FSStorage_Impl() { @@ -136,11 +133,8 @@ FSStorage_Impl::~FSStorage_Impl() delete m_pContent; } -//===================================================== // FSStorage implementation -//===================================================== -//----------------------------------------------- FSStorage::FSStorage( const ::ucbhelper::Content& aContent, sal_Int32 nMode, uno::Reference< uno::XComponentContext > xContext ) @@ -153,7 +147,6 @@ FSStorage::FSStorage( const ::ucbhelper::Content& aContent, GetContent(); } -//----------------------------------------------- FSStorage::~FSStorage() { { @@ -167,7 +160,6 @@ FSStorage::~FSStorage() } } -//----------------------------------------------- sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder ) { INetURLObject aURL( rFolder ); @@ -185,7 +177,6 @@ sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder ) return sal_False; } -//----------------------------------------------- ::ucbhelper::Content* FSStorage::GetContent() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -205,7 +196,6 @@ sal_Bool FSStorage::MakeFolderNoUI( const OUString& rFolder ) return m_pImpl->m_pContent; } -//----------------------------------------------- void FSStorage::CopyStreamToSubStream( const OUString& aSourceURL, const uno::Reference< embed::XStorage >& xDest, const OUString& aNewEntryName ) @@ -234,7 +224,6 @@ void FSStorage::CopyStreamToSubStream( const OUString& aSourceURL, xDestOutput->closeOutput(); } -//----------------------------------------------- void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const uno::Reference< embed::XStorage >& xDest ) { if ( !pContent ) @@ -296,11 +285,8 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const } } -//____________________________________________________________________________________________________ // XInterface -//____________________________________________________________________________________________________ -//----------------------------------------------- uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType ) throw( uno::RuntimeException ) { @@ -321,23 +307,18 @@ uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType ) return OWeakObject::queryInterface( rType ); } -//----------------------------------------------- void SAL_CALL FSStorage::acquire() throw() { OWeakObject::acquire(); } -//----------------------------------------------- void SAL_CALL FSStorage::release() throw() { OWeakObject::release(); } -//____________________________________________________________________________________________________ // XTypeProvider -//____________________________________________________________________________________________________ -//----------------------------------------------- uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes() throw( uno::RuntimeException ) { @@ -358,7 +339,6 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes() return m_pImpl->m_pTypeCollection->getTypes() ; } -//----------------------------------------------- uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId() throw( uno::RuntimeException ) { @@ -379,11 +359,8 @@ uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId() } -//____________________________________________________________________________________________________ // XStorage -//____________________________________________________________________________________________________ -//----------------------------------------------- void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& xDest ) throw ( embed::InvalidStorageException, io::IOException, @@ -435,7 +412,6 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& } } -//----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, @@ -545,7 +521,6 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( return xResult; } -//----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( const OUString&, sal_Int32, const OUString& ) throw ( embed::InvalidStorageException, @@ -559,7 +534,6 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( throw packages::NoEncryptionException(); } -//----------------------------------------------- uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( const OUString& aStorName, sal_Int32 nStorageMode ) throw ( embed::InvalidStorageException, @@ -653,7 +627,6 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( return xResult; } -//----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUString& aStreamName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -726,7 +699,6 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUSt return xTempResult; } -//----------------------------------------------- uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement( const OUString&, const OUString& ) @@ -741,7 +713,6 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement( throw packages::NoEncryptionException(); } -//----------------------------------------------- void SAL_CALL FSStorage::copyLastCommitTo( const uno::Reference< embed::XStorage >& xTargetStorage ) throw ( embed::InvalidStorageException, @@ -753,7 +724,6 @@ void SAL_CALL FSStorage::copyLastCommitTo( copyToStorage( xTargetStorage ); } -//----------------------------------------------- void SAL_CALL FSStorage::copyStorageElementLastCommitTo( const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) @@ -773,7 +743,6 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo( xSourceStor->copyToStorage( xTargetStorage ); } -//----------------------------------------------- sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -794,7 +763,6 @@ sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName ) return !::utl::UCBContentHelper::IsFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } -//----------------------------------------------- sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -815,7 +783,6 @@ sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName ) return ::utl::UCBContentHelper::IsFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } -//----------------------------------------------- void SAL_CALL FSStorage::removeElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -842,7 +809,6 @@ void SAL_CALL FSStorage::removeElement( const OUString& aElementName ) ::utl::UCBContentHelper::Kill( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } -//----------------------------------------------- void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUString& aNewName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -922,7 +888,6 @@ void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUSt } } -//----------------------------------------------- void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const OUString& aNewName ) @@ -1007,7 +972,6 @@ void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName, } } -//----------------------------------------------- void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const OUString& aNewName ) @@ -1028,11 +992,8 @@ void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName, throw io::IOException(); // TODO: error handling } -//____________________________________________________________________________________________________ // XNameAccess -//____________________________________________________________________________________________________ -//----------------------------------------------- uno::Any SAL_CALL FSStorage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, @@ -1091,7 +1052,6 @@ uno::Any SAL_CALL FSStorage::getByName( const OUString& aName ) } -//----------------------------------------------- uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames() throw ( uno::RuntimeException ) { @@ -1157,7 +1117,6 @@ uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames() } -//----------------------------------------------- sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { @@ -1194,7 +1153,6 @@ sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName ) || ::utl::UCBContentHelper::IsDocument( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ); } -//----------------------------------------------- uno::Type SAL_CALL FSStorage::getElementType() throw ( uno::RuntimeException ) { @@ -1207,7 +1165,6 @@ uno::Type SAL_CALL FSStorage::getElementType() return uno::Type(); } -//----------------------------------------------- sal_Bool SAL_CALL FSStorage::hasElements() throw ( uno::RuntimeException ) { @@ -1235,11 +1192,8 @@ sal_Bool SAL_CALL FSStorage::hasElements() } -//____________________________________________________________________________________________________ // XDisposable -//____________________________________________________________________________________________________ -//----------------------------------------------- void SAL_CALL FSStorage::dispose() throw ( uno::RuntimeException ) { @@ -1258,7 +1212,6 @@ void SAL_CALL FSStorage::dispose() m_pImpl = NULL; } -//----------------------------------------------- void SAL_CALL FSStorage::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw ( uno::RuntimeException ) @@ -1274,7 +1227,6 @@ void SAL_CALL FSStorage::addEventListener( m_pImpl->m_pListenersContainer->addInterface( xListener ); } -//----------------------------------------------- void SAL_CALL FSStorage::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw ( uno::RuntimeException ) @@ -1288,11 +1240,8 @@ void SAL_CALL FSStorage::removeEventListener( m_pImpl->m_pListenersContainer->removeInterface( xListener ); } -//____________________________________________________________________________________________________ // XPropertySet -//____________________________________________________________________________________________________ -//----------------------------------------------- uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo() throw ( uno::RuntimeException ) { @@ -1306,7 +1255,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo } -//----------------------------------------------- void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -1326,7 +1274,6 @@ void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const } -//----------------------------------------------- uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, @@ -1346,7 +1293,6 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName ) } -//----------------------------------------------- void SAL_CALL FSStorage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) @@ -1363,7 +1309,6 @@ void SAL_CALL FSStorage::addPropertyChangeListener( } -//----------------------------------------------- void SAL_CALL FSStorage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) @@ -1380,7 +1325,6 @@ void SAL_CALL FSStorage::removePropertyChangeListener( } -//----------------------------------------------- void SAL_CALL FSStorage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) @@ -1397,7 +1341,6 @@ void SAL_CALL FSStorage::addVetoableChangeListener( } -//----------------------------------------------- void SAL_CALL FSStorage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) @@ -1413,10 +1356,7 @@ void SAL_CALL FSStorage::removeVetoableChangeListener( //TODO: } -//____________________________________________________________________________________________________ // XHierarchicalStorageAccess -//____________________________________________________________________________________________________ -//----------------------------------------------- uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -1539,7 +1479,6 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl return uno::Reference< embed::XExtendedStorageStream >( xResult, uno::UNO_QUERY_THROW ); } -//----------------------------------------------- uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const OUString& /*sPassword*/ ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -1552,7 +1491,6 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncrypte throw packages::NoEncryptionException(); } -//----------------------------------------------- void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const OUString& sStreamPath ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index ef4a1f681de0..efafe8fed0dd 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -66,9 +66,7 @@ public: static sal_Bool MakeFolderNoUI( const OUString& rFolder ); - //____________________________________________________________________________________________________ // XInterface - //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); @@ -77,9 +75,7 @@ public: virtual void SAL_CALL release() throw(); - //____________________________________________________________________________________________________ // XTypeProvider - //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); @@ -87,9 +83,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); - //____________________________________________________________________________________________________ // XStorage - //____________________________________________________________________________________________________ virtual void SAL_CALL copyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -212,9 +206,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - //____________________________________________________________________________________________________ // XNameAccess - //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, @@ -233,9 +225,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw ( ::com::sun::star::uno::RuntimeException ); - //____________________________________________________________________________________________________ // XComponent - //____________________________________________________________________________________________________ virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); @@ -248,9 +238,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException ); - //____________________________________________________________________________________________________ // XPropertySet - //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException ); @@ -293,9 +281,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - //____________________________________________________________________________________________________ // XHierarchicalStorageAccess - //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) throw ( ::com::sun::star::embed::InvalidStorageException, diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index d43b02101c10..3c4caa674fd7 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -23,7 +23,6 @@ using namespace ::com::sun::star; -//----------------------------------------------- OFSInputStreamContainer::OFSInputStreamContainer( const uno::Reference< io::XInputStream >& xStream ) : m_xInputStream( xStream ) , m_xSeekable( xStream, uno::UNO_QUERY ) @@ -34,7 +33,6 @@ OFSInputStreamContainer::OFSInputStreamContainer( const uno::Reference< io::XInp m_bSeekable = m_xSeekable.is(); } -//----------------------------------------------- OFSInputStreamContainer::~OFSInputStreamContainer() { if ( m_pListenersContainer ) @@ -44,7 +42,6 @@ OFSInputStreamContainer::~OFSInputStreamContainer() } } -//----------------------------------------------- uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes() throw ( uno::RuntimeException ) { @@ -80,7 +77,6 @@ uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes() } -//----------------------------------------------- uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rType ) throw( uno::RuntimeException ) { @@ -104,21 +100,18 @@ uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rTyp return ::cppu::OWeakObject::queryInterface( rType ) ; } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::acquire() throw() { ::cppu::OWeakObject::acquire(); } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::release() throw() { ::cppu::OWeakObject::release(); } -//----------------------------------------------- sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw ( io::NotConnectedException, io::BufferSizeExceededException, @@ -136,7 +129,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 > return m_xInputStream->readBytes( aData, nBytesToRead ); } -//----------------------------------------------- sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw ( io::NotConnectedException, io::BufferSizeExceededException, @@ -154,7 +146,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_In return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, @@ -172,7 +163,6 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) m_xInputStream->skipBytes( nBytesToSkip ); } -//----------------------------------------------- sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) throw ( io::NotConnectedException, io::IOException, @@ -189,7 +179,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) return m_xInputStream->available(); } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::closeInput( ) throw ( io::NotConnectedException, io::IOException, @@ -206,7 +195,6 @@ void SAL_CALL OFSInputStreamContainer::closeInput( ) dispose(); } -//----------------------------------------------- uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStream() throw ( uno::RuntimeException ) { @@ -221,7 +209,6 @@ uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStr return uno::Reference< io::XInputStream >( static_cast< io::XInputStream* >( this ), uno::UNO_QUERY ); } -//----------------------------------------------- uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputStream() throw ( uno::RuntimeException ) { @@ -233,7 +220,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputS return uno::Reference< io::XOutputStream >(); } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, @@ -250,7 +236,6 @@ void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location ) m_xSeekable->seek( location ); } -//----------------------------------------------- sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition() throw ( io::IOException, uno::RuntimeException) @@ -266,7 +251,6 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition() return m_xSeekable->getPosition(); } -//----------------------------------------------- sal_Int64 SAL_CALL OFSInputStreamContainer::getLength() throw ( io::IOException, uno::RuntimeException ) @@ -282,7 +266,6 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getLength() return m_xSeekable->getLength(); } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::dispose( ) throw ( uno::RuntimeException ) { @@ -305,7 +288,6 @@ void SAL_CALL OFSInputStreamContainer::dispose( ) m_bDisposed = true; } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw ( uno::RuntimeException ) { @@ -320,7 +302,6 @@ void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< l m_pListenersContainer->addInterface( xListener ); } -//----------------------------------------------- void SAL_CALL OFSInputStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw ( uno::RuntimeException ) { diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index 081eb5986557..0089784c18da 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -23,7 +23,6 @@ using namespace ::com::sun::star; -//----------------------------------------------- OFSStreamContainer::OFSStreamContainer( const uno::Reference < io::XStream >& xStream ) : m_bDisposed( false ) , m_bInputClosed( false ) @@ -54,7 +53,6 @@ OFSStreamContainer::OFSStreamContainer( const uno::Reference < io::XStream >& xS } } -//----------------------------------------------- OFSStreamContainer::~OFSStreamContainer() { if ( m_pListenersContainer ) @@ -65,7 +63,6 @@ OFSStreamContainer::~OFSStreamContainer() } // XInterface -//----------------------------------------------- uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) throw( uno::RuntimeException ) { @@ -131,14 +128,12 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) return OWeakObject::queryInterface( rType ); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::acquire() throw() { OWeakObject::acquire(); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::release() throw() { @@ -146,7 +141,6 @@ void SAL_CALL OFSStreamContainer::release() } // XTypeProvider -//----------------------------------------------- uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes() throw( uno::RuntimeException ) { @@ -188,7 +182,6 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes() return m_pTypeCollection->getTypes() ; } -//----------------------------------------------- uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId() throw( uno::RuntimeException ) { @@ -209,7 +202,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId() } // XStream -//----------------------------------------------- uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream() throw ( uno::RuntimeException ) { @@ -227,7 +219,6 @@ uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream() return uno::Reference< io::XInputStream >(); } -//----------------------------------------------- uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream() throw ( uno::RuntimeException ) { @@ -246,7 +237,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream } // XComponent -//----------------------------------------------- void SAL_CALL OFSStreamContainer::dispose() throw ( uno::RuntimeException ) { @@ -279,7 +269,6 @@ void SAL_CALL OFSStreamContainer::dispose() m_bDisposed = true; } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw ( uno::RuntimeException ) { @@ -294,7 +283,6 @@ void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang:: m_pListenersContainer->addInterface( xListener ); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw ( uno::RuntimeException ) { @@ -309,7 +297,6 @@ void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lan // XSeekable -//----------------------------------------------- void SAL_CALL OFSStreamContainer::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, @@ -326,7 +313,6 @@ void SAL_CALL OFSStreamContainer::seek( sal_Int64 location ) m_xSeekable->seek( location ); } -//----------------------------------------------- sal_Int64 SAL_CALL OFSStreamContainer::getPosition() throw ( io::IOException, uno::RuntimeException ) @@ -342,7 +328,6 @@ sal_Int64 SAL_CALL OFSStreamContainer::getPosition() return m_xSeekable->getPosition(); } -//----------------------------------------------- sal_Int64 SAL_CALL OFSStreamContainer::getLength() throw ( io::IOException, uno::RuntimeException ) @@ -360,7 +345,6 @@ sal_Int64 SAL_CALL OFSStreamContainer::getLength() // XInputStream -//----------------------------------------------- sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw( io::NotConnectedException, io::BufferSizeExceededException, @@ -378,7 +362,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aDa return m_xInputStream->readBytes( aData, nBytesToRead ); } -//----------------------------------------------- sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw( io::NotConnectedException, io::BufferSizeExceededException, @@ -396,7 +379,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) throw( io::NotConnectedException, io::BufferSizeExceededException, @@ -414,7 +396,6 @@ void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) m_xInputStream->skipBytes( nBytesToSkip ); } -//----------------------------------------------- sal_Int32 SAL_CALL OFSStreamContainer::available() throw( io::NotConnectedException, io::IOException, @@ -431,7 +412,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::available() return m_xInputStream->available(); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::closeInput() throw( io::NotConnectedException, io::IOException, @@ -456,7 +436,6 @@ void SAL_CALL OFSStreamContainer::closeInput() } // XOutputStream -//----------------------------------------------- void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, @@ -474,7 +453,6 @@ void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& a return m_xOutputStream->writeBytes( aData ); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::flush() throw ( io::NotConnectedException, io::BufferSizeExceededException, @@ -492,7 +470,6 @@ void SAL_CALL OFSStreamContainer::flush() return m_xOutputStream->flush(); } -//----------------------------------------------- void SAL_CALL OFSStreamContainer::closeOutput() throw ( io::NotConnectedException, io::BufferSizeExceededException, @@ -519,7 +496,6 @@ void SAL_CALL OFSStreamContainer::closeOutput() // XTruncate -//----------------------------------------------- void SAL_CALL OFSStreamContainer::truncate() throw ( io::IOException, uno::RuntimeException ) @@ -537,7 +513,6 @@ void SAL_CALL OFSStreamContainer::truncate() // XAsyncOutputMonitor -//----------------------------------------------- void SAL_CALL OFSStreamContainer::waitForCompletion() throw ( io::IOException, uno::RuntimeException ) diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 1c079484361d..cdf6d12ed8b0 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -45,7 +45,6 @@ #define MEMORY_RECORD 0 #define PERSISTENT_RECORD 1 -//---------------------------------------------------------------------------------- class NamePassRecord { @@ -184,12 +183,10 @@ public: }; -//---------------------------------------------------------------------------------- typedef ::std::pair< const OUString, ::std::list< NamePassRecord > > PairUrlRecord; typedef ::std::map< OUString, ::std::list< NamePassRecord > > PassMap; -//---------------------------------------------------------------------------------- class PasswordContainer; @@ -223,7 +220,6 @@ public: virtual void Commit(); }; -//---------------------------------------------------------------------------------- enum PasswordState { no_password, @@ -381,7 +377,6 @@ public: void Notify(); }; -//---------------------------------------------------------------------------------- class MasterPasswordRequest_Impl : public ucbhelper::InteractionRequest { @@ -395,7 +390,6 @@ public: }; -//---------------------------------------------------------------------------------- class RW_SvMemoryStream : public SvMemoryStream { public: diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index e9cb52366ba6..c476a146acaa 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -24,18 +24,14 @@ #include <comphelper/extract.hxx> -//============================================================================ // // class SfxEnumItemInterface // -//============================================================================ DBG_NAME(SfxEnumItemInterface) -//============================================================================ TYPEINIT1(SfxEnumItemInterface, SfxPoolItem) -//============================================================================ // virtual int SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const { @@ -45,7 +41,6 @@ int SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const GetEnumValue(); } -//============================================================================ // virtual SfxItemPresentation SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, @@ -56,7 +51,6 @@ SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const @@ -65,7 +59,6 @@ bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) return true; } -//============================================================================ // virtual bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) @@ -81,21 +74,18 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, return false; } -//============================================================================ OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const { DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); return OUString(); } -//============================================================================ // virtual sal_uInt16 SfxEnumItemInterface::GetValueByPos(sal_uInt16 nPos) const { return nPos; } -//============================================================================ // virtual sal_uInt16 SfxEnumItemInterface::GetPosByValue(sal_uInt16 nValue) const { @@ -111,34 +101,28 @@ sal_Bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const return sal_True; } -//============================================================================ // virtual int SfxEnumItemInterface::HasBoolValue() const { return false; } -//============================================================================ // virtual sal_Bool SfxEnumItemInterface::GetBoolValue() const { return false; } -//============================================================================ // virtual void SfxEnumItemInterface::SetBoolValue(sal_Bool) {} -//============================================================================ // // class CntEnumItem // -//============================================================================ DBG_NAME(CntEnumItem) -//============================================================================ CntEnumItem::CntEnumItem(sal_uInt16 which, SvStream & rStream): SfxEnumItemInterface(which) { @@ -146,10 +130,8 @@ CntEnumItem::CntEnumItem(sal_uInt16 which, SvStream & rStream): rStream >> m_nValue; } -//============================================================================ TYPEINIT1(CntEnumItem, SfxEnumItemInterface) -//============================================================================ // virtual SvStream & CntEnumItem::Store(SvStream & rStream, sal_uInt16) const { @@ -157,32 +139,26 @@ SvStream & CntEnumItem::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual sal_uInt16 CntEnumItem::GetEnumValue() const { return GetValue(); } -//============================================================================ // virtual void CntEnumItem::SetEnumValue(sal_uInt16 nTheValue) { SetValue(nTheValue); } -//============================================================================ // // class CntBoolItem // -//============================================================================ DBG_NAME(CntBoolItem) -//============================================================================ TYPEINIT1_AUTOFACTORY(CntBoolItem, SfxPoolItem) -//============================================================================ CntBoolItem::CntBoolItem(sal_uInt16 which, SvStream & rStream): SfxPoolItem(which) { @@ -190,7 +166,6 @@ CntBoolItem::CntBoolItem(sal_uInt16 which, SvStream & rStream): rStream >> m_bValue; } -//============================================================================ // virtual int CntBoolItem::operator ==(const SfxPoolItem & rItem) const { @@ -199,7 +174,6 @@ int CntBoolItem::operator ==(const SfxPoolItem & rItem) const return m_bValue == static_cast< CntBoolItem const * >(&rItem)->m_bValue; } -//============================================================================ // virtual int CntBoolItem::Compare(const SfxPoolItem & rWith) const { @@ -208,7 +182,6 @@ int CntBoolItem::Compare(const SfxPoolItem & rWith) const 0 : m_bValue ? -1 : 1; } -//============================================================================ // virtual SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -219,7 +192,6 @@ SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -227,7 +199,6 @@ bool CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const return true; } -//============================================================================ // virtual bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { @@ -241,14 +212,12 @@ bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) return false; } -//============================================================================ // virtual SfxPoolItem * CntBoolItem::Create(SvStream & rStream, sal_uInt16) const { return new CntBoolItem(Which(), rStream); } -//============================================================================ // virtual SvStream & CntBoolItem::Store(SvStream & rStream, sal_uInt16) const { @@ -256,21 +225,18 @@ SvStream & CntBoolItem::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * CntBoolItem::Clone(SfxItemPool *) const { return new CntBoolItem(*this); } -//============================================================================ // virtual sal_uInt16 CntBoolItem::GetValueCount() const { return 2; } -//============================================================================ // virtual OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const { diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 430bdb3c148f..c8b35b97bdc6 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -21,18 +21,14 @@ #include <tools/stream.hxx> #include <svl/cintitem.hxx> -//============================================================================ // // class CntByteItem // -//============================================================================ DBG_NAME(CntByteItem) -//============================================================================ TYPEINIT1_AUTOFACTORY(CntByteItem, SfxPoolItem); -//============================================================================ // virtual int CntByteItem::operator ==(const SfxPoolItem & rItem) const { @@ -42,7 +38,6 @@ int CntByteItem::operator ==(const SfxPoolItem & rItem) const return m_nValue == (static_cast< const CntByteItem * >(&rItem))->m_nValue; } -//============================================================================ // virtual int CntByteItem::Compare(const SfxPoolItem & rWith) const { @@ -55,7 +50,6 @@ int CntByteItem::Compare(const SfxPoolItem & rWith) const 0 : 1; } -//============================================================================ // virtual SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -67,7 +61,6 @@ SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -76,7 +69,6 @@ bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const return true; } -//============================================================================ // virtual bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { @@ -91,7 +83,6 @@ bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) return false; } -//============================================================================ // virtual SfxPoolItem * CntByteItem::Create(SvStream & rStream, sal_uInt16) const { @@ -101,7 +92,6 @@ SfxPoolItem * CntByteItem::Create(SvStream & rStream, sal_uInt16) const return new CntByteItem(Which(), sal_uInt8(nTheValue)); } -//============================================================================ // virtual SvStream & CntByteItem::Store(SvStream & rStream, sal_uInt16) const { @@ -110,7 +100,6 @@ SvStream & CntByteItem::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const { @@ -118,7 +107,6 @@ SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const return new CntByteItem(*this); } -//============================================================================ // virtual sal_uInt8 CntByteItem::GetMin() const { @@ -126,7 +114,6 @@ sal_uInt8 CntByteItem::GetMin() const return 0; } -//============================================================================ // virtual sal_uInt8 CntByteItem::GetMax() const { @@ -134,7 +121,6 @@ sal_uInt8 CntByteItem::GetMax() const return 255; } -//============================================================================ // virtual SfxFieldUnit CntByteItem::GetUnit() const { @@ -142,18 +128,14 @@ SfxFieldUnit CntByteItem::GetUnit() const return SFX_FUNIT_NONE; } -//============================================================================ // // class CntUInt16Item // -//============================================================================ DBG_NAME(CntUInt16Item); -//============================================================================ TYPEINIT1_AUTOFACTORY(CntUInt16Item, SfxPoolItem); -//============================================================================ CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) { @@ -163,7 +145,6 @@ CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) : m_nValue = nTheValue; } -//============================================================================ // virtual int CntUInt16Item::operator ==(const SfxPoolItem & rItem) const { @@ -174,7 +155,6 @@ int CntUInt16Item::operator ==(const SfxPoolItem & rItem) const m_nValue; } -//============================================================================ // virtual int CntUInt16Item::Compare(const SfxPoolItem & rWith) const { @@ -189,7 +169,6 @@ int CntUInt16Item::Compare(const SfxPoolItem & rWith) const 0 : 1; } -//============================================================================ // virtual SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -202,7 +181,6 @@ SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -211,7 +189,6 @@ bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const return true; } -//============================================================================ // virtual bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { @@ -227,7 +204,6 @@ bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) return false; } -//============================================================================ // virtual SfxPoolItem * CntUInt16Item::Create(SvStream & rStream, sal_uInt16) const { @@ -235,7 +211,6 @@ SfxPoolItem * CntUInt16Item::Create(SvStream & rStream, sal_uInt16) const return new CntUInt16Item(Which(), rStream); } -//============================================================================ // virtual SvStream & CntUInt16Item::Store(SvStream &rStream, sal_uInt16) const { @@ -244,7 +219,6 @@ SvStream & CntUInt16Item::Store(SvStream &rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const { @@ -252,7 +226,6 @@ SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const return new CntUInt16Item(*this); } -//============================================================================ // virtual sal_uInt16 CntUInt16Item::GetMin() const { @@ -260,7 +233,6 @@ sal_uInt16 CntUInt16Item::GetMin() const return 0; } -//============================================================================ // virtual sal_uInt16 CntUInt16Item::GetMax() const { @@ -268,7 +240,6 @@ sal_uInt16 CntUInt16Item::GetMax() const return 65535; } -//============================================================================ // virtual SfxFieldUnit CntUInt16Item::GetUnit() const { @@ -276,18 +247,14 @@ SfxFieldUnit CntUInt16Item::GetUnit() const return SFX_FUNIT_NONE; } -//============================================================================ // // class CntInt32Item // -//============================================================================ DBG_NAME(CntInt32Item); -//============================================================================ TYPEINIT1_AUTOFACTORY(CntInt32Item, SfxPoolItem); -//============================================================================ CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) { @@ -296,7 +263,6 @@ CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) : rStream >> m_nValue; } -//============================================================================ // virtual int CntInt32Item::operator ==(const SfxPoolItem & rItem) const { @@ -307,7 +273,6 @@ int CntInt32Item::operator ==(const SfxPoolItem & rItem) const m_nValue; } -//============================================================================ // virtual int CntInt32Item::Compare(const SfxPoolItem & rWith) const { @@ -321,7 +286,6 @@ int CntInt32Item::Compare(const SfxPoolItem & rWith) const 0 : 1; } -//============================================================================ // virtual SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -333,7 +297,6 @@ SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -342,7 +305,6 @@ bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const return true; } -//============================================================================ // virtual bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { @@ -357,7 +319,6 @@ bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) return false; } -//============================================================================ // virtual SfxPoolItem * CntInt32Item::Create(SvStream & rStream, sal_uInt16) const { @@ -365,7 +326,6 @@ SfxPoolItem * CntInt32Item::Create(SvStream & rStream, sal_uInt16) const return new CntInt32Item(Which(), rStream); } -//============================================================================ // virtual SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const { @@ -375,7 +335,6 @@ SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const { @@ -383,7 +342,6 @@ SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const return new CntInt32Item(*this); } -//============================================================================ // virtual sal_Int32 CntInt32Item::GetMin() const { @@ -391,7 +349,6 @@ sal_Int32 CntInt32Item::GetMin() const return sal_Int32(0x80000000); } -//============================================================================ // virtual sal_Int32 CntInt32Item::GetMax() const { @@ -399,7 +356,6 @@ sal_Int32 CntInt32Item::GetMax() const return 0x7FFFFFFF; } -//============================================================================ // virtual SfxFieldUnit CntInt32Item::GetUnit() const { @@ -407,18 +363,14 @@ SfxFieldUnit CntInt32Item::GetUnit() const return SFX_FUNIT_NONE; } -//============================================================================ // // class CntUInt32Item // -//============================================================================ DBG_NAME(CntUInt32Item); -//============================================================================ TYPEINIT1_AUTOFACTORY(CntUInt32Item, SfxPoolItem); -//============================================================================ CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) { @@ -428,7 +380,6 @@ CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) : m_nValue = nTheValue; } -//============================================================================ // virtual int CntUInt32Item::operator ==(const SfxPoolItem & rItem) const { @@ -439,7 +390,6 @@ int CntUInt32Item::operator ==(const SfxPoolItem & rItem) const m_nValue; } -//============================================================================ // virtual int CntUInt32Item::Compare(const SfxPoolItem & rWith) const { @@ -454,7 +404,6 @@ int CntUInt32Item::Compare(const SfxPoolItem & rWith) const 0 : 1; } -//============================================================================ // virtual SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -467,7 +416,6 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -477,7 +425,6 @@ bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const return true; } -//============================================================================ // virtual bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { @@ -493,7 +440,6 @@ bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) return false; } -//============================================================================ // virtual SfxPoolItem * CntUInt32Item::Create(SvStream & rStream, sal_uInt16) const { @@ -501,7 +447,6 @@ SfxPoolItem * CntUInt32Item::Create(SvStream & rStream, sal_uInt16) const return new CntUInt32Item(Which(), rStream); } -//============================================================================ // virtual SvStream & CntUInt32Item::Store(SvStream &rStream, sal_uInt16) const { @@ -510,7 +455,6 @@ SvStream & CntUInt32Item::Store(SvStream &rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * CntUInt32Item::Clone(SfxItemPool *) const { @@ -518,7 +462,6 @@ SfxPoolItem * CntUInt32Item::Clone(SfxItemPool *) const return new CntUInt32Item(*this); } -//============================================================================ // virtual sal_uInt32 CntUInt32Item::GetMin() const { @@ -526,7 +469,6 @@ sal_uInt32 CntUInt32Item::GetMin() const return 0; } -//============================================================================ // virtual sal_uInt32 CntUInt32Item::GetMax() const { @@ -534,7 +476,6 @@ sal_uInt32 CntUInt32Item::GetMax() const return 0xFFFFFFFF; } -//============================================================================ // virtual SfxFieldUnit CntUInt32Item::GetUnit() const { diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 43c1478103cf..b0e0e82db244 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -103,7 +103,6 @@ int CntWallpaperItem::operator==( const SfxPoolItem& rItem ) const return sal_False; } -//============================================================================ // virtual sal_uInt16 CntWallpaperItem::GetVersion(sal_uInt16) const { @@ -136,7 +135,6 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const return new CntWallpaperItem( *this ); } -//---------------------------------------------------------------------------- // virtual bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8) const { @@ -144,7 +142,6 @@ bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8) const return false; } -//---------------------------------------------------------------------------- // virtual bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&, sal_uInt8) { diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 285f07bc30e1..19164d99b17a 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -23,36 +23,30 @@ #include <tools/stream.hxx> #include <svl/ctypeitm.hxx> -//============================================================================ // The following defines are copied from chaos/source/items/cstritem.cxx: #define CNTSTRINGITEM_STREAM_MAGIC ( (sal_uInt32)0xfefefefe ) #define CNTSTRINGITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) -//============================================================================ // // class CntContentTypeItem Implementation. // -//============================================================================ TYPEINIT1_AUTOFACTORY( CntContentTypeItem, CntUnencodedStringItem ); #define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 ) -//---------------------------------------------------------------------------- CntContentTypeItem::CntContentTypeItem() : CntUnencodedStringItem(), _eType( CONTENT_TYPE_NOT_INIT ) { } -//---------------------------------------------------------------------------- CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const OUString& rType ) : CntUnencodedStringItem( which, rType ), _eType( CONTENT_TYPE_NOT_INIT ) { } -//---------------------------------------------------------------------------- CntContentTypeItem::CntContentTypeItem( const CntContentTypeItem& rOrig ) : CntUnencodedStringItem( rOrig ), _eType( rOrig._eType ), @@ -60,14 +54,12 @@ CntContentTypeItem::CntContentTypeItem( const CntContentTypeItem& rOrig ) { } -//============================================================================ // virtual sal_uInt16 CntContentTypeItem::GetVersion(sal_uInt16) const { return 1; // because it uses SfxPoolItem::read/writeUnicodeString() } -//---------------------------------------------------------------------------- // virtual SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, sal_uInt16 nItemVersion ) const @@ -90,7 +82,6 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, return new CntContentTypeItem(Which(), aValue); } -//---------------------------------------------------------------------------- // virtual SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const { @@ -101,7 +92,6 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//---------------------------------------------------------------------------- // virtual int CntContentTypeItem::operator==( const SfxPoolItem& rOrig ) const { @@ -114,14 +104,12 @@ int CntContentTypeItem::operator==( const SfxPoolItem& rOrig ) const return CntUnencodedStringItem::operator==( rOther ); } -//---------------------------------------------------------------------------- // virtual SfxPoolItem* CntContentTypeItem::Clone( SfxItemPool* /* pPool */ ) const { return new CntContentTypeItem( *this ); } -//---------------------------------------------------------------------------- void CntContentTypeItem::SetValue( const OUString& rNewVal ) { // De-initialize enum type and presentation. @@ -131,7 +119,6 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal ) CntUnencodedStringItem::SetValue( rNewVal ); } -//---------------------------------------------------------------------------- int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const { OUString aOwnText, aWithText; @@ -142,7 +129,6 @@ int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rI return rIntlWrapper.getCollator()->compareString( aOwnText, aWithText ); } -//---------------------------------------------------------------------------- SfxItemPresentation CntContentTypeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -170,7 +156,6 @@ SfxItemPresentation CntContentTypeItem::GetPresentation( pIntlWrapper); } -//---------------------------------------------------------------------------- INetContentType CntContentTypeItem::GetEnumValue() const { if ( _eType == CONTENT_TYPE_NOT_INIT ) @@ -185,7 +170,6 @@ INetContentType CntContentTypeItem::GetEnumValue() const return _eType; } -//---------------------------------------------------------------------------- void CntContentTypeItem::SetValue( const INetContentType eType ) { SetValue( INetContentTypes::GetContentType( eType ) ); @@ -195,7 +179,6 @@ void CntContentTypeItem::SetValue( const INetContentType eType ) _eType = eType; } -//---------------------------------------------------------------------------- // virtual bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -203,7 +186,6 @@ bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) return true; } -//---------------------------------------------------------------------------- // virtual bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8) { diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index d44b43c1c382..ebbba99427ac 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -23,18 +23,14 @@ #include <tools/stream.hxx> #include <svl/custritm.hxx> -//============================================================================ // // class CntUnencodedStringItem // -//============================================================================ DBG_NAME(CntUnencodedStringItem) -//============================================================================ TYPEINIT1_AUTOFACTORY(CntUnencodedStringItem, SfxPoolItem) -//============================================================================ // virtual int CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const { @@ -46,7 +42,6 @@ int CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const m_aValue; } -//============================================================================ // virtual int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const { @@ -59,7 +54,6 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const return (nCmp == 0) ? 0 : (nCmp < 0) ? -1 : 1; } -//============================================================================ // virtual int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith, IntlWrapper const & rIntlWrapper) @@ -72,7 +66,6 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith, static_cast< CntUnencodedStringItem const * >(&rWith)->m_aValue ); } -//============================================================================ // virtual SfxItemPresentation CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, @@ -84,7 +77,6 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, return SFX_ITEM_PRESENTATION_NAMELESS; } -//============================================================================ // virtual bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const @@ -93,7 +85,6 @@ bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt return true; } -//============================================================================ // virtual bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) @@ -108,7 +99,6 @@ bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, return false; } -//============================================================================ // virtual SfxPoolItem * CntUnencodedStringItem::Clone(SfxItemPool *) const { diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index be6017334edb..ca4c7503b985 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -148,7 +148,6 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation return SFX_ITEM_PRESENTATION_NAMELESS; } -//---------------------------------------------------------------------------- // virtual bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) @@ -171,7 +170,6 @@ bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal, return false; } -//---------------------------------------------------------------------------- // virtual bool SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const diff --git a/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx index 066a5accccc2..0f84b67ef69d 100644 --- a/svl/source/items/eitem.cxx +++ b/svl/source/items/eitem.cxx @@ -18,19 +18,15 @@ */ #include <svl/eitem.hxx> -//============================================================================ // // class SfxEnumItem // -//============================================================================ TYPEINIT1(SfxEnumItem, CntEnumItem); -//============================================================================ // // class SfxBoolItem // -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxBoolItem, CntBoolItem); diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 333a97c3ae45..6dbe174c4878 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -68,7 +68,6 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const return new SfxGlobalNameItem( *this ); } -//---------------------------------------------------------------------------- // virtual bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { @@ -90,7 +89,6 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt return true; } -//---------------------------------------------------------------------------- // virtual bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index bc96af4ad8c0..deb5a7368a84 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -32,7 +32,6 @@ struct SfxImageItem_Impl { return nAngle == rOther.nAngle && bMirrored == rOther.bMirrored; } }; -//--------------------------------------------------------- SfxImageItem::SfxImageItem( sal_uInt16 which, sal_uInt16 nImage ) : SfxInt16Item( which, nImage ) @@ -48,20 +47,17 @@ SfxImageItem::SfxImageItem( const SfxImageItem& rItem ) pImp = new SfxImageItem_Impl( *(rItem.pImp) ); } -//--------------------------------------------------------- SfxImageItem::~SfxImageItem() { delete pImp; } -//--------------------------------------------------------- SfxPoolItem* SfxImageItem::Clone( SfxItemPool* ) const { return new SfxImageItem( *this ); } -//--------------------------------------------------------- int SfxImageItem::operator==( const SfxPoolItem& rItem ) const { diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 363afb9a9ec1..b8cd293f108b 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -24,15 +24,12 @@ #include <tools/stream.hxx> #include <svl/metitem.hxx> -//============================================================================ // // class SfxByteItem // -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxByteItem, CntByteItem); -//============================================================================ // virtual SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const { @@ -41,18 +38,14 @@ SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const return new SfxByteItem(Which(), sal_uInt8(nValue)); } -//============================================================================ // // class SfxInt16Item // -//============================================================================ DBG_NAME(SfxInt16Item); -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxInt16Item, SfxPoolItem); -//============================================================================ SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream): SfxPoolItem(which) { @@ -62,7 +55,6 @@ SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream): m_nValue = nTheValue; } -//============================================================================ // virtual int SfxInt16Item::operator ==(const SfxPoolItem & rItem) const { @@ -72,7 +64,6 @@ int SfxInt16Item::operator ==(const SfxPoolItem & rItem) const m_nValue; } -//============================================================================ // virtual int SfxInt16Item::Compare(const SfxPoolItem & rWith) const { @@ -86,7 +77,6 @@ int SfxInt16Item::Compare(const SfxPoolItem & rWith) const 0 : 1; } -//============================================================================ // virtual SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -99,7 +89,6 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation, } -//============================================================================ // virtual bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -108,7 +97,6 @@ bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const return true; } -//============================================================================ // virtual bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 ) { @@ -123,7 +111,6 @@ bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 ) return false; } -//============================================================================ // virtual SfxPoolItem * SfxInt16Item::Create(SvStream & rStream, sal_uInt16) const { @@ -131,7 +118,6 @@ SfxPoolItem * SfxInt16Item::Create(SvStream & rStream, sal_uInt16) const return new SfxInt16Item(Which(), rStream); } -//============================================================================ // virtual SvStream & SfxInt16Item::Store(SvStream & rStream, sal_uInt16) const { @@ -140,94 +126,77 @@ SvStream & SfxInt16Item::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//============================================================================ SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const { DBG_CHKTHIS(SfxInt16Item, 0); return new SfxInt16Item(*this); } -//============================================================================ sal_Int16 SfxInt16Item::GetMin() const { DBG_CHKTHIS(SfxInt16Item, 0); return -32768; } -//============================================================================ sal_Int16 SfxInt16Item::GetMax() const { DBG_CHKTHIS(SfxInt16Item, 0); return 32767; } -//============================================================================ SfxFieldUnit SfxInt16Item::GetUnit() const { DBG_CHKTHIS(SfxInt16Item, 0); return SFX_FUNIT_NONE; } -//============================================================================ // // class SfxUInt16Item // -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxUInt16Item, CntUInt16Item); -//============================================================================ // // class SfxInt32Item // -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxInt32Item, CntInt32Item); -//============================================================================ // // class SfxUInt32Item // -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxUInt32Item, CntUInt32Item); -//============================================================================ // // class SfxMetricItem // -//============================================================================ DBG_NAME(SfxMetricItem); -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxMetricItem, SfxInt32Item); -//============================================================================ SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_uInt32 nValue): SfxInt32Item(which, nValue) { DBG_CTOR(SfxMetricItem, 0); } -//============================================================================ SfxMetricItem::SfxMetricItem(sal_uInt16 which, SvStream & rStream): SfxInt32Item(which, rStream) { DBG_CTOR(SfxMetricItem, 0); } -//============================================================================ SfxMetricItem::SfxMetricItem(const SfxMetricItem & rItem): SfxInt32Item(rItem) { DBG_CTOR(SfxMetricItem, 0); } -//============================================================================ // virtual bool SfxMetricItem::ScaleMetrics(long nMult, long nDiv) { @@ -239,7 +208,6 @@ bool SfxMetricItem::ScaleMetrics(long nMult, long nDiv) return true; } -//============================================================================ // virtual bool SfxMetricItem::HasMetrics() const { diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 29e1c65b96a5..b1191cc00866 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -27,7 +27,6 @@ #include <svl/smplhint.hxx> #include "poolio.hxx" -//======================================================================== void SfxItemPool::AddSfxItemPoolUser(SfxItemPoolUser& rNewUser) diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 3f6da5df58e6..b9e3a9b310ec 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -41,11 +41,9 @@ static sal_uLong nRangesCopyCount = 0; // wie oft wurden Ranges kopiert DBG_NAME(SfxItemSet) -//======================================================================== #include "nranges.cxx" -//======================================================================== #ifdef DBG_UTIL @@ -459,7 +457,6 @@ void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault ) } } -//------------------------------------------------------------------------ void SfxItemSet::InvalidateAllItems() @@ -914,7 +911,6 @@ int SfxItemSet::Set return bRet; } -//------------------------------------------------------------------------ const SfxPoolItem* SfxItemSet::GetItem ( @@ -959,7 +955,6 @@ const SfxPoolItem* SfxItemSet::GetItem } -//------------------------------------------------------------------------ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) const diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 05d7ae3b5453..f5cc1fa36b45 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -111,7 +111,6 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const return rStream; } -//---------------------------------------------------------------------------- // virtual bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { @@ -136,7 +135,6 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -//---------------------------------------------------------------------------- // virtual bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 5484f5f21c7a..66d46d9d92f9 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -229,7 +229,6 @@ SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const return new SvxMacroItem( *this ); } -//------------------------------------------------------------------------ SfxItemPresentation SvxMacroItem::GetPresentation ( diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index 0b1f74ae7a46..c9fc72d51e93 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.cxx @@ -21,7 +21,6 @@ #include <vector> // compiled via include from itemset.cxx only! -//======================================================================== #ifdef DBG_UTIL @@ -39,7 +38,6 @@ #endif -//============================================================================ inline void Swap_Impl(const sal_uInt16 *& rp1, const sal_uInt16 *& rp2) { const sal_uInt16 * pTemp = rp1; @@ -47,7 +45,6 @@ inline void Swap_Impl(const sal_uInt16 *& rp1, const sal_uInt16 *& rp2) rp2 = pTemp; } -//======================================================================== sal_uInt16 InitializeRanges_Impl( sal_uInt16 *&rpRanges, va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 nNull ) @@ -96,7 +93,6 @@ sal_uInt16 InitializeRanges_Impl( sal_uInt16 *&rpRanges, va_list pArgs, return nSize; } -//------------------------------------------------------------------------ sal_uInt16 Count_Impl( const sal_uInt16 *pRanges ) @@ -116,7 +112,6 @@ sal_uInt16 Count_Impl( const sal_uInt16 *pRanges ) return nCount; } -//------------------------------------------------------------------------ sal_uInt16 Capacity_Impl( const sal_uInt16 *pRanges ) @@ -140,7 +135,6 @@ sal_uInt16 Capacity_Impl( const sal_uInt16 *pRanges ) return nCount; } -//------------------------------------------------------------------------ SfxUShortRanges::SfxUShortRanges( const SfxUShortRanges &rOrig ) @@ -160,7 +154,6 @@ SfxUShortRanges::SfxUShortRanges( const SfxUShortRanges &rOrig ) _pRanges = 0; } -//------------------------------------------------------------------------ SfxUShortRanges::SfxUShortRanges( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) @@ -179,7 +172,6 @@ SfxUShortRanges::SfxUShortRanges( sal_uInt16 nWhich1, sal_uInt16 nWhich2 ) _pRanges[2] = 0; } -//------------------------------------------------------------------------ SfxUShortRanges::SfxUShortRanges( const sal_uInt16* pArr ) @@ -199,7 +191,6 @@ SfxUShortRanges::SfxUShortRanges( const sal_uInt16* pArr ) memcpy( _pRanges, pArr, sizeof(sal_uInt16) * nCount ); } -//------------------------------------------------------------------------ bool SfxUShortRanges::operator==( const SfxUShortRanges &rOther ) const { @@ -230,7 +221,6 @@ bool SfxUShortRanges::operator==( const SfxUShortRanges &rOther ) const return true; } -//------------------------------------------------------------------------ SfxUShortRanges& SfxUShortRanges::operator = ( @@ -262,7 +252,6 @@ SfxUShortRanges& SfxUShortRanges::operator = return *this; } -//------------------------------------------------------------------------ SfxUShortRanges& SfxUShortRanges::operator += ( @@ -422,7 +411,6 @@ copy_rest: return *this; } -//------------------------------------------------------------------------ SfxUShortRanges& SfxUShortRanges::operator -= ( @@ -565,7 +553,6 @@ SfxUShortRanges& SfxUShortRanges::operator -= return *this; } -//------------------------------------------------------------------------ SfxUShortRanges& SfxUShortRanges::operator /= ( @@ -685,7 +672,6 @@ SfxUShortRanges& SfxUShortRanges::operator /= return *this; } -//------------------------------------------------------------------------ sal_uInt16 SfxUShortRanges::Count() const diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index fcb05b3a7460..909c33b78c67 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -28,7 +28,6 @@ DBG_NAME(SfxItemPoolCache) -//------------------------------------------------------------------------ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, const SfxPoolItem *pPutItem ): @@ -41,7 +40,6 @@ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, DBG_ASSERT(pItemPool, "kein Pool angegeben"); } -//------------------------------------------------------------------------ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, const SfxItemSet *pPutSet ): @@ -54,7 +52,6 @@ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool, DBG_ASSERT(pItemPool, "kein Pool angegeben"); } -//------------------------------------------------------------------------ SfxItemPoolCache::~SfxItemPoolCache() { @@ -69,7 +66,6 @@ SfxItemPoolCache::~SfxItemPoolCache() pPool->Remove( *pItemToPut ); } -//------------------------------------------------------------------------ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, sal_Bool bNew ) { diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index e0bed0a56ef3..e4e011355bc8 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -33,7 +33,6 @@ DBG_NAME(SfxItemPool); -//======================================================================== const SfxItemPool* SfxItemPool::GetStoringPool() @@ -50,7 +49,6 @@ const SfxItemPool* SfxItemPool::GetStoringPool() return pStoringPool_; } -//------------------------------------------------------------------------- SvStream &SfxItemPool::Store(SvStream &rStream) const @@ -361,7 +359,6 @@ bool SfxItemPool::IsInRange( sal_uInt16 nWhich ) const return nWhich >= pImp->mnStart && nWhich <= pImp->mnEnd; } -//============================================================================ // This had to be moved to a method of its own to keep Solaris GCC happy: void SfxItemPool_Impl::readTheItems ( SvStream & rStream, sal_uInt32 nItemCount, sal_uInt16 nVer, @@ -1143,7 +1140,6 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate return 0; } -//------------------------------------------------------------------------- bool SfxItemPool::StoreSurrogate @@ -1226,7 +1222,6 @@ bool SfxItemPool::IsInStoringRange( sal_uInt16 nWhich ) const nWhich <= pImp->nStoringEnd; } -//------------------------------------------------------------------------ void SfxItemPool::SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo ) @@ -1466,7 +1461,6 @@ bool SfxItemPool::IsCurrentVersionLoading() const ( !pImp->mpSecondary || pImp->mpSecondary->IsCurrentVersionLoading() ); } -//------------------------------------------------------------------------- bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, @@ -1532,7 +1526,6 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, return sal_True; } -//------------------------------------------------------------------------- const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 6fc44fbe03be..3147c5c5e84d 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -175,21 +175,18 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const return rStream; } -//============================================================================ // static OUString SfxPoolItem::readByteString(SvStream& rStream) { return rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); } -//============================================================================ // static void SfxPoolItem::writeByteString(SvStream & rStream, const OUString& rString) { rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); } -//============================================================================ // static OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) { @@ -197,7 +194,6 @@ OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode) rStream.GetStreamCharSet()); } -//============================================================================ // static void SfxPoolItem::writeUnicodeString(SvStream & rStream, const OUString& rString) { diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 645c543230e2..efc4d8134075 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -112,14 +112,12 @@ SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16) const return rStream; } -//========================================================================= SfxUShortRangesItem::SfxUShortRangesItem() : _pRanges(0) { } -//------------------------------------------------------------------------- SfxUShortRangesItem::SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream ) : SfxPoolItem( nWID ) @@ -132,7 +130,6 @@ SfxUShortRangesItem::SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream ) _pRanges[nCount] = 0; } -//------------------------------------------------------------------------- SfxUShortRangesItem::SfxUShortRangesItem( const SfxUShortRangesItem& rItem ) : SfxPoolItem( rItem ) @@ -142,14 +139,12 @@ SfxUShortRangesItem::SfxUShortRangesItem( const SfxUShortRangesItem& rItem ) memcpy( _pRanges, rItem._pRanges, sizeof(sal_uInt16) * nCount ); } -//------------------------------------------------------------------------- SfxUShortRangesItem::~SfxUShortRangesItem() { delete _pRanges; } -//------------------------------------------------------------------------- int SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const { @@ -167,7 +162,6 @@ int SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const return !_pRanges[n] && !rOther._pRanges[n]; } -//------------------------------------------------------------------------- SfxItemPresentation SfxUShortRangesItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreMetric*/, @@ -179,21 +173,18 @@ SfxItemPresentation SfxUShortRangesItem::GetPresentation( SfxItemPresentation /* return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------- SfxPoolItem* SfxUShortRangesItem::Clone( SfxItemPool * ) const { return new SfxUShortRangesItem( *this ); } -//------------------------------------------------------------------------- SfxPoolItem* SfxUShortRangesItem::Create( SvStream &rStream, sal_uInt16 ) const { return new SfxUShortRangesItem( Which(), rStream ); } -//------------------------------------------------------------------------- SvStream& SfxUShortRangesItem::Store( SvStream &rStream, sal_uInt16 ) const { diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 1aab6904a87e..5b8ec5a16ac3 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -42,7 +42,6 @@ public: ~SfxImpStringList(); }; -//------------------------------------------------------------------------ SfxImpStringList::~SfxImpStringList() { @@ -57,7 +56,6 @@ SfxStringListItem::SfxStringListItem() : { } -//------------------------------------------------------------------------ SfxStringListItem::SfxStringListItem( sal_uInt16 which, const std::vector<OUString>* pList ) : SfxPoolItem( which ), @@ -74,7 +72,6 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, const std::vector<OUStri } } -//------------------------------------------------------------------------ SfxStringListItem::SfxStringListItem( sal_uInt16 which, SvStream& rStream ) : SfxPoolItem( which ), @@ -96,7 +93,6 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, SvStream& rStream ) : } } -//------------------------------------------------------------------------ SfxStringListItem::SfxStringListItem( const SfxStringListItem& rItem ) : SfxPoolItem( rItem ), @@ -109,7 +105,6 @@ SfxStringListItem::SfxStringListItem( const SfxStringListItem& rItem ) : } } -//------------------------------------------------------------------------ SfxStringListItem::~SfxStringListItem() { @@ -123,7 +118,6 @@ SfxStringListItem::~SfxStringListItem() } } -//------------------------------------------------------------------------ std::vector<OUString>& SfxStringListItem::GetList() { @@ -138,7 +132,6 @@ const std::vector<OUString>& SfxStringListItem::GetList () const return (const_cast< SfxStringListItem * >(this))->GetList(); } -//------------------------------------------------------------------------ int SfxStringListItem::operator==( const SfxPoolItem& rItem ) const { @@ -149,7 +142,6 @@ int SfxStringListItem::operator==( const SfxPoolItem& rItem ) const return pImp == pItem->pImp; } -//------------------------------------------------------------------------ SfxItemPresentation SfxStringListItem::GetPresentation ( @@ -164,7 +156,6 @@ SfxItemPresentation SfxStringListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ SfxPoolItem* SfxStringListItem::Clone( SfxItemPool *) const { @@ -178,14 +169,12 @@ SfxPoolItem* SfxStringListItem::Clone( SfxItemPool *) const } -//------------------------------------------------------------------------ SfxPoolItem* SfxStringListItem::Create( SvStream & rStream, sal_uInt16 ) const { return new SfxStringListItem( Which(), rStream ); } -//------------------------------------------------------------------------ SvStream& SfxStringListItem::Store( SvStream & rStream, sal_uInt16 ) const { @@ -207,7 +196,6 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, sal_uInt16 ) const return rStream; } -//------------------------------------------------------------------------ void SfxStringListItem::SetString( const OUString& rStr ) { @@ -241,7 +229,6 @@ void SfxStringListItem::SetString( const OUString& rStr ) } } -//------------------------------------------------------------------------ OUString SfxStringListItem::GetString() { @@ -265,7 +252,6 @@ OUString SfxStringListItem::GetString() return convertLineEnd(aStr, GetSystemLineEnd()); } -//------------------------------------------------------------------------ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ) { @@ -285,7 +271,6 @@ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUSt } } -//---------------------------------------------------------------------------- void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const { long nCount = pImp->aList.size(); @@ -295,7 +280,6 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString > rList[i] = pImp->aList[i]; } -//---------------------------------------------------------------------------- // virtual bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { @@ -310,7 +294,6 @@ bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt return false; } -//---------------------------------------------------------------------------- // virtual bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index a75f83c46f89..78b91d373f32 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -258,7 +258,6 @@ int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const } -//------------------------------------------------------------------------ SfxItemPresentation SvxSearchItem::GetPresentation ( diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index 0cf799470636..9f0817ac8866 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -19,15 +19,12 @@ #include <svl/stritem.hxx> -//============================================================================ // // class SfxStringItem // -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxStringItem, CntUnencodedStringItem) -//============================================================================ // virtual SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream): CntUnencodedStringItem(which) @@ -36,14 +33,12 @@ SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream): } -//============================================================================ // virtual SfxPoolItem * SfxStringItem::Create(SvStream & rStream, sal_uInt16) const { return new SfxStringItem(Which(), rStream); } -//============================================================================ // virtual SvStream & SfxStringItem::Store(SvStream & rStream, sal_uInt16) const { @@ -51,7 +46,6 @@ SvStream & SfxStringItem::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * SfxStringItem::Clone(SfxItemPool *) const { diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 5926d298d5c2..140a8b22a5e5 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -21,18 +21,14 @@ #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> -//============================================================================ // // class SfxVisibilityItem // -//============================================================================ DBG_NAME(SfxVisibilityItem) -//============================================================================ TYPEINIT1_AUTOFACTORY(SfxVisibilityItem, SfxPoolItem); -//============================================================================ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream): SfxPoolItem(which) { @@ -42,7 +38,6 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream): m_nValue.bVisible = bValue; } -//============================================================================ // virtual int SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const { @@ -52,7 +47,6 @@ int SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const m_nValue.bVisible; } -//============================================================================ // virtual int SfxVisibilityItem::Compare(const SfxPoolItem & rWith) const { @@ -61,7 +55,6 @@ int SfxVisibilityItem::Compare(const SfxPoolItem & rWith) const 0 : m_nValue.bVisible ? -1 : 1; } -//============================================================================ // virtual SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, @@ -73,7 +66,6 @@ SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation, } -//============================================================================ // virtual bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const { @@ -81,7 +73,6 @@ bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) co return true; } -//============================================================================ // virtual bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) { @@ -92,7 +83,6 @@ bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 return false; } -//============================================================================ // virtual SfxPoolItem * SfxVisibilityItem::Create(SvStream & rStream, sal_uInt16) const { @@ -100,7 +90,6 @@ SfxPoolItem * SfxVisibilityItem::Create(SvStream & rStream, sal_uInt16) const return new SfxVisibilityItem(Which(), rStream); } -//============================================================================ // virtual SvStream & SfxVisibilityItem::Store(SvStream & rStream, sal_uInt16) const { @@ -109,7 +98,6 @@ SvStream & SfxVisibilityItem::Store(SvStream & rStream, sal_uInt16) const return rStream; } -//============================================================================ // virtual SfxPoolItem * SfxVisibilityItem::Clone(SfxItemPool *) const { @@ -117,14 +105,12 @@ SfxPoolItem * SfxVisibilityItem::Clone(SfxItemPool *) const return new SfxVisibilityItem(*this); } -//============================================================================ // virtual sal_uInt16 SfxVisibilityItem::GetValueCount() const { return 2; } -//============================================================================ // virtual OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const { diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index b8914eaca053..e9e297cf565c 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -26,7 +26,6 @@ namespace enum ElementType { ELEMENT_START, ELEMENT_DELIM, ELEMENT_ITEM, ELEMENT_END }; -//============================================================================ struct ParsedAddrSpec { sal_Unicode const * m_pBegin; @@ -65,7 +64,6 @@ inline void ParsedAddrSpec::finish() } -//============================================================================ class SvAddressParser_Impl { enum State { BEFORE_COLON, BEFORE_LESS, AFTER_LESS, AFTER_GREATER }; @@ -163,11 +161,9 @@ inline void SvAddressParser_Impl::addTokenToRealName() } } -//============================================================================ // // SvAddressParser_Impl // -//============================================================================ bool SvAddressParser_Impl::readToken() { @@ -316,7 +312,6 @@ bool SvAddressParser_Impl::readToken() } } -//============================================================================ // static OUString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bAddrSpec) @@ -429,7 +424,6 @@ OUString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin, return aResult.makeStringAndClear(); } -//============================================================================ // static OUString SvAddressParser_Impl::reparseComment(sal_Unicode const * pBegin, sal_Unicode const * pEnd) @@ -445,7 +439,6 @@ OUString SvAddressParser_Impl::reparseComment(sal_Unicode const * pBegin, return aResult.makeStringAndClear(); } -//============================================================================ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser, const OUString& rInput) { @@ -725,11 +718,9 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser, } } -//============================================================================ // // SvAddressParser // -//============================================================================ SvAddressParser::SvAddressParser(const OUString& rInput) : m_bHasFirst(false) @@ -737,7 +728,6 @@ SvAddressParser::SvAddressParser(const OUString& rInput) SvAddressParser_Impl aDoParse(this, rInput); } -//============================================================================ SvAddressParser::~SvAddressParser() { for ( size_t i = m_aRest.size(); i > 0; ) diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index b7b40144004a..ded51973251e 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -22,21 +22,15 @@ #include <osl/diagnose.h> #include <tools/urlobj.hxx> -//......................................................................... namespace svt { -//......................................................................... - //===================================================================== //= OFileNotation - //===================================================================== - //--------------------------------------------------------------------- OFileNotation::OFileNotation( const OUString& _rUrlOrPath ) { construct( _rUrlOrPath ); } - //--------------------------------------------------------------------- OFileNotation::OFileNotation( const OUString& _rUrlOrPath, NOTATION _eInputNotation ) { if ( _eInputNotation == N_URL ) @@ -51,7 +45,6 @@ namespace svt implInitWithSystemNotation( _rUrlOrPath ); } - //--------------------------------------------------------------------- bool OFileNotation::implInitWithSystemNotation( const OUString& _rSystemPath ) { bool bSuccess = false; @@ -78,7 +71,6 @@ namespace svt return bSuccess; } - //--------------------------------------------------------------------- bool OFileNotation::implInitWithURLNotation( const OUString& _rURL ) { m_sFileURL = _rURL; @@ -86,7 +78,6 @@ namespace svt return true; } - //--------------------------------------------------------------------- void OFileNotation::construct( const OUString& _rUrlOrPath ) { bool bSuccess = false; @@ -116,7 +107,6 @@ namespace svt (void)bSuccess; } - //--------------------------------------------------------------------- OUString OFileNotation::get(NOTATION _eOutputNotation) { switch (_eOutputNotation) @@ -129,8 +119,6 @@ namespace svt return OUString(); } -//......................................................................... } // namespace svt -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 36878223b912..bc485fe32910 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -29,7 +29,6 @@ namespace { -//============================================================================ struct MediaTypeEntry { sal_Char const * m_pTypeName; @@ -37,7 +36,6 @@ struct MediaTypeEntry sal_Char const * m_pExtension; }; -//============================================================================ struct TypeIDMapEntry { OUString m_aTypeName; @@ -45,7 +43,6 @@ struct TypeIDMapEntry OUString m_aSystemFileType; }; -//============================================================================ struct TypeNameMapEntry { OUString m_aExtension; @@ -55,7 +52,6 @@ struct TypeNameMapEntry m_eTypeID(CONTENT_TYPE_UNKNOWN) {} }; -//============================================================================ struct ExtensionMapEntry { INetContentType m_eTypeID; @@ -64,7 +60,6 @@ struct ExtensionMapEntry m_eTypeID(CONTENT_TYPE_UNKNOWN) {} }; -//============================================================================ class Registration { typedef boost::ptr_map<OUString, TypeNameMapEntry> TypeNameMap; @@ -118,11 +113,9 @@ inline TypeIDMapEntry * Registration::getEntry(INetContentType eTypeID) return NULL; } -//============================================================================ MediaTypeEntry const * seekEntry(OUString const & rTypeName, MediaTypeEntry const * pMap, sal_Size nSize); -//============================================================================ /** A mapping from type names to type ids and extensions. Sorted by type name. */ @@ -252,7 +245,6 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1] { CONTENT_TYPE_STR_X_VRML, CONTENT_TYPE_X_VRML, "wrl" } }; -//============================================================================ /** A mapping from type IDs to presentation resource IDs. Sorted by type ID. */ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1] @@ -357,7 +349,6 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1] STR_SVT_MIMETYPE_APP_SXIPACKED, // CONTENT_TYPE_APP_VND_SUN_XML_IMPRESSPACKED }; -//============================================================================ /** A mapping from extensions to type IDs. Sorted by extension. */ MediaTypeEntry const aStaticExtensionMap[] @@ -442,7 +433,6 @@ MediaTypeEntry const aStaticExtensionMap[] { "xpm", CONTENT_TYPE_IMAGE_GENERIC, "" }, { "zip", CONTENT_TYPE_APP_ZIP, "" } }; -//============================================================================ /** A mapping from presentations to type IDs. Sorted by presentations. */ MediaTypeEntry const aStaticPresentationMap[] @@ -504,20 +494,16 @@ MediaTypeEntry const aStaticPresentationMap[] } -//============================================================================ // // Registration // -//============================================================================ -//============================================================================ Registration::~Registration() { for ( TypeIDMap::iterator it = m_aTypeIDMap.begin(); it != m_aTypeIDMap.end(); ++it ) delete it->second; } -//============================================================================ // static TypeNameMapEntry * Registration::getExtensionEntry(OUString const & rTypeName) { @@ -529,7 +515,6 @@ TypeNameMapEntry * Registration::getExtensionEntry(OUString const & rTypeName) return 0; } -//============================================================================ // static INetContentType Registration::RegisterContentType(OUString const & rTypeName, OUString const & rPresentation, @@ -567,7 +552,6 @@ INetContentType Registration::RegisterContentType(OUString const & rTypeName, return eTypeID; } -//============================================================================ // static INetContentType Registration::GetContentType(OUString const & rTypeName) { @@ -580,7 +564,6 @@ INetContentType Registration::GetContentType(OUString const & rTypeName) : CONTENT_TYPE_UNKNOWN; } -//============================================================================ // static OUString Registration::GetContentType(INetContentType eTypeID) { @@ -592,7 +575,6 @@ OUString Registration::GetContentType(INetContentType eTypeID) return OUString(); } -//============================================================================ // static OUString Registration::GetPresentation(INetContentType eTypeID) { @@ -605,7 +587,6 @@ OUString Registration::GetPresentation(INetContentType eTypeID) return OUString(); } -//============================================================================ // static INetContentType Registration::GetContentType4Extension(OUString const & rExtension) { @@ -617,11 +598,9 @@ INetContentType Registration::GetContentType4Extension(OUString const & rExtensi : CONTENT_TYPE_UNKNOWN; } -//============================================================================ // // seekEntry // -//============================================================================ namespace { @@ -688,7 +667,6 @@ INetContentType INetContentTypes::RegisterContentType(OUString const & rTypeName return eTypeID; } -//============================================================================ // static INetContentType INetContentTypes::GetContentType(OUString const & rTypeName) { @@ -708,7 +686,6 @@ INetContentType INetContentTypes::GetContentType(OUString const & rTypeName) // the content type "x-starmail" has no sub type } -//============================================================================ //static OUString INetContentTypes::GetContentType(INetContentType eTypeID) { @@ -734,7 +711,6 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID) return aTypeName; } -//============================================================================ //static OUString INetContentTypes::GetPresentation(INetContentType eTypeID, const LanguageTag& aLocale) @@ -753,7 +729,6 @@ OUString INetContentTypes::GetPresentation(INetContentType eTypeID, return svl::getStringResource(nResID, aLocale); } -//============================================================================ //static INetContentType INetContentTypes::GetContentType4Extension(OUString const & rExtension) { @@ -766,7 +741,6 @@ INetContentType INetContentTypes::GetContentType4Extension(OUString const & rExt : eTypeID; } -//============================================================================ //static INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) { @@ -876,7 +850,6 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL) return eTypeID; } -//============================================================================ //static bool INetContentTypes::GetExtensionFromURL(OUString const & rURL, OUString & rExtension) @@ -903,7 +876,6 @@ bool INetContentTypes::GetExtensionFromURL(OUString const & rURL, return false; } -//============================================================================ // static bool INetContentTypes::parse(OUString const & rMediaType, OUString & rType, OUString & rSubType, diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 24cdf8991a1a..988bd5c09269 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -25,9 +25,6 @@ using namespace com::sun::star; -//========================================================================= -//============== SvCommandList ============================================ -//========================================================================= static OUString parseString(const OUString & rCmd, sal_Int32 * pIndex) { @@ -65,7 +62,6 @@ static void eatSpace(const OUString & rCmd, sal_Int32 * pIndex) } -//========================================================================= bool SvCommandList::AppendCommands ( const OUString & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ @@ -107,7 +103,6 @@ bool SvCommandList::AppendCommands return true; } -//========================================================================= SvCommand & SvCommandList::Append ( const OUString & rCommand, /* das Kommando */ diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 77a867692b8e..baeb10c0771a 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; -//============================================================================ class SvDataPipe_Impl { public: @@ -132,15 +131,12 @@ inline sal_uInt32 SvDataPipe_Impl::getReadPosition() const - m_pReadPage->m_aBuffer); } -//============================================================================ // // SvOutputStreamOpenLockBytes // -//============================================================================ TYPEINIT1(SvOutputStreamOpenLockBytes, SvOpenLockBytes) -//============================================================================ // virtual ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uLong, void *, sal_uLong, sal_uLong *) const @@ -148,7 +144,6 @@ ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uLong, void *, sal_uLong, sal_uL return ERRCODE_IO_CANTREAD; } -//============================================================================ // virtual ErrCode SvOutputStreamOpenLockBytes::WriteAt(sal_uLong nPos, void const * pBuffer, sal_uLong nCount, sal_uLong * pWritten) @@ -158,7 +153,6 @@ ErrCode SvOutputStreamOpenLockBytes::WriteAt(sal_uLong nPos, void const * pBuffe return FillAppend(pBuffer, nCount, pWritten); } -//============================================================================ // virtual ErrCode SvOutputStreamOpenLockBytes::Flush() const { @@ -175,14 +169,12 @@ ErrCode SvOutputStreamOpenLockBytes::Flush() const return ERRCODE_NONE; } -//============================================================================ // virtual ErrCode SvOutputStreamOpenLockBytes::SetSize(sal_uLong) { return ERRCODE_IO_NOTSUPPORTED; } -//============================================================================ // virtual ErrCode SvOutputStreamOpenLockBytes::Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const @@ -192,7 +184,6 @@ ErrCode SvOutputStreamOpenLockBytes::Stat(SvLockBytesStat * pStat, return ERRCODE_NONE; } -//============================================================================ // virtual ErrCode SvOutputStreamOpenLockBytes::FillAppend(void const * pBuffer, sal_uLong nCount, @@ -223,21 +214,18 @@ ErrCode SvOutputStreamOpenLockBytes::FillAppend(void const * pBuffer, return ERRCODE_NONE; } -//============================================================================ // virtual sal_uLong SvOutputStreamOpenLockBytes::Tell() const { return m_nPosition; } -//============================================================================ // virtual sal_uLong SvOutputStreamOpenLockBytes::Seek(sal_uLong) { return m_nPosition; } -//============================================================================ // virtual void SvOutputStreamOpenLockBytes::Terminate() { @@ -253,11 +241,9 @@ void SvOutputStreamOpenLockBytes::Terminate() } } -//============================================================================ // // SvLockBytesInputStream // -//============================================================================ // virtual uno::Any SAL_CALL SvLockBytesInputStream::queryInterface(uno::Type const & @@ -271,21 +257,18 @@ uno::Any SAL_CALL SvLockBytesInputStream::queryInterface(uno::Type const & return aReturn.hasValue() ? aReturn : OWeakObject::queryInterface(rType); } -//============================================================================ // virtual void SAL_CALL SvLockBytesInputStream::acquire() throw () { OWeakObject::acquire(); } -//============================================================================ // virtual void SAL_CALL SvLockBytesInputStream::release() throw () { OWeakObject::release(); } -//============================================================================ // virtual sal_Int32 SAL_CALL SvLockBytesInputStream::readBytes(uno::Sequence< sal_Int8 > & rData, @@ -325,7 +308,6 @@ SvLockBytesInputStream::readBytes(uno::Sequence< sal_Int8 > & rData, return nSize; } -//============================================================================ // virtual sal_Int32 SAL_CALL SvLockBytesInputStream::readSomeBytes(uno::Sequence< sal_Int8 > & rData, @@ -360,7 +342,6 @@ SvLockBytesInputStream::readSomeBytes(uno::Sequence< sal_Int8 > & rData, return sal_Int32(nCount); } -//============================================================================ // virtual void SAL_CALL SvLockBytesInputStream::skipBytes(sal_Int32 nBytesToSkip) throw (io::IOException, uno::RuntimeException) @@ -374,7 +355,6 @@ void SAL_CALL SvLockBytesInputStream::skipBytes(sal_Int32 nBytesToSkip) m_nPosition += nBytesToSkip; } -//============================================================================ // virtual sal_Int32 SAL_CALL SvLockBytesInputStream::available() throw (io::IOException, uno::RuntimeException) @@ -393,7 +373,6 @@ sal_Int32 SAL_CALL SvLockBytesInputStream::available() SAL_MAX_INT32; } -//============================================================================ // virtual void SAL_CALL SvLockBytesInputStream::closeInput() throw (io::IOException, uno::RuntimeException) @@ -403,7 +382,6 @@ void SAL_CALL SvLockBytesInputStream::closeInput() m_xLockBytes = 0; } -//============================================================================ // virtual void SAL_CALL SvLockBytesInputStream::seek(sal_Int64 nLocation) throw (lang::IllegalArgumentException, io::IOException, @@ -416,7 +394,6 @@ void SAL_CALL SvLockBytesInputStream::seek(sal_Int64 nLocation) m_nPosition = nLocation; } -//============================================================================ // virtual sal_Int64 SAL_CALL SvLockBytesInputStream::getPosition() throw (io::IOException, uno::RuntimeException) @@ -426,7 +403,6 @@ sal_Int64 SAL_CALL SvLockBytesInputStream::getPosition() return m_nPosition; } -//============================================================================ // virtual sal_Int64 SAL_CALL SvLockBytesInputStream::getLength() throw (io::IOException, uno::RuntimeException) @@ -443,11 +419,9 @@ sal_Int64 SAL_CALL SvLockBytesInputStream::getLength() return aStat.nSize; } -//============================================================================ // // SvInputStream // -//============================================================================ bool SvInputStream::open() { @@ -468,7 +442,6 @@ bool SvInputStream::open() return true; } -//============================================================================ // virtual sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) { @@ -563,7 +536,6 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize) return nRead; } -//============================================================================ // virtual sal_uLong SvInputStream::PutData(void const *, sal_uLong) { @@ -571,12 +543,10 @@ sal_uLong SvInputStream::PutData(void const *, sal_uLong) return 0; } -//============================================================================ // virtual void SvInputStream::FlushData() {} -//============================================================================ // virtual sal_uLong SvInputStream::SeekPos(sal_uLong nPos) { @@ -644,14 +614,12 @@ sal_uLong SvInputStream::SeekPos(sal_uLong nPos) return Tell(); } -//============================================================================ // virtual void SvInputStream::SetSize(sal_uLong) { SetError(ERRCODE_IO_NOTSUPPORTED); } -//============================================================================ SvInputStream::SvInputStream( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > const & @@ -663,7 +631,6 @@ SvInputStream::SvInputStream( SetBufferSize(0); } -//============================================================================ // virtual SvInputStream::~SvInputStream() { @@ -680,14 +647,12 @@ SvInputStream::~SvInputStream() delete m_pPipe; } -//============================================================================ // virtual sal_uInt16 SvInputStream::IsA() const { return 0; } -//============================================================================ // virtual void SvInputStream::AddMark(sal_uLong nPos) { @@ -695,7 +660,6 @@ void SvInputStream::AddMark(sal_uLong nPos) m_pPipe->addMark(nPos); } -//============================================================================ // virtual void SvInputStream::RemoveMark(sal_uLong nPos) { @@ -703,11 +667,9 @@ void SvInputStream::RemoveMark(sal_uLong nPos) m_pPipe->removeMark(nPos); } -//============================================================================ // // SvOutputStream // -//============================================================================ // virtual sal_uLong SvOutputStream::GetData(void *, sal_uLong) @@ -716,7 +678,6 @@ sal_uLong SvOutputStream::GetData(void *, sal_uLong) return 0; } -//============================================================================ // virtual sal_uLong SvOutputStream::PutData(void const * pData, sal_uLong nSize) { @@ -751,7 +712,6 @@ sal_uLong SvOutputStream::PutData(void const * pData, sal_uLong nSize) return nWritten; } -//============================================================================ // virtual sal_uLong SvOutputStream::SeekPos(sal_uLong) { @@ -759,7 +719,6 @@ sal_uLong SvOutputStream::SeekPos(sal_uLong) return 0; } -//============================================================================ // virtual void SvOutputStream::FlushData() { @@ -777,14 +736,12 @@ void SvOutputStream::FlushData() } } -//============================================================================ // virtual void SvOutputStream::SetSize(sal_uLong) { SetError(ERRCODE_IO_NOTSUPPORTED); } -//============================================================================ SvOutputStream::SvOutputStream(uno::Reference< io::XOutputStream > const & rTheStream): m_xStream(rTheStream) @@ -792,7 +749,6 @@ SvOutputStream::SvOutputStream(uno::Reference< io::XOutputStream > const & SetBufferSize(0); } -//============================================================================ // virtual SvOutputStream::~SvOutputStream() { @@ -808,18 +764,15 @@ SvOutputStream::~SvOutputStream() } } -//============================================================================ // virtual sal_uInt16 SvOutputStream::IsA() const { return 0; } -//============================================================================ // // SvDataPipe_Impl // -//============================================================================ bool SvDataPipe_Impl::remove(Page * pPage) { @@ -848,7 +801,6 @@ bool SvDataPipe_Impl::remove(Page * pPage) return true; } -//============================================================================ SvDataPipe_Impl::~SvDataPipe_Impl() { if (m_pFirstPage != 0) @@ -862,7 +814,6 @@ SvDataPipe_Impl::~SvDataPipe_Impl() } } -//============================================================================ sal_uInt32 SvDataPipe_Impl::read() { if (m_pReadBuffer == 0 || m_nReadBufferSize == 0 || m_pReadPage == 0) @@ -901,7 +852,6 @@ sal_uInt32 SvDataPipe_Impl::read() return nSize - nRemain; } -//============================================================================ sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) { if (nSize == 0) @@ -1000,7 +950,6 @@ sal_uInt32 SvDataPipe_Impl::write(sal_Int8 const * pBuffer, sal_uInt32 nSize) return nSize - nRemain; } -//============================================================================ bool SvDataPipe_Impl::addMark(sal_uInt32 nPosition) { if (m_pFirstPage != 0 && m_pFirstPage->m_nOffset > nPosition) @@ -1009,7 +958,6 @@ bool SvDataPipe_Impl::addMark(sal_uInt32 nPosition) return true; } -//============================================================================ bool SvDataPipe_Impl::removeMark(sal_uInt32 nPosition) { std::multiset< sal_uInt32 >::iterator t = m_aMarks.find(nPosition); @@ -1020,7 +968,6 @@ bool SvDataPipe_Impl::removeMark(sal_uInt32 nPosition) return true; } -//============================================================================ SvDataPipe_Impl::SeekResult SvDataPipe_Impl::setReadPosition(sal_uInt32 nPosition) { diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 61b3a0288e85..811f37fab813 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -46,11 +46,9 @@ using namespace com::sun::star; -//============================================================================ // // SmartRel2Abs // -//============================================================================ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, OUString const & rTheRelURIRef, @@ -106,11 +104,9 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, return aAbsURIRef.GetMainURL(eDecodeMechanism, eCharset); } -//============================================================================ // // SetMaybeFileHdl // -//============================================================================ namespace { struct MaybeFileHdl : public rtl::Static< Link, MaybeFileHdl > {}; } @@ -119,11 +115,9 @@ void URIHelper::SetMaybeFileHdl(Link const & rTheMaybeFileHdl) MaybeFileHdl::get() = rTheMaybeFileHdl; } -//============================================================================ // // GetMaybeFileHdl // -//============================================================================ Link URIHelper::GetMaybeFileHdl() { @@ -290,11 +284,9 @@ OUString URIHelper::simpleNormalizedMakeRelative( return rel.is() ? rel->getUriReference() : uriReference; } -//============================================================================ // // FindFirstURLInText // -//============================================================================ namespace { @@ -735,11 +727,9 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText, return OUString(); } -//============================================================================ // // removePassword // -//============================================================================ OUString URIHelper::removePassword(OUString const & rURI, INetURLObject::EncodeMechanism eEncodeMechanism, diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index b5a17cdcb281..1509a5213fb4 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.cxx @@ -28,13 +28,10 @@ #include <svl/brdcst.hxx> #include <algorithm> -//==================================================================== DBG_NAME(SfxBroadcaster) TYPEINIT0(SfxBroadcaster); -//==================================================================== -//==================================================================== // broadcast immediately void SfxBroadcaster::Broadcast( const SfxHint &rHint ) @@ -69,7 +66,6 @@ SfxBroadcaster::~SfxBroadcaster() } } -//-------------------------------------------------------------------- // simple ctor of class SfxBroadcaster @@ -78,7 +74,6 @@ SfxBroadcaster::SfxBroadcaster() DBG_CTOR(SfxBroadcaster, 0); } -//-------------------------------------------------------------------- // copy ctor of class SfxBroadcaster @@ -96,7 +91,6 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC ) } } -//-------------------------------------------------------------------- // add a new SfxListener to the list @@ -115,7 +109,6 @@ void SfxBroadcaster::AddListener( SfxListener& rListener ) m_Listeners.push_back(&rListener); } -//-------------------------------------------------------------------- // called, if no more listeners exists @@ -124,7 +117,6 @@ void SfxBroadcaster::ListenersGone() DBG_CHKTHIS(SfxBroadcaster,0); } -//-------------------------------------------------------------------- // forward a notification to all registered listeners @@ -139,7 +131,6 @@ void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint) } } -//-------------------------------------------------------------------- // remove one SfxListener from the list diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 47d1485d9210..4cdaa1425a60 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -24,10 +24,8 @@ #include <svl/smplhint.hxx> -//==================================================================== TYPEINIT0(SvtBroadcaster); -//==================================================================== // simple ctor of class SvtBroadcaster @@ -36,7 +34,6 @@ SvtBroadcaster::SvtBroadcaster() { } -//-------------------------------------------------------------------- // copy ctor of class SvtBroadcaster @@ -51,7 +48,6 @@ SvtBroadcaster::SvtBroadcaster( const SvtBroadcaster &rBC ) } while( 0 != ( pLast = aIter.GoNext() )); } -//-------------------------------------------------------------------- // unregister all listeners @@ -69,7 +65,6 @@ SvtBroadcaster::~SvtBroadcaster() } while( 0 != ( pLast = aIter.GoNext() )); } -//-------------------------------------------------------------------- // broadcast immedeately @@ -95,7 +90,6 @@ void SvtBroadcaster::Broadcast( const SfxHint &rHint ) } } -//-------------------------------------------------------------------- // called, if no more listeners exists diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx index da0f929dbf43..28ef4e06d165 100644 --- a/svl/source/notify/hint.cxx +++ b/svl/source/notify/hint.cxx @@ -20,11 +20,9 @@ #include <svl/hint.hxx> -//==================================================================== TYPEINIT0(SfxHint); -//==================================================================== // virtual dtor for the typical base-class Hint SfxHint::~SfxHint() diff --git a/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx index 26223851fe82..e8deae99b195 100644 --- a/svl/source/notify/isethint.cxx +++ b/svl/source/notify/isethint.cxx @@ -21,11 +21,9 @@ #include <svl/isethint.hxx> #include <svl/itemset.hxx> -//==================================================================== TYPEINIT1(SfxItemSetHint, SfxHint); -//==================================================================== SfxItemSetHint::SfxItemSetHint( const SfxItemSet &rItemSet ) @@ -38,13 +36,11 @@ SfxItemSetHint::SfxItemSetHint( const SfxItemSet &rItemSet ) { } -//-------------------------------------------------------------------- SfxItemSetHint::~SfxItemSetHint() { delete _pItemSet; } -//-------------------------------------------------------------------- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 3a7d8ec33e63..fd8616df4f51 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.cxx @@ -25,17 +25,14 @@ #include <svl/listeneriter.hxx> -//==================================================================== TYPEINIT0(SvtListener); -//==================================================================== // simple ctor of class SvtListener SvtListener::SvtListener() : pBrdCastLst( 0 ) { } -//-------------------------------------------------------------------- // copy ctor of class SvtListener @@ -49,7 +46,6 @@ SvtListener::SvtListener( const SvtListener &rListener ) pLst = pLst->GetNext(); } } -//-------------------------------------------------------------------- // unregisteres the SvtListener from its SvtBroadcasters @@ -58,7 +54,6 @@ SvtListener::~SvtListener() EndListeningAll(); } -//-------------------------------------------------------------------- // registeres at a specific SvtBroadcaster @@ -78,7 +73,6 @@ sal_Bool SvtListener::StartListening( SvtBroadcaster& rBroadcaster ) return sal_True; } -//-------------------------------------------------------------------- // unregisteres at a specific SvtBroadcaster @@ -103,7 +97,6 @@ sal_Bool SvtListener::EndListening( SvtBroadcaster& rBroadcaster ) return sal_False; } -//-------------------------------------------------------------------- // unregisteres all Broadcasters @@ -120,7 +113,6 @@ void SvtListener::EndListeningAll() pBrdCastLst = 0; } -//-------------------------------------------------------------------- sal_Bool SvtListener::IsListening( SvtBroadcaster& rBroadcaster ) const { @@ -134,7 +126,6 @@ sal_Bool SvtListener::IsListening( SvtBroadcaster& rBroadcaster ) const return 0 != pLst; } -//-------------------------------------------------------------------- // base implementation of notification handler diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 0e645ec3f9aa..a6946bcb543a 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -26,18 +26,15 @@ #include <svl/lstner.hxx> #include <algorithm> -//==================================================================== DBG_NAME(SfxListener) TYPEINIT0(SfxListener); -//==================================================================== // simple ctor of class SfxListener SfxListener::SfxListener() { DBG_CTOR(SfxListener, 0); } -//-------------------------------------------------------------------- // copy ctor of class SfxListener @@ -48,7 +45,6 @@ SfxListener::SfxListener( const SfxListener &rListener ) for ( sal_uInt16 n = 0; n < rListener.aBCs.size(); ++n ) StartListening( *rListener.aBCs[n] ); } -//-------------------------------------------------------------------- // unregisters the SfxListener from its SfxBroadcasters @@ -64,7 +60,6 @@ SfxListener::~SfxListener() } } -//-------------------------------------------------------------------- // unregisters a specific SfxBroadcaster @@ -75,7 +70,6 @@ void SfxListener::RemoveBroadcaster_Impl( SfxBroadcaster& rBroadcaster ) aBCs.erase( std::find( aBCs.begin(), aBCs.end(), &rBroadcaster ) ); } -//-------------------------------------------------------------------- // registers a specific SfxBroadcaster @@ -95,7 +89,6 @@ sal_Bool SfxListener::StartListening( SfxBroadcaster& rBroadcaster, sal_Bool bPr return sal_False; } -//-------------------------------------------------------------------- // unregisters a specific SfxBroadcaster @@ -115,7 +108,6 @@ sal_Bool SfxListener::EndListening( SfxBroadcaster& rBroadcaster, sal_Bool bAllD return sal_True; } -//-------------------------------------------------------------------- // unregisters all Broadcasters @@ -132,14 +124,12 @@ void SfxListener::EndListeningAll() } } -//-------------------------------------------------------------------- sal_Bool SfxListener::IsListening( SfxBroadcaster& rBroadcaster ) const { return aBCs.end() != std::find( aBCs.begin(), aBCs.end(), &rBroadcaster ); } -//-------------------------------------------------------------------- // base implementation of notification handler diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx index 5d4e06a46404..a30e900f5264 100644 --- a/svl/source/notify/smplhint.cxx +++ b/svl/source/notify/smplhint.cxx @@ -20,11 +20,9 @@ #include <svl/smplhint.hxx> -//==================================================================== TYPEINIT1(SfxSimpleHint, SfxHint); -//==================================================================== // creates a SimpleHint with the type nId SfxSimpleHint::SfxSimpleHint( sal_uLong nIdP ) diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index fad97e943f14..ddef32e9c020 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -44,8 +44,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::task; using namespace com::sun::star::ucb; -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- static OUString createIndex( vector< OUString > lines ) { @@ -78,7 +76,6 @@ static OUString createIndex( vector< OUString > lines ) return OUString::createFromAscii( aResult.getStr() ); } -//------------------------------------------------------------------------- static vector< OUString > getInfoFromInd( OUString aInd ) { @@ -131,7 +128,6 @@ static vector< OUString > getInfoFromInd( OUString aInd ) return aResult; } -//------------------------------------------------------------------------- static sal_Bool shorterUrl( OUString& aURL ) { @@ -145,7 +141,6 @@ static sal_Bool shorterUrl( OUString& aURL ) return sal_False; } -//------------------------------------------------------------------------- static OUString getAsciiLine( const ::rtl::ByteSequence& buf ) { @@ -165,7 +160,6 @@ static OUString getAsciiLine( const ::rtl::ByteSequence& buf ) return aResult; } -//------------------------------------------------------------------------- static ::rtl::ByteSequence getBufFromAsciiLine( OUString line ) { @@ -181,7 +175,6 @@ static ::rtl::ByteSequence getBufFromAsciiLine( OUString line ) return aResult; } -//------------------------------------------------------------------------- static Sequence< OUString > copyVectorToSequence( const vector< OUString >& original ) { @@ -201,8 +194,6 @@ static vector< OUString > copySequenceToVector( const Sequence< OUString >& orig return newOne; } -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- PassMap StorageItem::getInfo() { @@ -258,7 +249,6 @@ PassMap StorageItem::getInfo() return aResult; } -//------------------------------------------------------------------------- void StorageItem::setUseStorage( bool bUse ) { @@ -273,7 +263,6 @@ void StorageItem::setUseStorage( bool bUse ) ConfigItem::PutProperties( sendNames, sendVals ); } -//------------------------------------------------------------------------- bool StorageItem::useStorage() { @@ -294,7 +283,6 @@ bool StorageItem::useStorage() return aResult; } -//------------------------------------------------------------------------- bool StorageItem::getEncodedMP( OUString& aResult ) { @@ -324,7 +312,6 @@ bool StorageItem::getEncodedMP( OUString& aResult ) return hasEncoded; } -//------------------------------------------------------------------------- void StorageItem::setEncodedMP( const OUString& aEncoded, bool bAcceptEmpty ) { @@ -345,7 +332,6 @@ void StorageItem::setEncodedMP( const OUString& aEncoded, bool bAcceptEmpty ) mEncoded = aEncoded; } -//------------------------------------------------------------------------- void StorageItem::remove( const OUString& aURL, const OUString& aName ) { @@ -360,7 +346,6 @@ void StorageItem::remove( const OUString& aURL, const OUString& aName ) ConfigItem::ClearNodeElements( OUString("Store"), sendSeq ); } -//------------------------------------------------------------------------- void StorageItem::clear() { @@ -369,7 +354,6 @@ void StorageItem::clear() ConfigItem::ClearNodeSet( OUString("Store") ); } -//------------------------------------------------------------------------- void StorageItem::update( const OUString& aURL, const NamePassRecord& aRecord ) { @@ -395,7 +379,6 @@ void StorageItem::update( const OUString& aURL, const NamePassRecord& aRecord ) ConfigItem::SetSetProperties( OUString("Store"), sendSeq ); } -//------------------------------------------------------------------------- void StorageItem::Notify( const Sequence< OUString >& ) { @@ -404,15 +387,12 @@ void StorageItem::Notify( const Sequence< OUString >& ) mainCont->Notify(); } -//------------------------------------------------------------------------- void StorageItem::Commit() { // Do nothing, we stored everything we want already } -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- PasswordContainer::PasswordContainer( const Reference<XMultiServiceFactory>& xServiceFactory ): m_pStorageFile( NULL ) @@ -429,7 +409,6 @@ PasswordContainer::PasswordContainer( const Reference<XMultiServiceFactory>& xSe m_aContainer = m_pStorageFile->getInfo(); } -//------------------------------------------------------------------------- PasswordContainer::~PasswordContainer() { @@ -448,7 +427,6 @@ PasswordContainer::~PasswordContainer() } } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeException) { @@ -467,7 +445,6 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeEx } } -//------------------------------------------------------------------------- vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd ) throw(RuntimeException) { @@ -519,7 +496,6 @@ vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, co } -//------------------------------------------------------------------------- OUString PasswordContainer::EncodePasswords( vector< OUString > lines, const OUString& aMasterPasswd ) throw(RuntimeException) { @@ -598,7 +574,6 @@ OUString PasswordContainer::EncodePasswords( vector< OUString > lines, const OUS throw RuntimeException("Can't encode!", Reference< XInterface >() ); } -//------------------------------------------------------------------------- void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException) { @@ -632,7 +607,6 @@ void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord toUpdate.insert( toUpdate.begin(), aRecord ); } -//------------------------------------------------------------------------- UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, bool& io_bTryToDecode, const Reference< XInteractionHandler >& aHandler ) { @@ -657,7 +631,6 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, b return UserRecord( aRecord.GetUserName(), copyVectorToSequence( aPasswords ) ); } -//------------------------------------------------------------------------- Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< NamePassRecord >& original, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -675,7 +648,6 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< return aResult; } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -684,7 +656,6 @@ void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserN PrivateAdd( Url, UserName, Passwords, MEMORY_RECORD, aHandler ); } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -693,7 +664,6 @@ void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUStr PrivateAdd( Url, UserName, Passwords, PERSISTENT_RECORD, aHandler ); } -//------------------------------------------------------------------------- void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -729,7 +699,6 @@ void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserNam } -//------------------------------------------------------------------------- UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) @@ -737,14 +706,12 @@ UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Referenc return find( aURL, OUString(), false, aHandler ); } -//------------------------------------------------------------------------- UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { return find( aURL, aName, true, aHandler ); } -//------------------------------------------------------------------------- Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -766,7 +733,6 @@ Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& return Sequence< UserRecord >(); } -//------------------------------------------------------------------------- bool PasswordContainer::createUrlRecord( const PassMap::iterator & rIter, @@ -796,7 +762,6 @@ bool PasswordContainer::createUrlRecord( return false; } -//------------------------------------------------------------------------- UrlRecord PasswordContainer::find( const OUString& aURL, @@ -843,7 +808,6 @@ UrlRecord PasswordContainer::find( return UrlRecord(); } -//------------------------------------------------------------------------- OUString PasswordContainer::GetDefaultMasterPassword() { OUString aResult; @@ -853,7 +817,6 @@ OUString PasswordContainer::GetDefaultMasterPassword() return aResult; } -//------------------------------------------------------------------------- OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode, const uno::Reference< task::XInteractionHandler >& xHandler ) { // empty string means that the call was cancelled or just failed @@ -883,7 +846,6 @@ OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode, return aResult; } -//------------------------------------------------------------------------- OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) { @@ -943,7 +905,6 @@ OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHand return m_aMasterPasswd; } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName ) throw(RuntimeException) { @@ -985,7 +946,6 @@ void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& a } } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName ) throw(RuntimeException) { @@ -1032,7 +992,6 @@ void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const O } } } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException) { @@ -1074,7 +1033,6 @@ void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException) ++aIter; } } -//------------------------------------------------------------------------- Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler ) throw(RuntimeException) { @@ -1103,7 +1061,6 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere return aResult; } -//------------------------------------------------------------------------- sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler ) throw (uno::RuntimeException) { @@ -1158,7 +1115,6 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R return bResult; } -//------------------------------------------------------------------------- sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler ) throw (uno::RuntimeException) { @@ -1216,7 +1172,6 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< return bResult; } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::removeMasterPassword() throw (uno::RuntimeException) { @@ -1231,7 +1186,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } } -//------------------------------------------------------------------------- ::sal_Bool SAL_CALL PasswordContainer::hasMasterPassword( ) throw (::com::sun::star::uno::RuntimeException) { @@ -1244,7 +1198,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword() return ( m_pStorageFile->useStorage() && m_pStorageFile->getEncodedMP( aEncodedMP ) ); } -//------------------------------------------------------------------------- ::sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( ::sal_Bool bAllow ) throw (::com::sun::star::uno::RuntimeException) { @@ -1263,7 +1216,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword() return !bAllow; } -//------------------------------------------------------------------------- ::sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed() throw (::com::sun::star::uno::RuntimeException) { @@ -1275,7 +1227,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword() return m_pStorageFile->useStorage(); } -//------------------------------------------------------------------------- ::sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler ) throw ( uno::RuntimeException ) { @@ -1331,7 +1282,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } -//------------------------------------------------------------------------- ::sal_Bool SAL_CALL PasswordContainer::isDefaultMasterPasswordUsed() throw ( uno::RuntimeException ) { @@ -1345,35 +1295,30 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::addUrl( const OUString& Url, ::sal_Bool MakePersistent ) throw (uno::RuntimeException) { mUrlContainer.add( Url, MakePersistent ); } -//------------------------------------------------------------------------- OUString SAL_CALL PasswordContainer::findUrl( const OUString& Url ) throw (uno::RuntimeException) { return mUrlContainer.find( Url ); } -//------------------------------------------------------------------------- void SAL_CALL PasswordContainer::removeUrl( const OUString& Url ) throw (uno::RuntimeException) { mUrlContainer.remove( Url ); } -//------------------------------------------------------------------------- uno::Sequence< OUString > SAL_CALL PasswordContainer::getUrls( ::sal_Bool OnlyPersistent ) throw (uno::RuntimeException) { return mUrlContainer.list( OnlyPersistent ); } -//------------------------------------------------------------------------- void PasswordContainer::Notify() { @@ -1420,14 +1365,12 @@ void PasswordContainer::Notify() } } -//------------------------------------------------------------------------- OUString SAL_CALL PasswordContainer::getImplementationName( ) throw(uno::RuntimeException) { return impl_getStaticImplementationName(); } -//------------------------------------------------------------------------- sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { @@ -1437,14 +1380,12 @@ sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceNam return sal_False; } -//------------------------------------------------------------------------- Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) throw(uno::RuntimeException) { return impl_getStaticSupportedServiceNames(); } -//------------------------------------------------------------------------- Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) throw(uno::RuntimeException) { @@ -1453,21 +1394,18 @@ Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceN return aRet; } -//------------------------------------------------------------------------- OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException) { return OUString("stardiv.svl.PasswordContainer"); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( RuntimeException ) { return Reference< XInterface >( *new PasswordContainer( xServiceManager ) ); } -//------------------------------------------------------------------------- Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) throw(RuntimeException) { @@ -1479,8 +1417,6 @@ Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactor } -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- MasterPasswordRequest_Impl::MasterPasswordRequest_Impl( PasswordRequestMode Mode ) { @@ -1519,8 +1455,6 @@ MasterPasswordRequest_Impl::MasterPasswordRequest_Impl( PasswordRequestMode Mode setContinuations( aContinuations ); } -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- extern "C" { diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 83e3b11e02e2..9423acfc005f 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -98,7 +98,6 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( m_bInited = true; } -//============================================================================ namespace { diff --git a/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx index f627413ccce8..258021745602 100644 --- a/svl/source/svsql/converter.cxx +++ b/svl/source/svsql/converter.cxx @@ -23,7 +23,6 @@ sal_Int32 SvDbaseConverter::ConvertPrecisionToDbase(sal_Int32 _nLen, sal_Int32 _ { return _nScale ? _nLen +2 : _nLen +1; } -//------------------------------------------------------------------------ sal_Int32 SvDbaseConverter::ConvertPrecisionToOdbc(sal_Int32 _nLen, sal_Int32 _nScale) { return _nScale ? _nLen -2 : _nLen -1; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 04aaceb2ade6..4ed216eb32c5 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -36,33 +36,28 @@ using ::com::sun::star::uno::Exception; DBG_NAME(SfxUndoAction) -//======================================================================== TYPEINIT0(SfxUndoAction); TYPEINIT0(SfxListUndoAction); TYPEINIT0(SfxLinkUndoAction); TYPEINIT0(SfxRepeatTarget); -//------------------------------------------------------------------------ SfxRepeatTarget::~SfxRepeatTarget() { } -//------------------------------------------------------------------------ SfxUndoContext::~SfxUndoContext() { } -//------------------------------------------------------------------------ void SfxUndoAction::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) { mpSfxLinkUndoAction = pSfxLinkUndoAction; } -//------------------------------------------------------------------------ SfxUndoAction::~SfxUndoAction() { @@ -82,7 +77,6 @@ SfxUndoAction::SfxUndoAction() DBG_CTOR(SfxUndoAction, 0); } -//------------------------------------------------------------------------ bool SfxUndoAction::Merge( SfxUndoAction * ) { @@ -90,7 +84,6 @@ bool SfxUndoAction::Merge( SfxUndoAction * ) return false; } -//------------------------------------------------------------------------ OUString SfxUndoAction::GetComment() const { @@ -98,7 +91,6 @@ OUString SfxUndoAction::GetComment() const return OUString(); } -//------------------------------------------------------------------------ sal_uInt16 SfxUndoAction::GetId() const @@ -107,7 +99,6 @@ sal_uInt16 SfxUndoAction::GetId() const return 0; } -//------------------------------------------------------------------------ OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const { @@ -115,7 +106,6 @@ OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const return GetComment(); } -//------------------------------------------------------------------------ void SfxUndoAction::Undo() { @@ -123,7 +113,6 @@ void SfxUndoAction::Undo() OSL_FAIL( "pure virtual function called: SfxUndoAction::Undo()" ); } -//------------------------------------------------------------------------ void SfxUndoAction::UndoWithContext( SfxUndoContext& i_context ) { @@ -131,7 +120,6 @@ void SfxUndoAction::UndoWithContext( SfxUndoContext& i_context ) Undo(); } -//------------------------------------------------------------------------ void SfxUndoAction::Redo() { @@ -139,7 +127,6 @@ void SfxUndoAction::Redo() OSL_FAIL( "pure virtual function called: SfxUndoAction::Redo()" ); } -//------------------------------------------------------------------------ void SfxUndoAction::RedoWithContext( SfxUndoContext& i_context ) { @@ -147,7 +134,6 @@ void SfxUndoAction::RedoWithContext( SfxUndoContext& i_context ) Redo(); } -//------------------------------------------------------------------------ void SfxUndoAction::Repeat(SfxRepeatTarget&) { @@ -155,7 +141,6 @@ void SfxUndoAction::Repeat(SfxRepeatTarget&) OSL_FAIL( "pure virtual function called: SfxUndoAction::Repeat()" ); } -//------------------------------------------------------------------------ bool SfxUndoAction::CanRepeat(SfxRepeatTarget&) const @@ -163,7 +148,6 @@ bool SfxUndoAction::CanRepeat(SfxRepeatTarget&) const return true; } -//======================================================================== typedef ::std::vector< SfxUndoListener* > UndoListeners; @@ -201,11 +185,9 @@ struct SVL_DLLPRIVATE SfxUndoManager_Data } }; -//======================================================================== namespace svl { namespace undo { namespace impl { - //-------------------------------------------------------------------- class SVL_DLLPRIVATE LockGuard { public: @@ -224,11 +206,9 @@ namespace svl { namespace undo { namespace impl SfxUndoManager& m_manager; }; - //-------------------------------------------------------------------- typedef void ( SfxUndoListener::*UndoListenerVoidMethod )(); typedef void ( SfxUndoListener::*UndoListenerStringMethod )( const OUString& ); - //-------------------------------------------------------------------- struct SVL_DLLPRIVATE NotifyUndoListener : public ::std::unary_function< SfxUndoListener*, void > { NotifyUndoListener() @@ -276,7 +256,6 @@ namespace svl { namespace undo { namespace impl OUString m_sActionComment; }; - //-------------------------------------------------------------------- class SVL_DLLPRIVATE UndoManagerGuard { public: @@ -375,14 +354,12 @@ namespace svl { namespace undo { namespace impl using namespace ::svl::undo::impl; -//======================================================================== SfxUndoManager::SfxUndoManager( size_t nMaxUndoActionCount ) :m_pData( new SfxUndoManager_Data( nMaxUndoActionCount ) ) { } -//------------------------------------------------------------------------ SfxUndoManager::~SfxUndoManager() { @@ -396,7 +373,6 @@ SfxUndoManager::~SfxUndoManager() NotifyUndoListener( &SfxUndoListener::undoManagerDying ) ); } -//------------------------------------------------------------------------ void SfxUndoManager::EnableUndo( bool i_enable ) { @@ -405,7 +381,6 @@ void SfxUndoManager::EnableUndo( bool i_enable ) } -//------------------------------------------------------------------------ void SfxUndoManager::ImplEnableUndo_Lock( bool const i_enable ) { @@ -414,7 +389,6 @@ void SfxUndoManager::ImplEnableUndo_Lock( bool const i_enable ) m_pData->mbUndoEnabled = i_enable; } -//------------------------------------------------------------------------ bool SfxUndoManager::IsUndoEnabled() const { @@ -422,14 +396,12 @@ bool SfxUndoManager::IsUndoEnabled() const return ImplIsUndoEnabled_Lock(); } -//------------------------------------------------------------------------ bool SfxUndoManager::ImplIsUndoEnabled_Lock() const { return m_pData->mbUndoEnabled; } -//------------------------------------------------------------------------ void SfxUndoManager::SetMaxUndoActionCount( size_t nMaxUndoActionCount ) { @@ -468,7 +440,6 @@ void SfxUndoManager::SetMaxUndoActionCount( size_t nMaxUndoActionCount ) m_pData->pActUndoArray->nMaxUndoActions = nMaxUndoActionCount; } -//------------------------------------------------------------------------ size_t SfxUndoManager::GetMaxUndoActionCount() const { @@ -476,7 +447,6 @@ size_t SfxUndoManager::GetMaxUndoActionCount() const return m_pData->pActUndoArray->nMaxUndoActions; } -//------------------------------------------------------------------------ void SfxUndoManager::ImplClearCurrentLevel_NoNotify( UndoManagerGuard& i_guard ) { @@ -495,7 +465,6 @@ void SfxUndoManager::ImplClearCurrentLevel_NoNotify( UndoManagerGuard& i_guard ) m_pData->mnEmptyMark = MARK_INVALID; } -//------------------------------------------------------------------------ void SfxUndoManager::Clear() { @@ -508,7 +477,6 @@ void SfxUndoManager::Clear() aGuard.scheduleNotification( &SfxUndoListener::cleared ); } -//------------------------------------------------------------------------ void SfxUndoManager::ClearAllLevels() { @@ -525,7 +493,6 @@ void SfxUndoManager::ClearAllLevels() } } -//------------------------------------------------------------------------ void SfxUndoManager::ImplClearRedo_NoLock( bool const i_currentLevel ) { @@ -533,7 +500,6 @@ void SfxUndoManager::ImplClearRedo_NoLock( bool const i_currentLevel ) ImplClearRedo( aGuard, i_currentLevel ); } -//------------------------------------------------------------------------ void SfxUndoManager::ClearRedo() { @@ -541,7 +507,6 @@ void SfxUndoManager::ClearRedo() ImplClearRedo_NoLock( CurrentLevel ); } -//------------------------------------------------------------------------ void SfxUndoManager::Reset() { @@ -566,7 +531,6 @@ void SfxUndoManager::Reset() aGuard.scheduleNotification( &SfxUndoListener::resetAll ); } -//------------------------------------------------------------------------ void SfxUndoManager::ImplClearUndo( UndoManagerGuard& i_guard ) { @@ -580,7 +544,6 @@ void SfxUndoManager::ImplClearUndo( UndoManagerGuard& i_guard ) // TODO: notifications? We don't have clearedUndo, only cleared and clearedRedo at the SfxUndoListener } -//------------------------------------------------------------------------ void SfxUndoManager::ImplClearRedo( UndoManagerGuard& i_guard, bool const i_currentLevel ) { @@ -600,7 +563,6 @@ void SfxUndoManager::ImplClearRedo( UndoManagerGuard& i_guard, bool const i_curr i_guard.scheduleNotification( &SfxUndoListener::clearedRedo ); } -//------------------------------------------------------------------------ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bTryMerge, bool bClearRedo, UndoManagerGuard& i_guard ) { @@ -646,7 +608,6 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bT return true; } -//------------------------------------------------------------------------ void SfxUndoManager::AddUndoAction( SfxUndoAction *pAction, bool bTryMerge ) { @@ -660,7 +621,6 @@ void SfxUndoManager::AddUndoAction( SfxUndoAction *pAction, bool bTryMerge ) } } -//------------------------------------------------------------------------ size_t SfxUndoManager::GetUndoActionCount( bool const i_currentLevel ) const { @@ -669,7 +629,6 @@ size_t SfxUndoManager::GetUndoActionCount( bool const i_currentLevel ) const return pUndoArray->nCurUndoAction; } -//------------------------------------------------------------------------ OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const { @@ -683,7 +642,6 @@ OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentL return sComment; } -//------------------------------------------------------------------------ sal_uInt16 SfxUndoManager::GetUndoActionId() const { @@ -695,7 +653,6 @@ sal_uInt16 SfxUndoManager::GetUndoActionId() const return m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction->GetId(); } -//------------------------------------------------------------------------ SfxUndoAction* SfxUndoManager::GetUndoAction( size_t nNo ) const { @@ -707,7 +664,6 @@ SfxUndoAction* SfxUndoManager::GetUndoAction( size_t nNo ) const return m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1-nNo].pAction; } -//------------------------------------------------------------------------ /** clears the redo stack and removes the top undo action */ void SfxUndoManager::RemoveLastUndoAction() @@ -729,7 +685,6 @@ void SfxUndoManager::RemoveLastUndoAction() m_pData->pActUndoArray->aUndoActions.size() - m_pData->pActUndoArray->nCurUndoAction ); } -//------------------------------------------------------------------------ bool SfxUndoManager::IsDoing() const { @@ -737,21 +692,18 @@ bool SfxUndoManager::IsDoing() const return m_pData->mbDoing; } -//------------------------------------------------------------------------ bool SfxUndoManager::Undo() { return ImplUndo( NULL ); } -//------------------------------------------------------------------------ bool SfxUndoManager::UndoWithContext( SfxUndoContext& i_context ) { return ImplUndo( &i_context ); } -//------------------------------------------------------------------------ bool SfxUndoManager::ImplUndo( SfxUndoContext* i_contextOrNull ) { @@ -812,7 +764,6 @@ bool SfxUndoManager::ImplUndo( SfxUndoContext* i_contextOrNull ) return sal_True; } -//------------------------------------------------------------------------ size_t SfxUndoManager::GetRedoActionCount( bool const i_currentLevel ) const { @@ -820,7 +771,6 @@ size_t SfxUndoManager::GetRedoActionCount( bool const i_currentLevel ) const return ImplGetRedoActionCount_Lock( i_currentLevel ); } -//------------------------------------------------------------------------ size_t SfxUndoManager::ImplGetRedoActionCount_Lock( bool const i_currentLevel ) const { @@ -828,7 +778,6 @@ size_t SfxUndoManager::ImplGetRedoActionCount_Lock( bool const i_currentLevel ) return pUndoArray->aUndoActions.size() - pUndoArray->nCurUndoAction; } -//------------------------------------------------------------------------ SfxUndoAction* SfxUndoManager::GetRedoAction( size_t nNo, bool const i_currentLevel ) const { @@ -842,7 +791,6 @@ SfxUndoAction* SfxUndoManager::GetRedoAction( size_t nNo, bool const i_currentLe return pUndoArray->aUndoActions[ pUndoArray->nCurUndoAction + nNo ].pAction; } -//------------------------------------------------------------------------ OUString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const { @@ -856,21 +804,18 @@ OUString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentL return sComment; } -//------------------------------------------------------------------------ bool SfxUndoManager::Redo() { return ImplRedo( NULL ); } -//------------------------------------------------------------------------ bool SfxUndoManager::RedoWithContext( SfxUndoContext& i_context ) { return ImplRedo( &i_context ); } -//------------------------------------------------------------------------ bool SfxUndoManager::ImplRedo( SfxUndoContext* i_contextOrNull ) { @@ -932,7 +877,6 @@ bool SfxUndoManager::ImplRedo( SfxUndoContext* i_contextOrNull ) return sal_True; } -//------------------------------------------------------------------------ size_t SfxUndoManager::GetRepeatActionCount() const { @@ -940,7 +884,6 @@ size_t SfxUndoManager::GetRepeatActionCount() const return m_pData->pActUndoArray->aUndoActions.size(); } -//------------------------------------------------------------------------ OUString SfxUndoManager::GetRepeatActionComment(SfxRepeatTarget &rTarget) const { @@ -949,7 +892,6 @@ OUString SfxUndoManager::GetRepeatActionComment(SfxRepeatTarget &rTarget) const ->GetRepeatComment(rTarget); } -//------------------------------------------------------------------------ bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget ) { @@ -966,7 +908,6 @@ bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget ) return false; } -//------------------------------------------------------------------------ bool SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget ) const { @@ -979,7 +920,6 @@ bool SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget ) const return false; } -//------------------------------------------------------------------------ void SfxUndoManager::AddUndoListener( SfxUndoListener& i_listener ) { @@ -987,7 +927,6 @@ void SfxUndoManager::AddUndoListener( SfxUndoListener& i_listener ) m_pData->aListeners.push_back( &i_listener ); } -//------------------------------------------------------------------------ void SfxUndoManager::RemoveUndoListener( SfxUndoListener& i_listener ) { @@ -1005,7 +944,6 @@ void SfxUndoManager::RemoveUndoListener( SfxUndoListener& i_listener ) } } -//------------------------------------------------------------------------ void SfxUndoManager::EnterListAction( const OUString& rComment, const OUString &rRepeatComment, sal_uInt16 nId ) @@ -1034,7 +972,6 @@ void SfxUndoManager::EnterListAction( const OUString& rComment, aGuard.scheduleNotification( &SfxUndoListener::listActionEntered, rComment ); } -//------------------------------------------------------------------------ bool SfxUndoManager::IsInListAction() const { @@ -1042,14 +979,12 @@ bool SfxUndoManager::IsInListAction() const return ImplIsInListAction_Lock(); } -//------------------------------------------------------------------------ bool SfxUndoManager::ImplIsInListAction_Lock() const { return ( m_pData->pActUndoArray != m_pData->pUndoArray ); } -//------------------------------------------------------------------------ size_t SfxUndoManager::GetListActionDepth() const { @@ -1066,7 +1001,6 @@ size_t SfxUndoManager::GetListActionDepth() const return nDepth; } -//------------------------------------------------------------------------ size_t SfxUndoManager::LeaveListAction() { @@ -1087,7 +1021,6 @@ size_t SfxUndoManager::LeaveListAction() return nCount; } -//------------------------------------------------------------------------ size_t SfxUndoManager::LeaveAndMergeListAction() { @@ -1095,7 +1028,6 @@ size_t SfxUndoManager::LeaveAndMergeListAction() return ImplLeaveListAction( true, aGuard ); } -//------------------------------------------------------------------------ size_t SfxUndoManager::ImplLeaveListAction( const bool i_merge, UndoManagerGuard& i_guard ) { @@ -1175,7 +1107,6 @@ size_t SfxUndoManager::ImplLeaveListAction( const bool i_merge, UndoManagerGuard return nListActionElements; } -//------------------------------------------------------------------------ UndoStackMark SfxUndoManager::MarkTopUndoAction() { UndoManagerGuard aGuard( *m_pData ); @@ -1197,7 +1128,6 @@ UndoStackMark SfxUndoManager::MarkTopUndoAction() return m_pData->mnMarks; } -//------------------------------------------------------------------------ void SfxUndoManager::RemoveMark( UndoStackMark const i_mark ) { UndoManagerGuard aGuard( *m_pData ); @@ -1233,7 +1163,6 @@ void SfxUndoManager::RemoveMark( UndoStackMark const i_mark ) // about this. } -//------------------------------------------------------------------------ bool SfxUndoManager::HasTopUndoActionMark( UndoStackMark const i_mark ) { UndoManagerGuard aGuard( *m_pData ); @@ -1258,7 +1187,6 @@ bool SfxUndoManager::HasTopUndoActionMark( UndoStackMark const i_mark ) return false; } -//------------------------------------------------------------------------ void SfxUndoManager::RemoveOldestUndoActions( size_t const i_count ) { @@ -1282,28 +1210,24 @@ void SfxUndoManager::RemoveOldestUndoActions( size_t const i_count ) } } -//------------------------------------------------------------------------ sal_uInt16 SfxListUndoAction::GetId() const { return nId; } -//------------------------------------------------------------------------ OUString SfxListUndoAction::GetComment() const { return aComment; } -//------------------------------------------------------------------------ void SfxListUndoAction::SetComment(const OUString& rComment) { aComment = rComment; } -//------------------------------------------------------------------------ OUString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const { @@ -1311,7 +1235,6 @@ OUString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const } -//------------------------------------------------------------------------ SfxListUndoAction::SfxListUndoAction ( @@ -1326,7 +1249,6 @@ SfxListUndoAction::SfxListUndoAction nMaxUndoActions = USHRT_MAX; } -//------------------------------------------------------------------------ void SfxListUndoAction::Undo() { @@ -1335,7 +1257,6 @@ void SfxListUndoAction::Undo() nCurUndoAction=0; } -//------------------------------------------------------------------------ void SfxListUndoAction::UndoWithContext( SfxUndoContext& i_context ) { @@ -1344,7 +1265,6 @@ void SfxListUndoAction::UndoWithContext( SfxUndoContext& i_context ) nCurUndoAction=0; } -//------------------------------------------------------------------------ void SfxListUndoAction::Redo() { @@ -1353,7 +1273,6 @@ void SfxListUndoAction::Redo() nCurUndoAction = aUndoActions.size(); } -//------------------------------------------------------------------------ void SfxListUndoAction::RedoWithContext( SfxUndoContext& i_context ) { @@ -1362,7 +1281,6 @@ void SfxListUndoAction::RedoWithContext( SfxUndoContext& i_context ) nCurUndoAction = aUndoActions.size(); } -//------------------------------------------------------------------------ void SfxListUndoAction::Repeat(SfxRepeatTarget&rTarget) { @@ -1370,7 +1288,6 @@ void SfxListUndoAction::Repeat(SfxRepeatTarget&rTarget) aUndoActions[i].pAction->Repeat(rTarget); } -//------------------------------------------------------------------------ bool SfxListUndoAction::CanRepeat(SfxRepeatTarget&r) const { @@ -1382,14 +1299,12 @@ bool SfxListUndoAction::CanRepeat(SfxRepeatTarget&r) const return true; } -//------------------------------------------------------------------------ bool SfxListUndoAction::Merge( SfxUndoAction *pNextAction ) { return !aUndoActions.empty() && aUndoActions[aUndoActions.size()-1].pAction->Merge( pNextAction ); } -//------------------------------------------------------------------------ SfxLinkUndoAction::SfxLinkUndoAction(::svl::IUndoManager *pManager) /* [Beschreibung] @@ -1416,7 +1331,6 @@ SfxLinkUndoAction::SfxLinkUndoAction(::svl::IUndoManager *pManager) pAction = 0; } -//------------------------------------------------------------------------ void SfxLinkUndoAction::Undo() { @@ -1424,7 +1338,6 @@ void SfxLinkUndoAction::Undo() pUndoManager->Undo(); } -//------------------------------------------------------------------------ void SfxLinkUndoAction::Redo() { @@ -1432,7 +1345,6 @@ void SfxLinkUndoAction::Redo() pUndoManager->Redo(); } -//------------------------------------------------------------------------ bool SfxLinkUndoAction::CanRepeat(SfxRepeatTarget& r) const @@ -1441,7 +1353,6 @@ bool SfxLinkUndoAction::CanRepeat(SfxRepeatTarget& r) const } -//------------------------------------------------------------------------ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) @@ -1451,7 +1362,6 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) } -//------------------------------------------------------------------------ OUString SfxLinkUndoAction::GetComment() const { @@ -1461,7 +1371,6 @@ OUString SfxLinkUndoAction::GetComment() const } -//------------------------------------------------------------------------ OUString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const { @@ -1470,7 +1379,6 @@ OUString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const return OUString(); } -//------------------------------------------------------------------------ SfxLinkUndoAction::~SfxLinkUndoAction() { @@ -1478,7 +1386,6 @@ SfxLinkUndoAction::~SfxLinkUndoAction() pAction->SetLinkToSfxLinkUndoAction(0); } -//------------------------------------------------------------------------ void SfxLinkUndoAction::LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate) { @@ -1488,7 +1395,6 @@ void SfxLinkUndoAction::LinkedSfxUndoActionDestructed(const SfxUndoAction& rCand pAction = 0; } -//------------------------------------------------------------------------ SfxUndoArray::~SfxUndoArray() { |