diff options
| author | Prashant Shah <pshah.mumbai@gmail.com> | 2010-10-10 13:47:31 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 13:47:31 -0500 |
| commit | 4aefa94618fd40768dfa927cb68e5caed2ac8e27 (patch) | |
| tree | 62abf3f5aa4a53ff6ab6796b0f987c78f6f83e4c /sw/source | |
| parent | a6aea52f0d4e2b0fbd4a5f662bf9383c0fb9b737 (diff) | |
Remove bogus comment
Diffstat (limited to 'sw/source')
51 files changed, 77 insertions, 2050 deletions
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index 5fb403da58ce..8bad41ccc2e7 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.cxx @@ -47,9 +47,6 @@ using namespace com::sun::star::uno; #define SEL_TYPE_BEZIER 3 #define SEL_TYPE_GRAPHIC 4 -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ SwToolbarConfigItem::SwToolbarConfigItem( BOOL bWeb ) : ConfigItem(bWeb ? C2U("Office.WriterWeb/ObjectBar") : C2U("Office.Writer/ObjectBar"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) @@ -74,15 +71,11 @@ SwToolbarConfigItem::SwToolbarConfigItem( BOOL bWeb ) : } } } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ SwToolbarConfigItem::~SwToolbarConfigItem() { } -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ sal_Int32 lcl_getArrayIndex(int nSelType) { sal_Int32 nRet = -1; @@ -101,9 +94,7 @@ sal_Int32 lcl_getArrayIndex(int nSelType) nRet = SEL_TYPE_GRAPHIC; return nRet; } -/* -----------------------------10.10.00 14:38-------------------------------- - ---------------------------------------------------------------------------*/ void SwToolbarConfigItem::SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ) { sal_Int32 nProp = lcl_getArrayIndex(nSelType); @@ -113,9 +104,7 @@ void SwToolbarConfigItem::SetTopToolbar( sal_Int32 nSelType, sal_Int32 nBarId ) SetModified(); } } -/* -----------------------------10.10.00 13:33-------------------------------- - ---------------------------------------------------------------------------*/ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames() { static const char* aPropNames[] = @@ -133,9 +122,7 @@ Sequence<OUString> SwToolbarConfigItem::GetPropertyNames() pNames[i] = OUString::createFromAscii(aPropNames[i]); return aNames; } -/* -----------------------------10.10.00 13:36-------------------------------- - ---------------------------------------------------------------------------*/ void SwToolbarConfigItem::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -149,4 +136,3 @@ void SwToolbarConfigItem::Commit() } void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} - diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index d60361e49453..e0932d45dc63 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -37,10 +37,6 @@ #define VERSION_01 1 #define CAPTION_VERSION VERSION_01 -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) : bUseCaption(FALSE), eObjType(eType), @@ -56,27 +52,15 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI aOleId = *pOleId; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - InsCaptionOpt::InsCaptionOpt(const InsCaptionOpt& rOpt) { *this = rOpt; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - InsCaptionOpt::~InsCaptionOpt() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt& rOpt ) { bUseCaption = rOpt.bUseCaption; @@ -96,10 +80,6 @@ InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt& rOpt ) return *this; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const { return (eObjType == rOpt.eObjType && diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index b62276120287..977d70a77ba2 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -42,14 +42,11 @@ #include "cfgitems.hxx" #include "crstate.hxx" - - TYPEINIT1_AUTOFACTORY(SwDocDisplayItem, SfxPoolItem) TYPEINIT1_AUTOFACTORY(SwElemItem, SfxPoolItem) TYPEINIT1_AUTOFACTORY(SwAddPrinterItem, SfxPoolItem) TYPEINIT1_AUTOFACTORY(SwShadowCursorItem, SfxPoolItem) - SwDocDisplayItem::SwDocDisplayItem( USHORT _nWhich ) : SfxPoolItem(_nWhich), aIndexBackgrndCol(COL_GRAY) @@ -69,17 +66,12 @@ SwDocDisplayItem::SwDocDisplayItem( USHORT _nWhich ) : /*------------OS 12.01.95 ------------------------------------------- Item fuer Einstellungsdialog, Seite Dokumentansicht --------------------------------------------------------------------*/ - SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ): SfxPoolItem(rDocDisplayItem) { *this = rDocDisplayItem; }; -/*----------------------- ------------------------------------------- - ---------------------------------------------------------------------*/ - SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, USHORT _nWhich ) : SfxPoolItem( _nWhich ) { @@ -94,19 +86,12 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, USHORT _nWhich ) : bShowHiddenPara = rVOpt.IsShowHiddenPara(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const { return new SwDocDisplayItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); @@ -124,12 +109,6 @@ int SwDocDisplayItem::operator==( const SfxPoolItem& rAttr ) const bShowHiddenPara == rItem.bShowHiddenPara ); } - -/*-----------------31.08.96 14.14------------------- - ---------------------------------------------------*/ - - void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem) { bParagraphEnd = rDocDisplayItem.bParagraphEnd ; @@ -143,9 +122,6 @@ void SwDocDisplayItem::operator=( const SwDocDisplayItem& rDocDisplayItem) bShowHiddenPara = rDocDisplayItem.bShowHiddenPara ; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const { rVOpt.SetParagraph (bParagraphEnd ); @@ -159,10 +135,6 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetShowHiddenPara(bShowHiddenPara ); } - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwElemItem::SwElemItem( USHORT _nWhich ) : SfxPoolItem(_nWhich) { @@ -182,18 +154,12 @@ SwElemItem::SwElemItem( USHORT _nWhich ) : bFieldName = bNotes = FALSE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwElemItem::SwElemItem( const SwElemItem& rElemItem ): SfxPoolItem(rElemItem) { *this = rElemItem; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwElemItem::SwElemItem(const SwViewOption& rVOpt, USHORT _nWhich) : SfxPoolItem( _nWhich ) @@ -216,19 +182,11 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt, USHORT _nWhich) : } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxPoolItem* SwElemItem::Clone( SfxItemPool* ) const { return new SwElemItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SwElemItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); @@ -252,11 +210,6 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const bNotes == rItem.bNotes ); } -/*-----------------31.08.96 14.13------------------- - ---------------------------------------------------*/ - - void SwElemItem::operator=( const SwElemItem& rElemItem) { bHorzScrollbar = rElemItem. bHorzScrollbar ; @@ -276,10 +229,6 @@ void SwElemItem::operator=( const SwElemItem& rElemItem) bNotes = rElemItem.bNotes ; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const { rVOpt.SetViewHScrollBar(bHorzScrollbar ); @@ -300,11 +249,9 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetPostIts (bNotes ); } - /*-------------------------------------------------------------------- Beschreibung: CopyCTOR --------------------------------------------------------------------*/ - SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ): SfxPoolItem(rAddPrinterItem), SwPrintData( rAddPrinterItem ) @@ -314,33 +261,25 @@ SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ): /*-------------------------------------------------------------------- Beschreibung: CTOR fuer leeres Item --------------------------------------------------------------------*/ - SwAddPrinterItem::SwAddPrinterItem( USHORT _nWhich): SfxPoolItem(_nWhich) { } + /*-------------------------------------------------------------------- Beschreibung: CTOR aus SwPrintOptions --------------------------------------------------------------------*/ - SwAddPrinterItem::SwAddPrinterItem( USHORT _nWhich, const SwPrintData& rPrtData ) : SfxPoolItem(_nWhich) { SwPrintData::operator=(rPrtData); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SfxPoolItem* SwAddPrinterItem::Clone( SfxItemPool* ) const { return new SwAddPrinterItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); @@ -349,10 +288,10 @@ int SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const return SwPrintData::operator==(rItem); } + /*-----------------03.11.97 10:00------------------- Item fuer Einstellungsdialog, ShadowCursorSeite --------------------------------------------------*/ - SwShadowCursorItem::SwShadowCursorItem( USHORT _nWhich ) : SfxPoolItem( _nWhich ), eMode( FILL_TAB ) @@ -401,10 +340,6 @@ void SwShadowCursorItem::FillViewOptions( SwViewOption& rVOpt ) const } #ifdef DBG_UTIL -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwTestItem::SwTestItem( const SwTestItem& rTestItem ): SfxPoolItem(rTestItem) { @@ -420,19 +355,11 @@ SwTestItem::SwTestItem( const SwTestItem& rTestItem ): bTest10=rTestItem.bTest10; }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxPoolItem* SwTestItem::Clone( SfxItemPool* ) const { return new SwTestItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - int SwTestItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx index ade5163a5921..f8ccc9048ea2 100644 --- a/sw/source/ui/config/dbconfig.cxx +++ b/sw/source/ui/config/dbconfig.cxx @@ -67,9 +67,7 @@ const Sequence<OUString>& SwDBConfig::GetPropertyNames() } return aNames; } -/* -----------------------------06.09.00 16:44-------------------------------- - ---------------------------------------------------------------------------*/ SwDBConfig::SwDBConfig() : ConfigItem(C2U("Office.DataAccess"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -77,17 +75,13 @@ SwDBConfig::SwDBConfig() : pBibImpl(0) { }; -/* -----------------------------06.09.00 16:50-------------------------------- - ---------------------------------------------------------------------------*/ SwDBConfig::~SwDBConfig() { delete pAdrImpl; delete pBibImpl; } -/* -----------------------------20.02.01 12:32-------------------------------- - ---------------------------------------------------------------------------*/ void SwDBConfig::Load() { const Sequence<OUString>& rNames = GetPropertyNames(); @@ -118,18 +112,14 @@ void SwDBConfig::Load() } } } -/* -----------------------------20.02.01 12:36-------------------------------- - ---------------------------------------------------------------------------*/ const SwDBData& SwDBConfig::GetAddressSource() { if(!pAdrImpl) Load(); return *pAdrImpl; } -/* -----------------29.11.2002 11:43----------------- - * - * --------------------------------------------------*/ + const SwDBData& SwDBConfig::GetBibliographySource() { if(!pBibImpl) diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index 92582b0f09d3..de76eebfe0ca 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - #include <fontcfg.hxx> #include <i18npool/mslangid.hxx> #include <vcl/outdev.hxx> @@ -44,18 +43,13 @@ using namespace utl; using rtl::OUString; using namespace com::sun::star::uno; -/* -----------------07.10.2002 12:15----------------- - * - * --------------------------------------------------*/ inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL) { return LanguageType( nType < FONT_STANDARD_CJK ? eWestern : nType >= FONT_STANDARD_CTL ? eCTL : eCJK); } -/* -----------------------------08.09.00 15:52-------------------------------- - ---------------------------------------------------------------------------*/ Sequence<OUString> SwStdFontConfig::GetPropertyNames() { Sequence<OUString> aNames; @@ -104,9 +98,6 @@ Sequence<OUString> SwStdFontConfig::GetPropertyNames() } return aNames; } -/*-----------------03.09.96 15.00------------------- - ---------------------------------------------------*/ SwStdFontConfig::SwStdFontConfig() : utl::ConfigItem(C2U("Office.Writer")) @@ -151,9 +142,7 @@ SwStdFontConfig::SwStdFontConfig() : } } } -/* -----------------------------08.09.00 15:58-------------------------------- - ---------------------------------------------------------------------------*/ void SwStdFontConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -184,14 +173,11 @@ void SwStdFontConfig::Commit() } PutProperties(aNames, aValues); } -/* -----------------------------08.09.00 15:56-------------------------------- - ---------------------------------------------------------------------------*/ SwStdFontConfig::~SwStdFontConfig() -{} -/*-----------------18.01.97 10.05------------------- +{ +} ---------------------------------------------------*/ BOOL SwStdFontConfig::IsFontDefault(USHORT nFontType) const { BOOL bSame = sal_False; @@ -291,9 +277,6 @@ String SwStdFontConfig::GetDefaultFor(USHORT nFontType, LanguageType eLang) return aFont.GetName(); } -/*-- 11.10.2005 10:43:43--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eLang) { sal_Int32 nRet = FONTSIZE_DEFAULT; @@ -315,9 +298,6 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eL return nRet; } -/*-- 11.10.2005 10:50:06--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwStdFontConfig::ChangeInt( USHORT nFontType, sal_Int32 nHeight ) { DBG_ASSERT( nFontType < DEF_FONT_COUNT, "invalid index in SwStdFontConfig::ChangInt()"); @@ -346,9 +326,6 @@ void SwStdFontConfig::ChangeInt( USHORT nFontType, sal_Int32 nHeight ) } } -/*-- 08.11.2005 14:18:26--------------------------------------------------- - - -----------------------------------------------------------------------*/ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang ) { DBG_ASSERT(nFont + FONT_PER_GROUP * nScriptType < DEF_FONT_COUNT, "wrong index in SwStdFontConfig::GetFontHeight()"); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index c98808408368..02647d7fd7af 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -57,9 +57,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::mail; using namespace ::com::sun::star::beans; using ::rtl::OUString; -/*-- 06.05.2004 12:04:11--------------------------------------------------- - -----------------------------------------------------------------------*/ class SwTestAccountSettingsDialog : public SfxModalDialog { FixedInfo m_aInfoFI; @@ -97,9 +95,7 @@ public: SwTestAccountSettingsDialog(SwMailConfigPage* pParent); ~SwTestAccountSettingsDialog(); }; -/*-- 19.08.2004 14:27:33--------------------------------------------------- - -----------------------------------------------------------------------*/ class SwAuthenticationSettingsDialog : public SfxModalDialog { CheckBox m_aAuthenticationCB; @@ -144,9 +140,6 @@ public: ~SwAuthenticationSettingsDialog(); }; -/*-- 06.05.2004 10:59:40--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_MAILCONFIG), rSet), #ifdef MSC @@ -179,23 +172,17 @@ SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) : m_aServerAuthenticationPB.SetClickHdl(LINK(this, SwMailConfigPage, AuthenticationHdl)); m_aTestPB.SetClickHdl(LINK(this, SwMailConfigPage, TestHdl)); } -/*-- 06.05.2004 10:59:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SwMailConfigPage::~SwMailConfigPage() { delete m_pConfigItem; } -/*-- 06.05.2004 10:59:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwMailConfigPage(pParent, rAttrSet); } -/*-- 06.05.2004 10:59:41--------------------------------------------------- - -----------------------------------------------------------------------*/ BOOL SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) { if(m_aDisplayNameED.GetText() != m_aDisplayNameED.GetSavedValue()) @@ -218,9 +205,7 @@ BOOL SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) m_pConfigItem->Commit(); return sal_True; } -/*-- 06.05.2004 10:59:41--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwMailConfigPage::Reset( const SfxItemSet& /*rSet*/ ) { m_aDisplayNameED.SetText(m_pConfigItem->GetMailDisplayName()); @@ -243,9 +228,7 @@ void SwMailConfigPage::Reset( const SfxItemSet& /*rSet*/ ) m_aPortNF .SaveValue(); m_aSecureCB .SaveValue(); } -/*-- 06.05.2004 10:59:41--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK(SwMailConfigPage, ReplyToHdl, CheckBox*, pBox) { sal_Bool bEnable = pBox->IsChecked(); @@ -253,26 +236,20 @@ IMPL_LINK(SwMailConfigPage, ReplyToHdl, CheckBox*, pBox) m_aReplyToED.Enable(bEnable); return 0; } -/*-- 06.05.2004 10:59:41--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK(SwMailConfigPage, AuthenticationHdl, PushButton*, EMPTYARG) { SwAuthenticationSettingsDialog aDlg(this, *m_pConfigItem); aDlg.Execute(); return 0; } -/*-- 06.05.2004 10:59:42--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK(SwMailConfigPage, TestHdl, PushButton*, EMPTYARG) { SwTestAccountSettingsDialog(this).Execute(); return 0; } -/*-- 06.05.2004 12:11:13--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent) : SfxModalDialog(pParent, SW_RES(DLG_MM_TESTACCOUNTSETTINGS)), #ifdef MSC @@ -336,23 +313,17 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare Application::PostUserEvent( STATIC_LINK( this, SwTestAccountSettingsDialog, TestHdl ), this ); } -/*-- 06.05.2004 12:11:13--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTestAccountSettingsDialog::~SwTestAccountSettingsDialog() { } -/*-- 06.05.2004 12:15:43--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK(SwTestAccountSettingsDialog, StopHdl, PushButton*, EMPTYARG) { m_bStop = true; return 0; } -/*-- 07.06.2004 12:44:50--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_STATIC_LINK(SwTestAccountSettingsDialog, TestHdl, void*, EMPTYARG) { pThis->EnterWait(); @@ -360,9 +331,7 @@ IMPL_STATIC_LINK(SwTestAccountSettingsDialog, TestHdl, void*, EMPTYARG) pThis->LeaveWait(); return 0; } -/*-- 07.06.2004 12:45:45--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTestAccountSettingsDialog::Test() { uno::Reference<XMultiServiceFactory> rMgr = ::comphelper::getProcessServiceFactory(); @@ -471,24 +440,18 @@ void SwTestAccountSettingsDialog::Test() m_eErrorsED.SetText( m_sErrorServer ); } } -/*-- 18.08.2004 12:18:38--------------------------------------------------- - -----------------------------------------------------------------------*/ SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet ) : SfxSingleTabDialog(pParent, rSet, 0) { // TabPage erzeugen SetTabPage(SwMailConfigPage::Create( this, rSet )); } -/*-- 18.08.2004 12:18:38--------------------------------------------------- - -----------------------------------------------------------------------*/ SwMailConfigDlg::~SwMailConfigDlg() { } -/*-- 19.08.2004 14:33:58--------------------------------------------------- - -----------------------------------------------------------------------*/ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem) : SfxModalDialog(pParent, SW_RES(DLG_MM_SERVERAUTHENTICATION)), @@ -551,15 +514,11 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( CheckBoxHdl_Impl( &m_aAuthenticationCB ); } -/*-- 19.08.2004 14:33:58--------------------------------------------------- - -----------------------------------------------------------------------*/ SwAuthenticationSettingsDialog::~SwAuthenticationSettingsDialog() { } -/*-- 19.08.2004 14:33:59--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwAuthenticationSettingsDialog, OKHdl_Impl, OKButton*, EMPTYARG) { rConfigItem.SetAuthentication( m_aAuthenticationCB.IsChecked() ); @@ -575,9 +534,7 @@ IMPL_LINK( SwAuthenticationSettingsDialog, OKHdl_Impl, OKButton*, EMPTYARG) EndDialog(RET_OK); return 0; } -/*-- 19.08.2004 14:33:59--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox) { sal_Bool bChecked = pBox->IsChecked(); @@ -587,9 +544,7 @@ IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox) return 0; } -/*-- 19.08.2004 14:33:59--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, RadioButton*, EMPTYARG) { sal_Bool bSeparate = m_aSeparateAuthenticationRB.IsChecked(); diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index 50ece99d1a4b..c96f2a2958ed 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -60,9 +60,7 @@ using namespace com::sun::star::uno; #define GLOB_NAME_CHART 4 SV_IMPL_PTRARR_SORT(InsCapOptArr, InsCaptionOptPtr) -/* -----------------03.11.98 13:46------------------- - * - * --------------------------------------------------*/ + InsCaptionOpt* InsCaptionOptArr::Find(const SwCapObjType eType, const SvGlobalName *pOleId) const { for (USHORT i = 0; i < Count(); i++ ) @@ -78,10 +76,6 @@ InsCaptionOpt* InsCaptionOptArr::Find(const SwCapObjType eType, const SvGlobalNa return 0; } -/* -----------------03.11.98 15:05------------------- - * - * --------------------------------------------------*/ - const InsCaptionOpt* SwModuleOptions::GetCapOption( BOOL bHTML, const SwCapObjType eType, const SvGlobalName *pOleId) { @@ -104,10 +98,6 @@ const InsCaptionOpt* SwModuleOptions::GetCapOption( } } -/* -----------------03.11.98 15:05------------------- - * - * --------------------------------------------------*/ - BOOL SwModuleOptions::SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt) { BOOL bRet = FALSE; @@ -148,9 +138,7 @@ BOOL SwModuleOptions::SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt) return bRet; } -/*-----------------13.01.97 12.44------------------- ---------------------------------------------------*/ SwModuleOptions::SwModuleOptions() : aInsertConfig(FALSE), aWebInsertConfig(TRUE), @@ -159,9 +147,7 @@ SwModuleOptions::SwModuleOptions() : bHideFieldTips(FALSE) { } -/* -----------------------------19.01.01 12:26-------------------------------- - ---------------------------------------------------------------------------*/ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) { String sReturn; @@ -249,9 +235,7 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, BOOL bFromUI) } return sReturn; } -/* -----------------------------10.10.00 16:22-------------------------------- - ---------------------------------------------------------------------------*/ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -276,9 +260,7 @@ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames() } return aNames; } -/*-- 10.10.00 16:22:22--------------------------------------------------- - -----------------------------------------------------------------------*/ SwRevisionConfig::SwRevisionConfig() : ConfigItem(C2U("Office.Writer/Revision"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) @@ -295,15 +277,11 @@ SwRevisionConfig::SwRevisionConfig() : Load(); } -/*-- 10.10.00 16:22:23--------------------------------------------------- - -----------------------------------------------------------------------*/ SwRevisionConfig::~SwRevisionConfig() { } -/*-- 10.10.00 16:22:56--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) { sal_Int32 nRet = 0; @@ -328,7 +306,7 @@ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr) } return nRet; } -//----------------------------------------------------------------------------- + void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} void SwRevisionConfig::Commit() @@ -355,9 +333,7 @@ void SwRevisionConfig::Commit() } PutProperties(aNames, aValues); } -/*-- 10.10.00 16:22:56--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelete = sal_False) { rAttr.nItemId = rAttr.nAttr = 0; @@ -413,9 +389,7 @@ void SwRevisionConfig::Load() } } } -/* -----------------------------10.10.00 16:22-------------------------------- - ---------------------------------------------------------------------------*/ enum InsertConfigProp { INS_PROP_TABLE_HEADER = 0, @@ -630,9 +604,7 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames() } return bIsWeb ? aWebNames : aNames; } -/*-- 10.10.00 16:22:22--------------------------------------------------- - -----------------------------------------------------------------------*/ SwInsertConfig::SwInsertConfig(sal_Bool bWeb) : ConfigItem(bWeb ? C2U("Office.WriterWeb/Insert") : C2U("Office.Writer/Insert"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -653,17 +625,13 @@ SwInsertConfig::SwInsertConfig(sal_Bool bWeb) : Load(); } -/*-- 10.10.00 16:22:23--------------------------------------------------- - -----------------------------------------------------------------------*/ SwInsertConfig::~SwInsertConfig() { delete pCapOptions; delete pOLEMiscOpt; } -/*-- 10.10.00 16:22:56--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) { switch(nOffset) @@ -685,7 +653,7 @@ void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nProp, sal_ case 9: pValues[nProp] <<= rOpt.CopyAttributes(); break; //ApplyAttributes } } -//----------------------------------------------------------------------------- + void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} void SwInsertConfig::Commit() @@ -863,9 +831,7 @@ void SwInsertConfig::Commit() } PutProperties(aNames, aValues); } -/*-- 10.10.00 16:22:56--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) { switch(nOffset) @@ -932,7 +898,7 @@ void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp, sal_I break; } } -//----------------------------------------------------------------------------- + void SwInsertConfig::Load() { const Sequence<OUString>& aNames = GetPropertyNames(); @@ -1163,9 +1129,7 @@ void SwInsertConfig::Load() aInsTblOpts.mnInsMode = nInsTblFlags; } } -/* -----------------------------10.10.00 16:22-------------------------------- - ---------------------------------------------------------------------------*/ const Sequence<OUString>& SwTableConfig::GetPropertyNames() { const int nCount = 8; @@ -1186,24 +1150,18 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames() pNames[i] = OUString::createFromAscii(aPropNames[i]); return aNames; } -/*-- 10.10.00 16:22:22--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTableConfig::SwTableConfig(sal_Bool bWeb) : ConfigItem(bWeb ? C2U("Office.WriterWeb/Table") : C2U("Office.Writer/Table"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) { Load(); } -/*-- 10.10.00 16:22:23--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTableConfig::~SwTableConfig() { } -/*-- 10.10.00 16:22:56--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} void SwTableConfig::Commit() @@ -1229,9 +1187,7 @@ void SwTableConfig::Commit() } PutProperties(aNames, aValues); } -/*-- 10.10.00 16:22:56--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTableConfig::Load() { const Sequence<OUString>& aNames = GetPropertyNames(); @@ -1260,9 +1216,7 @@ void SwTableConfig::Load() } } } -/*-- 18.01.01 17:02:47--------------------------------------------------- - -----------------------------------------------------------------------*/ SwMiscConfig::SwMiscConfig() : ConfigItem(C2U("Office.Writer"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -1277,15 +1231,11 @@ SwMiscConfig::SwMiscConfig() : { Load(); } -/*-- 18.01.01 17:02:47--------------------------------------------------- - -----------------------------------------------------------------------*/ SwMiscConfig::~SwMiscConfig() { } -/*-- 18.01.01 17:02:47--------------------------------------------------- - -----------------------------------------------------------------------*/ const Sequence<OUString>& SwMiscConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -1314,9 +1264,7 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames() } return aNames; } -/*-- 18.01.01 17:02:47--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} void SwMiscConfig::Commit() @@ -1349,9 +1297,7 @@ void SwMiscConfig::Commit() } PutProperties(aNames, aValues); } -/*-- 18.01.01 17:02:48--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwMiscConfig::Load() { const Sequence<OUString>& aNames = GetPropertyNames(); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 863fd6816526..c6740cf1abae 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -180,15 +180,11 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe m_aOptionsLB.SetSizePixel( aNewSz ); } -// ----------------------------------------------------------------------- - SwCompatibilityOptPage::~SwCompatibilityOptPage() { delete m_pImpl; } -// ----------------------------------------------------------------------- - void SwCompatibilityOptPage::ReplaceFormatName( String& rEntry ) { static const String sOpenOfficeName = String::CreateFromAscii("OpenOffice.org"); @@ -214,8 +210,6 @@ void SwCompatibilityOptPage::ReplaceFormatName( String& rEntry ) } } -// ----------------------------------------------------------------------- - ULONG convertBools2Ulong_Impl ( bool _bUsePrtMetrics, @@ -270,8 +264,6 @@ ULONG convertBools2Ulong_Impl return nRet; } -// ----------------------------------------------------------------------- - void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) { // init objectshell and detect document name @@ -404,8 +396,6 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- - IMPL_LINK( SwCompatibilityOptPage, SelectHdl, ListBox*, EMPTYARG ) { USHORT nPos = m_aFormattingLB.GetSelectEntryPos(); @@ -415,8 +405,6 @@ IMPL_LINK( SwCompatibilityOptPage, SelectHdl, ListBox*, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - IMPL_LINK( SwCompatibilityOptPage, UseAsDefaultHdl, PushButton*, EMPTYARG ) { QueryBox aBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), m_sUseAsDefaultQuery ); @@ -461,8 +449,6 @@ IMPL_LINK( SwCompatibilityOptPage, UseAsDefaultHdl, PushButton*, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- - void SwCompatibilityOptPage::SetCurrentOptions( ULONG nOptions ) { ULONG nCount = m_aOptionsLB.GetEntryCount(); @@ -475,8 +461,6 @@ void SwCompatibilityOptPage::SetCurrentOptions( ULONG nOptions ) } } -// ----------------------------------------------------------------------- - ULONG SwCompatibilityOptPage::GetDocumentOptions() const { ULONG nRet = 0; @@ -499,8 +483,6 @@ ULONG SwCompatibilityOptPage::GetDocumentOptions() const return nRet; } -// ----------------------------------------------------------------------- - void SwCompatibilityOptPage::WriteOptions() { m_aConfigItem.Clear(); @@ -515,15 +497,11 @@ void SwCompatibilityOptPage::WriteOptions() pItem->m_bExpandWordSpace ); } -// ----------------------------------------------------------------------- - SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwCompatibilityOptPage( pParent, rAttrSet ); } -// ----------------------------------------------------------------------- - BOOL SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) { BOOL bModified = FALSE; @@ -613,8 +591,6 @@ BOOL SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) return bModified; } -// ----------------------------------------------------------------------- - void SwCompatibilityOptPage::Reset( const SfxItemSet& ) { m_aOptionsLB.SelectEntryPos( 0 ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 9f5da6a92e2f..623022cb8baf 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -73,9 +73,6 @@ using namespace ::com::sun::star; #include <svl/eitem.hxx> -/* -----------------22.10.98 15:12------------------- - * - * --------------------------------------------------*/ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, SW_RES( TP_OPTLOAD_PAGE ), rSet ), @@ -145,28 +142,16 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) : } } -/*-----------------18.01.97 12.43------------------- - ---------------------------------------------------*/ - SwLoadOptPage::~SwLoadOptPage() { } -/*-----------------18.01.97 12.43------------------- - ---------------------------------------------------*/ - SfxTabPage* __EXPORT SwLoadOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwLoadOptPage(pParent, rAttrSet ); } -/*-----------------18.01.97 12.42------------------- - ---------------------------------------------------*/ - BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { BOOL bRet = FALSE; @@ -244,9 +229,7 @@ BOOL __EXPORT SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) return bRet; } -/*-----------------18.01.97 12.42------------------- ---------------------------------------------------*/ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(FALSE); @@ -327,10 +310,10 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet) } aUseCharUnit.SaveValue(); } + /*-----------------13.01.97 14.44------------------- Metric des Deftabstops umschalten --------------------------------------------------*/ - IMPL_LINK(SwLoadOptPage, MetricHdl, ListBox*, EMPTYARG) { const USHORT nMPos = aMetricLB.GetSelectEntryPos(); @@ -350,9 +333,6 @@ IMPL_LINK(SwLoadOptPage, MetricHdl, ListBox*, EMPTYARG) return 0; } -/*********************************************************************/ -/* */ -/*********************************************************************/ IMPL_LINK(SwLoadOptPage, CaptionHdl, PushButton*, EMPTYARG) { @@ -362,10 +342,6 @@ IMPL_LINK(SwLoadOptPage, CaptionHdl, PushButton*, EMPTYARG) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, 0) { @@ -373,18 +349,10 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) : SetTabPage((SwCaptionOptPage*) SwCaptionOptPage::Create(this, rSet)); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwCaptionOptDlg::~SwCaptionOptDlg() { } -/* -----------------22.10.98 15:12------------------- - * - * --------------------------------------------------*/ - SwCaptionPreview::SwCaptionPreview( Window* pParent, const ResId& rResId ) : Window( pParent, rResId ) { @@ -417,7 +385,6 @@ void SwCaptionPreview::Paint( const Rectangle& rRect ) DrawText( Point( 4, 6 ), maText ); } - SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_OPTCAPTION_PAGE), rSet), aCheckFT (this, SW_RES(FT_OBJECTS )), @@ -539,30 +506,18 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aCheckLB.SetDeselectHdl( LINK(this, SwCaptionOptPage, SaveEntryHdl) ); } -/*-----------------18.01.97 12.43------------------- - ---------------------------------------------------*/ - SwCaptionOptPage::~SwCaptionOptPage() { DelUserData(); delete pMgr; } -/*-----------------18.01.97 12.43------------------- - ---------------------------------------------------*/ - SfxTabPage* SwCaptionOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwCaptionOptPage(pParent, rAttrSet ); } -/*-----------------18.01.97 12.42------------------- - ---------------------------------------------------*/ - BOOL SwCaptionOptPage::FillItemSet( SfxItemSet& ) { BOOL bRet = FALSE; @@ -588,10 +543,6 @@ BOOL SwCaptionOptPage::FillItemSet( SfxItemSet& ) return bRet; } -/*-----------------18.01.97 12.42------------------- - ---------------------------------------------------*/ - void SwCaptionOptPage::Reset( const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -658,10 +609,6 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet) ModifyHdl(); } -/*-----------------18.01.97 12.42------------------- - ---------------------------------------------------*/ - void SwCaptionOptPage::SetOptions(const USHORT nPos, const SwCapObjType eObjType, const SvGlobalName *pOleId) { @@ -677,10 +624,6 @@ void SwCaptionOptPage::SetOptions(const USHORT nPos, aCheckLB.SetEntryData(nPos, new InsCaptionOpt(eObjType, pOleId)); } -/*-----------------18.01.97 12.42------------------- - ---------------------------------------------------*/ - void SwCaptionOptPage::DelUserData() { SvLBoxEntry* pEntry = aCheckLB.First(); @@ -693,10 +636,6 @@ void SwCaptionOptPage::DelUserData() } } -/* -----------------26.10.98 11:06------------------- - * - * --------------------------------------------------*/ - IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG ) { SvLBoxEntry* pSelEntry = aCheckLB.FirstSelected(); @@ -822,10 +761,6 @@ IMPL_LINK( SwCaptionOptPage, ShowEntryHdl, SvxCheckListBox *, EMPTYARG ) return 0; } -/* -----------------26.10.98 11:06------------------- - * - * --------------------------------------------------*/ - IMPL_LINK( SwCaptionOptPage, SaveEntryHdl, SvxCheckListBox *, EMPTYARG ) { SvLBoxEntry* pEntry = aCheckLB.GetHdlEntry(); @@ -836,10 +771,6 @@ IMPL_LINK( SwCaptionOptPage, SaveEntryHdl, SvxCheckListBox *, EMPTYARG ) return 0; } -/* -----------------05.11.98 16:23------------------- - * - * --------------------------------------------------*/ - void SwCaptionOptPage::SaveEntry(SvLBoxEntry* pEntry) { if (pEntry) @@ -872,10 +803,6 @@ void SwCaptionOptPage::SaveEntry(SvLBoxEntry* pEntry) } } -/* -----------------26.10.98 11:06------------------- - * - * --------------------------------------------------*/ - IMPL_LINK( SwCaptionOptPage, ModifyHdl, Edit *, EMPTYARG ) { String sFldTypeName = aCategoryBox.GetText(); @@ -900,19 +827,13 @@ IMPL_LINK( SwCaptionOptPage, ModifyHdl, Edit *, EMPTYARG ) return 0; } -/* -----------------26.10.98 10:58------------------- - * - * --------------------------------------------------*/ - IMPL_LINK_INLINE_START( SwCaptionOptPage, SelectHdl, ListBox *, EMPTYARG ) { DrawSample(); return 0; } IMPL_LINK_INLINE_END( SwCaptionOptPage, SelectHdl, ListBox *, EMPTYARG ) -/*-- 02.11.2007 10:00:36--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox ) { DrawSample(); @@ -921,9 +842,6 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox ) aNumberingSeparatorED.Enable( nPos == 1 ); return 0; } -/* -----------------26.10.98 10:58------------------- - * - * --------------------------------------------------*/ void SwCaptionOptPage::DrawSample() { @@ -992,7 +910,6 @@ void SwCaptionOptPage::DrawSample() /*------------------------------------------------------------------------ Beschreibung: ComboBox ohne Spaces ------------------------------------------------------------------------*/ - void CaptionComboBox::KeyInput(const KeyEvent& rEvt) { if( rEvt.GetKeyCode().GetCode() != KEY_SPACE ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index d4117912a347..347443db4962 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -81,13 +81,8 @@ #include <unomid.h> - using namespace ::com::sun::star; - -/******************************************************* - ******************************************************/ - /*-----------------31.08.96 10.16------------------- TabPage Anzeige/Inhalt --------------------------------------------------*/ @@ -181,24 +176,16 @@ SwContentOptPage::SwContentOptPage( Window* pParent, } } -/*-----------------31.08.96 13.58------------------- - ---------------------------------------------------*/ SwContentOptPage::~SwContentOptPage() { } -/*-----------------31.08.96 13.58------------------- - ---------------------------------------------------*/ SfxTabPage* SwContentOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwContentOptPage(pParent, rAttrSet); } -/* -----------------------------07.04.01 16:57-------------------------------- - ---------------------------------------------------------------------------*/ static void lcl_SelectMetricLB(ListBox& rMetric, USHORT nSID, const SfxItemSet& rSet) { const SfxPoolItem* pItem; @@ -216,9 +203,7 @@ static void lcl_SelectMetricLB(ListBox& rMetric, USHORT nSID, const SfxItemSet& } rMetric.SaveValue(); } -/*-----------------31.08.96 13.58------------------- ---------------------------------------------------*/ void SwContentOptPage::Reset(const SfxItemSet& rSet) { const SwElemItem* pElemAttr = 0; @@ -250,9 +235,6 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet) AnyRulerHdl(&aAnyRulerCB); } -/*-----------------31.08.96 13.58------------------- - ---------------------------------------------------*/ BOOL SwContentOptPage::FillItemSet(SfxItemSet& rSet) { const SwElemItem* pOldAttr = (const SwElemItem*) @@ -309,17 +291,13 @@ BOOL SwContentOptPage::FillItemSet(SfxItemSet& rSet) } return bRet; } -/* -----------------------------05.03.2002 15:07------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(SwContentOptPage, VertRulerHdl, CheckBox*, pBox) { aVRulerRightCBox.Enable(pBox->IsEnabled() && pBox->IsChecked()); return 0; } -/* -----------------20.09.2002 11:30----------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox) { BOOL bChecked = pBox->IsChecked(); @@ -430,8 +408,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent, aProspectCB_RTL.Show(aCTLOptions.IsCTLFontEnabled()); } -//------------------------------------------------------------------------ - void SwAddPrinterTabPage::SetPreview(BOOL bPrev) { bPreview = bPrev; @@ -450,15 +426,11 @@ void SwAddPrinterTabPage::SetPreview(BOOL bPrev) } } -//------------------------------------------------------------------------ - SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ - BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) { @@ -498,8 +470,6 @@ BOOL SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) } return bAttrModified; } -//------------------------------------------------------------------------ - void SwAddPrinterTabPage::Reset( const SfxItemSet& ) { @@ -543,15 +513,11 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet& ) else aProspectCB_RTL.Enable( FALSE ); } -//----------------------------------------------------------------------- - void SwAddPrinterTabPage::Init() { } -//------------------------------------------------------------------------ - IMPL_LINK_INLINE_START( SwAddPrinterTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) { @@ -568,9 +534,6 @@ IMPL_LINK_INLINE_START( SwAddPrinterTabPage, AutoClickHdl, CheckBox *, EMPTYARG } IMPL_LINK_INLINE_END( SwAddPrinterTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) -//------------------------------------------------------------------------ - - void SwAddPrinterTabPage::SetFax( const SvStringsDtor& rFaxLst ) { aFaxLB.InsertEntry(sNone); @@ -579,9 +542,6 @@ void SwAddPrinterTabPage::SetFax( const SvStringsDtor& rFaxLst ) aFaxLB.SelectEntryPos(0); } -//------------------------------------------------------------------------ - - IMPL_LINK_INLINE_START( SwAddPrinterTabPage, SelectHdl, ListBox *, EMPTYARG ) { bAttrModified=TRUE; @@ -623,11 +583,10 @@ void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet) */ } } + /*-----------------03.09.96 11.53------------------- Tabpage Standardfonts --------------------------------------------------*/ - - SwStdFontTabPage::SwStdFontTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, SW_RES( TP_STD_FONT ), rSet), @@ -708,28 +667,18 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent, aDocOnlyCB.Check(SW_MOD()->GetModuleConfig()->IsDefaultFontInCurrDocOnly()); } -/*-----------------03.09.96 11.53------------------- - ---------------------------------------------------*/ - SwStdFontTabPage::~SwStdFontTabPage() { if(bDeletePrinter) delete pPrt; } -/*-----------------03.09.96 11.53------------------- - ---------------------------------------------------*/ SfxTabPage* SwStdFontTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwStdFontTabPage(pParent, rAttrSet); } -/*-----------------03.09.96 11.53------------------- - ---------------------------------------------------*/ void lcl_SetColl(SwWrtShell* pWrtShell, USHORT nType, SfxPrinter* pPrt, const String& rStyle, USHORT nFontWhich) @@ -749,9 +698,7 @@ void lcl_SetColl(SwWrtShell* pWrtShell, USHORT nType, delete (SfxFont*) pFnt; } } -/*-- 11.10.2005 15:47:52--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_SetColl(SwWrtShell* pWrtShell, USHORT nType, sal_Int32 nHeight, USHORT nFontHeightWhich) { @@ -760,9 +707,7 @@ void lcl_SetColl(SwWrtShell* pWrtShell, USHORT nType, SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType); pColl->SetFmtAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich)); } -/*-----------------03.09.96 11.53------------------- ---------------------------------------------------*/ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& ) { BOOL bNotDocOnly = !aDocOnlyCB.IsChecked(); @@ -910,9 +855,6 @@ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& ) return FALSE; } -/*-----------------03.09.96 11.53------------------- - ---------------------------------------------------*/ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) { const SfxPoolItem* pLang; @@ -1096,11 +1038,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) aIndexHeightLB. SaveValue(); } -/*-----------------07.09.96 12.28------------------- - ---------------------------------------------------*/ - - IMPL_LINK( SwStdFontTabPage, StandardHdl, PushButton *, EMPTYARG ) { sal_uInt8 nFontOffset = nFontGroup * FONT_PER_GROUP; @@ -1134,9 +1071,6 @@ IMPL_LINK( SwStdFontTabPage, StandardHdl, PushButton *, EMPTYARG ) return 0; } -/*-----------------17.01.97 15.43------------------- - ---------------------------------------------------*/ IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox ) { @@ -1165,9 +1099,6 @@ IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox ) return 0; } -/*-- 11.10.2005 15:11:23--------------------------------------------------- - - -----------------------------------------------------------------------*/ IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, FontSizeBox*, pBox ) { if(pBox == &aStandardHeightLB) @@ -1195,9 +1126,6 @@ IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, FontSizeBox*, pBox ) return 0; } -/*-- 28.09.2005 13:22:36--------------------------------------------------- - - -----------------------------------------------------------------------*/ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox ) { FontSizeBox* pHeightLB = 0; @@ -1285,28 +1213,16 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& aHeaderCB.SetClickHdl(aLnk); } -/*-----------------18.01.97 12.43------------------- - ---------------------------------------------------*/ - SwTableOptionsTabPage::~SwTableOptionsTabPage() { } -/*-----------------18.01.97 12.43------------------- - ---------------------------------------------------*/ - SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return new SwTableOptionsTabPage(pParent, rAttrSet ); } -/*-----------------18.01.97 12.42------------------- - ---------------------------------------------------*/ - BOOL SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) { BOOL bRet = FALSE; @@ -1393,9 +1309,7 @@ BOOL SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) return bRet; } -/*-----------------18.01.97 12.42------------------- ---------------------------------------------------*/ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) { const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); @@ -1491,9 +1405,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) CheckBoxHdl(0); } -/*-----------------18.01.97 12.42------------------- ---------------------------------------------------*/ IMPL_LINK(SwTableOptionsTabPage, CheckBoxHdl, CheckBox*, EMPTYARG) { aNumFmtFormattingCB.Enable(aNumFormattingCB.IsChecked()); @@ -1501,18 +1413,17 @@ IMPL_LINK(SwTableOptionsTabPage, CheckBoxHdl, CheckBox*, EMPTYARG) aRepeatHeaderCB.Enable(aHeaderCB.IsChecked()); return 0; } + void SwTableOptionsTabPage::PageCreated (SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,sal_False); if (pWrtSh) SetWrtShell(pWrtSh->GetValue()); } -/* */ /*-----------------31.10.97 17:55------------------- TabPage fuer ShadowCrsr --------------------------------------------------*/ - SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES(TP_OPTSHDWCRSR), rSet), @@ -1687,7 +1598,6 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) /*-----------------31.10.97 17:55------------------- TabPage fuer Redlining --------------------------------------------------*/ - struct CharAttr { USHORT nItemId; @@ -1724,7 +1634,6 @@ static USHORT aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 }; /*----------------------------------------------------------------------- Beschreibung: Markierungsvorschau -----------------------------------------------------------------------*/ - SwMarkPreview::SwMarkPreview( Window *pParent, const ResId& rResID ) : Window(pParent, rResID), @@ -2453,8 +2362,6 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) #ifdef DBG_UTIL -/******************************************************* - ******************************************************/ /*----------------- OS 11.01.95 ----------------------- TabPage Testeinstellungen -------------------------------------------------------*/ @@ -2521,17 +2428,11 @@ SwTestTabPage::SwTestTabPage( Window* pParent, } - -//------------------------------------------------------------------------ - - SfxTabPage* SwTestTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwTestTabPage( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ - BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) { @@ -2553,8 +2454,6 @@ BOOL SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) } return bAttrModified; } -//------------------------------------------------------------------------ - void SwTestTabPage::Reset( const SfxItemSet& ) { @@ -2576,8 +2475,6 @@ void SwTestTabPage::Reset( const SfxItemSet& ) aTest10CBox.Check(pTestAttr->bTest10); } } -//------------------------------------------------------------------------ - void SwTestTabPage::Init() { @@ -2594,8 +2491,6 @@ void SwTestTabPage::Init() aTest9CBox.SetClickHdl( aLk ); aTest10CBox.SetClickHdl( aLk ); } -//------------------------------------------------------------------------ - IMPL_LINK_INLINE_START( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG ) { diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx index a07c2c154696..44e0a2f6a2ca 100644 --- a/sw/source/ui/config/prtopt.cxx +++ b/sw/source/ui/config/prtopt.cxx @@ -78,9 +78,7 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() } return aNames; } -/* -----------------------------06.09.00 16:44-------------------------------- - ---------------------------------------------------------------------------*/ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) : ConfigItem(bWeb ? C2U("Office.WriterWeb/Print") : C2U("Office.Writer/Print"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -139,15 +137,11 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) : bPrintDraw = bPrintGraphic; } -/* -----------------------------06.09.00 16:50-------------------------------- - ---------------------------------------------------------------------------*/ SwPrintOptions::~SwPrintOptions() { } -/* -----------------------------06.09.00 16:43-------------------------------- - ---------------------------------------------------------------------------*/ void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index 016c2cd632dc..c30e5693d895 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -82,16 +82,12 @@ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) : if(pWebColorConfig) pWebColorConfig->Load(); } -/* -----------------------------13.02.01 09:48-------------------------------- - ---------------------------------------------------------------------------*/ SwMasterUsrPref::~SwMasterUsrPref() { delete pWebColorConfig; } -/*-- 28.09.00 09:55:32--------------------------------------------------- - -----------------------------------------------------------------------*/ Sequence<OUString> SwContentViewConfig::GetPropertyNames() { static const char* aPropNames[] = @@ -127,9 +123,7 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() } return aNames; } -/*-- 28.09.00 09:55:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SwContentViewConfig::SwContentViewConfig(BOOL bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? C2U("Office.WriterWeb/Content") : C2U("Office.Writer/Content")), rParent(rPar), @@ -138,22 +132,16 @@ SwContentViewConfig::SwContentViewConfig(BOOL bIsWeb, SwMasterUsrPref& rPar) : Load(); EnableNotification( GetPropertyNames() ); } -/*-- 28.09.00 09:55:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SwContentViewConfig::~SwContentViewConfig() { } -/*-- 09.02.07 09:55:33--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwContentViewConfig::Notify( const Sequence< OUString > & /*rPropertyNames*/ ) { Load(); } -/*-- 28.09.00 09:55:33--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwContentViewConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -191,9 +179,7 @@ void SwContentViewConfig::Commit() } PutProperties(aNames, aValues); } -/*-- 28.09.00 09:55:34--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwContentViewConfig::Load() { Sequence<OUString> aNames = GetPropertyNames(); @@ -239,9 +225,7 @@ void SwContentViewConfig::Load() } } } -/*-- 28.09.00 09:55:34--------------------------------------------------- - -----------------------------------------------------------------------*/ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames() { static const char* aPropNames[] = @@ -276,9 +260,7 @@ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames() } return aNames; } -/*-- 28.09.00 09:55:34--------------------------------------------------- - -----------------------------------------------------------------------*/ SwLayoutViewConfig::SwLayoutViewConfig(BOOL bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? C2U("Office.WriterWeb/Layout") : C2U("Office.Writer/Layout"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -286,15 +268,11 @@ SwLayoutViewConfig::SwLayoutViewConfig(BOOL bIsWeb, SwMasterUsrPref& rPar) : bWeb(bIsWeb) { } -/*-- 28.09.00 09:55:35--------------------------------------------------- - -----------------------------------------------------------------------*/ SwLayoutViewConfig::~SwLayoutViewConfig() { } -/*-- 28.09.00 09:55:36--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwLayoutViewConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -341,9 +319,7 @@ void SwLayoutViewConfig::Commit() } PutProperties(aNames, aValues); } -/*-- 28.09.00 09:55:36--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwLayoutViewConfig::Load() { Sequence<OUString> aNames = GetPropertyNames(); @@ -431,9 +407,6 @@ void SwLayoutViewConfig::Load() void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -/* -----------------------------19.01.01 13:07-------------------------------- - - ---------------------------------------------------------------------------*/ Sequence<OUString> SwGridConfig::GetPropertyNames() { static const char* aPropNames[] = @@ -455,9 +428,7 @@ Sequence<OUString> SwGridConfig::GetPropertyNames() } return aNames; } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ SwGridConfig::SwGridConfig(BOOL bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? C2U("Office.WriterWeb/Grid") : C2U("Office.Writer/Grid"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -465,15 +436,11 @@ SwGridConfig::SwGridConfig(BOOL bIsWeb, SwMasterUsrPref& rPar) : bWeb(bIsWeb) { } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ SwGridConfig::~SwGridConfig() { } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ void SwGridConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -499,9 +466,7 @@ void SwGridConfig::Commit() } PutProperties(aNames, aValues); } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ void SwGridConfig::Load() { Sequence<OUString> aNames = GetPropertyNames(); @@ -537,9 +502,6 @@ void SwGridConfig::Load() void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -/* -----------------------------19.01.01 13:07-------------------------------- - - ---------------------------------------------------------------------------*/ Sequence<OUString> SwCursorConfig::GetPropertyNames() { static const char* aPropNames[] = @@ -555,24 +517,18 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames() pNames[i] = C2U(aPropNames[i]); return aNames; } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ SwCursorConfig::SwCursorConfig(SwMasterUsrPref& rPar) : ConfigItem(C2U("Office.Writer/Cursor"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), rParent(rPar) { } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ SwCursorConfig::~SwCursorConfig() { } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ void SwCursorConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -594,9 +550,7 @@ void SwCursorConfig::Commit() } PutProperties(aNames, aValues); } -/* -----------------------------19.01.01 13:07-------------------------------- - ---------------------------------------------------------------------------*/ void SwCursorConfig::Load() { Sequence<OUString> aNames = GetPropertyNames(); @@ -630,9 +584,6 @@ void SwCursorConfig::Load() void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -/*-- 28.09.00 09:55:33--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) : ConfigItem(C2U("Office.WriterWeb/Background"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), @@ -641,15 +592,11 @@ SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) : { aPropNames.getArray()[0] = C2U("Color"); } -/*-- 28.09.00 09:55:33--------------------------------------------------- - -----------------------------------------------------------------------*/ SwWebColorConfig::~SwWebColorConfig() { } -/*-- 28.09.00 09:55:33--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwWebColorConfig::Commit() { Sequence<Any> aValues(aPropNames.getLength()); @@ -666,9 +613,6 @@ void SwWebColorConfig::Commit() void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -/*-- 28.09.00 09:55:34--------------------------------------------------- - - -----------------------------------------------------------------------*/ void SwWebColorConfig::Load() { Sequence<Any> aValues = GetProperties(aPropNames); diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 5c0b9385ce78..f9e9f2cd0638 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -86,10 +86,6 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm static const char __FAR_DATA aPostItStr[] = " "; -/************************************************************************* - * SwViewOption::IsEqualFlags() - *************************************************************************/ - BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const { return nCoreOptions == rOpt.nCoreOptions @@ -120,10 +116,6 @@ BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const ; } -/************************************************************************* - * SwViewOption::DrawRect() - *************************************************************************/ - void SwViewOption::DrawRect( OutputDevice *pOut, const SwRect &rRect, long nCol ) const { @@ -139,10 +131,6 @@ void SwViewOption::DrawRect( OutputDevice *pOut, DrawRectPrinter( pOut, rRect ); } -/************************************************************************* - * SwViewOption::DrawRectPrinter() - *************************************************************************/ - void SwViewOption::DrawRectPrinter( OutputDevice *pOut, const SwRect &rRect ) const { @@ -155,20 +143,12 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut, pOut->SetLineColor( aOldColor ); } -/************************************************************************* - * SwViewOption::GetPostItsWidth() - *************************************************************************/ - USHORT SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const { ASSERT( pOut, "no Outdev" ); return USHORT(pOut->GetTextWidth( String::CreateFromAscii(aPostItStr ))); } -/************************************************************************* - * SwViewOption::PaintPostIts() - *************************************************************************/ - void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const { if( pOut && bIsScript ) @@ -187,15 +167,6 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo } } - -/************************************************************************* -|* -|* ViewOption::ViewOption() -|* -|* Letzte Aenderung MA 04. Aug. 93 -|* -|*************************************************************************/ - SwViewOption::SwViewOption() : aRetoucheColor( COL_TRANSPARENT ), mnViewLayoutColumns( 0 ), @@ -334,14 +305,6 @@ SwViewOption::~SwViewOption() { } -/************************************************************************* -|* -|* ViewOption::Init() -|* -|* Letzte Aenderung MA 04. Aug. 93 -|* -|*************************************************************************/ - void SwViewOption::Init( Window *pWin ) { if( !nPixelTwips && pWin ) @@ -356,10 +319,6 @@ BOOL SwViewOption::IsAutoCompleteWords() const return /*rFlags.bAutoCompleteWords &&*/ rFlags.bAutoCmpltCollectWords; } -/*************************************************************************/ -/* */ -/*************************************************************************/ - AuthorCharAttr::AuthorCharAttr() : nItemId (SID_ATTR_CHAR_UNDERLINE), nAttr (UNDERLINE_SINGLE), @@ -367,10 +326,6 @@ AuthorCharAttr::AuthorCharAttr() : { } -/*-----------------07.01.97 13.50------------------- - ---------------------------------------------------*/ - USHORT GetHtmlMode(const SwDocShell* pShell) { USHORT nRet = 0; @@ -404,122 +359,87 @@ USHORT GetHtmlMode(const SwDocShell* pShell) } return nRet; } -/* -----------------------------24.04.2002 10:20------------------------------ - ---------------------------------------------------------------------------*/ Color& SwViewOption::GetDocColor() { return aDocColor; } -/* -----------------------------23.04.2002 17:18------------------------------ - ---------------------------------------------------------------------------*/ Color& SwViewOption::GetDocBoundariesColor() { return aDocBoundColor; } -/* -----------------------------23.04.2002 17:53------------------------------ - ---------------------------------------------------------------------------*/ Color& SwViewOption::GetObjectBoundariesColor() { return aObjectBoundColor; } -/* -----------------------------24.04.2002 10:41------------------------------ - ---------------------------------------------------------------------------*/ Color& SwViewOption::GetAppBackgroundColor() { return aAppBackgroundColor; } -/*-- 24.04.2002 10:50:11--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetTableBoundariesColor() { return aTableBoundColor; } -/*-- 24.04.2002 10:50:12--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetIndexShadingsColor() { return aIndexShadingsColor; } -/*-- 24.04.2002 10:50:12--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetLinksColor() { return aLinksColor; } -/*-- 24.04.2002 10:50:13--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetVisitedLinksColor() { return aVisitedLinksColor; } -/*-- 24.04.2002 10:50:13--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetDirectCursorColor() { return aDirectCursorColor; } -/*-- 24.04.2002 10:50:14--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetTextGridColor() { return aTextGridColor; } -/*-- 24.04.2002 10:50:14--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetSpellColor() { return aSpellColor; } -/*-- 24.04.2007 10:50:14--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetSmarttagColor() { return aSmarttagColor; } -/*-- 06.12.2002 10:50:11--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetFontColor() { return aFontColor; } -/*-- 24.04.2002 10:50:15--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetFieldShadingsColor() { return aFieldShadingsColor; } -/*-- 24.04.2002 10:50:15--------------------------------------------------- - -----------------------------------------------------------------------*/ Color& SwViewOption::GetSectionBoundColor() { return aSectionBoundColor; } -/* -----------------------------2002/07/31 14:00------------------------------ - ---------------------------------------------------------------------------*/ Color& SwViewOption::GetPageBreakColor() { return aPageBreakColor; } -/* -----------------------------23.04.2002 17:41------------------------------ - - ---------------------------------------------------------------------------*/ void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig ) { aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor); @@ -582,9 +502,7 @@ void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig ) aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor); } -/* -----------------------------23.04.2002 17:48------------------------------ - ---------------------------------------------------------------------------*/ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInConfig ) { if(bSet) @@ -625,9 +543,7 @@ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInCon } } } -/* -----------------------------24.04.2002 10:42------------------------------ - ---------------------------------------------------------------------------*/ BOOL SwViewOption::IsAppearanceFlag(sal_Int32 nFlag) { return 0 != (nAppearanceFlags & nFlag); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b0618572eb49..2e43ea8ff8b1 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -148,9 +148,6 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, ComboBox* pA } } -/* -----------------25.06.99 15:38------------------- - - --------------------------------------------------*/ class SwTestPasswdDlg : public SfxPasswordDialog { public: @@ -349,14 +346,9 @@ String SectRepr::GetSubRegion() const return sLinkFile; } - - /*---------------------------------------------------------------------------- Beschreibung: Dialog Bearbeiten Bereiche ----------------------------------------------------------------------------*/ - -//--------------------------------------------------------------------- - SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) : SfxModalDialog( pParent, SW_RES(MD_EDIT_REGION) ), aNameFL ( this, SW_RES( FL_NAME ) ), @@ -458,9 +450,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) aTree.Show(); bDontCheckPasswd = sal_False; } -/* -----------------------------26.04.01 14:56-------------------------------- - ---------------------------------------------------------------------------*/ BOOL SwEditRegionDlg::CheckPasswd(CheckBox* pBox) { if(bDontCheckPasswd) @@ -505,10 +495,10 @@ BOOL SwEditRegionDlg::CheckPasswd(CheckBox* pBox) return bRet; } + /*--------------------------------------------------------------------- Beschreibung: Durchsuchen nach Child-Sections, rekursiv ---------------------------------------------------------------------*/ - void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry ) { SwSection* pSect = 0; @@ -582,9 +572,6 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry aTree.Select(pSelEntry); } } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ USHORT SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt ) { @@ -596,10 +583,10 @@ USHORT SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt ) DBG_ERROR( "SectionFormat nicht in der Liste" ); return USHRT_MAX; } + /*--------------------------------------------------------------------- Beschreibung: ---------------------------------------------------------------------*/ - SwEditRegionDlg::~SwEditRegionDlg( ) { SvLBoxEntry* pEntry = aTree.First(); @@ -612,9 +599,7 @@ SwEditRegionDlg::~SwEditRegionDlg( ) aSectReprArr.DeleteAndDestroy( 0, aSectReprArr.Count() ); delete m_pDocInserter; } -/* -----------------------------09.10.2001 15:41------------------------------ - ---------------------------------------------------------------------------*/ void SwEditRegionDlg::SelectSection(const String& rSectionName) { SvLBoxEntry* pEntry = aTree.First(); @@ -632,12 +617,12 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName) aTree.MakeVisible(pEntry); } } + /*--------------------------------------------------------------------- Beschreibung: Selektierte Eintrag in der TreeListBox wird im Edit-Fenster angezeigt Bei Multiselektion werden einige Controls disabled ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { bDontCheckPasswd = sal_True; @@ -808,9 +793,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) bDontCheckPasswd = sal_False; return 0; } -/*-----------------28.06.97 09:19------------------- ---------------------------------------------------*/ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) { if( !pBox->GetSelectionCount() ) @@ -845,7 +828,6 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) Beschreibung: Im OkHdl werden die veraenderten Einstellungen uebernommen und aufgehobene Bereiche geloescht ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) { // JP 13.03.96: @@ -925,10 +907,10 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG ) return 0; } + /*--------------------------------------------------------------------- Beschreibung: Toggle protect ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -954,10 +936,10 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) aPasswdPB.Enable(bCheck); return 0; } + /*--------------------------------------------------------------------- Beschreibung: Toggle hide ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -990,7 +972,6 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) /*--------------------------------------------------------------------- Beschreibung: Toggle edit in readonly ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -1012,7 +993,6 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) /*--------------------------------------------------------------------- Beschreibung: selektierten Bereich aufheben ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG ) { if(!CheckPasswd()) @@ -1077,10 +1057,10 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG ) } return 0; } + /*--------------------------------------------------------------------- Beschreibung: CheckBox mit Datei verknuepfen? ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -1151,7 +1131,6 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) /*--------------------------------------------------------------------- Beschreibung: Dialog Datei einfuegen rufen ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, FileSearchHdl, PushButton *, EMPTYARG ) { if(!CheckPasswd(0)) @@ -1169,7 +1148,6 @@ IMPL_LINK( SwEditRegionDlg, FileSearchHdl, PushButton *, EMPTYARG ) /*--------------------------------------------------------------------- Beschreibung: ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG ) { if(!CheckPasswd()) @@ -1275,7 +1253,6 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG ) Beschreibung: Uebernahme des Dateinamen oder des verknuepften Bereichs ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) { Selection aSelect = pEdit->GetSelection(); @@ -1324,10 +1301,10 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) } return 0; } + /*--------------------------------------------------------------------- Beschreibung: ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) { if(!CheckPasswd(pBox)) @@ -1376,9 +1353,6 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) } return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) { @@ -1432,12 +1406,12 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) } return 0; } + /*--------------------------------------------------------------------- Beschreibung: Aktueller Bereichsname wird sofort beim editieren in die TreeListBox eingetragen, mit leerem String kein Ok() ---------------------------------------------------------------------*/ - IMPL_LINK( SwEditRegionDlg, NameEditHdl, Edit *, EMPTYARG ) { if(!CheckPasswd(0)) @@ -1455,9 +1429,6 @@ IMPL_LINK( SwEditRegionDlg, NameEditHdl, Edit *, EMPTYARG ) } return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit ) { @@ -1508,9 +1479,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) Application::SetDefDialogParent( m_pOldDefDlgParent ); return 0; } -/*-- 03.09.2009 16:24:18--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) { if( !bSubRegionsFilled && pEvent && pEvent->GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) @@ -1539,9 +1508,6 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) return 0; } -/* -----------------------------08.05.2002 15:00------------------------------ - - ---------------------------------------------------------------------------*/ Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden, BOOL bHighContrast) { ImageList& rImgLst = bHighContrast ? aImageILH : aImageIL; @@ -1551,7 +1517,6 @@ Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden, BOOL bHighContras /*-------------------------------------------------------------------- Beschreibung: Hilfsfunktion - Bereichsnamen aus dem Medium lesen --------------------------------------------------------------------*/ - static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ) { rBox.Clear(); @@ -1570,9 +1535,7 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ) aArr.DeleteAndDestroy(0, aArr.Count()); } } -/* -----------------21.05.99 10:16------------------- - * - * --------------------------------------------------*/ + SwInsertSectionTabDialog::SwInsertSectionTabDialog( Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) : SfxTabDialog( pParent, SW_RES(DLG_INSERT_SECTION), &rSet ), @@ -1603,15 +1566,11 @@ SwInsertSectionTabDialog::SwInsertSectionTabDialog( } SetCurPageId(TP_INSERT_SECTION); } -/* -----------------21.05.99 10:17------------------- - * - * --------------------------------------------------*/ + SwInsertSectionTabDialog::~SwInsertSectionTabDialog() { } -/* -----------------21.05.99 10:23------------------- - * - * --------------------------------------------------*/ + void SwInsertSectionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) { if(TP_INSERT_SECTION == nId) @@ -1632,17 +1591,12 @@ void SwInsertSectionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) else if(TP_SECTION_INDENTS == nId) ((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh); } -/* -----------------21.05.99 13:08------------------- - * - * --------------------------------------------------*/ void SwInsertSectionTabDialog::SetSectionData(SwSectionData const& rSect) { m_pSectionData.reset( new SwSectionData(rSect) ); } -/* -----------------21.05.99 13:10------------------- - * - * --------------------------------------------------*/ + short SwInsertSectionTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); @@ -1684,9 +1638,6 @@ short SwInsertSectionTabDialog::Ok() return nRet; } -/* -----------------21.05.99 10:31------------------- - * - * --------------------------------------------------*/ SwInsertSectionTabPage::SwInsertSectionTabPage( Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage( pParent, SW_RES(TP_INSERT_SECTION), rAttrSet ), @@ -1736,9 +1687,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( ChangeProtectHdl(&aProtectCB); aSubRegionED.EnableAutocomplete( sal_True, sal_True ); } -/* -----------------21.05.99 10:31------------------- - * - * --------------------------------------------------*/ + SwInsertSectionTabPage::~SwInsertSectionTabPage() { delete m_pDocInserter; @@ -1843,23 +1792,16 @@ BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) ((SwInsertSectionTabDialog*)GetTabDialog())->SetSectionData(aSection); return TRUE; } -/* -----------------21.05.99 10:32------------------- - * - * --------------------------------------------------*/ + void SwInsertSectionTabPage::Reset( const SfxItemSet& ) { } -/* -----------------21.05.99 11:22------------------- - * - * --------------------------------------------------*/ + SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwInsertSectionTabPage(pParent, rAttrSet); } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) { @@ -1868,17 +1810,11 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) aConditionFT.Enable(bHide); return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ IMPL_LINK( SwInsertSectionTabPage, ChangeEditInReadonlyHdl, CheckBox *, EMPTYARG ) { return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox ) { @@ -1887,9 +1823,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox ) aPasswdPB.Enable(bCheck); return 0; } -/* -----------------------------26.04.01 14:50-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) { sal_Bool bChange = pButton == &aPasswdPB; @@ -1920,9 +1854,6 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) m_aNewPasswd.realloc(0); return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ IMPL_LINK_INLINE_START( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG ) { @@ -1932,10 +1863,6 @@ IMPL_LINK_INLINE_START( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG ) } IMPL_LINK_INLINE_END( SwInsertSectionTabPage, NameEditHdl, Edit *, EMPTYARG ) -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ - IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) { if( pBox->IsChecked() ) @@ -1968,10 +1895,6 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ - IMPL_LINK( SwInsertSectionTabPage, FileSearchHdl, PushButton *, EMPTYARG ) { m_pOldDefDlgParent = Application::GetDefDialogParent(); @@ -1983,10 +1906,6 @@ IMPL_LINK( SwInsertSectionTabPage, FileSearchHdl, PushButton *, EMPTYARG ) return 0; } -/*--------------------------------------------------------------------- - ----------------------------------------------------------------------*/ - IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox ) { BOOL bDDE = pBox->IsChecked(); @@ -2307,9 +2226,6 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox ) return 0; } -/* -----------------21.05.99 13:59------------------- - * - * --------------------------------------------------*/ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) : SfxTabDialog(pParent, SW_RES(DLG_SECTION_PROPERTIES), &rSet), @@ -2334,15 +2250,11 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( RemoveTabPage(TP_COLUMN); } } -/* -----------------21.05.99 13:59------------------- - * - * --------------------------------------------------*/ + SwSectionPropertyTabDialog::~SwSectionPropertyTabDialog() { } -/* -----------------21.05.99 13:59------------------- - * - * --------------------------------------------------*/ + void SwSectionPropertyTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) { if( TP_BACKGROUND == nId ) @@ -2359,9 +2271,7 @@ void SwSectionPropertyTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) else if(TP_SECTION_INDENTS == nId) ((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh); } -/*-- 13.06.2003 09:59:08--------------------------------------------------- - -----------------------------------------------------------------------*/ SwSectionIndentTabPage::SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ) : SfxTabPage(pParent, SW_RES(TP_SECTION_INDENTS), rAttrSet), aIndentFL(this, SW_RES(FL_INDENT )), @@ -2376,15 +2286,11 @@ SwSectionIndentTabPage::SwSectionIndentTabPage( Window *pParent, const SfxItemSe aBeforeMF.SetModifyHdl(aLk); aAfterMF.SetModifyHdl(aLk); } -/*-- 13.06.2003 09:59:23--------------------------------------------------- - -----------------------------------------------------------------------*/ SwSectionIndentTabPage::~SwSectionIndentTabPage() { } -/*-- 13.06.2003 09:59:23--------------------------------------------------- - -----------------------------------------------------------------------*/ BOOL SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) { if(aBeforeMF.IsValueModified() || @@ -2397,9 +2303,7 @@ BOOL SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) } return TRUE; } -/*-- 13.06.2003 09:59:24--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet) { //this page doesn't show up in HTML mode @@ -2425,16 +2329,12 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet) aAfterMF.SaveValue(); IndentModifyHdl(0); } -/*-- 13.06.2003 09:59:24--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwSectionIndentTabPage(pParent, rAttrSet); } -/* -----------------13.06.2003 13:57----------------- - --------------------------------------------------*/ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) { //set sensible values at the preview @@ -2444,9 +2344,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) Size aPageSize(rPageRect.Width(), rPageRect.Height()); aPreviewWin.SetSize(aPageSize); } -/* -----------------13.06.2003 14:02----------------- - --------------------------------------------------*/ IMPL_LINK(SwSectionIndentTabPage, IndentModifyHdl, MetricField*, EMPTYARG) { aPreviewWin.SetLeftMargin( static_cast< long >(aBeforeMF.Denormalize(aBeforeMF.GetValue(FUNIT_TWIP))) ); @@ -2454,4 +2352,3 @@ IMPL_LINK(SwSectionIndentTabPage, IndentModifyHdl, MetricField*, EMPTYARG) aPreviewWin.Draw(TRUE); return 0; } - diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index df50e5e318da..85ed3778546d 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- Beschreibung: Feldeinfuegen bearbeiten --------------------------------------------------------------------*/ - sw::DropDownFieldDialog::DropDownFieldDialog( Window *pParent, SwWrtShell &rS, SwField* pField, BOOL bNextButton ) : @@ -105,10 +104,6 @@ sw::DropDownFieldDialog::~DropDownFieldDialog() { } -/*-------------------------------------------------------------------- - - --------------------------------------------------------------------*/ - void sw::DropDownFieldDialog::Apply() { if(pDropField) @@ -130,9 +125,7 @@ void sw::DropDownFieldDialog::Apply() } } } -/* -----------------17.06.2003 10:50----------------- - --------------------------------------------------*/ IMPL_LINK(sw::DropDownFieldDialog, ButtonHdl, PushButton*, pButton) { EndDialog(&aNextPB == pButton ? RET_OK : RET_YES ); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 4c807f381fe2..72db9792a126 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -69,8 +69,6 @@ using namespace ::com::sun::star::lang; /*-------------------------------------------------------------------- Beschreibung: Feldeinfuegen bearbeiten --------------------------------------------------------------------*/ - - SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) : SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), SW_RES(DLG_CHANGE_DB)), @@ -123,8 +121,6 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) : /*-------------------------------------------------------------------- Beschreibung: Datenbank-Listboxen initialisieren --------------------------------------------------------------------*/ - - void SwChangeDBDlg::FillDBPopup() { Reference<XNameAccess> xDBContext; @@ -176,11 +172,6 @@ void SwChangeDBDlg::FillDBPopup() } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) { String sDBName(rDBName.GetToken(0, DB_DELIM)); @@ -242,9 +233,7 @@ void __EXPORT SwChangeDBDlg::Apply() { UpdateFlds(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ + void SwChangeDBDlg::UpdateFlds() { SvStringsDtor aDBNames( (BYTE)aUsedDBTLB.GetSelectionCount(), 1 ); @@ -278,11 +267,6 @@ void SwChangeDBDlg::UpdateFlds() pSh->EndAllAction(); } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - - IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) { String sTableName, sColumnName; @@ -298,11 +282,6 @@ IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) return 0; } -/*------------------------------------------------------------------------ - Beschreibung: -------------------------------------------------------------------------*/ - - IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG ) { BOOL bEnable = FALSE; @@ -321,7 +300,6 @@ IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG ) /*-------------------------------------------------------------------- Beschreibung: Datenbankname fuer Anzeige wandeln --------------------------------------------------------------------*/ - void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) { String sTmp(rDBData.sDataSource); @@ -338,9 +316,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) aDocDBNameFT.SetText(sName); } -/*-- 27.05.2004 09:14:01--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwChangeDBDlg, AddDBHdl, PushButton *, EMPTYARG ) { String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource(); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 09d382a2f18d..309811e86e3a 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -48,9 +48,6 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_DB ), rCoreSet ), @@ -83,10 +80,6 @@ SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) : aAddDBPB.SetClickHdl(LINK(this, SwFldDBPage, AddDBHdl)); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - __EXPORT SwFldDBPage::~SwFldDBPage() { } @@ -94,7 +87,6 @@ __EXPORT SwFldDBPage::~SwFldDBPage() /*-------------------------------------------------------------------- Beschreibung: TabPage initialisieren --------------------------------------------------------------------*/ - void __EXPORT SwFldDBPage::Reset(const SfxItemSet&) { Init(); // Allgemeine initialisierung @@ -198,10 +190,6 @@ void __EXPORT SwFldDBPage::Reset(const SfxItemSet&) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) { String sTableName, sColumnName; @@ -271,29 +259,17 @@ BOOL __EXPORT SwFldDBPage::FillItemSet(SfxItemSet& ) return FALSE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* __EXPORT SwFldDBPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDBPage( pParent, rAttrSet ) ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldDBPage::GetGroup() { return GRP_DB; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) { // Alte ListBoxPos sichern @@ -419,10 +395,6 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB ) { aNewFormatRB.Check(); @@ -431,10 +403,6 @@ IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB ) return 0; } -/*--------------------------------------------------------------------- - Beschreibung: ----------------------------------------------------------------------*/ - void SwFldDBPage::CheckInsert() { BOOL bInsert = TRUE; @@ -464,10 +432,6 @@ void SwFldDBPage::CheckInsert() EnableInsert(bInsert); } -/*--------------------------------------------------------------------- - Beschreibung: ----------------------------------------------------------------------*/ - IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) { SvLBoxEntry* pColEntry; @@ -509,9 +473,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) } return 0; } -/*-- 27.05.2004 09:14:01--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG ) { String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource(); @@ -525,16 +487,12 @@ IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG ) /*-------------------------------------------------------------------- Beschreibung: Modify --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG ) { CheckInsert(); return 0; } -/* -----------------12.01.99 11:21------------------- - * - * --------------------------------------------------*/ void SwFldDBPage::FillUserData() { String sData( String::CreateFromAscii( @@ -549,9 +507,7 @@ void SwFldDBPage::FillUserData() sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } -/* -----------------12.12.2002 11:33----------------- - * - * --------------------------------------------------*/ + void SwFldDBPage::ActivateMailMergeAddress() { ULONG nData = TYP_DBFLD; @@ -560,9 +516,7 @@ void SwFldDBPage::ActivateMailMergeAddress() const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource(); aDatabaseTLB.Select(rData.sDataSource, rData.sCommand, aEmptyStr); } -/*-- 07.10.2003 13:59:04--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwFldDBPage::SetWrtShell(SwWrtShell& rSh) { aDatabaseTLB.SetWrtShell(rSh); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index a93248ca1995..8707d27ad5fb 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -61,9 +61,6 @@ using namespace nsSwDocInfoSubType; using namespace com::sun::star; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : SwFldPage( pWindow, SW_RES( TP_FLD_DOKINF ), rCoreSet ), @@ -97,18 +94,10 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : pItem->GetValue() >>= xCustomPropertySet; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - __EXPORT SwFldDokInfPage::~SwFldDokInfPage() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& ) { Init(); // Allgemeine initialisierung @@ -231,10 +220,6 @@ void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& ) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern @@ -258,9 +243,6 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) { USHORT nSubType = (USHORT)(ULONG)pSelEntry->GetUserData(); @@ -396,10 +378,6 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) { // Format-Listbox fuellen @@ -454,10 +432,6 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) return nSize; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& ) { if (!pSelEntry || (USHORT)(ULONG)pSelEntry->GetUserData() == USHRT_MAX) @@ -495,27 +469,17 @@ BOOL __EXPORT SwFldDokInfPage::FillItemSet(SfxItemSet& ) return FALSE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* __EXPORT SwFldDokInfPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokInfPage( pParent, rAttrSet ) ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldDokInfPage::GetGroup() { return GRP_REG; } -/* -----------------12.01.99 11:21------------------- - * - * --------------------------------------------------*/ + void SwFldDokInfPage::FillUserData() { String sData( String::CreateFromAscii( diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 20f9ebf3b786..49c3e311cb4f 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -40,9 +40,6 @@ namespace com{namespace sun{ namespace star{ namespace beans{ class XPropertySet; }}}} -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ class SwFldDokInfPage : public SwFldPage { diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index ed00b5c520b7..aeabdf343e4d 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -50,10 +50,6 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldDokPage::SwFldDokPage(Window* pWindow, const SfxItemSet& rCoreSet ) : SwFldPage( pWindow, SW_RES( TP_FLD_DOK ), rCoreSet ), @@ -89,18 +85,10 @@ SwFldDokPage::SwFldDokPage(Window* pWindow, const SfxItemSet& rCoreSet ) : aNumFormatLB.SetShowLanguageControl(TRUE); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - __EXPORT SwFldDokPage::~SwFldDokPage() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void __EXPORT SwFldDokPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); @@ -203,10 +191,6 @@ void __EXPORT SwFldDokPage::Reset(const SfxItemSet& ) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern @@ -461,20 +445,12 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldDokPage::AddSubType(USHORT nTypeId) { USHORT nPos = aSelectionLB.InsertEntry(SwFieldType::GetTypeStr(nTypeId)); aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) { USHORT nPos = aSelectionLB.GetSelectEntryPos(); @@ -509,10 +485,6 @@ IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldDokPage::FillFormatLB(USHORT nTypeId) { // Format-Listbox fuellen @@ -548,10 +520,6 @@ USHORT SwFldDokPage::FillFormatLB(USHORT nTypeId) return nSize; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG ) { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -584,10 +552,6 @@ IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& ) { BOOL bPage = FALSE; @@ -682,28 +646,17 @@ BOOL __EXPORT SwFldDokPage::FillItemSet(SfxItemSet& ) return FALSE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* __EXPORT SwFldDokPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldDokPage( pParent, rAttrSet ) ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldDokPage::GetGroup() { return GRP_DOC; } -/* -----------------12.01.99 10:09------------------- - * - * --------------------------------------------------*/ void SwFldDokPage::FillUserData() { String sData( String::CreateFromAscii( @@ -717,5 +670,3 @@ void SwFldDokPage::FillUserData() sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } - - diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 4cde2cc92f92..ed3d34309c8e 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -38,10 +38,6 @@ #include "numfmtlb.hxx" #include "fldpage.hxx" -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwFldDokPage : public SwFldPage { FixedText aTypeFT; diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 6c3f34f19cba..5469b1ec0aaa 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -60,16 +60,11 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - namespace swui { SwAbstractDialogFactory * GetFactory(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldEditDlg::SwFldEditDlg(SwView& rVw) : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), 0, 0), pSh (rVw.GetWrtShellPtr()), @@ -127,7 +122,6 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) : /*-------------------------------------------------------------------- Beschreibung: Controlls initialisieren --------------------------------------------------------------------*/ - void SwFldEditDlg::Init() { SwFldPage* pTabPage = (SwFldPage*)GetTabPage(); @@ -165,10 +159,6 @@ void SwFldEditDlg::Init() !pSh->HasReadonlySel() ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) { // TabPage erzeugen @@ -238,20 +228,12 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) return pTabPage; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldEditDlg::~SwFldEditDlg() { pSh->SetCareWin(NULL); pSh->EnterStdMode(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldEditDlg::EnableInsert(BOOL bEnable) { if( bEnable && pSh->IsReadOnlyAvailable() && pSh->HasReadonlySel() ) @@ -259,10 +241,6 @@ void SwFldEditDlg::EnableInsert(BOOL bEnable) GetOKButton()->Enable( bEnable ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldEditDlg::InsertHdl() { GetOKButton()->Click(); @@ -271,7 +249,6 @@ void SwFldEditDlg::InsertHdl() /*-------------------------------------------------------------------- Beschreibung: Aendern des Feldes anstossen --------------------------------------------------------------------*/ - IMPL_LINK( SwFldEditDlg, OKHdl, Button *, EMPTYARG ) { if (GetOKButton()->IsEnabled()) @@ -288,10 +265,6 @@ IMPL_LINK( SwFldEditDlg, OKHdl, Button *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - short SwFldEditDlg::Execute() { // Ohne TabPage kein Dialog @@ -301,7 +274,6 @@ short SwFldEditDlg::Execute() /*-------------------------------------------------------------------- Beschreibung: Traveling zwishen Feldern gleichen Typs --------------------------------------------------------------------*/ - IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) { BOOL bNext = pButton == &aNextBT; @@ -343,10 +315,6 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG ) { SwFldPage* pTabPage = (SwFldPage*)GetTabPage(); @@ -395,5 +363,3 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG ) delete pDlg; return 0; } - - diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 7ceb9300c477..69cb2b73a803 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -55,10 +55,6 @@ using namespace ::com::sun::star; using rtl::OUString; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage( pParent, SW_RES( TP_FLD_FUNC ), rCoreSet ), @@ -104,18 +100,10 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : // SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldFuncPage::~SwFldFuncPage() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldFuncPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); @@ -203,10 +191,6 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern @@ -415,10 +399,6 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG ) { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -429,10 +409,6 @@ IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldFuncPage, InsertMacroHdl, ListBox *, EMPTYARG ) { SelectHdl(); @@ -440,9 +416,7 @@ IMPL_LINK( SwFldFuncPage, InsertMacroHdl, ListBox *, EMPTYARG ) return 0; } -/* -----------------16.06.2003 16:24----------------- - --------------------------------------------------*/ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) { aListItemsLB.SetUpdateMode(FALSE); @@ -489,9 +463,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) ListEnableHdl(0); return 0; } -/* -----------------17.06.2003 08:36----------------- - --------------------------------------------------*/ IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG) { //enable "Add" button when text is in the Edit that's not already member of the box @@ -509,8 +481,6 @@ IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG) /*-------------------------------------------------------------------- Beschreibung: Typen in der SelectionBox erneuern --------------------------------------------------------------------*/ - - void SwFldFuncPage::UpdateSubType() { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -558,7 +528,6 @@ void SwFldFuncPage::UpdateSubType() /*-------------------------------------------------------------------- Beschreibung: MacroBrowser aufrufen, Listbox mit Macros fuellen --------------------------------------------------------------------*/ - IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) { Window* pDefModalDlgParent = Application::GetDefDialogParent(); @@ -575,10 +544,6 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -647,10 +612,6 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) return FALSE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - String SwFldFuncPage::TurnMacroString(const String &rMacro) { if (rMacro.Len()) @@ -676,28 +637,17 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro) return rMacro; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* SwFldFuncPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldFuncPage( pParent, rAttrSet ) ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldFuncPage::GetGroup() { return GRP_FKT; } -/* -----------------12.01.99 10:09------------------- - * - * --------------------------------------------------*/ void SwFldFuncPage::FillUserData() { String sData( String::CreateFromAscii( @@ -728,7 +678,3 @@ IMPL_LINK( SwFldFuncPage, ModifyHdl, Edit *, EMPTYARG ) return 0; } - - - - diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index c07ea6ce5481..e39d7ce500d2 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1675,10 +1675,6 @@ void SwFieldType::_GetFldName() } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL SwFldMgr::ChooseMacro(const String&) { BOOL bRet = FALSE; @@ -1724,10 +1720,6 @@ void SwFldMgr::SetMacroPath(const String& rPath) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - ULONG SwFldMgr::GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal) { double fValue; @@ -1774,9 +1766,6 @@ ULONG SwFldMgr::GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter return pFormatter->GetStandardFormat(nDefFormat, GetCurrLanguage()); } -/* -----------------------------01.03.01 16:46-------------------------------- - - ---------------------------------------------------------------------------*/ Reference<XNumberingTypeInfo> SwFldMgr::GetNumberingInfo() const { if(!xNumberingInfo.is()) diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 265a53dc6646..42fdd200cf69 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -56,10 +56,6 @@ using namespace ::com::sun::star; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldPage::SwFldPage( Window *pParent, const ResId &rId, const SfxItemSet &rAttrSet ) :SfxTabPage (pParent, rId, rAttrSet), @@ -77,10 +73,6 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId, // FreeResource(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldPage::~SwFldPage() { } @@ -322,10 +314,6 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, return bRet; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2, const ListBox* pLst3 ) { @@ -339,10 +327,6 @@ void SwFldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2, m_aLstStrArr[ i ].Erase(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3) { USHORT nPos = 0; @@ -401,19 +385,13 @@ void SwFldPage::EnableInsert(BOOL bEnable) m_bInsert = bEnable; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldPage, NumFormatHdl, ListBox *, EMPTYARG ) { InsertHdl(); return 0; } -/*-- 19.12.2005 14:05:47--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwFldPage::SetWrtShell( SwWrtShell* pShell ) { m_pWrtShell = pShell; diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index f2dc85e07f7c..01a010fe3c15 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -32,10 +32,6 @@ class ListBox; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - const int coLBCount = 3; class SwFldPage : public SfxTabPage diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index af0a8b3b2efa..657796ee1970 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -42,10 +42,6 @@ class SwTxtNode; // <-- -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwFldRefPage : public SwFldPage { FixedText aTypeFT; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 9888685c0128..c50cd78fb487 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -128,18 +128,10 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldDlg::~SwFldDlg() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL SwFldDlg::Close() { m_pBindings->GetDispatcher()-> @@ -148,10 +140,6 @@ BOOL SwFldDlg::Close() return TRUE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldDlg::Initialize(SfxChildWinInfo *pInfo) { Point aPos; @@ -198,10 +186,6 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo) SetPosPixel( aPos ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT nID ) { if ( nID == TP_FLD_DOKINF ) @@ -313,10 +297,6 @@ void SwFldDlg::Activate() } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldDlg::EnableInsert(BOOL bEnable) { if( bEnable ) @@ -331,17 +311,11 @@ void SwFldDlg::EnableInsert(BOOL bEnable) GetOKButton().Enable(bEnable); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldDlg::InsertHdl() { GetOKButton().Click(); } -/* -----------------27.11.2002 15:24----------------- - * - * --------------------------------------------------*/ + void SwFldDlg::ActivateDatabasePage() { m_bDataBaseMode = TRUE; @@ -358,9 +332,7 @@ void SwFldDlg::ActivateDatabasePage() RemoveTabPage(TP_FLD_REF); RemoveTabPage(TP_FLD_FUNC); } -/*-- 07.10.2003 14:01:44--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwFldDlg::PageCreated(USHORT nId, SfxTabPage& rPage) { if( TP_FLD_DB == nId) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index ad67d6e3f947..145547c2c604 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -52,9 +52,6 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage ( pParent, SW_RES( TP_FLD_VAR ), rCoreSet ), @@ -99,18 +96,10 @@ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : aNumFormatLB.SetShowLanguageControl(TRUE); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldVarPage::~SwFldVarPage() { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldVarPage::Reset(const SfxItemSet& ) { SavePos(&aTypeLB); @@ -204,10 +193,6 @@ void SwFldVarPage::Reset(const SfxItemSet& ) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern @@ -240,10 +225,6 @@ IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -611,7 +592,6 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) /*-------------------------------------------------------------------- Beschreibung: Typen in der SelectionBox erneuern --------------------------------------------------------------------*/ - void SwFldVarPage::UpdateSubType() { String sOldSel; @@ -715,10 +695,6 @@ void SwFldVarPage::UpdateSubType() aSelectionLB.SetUpdateMode(TRUE); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) { String sOldSel, sOldNumSel; @@ -851,7 +827,6 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) /*-------------------------------------------------------------------- Beschreibung: Modify --------------------------------------------------------------------*/ - IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) { String sValue(aValueED.GetText()); @@ -978,10 +953,6 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -1130,10 +1101,6 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) return TRUE; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG ) { BOOL bEnable = aChapterLevelLB.GetSelectEntryPos() != 0; @@ -1145,10 +1112,6 @@ IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwFldVarPage, SeparatorHdl, Edit *, EMPTYARG ) { BOOL bEnable = aSeparatorED.GetText().Len() != 0 || @@ -1158,10 +1121,6 @@ IMPL_LINK( SwFldVarPage, SeparatorHdl, Edit *, EMPTYARG ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) { USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); @@ -1293,30 +1252,17 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) return FALSE; } - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxTabPage* SwFldVarPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SwFldVarPage( pParent, rAttrSet ) ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - USHORT SwFldVarPage::GetGroup() { return GRP_VAR; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) : ListBox (pDialog, rResId), pDlg (pDialog), @@ -1324,10 +1270,6 @@ SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) { } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) { long nHandled = ListBox::PreNotify( rNEvt ); @@ -1355,9 +1297,7 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) return nHandled; } -/* -----------------12.01.99 11:14------------------- - * - * --------------------------------------------------*/ + void SwFldVarPage::FillUserData() { String sData(String::CreateFromAscii(USER_DATA_VERSION)); diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index b083c7ce7d3c..4648655b400c 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -41,10 +41,6 @@ class SwFldVarPage; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SelectionListBox : public ListBox { SwFldVarPage* pDlg; @@ -60,10 +56,6 @@ public: void ResetCallAddSelection() {bCallAddSelection = FALSE;} }; -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - class SwFldVarPage : public SwFldPage { friend class SelectionListBox; diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index 51379f7f301c..48e91d4424ae 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -51,10 +51,6 @@ SFX_IMPL_CHILDWINDOW(SwFldDlgWrapper, FN_INSERT_FIELD) -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) : SfxChildWindow(pParentWindow, nId), m_pDocSh(0) @@ -64,10 +60,6 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) : m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl)); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG ) { GetWindow()->Activate(); // Dialog aktualisieren @@ -78,7 +70,6 @@ IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG ) /*-------------------------------------------------------------------- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren --------------------------------------------------------------------*/ - BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *) { BOOL bRet = FALSE; @@ -94,10 +85,6 @@ BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *) return bRet; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SfxChildWinInfo SwFldDlgWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); @@ -105,11 +92,6 @@ SfxChildWinInfo SwFldDlgWrapper::GetInfo() const return aInfo; } - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId, SfxBindings* pB, SfxChildWinInfo* ) @@ -129,7 +111,6 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId, /*-------------------------------------------------------------------- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren --------------------------------------------------------------------*/ - BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { BOOL bRet; @@ -142,10 +123,6 @@ BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) return bRet; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void SwFldDlgWrapper::ShowPage(USHORT nPage) { pDlgInterface->ShowPage(nPage ? nPage : TP_FLD_REF); @@ -153,9 +130,6 @@ void SwFldDlgWrapper::ShowPage(USHORT nPage) SFX_IMPL_CHILDWINDOW(SwFldDataOnlyDlgWrapper, FN_INSERT_FIELD_DATA_ONLY) -/* -----------------04.02.2003 14:17----------------- - * - * --------------------------------------------------*/ SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); @@ -164,9 +138,7 @@ SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const aInfo.bVisible = FALSE; return aInfo; } -/* -----------------04.02.2003 14:17----------------- - * - * --------------------------------------------------*/ + SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId, SfxBindings* pB, SfxChildWinInfo* pInfo ) @@ -185,6 +157,7 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId, pDlg->Initialize( pInfo ); eChildAlignment = SFX_ALIGN_NOALIGNMENT; } + /* -----------------04.02.2003 14:17----------------- * re-init after doc activation * --------------------------------------------------*/ diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 099fb7c312f5..803102882028 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -90,9 +90,6 @@ using ::rtl::OUString; #endif #define SW_PROP_NAME_STR(nId) SwGetPropName((nId)).pName -/* -----------------04.11.99 11:28------------------- - - --------------------------------------------------*/ void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, const char* pPropName, const String& rValue) @@ -105,12 +102,14 @@ void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, xProps->setPropertyValue(uPropName, aValue); } } + void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, USHORT nId, const String& rValue) { lcl_SetProp( xInfo, xProps, SW_PROP_NAME_STR(nId), rValue); } + void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo, uno::Reference< XPropertySet > & xProps, USHORT nId, sal_Int16 nValue ) @@ -137,7 +136,7 @@ void lcl_SetBOOLProp( xProps->setPropertyValue(uPropName, aValue); } } -//----------------------------------------------------------------------------- + IMPL_LINK( SwMultiTOXTabDialog, CreateExample_Hdl, void*, EMPTYARG ) { try @@ -184,9 +183,6 @@ IMPL_LINK( SwMultiTOXTabDialog, CreateExample_Hdl, void*, EMPTYARG ) return 0; } -/* -------------------------------------------------- - - --------------------------------------------------*/ void SwMultiTOXTabDialog::CreateOrUpdateExample( TOXTypes nTOXIndex, sal_uInt16 nPage, sal_uInt16 nCurrentLevel) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 67ebed4d120f..3a62213b5913 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -110,10 +110,6 @@ static const sal_Unicode aDeliEnd = ']'; //fuer die form #define IDX_FILE_EXTENSION String::CreateFromAscii( \ RTL_CONSTASCII_STRINGPARAM( "*.sdi" )) - -/* -----------------14.06.99 13:10------------------- - - --------------------------------------------------*/ String lcl_CreateAutoMarkFileDlg( const String& rURL, const String& rFileString, sal_Bool bOpen ) { @@ -146,9 +142,7 @@ String lcl_CreateAutoMarkFileDlg( const String& rURL, rLastSaveDir = sSaveDir; return sRet; } -/* -----------------------------19.01.00 11:09-------------------------------- - ---------------------------------------------------------------------------*/ struct AutoMarkEntry { String sSearch; @@ -235,9 +229,7 @@ public: ~SwAutoMarkDlg_Impl(); }; -/* -----------------04.11.99 11:02------------------- - --------------------------------------------------*/ sal_uInt16 CurTOXType::GetFlatIndex() const { sal_uInt16 nRet = static_cast< sal_uInt16 >(eType); @@ -247,14 +239,9 @@ sal_uInt16 CurTOXType::GetFlatIndex() const } return nRet; } -/************************************************************************* -*************************************************************************/ #define EDIT_MINWIDTH 15 -/* -----------------14.06.99 12:12------------------- - - --------------------------------------------------*/ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, @@ -365,9 +352,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet if(aNewPos.X() < 0) SetPosPixel(aOldPos); } -/*-- 14.06.99 13:11:40--------------------------------------------------- - -----------------------------------------------------------------------*/ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() { SW_MOD()->GetModuleConfig()->SetShowIndexPreview(aShowExampleCB.IsChecked()); @@ -385,9 +370,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() delete pMgr; delete pExampleFrame; } -/*-- 14.06.99 13:11:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if( TP_BACKGROUND == nId ) @@ -411,9 +394,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ((SwTOXSelectTabPage&)rPage).SelectType((TOXTypes)nInitialTOXType); } } -/*-- 14.06.99 13:11:40--------------------------------------------------- - -----------------------------------------------------------------------*/ short SwMultiTOXTabDialog::Ok() { short nRet = SfxTabDialog::Ok(); @@ -444,9 +425,7 @@ short SwMultiTOXTabDialog::Ok() return nRet; } -/* -----------------16.06.99 11:59------------------- - --------------------------------------------------*/ SwForm* SwMultiTOXTabDialog::GetForm(CurTOXType eType) { sal_uInt16 nIndex = eType.GetFlatIndex(); @@ -454,9 +433,7 @@ SwForm* SwMultiTOXTabDialog::GetForm(CurTOXType eType) pFormArr[nIndex] = new SwForm(eType.eType); return pFormArr[nIndex]; } -/* -----------------09.09.99 11:29------------------- - --------------------------------------------------*/ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) { sal_uInt16 nIndex = eType.GetFlatIndex(); @@ -496,9 +473,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) } return *pDescArr[nIndex]; } -/* -----------------09.09.99 11:36------------------- - --------------------------------------------------*/ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( const SwTOXBase*pCurTOX) { @@ -527,10 +502,6 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( return pDesc; } -/* -----------------------------29.12.99 09:53-------------------------------- - - ---------------------------------------------------------------------------*/ - IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) { if(aShowExampleCB.IsChecked()) @@ -611,10 +582,6 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) return 0; } - -/* -----------------05.07.99 09:49------------------- - - --------------------------------------------------*/ sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName) { SwTxtFmtColl* pColl = rSh.GetParaStyle(rName); @@ -630,9 +597,7 @@ sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName) return sal_False; } -/* -----------------14.07.99 16:01------------------- - --------------------------------------------------*/ class SwIndexTreeLB : public SvTreeListBox { const HeaderBar* pHeaderBar; @@ -644,9 +609,7 @@ public: virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;} }; -/* -----------------14.07.99 16:03------------------- - --------------------------------------------------*/ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) { long nData = (long)pEntry->GetUserData(); @@ -660,9 +623,7 @@ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) nData += pTab->GetPos(); return nData; } -/* -----------------25.08.99 11:14------------------- - --------------------------------------------------*/ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) { SvLBoxEntry* pEntry = FirstSelected(); @@ -697,9 +658,6 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) SvTreeListBox::KeyInput(rKEvt); } -/* -----------------16.07.99 10:01------------------- - - --------------------------------------------------*/ class SwHeaderTree : public Control { HeaderBar aStylesHB; @@ -713,9 +671,7 @@ public: virtual void GetFocus(); }; -/* -----------------16.07.99 10:11------------------- - --------------------------------------------------*/ SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) : Control(pParent, rResId), aStylesHB( this, ResId(HB_STYLES, *rResId.GetResMgr())), @@ -732,17 +688,13 @@ SwHeaderTree::SwHeaderTree(Window* pParent, const ResId rResId) : aStylesTLB.SetSizePixel(aTLBSize); aStylesTLB.SetHeaderBar(&aStylesHB); } -/* -----------------25.08.99 10:38------------------- - --------------------------------------------------*/ void SwHeaderTree::GetFocus() { Control::GetFocus(); aStylesTLB.GrabFocus(); } -/* -----------------13.07.99 15:29------------------- - --------------------------------------------------*/ class SwAddStylesDlg_Impl : public SfxModalDialog { OKButton aOk; @@ -765,9 +717,7 @@ public: SwAddStylesDlg_Impl(Window* pParent, SwWrtShell& rWrtSh, String rStringArr[]); ~SwAddStylesDlg_Impl(); }; -/* -----------------13.07.99 15:39------------------- - --------------------------------------------------*/ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, SwWrtShell& rWrtSh, String rStringArr[]) : SfxModalDialog(pParent, SW_RES(DLG_ADD_IDX_STYLES)), @@ -851,15 +801,10 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, rTLB.GetModel()->Resort(); } -/* -----------------13.07.99 15:39------------------- - - --------------------------------------------------*/ SwAddStylesDlg_Impl::~SwAddStylesDlg_Impl() { } -/* -----------------13.07.99 15:39------------------- - --------------------------------------------------*/ IMPL_LINK(SwAddStylesDlg_Impl, OkHdl, OKButton*, EMPTYARG) { for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -884,17 +829,13 @@ IMPL_LINK(SwAddStylesDlg_Impl, OkHdl, OKButton*, EMPTYARG) EndDialog(RET_OK); return 0; } -/* -----------------16.07.99 09:27------------------- - --------------------------------------------------*/ IMPL_LINK(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, EMPTYARG) { aHeaderTree.GetTreeListBox().Invalidate(); return 0; } -/* -----------------13.07.99 15:39------------------- - --------------------------------------------------*/ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) { sal_Bool bLeft = pBtn == &aLeftPB; @@ -922,9 +863,6 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) return 0; } -/*-- 14.06.99 13:11:40--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, SW_RES(TP_TOX_SELECT), rAttrSet), @@ -1051,17 +989,13 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS aTypeLB.SelectEntryPos(0); aTitleED.SaveValue(); } -/*-- 14.06.99 13:11:41--------------------------------------------------- - -----------------------------------------------------------------------*/ SwTOXSelectTabPage::~SwTOXSelectTabPage() { delete pIndexRes; delete pIndexEntryWrapper; } -/* -----------------21.10.99 17:03------------------- - --------------------------------------------------*/ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh) { sal_uInt16 nUserTypeCount = rSh.GetTOXTypeCount(TOX_USER); @@ -1079,16 +1013,12 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh) } } } -/* -----------------14.06.99 13:10------------------- - --------------------------------------------------*/ sal_Bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& ) { return sal_True; } -/* -----------------25.08.99 14:31------------------- - --------------------------------------------------*/ long lcl_TOXTypesToUserData(CurTOXType eType) { sal_uInt16 nRet = TOX_INDEX; @@ -1109,7 +1039,7 @@ long lcl_TOXTypesToUserData(CurTOXType eType) } return nRet; } -//----------------------------------------------------------------- + void SwTOXSelectTabPage::SelectType(TOXTypes eSet) { CurTOXType eCurType (eSet, 0); @@ -1121,10 +1051,6 @@ void SwTOXSelectTabPage::SelectType(TOXTypes eSet) TOXTypeHdl(&aTypeLB); } -/*-- 14.06.99 13:10:45--------------------------------------------------- - - -----------------------------------------------------------------------*/ -//----------------------------------------------------------------- CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) { CurTOXType eRet; @@ -1147,9 +1073,7 @@ CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData) } return eRet; } -/* -----------------02.09.99 08:16------------------- - --------------------------------------------------*/ void SwTOXSelectTabPage::ApplyTOXDescription() { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -1264,9 +1188,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription() } } } -/* -----------------09.09.99 11:57------------------- - --------------------------------------------------*/ void SwTOXSelectTabPage::FillTOXDescription() { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -1377,9 +1299,7 @@ void SwTOXSelectTabPage::FillTOXDescription() if(pEntryData) rDesc.SetSortAlgorithm(*pEntryData); } -/* -----------------05.07.99 15:09------------------- - --------------------------------------------------*/ void SwTOXSelectTabPage::Reset( const SfxItemSet& ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -1412,16 +1332,12 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet& ) TOXTypeHdl(&aTypeLB); CheckBoxHdl(&aAddStylesCB); } -/*-- 14.06.99 13:10:52--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTOXSelectTabPage::ActivatePage( const SfxItemSet& ) { //nothing to do } -/*-- 14.06.99 13:11:00--------------------------------------------------- - -----------------------------------------------------------------------*/ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) @@ -1430,16 +1346,12 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) FillTOXDescription(); return LEAVE_PAGE; } -/* -----------------14.06.99 13:10------------------- - --------------------------------------------------*/ SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXSelectTabPage(pParent, rAttrSet); } -/* -----------------14.06.99 13:10------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -1547,9 +1459,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) ModifyHdl(0); return 0; } -/* -----------------30.11.99 12:48------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, ModifyHdl, void*, EMPTYARG) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -1560,9 +1470,7 @@ IMPL_LINK(SwTOXSelectTabPage, ModifyHdl, void*, EMPTYARG) } return 0; } -/* -----------------05.07.99 10:13------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -1592,9 +1500,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) ModifyHdl(0); return 0; }; -/* -----------------14.07.99 14:21------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, RadioButtonHdl, RadioButton*, EMPTYARG ) { sal_Bool bEnable = aFromCaptionsRB.IsChecked(); @@ -1605,9 +1511,7 @@ IMPL_LINK(SwTOXSelectTabPage, RadioButtonHdl, RadioButton*, EMPTYARG ) ModifyHdl(0); return 0; } -/* -----------------------------06.06.01 09:33-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) { Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) ); @@ -1646,9 +1550,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) ModifyHdl(0); return 0; }; -/* -----------------14.06.99 13:10------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) { DBG_WARNING("not implemented"); @@ -1698,9 +1600,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox) // delete pDlg; // return 0; //} -/* -----------------14.06.99 13:10------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton) { SwAddStylesDlg_Impl* pDlg = new SwAddStylesDlg_Impl(pButton, @@ -1711,9 +1611,6 @@ IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton) ModifyHdl(0); return 0; } -/* -----------------------------19.01.00 10:59-------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu) { @@ -1752,9 +1649,6 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu) return 0; } -/* -----------------16.06.99 10:46------------------- - - --------------------------------------------------*/ class SwTOXEdit : public Edit { SwFormToken aFormToken; @@ -1793,13 +1687,12 @@ public: void AdjustSize(); }; -//--------------------------------------------------- void SwTOXEdit::RequestHelp( const HelpEvent& rHEvt ) { if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt)) Edit::RequestHelp(rHEvt); } -//--------------------------------------------------- + void SwTOXEdit::KeyInput( const KeyEvent& rKEvt ) { const Selection& rSel = GetSelection(); @@ -1826,9 +1719,7 @@ void SwTOXEdit::KeyInput( const KeyEvent& rKEvt ) } Edit::KeyInput(rKEvt); } -/* -----------------16.07.99 12:41------------------- - --------------------------------------------------*/ void SwTOXEdit::AdjustSize() { Size aSize(GetSizePixel()); @@ -1838,8 +1729,6 @@ void SwTOXEdit::AdjustSize() SetSizePixel(aSize); } -//--------------------------------------------------- -//--------------------------------------------------- class SwTOXButton : public PushButton { SwFormToken aFormToken; @@ -1934,7 +1823,6 @@ public: } }; -//--------------------------------------------------- void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) { sal_Bool bCall = sal_False; @@ -1960,23 +1848,19 @@ void SwTOXButton::KeyInput( const KeyEvent& rKEvt ) else PushButton::KeyInput(rKEvt); } -//--------------------------------------------------- + void SwTOXButton::RequestHelp( const HelpEvent& rHEvt ) { if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt)) Button::RequestHelp(rHEvt); } -/* -----------------------------23.12.99 14:28-------------------------------- - ---------------------------------------------------------------------------*/ SwIdxTreeListBox::SwIdxTreeListBox(SwTOXEntryTabPage* pPar, const ResId& rResId) : SvTreeListBox(pPar, rResId), pParent(pPar) { } -/* -----------------------------23.12.99 14:19-------------------------------- - ---------------------------------------------------------------------------*/ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { if( rHEvt.GetMode() & HELPMODE_QUICK ) @@ -2014,7 +1898,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) else SvTreeListBox::RequestHelp(rHEvt); } -//--------------------------------------------------- + SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, SW_RES(TP_TOX_ENTRY), rAttrSet), aLevelFT(this, SW_RES(FT_LEVEL )), @@ -2222,23 +2106,16 @@ IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid) return 0; } -/*-- 16.06.99 10:47:33--------------------------------------------------- - - -----------------------------------------------------------------------*/ SwTOXEntryTabPage::~SwTOXEntryTabPage() { } -/*-- 16.06.99 10:47:33--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) { // nothing to do return sal_True; } -/*-- 16.06.99 10:47:34--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTOXEntryTabPage::Reset( const SfxItemSet& ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -2263,27 +2140,21 @@ void SwTOXEntryTabPage::Reset( const SfxItemSet& ) aRelToStyleCB.Check(m_pCurrentForm->IsRelTabPos()); aCommaSeparatedCB.Check(m_pCurrentForm->IsCommaSeparated()); } -/*-- 16.06.99 10:47:34--------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_ChgWidth(Window& rWin, long nDiff) { Size aTempSz(rWin.GetSizePixel()); aTempSz.Width() += nDiff; rWin.SetSizePixel(aTempSz); } -/* ---------------------------------------------------------------------- - -----------------------------------------------------------------------*/ void lcl_ChgXPos(Window& rWin, long nDiff) { Point aTempPos(rWin.GetPosPixel()); aTempPos.X() += nDiff; rWin.SetPosPixel(aTempPos); } -/* ---------------------------------------------------------------------- - -----------------------------------------------------------------------*/ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -2471,9 +2342,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) aTokenWIN.SetInvalid(); LevelHdl(&aLevelLB); } -/* -----------------30.11.99 15:04------------------- - --------------------------------------------------*/ void SwTOXEntryTabPage::UpdateDescriptor() { WriteBackLevel(); @@ -2513,24 +2382,18 @@ void SwTOXEntryTabPage::UpdateDescriptor() if(aCommaSeparatedCB.IsVisible()) pCurrentForm->SetCommaSeparated(aCommaSeparatedCB.IsChecked()); } -/*-- 16.06.99 10:47:34--------------------------------------------------- - -----------------------------------------------------------------------*/ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) { UpdateDescriptor(); return LEAVE_PAGE; } -/*-- 16.06.99 10:47:34--------------------------------------------------- - -----------------------------------------------------------------------*/ SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXEntryTabPage(pParent, rAttrSet); } -/*-- 16.06.99 10:47:35--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) { if( LISTBOX_ENTRY_NOTFOUND != aCharStyleLB.GetSelectEntryPos()) @@ -2549,9 +2412,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) } return 0; } -/* -----------------04.10.99 11:34------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) { sal_Bool bInsert = pButton == &aAuthInsertPB; @@ -2581,9 +2442,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) ModifyHdl(0); return 0; } -/* -----------------------------17.01.00 13:44-------------------------------- - ---------------------------------------------------------------------------*/ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken) { //fill it into the ListBox @@ -2651,9 +2510,7 @@ IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn) ModifyHdl(0); return 0; } -/* -----------------------------14.01.00 11:53-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, AllLevelsHdl, PushButton*, EMPTYARG) { //get current level @@ -2669,9 +2526,6 @@ IMPL_LINK(SwTOXEntryTabPage, AllLevelsHdl, PushButton*, EMPTYARG) return 0; } -/* -----------------02.12.99 12:40------------------- - - --------------------------------------------------*/ void SwTOXEntryTabPage::WriteBackLevel() { if(aTokenWIN.IsValid()) @@ -2682,9 +2536,7 @@ void SwTOXEntryTabPage::WriteBackLevel() m_pCurrentForm->SetPattern(nLastLevel + 1, sNewToken ); } } -/*-- 16.06.99 10:47:35--------------------------------------------------- - -----------------------------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) { if(bInLevelHdl) @@ -2728,9 +2580,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) pBox->GrabFocus(); return 0; } -/* -----------------20.10.99 13:16------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, SortKeyHdl, RadioButton*, pButton) { sal_Bool bEnable = &aSortContentRB == pButton; @@ -2749,9 +2599,7 @@ IMPL_LINK(SwTOXEntryTabPage, SortKeyHdl, RadioButton*, pButton) aThirdSortDownRB.Enable(bEnable); return 0; } -/* -----------------01.07.99 12:21------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken) { if(pToken->sCharStyleName.Len()) @@ -2885,9 +2733,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken) return 0; } -/* -----------------01.07.99 12:36------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox*, pBox) { String sEntry = pBox->GetSelectEntry(); @@ -2908,9 +2754,7 @@ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox*, pBox) ModifyHdl(0); return 0; } -/* -----------------------------11.01.00 12:54-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox*, pBox) { sal_uInt16 nPos = pBox->GetSelectEntryPos(); @@ -2956,9 +2800,6 @@ IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox*, pBox) return 0; } -/* -----------------19.08.99 15:37------------------- - - --------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, MetricField*, pField) { Control* pCtrl = aTokenWIN.GetActiveControl(); @@ -2973,9 +2814,7 @@ IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, MetricField*, pField) ModifyHdl(0); return 0; } -/* -----------------09.09.99 15:37------------------- - --------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox) { Control* pCtrl = aTokenWIN.GetActiveControl(); @@ -2995,9 +2834,6 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox) return 0; } -/*-- 16.06.99 10:47:36--------------------------------------------------- - - -----------------------------------------------------------------------*/ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox) { //the most right style::TabStop is usually right aligned @@ -3016,9 +2852,7 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox) ModifyHdl(0); return 0; } -/* -----------------16.06.99 11:00------------------- - --------------------------------------------------*/ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) { SwDocShell* pDocSh = rSh.GetView().GetDocShell(); @@ -3036,9 +2870,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) aMainEntryStyleLB.SelectEntry( SwStyleNameMapper::GetUIName( RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyStr )); } -/* -----------------------------23.12.99 14:23-------------------------------- - ---------------------------------------------------------------------------*/ String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const { String sRet; @@ -3055,9 +2887,6 @@ String SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const } return sRet; } -/* -----------------16.06.99 15:18------------------- - - --------------------------------------------------*/ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) : Window( pParent, rResId ), @@ -3092,9 +2921,7 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) : aLeftScrollWin.SetClickHdl(aLink); aRightScrollWin.SetClickHdl(aLink); } -/* -----------------01.07.99 12:17------------------- - --------------------------------------------------*/ SwTokenWindow::~SwTokenWindow() { // for(sal_uInt16 i = GetItemCount(); i ; i--) @@ -3113,9 +2940,7 @@ SwTokenWindow::~SwTokenWindow() delete pControl; } } -/* -----------------16.06.99 13:56------------------- - --------------------------------------------------*/ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) { SetActiveControl(0); @@ -3198,9 +3023,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) } AdjustScrolling(); } -/* -----------------19.08.99 13:00------------------- - --------------------------------------------------*/ void SwTokenWindow::SetActiveControl(Control* pSet) { if( pSet != pActiveCtrl ) @@ -3222,9 +3045,6 @@ void SwTokenWindow::SetActiveControl(Control* pSet) } } -/* -----------------17.06.99 09:53------------------- - - --------------------------------------------------*/ Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rToken) { Control* pRet = 0; @@ -3278,9 +3098,7 @@ Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rT } return pRet; } -/* -----------------16.07.99 11:50------------------- - --------------------------------------------------*/ void SwTokenWindow::InsertAtSelection( const String& rText, const SwFormToken& rToken) @@ -3452,9 +3270,7 @@ void SwTokenWindow::InsertAtSelection( AdjustPositions(); } -/* -----------------19.08.99 12:42------------------- - --------------------------------------------------*/ void SwTokenWindow::RemoveControl(SwTOXButton* pDel, sal_Bool bInternalCall ) { if(bInternalCall && TOX_AUTHORITIES == pForm->GetTOXType()) @@ -3487,9 +3303,6 @@ void SwTokenWindow::RemoveControl(SwTOXButton* pDel, sal_Bool bInternalCall ) aModifyHdl.Call(0); } -/* -----------------16.07.99 12:39------------------- - - --------------------------------------------------*/ void SwTokenWindow::AdjustPositions() { if(aControlList.Count() > 1) @@ -3505,9 +3318,7 @@ void SwTokenWindow::AdjustPositions() AdjustScrolling(); } }; -/* -----------------------------16.08.00 13:22-------------------------------- - ---------------------------------------------------------------------------*/ void SwTokenWindow::MoveControls(long nOffset) { // move the complete list @@ -3519,9 +3330,7 @@ void SwTokenWindow::MoveControls(long nOffset) pCtrl->SetPosPixel(aPos); }while(0 != (pCtrl = aControlList.Next())); } -/* -----------------------------14.01.00 13:03-------------------------------- - ---------------------------------------------------------------------------*/ void SwTokenWindow::AdjustScrolling() { if(aControlList.Count() > 1) @@ -3562,9 +3371,7 @@ void SwTokenWindow::AdjustScrolling() } } } -/* -----------------------------14.01.00 13:57-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) { if(aControlList.Count()) @@ -3654,9 +3461,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) } return 0; } -/* -----------------17.06.99 11:59------------------- - --------------------------------------------------*/ String SwTokenWindow::GetPattern() const { String sRet; @@ -3697,7 +3502,7 @@ sal_Bool SwTokenWindow::Contains(FormTokenType eSearchFor) const } return bRet; } -//--------------------------------------------------- + BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl, const SwFormToken& rToken, const HelpEvent& rHEvt) @@ -3745,9 +3550,7 @@ BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl, } return bRet; } -/* -----------------------------14.01.00 12:22-------------------------------- - ---------------------------------------------------------------------------*/ void SwTokenWindow::Resize() { Size aCompleteSize(GetOutputSizePixel()); @@ -3765,9 +3568,6 @@ void SwTokenWindow::Resize() aCtrlParentWin.SetSizePixel(aMiddleSize); } -/* -----------------16.06.99 15:23------------------- - - --------------------------------------------------*/ IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit) { ((SwTOXEdit*)pEdit)->AdjustSize(); @@ -3776,9 +3576,7 @@ IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit) aModifyHdl.Call(0); return 0; } -/* -----------------16.06.99 15:56------------------- - --------------------------------------------------*/ IMPL_LINK(SwTokenWindow, NextItemHdl, SwTOXEdit*, pEdit) { sal_uInt16 nPos = (sal_uInt16)aControlList.GetPos(pEdit); @@ -3794,9 +3592,7 @@ IMPL_LINK(SwTokenWindow, NextItemHdl, SwTOXEdit*, pEdit) } return 0; } -/* -----------------17.06.99 08:58------------------- - --------------------------------------------------*/ IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit) { for(sal_uInt16 i = 0; i < aControlList.Count(); i++) @@ -3812,9 +3608,7 @@ IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit) SetActiveControl(pEdit); return 0; } -/* -----------------17.06.99 10:05------------------- - --------------------------------------------------*/ IMPL_LINK(SwTokenWindow, NextItemBtnHdl, SwTOXButton*, pBtn ) { sal_uInt16 nPos = (sal_uInt16)aControlList.GetPos(pBtn); @@ -3839,9 +3633,6 @@ IMPL_LINK(SwTokenWindow, NextItemBtnHdl, SwTOXButton*, pBtn ) return 0; } -/* -----------------17.06.99 10:04------------------- - - --------------------------------------------------*/ IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, SwTOXButton*, pBtn ) { for(sal_uInt16 i = 0; i < aControlList.Count(); i++) @@ -3857,9 +3648,7 @@ IMPL_LINK(SwTokenWindow, TbxFocusBtnHdl, SwTOXButton*, pBtn ) SetActiveControl(pBtn); return 0; } -/* -----------------------------28.01.2002 12:22------------------------------ - ---------------------------------------------------------------------------*/ void SwTokenWindow::GetFocus() { if(GETFOCUS_TAB & GetGetFocusFlags()) @@ -3873,9 +3662,7 @@ void SwTokenWindow::GetFocus() } } } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ + SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) : SfxTabPage(pParent, SW_RES(TP_TOX_STYLES), rAttrSet), aLevelFT2(this, SW_RES(FT_LEVEL )), @@ -3900,30 +3687,22 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS aLevelLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl)); aParaLayLB.SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl)); } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ + SwTOXStylesTabPage::~SwTOXStylesTabPage() { delete m_pCurrentForm; } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ + sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) { return sal_True; } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ + void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) { ActivatePage(rSet); } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ + void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) { m_pCurrentForm = new SwForm(GetForm()); @@ -3990,26 +3769,19 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) EnableSelectHdl(&aParaLayLB); } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ + int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { GetForm() = *m_pCurrentForm; return LEAVE_PAGE; } -/* -----------------25.03.99 15:17------------------- - * - * --------------------------------------------------*/ SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return new SwTOXStylesTabPage(pParent, rAttrSet); } -/* -----------------26.03.99 12:47------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) { if( LISTBOX_ENTRY_NOTFOUND != aParaLayLB.GetSelectEntryPos()) @@ -4056,9 +3828,7 @@ IMPL_LINK( SwTOXStylesTabPage, AssignHdl, Button *, EMPTYARG ) } return 0; } -/* -----------------26.03.99 09:10------------------- - * - * --------------------------------------------------*/ + IMPL_LINK( SwTOXStylesTabPage, StdHdl, Button *, EMPTYARG ) { sal_uInt16 nPos = aLevelLB.GetSelectEntryPos(); @@ -4075,9 +3845,7 @@ IMPL_LINK( SwTOXStylesTabPage, StdHdl, Button *, EMPTYARG ) } return 0; } -/* -----------------26.03.99 09:11------------------- - * - * --------------------------------------------------*/ + IMPL_LINK_INLINE_START( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG ) { String aTmpName( aParaLayLB.GetSelectEntry() ); @@ -4089,6 +3857,7 @@ IMPL_LINK_INLINE_START( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG ) return 0; } IMPL_LINK_INLINE_END( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG ) + /*-------------------------------------------------------------------- Beschreibung: nur wenn selektiert enable --------------------------------------------------------------------*/ @@ -4105,9 +3874,7 @@ IMPL_LINK( SwTOXStylesTabPage, EnableSelectHdl, ListBox *, EMPTYARG ) aEditStyleBT.Enable(aParaLayLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); return 0; } -/* -----------------------------18.01.00 16:54-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwTOXStylesTabPage, ModifyHdl, void*, EMPTYARG) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); @@ -4118,9 +3885,7 @@ IMPL_LINK(SwTOXStylesTabPage, ModifyHdl, void*, EMPTYARG) } return 0; } -/****************************************************************************** -******************************************************************************/ #define ITEM_SEARCH 1 #define ITEM_ALTERNATIVE 2 #define ITEM_PRIM_KEY 3 @@ -4189,17 +3954,13 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId, HIB_STDSTYLE, HEADERBAR_APPEND ); } -/* -----------------------------19.01.00 11:29-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SwEntryBrowseBox::SeekRow( long nRow ) { nCurrentRow = nRow; return TRUE; } -/* -----------------------------19.01.00 15:32-------------------------------- - ---------------------------------------------------------------------------*/ String SwEntryBrowseBox::GetCellText(long nRow, USHORT nColumn) const { const String* pRet = &aEmptyStr; @@ -4220,9 +3981,6 @@ String SwEntryBrowseBox::GetCellText(long nRow, USHORT nColumn) const return *pRet; } -/* -----------------------------19.01.00 11:29-------------------------------- - - ---------------------------------------------------------------------------*/ void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { @@ -4230,16 +3988,12 @@ void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_CENTER; rDev.DrawText( rRect, sPaint, nStyle ); } -/* -----------------------------19.01.00 14:51-------------------------------- - ---------------------------------------------------------------------------*/ ::svt::CellController* SwEntryBrowseBox::GetController(long /*nRow*/, sal_uInt16 nCol) { return nCol < ITEM_CASE ? xController : xCheckController; } -/* -----------------------------19.01.00 15:36-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SwEntryBrowseBox::SaveModified() { SetModified(); @@ -4283,9 +4037,7 @@ sal_Bool SwEntryBrowseBox::SaveModified() } return sal_True; } -/* -----------------------------19.01.00 14:32-------------------------------- - ---------------------------------------------------------------------------*/ void SwEntryBrowseBox::InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) { @@ -4304,9 +4056,7 @@ void SwEntryBrowseBox::InitController( rTxt == sYes ); } } -/* -----------------------------19.01.00 12:19-------------------------------- - ---------------------------------------------------------------------------*/ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) { AutoMarkEntry* pToInsert = 0; @@ -4359,9 +4109,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) aEntryArr.Insert(pToInsert, aEntryArr.Count()); RowInserted(0, aEntryArr.Count() + 1, sal_True); } -/* -----------------------------19.01.00 12:19-------------------------------- - ---------------------------------------------------------------------------*/ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) { //check if the current controller is modified @@ -4401,9 +4149,7 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) rOutStr.WriteByteStringLine( sWrite, eTEnc ); } } -/* -----------------------------21.01.00 11:49-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SwEntryBrowseBox::IsModified()const { if(bModified) @@ -4419,9 +4165,7 @@ sal_Bool SwEntryBrowseBox::IsModified()const pController = xCheckController; return pController ->IsModified(); } -/* -----------------------------19.01.00 11:29-------------------------------- - ---------------------------------------------------------------------------*/ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkURL, const String& rAutoMarkType, sal_Bool bCreate) : ModalDialog(pParent, SW_RES(DLG_CREATE_AUTOMARK)), @@ -4456,15 +4200,11 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkU if(bError) EndDialog(RET_CANCEL); } -/* -----------------------------19.01.00 11:12-------------------------------- - ---------------------------------------------------------------------------*/ SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl() { } -/* -----------------------------19.01.00 16:43-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwAutoMarkDlg_Impl, OkHdl, OKButton*, EMPTYARG) { sal_Bool bError = sal_False; diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx index adf5ee1ae91d..5a7fb4bbe2e0 100644 --- a/sw/source/ui/index/idxmrk.cxx +++ b/sw/source/ui/index/idxmrk.cxx @@ -67,10 +67,6 @@ #include <ndtxt.hxx> #include <breakit.hxx> - -/* -----------------07.09.99 08:15------------------- - - --------------------------------------------------*/ SFX_IMPL_CHILDWINDOW(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG) SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, @@ -88,9 +84,7 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, // -> Show() will invoke StateChanged() and save pos eChildAlignment = SFX_ALIGN_NOALIGNMENT; } -/* -----------------07.09.99 09:14------------------- - --------------------------------------------------*/ SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); @@ -103,10 +97,6 @@ void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) pAbstDlg->ReInitDlg(rWrtShell); } - -/* -----------------07.09.99 08:15------------------- - - --------------------------------------------------*/ SFX_IMPL_CHILDWINDOW(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG) SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, @@ -123,17 +113,13 @@ SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, eChildAlignment = SFX_ALIGN_NOALIGNMENT; } -/* -----------------07.09.99 09:14------------------- - --------------------------------------------------*/ SfxChildWinInfo SwInsertAuthMarkWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); return aInfo; } -/* -----------------19.10.99 11:16------------------- - --------------------------------------------------*/ void SwInsertAuthMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) { pAbstDlg->ReInitDlg(rWrtShell); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 2a9f4e2bf971..28f7f30db29a 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -238,8 +238,6 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, Beschreibung: Controls neu initialisieren mit der aktuellen Markierung --------------------------------------------------------------------*/ - - void SwIndexMarkDlg::InitControls() { DBG_ASSERT(pSh && pTOXMgr, "Shell nicht da?"); @@ -424,7 +422,6 @@ String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText ) /* -----------------07.09.99 10:43------------------- Change the content of aEntryED if text is selected --------------------------------------------------*/ - void SwIndexMarkDlg::Activate() { // aktuelle Selektion (1.Element) anzeigen ???? @@ -464,8 +461,6 @@ void SwIndexMarkDlg::Apply() /*-------------------------------------------------------------------- Beschreibung: Aenderungen uebernehmen --------------------------------------------------------------------*/ - - void SwIndexMarkDlg::InsertUpdate() { pSh->StartUndo(bDel ? UNDO_INDEX_ENTRY_DELETE : UNDO_INDEX_ENTRY_INSERT); @@ -585,8 +580,6 @@ void SwIndexMarkDlg::InsertMark() /*-------------------------------------------------------------------- Beschreibung: Marke Updaten --------------------------------------------------------------------*/ - - void SwIndexMarkDlg::UpdateMark() { String aAltText(aEntryED.GetText()); @@ -629,8 +622,6 @@ void SwIndexMarkDlg::UpdateMark() /*-------------------------------------------------------------------- Beschreibung: Neue Keys eintragen --------------------------------------------------------------------*/ - - void SwIndexMarkDlg::UpdateKeyBoxes() { String aKey(aKeyDCB.GetText()); @@ -649,9 +640,7 @@ void SwIndexMarkDlg::UpdateKeyBoxes() aKey2DCB.InsertEntry(aKey); } } -/* -----------------13.10.99 15:10------------------- - --------------------------------------------------*/ class SwNewUserIdxDlg : public ModalDialog { OKButton aOKPB; @@ -707,9 +696,7 @@ IMPL_LINK( SwIndexMarkDlg, NewUserIdxHdl, Button*, EMPTYARG) delete pDlg; return 0; } -/* -----------------------------17.01.00 12:18-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SwIndexMarkDlg, SearchTypeHdl, CheckBox*, pBox) { sal_Bool bEnable = pBox->IsChecked() && pBox->IsEnabled(); @@ -717,9 +704,7 @@ IMPL_LINK( SwIndexMarkDlg, SearchTypeHdl, CheckBox*, pBox) aSearchCaseSensitiveCB.Enable(bEnable); return 0; } -/* -----------------07.09.99 10:30------------------- - --------------------------------------------------*/ IMPL_LINK( SwIndexMarkDlg, InsertHdl, Button *, pButton ) { Apply(); @@ -728,9 +713,7 @@ IMPL_LINK( SwIndexMarkDlg, InsertHdl, Button *, pButton ) CloseHdl(pButton); return 0; } -/* -----------------07.09.99 10:29------------------- - --------------------------------------------------*/ IMPL_LINK( SwIndexMarkDlg, CloseHdl, Button *, EMPTYARG ) { if(bNewMark) @@ -745,6 +728,7 @@ IMPL_LINK( SwIndexMarkDlg, CloseHdl, Button *, EMPTYARG ) } return 0; } + /*-------------------------------------------------------------------- Beschreibung: VerzeichnisTyp auswaehlen nur bei Einfuegen --------------------------------------------------------------------*/ @@ -823,11 +807,6 @@ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - IMPL_LINK_INLINE_START( SwIndexMarkDlg, NextHdl, Button *, EMPTYARG ) { InsertUpdate(); @@ -837,7 +816,6 @@ IMPL_LINK_INLINE_START( SwIndexMarkDlg, NextHdl, Button *, EMPTYARG ) } IMPL_LINK_INLINE_END( SwIndexMarkDlg, NextHdl, Button *, EMPTYARG ) - IMPL_LINK_INLINE_START( SwIndexMarkDlg, NextSameHdl, Button *, EMPTYARG ) { InsertUpdate(); @@ -847,7 +825,6 @@ IMPL_LINK_INLINE_START( SwIndexMarkDlg, NextSameHdl, Button *, EMPTYARG ) } IMPL_LINK_INLINE_END( SwIndexMarkDlg, NextSameHdl, Button *, EMPTYARG ) - IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevHdl, Button *, EMPTYARG ) { InsertUpdate(); @@ -857,7 +834,6 @@ IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevHdl, Button *, EMPTYARG ) } IMPL_LINK_INLINE_END( SwIndexMarkDlg, PrevHdl, Button *, EMPTYARG ) - IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevSameHdl, Button *, EMPTYARG ) { InsertUpdate(); @@ -868,7 +844,6 @@ IMPL_LINK_INLINE_START( SwIndexMarkDlg, PrevSameHdl, Button *, EMPTYARG ) } IMPL_LINK_INLINE_END( SwIndexMarkDlg, PrevSameHdl, Button *, EMPTYARG ) - IMPL_LINK( SwIndexMarkDlg, DelHdl, Button *, EMPTYARG ) { bDel = sal_True; @@ -888,8 +863,6 @@ IMPL_LINK( SwIndexMarkDlg, DelHdl, Button *, EMPTYARG ) /*-------------------------------------------------------------------- Beschreibung: Dialoganzeige erneuern --------------------------------------------------------------------*/ - - void SwIndexMarkDlg::UpdateDialog() { DBG_ASSERT(pSh && pTOXMgr, "Shell nicht da?"); @@ -994,7 +967,6 @@ void SwIndexMarkDlg::UpdateDialog() /*-------------------------------------------------------------------- Remind wether the edit boxes for Phonetic reading are changed manually --------------------------------------------------------------------*/ - IMPL_LINK( SwIndexMarkDlg, PhoneticEDModifyHdl, Edit *, pEdit ) { if(&aPhoneticED0 == pEdit) @@ -1015,7 +987,6 @@ IMPL_LINK( SwIndexMarkDlg, PhoneticEDModifyHdl, Edit *, pEdit ) /*-------------------------------------------------------------------- Beschreibung: Enable Disable des 2. Schluessels --------------------------------------------------------------------*/ - IMPL_LINK( SwIndexMarkDlg, KeyDCBModifyHdl, ComboBox *, pBox ) { if(&aKeyDCB == pBox) @@ -1074,16 +1045,12 @@ IMPL_LINK( SwIndexMarkDlg, KeyDCBModifyHdl, ComboBox *, pBox ) /*-----------------25.02.94 21:19------------------- dtor ueberladen --------------------------------------------------*/ - - SwIndexMarkDlg::~SwIndexMarkDlg() { delete pTOXMgr; ViewShell::SetCareWin( 0 ); } -/* -----------------07.09.99 08:41------------------- - --------------------------------------------------*/ void SwIndexMarkDlg::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark) { pSh = &rWrtShell; @@ -1100,9 +1067,7 @@ void SwIndexMarkDlg::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark) } InitControls(); } -/* -----------------06.10.99 10:00------------------- - --------------------------------------------------*/ SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings, SfxChildWindow* pChild, Window *pParent, @@ -1115,9 +1080,7 @@ SfxModelessDialog(_pBindings, pChild, pParent, SvtCJKOptions().IsCJKFontEnabled( aDlg.ReInitDlg(*::GetActiveWrtShell()); Initialize(pInfo); } -/* -----------------06.10.99 10:27------------------- - --------------------------------------------------*/ void SwIndexMarkFloatDlg::Activate() { SfxModelessDialog::Activate(); @@ -1129,9 +1092,6 @@ void SwIndexMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell) aDlg.ReInitDlg( rWrtShell ); } -/* -----------------06.10.99 10:35------------------- - - --------------------------------------------------*/ SwIndexMarkModalDlg::SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) : SvxStandardDialog(pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_EDIT_IDXMARK_CJK):SW_RES(DLG_EDIT_IDXMARK)), aDlg(this, sal_False, SW_RES(WIN_DLG), SvtCJKOptions().IsCJKFontEnabled()?DLG_EDIT_IDXMARK_CJK:DLG_EDIT_IDXMARK, rSh) @@ -1139,16 +1099,12 @@ SvxStandardDialog(pParent, SvtCJKOptions().IsCJKFontEnabled()?SW_RES(DLG_EDIT_ID FreeResource(); aDlg.ReInitDlg(rSh, pCurTOXMark); } -/* -----------------06.10.99 10:46------------------- - --------------------------------------------------*/ void SwIndexMarkModalDlg::Apply() { aDlg.Apply(); } -/* -----------------16.09.99 14:19------------------- - --------------------------------------------------*/ class SwCreateAuthEntryDlg_Impl : public ModalDialog { FixedLine aEntriesFL; @@ -1186,14 +1142,13 @@ public: void SetCheckNameHdl(const Link& rLink) {aShortNameCheckLink = rLink;} }; -/*-- 15.09.99 08:43:24--------------------------------------------------- - -----------------------------------------------------------------------*/ struct TextInfo { sal_uInt16 nToxField; sal_uInt16 nHelpId; }; + static const TextInfo aTextInfoArr[] = { {AUTH_FIELD_IDENTIFIER, HID_AUTH_FIELD_IDENTIFIER }, @@ -1300,23 +1255,17 @@ SwAuthMarkDlg::SwAuthMarkDlg( Window *pParent, aEntryLB.SetSelectHdl(LINK(this, SwAuthMarkDlg, CompEntryHdl)); } } -/*-- 15.09.99 08:43:25--------------------------------------------------- - -----------------------------------------------------------------------*/ SwAuthMarkDlg::~SwAuthMarkDlg() { } -/*-- 15.09.99 08:43:25--------------------------------------------------- - -----------------------------------------------------------------------*/ void SwAuthMarkDlg::ReInitDlg(SwWrtShell& rWrtShell) { pSh = &rWrtShell; InitControls(); } -/* -----------------15.09.99 08:57------------------- - --------------------------------------------------*/ IMPL_LINK( SwAuthMarkDlg, CloseHdl, PushButton *, EMPTYARG ) { if(bNewEntry) @@ -1331,9 +1280,7 @@ IMPL_LINK( SwAuthMarkDlg, CloseHdl, PushButton *, EMPTYARG ) } return 0; } -/* -----------------06.12.99 13:54------------------- - --------------------------------------------------*/ static String lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int32 nLen, const String& rColumnTitle) { String sRet; @@ -1350,9 +1297,7 @@ static String lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int32 } return sRet; } -/* -----------------------------07.12.99 15:39-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox) { String sEntry(pBox->GetSelectEntry()); @@ -1399,9 +1344,6 @@ IMPL_LINK( SwAuthMarkDlg, CompEntryHdl, ListBox*, pBox) return 0; } -/* -----------------15.09.99 08:57------------------- - - --------------------------------------------------*/ IMPL_LINK( SwAuthMarkDlg, InsertHdl, PushButton *, EMPTYARG ) { //insert or update the SwAuthorityField... @@ -1456,9 +1398,7 @@ IMPL_LINK( SwAuthMarkDlg, InsertHdl, PushButton *, EMPTYARG ) CloseHdl(0); return 0; } -/* -----------------17.09.99 13:06------------------- - --------------------------------------------------*/ IMPL_LINK(SwAuthMarkDlg, CreateEntryHdl, PushButton*, pButton) { sal_Bool bCreate = pButton == &aCreateEntryPB; @@ -1503,9 +1443,7 @@ IMPL_LINK(SwAuthMarkDlg, CreateEntryHdl, PushButton*, pButton) } return 0; } -/* -----------------------------20.12.99 14:26-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton) { sal_Bool bFromComp = (pButton == &aFromComponentRB); @@ -1569,9 +1507,7 @@ IMPL_LINK(SwAuthMarkDlg, ChangeSourceHdl, RadioButton*, pButton) CompEntryHdl(&aEntryLB); return 0; } -/* -----------------15.10.2002 13:16----------------- - * - * --------------------------------------------------*/ + IMPL_LINK(SwAuthMarkDlg, EditModifyHdl, Edit*, pEdit) { Link aAllowed = LINK(this, SwAuthMarkDlg, IsEntryAllowedHdl); @@ -1585,9 +1521,7 @@ IMPL_LINK(SwAuthMarkDlg, EditModifyHdl, Edit*, pEdit) } return 0; }; -/* -----------------------------20.12.99 15:11-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwAuthMarkDlg, IsEntryAllowedHdl, Edit*, pEdit) { String sEntry = pEdit->GetText(); @@ -1609,9 +1543,7 @@ IMPL_LINK(SwAuthMarkDlg, IsEntryAllowedHdl, Edit*, pEdit) } return bAllowed; } -/* -----------------21.09.99 14:19------------------- - --------------------------------------------------*/ void SwAuthMarkDlg::InitControls() { DBG_ASSERT(pSh, "Shell nicht da?"); @@ -1641,17 +1573,13 @@ void SwAuthMarkDlg::InitControls() aAuthorFI.SetText(pEntry->GetAuthorField(AUTH_FIELD_AUTHOR)); aTitleFI.SetText(pEntry->GetAuthorField(AUTH_FIELD_TITLE)); } -/* -----------------------------05.09.2002 09:44------------------------------ - ---------------------------------------------------------------------------*/ void SwAuthMarkDlg::Activate() { aOKBT.Enable(!pSh->HasReadonlySel()); Window::Activate(); } -/* -----------------16.09.99 14:27------------------- - --------------------------------------------------*/ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, const String pFields[], SwWrtShell& rSh, @@ -1803,9 +1731,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, SetSizePixel(aDlgSize); } -/* -----------------16.09.99 14:47------------------- - --------------------------------------------------*/ SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl() { for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) @@ -1816,9 +1742,7 @@ SwCreateAuthEntryDlg_Impl::~SwCreateAuthEntryDlg_Impl() delete pTypeListBox; delete pIdentifierBox; } -/* -----------------16.09.99 14:27------------------- - --------------------------------------------------*/ String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const { String sRet; @@ -1846,9 +1770,7 @@ String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const } return sRet; } -/* -----------------21.09.99 13:54------------------- - --------------------------------------------------*/ IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox*, pBox) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) @@ -1874,9 +1796,6 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox*, pBox) } return 0; } -/* -----------------------------20.12.99 15:07-------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit*, pEdit) { @@ -1888,17 +1807,13 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, Edit*, pEdit) } return 0; } -/* -----------------------------20.12.99 15:54-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox*, pBox) { aOKBT.Enable(m_bNameAllowed && pBox->GetSelectEntryCount()); return 0; }; -/* -----------------06.10.99 10:00------------------- - --------------------------------------------------*/ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, SfxChildWindow* pChild, Window *pParent, @@ -1913,9 +1828,7 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, DBG_ASSERT(pWrtShell, "No shell?"); aDlg.ReInitDlg(*pWrtShell); } -/* -----------------06.10.99 10:27------------------- - --------------------------------------------------*/ void SwAuthMarkFloatDlg::Activate() { SfxModelessDialog::Activate(); @@ -1927,9 +1840,6 @@ void SwAuthMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell) aDlg.ReInitDlg( rWrtShell ); } -/* -----------------06.10.99 10:35------------------- - - --------------------------------------------------*/ SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) : SvxStandardDialog(pParent, SW_RES(DLG_EDIT_AUTHMARK)), aDlg(this, SW_RES(WIN_DLG), sal_False) @@ -1937,9 +1847,7 @@ SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) : FreeResource(); aDlg.ReInitDlg(rSh); } -/* -----------------06.10.99 10:46------------------- - --------------------------------------------------*/ void SwAuthMarkModalDlg::Apply() { aDlg.InsertHdl(0); diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index 14c28767b1f1..509e84fdf5cc 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -83,9 +83,7 @@ void SwTOXMgr::DeleteTOXMark() // zur naechsten wandern pCurTOXMark = pNext; } -/* -----------------20.08.99 10:48------------------- - --------------------------------------------------*/ void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) { SwTOXMark* pMark = 0; @@ -287,10 +285,6 @@ void SwTOXMgr::SetCurTOXMark(USHORT nId) pCurTOXMark = (nId < aCurMarks.Count()) ? aCurMarks[nId] : 0; } -/* -----------------01.07.99 16:23------------------- - - --------------------------------------------------*/ - BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase, const SfxItemSet* pSet) @@ -472,9 +466,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, return bRet; } -/* -----------------20.10.99 14:11------------------- - --------------------------------------------------*/ void SwTOXDescription::SetSortKeys(SwTOXSortKey eKey1, SwTOXSortKey eKey2, SwTOXSortKey eKey3) @@ -493,9 +485,6 @@ void SwTOXDescription::SetSortKeys(SwTOXSortKey eKey1, eSortKey3 = aArr[2]; } -/* -----------------10.09.99 10:02------------------- - - --------------------------------------------------*/ void SwTOXDescription::ApplyTo(SwTOXBase& rTOXBase) { for(USHORT i = 0; i < MAXLEVEL; i++) diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx index b96920a6f64c..9e1e8a78e3fc 100644 --- a/sw/source/ui/utlui/bookctrl.cxx +++ b/sw/source/ui/utlui/bookctrl.cxx @@ -65,16 +65,12 @@ private: virtual void Select(); }; -// ----------------------------------------------------------------------- - BookmarkPopup_Impl::BookmarkPopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { } -// ----------------------------------------------------------------------- - void BookmarkPopup_Impl::Select() { nCurId = GetCurItemId(); @@ -89,14 +85,10 @@ SwBookmarkControl::SwBookmarkControl( USHORT _nSlotId, { } -// ----------------------------------------------------------------------- - SwBookmarkControl::~SwBookmarkControl() { } -// ----------------------------------------------------------------------- - void SwBookmarkControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { @@ -109,15 +101,11 @@ void SwBookmarkControl::StateChanged( } } -// ----------------------------------------------------------------------- - void SwBookmarkControl::Paint( const UserDrawEvent& ) { GetStatusBar().SetItemText( GetId(), sPageNumber ); } -// ----------------------------------------------------------------------- - void SwBookmarkControl::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 9a82899c7840..0a6c79533ea5 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -28,9 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -// include --------------------------------------------------------------- - - #include <sot/formats.hxx> #include <condedit.hxx> @@ -42,10 +39,6 @@ using namespace ::com::sun::star::uno; // STATIC DATA ----------------------------------------------------------- -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - ConditionEdit::ConditionEdit( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ), DropTargetHelper( this ), @@ -56,7 +49,6 @@ ConditionEdit::ConditionEdit( Window* pParent, const ResId& rResId ) /*-------------------------------------------------------------------- Beschreibung: Drop moeglich, bzw Format bekannt? --------------------------------------------------------------------*/ - sal_Int8 ConditionEdit::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) { return OColumnTransferable::canExtractColumnDescriptor diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index d07a085c68e8..b5e150440d8c 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -109,10 +109,6 @@ using namespace ::com::sun::star::container; #define NAVI_BOOKMARK_DELIM (sal_Unicode)1 -/*************************************************************************** - -***************************************************************************/ - typedef SwContent* SwContentPtr; SV_DECL_PTRARR_SORT_DEL( SwContentArr, SwContentPtr, 0,4) SV_IMPL_OP_PTRARR_SORT(SwContentArr, SwContentPtr) @@ -160,7 +156,6 @@ namespace Beschreibung: Inhalt, enthaelt Namen und Verweis auf den Inhalstyp ***************************************************************************/ - SwContent::SwContent(const SwContentType* pCnt, const String& rName, long nYPos) : SwTypeNumber(CTYPE_CNT), pParent(pCnt), @@ -170,7 +165,6 @@ SwContent::SwContent(const SwContentType* pCnt, const String& rName, long nYPos) { } - sal_uInt8 SwTypeNumber::GetTypeId() { return nTypeId; @@ -201,6 +195,7 @@ sal_Bool SwURLFieldContent::IsProtect() const SwGraphicContent::~SwGraphicContent() { } + SwTOXBaseContent::~SwTOXBaseContent() { } @@ -209,7 +204,6 @@ SwTOXBaseContent::~SwTOXBaseContent() Beschreibung: Inhaltstyp, kennt seine Inhalte und die WrtShell ***************************************************************************/ - SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLevel) : SwTypeNumber(CTYPE_CTT), pWrtShell(pShell), @@ -231,7 +225,6 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe Beschreibung: Initialisierung ***************************************************************************/ - void SwContentType::Init(sal_Bool* pbInvalidateWindow) { // wenn sich der MemberCount aendert ... @@ -485,11 +478,6 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) bDataValid = sal_False; } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - SwContentType::~SwContentType() { delete pMember; @@ -499,7 +487,6 @@ SwContentType::~SwContentType() Beschreibung: Inhalt liefern, dazu gfs. die Liste fuellen ***************************************************************************/ - const SwContent* SwContentType::GetMember(sal_uInt16 nIndex) { if(!bDataValid || !pMember) @@ -513,12 +500,6 @@ const SwContent* SwContentType::GetMember(sal_uInt16 nIndex) } - -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - void SwContentType::Invalidate() { bDataValid = sal_False; @@ -528,7 +509,6 @@ void SwContentType::Invalidate() Beschreibung: Liste der Inhalte fuellen ***************************************************************************/ - void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) { SwContentArr* pOldMember = 0; @@ -873,7 +853,6 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged) Beschreibung: TreeListBox fuer Inhaltsanzeige ***************************************************************************/ - SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), @@ -936,11 +915,6 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : EnableContextMenuHandling(); } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - SwContentTree::~SwContentTree() { Clear(); // vorher gfs. Inhaltstypen loeschen @@ -1217,11 +1191,10 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) return pPop; } + /*************************************************************************** Beschreibung: Einrueckung fuer outlines (und sections) ***************************************************************************/ - - long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) { sal_uInt16 nLevel = 0; @@ -1245,8 +1218,6 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) /*************************************************************************** Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt ***************************************************************************/ - - void SwContentTree::RequestingChilds( SvLBoxEntry* pParent ) { // ist es ein Inhaltstyp? @@ -1319,11 +1290,10 @@ void SwContentTree::RequestingChilds( SvLBoxEntry* pParent ) } } } + /*************************************************************************** Beschreibung: Expand - Zustand fuer Inhaltstypen merken ***************************************************************************/ - - sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) { if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || @@ -1378,11 +1348,10 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) } return SvTreeListBox::Expand(pParent); } + /*************************************************************************** Beschreibung: Collapse - Zustand fuer Inhaltstypen merken ***************************************************************************/ - - sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) { sal_Bool bRet; @@ -1419,12 +1388,9 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) return bRet; } - /*************************************************************************** Beschreibung: Auch auf Doppelclick wird zunaechst nur aufgeklappt ***************************************************************************/ - - IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) { SvLBoxEntry* pEntry = GetCurEntry(); @@ -1454,8 +1420,6 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG ) /*************************************************************************** Beschreibung: Anzeigen der Datei ***************************************************************************/ - - void SwContentTree::Display( sal_Bool bActive ) { if(!bIsImageListInitialized) @@ -1657,8 +1621,6 @@ void SwContentTree::Display( sal_Bool bActive ) /*************************************************************************** Beschreibung: Im Clear muessen auch die ContentTypes geloescht werden ***************************************************************************/ - - void SwContentTree::Clear() { SetUpdateMode(sal_False); @@ -1666,10 +1628,6 @@ void SwContentTree::Clear() SetUpdateMode(sal_True); } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, sal_Int8& rDragMode ) { @@ -1809,11 +1767,10 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, } return bRet; } + /*************************************************************************** Beschreibung: Umschalten der Anzeige auf Root ***************************************************************************/ - - sal_Bool SwContentTree::ToggleToRoot() { if(!bIsRoot) @@ -1846,8 +1803,6 @@ sal_Bool SwContentTree::ToggleToRoot() /*************************************************************************** Beschreibung: Angezeigten Inhalt auf Gueltigkeit pruefen ***************************************************************************/ - - sal_Bool SwContentTree::HasContentChanged() { /* @@ -2094,8 +2049,6 @@ void SwContentTree::FindActiveTypeAndRemoveUserData() Beschreibung: Nachdem ein File auf den Navigator gedroppt wurde, wird die neue Shell gesetzt ***************************************************************************/ - - void SwContentTree::SetHiddenShell(SwWrtShell* pSh) { pHiddenShell = pSh; @@ -2113,8 +2066,6 @@ void SwContentTree::SetHiddenShell(SwWrtShell* pSh) /*************************************************************************** Beschreibung: Dokumentwechsel - neue Shell setzen ***************************************************************************/ - - void SwContentTree::SetActiveShell(SwWrtShell* pSh) { if(bIsInternalDrag) @@ -2152,8 +2103,6 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh) /*************************************************************************** Beschreibung: Eine offene View als aktiv festlegen ***************************************************************************/ - - void SwContentTree::SetConstantShell(SwWrtShell* pSh) { pActiveShell = pSh; @@ -2166,11 +2115,10 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh) } Display(sal_True); } + /*************************************************************************** Beschreibung: Kommandos des Navigators ausfuehren ***************************************************************************/ - - void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) { sal_Bool nMove = sal_False; @@ -2327,10 +2275,6 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) } } } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - void SwContentTree::ShowTree() { @@ -2341,8 +2285,6 @@ void SwContentTree::ShowTree() /*************************************************************************** Beschreibung: zusammengefaltet wird nicht geidlet ***************************************************************************/ - - void SwContentTree::HideTree() { aUpdTimer.Stop(); @@ -2352,8 +2294,6 @@ void SwContentTree::HideTree() /*************************************************************************** Beschreibung: Kein Idle mit Focus oder waehrend des Dragging ***************************************************************************/ - - IMPL_LINK( SwContentTree, TimerUpdate, Timer*, EMPTYARG) { // kein Update waehrend D&D @@ -2391,11 +2331,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, Timer*, EMPTYARG) return 0; } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - DragDropMode SwContentTree::NotifyStartDrag( TransferDataContainer& rContainer, SvLBoxEntry* pEntry ) @@ -2415,13 +2350,10 @@ DragDropMode SwContentTree::NotifyStartDrag( return eMode; } - /*************************************************************************** Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t Childs verschoben ***************************************************************************/ - - sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& , ULONG& ) { @@ -2456,12 +2388,11 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, //TreeListBox wird aus dem Dokument neu geladen return sal_False; } + /*************************************************************************** Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e Childs verschoben ***************************************************************************/ - - sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& , ULONG& ) { @@ -2500,13 +2431,11 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, /*************************************************************************** Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType ***************************************************************************/ - sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) { return pEntry != 0; } - /*************************************************************************** Beschreibung: Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt, * dann soll die Basisfunktion des Controls gerufen werden @@ -2524,8 +2453,6 @@ void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) /*************************************************************************** Beschreibung: sofort aktualisieren ***************************************************************************/ - - void SwContentTree::GetFocus() { SwView* pActView = GetParentWindow()->GetCreateView(); @@ -2550,11 +2477,6 @@ void SwContentTree::GetFocus() SvTreeListBox::GetFocus(); } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - void SwContentTree::KeyInput(const KeyEvent& rEvent) { const KeyCode aCode = rEvent.GetKeyCode(); @@ -2606,11 +2528,6 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) { BOOL bCallBase = TRUE; @@ -2726,11 +2643,6 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - void SwContentTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) { SvLBoxEntry* pFirst = FirstSelected(); @@ -2821,11 +2733,6 @@ void SwContentTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) GetParentWindow()->UpdateListBox(); } -/*************************************************************************** - Beschreibung: -***************************************************************************/ - - void SwContentTree::SetOutlineLevel(sal_uInt8 nSet) { nOutlineLevel = nSet; @@ -2844,8 +2751,6 @@ void SwContentTree::SetOutlineLevel(sal_uInt8 nSet) /*************************************************************************** Beschreibung: Moduswechsel: gedropptes Doc anzeigen ***************************************************************************/ - - void SwContentTree::ShowHiddenShell() { if(pHiddenShell) @@ -2859,8 +2764,6 @@ void SwContentTree::ShowHiddenShell() /*************************************************************************** Beschreibung: Moduswechsel: aktive Sicht anzeigen ***************************************************************************/ - - void SwContentTree::ShowActualView() { bIsActive = sal_True; @@ -2869,11 +2772,10 @@ void SwContentTree::ShowActualView() GetParentWindow()->UpdateListBox(); } -/*-----------------20.11.96 13.34------------------- +/*************************************************************************** Beschreibung: Hier sollen die Buttons zum Verschieben von Outlines en-/disabled werden ---------------------------------------------------*/ - +***************************************************************************/ sal_Bool SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) { if(!pEntry) @@ -2897,10 +2799,6 @@ sal_Bool SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) return SvTreeListBox::Select(pEntry, bSelect); } -/*-----------------27.11.96 12.56------------------- - ---------------------------------------------------*/ - void SwContentTree::SetRootType(sal_uInt16 nType) { nRootType = nType; @@ -2908,10 +2806,6 @@ void SwContentTree::SetRootType(sal_uInt16 nType) pConfig->SetRootType( nRootType ); } -/*-----------------10.01.97 12.19------------------- - ---------------------------------------------------*/ - void SwContentType::RemoveNewline(String& rEntry) { sal_Unicode* pStr = rEntry.GetBufferAccess(); @@ -2922,10 +2816,6 @@ void SwContentType::RemoveNewline(String& rEntry) } } -/*-----------------14.01.97 16.38------------------- - ---------------------------------------------------*/ - void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) { SwContent* pCnt = (SwContent*)pEntry->GetUserData(); @@ -3157,10 +3047,6 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) } } -/*-----------------14.01.97 16.53------------------- - ---------------------------------------------------*/ - void SwContentTree::GotoContent(SwContent* pCnt) { pActiveShell->EnterStdMode(); @@ -3267,10 +3153,10 @@ void SwContentTree::GotoContent(SwContent* pCnt) rView.GetPostItMgr()->SetActiveSidebarWin(0); rView.GetEditWin().GrabFocus(); } + /*-----------------06.02.97 19.14------------------- Jetzt nochtdie passende text::Bookmark --------------------------------------------------*/ - NaviContentBookmark::NaviContentBookmark() : nDocSh(0), @@ -3278,10 +3164,6 @@ NaviContentBookmark::NaviContentBookmark() { } -/*-----------------06.02.97 20.12------------------- - ---------------------------------------------------*/ - NaviContentBookmark::NaviContentBookmark( const String &rUrl, const String& rDesc, sal_uInt16 nDragType, @@ -3322,10 +3204,6 @@ sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData ) return bRet; } - -/* -----------------------------09.12.99 13:50-------------------------------- - - ---------------------------------------------------------------------------*/ class SwContentLBoxString : public SvLBoxString { public: @@ -3336,9 +3214,6 @@ public: SvLBoxEntry* pEntry); }; -/* -----------------------------09.12.99 13:49-------------------------------- - - ---------------------------------------------------------------------------*/ void SwContentTree::InitEntry(SvLBoxEntry* pEntry, const XubString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) @@ -3349,9 +3224,7 @@ void SwContentTree::InitEntry(SvLBoxEntry* pEntry, SwContentLBoxString* pStr = new SwContentLBoxString( pEntry, 0, pCol->GetText() ); pEntry->ReplaceItem( pStr, nColToHilite ); } -/* -----------------------------09.12.99 13:49-------------------------------- - ---------------------------------------------------------------------------*/ void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ) { @@ -3370,9 +3243,7 @@ void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFl else SvLBoxString::Paint( rPos, rDev, nFlags, pEntry); } -/* -----------------------------06.05.2002 10:20------------------------------ - ---------------------------------------------------------------------------*/ void SwContentTree::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 03a063dce3bc..f708648d800e 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -75,7 +75,6 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; - // Kontextmenue fuer GlobalTree #define CTX_INSERT_ANY_INDEX 10 //#define CTX_INSERT_CNTIDX 11 @@ -139,12 +138,6 @@ static const USHORT __FAR_DATA aHelpForMenu[] = HID_GLBLTREEUPD_ALL //CTX_UPDATE_ALL }; -/************************************************************************/ -/* */ -/************************************************************************/ -/* -----------------------------24.08.00 12:04-------------------------------- - - ---------------------------------------------------------------------------*/ class SwGlobalFrameListener_Impl : public SfxListener { BOOL bValid; @@ -159,9 +152,7 @@ public: BOOL IsValid() const {return bValid;} }; -/* -----------------------------24.08.00 12:05-------------------------------- - ---------------------------------------------------------------------------*/ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if( rHint.ISA(SfxSimpleHint) && @@ -169,9 +160,6 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHi bValid = FALSE; } -/*-----------------12.06.97 09:38------------------- - ---------------------------------------------------*/ SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) : SvTreeListBox(pParent, rResId), @@ -206,18 +194,12 @@ SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) : EnableContextMenuHandling(); } -/*-----------------12.06.97 09:38------------------- - ---------------------------------------------------*/ SwGlobalTree::~SwGlobalTree() { delete pSwGlblDocContents; delete pDocInserter; } -/*-----------------12.06.97 09:38------------------- - ---------------------------------------------------*/ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; @@ -297,9 +279,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -/*-----------------12.06.97 09:38------------------- ---------------------------------------------------*/ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) { sal_Int8 nRet = rEvt.mnAction; @@ -358,9 +338,7 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) } return nRet; } -/*-----------------12.06.97 09:38------------------- ---------------------------------------------------*/ PopupMenu* SwGlobalTree::CreateContextMenu() { PopupMenu* pPop = 0; @@ -421,9 +399,7 @@ PopupMenu* SwGlobalTree::CreateContextMenu() } return pPop; } -/*-----------------16.06.97 10:41------------------- ---------------------------------------------------*/ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) { USHORT nEnableFlags = GetEnableFlags(); @@ -463,9 +439,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) pBox->Invalidate(); } } -/*-----------------16.06.97 11:02------------------- ---------------------------------------------------*/ USHORT SwGlobalTree::GetEnableFlags() const { SvLBoxEntry* pEntry = FirstSelected(); @@ -496,9 +470,6 @@ USHORT SwGlobalTree::GetEnableFlags() const return nRet; } -/*-----------------12.06.97 09:38------------------- - ---------------------------------------------------*/ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) { BOOL bParent = TRUE; @@ -546,9 +517,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) if(bParent) SvTreeListBox::RequestHelp(rHEvt); } -/*-----------------16.06.97 16:15------------------- ---------------------------------------------------*/ void SwGlobalTree::SelectHdl() { @@ -567,17 +536,12 @@ void SwGlobalTree::SelectHdl() nSelCount == 1 && nAbsPos < ((USHORT)GetEntryCount()) - 1 && !bReadonly); } -/*-----------------16.06.97 16:15------------------- ---------------------------------------------------*/ void SwGlobalTree::DeselectHdl() { SelectHdl(); } -/*-----------------17.06.97 13:11------------------- - ---------------------------------------------------*/ DragDropMode SwGlobalTree::NotifyStartDrag( TransferDataContainer& , SvLBoxEntry* pEntry ) { @@ -586,17 +550,11 @@ DragDropMode SwGlobalTree::NotifyStartDrag( TransferDataContainer& , return SV_DRAGDROP_CTRL_MOVE; } -/*-----------------21.06.97 12:44------------------- - ---------------------------------------------------*/ long SwGlobalTree::GetTabPos( SvLBoxEntry*, SvLBoxTab* pTab) { return pTab->GetPos() - GLBL_TABPOS_SUB; } -/*-----------------12.06.97 09:38------------------- - ---------------------------------------------------*/ BOOL SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pSource, SvLBoxEntry*&, @@ -613,9 +571,7 @@ BOOL SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, Display(); return FALSE; } -/*-----------------12.06.97 09:39------------------- ---------------------------------------------------*/ BOOL SwGlobalTree::NotifyCopying( SvLBoxEntry* /*pTarget*/, SvLBoxEntry* /*pEntry*/, SvLBoxEntry*& /*rpNewParent*/, @@ -624,24 +580,18 @@ BOOL SwGlobalTree::NotifyCopying( SvLBoxEntry* /*pTarget*/, { return FALSE; } -/*-----------------12.06.97 09:39------------------- ---------------------------------------------------*/ BOOL SwGlobalTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) { return pEntry != 0; } -/*-----------------12.06.97 09:39------------------- ---------------------------------------------------*/ void SwGlobalTree::StartDrag( sal_Int8 nAction, const Point& rPt ) { if( 1 == GetSelectionCount() ) SvTreeListBox::StartDrag( nAction, rPt ); } -/*-----------------12.06.97 09:39------------------- ---------------------------------------------------*/ void SwGlobalTree::DragFinished( sal_Int8 nAction ) { SvTreeListBox::DragFinished( nAction ); @@ -662,9 +612,6 @@ void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt ) SvTreeListBox::MouseButtonDown( rMEvt ); } -/*-----------------12.06.97 13:08------------------- - ---------------------------------------------------*/ void SwGlobalTree::GetFocus() { if(Update( FALSE )) @@ -672,9 +619,6 @@ void SwGlobalTree::GetFocus() SvTreeListBox::GetFocus(); } -/*-----------------12.06.97 12:34------------------- - ---------------------------------------------------*/ void SwGlobalTree::KeyInput(const KeyEvent& rKEvt) { const KeyCode aCode = rKEvt.GetKeyCode(); @@ -692,17 +636,12 @@ void SwGlobalTree::KeyInput(const KeyEvent& rKEvt) SvTreeListBox::KeyInput(rKEvt); } -/*-----------------17.06.97 11:59------------------- - ---------------------------------------------------*/ void SwGlobalTree::Clear() { pEmphasisEntry = 0; SvTreeListBox::Clear(); } -/*-----------------12.06.97 12:38------------------- ---------------------------------------------------*/ void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) { if(!bIsImageListInitialized) @@ -789,9 +728,6 @@ void SwGlobalTree::Display(BOOL bOnlyUpdateUserData) } } -/*-----------------13.06.97 10:32------------------- - ---------------------------------------------------*/ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pFileName ) { Sequence< OUString > aFileNames; @@ -814,9 +750,6 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF } } -/*-----------------18.06.97 12:42------------------- - ---------------------------------------------------*/ void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) { USHORT nSlot = 0; @@ -851,17 +784,12 @@ void SwGlobalTree::EditContent(const SwGlblDocContent* pCont ) } } -/*-----------------13.06.97 14:22------------------- - ---------------------------------------------------*/ IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu) { ExcecuteContextMenuAction( pMenu->GetCurItemId()); return TRUE; } -/* -----------------26.08.2003 11:57----------------- - --------------------------------------------------*/ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) //IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu) { @@ -1098,9 +1026,6 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) // return TRUE; } -/*-----------------16.06.97 07:57------------------- - ---------------------------------------------------*/ IMPL_LINK( SwGlobalTree, Timeout, Timer*, EMPTYARG ) { if(!HasFocus() && Update( FALSE )) @@ -1108,9 +1033,6 @@ IMPL_LINK( SwGlobalTree, Timeout, Timer*, EMPTYARG ) return 0; } -/*-----------------13.06.97 16:56------------------- - ---------------------------------------------------*/ void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) { pActiveShell->EnterStdMode(); @@ -1132,25 +1054,19 @@ void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) } } -/*-----------------16.06.97 07:42------------------- ---------------------------------------------------*/ void SwGlobalTree::ShowTree() { aUpdateTimer.Start(); SvTreeListBox::Show(); } -/*-----------------16.06.97 07:42------------------- ---------------------------------------------------*/ void SwGlobalTree::HideTree() { aUpdateTimer.Stop(); SvTreeListBox::Hide(); } -/*-----------------18.06.97 10:02------------------- ---------------------------------------------------*/ void SwGlobalTree::ExecCommand(USHORT nCmd) { SvLBoxEntry* pEntry = FirstSelected(); @@ -1193,9 +1109,6 @@ void SwGlobalTree::ExecCommand(USHORT nCmd) } } -/*-----------------16.06.97 07:43------------------- - ---------------------------------------------------*/ BOOL SwGlobalTree::Update(BOOL bHard) { SwView* pActView = GetParentWindow()->GetCreateView(); @@ -1278,9 +1191,6 @@ BOOL SwGlobalTree::Update(BOOL bHard) return bRet; } -/*-----------------25.06.97 16:20------------------- - ---------------------------------------------------*/ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) { String sFileName(pCont->GetSection()->GetLinkFileName().GetToken(0, @@ -1314,9 +1224,6 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) } } -/*-----------------25.06.97 16:08------------------- - ---------------------------------------------------*/ IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) { SvLBoxEntry* pEntry = GetCurEntry(); @@ -1331,9 +1238,6 @@ IMPL_LINK( SwGlobalTree, DoubleClickHdl, SwGlobalTree *, EMPTYARG ) return 0; } -/*-----------------07.10.97 08:09------------------- - ---------------------------------------------------*/ IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) { if(SwGlobalTree::GetShowShell()) @@ -1341,9 +1245,7 @@ IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) SwGlobalTree::SetShowShell(0); return 0; } -/* -----------------04.11.98 10:43------------------- - * - * --------------------------------------------------*/ + void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry, const XubString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) @@ -1354,9 +1256,6 @@ void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry, SwLBoxString* pStr = new SwLBoxString( pEntry, 0, pCol->GetText() ); pEntry->ReplaceItem( pStr, nColToHilite ); } -/* -----------------04.11.98 10:39------------------- - * - * --------------------------------------------------*/ void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry ) @@ -1377,9 +1276,7 @@ void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, else SvLBoxString::Paint( rPos, rDev, nFlags, pEntry); } -/* -----------------------------06.05.2002 10:20------------------------------ - ---------------------------------------------------------------------------*/ void SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d2e4cc8f02f8..2c3754fb6386 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -263,9 +263,7 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor& rLst ) } FreeResource(); } -/* -----------------16.09.99 12:28------------------- - --------------------------------------------------*/ const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) { if(!pAuthFieldNameList) @@ -279,9 +277,7 @@ const String& SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) } return *pAuthFieldNameList->GetObject( static_cast< USHORT >(eType) ); } -/* -----------------16.09.99 12:29------------------- - --------------------------------------------------*/ const String& SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) { if(!pAuthFieldTypeList) diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx index 435f5583cd30..2e4fab06c7d6 100644 --- a/sw/source/ui/utlui/navicfg.cxx +++ b/sw/source/ui/utlui/navicfg.cxx @@ -42,9 +42,6 @@ using namespace ::utl; using namespace ::rtl; using namespace ::com::sun::star::uno; -/* -----------------------------08.09.00 16:30-------------------------------- - - ---------------------------------------------------------------------------*/ Sequence<OUString> SwNavigationConfig::GetPropertyNames() { static const char* aPropNames[] = @@ -66,9 +63,6 @@ Sequence<OUString> SwNavigationConfig::GetPropertyNames() } return aNames; } -/*-----------------13.11.96 11.03------------------- - ---------------------------------------------------*/ SwNavigationConfig::SwNavigationConfig() : utl::ConfigItem(C2U("Office.Writer/Navigator")), @@ -105,14 +99,11 @@ SwNavigationConfig::SwNavigationConfig() : } } } -/* -----------------------------08.09.00 16:35-------------------------------- - ---------------------------------------------------------------------------*/ SwNavigationConfig::~SwNavigationConfig() -{} -/* -----------------------------08.09.00 16:35-------------------------------- +{ +} - ---------------------------------------------------------------------------*/ void SwNavigationConfig::Commit() { Sequence<OUString> aNames = GetPropertyNames(); diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index b059c12a4a50..a6b6c99717f3 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -86,10 +86,6 @@ NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId, Init(nFormatType, bUsrFmts); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - NumFormatListBox::NumFormatListBox( Window* pWin, SwView* pView, const ResId& rResId, short nFormatType, ULONG nDefFmt, BOOL bUsrFmts ) : @@ -106,10 +102,6 @@ NumFormatListBox::NumFormatListBox( Window* pWin, SwView* pView, Init(nFormatType, bUsrFmts); } -/* -----------------15.06.98 11:29------------------- - * - * --------------------------------------------------*/ - void NumFormatListBox::Init(short nFormatType, BOOL bUsrFmts) { SwView *pView = GetView(); @@ -131,18 +123,11 @@ void NumFormatListBox::Init(short nFormatType, BOOL bUsrFmts) SetSelectHdl(LINK(this, NumFormatListBox, SelectHdl)); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - NumFormatListBox::~NumFormatListBox() { if (pOwnFormatter) delete pOwnFormatter; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ SwView* NumFormatListBox::GetView() { @@ -151,10 +136,6 @@ SwView* NumFormatListBox::GetView() return ::GetActiveView(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void NumFormatListBox::SetFormatType(const short nFormatType) { if (nCurrFormatType == -1 || @@ -298,10 +279,6 @@ void NumFormatListBox::SetFormatType(const short nFormatType) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void NumFormatListBox::SetDefFormat(const ULONG nDefFmt) { if (nDefFmt == ULONG_MAX) @@ -391,10 +368,6 @@ void NumFormatListBox::SetDefFormat(const ULONG nDefFmt) nDefFormat = GetFormat(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - ULONG NumFormatListBox::GetFormat() const { USHORT nPos = GetSelectEntryPos(); @@ -402,10 +375,6 @@ ULONG NumFormatListBox::GetFormat() const return (ULONG)GetEntryData(nPos); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) { USHORT nPos = pBox->GetSelectEntryPos(); @@ -487,10 +456,6 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox ) return 0; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - double NumFormatListBox::GetDefValue(const short nFormatType) const { double fDefValue = 0.0; @@ -537,10 +502,6 @@ double NumFormatListBox::GetDefValue(const short nFormatType) const return fDefValue; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void NumFormatListBox::Clear() { ListBox::Clear(); diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx index 9ab9d9f47b34..dab55775b71b 100644 --- a/sw/source/ui/utlui/prcntfld.cxx +++ b/sw/source/ui/utlui/prcntfld.cxx @@ -28,17 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -// include --------------------------------------------------------------- - - #include "prcntfld.hxx" // STATIC DATA ----------------------------------------------------------- -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - PercentField::PercentField( Window* pWin, const ResId& rResId ) : MetricField ( pWin, rResId ), @@ -56,10 +49,6 @@ PercentField::PercentField( Window* pWin, const ResId& rResId ) : SetCustomUnitText('%'); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void PercentField::SetRefValue(sal_Int64 nValue) { sal_Int64 nRealValue = GetRealValue(eOldUnit); @@ -70,10 +59,6 @@ void PercentField::SetRefValue(sal_Int64 nValue) SetPrcntValue(nRealValue, eOldUnit); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void PercentField::ShowPercent(BOOL bPercent) { if ((bPercent && GetUnit() == FUNIT_CUSTOM) || @@ -141,16 +126,11 @@ void PercentField::ShowPercent(BOOL bPercent) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ void PercentField::SetValue(sal_Int64 nNewValue, FieldUnit eInUnit) { MetricFormatter::SetValue(nNewValue, eInUnit); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ + void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit) { if (GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM) @@ -174,10 +154,6 @@ void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void PercentField::SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ) { if (GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM) @@ -202,10 +178,6 @@ void PercentField::SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ) } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void PercentField::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit) { if (GetUnit() == FUNIT_CUSTOM) @@ -214,19 +186,11 @@ void PercentField::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit) MetricField::SetBaseValue(nNewValue, eInUnit); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Int64 PercentField::GetValue( FieldUnit eOutUnit ) { return Convert(MetricField::GetValue(), GetUnit(), eOutUnit); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void PercentField::SetMin(sal_Int64 nNewMin, FieldUnit eInUnit) { if (GetUnit() != FUNIT_CUSTOM) @@ -242,10 +206,6 @@ void PercentField::SetMin(sal_Int64 nNewMin, FieldUnit eInUnit) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit) { if (GetUnit() != FUNIT_CUSTOM) @@ -258,10 +218,6 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Int64 PercentField::NormalizePercent(sal_Int64 nValue) { if (GetUnit() != FUNIT_CUSTOM) @@ -272,10 +228,6 @@ sal_Int64 PercentField::NormalizePercent(sal_Int64 nValue) return nValue; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Int64 PercentField::DenormalizePercent(sal_Int64 nValue) { if (GetUnit() != FUNIT_CUSTOM) @@ -289,10 +241,6 @@ sal_Int64 PercentField::DenormalizePercent(sal_Int64 nValue) return nValue; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - BOOL PercentField::IsValueModified() { if (GetUnit() == FUNIT_CUSTOM) @@ -301,10 +249,6 @@ BOOL PercentField::IsValueModified() return MetricField::IsValueModified(); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Int64 PercentField::ImpPower10( USHORT n ) { USHORT i; @@ -316,10 +260,6 @@ sal_Int64 PercentField::ImpPower10( USHORT n ) return nValue; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Int64 PercentField::GetRealValue(FieldUnit eOutUnit) { if (GetUnit() != FUNIT_CUSTOM) @@ -328,10 +268,6 @@ sal_Int64 PercentField::GetRealValue(FieldUnit eOutUnit) return Convert(GetValue(), GetUnit(), eOutUnit); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit) { if (eInUnit == eOutUnit || diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 27b861991e0f..2a04d5facc2e 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -94,9 +94,7 @@ SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, aNewNameED.SetModifyHdl(LINK(this, SwRenameXNamedDlg, ModifyHdl)); aOk.Enable(sal_False); } -/* -----------------09.06.99 15:34------------------- - * - * --------------------------------------------------*/ + IMPL_LINK(SwRenameXNamedDlg, OkHdl, OKButton*, EMPTYARG) { try @@ -110,9 +108,7 @@ IMPL_LINK(SwRenameXNamedDlg, OkHdl, OKButton*, EMPTYARG) EndDialog(RET_OK); return 0; } -/* -----------------09.06.99 15:48------------------- - * - * --------------------------------------------------*/ + IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, NoSpaceEdit*, pEdit) { String sTmp(pEdit->GetText()); diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index a477f86b3fd3..81a66f55fe62 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -28,9 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -// include --------------------------------------------------------------- - - #include <svl/style.hxx> #include <vcl/menu.hxx> #include <svl/stritem.hxx> @@ -47,7 +44,6 @@ // STATIC DATA ----------------------------------------------------------- - SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem ); // class TemplatePopup_Impl -------------------------------------------------- @@ -65,16 +61,12 @@ private: virtual void Select(); }; -// ----------------------------------------------------------------------- - TemplatePopup_Impl::TemplatePopup_Impl() : PopupMenu(), nCurId(USHRT_MAX) { } -// ----------------------------------------------------------------------- - void TemplatePopup_Impl::Select() { nCurId = GetCurItemId(); @@ -89,14 +81,10 @@ SwTemplateControl::SwTemplateControl( USHORT _nSlotId, { } -// ----------------------------------------------------------------------- - SwTemplateControl::~SwTemplateControl() { } -// ----------------------------------------------------------------------- - void SwTemplateControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { @@ -109,15 +97,11 @@ void SwTemplateControl::StateChanged( } } -// ----------------------------------------------------------------------- - void SwTemplateControl::Paint( const UserDrawEvent& ) { GetStatusBar().SetItemText( GetId(), sTemplate ); } -// ----------------------------------------------------------------------- - void SwTemplateControl::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 15e0843331ab..bbf1683ea9d2 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -120,9 +120,7 @@ SfxItemPresentation SwPageFtnInfoItem::GetPresentation } return SFX_ITEM_PRESENTATION_NONE; } -/* -----------------------------26.04.01 12:25-------------------------------- - ---------------------------------------------------------------------------*/ bool SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const { bool bRet = true; @@ -146,9 +144,7 @@ bool SwPageFtnInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const } return bRet; } -/* -----------------------------26.04.01 12:26-------------------------------- - ---------------------------------------------------------------------------*/ bool SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId) { sal_Int32 nSet32 = 0; @@ -238,11 +234,6 @@ SfxPoolItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ ) const return new SwPtrItem( *this ); } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - int SwPtrItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -303,16 +294,12 @@ bool SwUINumRuleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) } return true; } -/* -----------------17.06.98 17:43------------------- - * - * --------------------------------------------------*/ + SwBackgroundDestinationItem::SwBackgroundDestinationItem(USHORT _nWhich, USHORT nValue) : SfxUInt16Item(_nWhich, nValue) { } -/* -----------------17.06.98 17:44------------------- - * - * --------------------------------------------------*/ + SfxPoolItem* SwBackgroundDestinationItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SwBackgroundDestinationItem(Which(), GetValue()); diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index a557a2f1048b..efac0dd0a72a 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -310,11 +310,6 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) } } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - - void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) { const SwFrmFmt& rMaster = rPageDesc.GetMaster(); @@ -606,9 +601,6 @@ void SetDfltMetric( FieldUnit eMetric, BOOL bWeb ) SW_MOD()->ApplyUserMetric(eMetric, bWeb); } -/*-----------------09.04.98 16:58------------------- - ---------------------------------------------------*/ USHORT InsertStringSorted(const String& rEntry, ListBox& rToFill, USHORT nOffset ) { USHORT i = nOffset; @@ -665,9 +657,6 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, BOOL bSorted, BO } }; -/* -----------------27.04.98 08:26------------------- - * - * --------------------------------------------------*/ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent, SwWrtShell* pSh ) { @@ -710,8 +699,6 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent, return nWidth; } -/*------------------------------------------------------------------------*/ - String GetAppLangDateTimeString( const DateTime& rDT ) { const SvtSysLocale aSysLocale; @@ -734,9 +721,6 @@ void SetApplyCharUnit(BOOL bApplyChar, BOOL bWeb) SW_MOD()->ApplyUserCharUnit(bApplyChar, bWeb); } -/*-- 26.01.2006 08:06:33--------------------------------------------------- - - -----------------------------------------------------------------------*/ bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, USHORT nId ) { bool bRet = false; diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index e944c3b383cf..d17b109dce05 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -62,21 +62,14 @@ #include <unomid.h> - using namespace ::com::sun::star; using ::rtl::OUString; const sal_Char cFrameControl[] = "com.sun.star.frame.FrameControl"; const sal_Char cFactory[] = "private:factory/swriter"; -/************************************************************************ - -************************************************************************/ sal_Bool SwOneExampleFrame::bShowServiceNotAvailableMessage = sal_True; -/* -----------------27.07.99 15:26------------------- - - --------------------------------------------------*/ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, sal_uInt32 nFlags, const Link* pInitializedLink, @@ -112,9 +105,6 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, aTopWindow.Show(); } -/* -----------------------------08.12.99 13:44-------------------------------- - - ---------------------------------------------------------------------------*/ void SwOneExampleFrame::CreateErrorMessage(Window* pParent) { if(SwOneExampleFrame::bShowServiceNotAvailableMessage) @@ -125,16 +115,12 @@ void SwOneExampleFrame::CreateErrorMessage(Window* pParent) SwOneExampleFrame::bShowServiceNotAvailableMessage = sal_False; } } -/* -----------------27.07.99 15:26------------------- - --------------------------------------------------*/ SwOneExampleFrame::~SwOneExampleFrame() { DisposeControl(); } -/* -----------------------------21.12.00 10:16-------------------------------- - ---------------------------------------------------------------------------*/ void SwOneExampleFrame::CreateControl() { if(_xControl.is()) @@ -189,10 +175,6 @@ void SwOneExampleFrame::CreateControl() } } - -/* -----------------------------21.12.00 10:16-------------------------------- - - ---------------------------------------------------------------------------*/ void SwOneExampleFrame::DisposeControl() { _xCursor = 0; @@ -202,9 +184,7 @@ void SwOneExampleFrame::DisposeControl() _xModel = 0; _xController = 0; } -/* -----------------27.07.99 15:26------------------- - --------------------------------------------------*/ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) { if(!_xControl.is()) @@ -364,9 +344,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) pTimer->Start(); return 0; } -/* -----------------------------27.12.99 09:59-------------------------------- - ---------------------------------------------------------------------------*/ void SwOneExampleFrame::ClearDocument( BOOL bStartUpdateTimer ) { uno::Reference< lang::XUnoTunnel> xTunnel( _xCursor, uno::UNO_QUERY); @@ -398,9 +376,7 @@ void SwOneExampleFrame::ClearDocument( BOOL bStartUpdateTimer ) } } } -/* -----------------------------15.12.99 11:09-------------------------------- - ---------------------------------------------------------------------------*/ static const sal_Int16 nZoomValues[] = { 20, @@ -409,7 +385,7 @@ static const sal_Int16 nZoomValues[] = 75, 100 }; -//--------------------------------------------------------------------------- + #define ITEM_UP 100 #define ITEM_DOWN 200 #define ITEM_ZOOM 300 @@ -451,9 +427,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) aPop.Execute( &aTopWindow, rPt ); } -/* -----------------------------15.12.99 11:09-------------------------------- - ---------------------------------------------------------------------------*/ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) { sal_uInt16 nId = pMenu->GetCurItemId(); @@ -480,18 +454,14 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) } return 0; }; -/* -----------------------------15.12.99 10:37-------------------------------- - ---------------------------------------------------------------------------*/ SwFrmCtrlWindow::SwFrmCtrlWindow(Window* pParent, WinBits nBits, SwOneExampleFrame* pFrame) : Window(pParent, nBits), pExampleFrame(pFrame) { } -/* -----------------------------15.12.99 09:57-------------------------------- - ---------------------------------------------------------------------------*/ void SwFrmCtrlWindow::Command( const CommandEvent& rCEvt ) { switch ( rCEvt.GetCommand() ) @@ -510,9 +480,7 @@ void SwFrmCtrlWindow::Command( const CommandEvent& rCEvt ) default:; } } -/* -----------------------------15.12.99 12:57-------------------------------- - ---------------------------------------------------------------------------*/ MenuResource::MenuResource(const ResId& rResId) : Resource(rResId), aMenuArray(ResId(1,*rResId.GetResMgr())) diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index 0930d1a6e30e..77fc423422fe 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -42,16 +42,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem ); -// ----------------------------------------------------------------------- - const long nImageWidthSingle = 15; const long nImageWidthAuto = 25; const long nImageWidthBook = 23; const long nImageWidthSum = 63; const long nImageHeight = 11; -// ----------------------------------------------------------------------- - struct SwViewLayoutControl::SwViewLayoutControl_Impl { USHORT mnState; // 0 = single, 1 = auto, 2 = book, 3 = none @@ -80,15 +76,11 @@ SwViewLayoutControl::SwViewLayoutControl( USHORT _nSlotId, USHORT _nId, StatusBa mpImpl->maImageBookMode_Active = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC) : SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE) ); } -// ----------------------------------------------------------------------- - SwViewLayoutControl::~SwViewLayoutControl() { delete mpImpl; } -// ----------------------------------------------------------------------- - void SwViewLayoutControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState || pState->ISA( SfxVoidItem ) ) @@ -116,8 +108,6 @@ void SwViewLayoutControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, co GetStatusBar().SetItemData( GetId(), 0 ); // force repaint } -// ----------------------------------------------------------------------- - void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt ) { OutputDevice* pDev = rUsrEvt.GetDevice(); diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index e5713f9170b9..512487a8bc40 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -28,8 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - - #include "hintids.hxx" #include <vcl/status.hxx> @@ -40,10 +38,8 @@ #include "swtypes.hxx" #include "zoomctrl.hxx" - SFX_IMPL_STATUSBAR_CONTROL( SwZoomControl, SvxZoomItem ); - SwZoomControl::SwZoomControl( USHORT _nSlotId, USHORT _nId, StatusBar& rStb ) : @@ -51,14 +47,10 @@ SwZoomControl::SwZoomControl( USHORT _nSlotId, { } -// ----------------------------------------------------------------------- - SwZoomControl::~SwZoomControl() { } -// ----------------------------------------------------------------------- - void SwZoomControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -74,8 +66,6 @@ void SwZoomControl::StateChanged( USHORT nSID, SfxItemState eState, } } -// ----------------------------------------------------------------------- - void SwZoomControl::Paint( const UserDrawEvent& rUsrEvt ) { if(!sPreviewZoom.Len()) @@ -84,8 +74,6 @@ void SwZoomControl::Paint( const UserDrawEvent& rUsrEvt ) GetStatusBar().SetItemText( GetId(), sPreviewZoom ); } -// ----------------------------------------------------------------------- - void SwZoomControl::Command( const CommandEvent& rCEvt ) { if(!sPreviewZoom.Len()) |