diff options
Diffstat (limited to 'cui/source/dialogs')
45 files changed, 73 insertions, 907 deletions
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index c4c55b9ebe1b..f3098f0688de 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -37,134 +37,116 @@ using namespace svx; using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; -/*-- 26.06.2008 10:41:57--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rDesc ) { } -/*-- 10.09.2003 12:54:34--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription ) { } -/*-- 10.09.2003 12:54:34--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellErrorAttrib::~SpellErrorAttrib() { } -/*-- 10.09.2003 12:54:35--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellErrorAttrib::SetFont( Font& ) const { //this attribute doesn't have a visual effect } -/*-- 10.09.2003 12:54:35--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- TextAttrib* SpellErrorAttrib::Clone() const { return new SpellErrorAttrib(*this); } -/*-- 10.09.2003 12:54:35--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription; } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellLanguageAttrib::SpellLanguageAttrib(LanguageType eLang) : TextAttrib(TEXTATTR_SPELL_LANGUAGE), m_eLanguage(eLang) { } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellLanguageAttrib::SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_LANGUAGE), m_eLanguage(rAttr.m_eLanguage) { } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellLanguageAttrib::~SpellLanguageAttrib() { } -/*-- 10.09.2003 14:27:43--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellLanguageAttrib::SetFont( Font& ) const { //no visual effect } -/*-- 10.09.2003 14:27:44--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- TextAttrib* SpellLanguageAttrib::Clone() const { return new SpellLanguageAttrib(*this); } -/*-- 10.09.2003 14:27:44--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage; } -/*-- 31.10.2003 16:07:45--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rCol) { } -/*-- 31.10.2003 16:07:45--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellBackgroundAttrib::SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_BACKGROUND), m_aBackgroundColor(rAttr.m_aBackgroundColor) { } -/*-- 31.10.2003 16:07:46--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellBackgroundAttrib::~SpellBackgroundAttrib() { } -/*-- 31.10.2003 16:07:46--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellBackgroundAttrib::SetFont( Font& rFont ) const { rFont.SetFillColor(m_aBackgroundColor); } -/*-- 31.10.2003 16:07:46--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- TextAttrib* SpellBackgroundAttrib::Clone() const { return new SpellBackgroundAttrib(*this); } -/*-- 31.10.2003 16:07:47--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const { return Which() == rAttr.Which() && diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 72e69270239a..9ebc229380ce 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -35,9 +35,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/linguistic2/XProofreader.hpp> #include <tools/color.hxx> -//namespace com{ namespace sun{ namespace star{ namespace linguistic2{ -// class XSpellAlternatives; -//}}}} #define TEXTATTR_SPELL_ERROR (TEXTATTR_USER_START + 1) #define TEXTATTR_SPELL_LANGUAGE (TEXTATTR_USER_START + 2) @@ -97,21 +94,18 @@ struct SpellErrorDescription sRuleId == rDesc.sRuleId; } }; -/* -----------------10.09.2003 14:23----------------- - --------------------------------------------------*/ +//------------------------------------------------- class SpellErrorAttrib : public TextAttrib { public: private: - //com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> m_xAlternatives; SpellErrorDescription m_aSpellErrorDescription; //not accessible SpellErrorAttrib(); public: -// SpellErrorAttrib(com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> xAlternatives); SpellErrorAttrib( const SpellErrorDescription& ); SpellErrorAttrib( const SpellErrorAttrib& rAttr ); ~SpellErrorAttrib(); @@ -123,9 +117,8 @@ public: virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; }; -/* -----------------10.09.2003 14:23----------------- - --------------------------------------------------*/ +//------------------------------------------------- class SpellLanguageAttrib : public TextAttrib { LanguageType m_eLanguage; @@ -147,9 +140,8 @@ public: virtual TextAttrib* Clone() const; virtual int operator==( const TextAttrib& rAttr ) const; }; -/* -----------------31.10.2003 16:01----------------- - --------------------------------------------------*/ +//------------------------------------------------- class SpellBackgroundAttrib : public TextAttrib { Color m_aBackgroundColor; diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 304407cdba07..d3b0fac563d3 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -85,7 +85,6 @@ struct SpellDialog_Impl Sequence< Reference< XDictionary > > aDics; }; // ----------------------------------------------------------------------- -//#define VENDOR_IMAGE_HEIGHT 44 //as specified #define SPELLUNDO_CHANGE_LANGUAGE (TEXTUNDO_USER + 1) #define SPELLUNDO_CHANGE_TEXTENGINE (TEXTUNDO_USER + 2) @@ -157,7 +156,6 @@ public: void SetErrorLanguageSelected(bool bSet){ m_bIsErrorLanguageSelected = bSet;} bool IsErrorLanguageSelected() const {return m_bIsErrorLanguageSelected;} - void SetDictionary(Reference<XDictionary> xDict) { m_xDictionary = xDict; } Reference<XDictionary> GetDictionary() const {return m_xDictionary;} void SetAddedWord(const ::rtl::OUString& rWord) {m_sAddedWord = rWord;} @@ -172,22 +170,19 @@ public: }; }//namespace svx using namespace ::svx; -/*-- 06.11.2003 12:16:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SpellUndoAction_Impl::~SpellUndoAction_Impl() { } -/*-- 06.11.2003 12:16:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellUndoAction_Impl::Undo() { m_rActionLink.Call(this); } -/*-- 06.11.2003 12:16:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- USHORT SpellUndoAction_Impl::GetId()const { return m_nId; @@ -328,13 +323,11 @@ void SpellDialog::UpdateBoxes_Impl() const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives(); LanguageType nAltLanguage = LANGUAGE_NONE; - //String aAltWord; Sequence< ::rtl::OUString > aNewWords; bool bIsGrammarError = false; if( pSpellErrorDescription ) { nAltLanguage = SvxLocaleToLanguage( pSpellErrorDescription->aLocale ); - //aAltWord = String( xAlt->getWord() ); aNewWords = pSpellErrorDescription->aSuggestions; bIsGrammarError = pSpellErrorDescription->bIsGrammarError; aExplainPB.SetExplanation(pSpellErrorDescription->sExplanation ); @@ -350,7 +343,6 @@ void SpellDialog::UpdateBoxes_Impl() SetTitle_Impl( nAltLanguage ); SetSelectedLang_Impl( nAltLanguage ); - // Alternativen eintragen const ::rtl::OUString *pNewWords = aNewWords.getConstArray(); const sal_Int32 nSize = aNewWords.getLength(); @@ -366,7 +358,6 @@ void SpellDialog::UpdateBoxes_Impl() if(!nSize) aSuggestionLB.InsertEntry( aNoSuggestionsST ); aAutoCorrPB.Enable( nSize > 0 ); - //aSentenceED.GrabFocus(); aSuggestionFT.Enable(nSize > 0); aSuggestionLB.Enable(nSize > 0); @@ -417,7 +408,6 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent } while(aControls[++nIdx]); - } if( bNextSentence ) { @@ -486,7 +476,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) aVendorSize.Width() = aImageSize.Width(); pThis->aVendorImageFI.SetSizePixel( aVendorSize ); } - //aVendorSize.Height() = nDiff; sal_Int32 nDiff = aVendorSize.Height(); pThis->aVendorImageFI.SetSizePixel(aVendorSize); Control* aControls[] = { @@ -634,7 +623,6 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG ) return 1; } - // ----------------------------------------------------------------------- IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG ) @@ -717,9 +705,8 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP ); return 1; } -/*-- 06.11.2003 11:24:08--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG ) { aSentenceED.Undo(); @@ -727,9 +714,8 @@ IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG ) aUndoPB.Enable(FALSE); return 0; } -/*-- 06.11.2003 12:19:15--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) { switch(pAction->GetId()) @@ -806,7 +792,6 @@ IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG ) return 1; } - // ----------------------------------------------------------------------- sal_Bool SpellDialog::Close() @@ -830,9 +815,8 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const INT16 nLang = aLanguageLB.GetSelectLanguage(); return nLang; } -/* -----------------28.10.2003 14:27----------------- - --------------------------------------------------*/ +//------------------------------------------------- IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) { //if currently an error is selected then search for alternatives for @@ -919,7 +903,6 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) } else { - //bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); sTitle = m_sTitleSpellingGrammar; } } @@ -995,9 +978,8 @@ void SpellDialog::InitUserDicts() } } } -/*-- 20.10.2003 15:31:06--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) { aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP ); @@ -1041,9 +1023,8 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton ) aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP ); return 0; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) { if (&aSentenceED == pEd) @@ -1068,9 +1049,8 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) } return 0; }; -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG ) { //apply changes and ignored text parts first - if there are any @@ -1078,9 +1058,8 @@ IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG ) Close(); return 0; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SpellDialog::Paint( const Rectangle& rRect ) { ModelessDialog::Paint(rRect ); @@ -1088,9 +1067,8 @@ void SpellDialog::Paint( const Rectangle& rRect ) DecorationView aDecoView( this ); aDecoView.DrawButton( aRect, BUTTON_DRAW_NOFILL); } -/*-- 28.10.2003 13:26:39--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- long SpellDialog::Notify( NotifyEvent& rNEvt ) { /* #i38338# @@ -1117,9 +1095,8 @@ long SpellDialog::Notify( NotifyEvent& rNEvt ) } return SfxModelessDialog::Notify(rNEvt); } -/* -----------------10.09.2003 08:26----------------- - --------------------------------------------------*/ +//------------------------------------------------- void SpellDialog::InvalidateDialog() { if( bFocusLocked ) @@ -1151,13 +1128,11 @@ void SpellDialog::InvalidateDialog() SfxModelessDialog::Deactivate(); } -/*-- 10.09.2003 08:35:56--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) { bool bRet = false; - if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/) + if(!bUseSavedSentence) { //apply changes and ignored text parts rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck); @@ -1244,7 +1219,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) } return bRet; } -/*-- 12.11.2003 15:21:25--------------------------------------------------- +/*------------------------------------------------------------------------- replace errrors that have a replacement in the ChangeAllList returns false if the result doesn't contain errors after the replacement -----------------------------------------------------------------------*/ @@ -1277,9 +1252,8 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe } return bRet; } -/*-- 10.09.2003 10:40:21--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SentenceEditWindow_Impl::SentenceEditWindow_Impl( SpellDialog* pParent, const ResId& rResId ) : MultiLineEdit( pParent, rResId ), m_nErrorStart(0), @@ -1288,13 +1262,12 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl( SpellDialog* pParent, const Re { DisableSelectionOnFocus(); } -/*-- 10.09.2003 10:40:11--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- SentenceEditWindow_Impl::~SentenceEditWindow_Impl() { } -/*-- 20.10.2003 13:42:34--------------------------------------------------- +/*------------------------------------------------------------------------- The selection before inputting a key may have a range or not and it may be inside or outside of field or error attributes. A range may include the attribute partially, completely or together @@ -1386,7 +1359,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) bool bHasError = false; bool bHasFieldLeft = false; bool bHasErrorLeft = false; -// bool bInsideAttr = false; bool bHasRange = rCurrentSelection.HasRange(); sal_uInt8 nSelectionType = 0; // invalid type! @@ -1466,7 +1438,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) pErrorAttrLeft = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR ); bHasFieldLeft = pBackAttrLeft !=0; bHasErrorLeft = pErrorAttrLeft != 0; -// bInsideAttr = (bHasField || bHasError) && (bHasFieldLeft || bHasErrorLeft); ++aCursor.GetIndex(); } } @@ -1481,9 +1452,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) bool bBackspace = rKeyCode.GetCode() == KEY_BACKSPACE; sal_Int8 nAction = ACTION_CONTINUE; -// nAction = ACTION_UNDOEDIT -// nAction = ACTION_SELECTFIELD -// nAction = ACTION_EXPAND switch(nSelectionType) { // 1 - backspace delete any other @@ -1637,9 +1605,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) long nRet = bChange ? 1 : MultiLineEdit::PreNotify(rNEvt); return nRet; } -/*-- 10.09.2003 13:38:14--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) { if (bIgnoreCurrentError) @@ -1675,7 +1642,6 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) Reference<XDictionary> xChangeAll( SvxGetChangeAllList(), UNO_QUERY ); Reference<XDictionaryEntry> xEntry; -// Reference <XSpellAlternatives> xAlternatives; const SpellErrorDescription* pSpellErrorDescription = 0; if(pNextError) { @@ -1725,9 +1691,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError ) return bRet; } -/*-- 06.11.2003 13:30:26--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::MoveErrorMarkTo(USHORT nStart, USHORT nEnd, bool bGrammarError) { TextEngine* pTextEngine = GetTextEngine(); @@ -1739,9 +1703,7 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(USHORT nStart, USHORT nEnd, bool b m_nErrorEnd = nEnd; } -/*-- 17.09.2003 10:13:08--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage) { //calculate length changes @@ -1752,7 +1714,6 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT pTextEngine->UndoActionStart( TEXTUNDO_INSERT ); const TextCharAttrib* pErrorAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_ERROR ); DBG_ASSERT(pErrorAttrib, "no error attribute found"); -// Reference <XSpellAlternatives> xAlternatives; const SpellErrorDescription* pSpellErrorDescription = 0; if(pErrorAttrib) { @@ -1761,7 +1722,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT } const TextCharAttrib* pBackAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_BACKGROUND ); pTextEngine->ReplaceText( aSel, rNewWord ); - // + if(!m_nErrorStart) { //attributes following an error at the start of the text are not moved but expanded from the @@ -1804,16 +1765,14 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT SetAttrib( SpellLanguageAttrib(eLanguage), 0, m_nErrorStart, m_nErrorEnd ); pTextEngine->UndoActionEnd( TEXTUNDO_INSERT ); } -/* -----------------08.10.2003 13:18----------------- - --------------------------------------------------*/ +//------------------------------------------------- String SentenceEditWindow_Impl::GetErrorText() const { return GetTextEngine()->GetText(TextSelection(TextPaM(0, m_nErrorStart), TextPaM(0, m_nErrorEnd) )); } -/*-- 26.06.2008 10:54:13--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives() { TextPaM aCursor(0, m_nErrorStart); @@ -1821,9 +1780,8 @@ const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives() GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)); return pAttrib ? &pAttrib->GetErrorDescription() : 0; } -/*-- 06.09.2004 10:50:32--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::RestoreCurrentError() { TextPaM aCursor(0, m_nErrorStart); @@ -1836,9 +1794,8 @@ void SentenceEditWindow_Impl::RestoreCurrentError() ChangeMarkedWord(rDesc.sErrorText, SvxLocaleToLanguage( rDesc.aLocale )); } } -/*-- 28.10.2003 14:44:10--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xAlt ) { TextPaM aCursor(0, m_nErrorStart); @@ -1862,25 +1819,20 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd ); } -/*-- 10.09.2003 14:43:02--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd ) { GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd); } -/*-- 10.09.2003 14:43:02--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetText( const String& rStr ) { m_nErrorStart = m_nErrorEnd = 0; GetTextEngine()->SetText(rStr); -// InitScrollBars(); } -/*-- 08.10.2003 14:35:52--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- struct LanguagePosition_Impl { USHORT nPosition; @@ -1917,7 +1869,7 @@ void lcl_InsertBreakPosition_Impl( } rBreakPositions.push_back(LanguagePosition_Impl(nInsert, eLanguage)); } -/*-- 17.09.2003 14:26:59--------------------------------------------------- +/*------------------------------------------------------------------------- Returns the text in spell portions. Each portion contains text with an equal language and attribute. The spell alternatives are empty. -----------------------------------------------------------------------*/ @@ -1954,7 +1906,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore } aCursor.GetIndex()++; } - // + if(nTextLen && aBreakPositions.empty()) { //if all content has been overwritten the attributes may have been removed, too @@ -1982,7 +1934,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore aPortion1.sText = pTextEngine->GetText( TextSelection(TextPaM(0, nStart), TextPaM(0, aStart->nPosition))); bool bIsIgnoreError = m_aIgnoreErrorsAt.find( nStart ) != m_aIgnoreErrorsAt.end(); - if( bSetIgnoreFlag && bIsIgnoreError /*m_nErrorStart == nStart*/ ) + if( bSetIgnoreFlag && bIsIgnoreError ) { aPortion1.bIgnoreThisError = true; } @@ -2021,9 +1973,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore return aRet; } -/*-- 06.11.2003 11:30:10--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::Undo() { SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); @@ -2042,47 +1992,40 @@ void SentenceEditWindow_Impl::Undo() if(bSaveUndoEdit || SPELLUNDO_CHANGE_GROUP == nId) GetSpellDialog()->UpdateBoxes_Impl(); } -/*-- 06.11.2003 11:30:10--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::ResetUndo() { GetTextEngine()->ResetUndo(); } -/*-- 06.11.2003 12:30:41--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg ) { SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); rUndoMgr.AddUndoAction(pAction, bTryMerg); GetSpellDialog()->aUndoPB.Enable(); } -/*-- 06.11.2003 12:38:44--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- USHORT SentenceEditWindow_Impl::GetUndoActionCount() { return GetTextEngine()->GetUndoManager().GetUndoActionCount(); } -/*-- 12.11.2003 12:12:38--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::UndoActionStart( USHORT nId ) { GetTextEngine()->UndoActionStart(nId); } -/*-- 12.11.2003 12:12:38--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::UndoActionEnd( USHORT nId ) { GetTextEngine()->UndoActionEnd(nId); } -/*-- 12.11.2003 12:12:38--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) { if(nOffset > 0) @@ -2090,9 +2033,8 @@ void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset) else m_nErrorEnd = m_nErrorEnd -(USHORT)- nOffset; } -/*-- 13.11.2003 15:15:19--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) { DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?"); @@ -2133,15 +2075,12 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pSpellDialog->aChangePB.Enable(); } -/*-- 30.06.2008 14:15:19--------------------------------------------------- - - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- ExplainButton::~ExplainButton() { } -/*-- 30.06.2008 14:15:19--------------------------------------------------- - -----------------------------------------------------------------------*/ +//----------------------------------------------------------------------- void ExplainButton::RequestHelp( const HelpEvent& ) { Help::ShowBalloon( this, GetPosPixel(), m_sExplanation ); diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index 5a97025f02af..4f8831637c7c 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -221,22 +221,3 @@ ModelessDialog RID_SVXDLG_SPELLCHECK }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 02e2e728f412..8dc5b3a3f857 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -38,7 +38,6 @@ ModalDialog RID_SVXDLG_CHARMAP HelpId = SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; -/* Size = MAP_APPFONT ( 297 , 169 ) ; */ Size = MAP_APPFONT ( 297 , 153 ) ; OutputSize = TRUE ; Moveable = TRUE ; @@ -92,7 +91,6 @@ ModalDialog RID_SVXDLG_CHARMAP { HelpId = HID_CHARMAP_CTL_SHOWTEXT ; Pos = MAP_APPFONT ( 46 , 137 ) ; -/* Size = MAP_APPFONT ( 190 , 16 ) ; */ Size = MAP_APPFONT ( 244 , 16 ) ; Group = TRUE ; }; @@ -134,26 +132,6 @@ ModalDialog RID_SVXDLG_CHARMAP Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; -/* - PushButton BT_ASSIGN - { - Pos = MAP_APPFONT ( 242 , 140 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Assign shortcut..."; - }; - FixedText FT_ASSIGN - { - Pos = MAP_APPFONT ( 6 , 156 ) ; - Size = MAP_APPFONT ( 100 , 8 ) ; - Left = TRUE ; - Text [ en-US ] = "Shortcut key: "; - }; - Control CT_ASSIGN - { - Pos = MAP_APPFONT ( 60 , 156 ) ; - Size = MAP_APPFONT ( 160 , 8 ) ; - }; -*/ }; // ********************************************************************** EOF diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src index 60a1eff0e14f..639c5ef755ef 100644 --- a/cui/source/dialogs/commonlingui.src +++ b/cui/source/dialogs/commonlingui.src @@ -134,20 +134,3 @@ Window RID_SVX_WND_COMMON_LINGU Text [ en-US ] = "~Close" ; }; }; - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6348b73d4e14..771686f970d6 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -264,12 +264,10 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe : mpDialog( pDialog ), aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ), aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ), -// aShowShortcut ( pDialog, ResId( CT_ASSIGN, *pResContext ) ), aOKBtn ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ), aCancelBtn ( pDialog, ResId( BTN_CHAR_CANCEL, *pResContext ) ), aHelpBtn ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ), aDeleteBtn ( pDialog, ResId( BTN_DELETE, *pResContext ) ), -// aAssignBtn ( pDialog, ResId( BT_ASSIGN, *pResContext ) ), aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ), aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ), aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ), @@ -277,7 +275,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ), aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), TRUE ), aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ), -// aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ), bOne( bOne_ ), pSubsetMap( NULL ) { @@ -342,7 +339,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe aShowSet.SetHighlightHdl( LINK( this, SvxCharMapData, CharHighlightHdl ) ); aShowSet.SetPreSelectHdl( LINK( this, SvxCharMapData, CharPreSelectHdl ) ); aDeleteBtn.SetClickHdl( LINK( this, SvxCharMapData, DeleteHdl ) ); -// aAssignBtn.SetClickHdl( LINK( this, SvxCharMapData, AssignHdl ) ); if( SvxShowCharSet::getSelectedChar() == ' ') aOKBtn.Disable(); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 7cf48b0c1821..d8723d468a4d 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -85,7 +85,6 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) m_aHalfFullFormsCJK.Hide(); // never ignore the width (ignoring is expensive) if the option is not available at all - // 04.12.2001 - 91973 - fs@openoffice.org m_pSearchEngine->SetIgnoreWidthCJK( sal_False ); } @@ -630,7 +629,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( !bEnable ) { // if one of my children has the focus, remember it - // 104332 - 2002-10-17 - fs@openoffice.org Window* pFocusWindow = Application::GetFocusWindow( ); if ( pFocusWindow && IsChild( pFocusWindow ) ) m_pPreSearchFocus = pFocusWindow; @@ -665,7 +663,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) { // this means we're preparing for starting a search // In this case, EnableSearchForDependees disabled the search button // But as we're about to use it for cancelling the search, we really need to enable it, again - // 07.12.2001 - 95246 - fs@openoffice.org m_pbSearchAgain.Enable( sal_True ); } } @@ -678,7 +675,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if ( bEnable ) { // restore focus - // 104332 - 2002-10-17 - fs@openoffice.org if ( m_pPreSearchFocus ) { m_pPreSearchFocus->GrabFocus(); @@ -809,7 +805,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) : RID_SVXERR_SEARCH_NORECORD; ErrorBox(this, CUI_RES(nErrorId)).Execute(); } - // KEIN break ! + // NO break ! case FmSearchProgress::STATE_CANCELED: EnableSearchUI(sal_True); if (m_lnkCanceledNotFoundHdl.IsSet()) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 26c13ee9fbfa..cdf758596556 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1037,7 +1037,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) if ( xFolderPicker.is() ) { -// svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES ); String aDlgPathName( SvtPathOptions().GetGraphicPath() ); xFolderPicker->setDisplayDirectory(aDlgPathName); @@ -1148,7 +1147,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound ) { SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) ); -// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); aDlg.EnableLink(sal_False); aDlg.AsLink(sal_False); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index ba85929192f4..53b2d8f703c5 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -238,26 +238,6 @@ void SvxHpLinkDlg::Move() Window::Move(); } -/*long SvxHpLinkDlg::PreNotify( NotifyEvent& rNEvt ) -{ - long nRet = 0; - - if( rNEvt.GetType() == EVENT_KEYINPUT ) - { - DBG_ASSERT( rNEvt.GetKeyEvent(), "-SvxHpLinkDlg::PreNotify(): no KeyEvent for key event?!" ); - - const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - - if( KEY_MOD2 == pKEvt->GetKeyCode().GetModifier() && pKEvt->GetCharCode() && HandleShortCutKey( *pKEvt ) ) - nRet = 1; - } - - if( !nRet ) - nRet = IconChoiceDialog::PreNotify( rNEvt ); - - return nRet; -}*/ - /************************************************************************* |* |* Click on Apply-button diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index e3e961880dfc..1d72e877f230 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -242,28 +242,3 @@ ModalDialog RID_SVXDLG_MESSBOX }; }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index fc1921b47cce..76cf9ecc6f74 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -420,35 +420,3 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index cb986f6dd1dd..99625b23536a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -600,19 +600,15 @@ namespace svx m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, LINK( this, HangulHanjaConversionDialog, OnOption ) ); m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show(); -// m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) { -// m_aHanjaOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHangulOnly; } else { -// m_aHangulOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHanjaOnly; } -// m_pIgnoreNonPrimary->Check(); // initial focus FocusSuggestion( ); @@ -894,8 +890,6 @@ namespace svx //------------------------------------------------------------------------- sal_Bool HangulHanjaConversionDialog::GetUseBothDirections( ) const { -// DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" ); -// return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True; return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked(); } @@ -1173,7 +1167,6 @@ namespace svx m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); m_aDictsLB.SetSelectionMode( SINGLE_SELECTION ); m_aDictsLB.SetHighlightRange(); -// m_aDictsLB.SetHelpId( xxx ); m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); m_aDictsLB.SetDeselectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index db9ab3647e41..53a5d3eeb351 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -136,7 +136,6 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbPath.Show(); maCbbPath.SetBaseURL(SvtPathOptions().GetWorkPath()); -// maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); // set defaults maRbtEditNow.Check(); @@ -391,7 +390,6 @@ void SvxHyperlinkNewDocTp::DoApply () SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) ); SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) ); - //SfxBoolItem aFrame( SID_OPEN_NEW_VIEW, TRUE ); String aStrFlags ( sal_Unicode('S') ); if ( maRbtEditLater.IsChecked() ) @@ -413,7 +411,6 @@ void SvxHyperlinkNewDocTp::DoApply () pViewFrame = pItem->GetFrame(); if (pViewFrame) { - //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame(); SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC, diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index b7d26c2cb378..d09491b14bbd 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -311,51 +311,6 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG ) } -/* uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); - if ( xProv.is() ) - { -!!! (pb) we need a new config item here - SfxAppIniManagerProperty aProp; - GetpApp()->Property( aProp ); - if( !aProp.GetIniManager() ) - return ( 0L ); - - String aAddressBook = aProp.GetIniManager()->Get( SFX_KEY_ADDRESSBOOK ); - INetURLObject aObj; - aObj.SetSmartProtocol( INET_PROT_FILE ); - aObj.SetURL( aAddressBook.GetToken( 0, sal_Unicode( ';' ) ) ); - - String aMark( RTL_CONSTASCII_USTRINGPARAM( "db:Table;" ) ); - aMark += aAddressBook.GetToken( 1, sal_Unicode( ';' ) ); - aObj.SetMark( aMark ); - - util::URL aURL; - aURL.Complete = ::rtl::OUString( aObj.GetMainURL( INetURLObject::NO_DECODE ) ); - - uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - if( xFactory.is() ) - { - uno::Reference< util::XURLTransformer > xTrans( xFactory->createInstance - ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), - uno::UNO_QUERY); - xTrans->parseStrict( aURL ); - - uno::Reference< frame::XDispatch > aDisp = xProv->queryDispatch( aURL, - OUString::createFromAscii( "_beamer" ), - frame::FrameSearchFlag::GLOBAL | - frame::FrameSearchFlag::CREATE ); - if ( aDisp.is() ) - { - uno::Sequence< beans::PropertyValue > aArgs(1); - beans::PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = DEFINE_CONST_UNICODE("Referer"); - pArg[0].Value = uno::makeAny( OUString( DEFINE_CONST_UNICODE("private:user") ) ); - aDisp->dispatch( aURL, aArgs ); - } - } - } -*/ - return( 0L ); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 99b18e053783..9755364c0531 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -316,27 +316,6 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL ) } return (mnError==0); } -/* -void SvxHlinkDlgMarkWnd::Error(int nNr) -{ - switch(nNr) - { - case 0: - { - Rectangle aDrawRect( Point( 0, 0 ), maLbTree.GetSizePixel() ); - //maLbTree.SetTextColor( Color(COL_BLACK) ); - //maLbTree.DrawText( aDrawRect, "Keine Ziele im Dokument vorhanden.", TEXT_DRAW_LEFT);// | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); - maLbTree.DrawText( Point(0,0), "Keine Ziele im Dokument vorhanden."); - maLbTree.DrawLine(aDrawRect.TopLeft(), aDrawRect.BottomRight() ); - } - break; - case 1: - Rectangle aDrawRect( Point( 0, 0 ), maLbTree.GetSizePixel() ); - maLbTree.DrawText( aDrawRect, "Das Dokument konnte nicht ge�ffnet werden.", TEXT_DRAW_LEFT | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); - break; - } -} -*/ /************************************************************************* |* |* Fill Tree-Control diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc index 1ac36dafa099..f9d03f14e91c 100644 --- a/cui/source/dialogs/hlmarkwn.hrc +++ b/cui/source/dialogs/hlmarkwn.hrc @@ -29,6 +29,3 @@ #define BT_CLOSE 2 #define TLB_MARK 3 -//#define HYPERLINK_BMP_EXPAND 301 -//#define HYPERLINK_BMP_COLLAPSE 302 - diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src index 396e8cd573e0..ac0bba11e346 100644 --- a/cui/source/dialogs/hlmarkwn.src +++ b/cui/source/dialogs/hlmarkwn.src @@ -76,20 +76,3 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN { Text [ en-US ] = "Couldn't open the document." ; }; - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index cc09d911be0c..cd5810d5348f 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -448,7 +448,6 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) SID_ATTR_MACROITEM ); pItemSet->Put ( aItem, SID_ATTR_MACROITEM ); - // --> PB 2006-01-13 #123474# /* disable HyperLinkDlg for input while the MacroAssignDlg is working because if no JAVA is installed an error box occurs and then it is possible to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF @@ -472,7 +471,6 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ), SFX_EVENT_MOUSEOUT_OBJECT); - // --> PB 2006-01-13 #123474# if ( bIsInputEnabled ) GetParent()->EnableInput( TRUE ); // <-- diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc index 0228d65bf3d2..340117fda311 100644 --- a/cui/source/dialogs/hyperdlg.hrc +++ b/cui/source/dialogs/hyperdlg.hrc @@ -97,4 +97,3 @@ #define COL_OLD 54 #define COL_2 63 #define COL_DIFF (COL_2 - COL_OLD) - diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 4ed7d1419bba..ebf0320df9d5 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -884,85 +884,3 @@ Image RID_SVXBMP_HLDOCNTP_H ImageBitmap = Bitmap { File = "hldocntp_h.bmp" ; }; MASKCOLOR }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 7f9bede9aedc..e50fd6d83bb9 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -75,7 +75,6 @@ HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) : void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) { -// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch ( nCode ) @@ -105,7 +104,6 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt ) struct SvxHyphenWordDialog_Impl { SvxHyphenWordDialog * m_pDialog; -// Window * m_pParent; FixedText aWordFT; HyphenEdit_Impl aWordEdit; diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index f10e94626f31..5a727fb096df 100755 --- a/cui/source/dialogs/hyphen.src +++ b/cui/source/dialogs/hyphen.src @@ -122,5 +122,3 @@ ModalDialog RID_SVXDLG_HYPHENATE TABSTOP = TRUE ; }; }; - - diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 140338916149..f52674d6a432 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -268,12 +268,12 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, const EIconChoicePos ePos, - const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 ) + const SfxItemSet *pItemSet ) : ModalDialog ( pParent, rResId ), meChoicePos ( ePos ), maIconCtrl ( this, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | - /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP ), + WB_NODRAGSELECTION | WB_TABSTOP ), mnCurrentPageId ( USHRT_MAX ), aOKBtn ( this, WB_DEFBUTTON ), @@ -292,10 +292,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, bModified ( FALSE ), bItemsReset ( FALSE ) { - // IconChoiceCtrl-Settings - //maIconCtrl.SetBackground ( Wallpaper( Color (146, 146, 186) ) ); - maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); + maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); SetCtrlPos ( meChoicePos ); maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) ); maIconCtrl.Show(); @@ -327,26 +325,6 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // ----------------------------------------------------------------------- -/* -IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, - const SfxItemSet * = 0, BOOL bEditFmt = FALSE, - const String *pUserButtonText = 0 ) -: meChoicePos ( PosLeft ), // Default erst ma Links - maIconCtrl ( this, Die_Winbits ), - aOKBtn ( this ), - pUserBtn ( pUserButtonText? new PushButton(this): 0 ), - aCancelBtn ( this ), - aHelpBtn ( this ), - aResetBtn ( this ), - aBaseFmtBtn ( this ), - mnCurrentPageId ( 0 ) -{ - FreeResource(); -} -*/ - -// ----------------------------------------------------------------------- - IconChoiceDialog ::~IconChoiceDialog () { ULONG i; @@ -381,18 +359,6 @@ IconChoiceDialog ::~IconChoiceDialog () delete pData; } - // remove Pagelist -/* for ( i=0; i<maPageList.Count(); i++ ) - { - IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); - - if ( pData->bOnDemand ) - delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); - - delete pData->pPage; - delete pData; - }*/ - // remove Userdata from Icons for ( i=0; i<maIconCtrl.GetEntryCount(); i++) { @@ -1250,7 +1216,7 @@ void IconChoiceDialog::Start_Impl() USHORT nActPage; if ( mnCurrentPageId == 0 || mnCurrentPageId == USHRT_MAX ) - nActPage = maPageList.GetObject(0)->nId;//First()->nId; + nActPage = maPageList.GetObject(0)->nId; else nActPage = mnCurrentPageId; diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 26f08b73e2f0..f6ab7c4183e5 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -126,7 +126,6 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml Automatic().SetClickHdl( LINK( this, SvBaseLinksDlg, AutomaticClickHdl ) ); Manual().SetClickHdl( LINK( this, SvBaseLinksDlg, ManualClickHdl ) ); UpdateNow().SetClickHdl( LINK( this, SvBaseLinksDlg, UpdateNowClickHdl ) ); -// OpenSource().SetClickHdl( LINK( this, SvBaseLinksDlg, OpenSourceClickHdl ) ); ChangeSource().SetClickHdl( LINK( this, SvBaseLinksDlg, ChangeSourceClickHdl ) ); if(!bHtmlMode) BreakLink().SetClickHdl( LINK( this, SvBaseLinksDlg, BreakLinkClickHdl ) ); @@ -337,15 +336,6 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) return 0; } -/* -IMPL_LINK_INLINE_START( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton ) -{ - DBG_ASSERT( !this, "Open noch nicht impl." ); - return 0; -} -IMPL_LINK_INLINE_END( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton ) -*/ - IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) { (void)pPushButton; @@ -485,7 +475,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) Automatic().Disable(); Manual().Disable(); UpdateNow().Disable(); -// OpenSource().Disable(); ChangeSource().Disable(); BreakLink().Disable(); @@ -502,8 +491,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) { (void)pTimer; -// for( SvLBoxEntry* pBox = Links().First(); pBox; -// pBox = Links().Next( pBox )) Links().SetUpdateMode(FALSE); for( ULONG nPos = Links().GetEntryCount(); nPos; ) @@ -529,7 +516,6 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) if( _pLink && _pLink->WasLastEditOK() ) { - // JP 09.01.98: // StarImpress/Draw tauschen die LinkObjecte selbst aus! // also suche den Link im Manager, wenn der nicht mehr existiert, // dann setze fuelle die Liste komplett neu. Ansonsten braucht diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index 987867492e13..a43ab32bbbf6 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -125,26 +125,3 @@ String RID_SVXSTR_MULTIFILE_DBL_ERR { Text [ en-US ] = "The file %1 already exists." ; }; - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index 4bbbd564edd1..6d9bf1998810 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -99,37 +99,3 @@ ModalDialog RID_SVX_NEWTABLE_DLG TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index f218fdd2557a..f10ac3586baf 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -69,8 +69,6 @@ public: PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) : Edit( pParent, rResId ) { -// currently the spec does not want to display this text anymore... -// m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) ); } @@ -83,16 +81,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect ) { if (GetText().Len() == 0) { - Push( /*PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR |*/ PUSH_TEXTCOLOR ); -/* - Color aFillColor( GetParent()->GetBackground().GetColor() ); - SetLineColor(); // don't draw a border when painting the Edit field rectangle with the new background color - SetFillColor( aFillColor ); - SetTextFillColor( aFillColor ); - SetTextColor( GetParent()->GetTextColor() ); // use plain text color even if the Edit field is disabled (it is hard to read the text otherwise) - - DrawRect( Rectangle( Point(), GetOutputSizePixel() ) ); -*/ + Push( PUSH_TEXTCOLOR ); SetTextColor( Color( COL_GRAY ) ); DrawText( Point(), m_aDefaultTxt ); @@ -114,7 +103,6 @@ struct PasswordToOpenModifyDialog_Impl Edit m_aPasswdToOpenED; FixedText m_aReenterPasswdToOpenFT; PasswordReenterEdit_Impl m_aReenterPasswdToOpenED; -// FixedImage m_aPasswdToOpenMatchFI; FixedText m_aPasswdNoteFT; FixedLine m_aButtonsFL; MoreButton m_aMoreFewerOptionsBTN; @@ -126,7 +114,6 @@ struct PasswordToOpenModifyDialog_Impl Edit m_aPasswdToModifyED; FixedText m_aReenterPasswdToModifyFT; PasswordReenterEdit_Impl m_aReenterPasswdToModifyED; -// FixedImage m_aPasswdToModifyMatchFI; String m_aOneMismatch; String m_aTwoMismatch; @@ -136,7 +123,6 @@ struct PasswordToOpenModifyDialog_Impl bool m_bIsPasswordToModify; -// DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( OkBtnClickHdl, OKButton * ); PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, @@ -156,7 +142,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToOpenED ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ), m_aReenterPasswdToOpenED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ), -// m_aPasswdToOpenMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ), m_aPasswdNoteFT ( pParent, CUI_RES( FT_PASSWD_NOTE ) ), m_aButtonsFL ( pParent, CUI_RES( FL_BUTTONS ) ), m_aMoreFewerOptionsBTN ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ), @@ -168,35 +153,17 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToModifyED ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyFT ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ), m_aReenterPasswdToModifyED ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ), -// m_aPasswdToModifyMatchFI ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) ) m_aOneMismatch( CUI_RES( STR_ONE_PASSWORD_MISMATCH ) ), m_aTwoMismatch( CUI_RES( STR_TWO_PASSWORDS_MISMATCH ) ), m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ), m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ), m_bIsPasswordToModify( bIsPasswordToModify ) { -/* - const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode(); - const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) ); - m_aPasswdToOpenMatchFI.SetImage( aImage ); - m_aPasswdToModifyMatchFI.SetImage( aImage ); -*/ - m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) ); m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) ); -#if 0 - Link aModifyLink = LINK( this, PasswordToOpenModifyDialog_Impl, ModifyHdl ); - m_aPasswdToOpenED.SetModifyHdl( aModifyLink ); - m_aReenterPasswdToOpenED.SetModifyHdl( aModifyLink ); - m_aPasswdToModifyED.SetModifyHdl( aModifyLink ); - m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink ); -#endif - m_aOk.SetClickHdl( LINK( this, PasswordToOpenModifyDialog_Impl, OkBtnClickHdl ) ); -// m_aOk.Enable( FALSE ); - if (nMaxPasswdLen) { m_aPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen ); @@ -209,8 +176,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_aPasswdToOpenED.GrabFocus(); -// ModifyHdl( NULL ); - m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify ); if (!bIsPasswordToModify) m_aMoreFewerOptionsBTN.Hide( TRUE ); @@ -221,32 +186,6 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl() { } -#if 0 -IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*/ ) -{ - // force repaints to get the m_aDefaultTxt displayed again - if (m_aReenterPasswdToOpenED.GetText().Len() == 0) - m_aReenterPasswdToOpenED.Invalidate(); - if (m_aReenterPasswdToModifyED.GetText().Len() == 0) - m_aReenterPasswdToModifyED.Invalidate(); - - const sal_Int32 nPasswdToOpenLen = m_aPasswdToOpenED.GetText().Len(); - const sal_Int32 nPasswdToModifyLen = m_aPasswdToModifyED.GetText().Len(); - - const bool bBothEmpty = nPasswdToOpenLen == 0 && nPasswdToModifyLen == 0; - const bool bToOpenMatch = m_aPasswdToOpenED.GetText() == m_aReenterPasswdToOpenED.GetText(); - const bool bToModifyMatch = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText(); - - m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty ); - -// m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty ); -// m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty ); - - return 0; -} -#endif - - IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ ) { bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() && diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index 522e4edf1da2..edeae469a3c5 100755 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -58,4 +58,3 @@ #define STR_INVALID_STATE_FOR_OK_BUTTON_V2 57 #endif - diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src index edb84813d387..129874b92c45 100755 --- a/cui/source/dialogs/passwdomdlg.src +++ b/cui/source/dialogs/passwdomdlg.src @@ -81,13 +81,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Border = TRUE ; PassWord = TRUE ; }; -/* - FixedImage FI_PASSWD_TO_OPEN_MATCH - { - Pos = MAP_APPFONT ( 150, 42 ) ; - Size = MAP_APPFONT ( 12 , 12 ) ; - }; -*/ + FixedText FT_PASSWD_NOTE { Pos = MAP_APPFONT( 6, 80 ); @@ -176,13 +170,6 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY Border = TRUE ; PassWord = TRUE ; }; -/* - FixedImage FI_PASSWD_TO_MODIFY_MATCH - { - Pos = MAP_APPFONT ( 150, 224 ) ; - Size = MAP_APPFONT ( 12 , 12 ) ; - }; -*/ String STR_PASSWD_MUST_BE_CONFIRMED { @@ -213,16 +200,4 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY { Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; }; -/* - Image IMG_PASSWD_MATCH - { - ImageBitmap = Bitmap { File = "apply.png"; }; - }; - - Image IMG_PASSWD_MATCH_HC - { - ImageBitmap = Bitmap { File = "apply_h.png"; }; - }; -*/ }; - diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 90b3c1a8211e..c9c55f65be84 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -164,53 +164,6 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, String* pName = (String*) aSupplementTable.Get( nFormat ); String aName; -#ifdef WNT -/* - if( !pName && - ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) ) - { - BOOL IsClipboardObject_Impl( SotDataObject * ); - if( IsClipboardObject_Impl( pDataObj ) ) - { - IDataObject * pDO = NULL; - OleGetClipboard( &pDO ); - if( pDO ) - { - FORMATETC fe; - STGMEDIUM stm; - (fe).cfFormat=RegisterClipboardFormat( "Object Descriptor" ); - (fe).dwAspect=DVASPECT_CONTENT; - (fe).ptd=NULL; - (fe).tymed=TYMED_HGLOBAL; - (fe).lindex=-1; - - if (SUCCEEDED(pDO->GetData(&fe, &stm))) - { - LPOBJECTDESCRIPTOR pOD=(LPOBJECTDESCRIPTOR)GlobalLock(stm.hGlobal); - if( pOD->dwFullUserTypeName ) - { - OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwFullUserTypeName); - aName.Append( pN ); - pName = &aName; - // set format to ole object - nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE; - } - if( pOD->dwSrcOfCopy ) - { - OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwSrcOfCopy); - aSourceName.Append( *pN++ ); - } - else - aSourceName = String( ResId( STR_UNKNOWN_SOURCE, SOAPP->GetResMgr() ) ); - GlobalUnlock(stm.hGlobal); - ReleaseStgMedium(&stm); - } - } - } - } -*/ -#endif - // if there is an "Embed Source" or and "Embedded Object" on the // Clipboard we read the Description and the Source of this object // from an accompanied "Object Descriptor" format on the clipboard diff --git a/cui/source/dialogs/postdlg.hrc b/cui/source/dialogs/postdlg.hrc index c0df97b971e2..364ab737dc6a 100644 --- a/cui/source/dialogs/postdlg.hrc +++ b/cui/source/dialogs/postdlg.hrc @@ -48,4 +48,3 @@ #endif - diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 904319d45355..c8262ab5f7a1 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -122,7 +122,6 @@ ModalDialog RID_SVXDLG_POSTIT String STR_NOTIZ_INSERT { /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */ Text [ en-US ] = "Insert note" ; }; }; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 9d44e12f55f1..2b05f258a6f0 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -267,7 +267,6 @@ void SFTreeListBox::Init( const ::rtl::OUString& language ) Reference< browse::XBrowseNode > langEntries = getLangNodeFromRootNode( children[ n ], lang ); - /*SvLBoxEntry* pBasicManagerRootEntry =*/ insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT, 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL ); } @@ -467,18 +466,6 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) void __EXPORT SFTreeListBox::ExpandedHdl() { -/* SvLBoxEntry* pEntry = GetHdlEntry(); - DBG_ASSERT( pEntry, "Was wurde zugeklappt?" ); - - if ( !IsExpanded( pEntry ) && pEntry->HasChildsOnDemand() ) - { - SvLBoxEntry* pChild = FirstChild( pEntry ); - while ( pChild ) - { - GetModel()->Remove( pChild ); // Ruft auch den DTOR - pChild = FirstChild( pEntry ); - } - }*/ } // ---------------------------------------------------------------------------- @@ -1166,21 +1153,6 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry ) { ::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName(); bValid = TRUE; - /* - for( sal_Int32 index = 0; index < childNodes.getLength(); index++ ) - { - if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) ) - { - bValid = FALSE; - String aError( m_createErrStr ); - aError.Append( m_createDupStr ); - ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError ); - aErrorBox.SetText( m_createErrTitleStr ); - aErrorBox.Execute(); - xNewDlg->SetObjectName( aNewName ); - break; - } - } */ if( bValid ) aNewName = aUserSuppliedName; } diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 9686e04b57aa..44ae64458d1f 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -54,14 +54,6 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* p AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); AddTabPage( RID_SVXPAGE_BORDER ); AddTabPage( RID_SVXPAGE_AREA ); - -/* - SvtCJKOptions aCJKOptions; - if( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage( RID_SVXPAGE_PARA_ASIAN); - else - RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); -*/ } SvxFormatCellsDialog::~SvxFormatCellsDialog() @@ -80,13 +72,7 @@ void SvxFormatCellsDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA ); ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 ); ( (SvxAreaTabPage&) rPage ).SetPos( 0 ); -// ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP ); -// ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState ); -// ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState ); -// ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState ); -// ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState ); ( (SvxAreaTabPage&) rPage ).Construct(); - // ActivatePage() wird das erste mal nicht gerufen ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs ); break; diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index c3ece3326544..223028d45b40 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -108,34 +108,3 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG }; Text [ x-comment ] = " "; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src index 465591e8f0a0..a66622a2091a 100644 --- a/cui/source/dialogs/showcols.src +++ b/cui/source/dialogs/showcols.src @@ -70,33 +70,3 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS }; Text [ en-US ] = "Show columns"; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index 5326ca2d0e4d..b8f623f8bfe4 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -128,5 +128,3 @@ ModalDialog RID_SVX_SPLITCELLDLG Text [ en-US ] = "Direction" ; }; }; - - diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc index 5df6d9bd4767..995f0097586e 100644 --- a/cui/source/dialogs/srchxtra.hrc +++ b/cui/source/dialogs/srchxtra.hrc @@ -44,8 +44,4 @@ #define NF_LONGER 21 #define FL_SIMILARITY 22 - - - #endif - diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src index 74a8eae82274..dc3469a468a5 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/cui/source/dialogs/svuidlg.src @@ -76,15 +76,6 @@ ModalDialog MD_PASTE_OBJECT Size = MAP_APPFONT ( 64 , 10 ) ; Text [ en-US ] = "~As icon" ; }; - /* - FixedIcon FI_DISPLAY - { - Border = TRUE ; - Hide = TRUE ; - Pos = MAP_APPFONT ( 167 , 75 ) ; - Size = MAP_APPFONT ( 30 , 30 ) ; - }; -*/ PushButton PB_CHANGE_ICON { Hide = TRUE ; diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index d62d0d98d63e..a61d394d23bc 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -59,7 +59,6 @@ #include <comphelper/processfactory.hxx> #include <osl/file.hxx> - #include <stack> #include <algorithm> @@ -70,11 +69,8 @@ using namespace ::com::sun::star; using ::rtl::OUString; - #define A2S(x) String::CreateFromAscii( x ) - - // GetReplaceEditString ------------------------------- static void GetReplaceEditString( String &rText ) @@ -117,18 +113,15 @@ LookUpComboBox_Impl::LookUpComboBox_Impl( EnableAutocomplete( FALSE ); } - LookUpComboBox_Impl::~LookUpComboBox_Impl() { } - void LookUpComboBox_Impl::Modify() { m_aModifyTimer.Start(); } - IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) { m_rDialogImpl.LookUp( GetText() ); @@ -136,7 +129,6 @@ IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) return 0; } - // class ReplaceEdit_Impl -------------------------------------------------- ReplaceEdit_Impl::ReplaceEdit_Impl( @@ -145,12 +137,10 @@ ReplaceEdit_Impl::ReplaceEdit_Impl( { } - ReplaceEdit_Impl::~ReplaceEdit_Impl() { } - void ReplaceEdit_Impl::Modify() { if (m_pBtn) @@ -163,20 +153,18 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr ) Modify(); } - void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSelection ) { Edit::SetText( rStr, rNewSelection ); Modify(); } - // class ThesaurusAlternativesCtrl_Impl ---------------------------------- AlternativesString_Impl::AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : - // + SvLBoxString( pEntry, nFlags, rStr ), m_rControlImpl( rControl ) { @@ -203,7 +191,6 @@ void AlternativesString_Impl::Paint( rDev.SetFont( aOldFont ); } - ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( Window* pParent, SvxThesaurusDialog_Impl &rImpl ) : @@ -214,20 +201,17 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( SetHighlightRange(); } - ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl() { ClearExtraData(); } - void ThesaurusAlternativesCtrl_Impl::ClearExtraData() { UserDataMap_t aEmpty; m_aUserData.swap( aEmpty ); } - void ThesaurusAlternativesCtrl_Impl::SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ) @@ -242,7 +226,6 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData( m_aUserData[ pEntry ] = rData; } - AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( const SvLBoxEntry *pEntry ) { @@ -253,7 +236,6 @@ AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( return pRes; } - SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ) { SvLBoxEntry* pEntry = new SvLBoxEntry; @@ -277,7 +259,6 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St return pEntry; } - void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) { const KeyCode& rKey = rKEvt.GetKeyCode(); @@ -290,32 +271,23 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) SvxCheckListBox::KeyInput( rKEvt ); } - void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect ) { if (!m_rDialogImpl.m_bWordFound) { -/* Push( PUSH_FONT ); - - Font aFont( GetFont() ); - aFont.SetHeight( 2 * aFont.GetHeight() ); - SetFont( aFont ); -*/ Size aTextSize( GetTextWidth( m_rDialogImpl.aErrStr ), GetTextHeight() ); aTextSize = LogicToPixel( aTextSize ); Point aPos; aPos.X() += GetSizePixel().Width() / 2 - aTextSize.Width() / 2; - aPos.Y() += GetSizePixel().Height() / 2 /*- aTextSize.Height() / 2*/; + aPos.Y() += GetSizePixel().Height() / 2; aPos = PixelToLogic( aPos ); DrawText( aPos, m_rDialogImpl.aErrStr ); -// Pop(); } else SvxCheckListBox::Paint( rRect ); } - // struct SvxThesaurusDialog_Impl ---------------------------------------- SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) : @@ -354,13 +326,11 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, VendorImageInitHdl ) ); } - SvxThesaurusDialog_Impl::~SvxThesaurusDialog_Impl() { delete aLangMBtn.GetPopupMenu(); } - uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDialog_Impl::queryMeanings_Impl( OUString& rTerm, const lang::Locale& rLocale, @@ -388,7 +358,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDi return aMeanings; } - bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() { lang::Locale aLocale( SvxCreateLocale( nLookUpLanguage ) ); @@ -422,7 +391,6 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() return nMeanings > 0; } - void SvxThesaurusDialog_Impl::LookUp( const String &rText ) { if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same @@ -430,7 +398,6 @@ void SvxThesaurusDialog_Impl::LookUp( const String &rText ) LookUp_Impl(); } - IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) { if (pBtn && aLookUpHistory.size() >= 2) @@ -443,7 +410,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn ) return 0; } - IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) { PopupMenu *pMenu = aLangMBtn.GetPopupMenu(); @@ -462,7 +428,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn ) return 0; } - void SvxThesaurusDialog_Impl::LookUp_Impl() { String aText( aWordCB.GetText() ); @@ -482,7 +447,6 @@ void SvxThesaurusDialog_Impl::LookUp_Impl() aLeftBtn.Enable( aLookUpHistory.size() > 1 ); } - IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) { if (pBox && !aWordCB.IsTravelSelect()) // act only upon return key and not when traveling with cursor keys @@ -497,7 +461,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox ) return 0; } - IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox ) { SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; @@ -515,7 +478,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox return 0; } - IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) { SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; @@ -540,7 +502,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis return 0; } - IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { (void) pThis; @@ -567,7 +528,6 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) return aRes; } - static String lcl_GetThesImplName( const lang::Locale &rLocale ) { String aRes; @@ -600,7 +560,6 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale ) return aRes; } - void SvxThesaurusDialog_Impl::UpdateVendorImage() { m_pDialog->SetUpdateMode( sal_False ); @@ -623,7 +582,6 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage() m_pDialog->SetUpdateMode( sal_True ); } - IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG ) { pThis->m_pDialog->SetUpdateMode( sal_False ); @@ -683,7 +641,6 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo return 0; }; - // class SvxThesaurusDialog ---------------------------------------------- SvxThesaurusDialog::SvxThesaurusDialog( @@ -744,12 +701,10 @@ SvxThesaurusDialog::SvxThesaurusDialog( Enable( sal_False ); } - SvxThesaurusDialog::~SvxThesaurusDialog() { } - void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) { // Sprache anpassen @@ -761,22 +716,18 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) SetText( aStr ); // set window title } - String SvxThesaurusDialog::GetWord() { return m_pImpl->aReplaceEdit.GetText(); } - sal_uInt16 SvxThesaurusDialog::GetLanguage() const { return m_pImpl->nLookUpLanguage; } - void SvxThesaurusDialog::Apply() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc index 994c933246de..ad5cc4af8cc5 100755 --- a/cui/source/dialogs/thesdlg.hrc +++ b/cui/source/dialogs/thesdlg.hrc @@ -47,6 +47,4 @@ #define STR_ERR_TEXTNOTFOUND 101 - #endif - diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp index c7f0e0af1d61..242607952c99 100644 --- a/cui/source/dialogs/winpluginlib.cpp +++ b/cui/source/dialogs/winpluginlib.cpp @@ -37,7 +37,6 @@ #include <Shlwapi.h> #include <stdio.h> - #define SO_PATH_SIZE 4096 #define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll" extern "C" { @@ -81,8 +80,7 @@ int lc_isInstalled(const char* realFilePath) sprintf(sSoPath,"%s", realFilePath); ret = 0; } - //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); - //ret = GetEnvironmentVariable("prog", sSoPath, SO_PATH_SIZE); + // GetCurrentDirectory return the char number of the string if(ret == 0){ DWORD dType = REG_SZ; @@ -156,7 +154,6 @@ int lc_installPlugin(const char* realFilePath) char sSoPath[SO_PATH_SIZE]; DWORD sState; - LONG ret; ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE", 0, KEY_READ|KEY_WRITE, &hKeySoftware); if(ret != ERROR_SUCCESS){ @@ -196,7 +193,6 @@ int lc_installPlugin(const char* realFilePath) RegFlushKey(hStarOffice); RegFlushKey(hMozillaPlugins); - if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE)) ret = -1; else{ @@ -204,7 +200,6 @@ int lc_installPlugin(const char* realFilePath) ret = 0; } - //ret = GetCurrentDirectory( SO_PATH_SIZE, sSoPath); // GetCurrentDirectory return the char number of the string if(ret == 0){ ret = RegSetValueEx( hStarOffice, "Path", 0, REG_SZ, (LPBYTE) sSoPath, strlen(sSoPath) + 1); diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc index 49412ad085f0..32c1cc2dc97a 100644 --- a/cui/source/dialogs/zoom.hrc +++ b/cui/source/dialogs/zoom.hrc @@ -50,4 +50,3 @@ #define BTN_ZOOM_HELP 30 #endif - diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 8137b1c7bb89..67ca4ad3b957 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -154,4 +154,3 @@ ModalDialog RID_SVXDLG_ZOOM }; // ********************************************************************** EOF - |