summaryrefslogtreecommitdiffstats
path: root/filter/source
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source')
-rw-r--r--filter/source/flash/impswfdialog.cxx2
-rw-r--r--filter/source/flash/impswfdialog.hxx2
-rw-r--r--filter/source/pdf/impdialog.cxx40
-rw-r--r--filter/source/pdf/impdialog.hxx40
-rw-r--r--filter/source/pdf/pdffilter.cxx4
-rw-r--r--filter/source/svg/impsvgdialog.cxx2
-rw-r--r--filter/source/svg/impsvgdialog.hxx2
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--filter/source/svg/svgfilter.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx10
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx10
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
17 files changed, 66 insertions, 66 deletions
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 3bca31968594..1d15cc09d1db 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -93,7 +93,7 @@ Sequence< PropertyValue > ImpSWFDialog::GetFilterData()
/// This is called whenever the user toggles one of the checkboxes
-IMPL_LINK_TYPED( ImpSWFDialog, OnToggleCheckbox, CheckBox&, rBox, void )
+IMPL_LINK( ImpSWFDialog, OnToggleCheckbox, CheckBox&, rBox, void )
{
if (&rBox == mpCheckExportAll)
{
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index 5d5f152902f0..325f4b1fe4b4 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -50,7 +50,7 @@ private:
FilterConfigItem maConfigItem;
- DECL_LINK_TYPED( OnToggleCheckbox, CheckBox&, void );
+ DECL_LINK( OnToggleCheckbox, CheckBox&, void );
public:
ImpSWFDialog( vcl::Window* pParent,
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index eb089d38f4c7..df7de8f45f9a 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -307,7 +307,7 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabDialog, CancelHdl, Button*, void)
+IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl, Button*, void)
{
EndDialog();
}
@@ -775,18 +775,18 @@ VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( vcl::Window* pParent,
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAllHdl, RadioButton&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAllHdl, RadioButton&, void)
{
EnableExportNotesPages();
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, TogglePagesHdl, RadioButton&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl, RadioButton&, void)
{
TogglePagesHdl();
EnableExportNotesPages();
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleSelectionHdl, RadioButton&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleSelectionHdl, RadioButton&, void)
{
EnableExportNotesPages();
}
@@ -807,29 +807,29 @@ void ImpPDFTabGeneralPage::EnableExportNotesPages()
}
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, CheckBox&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, CheckBox&, void)
{
mpFormsFrame->Enable(mpCbExportFormFields->IsChecked());
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl, CheckBox&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl, CheckBox&, void)
{
mpCbExportOnlyNotesPages->Enable(mpCbExportNotesPages->IsChecked());
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleCompressionHdl, RadioButton&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl, RadioButton&, void)
{
mpQualityFrame->Enable(mpRbJPEGCompression->IsChecked());
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, CheckBox&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, CheckBox&, void)
{
mpCoReduceImageResolution->Enable( mpCbReduceImageResolution->IsChecked() );
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void)
{
mpEdWatermark->Enable( mpCbWatermark->IsChecked() );
mpFtWatermark->Enable (mpCbWatermark->IsChecked() );
@@ -838,7 +838,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleWatermarkHdl, CheckBox&, void)
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void)
{
if( mpCbAddStream->IsVisible() )
{
@@ -860,7 +860,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleAddStreamHdl, CheckBox&, void)
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void)
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, CheckBox&, void)
{
// set the security page status (and its controls as well)
ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : nullptr;
@@ -1077,7 +1077,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, RadioButton&, void)
+IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, RadioButton&, void)
{
ToggleRbPgLyContinueFacingHdl();
}
@@ -1089,7 +1089,7 @@ void ImpPDFTabOpnFtrPage::ToggleRbPgLyContinueFacingHdl()
}
-IMPL_LINK_NOARG_TYPED( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, RadioButton&, void )
+IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, RadioButton&, void )
{
mpNumZoom->Enable( mpRbMagnZoom->IsChecked() );
}
@@ -1141,7 +1141,7 @@ void ImpPDFTabViewerPage::dispose()
}
-IMPL_LINK_NOARG_TYPED( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void )
+IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void )
{
m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() );
}
@@ -1357,7 +1357,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen
}
-IMPL_LINK_NOARG_TYPED(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void)
+IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void)
{
ScopedVclPtrInstance< SfxPasswordDialog > aPwdDialog( this, &msUserPwdTitle );
aPwdDialog->SetMinLen( 0 );
@@ -1598,7 +1598,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch )
/// Reset the memory of Launch action present when PDF/A-1 was requested
-IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, void)
+IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, void)
{
mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked();
mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked();
@@ -1607,7 +1607,7 @@ IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, voi
/// Reset the memory of a launch action present when PDF/A-1 was requested
-IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, void)
+IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, void)
{
mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked();
mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked();
@@ -1704,7 +1704,7 @@ void ImplErrorDialog::dispose()
}
-IMPL_LINK_NOARG_TYPED(ImplErrorDialog, SelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, ListBox&, void)
{
OUString* pStr = static_cast<OUString*>(m_pErrors->GetSelectEntryData());
m_pExplanation->SetText( pStr ? *pStr : OUString() );
@@ -1751,7 +1751,7 @@ void ImpPDFTabSigningPage::dispose()
}
-IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void )
+IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void )
{
Reference< security::XDocumentDigitalSignatures > xSigner(
@@ -1793,7 +1793,7 @@ IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, v
}
-IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void )
+IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void )
{
mpEdSignCert->SetText("");
maSignCertificate.clear();
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 62c9ea373265..c2ae742744db 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -58,7 +58,7 @@ private:
VclPtr<ListBox> m_pErrors;
VclPtr<FixedText> m_pExplanation;
- DECL_LINK_TYPED(SelectHdl, ListBox&, void);
+ DECL_LINK(SelectHdl, ListBox&, void);
public:
explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& );
@@ -81,7 +81,7 @@ private:
Any maSelection;
- DECL_LINK_TYPED(CancelHdl, Button*, void);
+ DECL_LINK(CancelHdl, Button*, void);
sal_uInt16 mnSigningPageId;
sal_uInt16 mnSecurityPageId;
@@ -236,21 +236,21 @@ class ImpPDFTabGeneralPage : public SfxTabPage
VclPtr<ImpPDFTabDialog> mpaParent;
- DECL_LINK_TYPED( ToggleAllHdl, RadioButton&, void );
- DECL_LINK_TYPED( TogglePagesHdl, RadioButton&, void );
- DECL_LINK_TYPED( ToggleSelectionHdl, RadioButton&, void );
- DECL_LINK_TYPED( ToggleCompressionHdl, RadioButton&, void );
- DECL_LINK_TYPED( ToggleReduceImageResolutionHdl, CheckBox&, void );
- DECL_LINK_TYPED( ToggleWatermarkHdl, CheckBox&, void );
- DECL_LINK_TYPED( ToggleAddStreamHdl, CheckBox&, void );
- DECL_LINK_TYPED( ToggleExportFormFieldsHdl, CheckBox&, void );
- DECL_LINK_TYPED( ToggleExportNotesPagesHdl, CheckBox&, void );
+ DECL_LINK( ToggleAllHdl, RadioButton&, void );
+ DECL_LINK( TogglePagesHdl, RadioButton&, void );
+ DECL_LINK( ToggleSelectionHdl, RadioButton&, void );
+ DECL_LINK( ToggleCompressionHdl, RadioButton&, void );
+ DECL_LINK( ToggleReduceImageResolutionHdl, CheckBox&, void );
+ DECL_LINK( ToggleWatermarkHdl, CheckBox&, void );
+ DECL_LINK( ToggleAddStreamHdl, CheckBox&, void );
+ DECL_LINK( ToggleExportFormFieldsHdl, CheckBox&, void );
+ DECL_LINK( ToggleExportNotesPagesHdl, CheckBox&, void );
void TogglePagesHdl();
void EnableExportNotesPages();
public:
- DECL_LINK_TYPED( ToggleExportPDFAHdl, CheckBox&, void );
+ DECL_LINK( ToggleExportPDFAHdl, CheckBox&, void );
ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~ImpPDFTabGeneralPage() override;
@@ -286,8 +286,8 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage
bool mbUseCTLFont;
- DECL_LINK_TYPED( ToggleRbPgLyContinueFacingHdl, RadioButton&, void );
- DECL_LINK_TYPED( ToggleRbMagnHdl, RadioButton&, void );
+ DECL_LINK( ToggleRbPgLyContinueFacingHdl, RadioButton&, void );
+ DECL_LINK( ToggleRbMagnHdl, RadioButton&, void );
void ToggleRbPgLyContinueFacingHdl();
@@ -322,7 +322,7 @@ class ImpPDFTabViewerPage : public SfxTabPage
VclPtr<RadioButton> m_pRbVisibleBookmarkLevels;
VclPtr<NumericField> m_pNumBookmarkLevels;
- DECL_LINK_TYPED( ToggleRbBookmarksHdl, RadioButton&, void );
+ DECL_LINK( ToggleRbBookmarksHdl, RadioButton&, void );
public:
ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -374,7 +374,7 @@ class ImpPDFTabSecurityPage : public SfxTabPage
css::uno::Reference< css::beans::XMaterialHolder > mxPreparedPasswords;
- DECL_LINK_TYPED( ClickmaPbSetPwdHdl, Button*, void );
+ DECL_LINK( ClickmaPbSetPwdHdl, Button*, void );
void enablePermissionControls();
@@ -406,8 +406,8 @@ class ImpPDFTabLinksPage : public SfxTabPage
VclPtr<RadioButton> m_pRbOpnLnksBrowser;
bool mbOpnLnksBrowserUserState;
- DECL_LINK_TYPED( ClickRbOpnLnksDefaultHdl, Button*, void );
- DECL_LINK_TYPED( ClickRbOpnLnksBrowserHdl, Button*, void );
+ DECL_LINK( ClickRbOpnLnksDefaultHdl, Button*, void );
+ DECL_LINK( ClickRbOpnLnksBrowserHdl, Button*, void );
public:
ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -435,8 +435,8 @@ class ImpPDFTabSigningPage : public SfxTabPage
VclPtr<ListBox> mpLBSignTSA;
css::uno::Reference< css::security::XCertificate > maSignCertificate;
- DECL_LINK_TYPED( ClickmaPbSignCertSelect, Button*, void );
- DECL_LINK_TYPED( ClickmaPbSignCertClear, Button*, void );
+ DECL_LINK( ClickmaPbSignCertSelect, Button*, void );
+ DECL_LINK( ClickmaPbSignCertClear, Button*, void );
public:
ImpPDFTabSigningPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index cb07999e02e6..478845a3ee1d 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -159,11 +159,11 @@ public:
}
}
- DECL_LINK_TYPED( DestroyedLink, VclWindowEvent&, void );
+ DECL_LINK( DestroyedLink, VclWindowEvent&, void );
};
-IMPL_LINK_TYPED( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void )
+IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void )
{
if( rEvent.GetId() == VCLEVENT_OBJECT_DYING )
m_pFocusWindow = nullptr;
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index 592ed457421a..62eee7edb76e 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -119,7 +119,7 @@ Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
}
-IMPL_LINK_TYPED( ImpSVGDialog, OnToggleCheckbox, CheckBox&, rBox, void )
+IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox&, rBox, void )
{
if( &rBox == maCBTinyProfile.get() )
{
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index 3bb35e98bee5..4cc661c345c9 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -58,7 +58,7 @@ private:
FilterConfigItem maConfigItem;
bool mbOldNativeDecoration;
- DECL_LINK_TYPED( OnToggleCheckbox, CheckBox&, void );
+ DECL_LINK( OnToggleCheckbox, CheckBox&, void );
public:
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 363bc068acd7..cce9f68d88cd 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2136,7 +2136,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
}
-IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
+IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
{
bool bFieldProcessed = false;
if( pInfo && mbPresentation )
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 2d4763857dde..8571653785d1 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -279,7 +279,7 @@ private:
static Any implSafeGetPagePropSet( const OUString & sPropertyName,
const Reference< XPropertySet > & rxPropSet,
const Reference< XPropertySetInfo > & rxPropSetInfo );
- DECL_LINK_TYPED( CalcFieldHdl, EditFieldInfo*, void );
+ DECL_LINK( CalcFieldHdl, EditFieldInfo*, void );
static bool isStreamGZip(const css::uno::Reference<css::io::XInputStream>& xInput);
static bool isStreamSvg(const css::uno::Reference<css::io::XInputStream>& xInput);
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 94aa8d56ed10..d8a7aef7d3ca 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -123,7 +123,7 @@ void XMLFilterSettingsDialog::dispose()
ModelessDialog::dispose();
}
-IMPL_LINK_TYPED(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void )
+IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void )
{
m_bIsClosable = false;
@@ -159,12 +159,12 @@ IMPL_LINK_TYPED(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void
m_bIsClosable = true;
}
-IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeListBox*, void)
{
updateStates();
}
-IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bool)
+IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bool)
{
onEdit();
return false;
@@ -1436,12 +1436,12 @@ void XMLFilterListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle
SvTabListBox::Paint(rRenderContext, rRect);
}
-IMPL_LINK_NOARG_TYPED( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTreeListBox*, void )
+IMPL_LINK_NOARG( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTreeListBox*, void )
{
m_pHeaderBar->SetOffset( -GetXOffset() );
}
-IMPL_LINK_TYPED( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
+IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
{
if ( pBar && !pBar->GetCurItemId() )
return;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index ea40b64dd802..f1e2b5833520 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -62,8 +62,8 @@ class XMLFilterListBox : public SvTabListBox
private:
VclPtr<HeaderBar> m_pHeaderBar;
- DECL_LINK_TYPED( TabBoxScrollHdl_Impl, SvTreeListBox*, void );
- DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void );
+ DECL_LINK( TabBoxScrollHdl_Impl, SvTreeListBox*, void );
+ DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void );
static OUString getEntryString( const filter_info_impl* pInfo );
@@ -90,9 +90,9 @@ public:
virtual ~XMLFilterSettingsDialog() override;
virtual void dispose() override;
- DECL_LINK_TYPED(ClickHdl_Impl, Button *, void );
- DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void );
- DECL_LINK_TYPED(DoubleClickHdl_Impl, SvTreeListBox*, bool );
+ DECL_LINK(ClickHdl_Impl, Button *, void );
+ DECL_LINK(SelectionChangedHdl_Impl, SvTreeListBox*, void );
+ DECL_LINK(DoubleClickHdl_Impl, SvTreeListBox*, bool );
virtual short Execute() override;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index ae4610619bf7..917cb2cf5de1 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -278,14 +278,14 @@ bool XMLFilterTabDialog::onOk()
}
-IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void)
+IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl, Button*, void)
{
if( onOk() )
EndDialog(1);
}
-IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
+IMPL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
{
const sal_uInt16 nId = pTabCtrl->GetCurPageId();
TabPage* pTabPage = pTabCtrl->GetTabPage( nId );
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 7d164f0c1799..4602af7907b9 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -45,8 +45,8 @@ public:
private:
css::uno::Reference< css::uno::XComponentContext > mxContext;
- DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void );
- DECL_LINK_TYPED(OkHdl, Button*, void);
+ DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void );
+ DECL_LINK(OkHdl, Button*, void);
ResMgr& mrResMgr;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 2fbf0e83a3bc..e7f3f989885a 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -151,7 +151,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox* rURLBox )
return aURL;
}
-IMPL_LINK_TYPED ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton, void )
+IMPL_LINK ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton, void )
{
SvtURLBox* pURLBox;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 880e5d530c4e..9d88183cdf96 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -40,7 +40,7 @@ public:
void FillInfo( filter_info_impl* pInfo );
void SetInfo(const filter_info_impl* pInfo);
- DECL_LINK_TYPED( ClickBrowseHdl_Impl, Button *, void );
+ DECL_LINK( ClickBrowseHdl_Impl, Button *, void );
VclPtr<Edit> m_pEDDocType;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 618ea5e89e80..5c81b608edc9 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -655,7 +655,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
}
}
-IMPL_LINK_TYPED(XMLFilterTestDialog, ClickHdl_Impl, Button *, pButton, void )
+IMPL_LINK(XMLFilterTestDialog, ClickHdl_Impl, Button *, pButton, void )
{
if (m_pPBExportBrowse == pButton)
{
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 7825dd24fe5a..64144fa60d84 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -44,7 +44,7 @@ public:
void updateCurrentDocumentButtonState( css::uno::Reference< css::lang::XComponent > * pRef = nullptr );
private:
- DECL_LINK_TYPED(ClickHdl_Impl, Button *, void );
+ DECL_LINK(ClickHdl_Impl, Button *, void );
void onExportBrowse();
void onExportCurrentDocument();
generated by cgit (git 2.34.1) at 2024-09-09 20:25:05 +0000