diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2011-02-13 18:43:56 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-02-14 21:45:54 +0100 |
commit | 47506b8c83660b109a069207b7d292872f5718e7 (patch) | |
tree | 4b40adc306252f41c899b866b1ee08883a64709d | |
parent | b70ecb4303a6f308f6be4d3b087aacb94258007d (diff) |
Remove bogus comments and dead code from editeng, next part.
-rw-r--r-- | editeng/source/items/justifyitem.cxx | 23 | ||||
-rw-r--r-- | editeng/source/items/svxfont.cxx | 42 | ||||
-rw-r--r-- | editeng/source/items/writingmodeitem.cxx | 1 | ||||
-rw-r--r-- | editeng/source/items/xmlcnitm.cxx | 1 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.hxx | 1 | ||||
-rw-r--r-- | editeng/source/misc/acorrcfg.cxx | 4 | ||||
-rw-r--r-- | editeng/source/misc/hangulhanja.cxx | 80 | ||||
-rw-r--r-- | editeng/source/misc/splwrap.cxx | 4 | ||||
-rw-r--r-- | editeng/source/misc/txtrange.cxx | 17 | ||||
-rw-r--r-- | editeng/source/misc/unolingu.cxx | 67 |
11 files changed, 5 insertions, 237 deletions
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index ad34db825705..7523b34d31ee 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -44,14 +44,12 @@ #include <com/sun/star/table/CellVertJustify2.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> -// STATIC DATA ----------------------------------------------------------- TYPEINIT1_FACTORY( SvxHorJustifyItem, SfxEnumItem, new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ); TYPEINIT1_FACTORY( SvxVerJustifyItem, SfxEnumItem, new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ); using namespace ::com::sun::star; -// class SvxHorJustifyItem ----------------------------------------------- SvxHorJustifyItem::SvxHorJustifyItem( const USHORT nId ) : @@ -65,7 +63,6 @@ SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify, { } -//------------------------------------------------------------------------ SfxItemPresentation SvxHorJustifyItem::GetPresentation ( @@ -88,7 +85,6 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { @@ -185,7 +181,6 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) return true; } -//------------------------------------------------------------------------ XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const { @@ -193,14 +188,12 @@ XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const return EE_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal); } -//------------------------------------------------------------------------ SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const { return new SvxHorJustifyItem( *this ); } -//------------------------------------------------------------------------ SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const { @@ -208,14 +201,13 @@ SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const rStream >> nVal; return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() ); } -//------------------------------------------------------------------------ + USHORT SvxHorJustifyItem::GetValueCount() const { return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1 } -// class SvxVerJustifyItem ----------------------------------------------- SvxVerJustifyItem::SvxVerJustifyItem( const USHORT nId ) : SfxEnumItem( nId, (USHORT)SVX_VER_JUSTIFY_STANDARD ) @@ -228,7 +220,6 @@ SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify, { } -//------------------------------------------------------------------------ SfxItemPresentation SvxVerJustifyItem::GetPresentation ( @@ -252,7 +243,6 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { @@ -337,7 +327,6 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) return true; } -//------------------------------------------------------------------------ XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const { @@ -345,14 +334,12 @@ XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const return EE_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal); } -//------------------------------------------------------------------------ SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const { return new SvxVerJustifyItem( *this ); } -//------------------------------------------------------------------------ SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const { @@ -361,7 +348,6 @@ SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() ); } -//------------------------------------------------------------------------ USHORT SvxVerJustifyItem::GetValueCount() const { @@ -369,7 +355,6 @@ USHORT SvxVerJustifyItem::GetValueCount() const } -// class SvxJustifyMethodItem ----------------------------------------------- SvxJustifyMethodItem::SvxJustifyMethodItem( const USHORT nId ) : SfxEnumItem( nId, (USHORT)SVX_JUSTIFY_METHOD_AUTO ) @@ -382,7 +367,6 @@ SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify, { } -//------------------------------------------------------------------------ SfxItemPresentation SvxJustifyMethodItem::GetPresentation ( @@ -406,7 +390,6 @@ SfxItemPresentation SvxJustifyMethodItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -//------------------------------------------------------------------------ bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const { @@ -442,7 +425,6 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) return true; } -//------------------------------------------------------------------------ XubString SvxJustifyMethodItem::GetValueText( USHORT nVal ) const { @@ -450,14 +432,12 @@ XubString SvxJustifyMethodItem::GetValueText( USHORT nVal ) const return EE_RESSTR(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); } -//------------------------------------------------------------------------ SfxPoolItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const { return new SvxJustifyMethodItem( *this ); } -//------------------------------------------------------------------------ SfxPoolItem* SvxJustifyMethodItem::Create( SvStream& rStream, USHORT ) const { @@ -466,7 +446,6 @@ SfxPoolItem* SvxJustifyMethodItem::Create( SvStream& rStream, USHORT ) const return new SvxJustifyMethodItem( (SvxCellJustifyMethod)nVal, Which() ); } -//------------------------------------------------------------------------ USHORT SvxJustifyMethodItem::GetValueCount() const { diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 55c4607f35bc..1f9ff08320d1 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -51,9 +51,6 @@ static sal_Char const sDoubleSpace[] = " "; #endif -/************************************************************************* - * class SvxFont - *************************************************************************/ SvxFont::SvxFont() { @@ -72,9 +69,6 @@ SvxFont::SvxFont( const Font &rFont ) eLang = LANGUAGE_SYSTEM; } -/************************************************************************* - * class SvxFont: Copy-Ctor - *************************************************************************/ SvxFont::SvxFont( const SvxFont &rFont ) : Font( rFont ) @@ -86,9 +80,6 @@ SvxFont::SvxFont( const SvxFont &rFont ) eLang = rFont.GetLanguage(); } -/************************************************************************* - * static SvxFont::DrawArrow - *************************************************************************/ void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect, const Size& rSize, const Color& rCol, BOOL bLeft ) @@ -126,9 +117,6 @@ void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect, rOut.SetFillColor( aOldFillColor ); } -/************************************************************************* - * SvxFont::CalcCaseMap - *************************************************************************/ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const { @@ -357,9 +345,6 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const rDo.DoSpace( TRUE ); } -/************************************************************************** - * SvxFont::SetPhysFont() - *************************************************************************/ void SvxFont::SetPhysFont( OutputDevice *pOut ) const { @@ -380,9 +365,6 @@ void SvxFont::SetPhysFont( OutputDevice *pOut ) const } } -/************************************************************************* - * SvxFont::ChgPhysFont() - *************************************************************************/ Font SvxFont::ChgPhysFont( OutputDevice *pOut ) const { @@ -391,9 +373,6 @@ Font SvxFont::ChgPhysFont( OutputDevice *pOut ) const return aOldFont; } -/************************************************************************* - * SvxFont::GetPhysTxtSize() - *************************************************************************/ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const XubString &rTxt, const xub_StrLen nIdx, const xub_StrLen nLen ) const @@ -483,9 +462,6 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt, return aTxtSize; } -/************************************************************************* - * SvxFont::GetTxtSize() - *************************************************************************/ Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt, const xub_StrLen nIdx, const xub_StrLen nLen ) @@ -504,9 +480,6 @@ Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt, return aTxtSize; } -/************************************************************************* - * SvxFont::DrawText() - *************************************************************************/ void SvxFont::DrawText( OutputDevice *pOut, const Point &rPos, const XubString &rTxt, @@ -590,7 +563,6 @@ void SvxFont::QuickDrawText( OutputDevice *pOut, } } -// ----------------------------------------------------------------------- void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter, const Point &rPos, const XubString &rTxt, @@ -652,7 +624,6 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter, pPrinter->SetFont( aOldPrnFont ); } -// ----------------------------------------------------------------------- SvxFont& SvxFont::operator=( const Font& rFont ) { @@ -672,11 +643,6 @@ SvxFont& SvxFont::operator=( const SvxFont& rFont ) } -/************************************************************************* - * class SvxDoGetCapitalSize - * wird von SvxFont::GetCapitalSize() zur Berechnung der TxtSize bei - * eingestellten Kapitaelchen benutzt. - *************************************************************************/ class SvxDoGetCapitalSize : public SvxDoCapitals { @@ -723,10 +689,6 @@ void SvxDoGetCapitalSize::Do( const XubString &_rTxt, const xub_StrLen _nIdx, aTxtSize.Width() += ( _nLen * long( nKern ) ); } -/************************************************************************* - * SvxFont::GetCapitalSize() - * berechnet TxtSize, wenn Kapitaelchen eingestellt sind. - *************************************************************************/ Size SvxFont::GetCapitalSize( const OutputDevice *pOut, const XubString &rTxt, const xub_StrLen nIdx, const xub_StrLen nLen) const @@ -745,10 +707,6 @@ Size SvxFont::GetCapitalSize( const OutputDevice *pOut, const XubString &rTxt, return aTxtSize; } -/************************************************************************* - * class SvxDoDrawCapital - * wird von SvxFont::DrawCapital zur Ausgabe von Kapitaelchen benutzt. - *************************************************************************/ class SvxDoDrawCapital : public SvxDoCapitals { diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 8120b9ddf76f..82fde31f946c 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; -// class SvxWritingModeItem ------------------------------------------------- TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(com::sun::star::text::WritingMode_LR_TB, 0)); diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 395bbcd9ef5a..9c43dd5b2535 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml; -// ------------------------------------------------------------------------ TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem); diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 19616f36ab26..4e4989ec5613 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -141,8 +141,6 @@ SvXMLWordContext::SvXMLWordContext( if (!sWrong.Len() || !sRight.Len() ) return; -// const International& rInter = Application::GetAppInternational(); -// BOOL bOnlyTxt = COMPARE_EQUAL != rInter.Compare( sRight, sWrong, INTN_COMPARE_IGNORECASE ); BOOL bOnlyTxt = sRight != sWrong; if( !bOnlyTxt ) { diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 9a2391833955..7fba16e239a5 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -49,7 +49,6 @@ public: SvxAutocorrWordList *pAutocorr_List; SvxAutoCorrect &rAutoCorrect; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStorage; - //SvStorageRef &rStorage; // #110680# SvXMLAutoCorrectImport( diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index c00e4e225912..7c9f5a56fbcd 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -47,10 +47,6 @@ using namespace com::sun::star::uno; static SvxAutoCorrCfg* pAutoCorrCfg = 0; -/*-------------------------------------------------------------------- - Beschreibung: Ctor Dtor - --------------------------------------------------------------------*/ - SvxAutoCorrCfg::SvxAutoCorrCfg() : aBaseConfig(*this), aSwConfig(*this), diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index c1bad6b18414..cb25cba2b1e6 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -64,36 +64,6 @@ namespace editeng using namespace ::com::sun::star::i18n::TextConversionOption; using namespace ::com::sun::star::i18n::TextConversionType; using namespace ::com::sun::star::lang; -/* - using HangulHanjaConversion::ReplacementAction; - using HangulHanjaConversion::eExchange; - using HangulHanjaConversion::eReplacementBracketed; - using HangulHanjaConversion::eOriginalBracketed; - using HangulHanjaConversion::eReplacementAbove; - using HangulHanjaConversion::eOriginalAbove; - using HangulHanjaConversion::eReplacementBelow; - using HangulHanjaConversion::eOriginalBelow; - - using HangulHanjaConversion::eHangulToHanja; - using HangulHanjaConversion::eHanjaToHangul; - - using HangulHanjaConversion::eSimpleConversion; - using HangulHanjaConversion::eHangulBracketed; - using HangulHanjaConversion::eHanjaBracketed; - using HangulHanjaConversion::eRubyHanjaAbove; - using HangulHanjaConversion::eRubyHanjaBelow; - using HangulHanjaConversion::eRubyHangulAbove; - using HangulHanjaConversion::eRubyHangulBelow; - - using ::com::sun::star::i18n::TextConversionType::TO_HANJA; - using ::com::sun::star::i18n::TextConversionType::TO_HANGUL; - using ::com::sun::star::i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - using ::com::sun::star::i18n::TextConversionOption::NONE; -*/ - //========================================================================= - //= HangulHanjaConversion_Impl - //========================================================================= - //using HangulHanjaConversion::ConversionFormat; class HangulHanjaConversion_Impl { @@ -270,14 +240,8 @@ namespace editeng sal_Int16 implGetConversionType( bool bSwitchDirection=false ) const; }; - //========================================================================= - //= HangulHanjaConversion_Impl - //========================================================================= - //------------------------------------------------------------------------- - // static member initialization HangulHanjaConversion_Impl::StringMap HangulHanjaConversion_Impl::m_aRecentlyUsedList = HangulHanjaConversion_Impl::StringMap(); - //------------------------------------------------------------------------- HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( Window* _pUIParent, const Reference< XMultiServiceFactory >& _rxORB, const Locale& _rSourceLocale, @@ -335,7 +299,6 @@ namespace editeng } - //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::createDialog() { DBG_ASSERT( m_bIsInteractive, "createDialog when the conversion should not be interactive?" ); @@ -366,7 +329,6 @@ namespace editeng } } - //------------------------------------------------------------------------- sal_Int16 HangulHanjaConversion_Impl::implGetConversionType( bool bSwitchDirection ) const { sal_Int16 nConversionType = -1; @@ -378,7 +340,6 @@ namespace editeng return nConversionType; } - //------------------------------------------------------------------------- bool HangulHanjaConversion_Impl::implUpdateSuggestions( bool _bAllowSearchNextConvertibleText, const sal_Int32 _nStartAt ) { // parameters for the converter @@ -498,7 +459,6 @@ namespace editeng return bFoundAny; } - //------------------------------------------------------------------------- bool HangulHanjaConversion_Impl::implNextConvertibleUnit( const sal_Int32 _nStartAt ) { m_aCurrentSuggestions.realloc( 0 ); @@ -528,7 +488,6 @@ namespace editeng (m_nCurrentStartIndex < m_sCurrentPortion.getLength()); } - //------------------------------------------------------------------------- bool HangulHanjaConversion_Impl::implRetrieveNextPortion( ) { sal_Bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional; @@ -547,7 +506,6 @@ namespace editeng return bRet; } - //------------------------------------------------------------------------- sal_Bool HangulHanjaConversion_Impl::implNextConvertible( bool _bRepeatUnit ) { if ( _bRepeatUnit || ( m_nCurrentEndIndex < m_sCurrentPortion.getLength() ) ) @@ -578,7 +536,6 @@ namespace editeng return sal_False; } - //------------------------------------------------------------------------- ::rtl::OUString HangulHanjaConversion_Impl::GetCurrentUnit() const { DBG_ASSERT( m_nCurrentStartIndex < m_sCurrentPortion.getLength(), @@ -592,7 +549,6 @@ namespace editeng return sCurrentUnit; } - //------------------------------------------------------------------------- sal_Bool HangulHanjaConversion_Impl::ContinueConversion( bool _bRepeatCurrentUnit ) { sal_Bool bNeedUserInteraction = sal_False; // when we leave here, do we need user interaction? @@ -654,7 +610,6 @@ namespace editeng return bDocumentDone || !bNeedUserInteraction; } - //------------------------------------------------------------------------- bool HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion( HHC::ConversionDirection& rDirection ) { // - For eConvHangulHanja the direction is determined by @@ -713,7 +668,6 @@ namespace editeng return bSuccess; } - //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::DoDocumentConversion( ) { // clear the change-all list - it's to be re-initialized for every single document @@ -775,7 +729,6 @@ namespace editeng } } - //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::implProceed( bool _bRepeatCurrentUnit ) { if ( ContinueConversion( _bRepeatCurrentUnit ) ) @@ -786,7 +739,6 @@ namespace editeng } } - //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::implChange( const ::rtl::OUString& _rChangeInto ) { if( !_rChangeInto.getLength() ) @@ -879,7 +831,6 @@ namespace editeng m_nReplacementBaseIndex = m_nCurrentEndIndex; } - //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::implReadOptionsFromConfiguration() { SvtLinguConfig aLngCfg; @@ -888,7 +839,6 @@ namespace editeng aLngCfg.GetProperty( UPH_IS_AUTO_REPLACE_UNIQUE_ENTRIES ) >>= m_bAutoReplaceUnique; } - //------------------------------------------------------------------------- void HangulHanjaConversion_Impl::implUpdateData() { implReadOptionsFromConfiguration(); @@ -905,7 +855,6 @@ namespace editeng m_pAntiImpl->HandleNewUnit( m_nCurrentStartIndex - m_nReplacementBaseIndex, m_nCurrentEndIndex - m_nReplacementBaseIndex ); } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnOptionsChanged, void*, EMPTYARG ) { //options and dictionaries might have been changed @@ -915,7 +864,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnIgnore, void*, EMPTYARG ) { // simply ignore, and proceed @@ -923,7 +871,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnIgnoreAll, void*, EMPTYARG ) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnIgnoreAll: no dialog! How this?" ); @@ -944,7 +891,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnChange, void*, EMPTYARG ) { // change @@ -957,7 +903,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnChangeAll, void*, EMPTYARG ) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); @@ -982,7 +927,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox ) { m_bByCharacter = _pBox->IsChecked(); @@ -992,7 +936,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnConversionTypeChanged, void*, EMPTYARG ) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); @@ -1001,7 +944,6 @@ namespace editeng return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( HangulHanjaConversion_Impl, OnFind, void*, EMPTYARG ) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnFind: where did this come from?" ); @@ -1061,17 +1003,10 @@ namespace editeng return 0L; } - //========================================================================= - //= HangulHanjaConversion - //========================================================================= - //------------------------------------------------------------------------- - - // static member initialization sal_Bool HangulHanjaConversion::m_bUseSavedValues = sal_False; sal_Bool HangulHanjaConversion::m_bTryBothDirectionsSave = sal_False; HHC::ConversionDirection HangulHanjaConversion::m_ePrimaryConversionDirectionSave = HHC::eHangulToHanja; - //------------------------------------------------------------------------- HangulHanjaConversion::HangulHanjaConversion( Window* _pUIParent, const Reference< XMultiServiceFactory >& _rxORB, const Locale& _rSourceLocale, const Locale& _rTargetLocale, @@ -1081,66 +1016,55 @@ namespace editeng { } - //------------------------------------------------------------------------- HangulHanjaConversion::~HangulHanjaConversion( ) { } - //------------------------------------------------------------------------- void HangulHanjaConversion::SetUseSavedConversionDirectionState( sal_Bool bVal ) { m_bUseSavedValues = bVal; } - //------------------------------------------------------------------------- sal_Bool HangulHanjaConversion::IsUseSavedConversionDirectionState() { return m_bUseSavedValues; } - //------------------------------------------------------------------------- LanguageType HangulHanjaConversion::GetSourceLanguage( ) const { return m_pImpl->GetSourceLang(); } - //------------------------------------------------------------------------- LanguageType HangulHanjaConversion::GetTargetLanguage( ) const { return m_pImpl->GetTargetLang(); } - //------------------------------------------------------------------------- const Font * HangulHanjaConversion::GetTargetFont( ) const { return m_pImpl->GetTargetFont(); } - //------------------------------------------------------------------------- sal_Int32 HangulHanjaConversion::GetConversionOptions( ) const { return m_pImpl->GetConvOptions(); } - //------------------------------------------------------------------------- sal_Bool HangulHanjaConversion::IsInteractive( ) const { return m_pImpl->IsInteractive(); } - //------------------------------------------------------------------------- void HangulHanjaConversion::HandleNewUnit( const sal_Int32, const sal_Int32 ) { // nothing to do, only derived classes need this. } - //------------------------------------------------------------------------- void HangulHanjaConversion::GetNextPortion( ::rtl::OUString&, LanguageType&, sal_Bool ) { DBG_ERROR( "HangulHanjaConversion::GetNextPortion: to be overridden!" ); } - //------------------------------------------------------------------------- void HangulHanjaConversion::ReplaceUnit( const sal_Int32, const sal_Int32, const ::rtl::OUString&, @@ -1152,22 +1076,18 @@ namespace editeng DBG_ERROR( "HangulHanjaConversion::ReplaceUnit: to be overridden!" ); } - //------------------------------------------------------------------------- sal_Bool HangulHanjaConversion::HasRubySupport() const { DBG_ERROR( "HangulHanjaConversion::HasRubySupport: to be overridden!" ); return sal_False; } - //------------------------------------------------------------------------- void HangulHanjaConversion::ConvertDocument() { if ( m_pImpl->IsValid() ) m_pImpl->DoDocumentConversion( ); } -//............................................................................. } // namespace svx -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 3384b2c02c36..5c158da3e0bc 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -46,7 +46,7 @@ #include <map> #include <editeng/svxenum.hxx> -#include <editeng/splwrap.hxx> // Der Wrapper +#include <editeng/splwrap.hxx> #include <editeng/edtdlg.hxx> #include <editeng/eerdll.hxx> #include <editeng/editrids.hrc> @@ -88,8 +88,6 @@ void SvxPrepareAutoCorrect( String &rOldText, String &rNewText ) } } -// ----------------------------------------------------------------------- - #define SVX_LANG_NEED_CHECK 0 #define SVX_LANG_OK 1 #define SVX_LANG_MISSING 2 diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index 780a7f84b718..50a198136588 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -36,12 +36,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -/************************************************************************* -|* -|* TextRanger::TextRanger() -|* -*************************************************************************/ - #ifdef WIN #pragma optimize ( "", off ) #endif @@ -98,11 +92,6 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg #pragma optimize ( "", on ) #endif -/************************************************************************* -|* -|* TextRanger::~TextRanger() -|* -*************************************************************************/ TextRanger::~TextRanger() { @@ -130,12 +119,6 @@ void TextRanger::SetVertical( BOOL bNew ) } } -/************************************************************************* -|* -|* SvxBoundArgs -|* -*************************************************************************/ - class SvxBoundArgs { SvBools aBoolArr; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 0ada254a331b..7a43425aed7a 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -80,9 +80,6 @@ using namespace ::com::sun::star::linguistic2; #define CSS com::sun::star -/////////////////////////////////////////////////////////////////////////// - - static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl() { uno::Reference< XLinguServiceManager > xRes; @@ -96,8 +93,6 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl() return xRes; } -/////////////////////////////////////////////////////////////////////////// - BOOL lcl_FindEntry( const OUString &rEntry, const Sequence< OUString > &rCfgSvcs ) { INT32 nRes = -1; @@ -223,9 +218,6 @@ Sequence< OUString > lcl_MergeSeq( return aRes; } -/////////////////////////////////////////////////////////////////////////// - -// static member initialization INT16 SvxLinguConfigUpdate::nNeedUpdating = -1; INT32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1; @@ -467,8 +459,6 @@ BOOL SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck ) return nNeedUpdating == 1; } -/////////////////////////////////////////////////////////////////////////// - //! Dummy implementation in order to avoid loading of lingu DLL //! when only the XSupportedLocales interface is used. @@ -612,9 +602,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL } -/////////////////////////////////////////////////////////////////////////// - - //! Dummy implementation in order to avoid loading of lingu DLL. //! The dummy accesses the real implementation (and thus loading the DLL) //! when it needs to be done only. @@ -717,9 +704,6 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL } -/////////////////////////////////////////////////////////////////////////// - - //! Dummy implementation in order to avoid loading of lingu DLL. //! The dummy accesses the real implementation (and thus loading the DLL) //! when it needs to be done only. @@ -858,11 +842,9 @@ uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL } -/////////////////////////////////////////////////////////////////////////// - - typedef cppu::WeakImplHelper1 < XEventListener > LinguMgrAppExitLstnrBaseClass; + class LinguMgrAppExitLstnr : public LinguMgrAppExitLstnrBaseClass { uno::Reference< XComponent > xDesktop; @@ -916,8 +898,6 @@ void LinguMgrAppExitLstnr::disposing(const EventObject& rSource) } } -/////////////////////////////////////////////////////////////////////////// - class LinguMgrExitLstnr : public LinguMgrAppExitLstnr { public: @@ -944,10 +924,7 @@ void LinguMgrExitLstnr::AtExit() LinguMgr::pExitLstnr = 0; } -/////////////////////////////////////////////////////////////////////////// - -// static member initialization LinguMgrExitLstnr * LinguMgr::pExitLstnr = 0; sal_Bool LinguMgr::bExiting = sal_False; uno::Reference< XLinguServiceManager > LinguMgr::xLngSvcMgr = 0; @@ -1028,16 +1005,6 @@ uno::Reference< XSpellChecker1 > LinguMgr::GetSpell() //! use dummy implementation in order to avoid loading of lingu DLL xSpell = new SpellDummy_Impl; - -/* if (!xLngSvcMgr.is()) - xLngSvcMgr = GetLngSvcMgr_Impl(); - - if (xLngSvcMgr.is()) - { - xSpell = uno::Reference< XSpellChecker1 > ( - xLngSvcMgr->getSpellChecker(), UNO_QUERY ); - } -*/ return xSpell; } @@ -1051,16 +1018,6 @@ uno::Reference< XHyphenator > LinguMgr::GetHyph() //! use dummy implementation in order to avoid loading of lingu DLL xHyph = new HyphDummy_Impl; - -/* - if (!xLngSvcMgr.is()) - xLngSvcMgr = GetLngSvcMgr_Impl(); - - if (xLngSvcMgr.is()) - { - xHyph = xLngSvcMgr->getHyphenator(); - } -*/ return xHyph; } @@ -1077,15 +1034,6 @@ uno::Reference< XThesaurus > LinguMgr::GetThes() //! The dummy accesses the real implementation (and thus loading the DLL) //! when "real" work needs to be done only. xThes = new ThesDummy_Impl; -/* - if (!xLngSvcMgr.is()) - xLngSvcMgr = GetLngSvcMgr_Impl(); - - if (xLngSvcMgr.is()) - { - xThes = xLngSvcMgr->getThesaurus(); - } -*/ return xThes; } @@ -1217,8 +1165,6 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() return xDic; } -/////////////////////////////////////////////////////////////////////////// - uno::Reference< XSpellChecker1 > SvxGetSpellChecker() { return LinguMgr::GetSpellChecker(); @@ -1261,9 +1207,6 @@ uno::Reference< XDictionary > SvxGetChangeAllList() return LinguMgr::GetChangeAllList(); } -/////////////////////////////////////////////////////////////////////////// - - #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> SvxAlternativeSpelling SvxGetAltSpelling( @@ -1307,8 +1250,6 @@ SvxAlternativeSpelling SvxGetAltSpelling( } -/////////////////////////////////////////////////////////////////////////// - SvxDicListChgClamp::SvxDicListChgClamp( uno::Reference< XDictionaryList > &rxDicList ) : xDicList ( rxDicList ) { @@ -1326,8 +1267,6 @@ SvxDicListChgClamp::~SvxDicListChgClamp() } } -/////////////////////////////////////////////////////////////////////////// - short SvxDicError( Window *pParent, sal_Int16 nError ) { short nRes = 0; @@ -1358,7 +1297,7 @@ LanguageType SvxLocaleToLanguage( const Locale& rLocale ) Locale& SvxLanguageToLocale( Locale& rLocale, LanguageType eLang ) { - if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */) + if ( eLang != LANGUAGE_NONE ) MsLangId::convertLanguageToLocale( eLang, rLocale ); else rLocale = Locale(); @@ -1369,7 +1308,7 @@ Locale& SvxLanguageToLocale( Locale& rLocale, LanguageType eLang ) Locale SvxCreateLocale( LanguageType eLang ) { Locale aLocale; - if ( eLang != LANGUAGE_NONE /* && eLang != LANGUAGE_SYSTEM */) + if ( eLang != LANGUAGE_NONE ) MsLangId::convertLanguageToLocale( eLang, aLocale ); return aLocale; |