summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-11-04 09:27:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-04 15:26:14 +0100
commita04d60ca5af1b794c190fa9d5a0fb7506755f27d (patch)
treea5d141f79a11eaaca5ff76d6def636278c54357e /include/svtools
parentf90159697506e28ebbfb436047e52db1b65bd9a7 (diff)
use more DECL_DLLPRIVATE_LINK
to avoid unnecessarily exporting symbols Change-Id: I4c9c7c86f288ba9655a8b919387e30f3096ccfb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124667 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/PlaceEditDialog.hxx14
-rw-r--r--include/svtools/addresstemplate.hxx14
-rw-r--r--include/svtools/colrdlg.hxx2
-rw-r--r--include/svtools/ctrlbox.hxx24
-rw-r--r--include/svtools/editbrowsebox.hxx30
-rw-r--r--include/svtools/filechangedchecker.hxx2
-rw-r--r--include/svtools/recorditemwindow.hxx6
-rw-r--r--include/svtools/svparser.hxx2
-rw-r--r--include/svtools/toolbarmenu.hxx4
9 files changed, 49 insertions, 49 deletions
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index 9bb68e804e0e..931aad16f811 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -87,14 +87,14 @@ public:
private:
void InitDetails();
- DECL_LINK(OKHdl, weld::Button&, void);
- DECL_LINK(DelHdl, weld::Button&, void);
- DECL_LINK(EditHdl, DetailsContainer*, void);
- DECL_LINK(ModifyHdl, weld::Entry&, void);
+ DECL_DLLPRIVATE_LINK(OKHdl, weld::Button&, void);
+ DECL_DLLPRIVATE_LINK(DelHdl, weld::Button&, void);
+ DECL_DLLPRIVATE_LINK(EditHdl, DetailsContainer*, void);
+ DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void);
void SelectType(bool bSkipSeparator);
- DECL_LINK(SelectTypeHdl, weld::ComboBox&, void);
- DECL_LINK(EditLabelHdl, weld::Entry&, void);
- DECL_LINK(EditUsernameHdl, weld::Entry&, void);
+ DECL_DLLPRIVATE_LINK(SelectTypeHdl, weld::ComboBox&, void);
+ DECL_DLLPRIVATE_LINK(EditLabelHdl, weld::Entry&, void);
+ DECL_DLLPRIVATE_LINK(EditUsernameHdl, weld::Entry&, void);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 48fe7a59f060..6fc723ab63b3 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -92,14 +92,14 @@ namespace svt
// initialize the dialog from the configuration data
void loadConfiguration();
- DECL_LINK(OnFieldScroll, weld::ScrolledWindow&, void);
- DECL_LINK(OnFieldSelect, weld::ComboBox&, void);
- DECL_LINK(OnAdministrateDatasources, weld::Button&, void);
+ DECL_DLLPRIVATE_LINK(OnFieldScroll, weld::ScrolledWindow&, void);
+ DECL_DLLPRIVATE_LINK(OnFieldSelect, weld::ComboBox&, void);
+ DECL_DLLPRIVATE_LINK(OnAdministrateDatasources, weld::Button&, void);
DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, weld::Widget&, void);
- DECL_LINK(OnComboLoseFocus, weld::Widget&, void);
- DECL_LINK(OnComboSelect, weld::ComboBox&, void);
- DECL_LINK(OnOkClicked, weld::Button&, void);
- DECL_LINK(OnDelayedInitialize, void*, void);
+ DECL_DLLPRIVATE_LINK(OnComboLoseFocus, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(OnComboSelect, weld::ComboBox&, void);
+ DECL_DLLPRIVATE_LINK(OnOkClicked, weld::Button&, void);
+ DECL_DLLPRIVATE_LINK(OnDelayedInitialize, void*, void);
// string to display for "no selection"
const OUString m_sNoFieldSelection;
diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx
index fabdbcd1177e..a8785ad8a510 100644
--- a/include/svtools/colrdlg.hxx
+++ b/include/svtools/colrdlg.hxx
@@ -55,7 +55,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog > mxDialog;
std::function<void(sal_Int32)> m_aResultFunc;
- DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
+ DECL_DLLPRIVATE_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index ea49f0a4fbc5..28730d16e85a 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -251,10 +251,10 @@ private:
SvxBorderLineStyle nStyle, BitmapEx& rBmp );
void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed
- DECL_LINK(ValueSelectHdl, ValueSet*, void);
- DECL_LINK(FocusHdl, weld::Widget&, void);
- DECL_LINK(ToggleHdl, weld::Toggleable&, void);
- DECL_LINK(NoneHdl, weld::Button&, void);
+ DECL_DLLPRIVATE_LINK(ValueSelectHdl, ValueSet*, void);
+ DECL_DLLPRIVATE_LINK(FocusHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void);
+ DECL_DLLPRIVATE_LINK(NoneHdl, weld::Button&, void);
void UpdateEntries();
sal_Int32 GetStylePos(sal_Int32 nListPos) const;
@@ -314,8 +314,8 @@ public:
void connect_focus_in(const Link<weld::Widget&, void>& rLink) { m_xControl->connect_focus_in(rLink); }
void connect_focus_out(const Link<weld::Widget&, void>& rLink) { m_xControl->connect_focus_out(rLink); }
private:
- DECL_LINK(SelectHdl, weld::Calendar&, void);
- DECL_LINK(ActivateHdl, weld::Calendar&, void);
+ DECL_DLLPRIVATE_LINK(SelectHdl, weld::Calendar&, void);
+ DECL_DLLPRIVATE_LINK(ActivateHdl, weld::Calendar&, void);
bool m_bUseLabel;
@@ -342,10 +342,10 @@ private:
SVT_DLLPRIVATE void ImplDestroyFontList();
- DECL_LINK(CustomRenderHdl, weld::ComboBox::render_args, void);
- DECL_LINK(CustomGetSizeHdl, OutputDevice&, Size);
- DECL_LINK(SettingsChangedHdl, VclSimpleEvent&, void);
- DECL_LINK(UpdateHdl, Timer*, void);
+ DECL_DLLPRIVATE_LINK(CustomRenderHdl, weld::ComboBox::render_args, void);
+ DECL_DLLPRIVATE_LINK(CustomGetSizeHdl, OutputDevice&, Size);
+ DECL_DLLPRIVATE_LINK(SettingsChangedHdl, VclSimpleEvent&, void);
+ DECL_DLLPRIVATE_LINK(UpdateHdl, Timer*, void);
void LoadMRUEntries( const OUString& aFontMRUEntriesFile );
void SaveMRUEntries( const OUString& aFontMRUEntriesFile ) const;
@@ -453,8 +453,8 @@ class SVT_DLLPUBLIC FontSizeBox
OUString format_number(int nValue) const;
- DECL_LINK(ModifyHdl, weld::ComboBox&, void);
- DECL_LINK(ReformatHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void);
+ DECL_DLLPRIVATE_LINK(ReformatHdl, weld::Widget&, void);
public:
FontSizeBox(std::unique_ptr<weld::ComboBox> p);
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 99a14fa980a9..6d253cb2245a 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -204,12 +204,12 @@ namespace svt
}
protected:
- DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
- DECL_LINK(FocusInHdl, weld::Widget&, void);
- DECL_LINK(FocusOutHdl, weld::Widget&, void);
- DECL_LINK(MousePressHdl, const MouseEvent&, bool);
- DECL_LINK(MouseReleaseHdl, const MouseEvent&, bool);
- DECL_LINK(MouseMoveHdl, const MouseEvent&, bool);
+ DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool);
+ DECL_DLLPRIVATE_LINK(FocusInHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(MousePressHdl, const MouseEvent&, bool);
+ DECL_DLLPRIVATE_LINK(MouseReleaseHdl, const MouseEvent&, bool);
+ DECL_DLLPRIVATE_LINK(MouseMoveHdl, const MouseEvent&, bool);
private:
Link<LinkParamNone*,void> m_aFocusInHdl;
Link<LinkParamNone*,void> m_aFocusOutHdl;
@@ -595,7 +595,7 @@ namespace svt
void Clicked();
private:
- DECL_LINK(OnToggle, weld::Toggleable&, void);
+ DECL_DLLPRIVATE_LINK(OnToggle, weld::Toggleable&, void);
void CallModifyHdls()
{
@@ -617,7 +617,7 @@ namespace svt
private:
virtual void ActivatingMouseEvent(const BrowserMouseEvent& rEvt, bool bUp) override;
- DECL_LINK(ModifyHdl, LinkParamNone*, void);
+ DECL_DLLPRIVATE_LINK(ModifyHdl, LinkParamNone*, void);
};
//= ComboBoxControl
@@ -663,7 +663,7 @@ namespace svt
virtual void dispose() override;
private:
- DECL_LINK(SelectHdl, weld::ComboBox&, void);
+ DECL_DLLPRIVATE_LINK(SelectHdl, weld::ComboBox&, void);
void CallModifyHdls()
{
@@ -685,7 +685,7 @@ namespace svt
private:
virtual bool MoveAllowed(const KeyEvent& rEvt) const override;
- DECL_LINK(ModifyHdl, LinkParamNone*, void);
+ DECL_DLLPRIVATE_LINK(ModifyHdl, LinkParamNone*, void);
};
//= ListBoxControl
@@ -725,7 +725,7 @@ namespace svt
virtual void dispose() override;
private:
- DECL_LINK(SelectHdl, weld::ComboBox&, void);
+ DECL_DLLPRIVATE_LINK(SelectHdl, weld::ComboBox&, void);
void CallModifyHdls()
{
@@ -748,7 +748,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const override;
private:
- DECL_LINK(ListBoxSelectHdl, LinkParamNone*, void);
+ DECL_DLLPRIVATE_LINK(ListBoxSelectHdl, LinkParamNone*, void);
};
class SVT_DLLPUBLIC FormattedControlBase : public EditControlBase
@@ -813,9 +813,9 @@ namespace svt
std::unique_ptr<weld::Button> m_xTodayBtn;
std::unique_ptr<weld::Button> m_xNoneBtn;
- DECL_LINK(ToggleHdl, weld::Toggleable&, void);
- DECL_LINK(ActivateHdl, weld::Calendar&, void);
- DECL_LINK(ImplClickHdl, weld::Button&, void);
+ DECL_DLLPRIVATE_LINK(ToggleHdl, weld::Toggleable&, void);
+ DECL_DLLPRIVATE_LINK(ActivateHdl, weld::Calendar&, void);
+ DECL_DLLPRIVATE_LINK(ImplClickHdl, weld::Button&, void);
};
class SVT_DLLPUBLIC PatternControl final : public EditControl
diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx
index 23ea1c66323d..a6f86eab8f92 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -34,7 +34,7 @@ private:
::std::function<void ()> mpCallback;
bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
- DECL_LINK(TimerHandler, Timer *, void);
+ DECL_DLLPRIVATE_LINK(TimerHandler, Timer *, void);
public:
void resetTimer();
diff --git a/include/svtools/recorditemwindow.hxx b/include/svtools/recorditemwindow.hxx
index 98f2e2db579a..a238148dd41f 100644
--- a/include/svtools/recorditemwindow.hxx
+++ b/include/svtools/recorditemwindow.hxx
@@ -30,11 +30,11 @@ protected:
private:
virtual void PositionFired(sal_Int64 nRecord);
- DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+ DECL_DLLPRIVATE_LINK(KeyInputHdl, const KeyEvent&, bool);
- DECL_LINK(ActivatedHdl, weld::Entry&, bool);
+ DECL_DLLPRIVATE_LINK(ActivatedHdl, weld::Entry&, bool);
// for invalidating our content when losing the focus
- DECL_LINK(FocusOutHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void);
void FirePosition(bool bForce);
};
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 3233cf8000a7..b0ba450a7285 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -43,7 +43,7 @@ enum class SvParserState
template<typename T>
class SVT_DLLPUBLIC SvParser : public SvRefBase
{
- DECL_LINK( NewDataRead, LinkParamNone*, void );
+ DECL_DLLPRIVATE_LINK( NewDataRead, LinkParamNone*, void );
protected:
SvStream& rInput;
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 9f1e36ddaca8..f82d87f0d81b 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -34,7 +34,7 @@ namespace svt { class FrameStatusListener; }
class SVT_DLLPUBLIC WeldToolbarPopup
{
private:
- DECL_LINK(FocusHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(FocusHdl, weld::Widget&, void);
protected:
std::unique_ptr<weld::Builder> m_xBuilder;
@@ -65,7 +65,7 @@ public:
class SVT_DLLPUBLIC ToolbarPopupContainer final
{
private:
- DECL_LINK(FocusHdl, weld::Widget&, void);
+ DECL_DLLPRIVATE_LINK(FocusHdl, weld::Widget&, void);
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xTopLevel;