diff options
Diffstat (limited to 'sw/source/ui/lingu')
-rw-r--r-- | sw/source/ui/lingu/hhcwrp.cxx | 25 | ||||
-rw-r--r-- | sw/source/ui/lingu/hyp.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/lingu/sdrhhcwrap.cxx | 7 | ||||
-rw-r--r-- | sw/source/ui/lingu/sdrhhcwrap.hxx | 4 |
5 files changed, 3 insertions, 56 deletions
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 21e0aba383ed..b5d1950f24f3 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::i18n; -////////////////////////////////////////////////////////////////////// // Description: Turn off frame/object shell if applicable static void lcl_ActivateTextShell( SwWrtShell & rWrtSh ) @@ -64,8 +63,6 @@ static void lcl_ActivateTextShell( SwWrtShell & rWrtSh ) rWrtSh.EnterStdMode(); } -////////////////////////////////////////////////////////////////////// - class SwKeepConversionDirectionStateContext { public: @@ -83,8 +80,6 @@ public: } }; -////////////////////////////////////////////////////////////////////// - SwHHCWrapper::SwHHCWrapper( SwView* pSwView, const uno::Reference< uno::XComponentContext >& rxContext, @@ -117,7 +112,6 @@ SwHHCWrapper::SwHHCWrapper( { } - SwHHCWrapper::~SwHHCWrapper() { delete m_pConvArgs; @@ -153,7 +147,7 @@ SwHHCWrapper::~SwHHCWrapper() //!! Note: This also effects the default language of text boxes (EditEngine/EditView) !! pDoc->SetDefault( SvxLanguageItem( nTargetLang, RES_CHRATR_CJK_LANGUAGE ) ); - // + const Font *pFont = GetTargetFont(); if (pFont) { @@ -166,7 +160,6 @@ SwHHCWrapper::~SwHHCWrapper() } } - void SwHHCWrapper::GetNextPortion( OUString& rNextPortion, LanguageType& rLangOfPortion, @@ -185,7 +178,6 @@ void SwHHCWrapper::GetNextPortion( m_nLastPos = pCrsr->Start()->nContent.GetIndex(); } - void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd ) { SwPaM *pCrsr = m_rWrtShell.GetCrsr(); @@ -203,7 +195,6 @@ void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd m_rWrtShell.EndSelect(); } - void SwHHCWrapper::HandleNewUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd ) { @@ -221,7 +212,6 @@ void SwHHCWrapper::HandleNewUnit( m_rWrtShell.EndAllAction(); } - void SwHHCWrapper::ChangeText( const OUString &rNewText, const OUString& rOrigText, const uno::Sequence< sal_Int32 > *pOffsets, @@ -331,7 +321,6 @@ void SwHHCWrapper::ChangeText( const OUString &rNewText, } } - void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ) { if (bKeepAttributes) @@ -376,7 +365,6 @@ void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttribut } } - void SwHHCWrapper::ReplaceUnit( const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, @@ -535,13 +523,11 @@ void SwHHCWrapper::ReplaceUnit( m_rWrtShell.EndAllAction(); } - bool SwHHCWrapper::HasRubySupport() const { return true; } - void SwHHCWrapper::Convert() { OSL_ENSURE( m_pConvArgs == 0, "NULL pointer expected" ); @@ -550,7 +536,6 @@ void SwHHCWrapper::Convert() SwPosition* pSttPos = pCrsr->Start(); SwPosition* pEndPos = pCrsr->End(); - if (pSttPos->nNode.GetNode().IsTxtNode() && pEndPos->nNode.GetNode().IsTxtNode()) { @@ -640,7 +625,6 @@ void SwHHCWrapper::Convert() ConvEnd_impl( m_pConvArgs ); } - bool SwHHCWrapper::ConvNext_impl( ) { //! modified version of SvxSpellWrapper::SpellNext @@ -682,7 +666,6 @@ bool SwHHCWrapper::ConvNext_impl( ) return bGoOn; } - bool SwHHCWrapper::FindConvText_impl() { //! modified version of SvxSpellWrapper::FindSpellError @@ -709,26 +692,22 @@ bool SwHHCWrapper::FindConvText_impl() return bFound; } - bool SwHHCWrapper::HasOtherCnt_impl() { return m_bIsSelection ? false : m_rWrtShell.HasOtherCnt(); } - void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs, SvxSpellArea eArea ) { SetDrawObj( SVX_SPELL_OTHER == eArea ); m_pView->SpellStart( eArea, m_bStartDone, m_bEndDone, /* [out] */ pConversionArgs ); } - void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs ) { m_pView->SpellEnd( pConversionArgs ); } - bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) { bool bProgress = !m_bIsDrawObj && !m_bIsSelection; @@ -738,6 +717,4 @@ bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs ) return !pConversionArgs->aConvText.isEmpty(); } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 1b228e5dc877..73de46c7aeb8 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "initui.hxx" #include "view.hxx" #include "edtwin.hxx" @@ -62,7 +61,6 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, SetHyphen(); } - void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) { if( SVX_SPELL_OTHER == eSpell && nPageCount ) @@ -74,8 +72,6 @@ void SwHyphWrapper::SpellStart( SvxSpellArea eSpell ) pView->HyphStart( eSpell ); } - - bool SwHyphWrapper::SpellContinue() { // for automatic separation, make actions visible only at the end @@ -101,14 +97,12 @@ bool SwHyphWrapper::SpellContinue() return GetLast().is(); } - void SwHyphWrapper::SpellEnd() { PSH->HyphEnd(); SvxSpellWrapper::SpellEnd(); } - bool SwHyphWrapper::SpellMore() { PSH->Push(); @@ -117,8 +111,6 @@ bool SwHyphWrapper::SpellMore() return false; } - - void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) { if( nPos) @@ -129,7 +121,6 @@ void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos ) PSH->HyphIgnore(); } - SwHyphWrapper::~SwHyphWrapper() { if( nPageCount ) diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index c2591a4966ac..f5909da430d1 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -93,12 +93,10 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp> - using namespace ::com::sun::star; extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); - /// @returns : the language for the selected text that is set for the /// specified attribute (script type). /// If there are more than one languages used LANGUAGE_DONTKNOW will be returned. @@ -197,7 +195,6 @@ void SwSpellPopup::fillLangPopupMenu( } } - sal_uInt16 nItemId = nLangItemIdStart; std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) @@ -267,7 +264,6 @@ OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) return aLabel; } - SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic2::XSpellAlternatives > &xAlt, @@ -414,7 +410,7 @@ SwSpellPopup::SwSpellPopup( EnableItem( MN_ADD_TO_DIC_SINGLE, ((nItemId - MN_DICTIONARIES_START) == 1)?sal_True:sal_False ); //ADD NEW LANGUAGE MENU ITEM - /////////////////////////////////////////////////////////////////////////// + OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; @@ -453,14 +449,10 @@ SwSpellPopup::SwSpellPopup( SetItemImage( MN_SPELLING_DLG, rImg ); } - ////////////////////////////////////////////////////////////////////////////////// - checkRedline(); RemoveDisabledEntries( true, true ); } - - SwSpellPopup::SwSpellPopup( SwWrtShell *pWrtSh, const linguistic2::ProofreadingResult &rResult, @@ -568,7 +560,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) EnableItem( MN_ADD_TO_DIC_SINGLE, false ); //ADD NEW LANGUAGE MENU ITEM - /////////////////////////////////////////////////////////////////////////// + OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; @@ -607,8 +599,6 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) SetItemImage( MN_SPELLING_DLG, rImg ); } - ////////////////////////////////////////////////////////////////////////////////// - checkRedline(); RemoveDisabledEntries( true, true ); } diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index 7c3de8257ec4..3a05a06b3328 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////// - SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const Font* pTargetFnt, @@ -78,7 +76,6 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, // Hack: all SdrTextObj attributes should be transferred to EditEngine pOutlView->SetBackgroundColor( Color( COL_WHITE ) ); - InsertView( pOutlView ); Point aPoint( 0, 0 ); Rectangle aRect( aPoint, aSize ); @@ -101,13 +98,11 @@ SdrHHCWrapper::~SdrHHCWrapper() delete pOutlView; } - void SdrHHCWrapper::StartTextConversion() { pOutlView->StartTextConversion( nSourceLang, nTargetLang, pTargetFont, nOptions, bIsInteractive, true ); } - bool SdrHHCWrapper::ConvertNextDocument() { bool bNextDoc = false; @@ -177,6 +172,4 @@ bool SdrHHCWrapper::ConvertNextDocument() return bNextDoc; } -////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/ui/lingu/sdrhhcwrap.hxx index c416124c04e1..d6befe334b44 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.hxx +++ b/sw/source/ui/lingu/sdrhhcwrap.hxx @@ -25,8 +25,6 @@ class SwView; class SdrTextObj; class OutlinerView; -////////////////////////////////////////////////////////////////////// - class SdrHHCWrapper : public SdrOutliner { // modified version of SdrSpeller @@ -53,8 +51,6 @@ public: void StartTextConversion(); }; -////////////////////////////////////////////////////////////////////// - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |