diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /cui | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'cui')
64 files changed, 0 insertions, 481 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 4c767bf9c7ca..5fcee3feba2c 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -4825,7 +4825,6 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) } - void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry ) { if ( pEntry != nullptr ) diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e2aa34d35da3..927a2dde7695 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -855,7 +855,6 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< fra } - IMPL_LINK_NOARG_TYPED(AssignComponentDialog, ButtonHandler, Button*, void) { OUString aMethodName = mpMethodEdit->GetText(); @@ -903,7 +902,6 @@ IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void } - SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "MacroAssignDialog", "cui/ui/macroassigndialog.ui") diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index d8a0f731988b..a497db709446 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; - SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rDesc ) @@ -34,7 +33,6 @@ SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : } - SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription ) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index b9f74bc89e1f..f1b552fc4576 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -470,7 +470,6 @@ IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) }; - IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) { if (m_pOptionsPB == pBtn) @@ -568,7 +567,6 @@ OUString SpellDialog::getReplacementString() const } - IMPL_LINK_NOARG_TYPED(SpellDialog, DoubleClickChangeHdl, ListBox&, void) { ChangeHdl(nullptr); @@ -594,7 +592,6 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); @@ -755,7 +752,6 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, IgnoreHdl, Button*, void) } - bool SpellDialog::Close() { // We have to call ToggleChildWindow directly; calling SfxDispatcher's @@ -775,7 +771,6 @@ void SpellDialog::SetSelectedLang_Impl( LanguageType nLang ) } - LanguageType SpellDialog::GetSelectedLang_Impl() const { sal_Int16 nLang = m_pLanguageLB->GetSelectLanguage(); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index c8a5a28ada93..ded95884f4eb 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -131,22 +131,18 @@ void SvxCharacterMap::SetChar( sal_UCS4 c ) } - sal_UCS4 SvxCharacterMap::GetChar() const { return m_pShowSet->GetSelectCharacter(); } - OUString SvxCharacterMap::GetCharacters() const { return m_pShowText->GetText(); } - - void SvxCharacterMap::DisableFontSelection() { m_pFontText->Disable(); @@ -269,7 +265,6 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void SvxShowText::SetFont( const vcl::Font& rFont ) { long nWinHeight = GetOutputSizePixel().Height(); @@ -300,7 +295,6 @@ void SvxShowText::Resize() } - void SvxShowText::SetText( const OUString& rText ) { Control::SetText( rText ); @@ -308,7 +302,6 @@ void SvxShowText::SetText( const OUString& rText ) } - // class SvxCharacterMap ================================================= void SvxCharacterMap::init() @@ -381,7 +374,6 @@ void SvxCharacterMap::init() } - void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) { // first get the underlying info in order to get font names @@ -400,7 +392,6 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void) { OUString aStr = m_pShowText->GetText(); @@ -428,7 +419,6 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); @@ -481,7 +471,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); @@ -495,7 +484,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) { if (bOne) @@ -507,7 +495,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) { if ( !bOne ) @@ -539,7 +526,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) { OUString aText; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 88429636510f..c285d86d27a5 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -70,12 +70,6 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } - - - - - - //# # //# Hyperlink - Dialog # //# # diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 99a67551ca8a..6e39a876bcab 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -75,7 +75,6 @@ void IconChoicePage::ActivatePage( const SfxItemSet& ) } - int IconChoicePage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; @@ -116,7 +115,6 @@ void IconChoicePage::ImplInitSettings() } - void IconChoicePage::StateChanged( StateChangedType nType ) { Window::StateChanged( nType ); @@ -129,7 +127,6 @@ void IconChoicePage::StateChanged( StateChangedType nType ) } - void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -143,11 +140,9 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) } - // Class IconChoiceDialog - /********************************************************************** | | Ctor / Dtor @@ -322,7 +317,6 @@ void IconChoiceDialog::ShowPageImpl ( IconChoicePageData* pData ) } - void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) { if ( pData->pPage ) @@ -427,7 +421,6 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(IconChoiceDialog, CancelHdl, Button*, void) { Close(); @@ -493,7 +486,6 @@ void IconChoiceDialog::ActivatePageImpl () } - void IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); @@ -554,7 +546,6 @@ void IconChoiceDialog::DeActivatePageImpl () } - void IconChoiceDialog::ResetPageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); @@ -625,7 +616,6 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) } - void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) { bool bSet = ( pSet != nullptr ); @@ -640,14 +630,12 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) } - void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*/ ) { // not interested in } - SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 ) { SAL_INFO( "cui.dialogs", "CreateInputItemSet not implemented" ); @@ -672,7 +660,6 @@ short IconChoiceDialog::Execute() } - void IconChoiceDialog::Start( bool bShow ) { @@ -687,7 +674,6 @@ void IconChoiceDialog::Start( bool bShow ) } - bool IconChoiceDialog::QueryClose() { bool bRet = true; @@ -772,7 +758,6 @@ bool IconChoiceDialog::OK_Impl() } - short IconChoiceDialog::Ok() { bInOK = true; diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 3d8466d5a106..bfa1437c0883 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -99,7 +99,6 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU } - IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, DoubleClickHdl, ListBox&, void) { EndDialog( RET_OK ); @@ -133,7 +132,6 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) { if ( m_pRbNewObject->IsChecked() ) @@ -149,7 +147,6 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) } - void SvInsertOleDlg::SelectDefault() { m_pLbObjecttype->SelectEntryPos(0); @@ -603,7 +600,6 @@ short SfxInsertFloatingFrameDialog::Execute() } - IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) { CheckBox* pCB = static_cast<CheckBox*>(pButton); @@ -625,7 +621,6 @@ IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void } - IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) { vcl::Window* pOldParent = Application::GetDefDialogParent(); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index bd1b07b11d2e..1a9a932494ac 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -183,6 +183,4 @@ bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 1b69f936e410..9f37eee2aead 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -121,7 +121,6 @@ SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSe } - SvxPostItDialog::~SvxPostItDialog() { disposeOnce(); @@ -142,7 +141,6 @@ void SvxPostItDialog::dispose() } - void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) { OUString sTxt( rAuthor ); @@ -152,7 +150,6 @@ void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rD } - const sal_uInt16* SvxPostItDialog::GetRanges() { static const sal_uInt16 pRanges[] = @@ -165,7 +162,6 @@ const sal_uInt16* SvxPostItDialog::GetRanges() } - void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) { m_pPrevBtn->Enable(bPrev); @@ -173,7 +169,6 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) } - IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void) { aPrevHdlLink.Call( *this ); @@ -212,7 +207,6 @@ IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxPostItDialog, OKHdl, Button*, void) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index e142956e959f..de84d1c7f29f 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -174,7 +174,6 @@ IMPL_LINK_TYPED( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) } - void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); @@ -1575,7 +1574,6 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Wind } - SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( vcl::Window* pParent ) { return new AbstractPasteDialog_Impl( VclPtr<SvPasteObjectDialog>::Create( pParent ) ); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 6c7d73fb9452..5bb412c6a611 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -50,7 +50,6 @@ namespace svx { - class AlignmentTabPage : public SfxTabPage { using TabPage::DeactivatePage; @@ -114,7 +113,6 @@ private: }; - } #endif diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 8b47df782023..2c56294ab676 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -51,7 +51,6 @@ public: }; - /************************************************************************* |* |* Hyperlink-Dialog diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 24c4a6ce2666..095b961ceca7 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -25,7 +25,6 @@ #include <vcl/field.hxx> - class FmInputRecordNoDialog : public ModalDialog { public: diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 76c979e55601..ac09a3d91bbd 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -151,7 +151,6 @@ public: }; - #endif // INCLUDED_CUI_SOURCE_INC_DLGNAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 5ada9262ba37..df61c578320f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_INC_NUMFMT_HXX - #include <rtl/ustring.hxx> #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> @@ -34,13 +33,11 @@ #include <vcl/window.hxx> - class SvxNumberFormatShell; class SvxNumberInfoItem; class vector; - class SvxNumberPreview : public vcl::Window { private: @@ -62,7 +59,6 @@ public: }; - class SvxNumberFormatTabPage : public SfxTabPage { friend class VclPtr<SvxNumberFormatTabPage>; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index cea7ac040f5c..b29e32993ea7 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -79,7 +79,6 @@ struct SvxNumSettings_Impl typedef std::vector<std::unique_ptr<SvxNumSettings_Impl> > SvxNumSettingsArr_Impl; - class SvxSingleNumPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -116,8 +115,6 @@ public: }; - - class SvxBulletPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -200,7 +197,6 @@ public: }; - class SvxBitmapPickTabPage : public SfxTabPage { using TabPage::ActivatePage; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index b0082525273e..87363297f0fe 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -25,7 +25,6 @@ #include <memory> - struct PasswordToOpenModifyDialog_Impl; class PasswordToOpenModifyDialog : public SfxModalDialog @@ -49,7 +48,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index b29ccec012a0..d76725a8e46e 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -99,7 +99,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - DECL_LINK_TYPED(RangeModifyHdl, Control&, void); DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 3490963393f5..f56ee4eec014 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -274,7 +274,6 @@ public: }; - #endif // INCLUDED_CUI_SOURCE_INC_TRANSFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 727e88bdf32b..91c9295939ec 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -311,8 +311,6 @@ void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const } - - void SvxChartColorTableItem::ReplaceColorByIndex( size_t _nIndex, const XColorEntry & _rEntry ) { m_aColorTable.replace( _nIndex, _rEntry ); diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index c3a4cee060c0..56ff7d3b88a9 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -199,5 +199,4 @@ namespace offapp } // namespace offapp - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 17e8a27386cc..de64d355aac6 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -81,10 +81,7 @@ namespace offapp } - - } // namespace offapp - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index cd439f268497..f0d16513d245 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -160,7 +160,6 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons } - DbRegistrationOptionsPage::~DbRegistrationOptionsPage() { disposeOnce(); @@ -179,7 +178,6 @@ void DbRegistrationOptionsPage::dispose() } - VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { @@ -187,7 +185,6 @@ VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent, } - bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) { // the settings for the single drivers @@ -215,7 +212,6 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) } - void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) { // the settings for the single drivers @@ -314,7 +310,6 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) } - IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -344,7 +339,6 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, } - IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -451,5 +445,4 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, NameValidator, const OUString&, _rNa } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 18a8680518b1..cd612bd78635 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -52,10 +52,7 @@ namespace svx } - - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 8abd26130a2b..e5e274ff8864 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -39,7 +39,6 @@ public: }; - void OptLBoxString_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index d743156bbc4f..38a9d4704ece 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -172,8 +172,6 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) } - - // event handlers diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 825ee32cf82e..31564763122f 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -499,7 +499,6 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor) } - // ColorConfigWindow_Impl @@ -1040,7 +1039,6 @@ IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) }; - // SvxColorOptionsTabPage diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 5fe38e7988fa..666cfc4ef5f0 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -200,7 +200,6 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) { if ( !pNameEdit->GetText().isEmpty() ) @@ -376,7 +375,6 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( } - void SvxEditDictionaryDialog::SetLanguage_Impl( util::Language nLanguage ) { // select language @@ -423,7 +421,6 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) } - IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) { sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); @@ -447,7 +444,6 @@ IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, voi } - IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) { sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos(); @@ -481,7 +477,6 @@ IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, voi } - void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) { Reference< XDictionary > xDic = aDics.getConstArray()[ nId ]; @@ -553,7 +548,6 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) } - IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) { if(!bDoNothing) @@ -579,7 +573,6 @@ IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) }; - IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(static_cast<PushButton*>(pBtn)); @@ -686,7 +679,6 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn) } - IMPL_LINK_TYPED(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) { OUString rEntry = rEdt.GetText(); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 08a5eef252b9..b990d188e0ef 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -37,7 +37,6 @@ enum MSFltrPg2_CheckBoxEntries { }; - OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet ) { diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 706c17159466..a024162675bc 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1590,7 +1590,6 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) m_pWesternLanguageLB->Enable( bEnable ); - // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl #if 0 bEnable = ( !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale_CJK" ) && m_pAsianSupportCB->IsChecked() ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index bd67adbb8c19..c2630b2c2a32 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -154,8 +154,6 @@ const vFieldInfo[] = } // namespace - - // Row struct SvxGeneralTabPage::Row @@ -176,8 +174,6 @@ public: }; - - // Field struct SvxGeneralTabPage::Field @@ -202,7 +198,6 @@ public: }; - SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet) @@ -283,7 +278,6 @@ void SvxGeneralTabPage::InitControls () } - void SvxGeneralTabPage::SetLinks () { // link for updating the initials @@ -294,7 +288,6 @@ void SvxGeneralTabPage::SetLinks () } - VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet ); @@ -340,7 +333,6 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) } - // ModifyHdl_Impl() // This handler updates the initials (short name) // when one of the name fields was updated. @@ -377,7 +369,6 @@ IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) } - bool SvxGeneralTabPage::GetAddress_Impl() { // updating @@ -396,7 +387,6 @@ bool SvxGeneralTabPage::GetAddress_Impl() } - void SvxGeneralTabPage::SetAddress_Impl() { // updating and disabling edit boxes @@ -426,7 +416,6 @@ void SvxGeneralTabPage::SetAddress_Impl() } - SvxGeneralTabPage::sfxpg SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index ee3f151516ab..f60a831d3523 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -66,5 +66,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index b288c9983407..1c878c3db924 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -119,7 +119,6 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) } - void SvxNoSpaceEdit::Modify() { Edit::Modify(); @@ -525,7 +524,6 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable) } - IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -540,7 +538,6 @@ IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) } - IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) { Edit* pEdit = static_cast<Edit*>(&rControl); @@ -551,7 +548,6 @@ IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, } - void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) { // try to show tips just like as on toolbars sal_Int32 nPos=LISTBOX_ENTRY_NOTFOUND; @@ -1092,5 +1088,4 @@ IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 6c8e805fb002..5568cdc89d8c 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -199,7 +199,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& } - SvxJavaOptionsPage::~SvxJavaOptionsPage() { disposeOnce(); @@ -235,7 +234,6 @@ void SvxJavaOptionsPage::dispose() } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) { bool bEnable = m_pJavaEnableCB->IsChecked(); @@ -244,7 +242,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() ) @@ -254,7 +251,6 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) { // set installation directory info @@ -269,7 +265,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) { try @@ -294,7 +289,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA @@ -344,7 +338,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA @@ -390,14 +383,12 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) { LoadJREs(); } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) { try @@ -415,7 +406,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) } - IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if ( RET_OK == pEvt->DialogResult ) @@ -427,7 +417,6 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, } - IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) { ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this); @@ -442,7 +431,6 @@ IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) } - void SvxJavaOptionsPage::ClearJavaInfo() { #if HAVE_FEATURE_JAVA @@ -465,7 +453,6 @@ void SvxJavaOptionsPage::ClearJavaInfo() } - void SvxJavaOptionsPage::ClearJavaList() { SvTreeListEntry* pEntry = m_pJavaList->First(); @@ -479,7 +466,6 @@ void SvxJavaOptionsPage::ClearJavaList() } - void SvxJavaOptionsPage::LoadJREs() { #if HAVE_FEATURE_JAVA @@ -527,7 +513,6 @@ void SvxJavaOptionsPage::LoadJREs() } - void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) { #if HAVE_FEATURE_JAVA @@ -550,7 +535,6 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) } - void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) { m_pJavaList->Select( _pEntry ); @@ -572,7 +556,6 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) } - void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { #if HAVE_FEATURE_JAVA @@ -648,14 +631,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } - VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return VclPtr<SvxJavaOptionsPage>::Create( pParent, *rAttrSet ); } - bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) { bool bModified = false; @@ -761,7 +742,6 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) } - void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { ClearJavaInfo(); @@ -790,7 +770,6 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) } - void SvxJavaOptionsPage::FillUserData() { OUString aUserData; @@ -847,7 +826,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); @@ -887,7 +865,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); @@ -896,7 +873,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); @@ -923,7 +899,6 @@ short SvxJavaParameterDlg::Execute() } - Sequence< OUString > SvxJavaParameterDlg::GetParameters() const { sal_Int32 nCount = m_pAssignedList->GetEntryCount(); @@ -935,7 +910,6 @@ Sequence< OUString > SvxJavaParameterDlg::GetParameters() const } - void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) { m_pAssignedList->Clear(); @@ -970,7 +944,6 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent) } - SvxJavaClassPathDlg::~SvxJavaClassPathDlg() { disposeOnce(); @@ -1027,7 +1000,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -1063,7 +1035,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathList->GetSelectEntryPos(); @@ -1083,14 +1054,12 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void) { EnableRemoveButton(); } - bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath ) { bool bRet = false; @@ -1110,7 +1079,6 @@ bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath ) } - OUString SvxJavaClassPathDlg::GetClassPath() const { OUString sPath; @@ -1129,7 +1097,6 @@ OUString SvxJavaClassPathDlg::GetClassPath() const } - void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath ) { if ( m_sOldPath.isEmpty() ) diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 9ef64992a245..60fd15bbdea8 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::i18n; - SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet ) { diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index eb58df0a09a4..b64ef76d330b 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -28,7 +28,6 @@ namespace vcl { class Window; } class SfxItemSet; - class SvxJSearchOptionsPage : public SfxTabPage { private: @@ -75,7 +74,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 98dbbded979f..cdf0b3237283 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -631,8 +631,6 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp } - - static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd) { const Locale* pAdd = rAdd.getConstArray(); @@ -1217,7 +1215,6 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet ) } - // activate dictionaries according to checkbox state Sequence< OUString > aActiveDics; @@ -1359,7 +1356,6 @@ void SvxLinguTabPage::AddDicBoxEntry( } - void SvxLinguTabPage::UpdateDicBox_Impl() { m_pLinguDicsCLB->SetUpdateMode(false); @@ -1378,7 +1374,6 @@ void SvxLinguTabPage::UpdateDicBox_Impl() } - void SvxLinguTabPage::UpdateModulesBox_Impl() { if (pLinguData) @@ -1401,7 +1396,6 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() } - void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) { // if not HideGroups was called with GROUP_MODULES... @@ -1413,7 +1407,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) } - // get data from configuration @@ -1512,7 +1505,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) } - IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) { if (pBox == m_pLinguModulesCLB) @@ -1531,14 +1523,12 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, } - IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) { ClickHdl_Impl(m_pLinguModulesEditPB); } - IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); @@ -1546,7 +1536,6 @@ IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) } - IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) { if (pBox == m_pLinguModulesCLB) @@ -1576,7 +1565,6 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, } - IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) { if (m_pLinguModulesEditPB == pBtn) @@ -1755,7 +1743,6 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) } - IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pLinguModulesCLB == pBox) @@ -1789,7 +1776,6 @@ IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } - SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -1812,7 +1798,6 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) } - void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) { if ( 0 != ( GROUP_MODULES & nGrp ) ) @@ -2308,7 +2293,6 @@ IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index e3bc43783cd3..20be147715ca 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -110,7 +110,6 @@ SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) } - OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet) { @@ -212,7 +211,6 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) } - void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index d30fcc8c2601..f8215a62bac2 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -234,7 +234,6 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) } - SvxPathTabPage::~SvxPathTabPage() { disposeOnce(); @@ -275,7 +274,6 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) } - void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); @@ -368,7 +366,6 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) } - void SvxPathTabPage::FillUserData() { HeaderBar &rBar = pPathBox->GetTheHeaderBar(); @@ -381,7 +378,6 @@ void SvxPathTabPage::FillUserData() } - IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) { sal_uInt16 nSelCount = 0; @@ -403,7 +399,6 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) } - IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); @@ -470,7 +465,6 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) } - void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); @@ -534,7 +528,6 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } - IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) { PathHdl_Impl(nullptr); @@ -645,7 +638,6 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE) @@ -673,7 +665,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) } - IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if (!pBar || !pBar->GetCurItemId()) @@ -703,7 +694,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) } - IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if ( RET_OK == pEvt->DialogResult ) @@ -716,7 +706,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void } - void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ) @@ -782,7 +771,6 @@ void SvxPathTabPage::GetPathList( } - void SvxPathTabPage::SetPathList( sal_uInt16 _nPathHandle, const OUString& _rUserPath, const OUString& _rWritablePath ) { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index d3448524014e..e1b63cee99a7 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -54,7 +54,6 @@ using namespace comphelper; #define CFG_PAGE_AND_GROUP "General", "LoadSave" - struct SvxSaveTabPage_Impl { Reference< XNameContainer > xFact; @@ -195,7 +194,6 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet } - SvxSaveTabPage::~SvxSaveTabPage() { disposeOnce(); @@ -512,7 +510,6 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) } - IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) { if ( pBox == aAutoSaveCB ) diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index ae2e1537e79e..ba0ade2bf883 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -97,5 +97,4 @@ namespace offapp } // namespace offapp - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index a5a064dcbc6d..160f0a315463 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2202,7 +2202,6 @@ void ExtensionsTabPage::dispose() } - void ExtensionsTabPage::CreateDialogWithHandler() { try @@ -2246,7 +2245,6 @@ void ExtensionsTabPage::CreateDialogWithHandler() } - bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { bool bRet = false; @@ -2299,7 +2297,6 @@ void ExtensionsTabPage::DeactivatePage() } - void ExtensionsTabPage::ResetPage() { DispatchAction( "back" ); @@ -2307,7 +2304,6 @@ void ExtensionsTabPage::ResetPage() } - void ExtensionsTabPage::SavePage() { DispatchAction( "ok" ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 3832cd0f7086..aac518d4084a 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -91,7 +91,6 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] = }; - const sal_uInt16 AlignmentTabPage::s_pRanges[] = { SID_ATTR_ALIGN_HOR_JUSTIFY,SID_ATTR_ALIGN_VER_JUSTIFY, @@ -107,7 +106,6 @@ const sal_uInt16 AlignmentTabPage::s_pRanges[] = }; - namespace { template<typename _JustContainerType, typename _JustEnumType> @@ -149,7 +147,6 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const }//namespace - AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs ) @@ -441,7 +438,6 @@ IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableHdl, ListBox&, void) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index cb0932ab88a8..db26ba4d6aa9 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2157,7 +2157,6 @@ IMPL_LINK_TYPED( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) } - OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) { if (!cChar) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index cd45b4fc0e37..416a582cc6a6 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -417,7 +417,6 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const } - void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) { SfxTabPage::Reset( rSet ); @@ -642,7 +641,6 @@ SfxTabPage::sfxpg SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); @@ -795,14 +793,12 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) } - void SvxBorderTabPage::HideShadowControls() { m_pShadowFrame->Hide(); } - IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) { const svx::FrameBorderState SHOW = svx::FRAMESTATE_SHOW; @@ -874,7 +870,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) } - IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) { bool bEnable = m_pWndShadows->GetSelectItemId() > 1; @@ -885,7 +880,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) } - IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) { ColorListBox* pColLb = static_cast<ColorListBox*>(&rLb); @@ -910,7 +904,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void ) { if (&rLb == m_pLbLineStyle) @@ -935,7 +928,6 @@ const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5; const sal_uInt16 SVX_BORDER_SHADOW_COUNT = 5; - sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const { // table with all sets of predefined border styles @@ -1003,7 +995,6 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const } - void SvxBorderTabPage::FillPresetVS() { ImageList& rImgList = aBorderImgLst; @@ -1026,7 +1017,6 @@ void SvxBorderTabPage::FillPresetVS() } - void SvxBorderTabPage::FillShadowVS() { ImageList& rImgList = aShadowImgLst; @@ -1056,7 +1046,6 @@ void SvxBorderTabPage::FillShadowVS() } - void SvxBorderTabPage::FillValueSets() { FillPresetVS(); @@ -1204,7 +1193,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) } - IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) { if ( mbSync ) diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index a1e6b06ffb7c..aecef5b2be2d 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -264,8 +264,6 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet, } - - sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot, FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags ) { @@ -288,7 +286,6 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index 1761fe5479ee..466c631709f9 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -33,7 +33,6 @@ namespace svx { class FrameSelector; - /** Creates an item connection object that connects an SvxLineItem with an svx::FrameSelector control. */ sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot, @@ -54,7 +53,6 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); - } #endif diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 42150e41fcd2..99e3382b08ec 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -161,7 +161,6 @@ inline SvxFont& SvxCharBasePage::GetPreviewFont() } - inline SvxFont& SvxCharBasePage::GetPreviewCJKFont() { return m_pPreviewWin->GetCJKFont(); @@ -174,7 +173,6 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() } - SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) , m_pPreviewWin(nullptr) @@ -200,8 +198,6 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) } - - void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); @@ -375,7 +371,6 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet } - SvxCharNamePage::~SvxCharNamePage() { disposeOnce(); @@ -441,7 +436,6 @@ void SvxCharNamePage::Initialize() } - const FontList* SvxCharNamePage::GetFontList() const { if ( !m_pImpl->m_pFontList ) @@ -543,7 +537,6 @@ namespace } - void SvxCharNamePage::UpdatePreview_Impl() { SvxFont& rFont = GetPreviewFont(); @@ -584,7 +577,6 @@ void SvxCharNamePage::UpdatePreview_Impl() } - void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) { const FontList* pFontList = GetFontList(); @@ -621,7 +613,6 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) } - void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) { const FontList* pFontList = GetFontList(); @@ -656,7 +647,6 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) } - void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { FontNameBox* pNameBox = nullptr; @@ -1178,14 +1168,12 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp } - IMPL_LINK_NOARG_TYPED(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) { UpdatePreview_Impl(); } - IMPL_LINK_TYPED( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void ) { FontModifyHdl_Impl(&rBox); @@ -1210,7 +1198,6 @@ void SvxCharNamePage::FontModifyHdl_Impl(void* pNameBox) } - void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); @@ -1219,7 +1206,6 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -1228,14 +1214,12 @@ SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharNamePage>::Create( pParent, *rSet ); } - void SvxCharNamePage::Reset( const SfxItemSet* rSet ) { Reset_Impl( *rSet, Western ); @@ -1270,7 +1254,6 @@ bool SvxCharNamePage::FillItemSet( SfxItemSet* rSet ) } - void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem ) { if ( m_pImpl->m_bMustDelete ) @@ -1311,7 +1294,6 @@ void SvxCharNamePage::EnableRelativeMode() } - void SvxCharNamePage::EnableSearchMode() { m_pImpl->m_bInSearchMode = true; @@ -1598,7 +1580,6 @@ void SvxCharEffectsPage::UpdatePreview_Impl() } - void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) { if ( SVX_CASEMAP_END > eCaseMap ) @@ -1614,7 +1595,6 @@ void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) } - void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); @@ -1672,7 +1652,6 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) } - bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); @@ -1713,7 +1692,6 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) } - IMPL_LINK_TYPED( SvxCharEffectsPage, SelectListBoxHdl_Impl, ListBox&, rBox, void ) { SelectHdl_Impl(&rBox); @@ -1750,7 +1728,6 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox ) } - IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) { bool bEnable = ( ( m_pUnderlineLB->GetSelectEntryPos() > 0 ) || @@ -1762,21 +1739,18 @@ IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } - IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } - IMPL_LINK_TYPED( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, void ) { ColorListBox* pBox = static_cast<ColorListBox*>(&rListBox); @@ -1805,14 +1779,12 @@ SfxTabPage::sfxpg SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharEffectsPage>::Create( pParent, *rSet ); } - void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) { SvxFont& rFont = GetPreviewFont(); @@ -2750,7 +2722,6 @@ void SvxCharPositionPage::UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscPro } - void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) { SvxEscapementItem aEscItm( (SvxEscapement)nEsc, SID_ATTR_CHAR_ESCAPEMENT ); @@ -2798,7 +2769,6 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) } - IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) { sal_uInt16 nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL @@ -2812,7 +2782,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) } - IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) { bool bEnable = false; @@ -2824,7 +2793,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) { sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue(); @@ -2834,7 +2802,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) { if ( static_cast<CheckBox*>(pBox)->IsChecked() ) @@ -2849,7 +2816,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void } - IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) { if (m_pFitToLineCB == pBox) @@ -2864,7 +2830,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void) { if ( m_pKerningLB->GetSelectEntryPos() > LW_NORMAL ) @@ -2897,7 +2862,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) { long nVal = static_cast<long>(m_pKerningMF->GetValue()); @@ -2919,7 +2883,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) { MetricField* pField = static_cast<MetricField*>(&rControl); @@ -2944,7 +2907,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, voi } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) { m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) ); @@ -2969,7 +2931,6 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -2978,14 +2939,12 @@ SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharPositionPage>::Create( pParent, *rSet ); } - void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { OUString sUser = GetUserData(); @@ -3372,7 +3331,6 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) } - void SvxCharPositionPage::FillUserData() { const OUString cTok( ";" ); @@ -3451,7 +3409,6 @@ void SvxCharTwoLinesPage::Initialize() } - void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) { bool bStart = pBox == m_pStartBracketLB; @@ -3470,7 +3427,6 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) } - void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) { sal_Int32 nEntryPos = 0; @@ -3508,7 +3464,6 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) } - IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) { bool bChecked = m_pTwoLinesBtn->IsChecked(); @@ -3518,7 +3473,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -3536,14 +3490,12 @@ IMPL_LINK_TYPED( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void } - void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); } - SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -3552,7 +3504,6 @@ SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharTwoLinesPage>::Create( pParent, *rSet ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 55cb3b301cf9..da590149f576 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -165,7 +165,6 @@ void SvxCaptionTabPage::Construct() } - bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) { SfxItemPool* pPool = _rOutAttrs->GetPool(); @@ -237,7 +236,6 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) } - void SvxCaptionTabPage::Reset( const SfxItemSet* ) { @@ -355,7 +353,6 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { @@ -363,7 +360,6 @@ VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow, } - void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) { switch( nType ) @@ -421,7 +417,6 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) } - IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ) @@ -456,7 +451,6 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) } - IMPL_LINK_NOARG_TYPED(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) { SetupType_Impl( m_pCT_CAPTTYPE->GetSelectItemId() ); @@ -493,7 +487,6 @@ void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType ) } - void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); @@ -503,7 +496,6 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } - void SvxCaptionTabPage::FillValueSet() { m_pCT_CAPTTYPE->SetItemImage(BMP_CAPTTYPE_1, m_aBmpCapTypes[0] ); @@ -512,8 +504,6 @@ void SvxCaptionTabPage::FillValueSet() } - - SvxCaptionTabDialog::SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pSdrView, sal_uInt16 nAnchorTypes) : SfxTabDialog( pParent, "CalloutDialog", "cui/ui/calloutdialog.ui") diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 72d79a7cb287..f0b3255373c3 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -199,7 +199,6 @@ void SvxNumberPreview::InitSettings( bool bForeground, bool bBackground ) } - void SvxNumberPreview::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::ControlForeground ) @@ -211,7 +210,6 @@ void SvxNumberPreview::StateChanged( StateChangedType nType ) } - void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -933,7 +931,6 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa } - if ( nCategory != nCurCategory || bDoIt) { if ( bCheckCatChange ) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 28959c48b8a4..0fa0782bf304 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -89,7 +89,6 @@ const sal_uInt16 aArr[] = }; - sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) { for ( sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aArr); ++i ) @@ -99,7 +98,6 @@ sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) } - sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) { if ( nPos >= SAL_N_ELEMENTS(aArr) ) @@ -108,7 +106,6 @@ sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) } - Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBox ) { Size aSz; @@ -120,7 +117,6 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo } - long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit ) { return OutputDevice::LogicToLogic( nIn, (MapUnit)eUnit, MAP_TWIP ); @@ -140,7 +136,6 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) } - #define MARGIN_LEFT ( (MarginPosition)0x0001 ) #define MARGIN_RIGHT ( (MarginPosition)0x0002 ) #define MARGIN_TOP ( (MarginPosition)0x0004 ) @@ -362,7 +357,6 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr } - SvxPageDescPage::~SvxPageDescPage() { disposeOnce(); @@ -408,7 +402,6 @@ void SvxPageDescPage::dispose() } - void SvxPageDescPage::Init_Impl() { // adjust the handler @@ -442,7 +435,6 @@ void SvxPageDescPage::Init_Impl() } - void SvxPageDescPage::Reset( const SfxItemSet* rSet ) { SfxItemPool* pPool = rSet->GetPool(); @@ -693,7 +685,6 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) } - void SvxPageDescPage::FillUserData() { if ( SVX_PAGE_MODE_PRESENTATION == eMode ) @@ -702,7 +693,6 @@ void SvxPageDescPage::FillUserData() } - bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -926,7 +916,6 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) { // switch inside outside @@ -950,7 +939,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) { if ( m_pPaperTrayBox->GetEntryCount() > 1 ) @@ -985,7 +973,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) } - IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -1056,7 +1043,6 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); @@ -1080,7 +1066,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) { if ( @@ -1108,7 +1093,6 @@ IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) } - void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = mpDefPrinter->GetMapMode(); @@ -1176,7 +1160,6 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void) { if ( !bBorderModified ) @@ -1206,7 +1189,6 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) } - void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) { sal_uInt16 nWhich(GetWhich(SID_ATTR_PAGE_HEADERSET)); @@ -1464,7 +1446,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) } - void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) { InitHeadFoot_Impl( rSet ); @@ -1474,7 +1455,6 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { // Inquiry whether the page margins are beyond the printing area. @@ -1528,7 +1508,6 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) { // example window @@ -1596,7 +1575,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) } - void SvxPageDescPage::CalcMargin_Impl() { // current values for page margins @@ -1639,7 +1617,6 @@ void SvxPageDescPage::CalcMargin_Impl() } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, CenterHdl_Impl, Button*, void) { m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); @@ -1662,7 +1639,6 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) } - IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) { bool bEnable = false; @@ -1677,7 +1653,6 @@ IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) } - void SvxPageDescPage::DisableVerticalPageDir() { m_pTextFlowBox->RemoveEntryValue( FRMDIR_VERT_TOP_RIGHT ); diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 73961af035ea..6a6ce0394e69 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -222,7 +222,6 @@ short SvxAreaTabDialog::Ok() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 20b3da921466..4db2bbc5d979 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -103,7 +103,6 @@ SvxLineTabDialog::SvxLineTabDialog } - void SvxLineTabDialog::SavePalettes() { SfxObjectShell* pShell = SfxObjectShell::Current(); @@ -171,7 +170,6 @@ void SvxLineTabDialog::SavePalettes() } - short SvxLineTabDialog::Ok() { SavePalettes(); @@ -182,7 +180,6 @@ short SvxLineTabDialog::Ok() } - IMPL_LINK_NOARG_TYPED(SvxLineTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 3ec8bf61468f..266d8a074c44 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -692,7 +692,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs pMainFrame->set_height_request(aMainFrame.Height()); - // groups that overlay each other m_pLbBitmap->Hide(); m_pCtlBitmapPreview->Hide(); @@ -847,7 +846,6 @@ void SvxAreaTabPage::Construct() } - void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nCount(0); @@ -996,7 +994,6 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( m_nDlgType == 0 ) // area dialog @@ -1048,7 +1045,6 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) { sal_Int32 _nPos; @@ -1493,7 +1489,6 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) { bool isMissingHatching(false); @@ -1851,7 +1846,6 @@ VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void) { switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() ) @@ -1888,7 +1882,6 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl() } - void SvxAreaTabPage::ClickColorHdl_Impl() { m_pBxBitmap->Hide(); @@ -1912,7 +1905,6 @@ void SvxAreaTabPage::ClickColorHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -1966,7 +1958,6 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -1992,7 +1983,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) } - void SvxAreaTabPage::ClickHatchingHdl_Impl() { m_pFillLB->Show(); @@ -2020,7 +2010,6 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -2046,7 +2035,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -2069,7 +2057,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, ListBox&, } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void) { // switch on/off backgroundcolor for hatches @@ -2092,7 +2079,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl, CheckBox&, } - void SvxAreaTabPage::ClickBitmapHdl_Impl() { m_pFillLB->Show(); @@ -2139,7 +2125,6 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) { //UUUU @@ -2170,7 +2155,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) } - IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountClickHdl_Impl, Button*, p, void ) { ModifyStepCountHdl_Impl(p); @@ -2400,7 +2384,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileHdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void) { if( m_pTsbScale->GetState() == TRISTATE_TRUE ) @@ -2436,7 +2419,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void) } - void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT eRcPt ) { m_eRP = eRcPt; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3026a8679797..0733247fc1af 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -152,7 +152,6 @@ void SvxBitmapTabPage::Construct() } - void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) { sal_Int32 nPos; @@ -230,7 +229,6 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) { if ( CheckChanges_Impl() == -1L ) @@ -243,7 +241,6 @@ SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) } - bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) { if( m_nDlgType == 0 && !*m_pbAreaTP ) // area dialog @@ -272,7 +269,6 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) } - void SvxBitmapTabPage::Reset( const SfxItemSet* ) { // aLbBitmaps.SelectEntryPos( 0 ); @@ -307,7 +303,6 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { @@ -315,7 +310,6 @@ VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBitmapHdl_Impl, ListBox&, void) { std::unique_ptr<GraphicObject> pGraphicObject; @@ -432,7 +426,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBitmapHdl_Impl, ListBox&, void) } - long SvxBitmapTabPage::CheckChanges_Impl() { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -478,7 +471,6 @@ long SvxBitmapTabPage::CheckChanges_Impl() } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) { @@ -586,8 +578,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) /******************************************************************************/ - - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -669,7 +659,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -732,7 +721,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -765,7 +753,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -867,7 +854,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -934,7 +920,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangePixelColorHdl_Impl, ListBox&, void) { m_pCtlPixel->SetPixelColor( m_pLbColor->GetSelectEntryColor() ); @@ -951,7 +936,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangePixelColorHdl_Impl, ListBox&, void } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl, ListBox&, void) { m_pCtlPixel->SetBackgroundColor( m_pLbBackgroundColor->GetSelectEntryColor() ); @@ -968,7 +952,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl, ListBox&, v } - void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) { if( pWindow == m_pCtlPixel ) @@ -985,8 +968,6 @@ void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) } - - vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 9c7ee227cd0f..f376503c57b3 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -118,7 +118,6 @@ void SvxColorTabPage::UpdateTableName() } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -198,7 +197,6 @@ void SvxColorTabPage::EnableSave( bool bCanSave ) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( @@ -305,7 +303,6 @@ struct SvxColorTabPageShadow }; - SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XCOLOR_LIST ) @@ -445,7 +442,6 @@ void SvxColorTabPage::ImpColorCountChanged() } - void SvxColorTabPage::Construct() { if (pColorList.is()) @@ -521,7 +517,6 @@ SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) } - long SvxColorTabPage::CheckChanges_Impl() { // used to NOT lose changes @@ -586,7 +581,6 @@ long SvxColorTabPage::CheckChanges_Impl() } - bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet ) { if( ( nDlgType != 0 ) || @@ -648,7 +642,6 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) } - VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { @@ -682,7 +675,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) ); @@ -767,7 +759,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -835,7 +826,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) { std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); @@ -874,7 +864,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -909,7 +898,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectColorLBHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -932,7 +920,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectColorLBHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, void) { sal_Int32 nPos = m_pValSetColorList->GetSelectItemId(); @@ -955,7 +942,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, void) } - void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) { switch (eModell) @@ -1008,7 +994,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectColorModelHdl_Impl, ListBox&, void) } - void SvxColorTabPage::ChangeColor(const Color &rNewColor) { aCurrentColor = rNewColor; @@ -1037,7 +1022,6 @@ void SvxColorTabPage::ChangeColor(const Color &rNewColor) } - //void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) //{ // long nCount = pColorList->Count(); @@ -1054,7 +1038,6 @@ void SvxColorTabPage::ChangeColor(const Color &rNewColor) //} - // A RGB value is converted to a CMYK value - not in an ideal way as // R is converted into C, G into M and B into Y. The K value is held in an // extra variable. For further color models one should develop own @@ -1074,7 +1057,6 @@ void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ) } - // reverse case to RgbToCmyk_Impl (see above) void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK ) @@ -1101,7 +1083,6 @@ void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK ) } - sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) { sal_uInt16 nWert = 0; @@ -1121,7 +1102,6 @@ sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) } - sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) { sal_uInt16 nWert = 0; @@ -1141,7 +1121,6 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) } - void SvxColorTabPage::FillUserData() { // the color model is saved in the Ini-file @@ -1149,7 +1128,6 @@ void SvxColorTabPage::FillUserData() } - void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame ) { const OfaRefItem<XColorList> *pPtr = nullptr; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index c074fca231b0..21cd0b3604f6 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -177,7 +177,6 @@ void SvxGradientTabPage::Construct() } - void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) { sal_Int32 nPos; @@ -254,7 +253,6 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( CheckChanges_Impl() == -1L ) @@ -267,7 +265,6 @@ SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) } - long SvxGradientTabPage::CheckChanges_Impl() { // is used here in order to NOT lose changes @@ -333,7 +330,6 @@ long SvxGradientTabPage::CheckChanges_Impl() } - bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_nDlgType == 0 && *m_pPageType == PT_GRADIENT && !*m_pbAreaTP ) @@ -370,7 +366,6 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) } - void SvxGradientTabPage::Reset( const SfxItemSet* ) { // m_pLbGradients->SelectEntryPos( 0 ); @@ -392,7 +387,6 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { @@ -400,7 +394,6 @@ VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); @@ -435,7 +428,6 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl ) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); @@ -537,7 +529,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); @@ -604,7 +595,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); @@ -636,7 +626,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -741,7 +730,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( @@ -809,7 +797,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl_Impl, ListBox&, void) { std::unique_ptr<XGradient> pGradient; @@ -882,7 +869,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl_Impl, ListBox&, void } - void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS ) { switch( eXGS ) diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index d6d4f850342b..a12478f80789 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -166,7 +166,6 @@ void SvxHatchTabPage::Construct() } - void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nPos; @@ -236,7 +235,6 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) @@ -249,7 +247,6 @@ SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) } - long SvxHatchTabPage::CheckChanges_Impl() { if( m_pMtrDistance->IsValueChangedFromSaved() || @@ -298,7 +295,6 @@ long SvxHatchTabPage::CheckChanges_Impl() } - bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_nDlgType == 0 && !*m_pbAreaTP ) // area dialog @@ -332,7 +328,6 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) } - void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) { ChangeHatchHdl_Impl( *m_pLbHatchings ); @@ -358,7 +353,6 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) } - VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { @@ -366,7 +360,6 @@ VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); @@ -405,7 +398,6 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void* p ) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl_Impl, ListBox&, void) { std::unique_ptr<XHatch> pHatch; @@ -476,7 +468,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); @@ -572,7 +563,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); @@ -639,7 +629,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); @@ -671,7 +660,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -766,7 +754,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -833,7 +820,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void) } - void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { if( pWindow == m_pCtlAngle ) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 944b0a4249cd..a360db9d3073 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -550,7 +550,6 @@ void SvxLineTabPage::FillListboxes() } - void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { const CntUInt16Item* pPageTypeItem = rSet.GetItem<CntUInt16Item>(SID_PAGE_TYPE, false); @@ -680,7 +679,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( m_nDlgType == 0 ) // Line dialog @@ -700,7 +698,6 @@ SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) { const SfxPoolItem* pOld = nullptr; @@ -985,7 +982,6 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxLineTabPage::FillXLSet_Impl() { sal_Int32 nPos; @@ -1106,7 +1102,6 @@ void SvxLineTabPage::FillXLSet_Impl() } - void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) { drawing::LineStyle eXLS; // drawing::LineStyle_NONE, drawing::LineStyle_SOLID, drawing::LineStyle_DASH @@ -1508,7 +1503,6 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) } - VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { @@ -1584,7 +1578,6 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void * pCntrl ) } - IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) { ChangeStartHdl_Impl(p); @@ -1613,7 +1606,6 @@ void SvxLineTabPage::ChangeStartHdl_Impl( void * p ) } - IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) { ChangePreviewHdl_Impl( nullptr ); @@ -1661,7 +1653,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) } - IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) { ChangeEndHdl_Impl(p); @@ -1690,7 +1681,6 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void * p ) } - IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) { sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); @@ -1704,14 +1694,12 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) } - void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { m_eRP = eRcPt; } - void SvxLineTabPage::FillUserData() { // Write the synched value to the INI file diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 3ec2f9247eea..46198f999830 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -184,7 +184,6 @@ void SvxLineDefTabPage::Construct() } - void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) { if( nDlgType == 0 ) // area dialog @@ -216,7 +215,6 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); @@ -228,7 +226,6 @@ SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxLineDefTabPage::CheckChanges_Impl() { // is here used to NOT lose changes @@ -274,7 +271,6 @@ void SvxLineDefTabPage::CheckChanges_Impl() } - sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -283,7 +279,6 @@ void SvxLineDefTabPage::CheckChanges_Impl() } - bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) { if( nDlgType == 0 ) // line dialog @@ -301,7 +296,6 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) { if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SfxItemState::DONTCARE ) @@ -347,14 +341,12 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) } - VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return VclPtr<SvxLineDefTabPage>::Create( pWindow, *rOutAttrs ); } - IMPL_LINK_TYPED( SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectLinestyleHdl_Impl(&rListBox); @@ -392,7 +384,6 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox* p) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) { FillDash_Impl(); @@ -416,7 +407,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) { if( m_pNumFldNumber2->GetValue() == 0L ) @@ -434,8 +424,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) } - - IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) { if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit ) @@ -503,7 +491,6 @@ IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) } - IMPL_LINK_TYPED( SvxLineDefTabPage, SelectTypeListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectTypeHdl_Impl(&rListBox); @@ -542,7 +529,6 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -631,7 +617,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -700,7 +685,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -736,7 +720,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -817,7 +800,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -871,7 +853,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) } - void SvxLineDefTabPage::FillDash_Impl() { css::drawing::DashStyle eXDS; @@ -895,7 +876,6 @@ void SvxLineDefTabPage::FillDash_Impl() } - void SvxLineDefTabPage::FillDialog_Impl() { css::drawing::DashStyle eXDS = aDash.GetDashStyle(); // css::drawing::DashStyle_RECT, css::drawing::DashStyle_ROUND diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 3f29be40482e..03f2a1e608ca 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -129,7 +129,6 @@ void SvxLineEndDefTabPage::Resize() } - void SvxLineEndDefTabPage::Construct() { m_pLbLineEnds->Fill( pLineEndList ); @@ -157,7 +156,6 @@ void SvxLineEndDefTabPage::Construct() } - void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) { if( nDlgType == 0 ) // area dialog @@ -181,7 +179,6 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); @@ -193,7 +190,6 @@ SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxLineEndDefTabPage::CheckChanges_Impl() { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -218,7 +214,6 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() } - bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) { if( nDlgType == 0 ) // line dialog @@ -238,7 +233,6 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) } - void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) { m_pLbLineEnds->SelectEntryPos( 0 ); @@ -277,14 +271,12 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return VclPtr<SvxLineEndDefTabPage>::Create( pWindow, *rSet ); } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) { if( pLineEndList->Count() > 0 ) @@ -310,14 +302,12 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, voi } - void SvxLineEndDefTabPage::ChangePreviewHdl_Impl() { m_pCtlPreview->Invalidate(); } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -397,7 +387,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) { if( pPolyObj ) @@ -511,7 +500,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -546,7 +534,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -628,7 +615,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 37a64510b280..1d9eddf343fd 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -195,7 +195,6 @@ void SvxShadowTabPage::Construct() } - void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nPos; @@ -256,7 +255,6 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) @@ -266,7 +264,6 @@ SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -380,7 +377,6 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) { if( !m_bDisable ) @@ -483,7 +479,6 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) } - VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { @@ -491,7 +486,6 @@ VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE ) @@ -508,7 +502,6 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) { ModifyShadowHdl_Impl(*m_pMtrTransparent); @@ -553,7 +546,6 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) } - void SvxShadowTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { m_eRP = eRcPt; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index feca458c8c24..cc7c3bfe3606 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -117,7 +117,6 @@ SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxIte } - void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) { if (nId==nPosSize) @@ -164,7 +163,6 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } - void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidation&,void>& rLink) { aValidateLink = rLink; @@ -285,7 +283,6 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet) } - void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) { const double fUIScale(double(pView->GetModel()->GetUIScale())); @@ -325,20 +322,17 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) } - VclPtr<SfxTabPage> SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { return VclPtr<SvxAngleTabPage>::Create(pWindow, *rSet); } - void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/) { } - SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) @@ -350,7 +344,6 @@ SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP) { if(pWindow == m_pCtlRect) @@ -487,7 +480,6 @@ void SvxSlantTabPage::Construct() } - bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) { bool bModified = false; @@ -711,7 +703,6 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) @@ -723,7 +714,6 @@ SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT ) { } @@ -917,7 +907,6 @@ void SvxPositionSizeTabPage::Construct() } - bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { bool bModified(false); @@ -1041,7 +1030,6 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) } - void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) { const SfxPoolItem* pItem; @@ -1148,14 +1136,12 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return VclPtr<SvxPositionSizeTabPage>::Create( pWindow, *rOutAttrs ); } - void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) { SfxRectangleItem const * pRectItem = nullptr; @@ -1172,7 +1158,6 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) @@ -1193,7 +1178,6 @@ SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) { // #106572# Remember user's last choice @@ -1202,7 +1186,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void } - void SvxPositionSizeTabPage::UpdateControlStates() { const bool bPosProtect = m_pTsbPosProtect->GetState() == TRISTATE_TRUE; @@ -1236,7 +1219,6 @@ void SvxPositionSizeTabPage::UpdateControlStates() } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) { if( m_pTsbSizeProtect->IsEnabled() ) @@ -1256,7 +1238,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, voi } - void SvxPositionSizeTabPage::SetMinMaxPosition() { // position @@ -1427,7 +1408,6 @@ void SvxPositionSizeTabPage::SetMinMaxPosition() } - void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange) { switch (m_pCtlPos->GetActualRP()) @@ -1484,7 +1464,6 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const } - void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) { if( pWindow == m_pCtlPos ) @@ -1556,21 +1535,18 @@ void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP } - void SvxPositionSizeTabPage::DisableResize() { mbSizeDisabled = true; } - void SvxPositionSizeTabPage::DisableProtect() { mbProtectDisabled = true; } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) @@ -1593,7 +1569,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) @@ -1616,14 +1591,12 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) { UpdateControlStates(); } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) { if( m_pCbxScale->IsChecked() ) @@ -1634,7 +1607,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) } - void SvxPositionSizeTabPage::FillUserData() { // matching is saved in the Ini-file |