diff options
author | Prashant Shah <pshah.mumbai@gmail.com> | 2010-10-12 17:05:15 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-12 17:05:15 +0100 |
commit | b641d4f7431febb8d9b684bc7c3547b39374305a (patch) | |
tree | 8f543fa3c1c2d5866d2fd06454a0b4523a4028c0 /sw | |
parent | bdd8fe45f6e9d9eb582182de05473fa28ccea0c1 (diff) |
remove more bogus comments
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 39 | ||||
-rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 31 | ||||
-rw-r--r-- | sw/source/ui/misc/glosdoc.cxx | 56 | ||||
-rw-r--r-- | sw/source/ui/misc/glossary.cxx | 98 | ||||
-rw-r--r-- | sw/source/ui/misc/glshell.cxx | 62 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 36 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 59 | ||||
-rw-r--r-- | sw/source/ui/misc/numberingtypelistbox.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/misc/outline.cxx | 133 | ||||
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 21 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 34 | ||||
-rw-r--r-- | sw/source/ui/misc/redlndlg.cxx | 134 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 14 | ||||
-rw-r--r-- | sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 17 |
14 files changed, 40 insertions, 708 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index feae6a64398a..010af9243345 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -47,10 +47,8 @@ #include "bookmark.hrc" #include "misc.hrc" - const String BookmarkCombo::aForbiddenChars = String::CreateFromAscii("/\\@:*?\";,.#"); - IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) { BOOL bSelEntries = pBox->GetSelectEntryCount() != 0; @@ -88,7 +86,6 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) /*------------------------------------------------------------------------ Beschreibung: Callback zum Loeschen einer Textmarke -----------------------------------------------------------------------*/ - IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG ) { // Textmarken aus der ComboBox entfernen @@ -109,8 +106,6 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG ) an die akt. Position ein. Geloeschte Textmarken werden auch am Modell entfernt. -----------------------------------------------------------------------*/ - - void SwInsertBookmarkDlg::Apply() { //at first remove deleted bookmarks to prevent multiple bookmarks with the same @@ -147,8 +142,6 @@ void SwInsertBookmarkDlg::Apply() /*------------------------------------------------------------------------ Beschreibung: CTOR -----------------------------------------------------------------------*/ - - SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) : SvxStandardDialog(pParent,SW_RES(DLG_INSERT_BOOKMARK)), @@ -181,45 +174,25 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRe sRemoveWarning = String(SW_RES(STR_REMOVE_WARNING)); } -/*------------------------------------------------------------------------ - Beschreibung: - -----------------------------------------------------------------------*/ - SwInsertBookmarkDlg::~SwInsertBookmarkDlg() { } -/*------------------------------------------------------------------------ - Beschreibung: - -----------------------------------------------------------------------*/ - BookmarkCombo::BookmarkCombo( Window* pWin, const ResId& rResId ) : SwComboBox(pWin, rResId) { } -/*------------------------------------------------------------------------ - Beschreibung: - -----------------------------------------------------------------------*/ - USHORT BookmarkCombo::GetFirstSelEntryPos() const { return GetSelEntryPos(0); } -/*------------------------------------------------------------------------ - Beschreibung: - -----------------------------------------------------------------------*/ - USHORT BookmarkCombo::GetNextSelEntryPos(USHORT nPos) const { return GetSelEntryPos(nPos + 1); } -/*------------------------------------------------------------------------ - Beschreibung: - -----------------------------------------------------------------------*/ - USHORT BookmarkCombo::GetSelEntryPos(USHORT nPos) const { sal_Unicode cSep = GetMultiSelectionSeparator(); @@ -238,10 +211,6 @@ USHORT BookmarkCombo::GetSelEntryPos(USHORT nPos) const return COMBOBOX_ENTRY_NOTFOUND; } -/*------------------------------------------------------------------------ - Beschreibung: - -----------------------------------------------------------------------*/ - USHORT BookmarkCombo::GetSelectEntryCount() const { USHORT nCnt = 0; @@ -259,7 +228,6 @@ USHORT BookmarkCombo::GetSelectEntryCount() const /*------------------------------------------------------------------------ Beschreibung: Position in der Listbox (der ComboBox) -----------------------------------------------------------------------*/ - USHORT BookmarkCombo::GetSelectEntryPos( USHORT nSelIndex ) const { USHORT nCnt = 0; @@ -282,9 +250,7 @@ USHORT BookmarkCombo::GetSelectEntryPos( USHORT nSelIndex ) const return COMBOBOX_ENTRY_NOTFOUND; } -/* -----------------05.02.99 08:39------------------- - * - * --------------------------------------------------*/ + long BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) { long nHandled = 0; @@ -299,6 +265,3 @@ long BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) nHandled = SwComboBox::PreNotify( rNEvt ); return nHandled; } - - - diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index b94dc23e7e5a..a61f3a5d689e 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -61,9 +61,6 @@ #define RENAME_TOKEN_DELIM (sal_Unicode)1 -/*-----------------09.06.97 13:05------------------- - ---------------------------------------------------*/ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, const SvStrings* pPathArr, SwGlossaryHdl *pHdl) : @@ -147,9 +144,6 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, aGroupTLB.GetModel()->Resort(); } -/*-----------------09.06.97 13:05------------------- - ---------------------------------------------------*/ SwGlossaryGroupDlg::~SwGlossaryGroupDlg() { @@ -171,10 +165,6 @@ SwGlossaryGroupDlg::~SwGlossaryGroupDlg() } -/*-----------------09.06.97 13:11------------------- - ---------------------------------------------------*/ - void __EXPORT SwGlossaryGroupDlg::Apply() { if(aNewPB.IsEnabled()) @@ -245,9 +235,7 @@ void __EXPORT SwGlossaryGroupDlg::Apply() } } } -/*-----------------09.06.97 13:12------------------- ---------------------------------------------------*/ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) { aNewPB.Enable(FALSE); @@ -273,9 +261,6 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) return 0; } -/*-----------------09.06.97 13:22------------------- - ---------------------------------------------------*/ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG ) { String sGroup(aNameED.GetText()); @@ -302,9 +287,7 @@ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG ) return 0; } -/*-----------------09.06.97 13:22------------------- ---------------------------------------------------*/ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) { SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); @@ -370,9 +353,6 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) return 0; } -/* -----------------23.11.98 12:26------------------- - * - * --------------------------------------------------*/ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) { SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); @@ -432,9 +412,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG ) aGroupTLB.GetModel()->Resort(); return 0; } -/*-----------------09.06.97 13:42------------------- ---------------------------------------------------*/ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG ) { String sEntry(aNameED.GetText()); @@ -496,10 +474,6 @@ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG ) return 0; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - BOOL SwGlossaryGroupDlg::IsDeleteAllowed(const String &rGroup) { BOOL bDel = (!pGlosHdl->IsReadOnly(&rGroup)); @@ -525,9 +499,6 @@ BOOL SwGlossaryGroupDlg::IsDeleteAllowed(const String &rGroup) return bDel; } -/*-----------------18.07.97 19:06------------------- - ---------------------------------------------------*/ void FEdit::KeyInput( const KeyEvent& rKEvent ) { KeyCode aCode = rKEvent.GetKeyCode(); @@ -537,9 +508,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent ) SVT_SEARCHPATH_DELIMITER != rKEvent.GetCharCode() ) Edit::KeyInput( rKEvent ); } -/* -----------------------------08.02.00 15:07-------------------------------- - ---------------------------------------------------------------------------*/ void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index a21ff5b2c1c3..a3e3f766f334 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -59,11 +59,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - // PUBLIC METHODES ------------------------------------------------------- -/* -----------------------------08.02.00 15:54-------------------------------- - - ---------------------------------------------------------------------------*/ String lcl_CheckFileName( const String& rNewFilePath, const String& rNewGroupName ) { @@ -107,25 +103,24 @@ String lcl_CheckFileName( const String& rNewFilePath, } return sRet; } + /*------------------------------------------------------------------------ Beschreibung: Liefert den Namen der Default-Gruppe ------------------------------------------------------------------------*/ - - String SwGlossaries::GetDefName() { return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "standard" )); } + /*------------------------------------------------------------------------ Beschreibung: Liefert die Anzahl der Textbausteingruppen ------------------------------------------------------------------------*/ - - sal_uInt16 SwGlossaries::GetGroupCnt() { return GetNameList()->Count(); } + /*------------------------------------------------------------------------ Beschreibung: Liefert den Gruppennamen ------------------------------------------------------------------------*/ @@ -161,18 +156,13 @@ sal_Bool SwGlossaries::FindGroupName(String & rGroup) } return sal_False; } -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ String SwGlossaries::GetGroupName(sal_uInt16 nGroupId) { ASSERT(nGroupId < m_pGlosArr->Count(), Textbausteinarray ueberindiziert); return *(*m_pGlosArr)[nGroupId]; } -/* -----------------------------08.02.00 13:04-------------------------------- - ---------------------------------------------------------------------------*/ String SwGlossaries::GetGroupTitle( const String& rGroupName ) { String sRet; @@ -191,7 +181,6 @@ String SwGlossaries::GetGroupTitle( const String& rGroupName ) /*------------------------------------------------------------------------ Beschreibung: Liefert das Textbaustein-Dokument der Gruppe rName ------------------------------------------------------------------------*/ - SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName, sal_Bool bCreate) const { @@ -220,17 +209,15 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName, /*------------------------------------------------------------------------ Beschreibung: Loeschen Textblock ------------------------------------------------------------------------*/ - void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) { delete pBlock; } + /*------------------------------------------------------------------------ Beschreibung: Erzeugt ein neues Dokument mit dem Gruppenname Wird temp. auch als File angelegt, damit die Gruppen auch spaeter (ohne Zugriff) vorhanden sind. ------------------------------------------------------------------------*/ - - sal_Bool SwGlossaries::NewGroupDoc(String& rGroupName, const String& rTitle) { sal_uInt16 nNewPath = (sal_uInt16)rGroupName.GetToken(1, GLOS_DELIM).ToInt32(); @@ -252,9 +239,7 @@ sal_Bool SwGlossaries::NewGroupDoc(String& rGroupName, const String& rTitle) } return sal_False; } -/* -----------------23.11.98 13:13------------------- - * - * --------------------------------------------------*/ + sal_Bool SwGlossaries::RenameGroupDoc( const String& rOldGroup, String& rNewGroup, const String& rNewTitle ) { @@ -318,8 +303,6 @@ sal_Bool SwGlossaries::RenameGroupDoc( /*------------------------------------------------------------------------ Beschreibung: Loescht eine Textbausteingruppe ------------------------------------------------------------------------*/ - - sal_Bool SwGlossaries::DelGroupDoc(const String &rName) { sal_uInt16 nPath = (sal_uInt16)rName.GetToken(1, GLOS_DELIM).ToInt32(); @@ -342,11 +325,10 @@ sal_Bool SwGlossaries::DelGroupDoc(const String &rName) RemoveFileFromList( aName ); return bRemoved; } + /*------------------------------------------------------------------------ Beschreibung: DTOR ------------------------------------------------------------------------*/ - - SwGlossaries::~SwGlossaries() { sal_uInt16 nCount = m_pGlosArr? m_pGlosArr->Count() : 0; @@ -368,11 +350,10 @@ SwGlossaries::~SwGlossaries() InvalidateUNOOjects(); } + /*------------------------------------------------------------------------ Beschreibung: Bausteindokument einlesen ------------------------------------------------------------------------*/ - - SwTextBlocks* SwGlossaries::GetGlosDoc( const String &rName, sal_Bool bCreate ) const { sal_uInt16 nPath = (sal_uInt16)rName.GetToken(1, GLOS_DELIM).ToInt32(); @@ -410,7 +391,6 @@ SwTextBlocks* SwGlossaries::GetGlosDoc( const String &rName, sal_Bool bCreate ) /*------------------------------------------------------------------------ Beschreibung: Zugriff auf die Liste der Name; diese wird gfs. eingelesen ------------------------------------------------------------------------*/ - SvStrings* SwGlossaries::GetNameList() { if( !m_pGlosArr ) @@ -451,8 +431,6 @@ SvStrings* SwGlossaries::GetNameList() /*------------------------------------------------------------------------ Beschreibung: CTOR ------------------------------------------------------------------------*/ - - SwGlossaries::SwGlossaries() : m_pPathArr(0), m_pGlosArr(0) @@ -544,27 +522,18 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull) } } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - - void SwGlossaries::ShowError() { sal_uInt32 nPathError = *new StringErrorInfo(ERR_AUTOPATH_ERROR, m_sErrPath, ERRCODE_BUTTON_OK ); ErrorHandler::HandleError( nPathError ); } -/* -----------------------------09.02.00 11:37-------------------------------- - ---------------------------------------------------------------------------*/ String SwGlossaries::GetExtension() { return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( ".bau" )); } - - void SwGlossaries::RemoveFileFromList( const String& rGroup ) { if(m_pGlosArr) @@ -626,7 +595,6 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup ) } } - String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName ) { sal_uInt16 nCount = GetGroupCnt(); @@ -646,7 +614,6 @@ String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName ) return aEmptyStr; } - void SwGlossaries::InvalidateUNOOjects() { // invalidate all the AutoTextGroup-objects @@ -681,9 +648,6 @@ void SwGlossaries::InvalidateUNOOjects() m_aGlossaryEntries.swap( aTmpe ); } -//----------------------------------------------------------------------- -//--- 03.03.2003 14:15:32 ----------------------------------------------- - Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::OUString& _rGroupName, bool _bCreate ) { // first, find the name with path-extension @@ -738,9 +702,6 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::O return xGroup; } -//----------------------------------------------------------------------- -//--- 03.03.2003 13:46:06 ----------------------------------------------- - Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const ::rtl::OUString& _rGroupName, const ::rtl::OUString& _rEntryName, bool _bCreate ) { @@ -797,6 +758,3 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& return xReturn; } - - - diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 7b16e184839c..e644652289d3 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -119,9 +119,6 @@ String lcl_GetValidShortCut( const String& rName ) return aBuf; } -/* -----------------------------08.02.00 10:28-------------------------------- - - ---------------------------------------------------------------------------*/ struct GroupUserData { String sGroupName; @@ -193,7 +190,6 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, /*------------------------------------------------------------------------ Beschreibung: aktuell eingestellte Gruppe erfragen / setzen ------------------------------------------------------------------------*/ - String SwGlossaryDlg::GetCurrGroup() { if( ::GetCurrGlosGroup() && ::GetCurrGlosGroup()->Len() ) @@ -201,8 +197,6 @@ String SwGlossaryDlg::GetCurrGroup() return SwGlossaries::GetDefName(); } - - void SwGlossaryDlg::SetActGroup(const String &rGrp) { if( !::GetCurrGlosGroup() ) @@ -210,8 +204,6 @@ void SwGlossaryDlg::SetActGroup(const String &rGrp) *(::GetCurrGlosGroup()) = rGrp; } - - SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell) : @@ -293,10 +285,6 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, Init(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwGlossaryDlg::~SwGlossaryDlg() { @@ -308,11 +296,10 @@ SwGlossaryDlg::~SwGlossaryDlg() delete pMenu; delete pExampleFrame; } + /*------------------------------------------------------------------------ Beschreibung: Auswahl neue Gruppe ------------------------------------------------------------------------*/ - - IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) { SvLBoxEntry* pEntry = pBox->FirstSelected(); @@ -355,10 +342,6 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) } return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwGlossaryDlg::Apply() { @@ -376,9 +359,7 @@ void SwGlossaryDlg::Apply() aReq.Done(); } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ + /* inline */ void SwGlossaryDlg::EnableShortName(sal_Bool bOn) { aShortNameLbl.Enable(bOn); @@ -411,11 +392,6 @@ SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) { String aName(aNameED.GetText()); @@ -459,10 +435,6 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) } return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) { @@ -472,10 +444,6 @@ IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) return 0; } IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, EMPTYARG ) -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn ) { @@ -500,10 +468,6 @@ IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn ) pMn->EnableItem( FN_GL_IMPORT, bEnable ); return 1; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) { @@ -687,11 +651,10 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) } return 1; } + /*-------------------------------------------------------------------- Beschreibung: Dialog Verwaltung Bereiche --------------------------------------------------------------------*/ - - IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG ) { SwGlossaries* pGloss = ::GetGlossaries(); @@ -769,8 +732,6 @@ IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG ) /*------------------------------------------------------------------------ Beschreibung: Initialisierung; aus Ctor und nach Bearbeiten Bereiche ------------------------------------------------------------------------*/ - - void SwGlossaryDlg::Init() { aCategoryBox.SetUpdateMode( sal_False ); @@ -859,10 +820,6 @@ void SwGlossaryDlg::Init() aInsertTipCB.Check( pCfg->IsAutoTextTip() ); aInsertTipCB.SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl)); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) { @@ -882,7 +839,6 @@ IMPL_LINK_INLINE_END( SwGlossaryDlg, EditHdl, Button *, EMPTYARG ) /*------------------------------------------------------------------------ Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces ------------------------------------------------------------------------*/ - IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) { String aName(aNewName.GetText()); @@ -897,9 +853,6 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) aOk.Enable(bEnable); return 0; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ IMPL_LINK( SwNewGlosNameDlg, Rename, Button *, EMPTYARG ) { @@ -917,10 +870,6 @@ IMPL_LINK( SwNewGlosNameDlg, Rename, Button *, EMPTYARG ) return 0; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) { SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get(); @@ -945,9 +894,7 @@ SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId) : FreeResource(); SetDragDropMode( SV_DRAGDROP_CTRL_MOVE|SV_DRAGDROP_CTRL_COPY ); } -/* -----------------30.11.98 10:49------------------- - * - * --------------------------------------------------*/ + void SwGlTreeListBox::Clear() { SvLBoxEntry* pEntry = First(); @@ -962,9 +909,6 @@ void SwGlTreeListBox::Clear() SvTreeListBox::Clear(); } -/*-----------------10.06.97 14.52------------------- - ---------------------------------------------------*/ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); @@ -1016,9 +960,7 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) } } } -/* -----------------26.11.98 14:42------------------- - * - * --------------------------------------------------*/ + DragDropMode SwGlTreeListBox::NotifyStartDrag( TransferDataContainer& /*rContainer*/, SvLBoxEntry* pEntry ) @@ -1047,9 +989,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( } return eRet; } -/* -----------------27.11.98 09:35------------------- - * - * --------------------------------------------------*/ + sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry) { // TODO: Readonly - Ueberpruefung fehlt noch! @@ -1059,9 +999,7 @@ sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry) return pDestParent != pSrcParent; } -/* -----------------26.11.98 14:42------------------- - * - * --------------------------------------------------*/ + sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& /*rpNewParent*/, @@ -1107,9 +1045,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, } return sal_False; //sonst wird der Eintrag automatisch vorgenommen } -/* -----------------26.11.98 14:42------------------- - * - * --------------------------------------------------*/ + sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& /*rpNewParent*/, @@ -1157,10 +1093,6 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, return sal_False; //sonst wird der Eintrag automatisch vorgenommen } - -/*-----------------10.06.97 15.18------------------- - ---------------------------------------------------*/ String SwGlossaryDlg::GetCurrGrpName() const { SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); @@ -1177,9 +1109,6 @@ String SwGlossaryDlg::GetCurrGrpName() const return sRet; } -/*-----------------11.06.97 08.17------------------- - ---------------------------------------------------*/ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1204,9 +1133,7 @@ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn ) } return 0; } -/* -----------------28.07.99 13:48------------------- - --------------------------------------------------*/ IMPL_LINK( SwGlossaryDlg, ShowPreviewHdl, CheckBox *, pBox ) { sal_Bool bCreated = sal_False; @@ -1230,9 +1157,7 @@ IMPL_LINK( SwGlossaryDlg, ShowPreviewHdl, CheckBox *, pBox ) return 0; }; -/* -----------------18.11.99 17:09------------------- - --------------------------------------------------*/ IMPL_LINK( SwGlossaryDlg, PreviewLoadedHdl, void *, EMPTYARG ) { BOOL bShow = aShowExampleCB.IsChecked(); @@ -1242,9 +1167,6 @@ IMPL_LINK( SwGlossaryDlg, PreviewLoadedHdl, void *, EMPTYARG ) return 0; } -/* -----------------28.07.99 16:28------------------- - - --------------------------------------------------*/ void SwGlossaryDlg::ShowAutoText(const String& rGroup, const String& rShortName) { if(aExampleWIN.IsVisible()) @@ -1254,9 +1176,7 @@ void SwGlossaryDlg::ShowAutoText(const String& rGroup, const String& rShortName) pExampleFrame->ClearDocument( TRUE ); } } -/* -----------------------------21.12.00 11:33-------------------------------- - ---------------------------------------------------------------------------*/ void SwGlossaryDlg::ResumeShowAutoText() { String sGroup, sShortName; @@ -1293,5 +1213,3 @@ void SwGlossaryDlg::ResumeShowAutoText() } ResetResumeData(); } - - diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index fcabe33964bd..cb819b57e687 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -72,11 +72,9 @@ SFX_IMPL_INTERFACE( SwWebGlosDocShell, SwWebDocShell, SW_RES(0) ) { } - TYPEINIT1( SwGlosDocShell, SwDocShell ); TYPEINIT1( SwWebGlosDocShell, SwWebDocShell ); - void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq ) { if ( rReq.GetSlot() == SID_SAVEDOC ) @@ -96,7 +94,6 @@ void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq ) } } - void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) { if( SFX_ITEM_AVAILABLE >= rSet.GetItemState( SID_SAVEDOC, FALSE )) @@ -108,7 +105,6 @@ void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) } } - BOOL lcl_Save( SwWrtShell& rSh, const String& rGroupName, const String& rShortNm, const String& rLongNm ) { @@ -140,11 +136,6 @@ BOOL lcl_Save( SwWrtShell& rSh, const String& rGroupName, return nRet != USHRT_MAX; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SwGlosDocShell::SwGlosDocShell(sal_Bool bNewShow) : SwDocShell( (bNewShow) ? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL ) @@ -153,40 +144,20 @@ SwGlosDocShell::SwGlosDocShell(sal_Bool bNewShow) SetHelpId(SW_GLOSDOCSHELL); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SwGlosDocShell::~SwGlosDocShell( ) { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - void SwGlosDocShell::Execute( SfxRequest& rReq ) { ::lcl_Execute( *this, rReq ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - void SwGlosDocShell::GetState( SfxItemSet& rSet ) { ::lcl_GetState( *this, rSet ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - BOOL SwGlosDocShell::Save() { // In case of an API object which holds this document, it is possible that the WrtShell is already @@ -203,53 +174,26 @@ BOOL SwGlosDocShell::Save() } } - -/**/ - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SwWebGlosDocShell::SwWebGlosDocShell() : SwWebDocShell( SFX_CREATE_MODE_STANDARD ) { SetHelpId(SW_WEBGLOSDOCSHELL); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SwWebGlosDocShell::~SwWebGlosDocShell( ) { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - void SwWebGlosDocShell::Execute( SfxRequest& rReq ) { ::lcl_Execute( *this, rReq ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwWebGlosDocShell::GetState( SfxItemSet& rSet ) { ::lcl_GetState( *this, rSet ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - BOOL SwWebGlosDocShell::Save() { // same comment as in SwGlosDocShell::Save - see there @@ -262,10 +206,6 @@ BOOL SwWebGlosDocShell::Save() } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SV_IMPL_REF ( SwDocShell ) SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rShortName, BOOL bShow ) @@ -343,5 +283,3 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS } return xDocSh; } - - diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 34c2b87f378b..129c1af3c305 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -52,10 +52,6 @@ #include <IDocumentStylePoolAccess.hxx> -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) : SfxSingleTabDialog(&pVw->GetViewFrame()->GetWindow(), 0, 0), pSh(pVw->GetWrtShellPtr()) @@ -66,18 +62,10 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) : GetOKButton()->SetClickHdl(LINK(this, SwLineNumberingDlg, OKHdl)); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - __EXPORT SwLineNumberingDlg::~SwLineNumberingDlg() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwLineNumberingDlg, OKHdl, Button *, EMPTYARG ) { if (GetOKButton()->IsEnabled()) @@ -92,10 +80,6 @@ IMPL_LINK( SwLineNumberingDlg, OKHdl, Button *, EMPTYARG ) return 0; } -/*----------------------------------------------------------------------- - Beschreibung: - -----------------------------------------------------------------------*/ - SwLineNumberingPage::SwLineNumberingPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_LINENUMBERING), rSet), @@ -131,27 +115,15 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent, ::FillCharStyleListBox(aCharStyleLB, pSh->GetView().GetDocShell()); } -/*----------------------------------------------------------------------- - Beschreibung: - -----------------------------------------------------------------------*/ - __EXPORT SwLineNumberingPage::~SwLineNumberingPage() { } -/*----------------------------------------------------------------------- - Beschreibung: - -----------------------------------------------------------------------*/ - SfxTabPage* __EXPORT SwLineNumberingPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SwLineNumberingPage( pParent, rSet ); } -/*----------------------------------------------------------------------- - Beschreibung: - -----------------------------------------------------------------------*/ - void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& ) { const SwLineNumberInfo &rInf = pSh->GetLineNumberInfo(); @@ -224,7 +196,6 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& ) /*-------------------------------------------------------------------- Beschreibung: Modify --------------------------------------------------------------------*/ - IMPL_LINK( SwLineNumberingPage, ModifyHdl, Edit *, EMPTYARG ) { BOOL bHasValue = aDivisorED.GetText().Len() != 0; @@ -239,7 +210,6 @@ IMPL_LINK( SwLineNumberingPage, ModifyHdl, Edit *, EMPTYARG ) /*-------------------------------------------------------------------- Beschreibung: On/Off --------------------------------------------------------------------*/ - IMPL_LINK( SwLineNumberingPage, LineOnOffHdl, CheckBox *, EMPTYARG ) { BOOL bEnable = aNumberingOnCB.IsChecked(); @@ -270,10 +240,6 @@ IMPL_LINK( SwLineNumberingPage, LineOnOffHdl, CheckBox *, EMPTYARG ) return 0; } -/*----------------------------------------------------------------------- - Beschreibung: - -----------------------------------------------------------------------*/ - BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& ) { SwLineNumberInfo aInf(pSh->GetLineNumberInfo()); @@ -326,5 +292,3 @@ BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& ) return FALSE; } - - diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index fe6d4ee3ede4..57f4eea02e16 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -77,9 +77,6 @@ static BOOL bLastRelative = FALSE; -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, SW_RES( TP_NUM_POSITION ), rSet ), @@ -184,16 +181,12 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, aRelativeCB.Check(bLastRelative); aPreviewWIN.SetPositionMode(); } -/*-----------------03.12.97 10:02------------------- ---------------------------------------------------*/ SwNumPositionTabPage::~SwNumPositionTabPage() { delete pActNum; } -/*-----------------03.12.97 10:06------------------- ---------------------------------------------------*/ void SwNumPositionTabPage::InitControls() { bInInintControl = TRUE; @@ -410,9 +403,6 @@ void SwNumPositionTabPage::InitControls() bInInintControl = FALSE; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) { const SfxPoolItem* pItem; @@ -454,9 +444,6 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) aPreviewWIN.Invalidate(); } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { SwOutlineTabDialog::SetActNumLevel(nActNumLvl); @@ -466,9 +453,6 @@ int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ BOOL SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { if(pOutlineDlg) @@ -482,9 +466,6 @@ BOOL SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; @@ -582,18 +563,12 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() } // <-- -/*-----------------03.12.97 10:02------------------- - ---------------------------------------------------*/ SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwNumPositionTabPage(pParent, rAttrSet); } -/*-----------------04.12.97 12:51------------------- - ---------------------------------------------------*/ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) { pWrtSh = pSh; @@ -644,9 +619,6 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) // <-- } -/*-----------------03.12.97 11:06------------------- - ---------------------------------------------------*/ IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG ) { USHORT nMask = 1; @@ -674,9 +646,7 @@ IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, EMPTYARG ) SetModified(); return 0; } -/*-----------------03.12.97 11:11------------------- ---------------------------------------------------*/ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox ) { USHORT nSaveNumLvl = nActNumLvl; @@ -724,9 +694,7 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox ) InitControls(); return 0; } -/*-----------------03.12.97 12:24------------------- ---------------------------------------------------*/ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld ) { if(bInInintControl) @@ -787,9 +755,6 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld ) return 0; } -/*-----------------04.12.97 12:35------------------- - ---------------------------------------------------*/ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox ) { BOOL bOn = pBox->IsChecked(); @@ -973,9 +938,6 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) } // <-- -/*-----------------05.12.97 15:33------------------- - ---------------------------------------------------*/ IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG ) { USHORT nMask = 1; @@ -1031,12 +993,6 @@ void SwNumPositionTabPage::SetModified(BOOL bRepaint) #endif -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - - SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rSh) : SfxTabDialog(pParent, SW_RES(DLG_SVXTEST_NUM_BULLET), pSwItemSet, FALSE, &aEmptyStr), @@ -1058,18 +1014,11 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, AddTabPage( RID_SVXPAGE_NUM_POSITION ); } -/*-----------------07.02.97 12.08------------------- - ---------------------------------------------------*/ SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog() { } -/*-----------------07.02.97 14.48------------------- - ---------------------------------------------------*/ - void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) { //Namen der Vorlagen und Metric setzen @@ -1134,22 +1083,16 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) break; } } -/*-----------------17.02.97 16.52------------------- ---------------------------------------------------*/ short SwSvxNumBulletTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); pExampleSet->ClearItem(SID_PARAM_NUM_PRESET); return nRet; } -/* -----------------02.12.98 08:35------------------- - * - * --------------------------------------------------*/ + IMPL_LINK(SwSvxNumBulletTabDialog, RemoveNumberingHdl, PushButton*, EMPTYARG) { EndDialog(RET_USER); return 0; } - - diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 90d51b3d7dc0..17dea135298c 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -40,16 +40,11 @@ using namespace com::sun::star; using namespace rtl; -/* -----------------------------01.03.01 16:04-------------------------------- - - ---------------------------------------------------------------------------*/ struct SwNumberingTypeListBox_Impl { uno::Reference<text::XNumberingTypeInfo> xInfo; }; -/* -----------------------------01.03.01 14:46-------------------------------- - ---------------------------------------------------------------------------*/ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, const ResId& rResId, USHORT nTypeFlags ) : ListBox(pWin, rResId), @@ -64,16 +59,12 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, const ResId& rResI pImpl->xInfo = uno::Reference<text::XNumberingTypeInfo>(xDefNum, uno::UNO_QUERY); Reload(nTypeFlags); } -/* -----------------------------01.03.01 14:46-------------------------------- - ---------------------------------------------------------------------------*/ SwNumberingTypeListBox::~SwNumberingTypeListBox() { delete pImpl; } -/* -----------------------------01.03.01 16:02-------------------------------- - ---------------------------------------------------------------------------*/ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) { Clear(); @@ -148,9 +139,7 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) SelectEntryPos(0); } } -/* -----------------------------01.03.01 14:46-------------------------------- - ---------------------------------------------------------------------------*/ sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() { sal_Int16 nRet = 0; @@ -163,13 +152,10 @@ sal_Int16 SwNumberingTypeListBox::GetSelectedNumberingType() #endif return nRet; } -/* -----------------------------01.03.01 14:46-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SwNumberingTypeListBox::SelectNumberingType(sal_Int16 nType) { USHORT nPos = GetEntryPos((void*)(ULONG)nType); SelectEntryPos( nPos ); return LISTBOX_ENTRY_NOTFOUND != nPos; } - diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index d84e1870ad11..b37f63fd25f0 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -74,16 +74,8 @@ using namespace ::com::sun::star; -/* -----------------------------31.01.01 10:23-------------------------------- - - ---------------------------------------------------------------------------*/ - DBG_NAME(outlinehdl) -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ - class SwNumNamesDlg: public ModalDialog { Edit aFormEdit; @@ -108,8 +100,6 @@ public: /*------------------------------------------------------------------------ Beschreibung: selektierten Eintrag merken ------------------------------------------------------------------------*/ - - IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox ) { aFormEdit.SetText(pBox->GetSelectEntry()); @@ -123,8 +113,6 @@ IMPL_LINK_INLINE_END( SwNumNamesDlg, SelectHdl, ListBox *, pBox ) Parameter: Liste der vom Benutzer vergebenen Namen; nicht vom Benutzer benannte Positionen sind 0. ------------------------------------------------------------------------*/ - - void SwNumNamesDlg::SetUserNames(const String *pList[]) { USHORT nSelect = 0; @@ -141,22 +129,20 @@ void SwNumNamesDlg::SetUserNames(const String *pList[]) aFormBox.SelectEntryPos(nSelect); SelectHdl(&aFormBox); } + /*------------------------------------------------------------------------ Beschreibung: OK-Button freischalten, wenn Text im Edit steht. ------------------------------------------------------------------------*/ - - IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) { aOKBtn.Enable(0 != pBox->GetText().Len()); return 0; } IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) + /*------------------------------------------------------------------------ Beschreibung: DoubleClickHdl ------------------------------------------------------------------------*/ - - IMPL_LINK_INLINE_START( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG ) { EndDialog(RET_OK); @@ -164,10 +150,6 @@ IMPL_LINK_INLINE_START( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG ) } IMPL_LINK_INLINE_END( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG ) -/*-------------------------------------------------- - ---------------------------------------------------*/ - SwNumNamesDlg::SwNumNamesDlg(Window *pParent) : ModalDialog(pParent, SW_RES(DLG_NUM_NAMES)), aFormEdit(this, SW_RES(ED_FORM)), @@ -184,16 +166,8 @@ SwNumNamesDlg::SwNumNamesDlg(Window *pParent) SelectHdl(&aFormBox); } -/*-------------------------------------------------- - ---------------------------------------------------*/ - __EXPORT SwNumNamesDlg::~SwNumNamesDlg() {} - -/* -----------------08.07.98 08:46------------------- - * - * --------------------------------------------------*/ USHORT lcl_BitToLevel(USHORT nActLevel) { USHORT nTmp = nActLevel; @@ -203,9 +177,6 @@ USHORT lcl_BitToLevel(USHORT nActLevel) return nTmpLevel; } -/* -----------------07.07.98 14:13------------------- - * - * --------------------------------------------------*/ USHORT SwOutlineTabDialog::nNumLevel = 1; SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, @@ -265,17 +236,11 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, } } -/* -----------------07.07.98 14:13------------------- - * - * --------------------------------------------------*/ SwOutlineTabDialog::~SwOutlineTabDialog() { delete pNumRule; } -/* -----------------07.07.98 14:13------------------- - * - * --------------------------------------------------*/ void SwOutlineTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) { switch ( nPageId ) @@ -289,9 +254,7 @@ void SwOutlineTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage) break; } } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineTabDialog, CancelHdl, Button *, EMPTYARG ) { if (!bModified) @@ -299,9 +262,7 @@ IMPL_LINK( SwOutlineTabDialog, CancelHdl, Button *, EMPTYARG ) EndDialog(RET_CANCEL); return 0; } -/* -----------------08.07.98 12:14------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn ) { //PopupMenu auffuellen @@ -316,9 +277,6 @@ IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn ) return 0; } -/* -----------------08.07.98 12:14------------------- - * - * --------------------------------------------------*/ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) { BYTE nLevelNo = 0; @@ -379,9 +337,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) return 0; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + USHORT SwOutlineTabDialog::GetLevel(const String &rFmtName) const { for(USHORT i = 0; i < MAXLEVEL; ++i) @@ -392,9 +348,7 @@ USHORT SwOutlineTabDialog::GetLevel(const String &rFmtName) const return MAXLEVEL;//NO_NUMBERING; //#outline level,zhaojianwei } -/* -----------------07.07.98 16:30------------------- - * - * --------------------------------------------------*/ + short SwOutlineTabDialog::Ok() { SfxTabDialog::Ok(); @@ -522,9 +476,6 @@ short SwOutlineTabDialog::Ok() return RET_OK; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, SW_RES(TP_OUTLINE_NUM), rSet), aLevelLB( this, SW_RES(LB_LEVEL )), @@ -567,9 +518,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte aCharFmtLB.SetSelectHdl(LINK(this, SwOutlineSettingsTabPage, CharFmtHdl)); } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + void SwOutlineSettingsTabPage::Update() { // falls eine Vorlage fuer diese Ebene bereits selektiert wurde, @@ -683,9 +632,6 @@ void SwOutlineSettingsTabPage::Update() SetModified(); } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ IMPL_LINK( SwOutlineSettingsTabPage, LevelHdl, ListBox *, pBox ) { nActLevel = 0; @@ -706,9 +652,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, LevelHdl, ListBox *, pBox ) Update(); return 0; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, NumericField *, pFld ) { USHORT nMask = 1; @@ -726,9 +670,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, NumericField *, pFld ) SetModified(); return 0; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox ) { BYTE i; @@ -779,9 +721,6 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelectGetFocus, ListBox *, EMPTYARG ) return 0; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBox ) { USHORT nMask = 1; @@ -800,9 +739,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBo SetModified(); return 0; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineSettingsTabPage, DelimModify, Edit *, EMPTYARG ) { USHORT nMask = 1; @@ -820,9 +757,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, DelimModify, Edit *, EMPTYARG ) SetModified(); return 0; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld ) { USHORT nMask = 1; @@ -839,9 +774,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld ) SetModified(); return 0; } -/* -----------------21.09.98 12:21------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG ) { // bAutomaticCharStyles = FALSE; @@ -888,15 +821,11 @@ IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG ) } return RET_OK; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + SwOutlineSettingsTabPage::~SwOutlineSettingsTabPage() { } -/* -----------------07.07.98 16:27------------------- - * - * --------------------------------------------------*/ + void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell) { pSh = pShell; @@ -957,9 +886,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell) pSh->GetView().GetDocShell()); Update(); } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + void SwOutlineSettingsTabPage::ActivatePage(const SfxItemSet& ) { nActLevel = SwOutlineTabDialog::GetActNumLevel(); @@ -969,39 +896,29 @@ void SwOutlineSettingsTabPage::ActivatePage(const SfxItemSet& ) aLevelLB.SelectEntryPos(MAXLEVEL); LevelHdl(&aLevelLB); } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) { SwOutlineTabDialog::SetActNumLevel(nActLevel); return LEAVE_PAGE; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + BOOL SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& ) { return TRUE; } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet ) { ActivatePage(rSet); } -/* -----------------07.07.98 14:19------------------- - * - * --------------------------------------------------*/ + SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwOutlineSettingsTabPage(pParent, rAttrSet); } -/* -----------------07.11.2002 15:13----------------- - * - * --------------------------------------------------*/ + void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) { BOOL bIsNull = aStartEdit.GetValue() == 0; @@ -1012,9 +929,7 @@ void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType if(bIsNull && bNoZeroAllowed) aStartEdit.GetModifyHdl().Call(&aStartEdit); } -/*-----------------09.12.97 11:54------------------- ---------------------------------------------------*/ USHORT lcl_DrawBullet(VirtualDevice* pVDev, const SwNumFmt& rFmt, USHORT nXStart, USHORT nYStart, const Size& rSize) @@ -1032,9 +947,7 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev, pVDev->SetFont(aTmpFont); return nRet; } -/*-----------------09.12.97 11:49------------------- ---------------------------------------------------*/ USHORT lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, USHORT nXStart, USHORT nYStart, USHORT nDivision) { @@ -1056,6 +969,7 @@ USHORT lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, USHORT nXStar return nRet; } + /*-----------------02.12.97 10:34------------------- Vorschau der Numerierung painten --------------------------------------------------*/ @@ -1317,11 +1231,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) } -/*-----------------02.12.97 10:34------------------- - ---------------------------------------------------*/ NumberingPreview::~NumberingPreview() { } - - diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 21d109fa1b81..583dc8570ad5 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -56,10 +56,10 @@ #include <pgfnote.hrc> #define TWIP_TO_LBOX 5 + /*-----------------------------------------------------#--------------- Beschreibung: vordefinierte Linien in Point --------------------------------------------------------------------*/ - static const USHORT __FAR_DATA nLines[] = { 0, 50, @@ -76,13 +76,10 @@ static USHORT __FAR_DATA aPageRg[] = { 0 }; - /*------------------------------------------------------------------------ Beschreibung: liefert zurueck, ob die Linienbreite nWidth bereits in der Listbox enthalten ist. ------------------------------------------------------------------------*/ - - BOOL lcl_HasLineWidth(USHORT nWidth) { for(USHORT i = 0; i < nLineCount; ++i) { @@ -97,8 +94,6 @@ BOOL lcl_HasLineWidth(USHORT nWidth) Arten, wie die Hoehe des Fussnotenbereiches angegeben werden kann. ------------------------------------------------------------------------*/ - - IMPL_LINK_INLINE_START( SwFootNotePage, HeightPage, Button *, EMPTYARG ) { aMaxHeightEdit.Enable(FALSE); @@ -118,8 +113,6 @@ IMPL_LINK_INLINE_END( SwFootNotePage, HeightMetric, Button *, EMPTYARG ) /*------------------------------------------------------------------------ Beschreibung: Handler Grenzwerte ------------------------------------------------------------------------*/ - - IMPL_LINK( SwFootNotePage, HeightModify, MetricField *, EMPTYARG ) { aMaxHeightEdit.SetMax(aMaxHeightEdit.Normalize(lMaxHeight - @@ -180,18 +173,11 @@ SwFootNotePage::~SwFootNotePage() { } - SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwFootNotePage(pParent, rSet); } - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - void SwFootNotePage::Reset(const SfxItemSet &rSet) { // Falls noch kein Bsp vorhanden Init hier sonst im Activate @@ -257,8 +243,6 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) /*-------------------------------------------------------------------- Beschreibung: Attribute in den Set stopfen bei OK --------------------------------------------------------------------*/ - - BOOL SwFootNotePage::FillItemSet(SfxItemSet &rSet) { SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO)); @@ -358,6 +342,3 @@ USHORT* SwFootNotePage::GetRanges() { return aPageRg; } - - - diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 12b3c7e115dc..c1bad3204bcc 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -57,9 +57,7 @@ #include "uiitems.hxx" #include "swmodule.hxx" #include "view.hxx" -/*-- 06.02.2002 15:25:39--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, SW_RES(TP_TEXTGRID_PAGE), rSet), aGridTypeFL (this, SW_RES(FL_GRID_TYPE )), @@ -189,22 +187,16 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : aCharWidthMF.Show(); } } -/*-- 06.02.2002 15:25:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTextGridPage::~SwTextGridPage() { } -/*-- 06.02.2002 15:25:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwTextGridPage(pParent, rSet); } -/*-- 06.02.2002 15:25:40--------------------------------------------------- - -----------------------------------------------------------------------*/ BOOL SwTextGridPage::FillItemSet(SfxItemSet &rSet) { BOOL bRet = FALSE; @@ -235,9 +227,7 @@ BOOL SwTextGridPage::FillItemSet(SfxItemSet &rSet) pView->GetVLineal().DrawTicks(); return bRet; } -/*-- 06.02.2002 15:25:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTextGridPage::Reset(const SfxItemSet &rSet) { if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, TRUE)) @@ -280,9 +270,7 @@ void SwTextGridPage::Reset(const SfxItemSet &rSet) aPrintCB.SaveValue(); aColorLB.SaveValue(); } -/*-- 06.02.2002 15:25:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTextGridPage::ActivatePage( const SfxItemSet& rSet ) { aExampleWN.Hide(); @@ -291,16 +279,12 @@ void SwTextGridPage::ActivatePage( const SfxItemSet& rSet ) aExampleWN.Show(); aExampleWN.Invalidate(); } -/*-- 06.02.2002 15:25:41--------------------------------------------------- - -----------------------------------------------------------------------*/ int SwTextGridPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } -/* -----------------------------08.02.2002 11:57------------------------------ - ---------------------------------------------------------------------------*/ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) { SwTextGridItem aGridItem; @@ -332,9 +316,7 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) pView->GetVLineal().SetLineHeight((long)(aTextSizeMF.GetValue(FUNIT_TWIP)/56.7)); } } -/* -----------------------------08.02.2002 10:54------------------------------ - ---------------------------------------------------------------------------*/ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) { if( SFX_ITEM_UNKNOWN != rSet.GetItemState( RES_FRAMEDIR, TRUE )) @@ -401,9 +383,7 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) } } } -/* -----------------------------30.05.2008 14:12------------------------------ - ---------------------------------------------------------------------------*/ void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ) { String aFieldStr = String::CreateFromAscii("( 1 -"); @@ -411,9 +391,7 @@ void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 n aFieldStr += String::CreateFromAscii(" )"); rField.SetText( aFieldStr ); } -/* -----------------------------06.02.2002 15:24------------------------------ - ---------------------------------------------------------------------------*/ USHORT* SwTextGridPage::GetRanges() { static USHORT __FAR_DATA aPageRg[] = { @@ -421,9 +399,7 @@ USHORT* SwTextGridPage::GetRanges() 0}; return aPageRg; } -/* -----------------------------08.02.2002 10:56------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField) { //if in squared mode @@ -470,8 +446,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField) GridModifyHdl(0); return 0; } -/* -----------------------------04.09.2006 15:46------------------------------ - ---------------------------------------------------------------------------*/ + IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField) { //if in squared mode @@ -514,9 +489,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField) GridModifyHdl(0); return 0; } -/* -----------------------------22.04.2002 14:53------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) { sal_Bool bEnable = &aNoGridRB != pButton; @@ -543,17 +516,13 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) GridModifyHdl(0); return 0; } -/* -----------------------------22.04.2002 15:46------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTextGridPage, DisplayGridHdl, CheckBox*, EMPTYARG) { aPrintCB.Enable(aDisplayCB.IsChecked()); return 0; } -/* -----------------------------08.02.2002 11:54------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTextGridPage, GridModifyHdl, void*, EMPTYARG) { const SfxItemSet& rOldSet = GetItemSet(); @@ -565,4 +534,3 @@ IMPL_LINK(SwTextGridPage, GridModifyHdl, void*, EMPTYARG) aExampleWN.UpdateExample(aSet); return 0; } - diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index fda197539688..5315099607ec 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -77,10 +77,6 @@ #include <IDocumentRedlineAccess.hxx> -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SFX_IMPL_MODELESSDIALOG( SwRedlineAcceptChild, FN_REDLINE_ACCEPT ) SV_IMPL_PTRARR(SwRedlineDataParentArr, SwRedlineDataParentPtr) @@ -91,10 +87,6 @@ SV_IMPL_PTRARR(SvLBoxEntryArr, SvLBoxEntryPtr) static USHORT nSortMode = 0xffff; static BOOL bSortDir = TRUE; -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent, USHORT nId, SfxBindings* pBindings, @@ -109,7 +101,6 @@ SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent, /*-------------------------------------------------------------------- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren --------------------------------------------------------------------*/ - BOOL SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh) { BOOL bRet; @@ -120,10 +111,6 @@ BOOL SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh) return bRet; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( SfxBindings* _pBindings, SwChildWinWrapper* pChild, Window *_pParent) : @@ -135,10 +122,6 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( SfxBindings* _pBindings, FreeResource(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwModelessRedlineAcceptDlg::Activate() { SwView *pView = ::GetActiveView(); @@ -169,10 +152,6 @@ void SwModelessRedlineAcceptDlg::Activate() pImplDlg->Activate(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwModelessRedlineAcceptDlg::Initialize(SfxChildWinInfo *pInfo) { String aStr; @@ -182,39 +161,23 @@ void SwModelessRedlineAcceptDlg::Initialize(SfxChildWinInfo *pInfo) SfxModelessDialog::Initialize(pInfo); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwModelessRedlineAcceptDlg::FillInfo(SfxChildWinInfo& rInfo) const { SfxModelessDialog::FillInfo(rInfo); pImplDlg->FillInfo(rInfo.aExtraString); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - void SwModelessRedlineAcceptDlg::Resize() { pImplDlg->Resize(); SfxModelessDialog::Resize(); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg() { delete pImplDlg; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : pParentDlg (pParent), aTabPagesCTRL (pParent, SW_RES(CTRL_TABPAGES)), @@ -301,18 +264,10 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : aSelectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, GotoHdl)); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SwRedlineAcceptDlg::~SwRedlineAcceptDlg() { } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - void SwRedlineAcceptDlg::Init(USHORT nStart) { SwWait aWait( *::GetActiveView()->GetDocShell(), FALSE ); @@ -339,10 +294,6 @@ void SwRedlineAcceptDlg::Init(USHORT nStart) pTable->MakeVisible( pSelEntry, sal_True ); //#i70937#, force the scroll } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - void SwRedlineAcceptDlg::InitAuthors() { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); @@ -412,10 +363,6 @@ void SwRedlineAcceptDlg::InitAuthors() !bOnlyFormatedRedlines ); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - String SwRedlineAcceptDlg::GetRedlineText( const SwRedline& rRedln, DateTime &rDateTime, USHORT nStack) { @@ -435,10 +382,6 @@ String SwRedlineAcceptDlg::GetRedlineText( const SwRedline& rRedln, return sEntry; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - const String &SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, USHORT nStack) { switch( rRedln.GetType(nStack) ) @@ -454,10 +397,6 @@ const String &SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, USHORT return aEmptyStr; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - void SwRedlineAcceptDlg::Resize() { Size aSz(pParentDlg->GetOutputSizePixel()); @@ -473,7 +412,6 @@ void SwRedlineAcceptDlg::Resize() /*-------------------------------------------------------------------- Beschreibung: Nach Aktivierung neu initialisieren --------------------------------------------------------------------*/ - void SwRedlineAcceptDlg::Activate() { // prevent update if flag is set (#102547#) @@ -579,10 +517,6 @@ void SwRedlineAcceptDlg::Activate() InitAuthors(); } -/* -----------------05.06.98 13:06------------------- - * - * --------------------------------------------------*/ - USHORT SwRedlineAcceptDlg::CalcDiff(USHORT nStart, BOOL bChild) { if (!nStart) @@ -656,10 +590,6 @@ USHORT SwRedlineAcceptDlg::CalcDiff(USHORT nStart, BOOL bChild) return USHRT_MAX; } -/* -----------------05.06.98 13:57------------------- - * - * --------------------------------------------------*/ - void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const USHORT nAutoFmt) { String sChild; @@ -739,10 +669,6 @@ void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedl } } -/* -----------------05.06.98 15:20------------------- - * - * --------------------------------------------------*/ - void SwRedlineAcceptDlg::RemoveParents(USHORT nStart, USHORT nEnd) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); @@ -817,10 +743,6 @@ void SwRedlineAcceptDlg::RemoveParents(USHORT nStart, USHORT nEnd) aRedlineParents.DeleteAndDestroy( nStart, nEnd - nStart + 1); } -/* -----------------05.06.98 15:20------------------- - * - * --------------------------------------------------*/ - void SwRedlineAcceptDlg::InsertParents(USHORT nStart, USHORT nEnd) { SwView *pView = ::GetActiveView(); @@ -884,10 +806,6 @@ void SwRedlineAcceptDlg::InsertParents(USHORT nStart, USHORT nEnd) } } -/* -----------------05.06.98 13:06------------------- - * - * --------------------------------------------------*/ - void SwRedlineAcceptDlg::CallAcceptReject( BOOL bSelect, BOOL bAccept ) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); @@ -985,10 +903,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( BOOL bSelect, BOOL bAccept ) pTPView->EnableUndo(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwRedlineAcceptDlg::GetRedlinePos( const SvLBoxEntry& rEntry ) const { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); @@ -996,50 +910,30 @@ USHORT SwRedlineAcceptDlg::GetRedlinePos( const SvLBoxEntry& rEntry ) const rEntry.GetUserData())->pData)->pData ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, AcceptHdl, void*, EMPTYARG) { CallAcceptReject( TRUE, TRUE ); return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, AcceptAllHdl, void*, EMPTYARG ) { CallAcceptReject( FALSE, TRUE ); return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, RejectHdl, void*, EMPTYARG ) { CallAcceptReject( TRUE, FALSE ); return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, RejectAllHdl, void*, EMPTYARG ) { CallAcceptReject( FALSE, FALSE ); return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, UndoHdl, void*, EMPTYARG ) { SwView * pView = ::GetActiveView(); @@ -1052,10 +946,6 @@ IMPL_LINK( SwRedlineAcceptDlg, UndoHdl, void*, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, FilterChangedHdl, void*, EMPTYARG ) { SvxTPFilter *pFilterTP = aTabPagesCTRL.GetFilterPage(); @@ -1070,10 +960,6 @@ IMPL_LINK( SwRedlineAcceptDlg, FilterChangedHdl, void*, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, DeselectHdl, void*, EMPTYARG ) { // Flackern der Buttons vermeiden: @@ -1082,10 +968,6 @@ IMPL_LINK( SwRedlineAcceptDlg, DeselectHdl, void*, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, SelectHdl, void*, EMPTYARG ) { aDeselectTimer.Stop(); @@ -1094,10 +976,6 @@ IMPL_LINK( SwRedlineAcceptDlg, SelectHdl, void*, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG ) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); @@ -1172,10 +1050,6 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) { const CommandEvent aCEvt(pTable->GetCommandEvent()); @@ -1342,10 +1216,6 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwRedlineAcceptDlg::Initialize(const String& rExtraData) { if (rExtraData.Len()) @@ -1383,10 +1253,6 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwRedlineAcceptDlg::FillInfo(String &rExtraData) const { rExtraData.AppendAscii("AcceptChgDat:("); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 16d62e9d539d..92dd91632dca 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using ::rtl::OUString; - void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) { void* pDel; @@ -98,8 +97,6 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) Beschreibung: Fuer Tabellenselektion sel. Zeilen und Spalten feststellen --------------------------------------------------------------------*/ - - BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY ) { const SwTableNode* pTblNd = rSh.IsCrsrInTbl(); @@ -127,7 +124,6 @@ BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY ) /*-------------------------------------------------------------------- Beschreibung: Init-Liste --------------------------------------------------------------------*/ - SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) : SvxStandardDialog(pParent, SW_RES(DLG_SORTING)), @@ -372,9 +368,6 @@ void SwSortDlg::Apply() InfoBox( this->GetParent(), SW_RES(MSG_SRTERR)).Execute(); } -/* -----------------30.09.98 10:03------------------- - * - * --------------------------------------------------*/ IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton ) { BOOL bEnable = pButton == &aDelimFreeRB && aDelimFreeRB.IsEnabled(); @@ -404,7 +397,6 @@ IMPL_LINK( SwSortDlg, DelimCharHdl, PushButton*, EMPTYARG ) return 0; } - IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck ) { if( pCheck == ( CheckBox* ) &aRowRB) @@ -482,9 +474,3 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) } return 0; } - - - - - - diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index bab12b1e04da..aae292fa67dc 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -69,7 +69,6 @@ #include <unomid.h> - SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) : SfxModalDialog(pParent, SW_RES(DLG_MOD_REDLINE_ACCEPT)) { @@ -81,10 +80,6 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) : FreeResource(); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() { AcceptAll(FALSE); // Alles uebriggebliebene ablehnen @@ -93,28 +88,16 @@ SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() delete pImplDlg; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwModalRedlineAcceptDlg::Activate() { } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - void SwModalRedlineAcceptDlg::Resize() { pImplDlg->Resize(); SfxModalDialog::Resize(); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - void SwModalRedlineAcceptDlg::AcceptAll( BOOL bAccept ) { SvxTPFilter* pFilterTP = pImplDlg->GetChgCtrl()->GetFilterPage(); |