diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-03 12:54:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-03 22:24:23 +0200 |
| commit | e44db461ca135fcbef7854c7304c894b65fcd497 (patch) | |
| tree | bf24b37c2abdbddcde0eaee322d09c61c93569e7 /vcl/source/window/NotebookBarAddonsMerger.cxx | |
| parent | 446f4b086ccd4cdb9524637e4808dbe6b7d40f7e (diff) | |
Ensure that VCL builder entry points use proper function type
This removes duplicating typedefs from NotebookBarAddonsMerger,
and removes dependency of include/vcl/builder.hxx on
include/vcl/NotebookBarAddonsMerger.hxx.
Change-Id: Ica5787c934d1b8ce21623f28ce155337637fdf54
Reviewed-on: https://gerrit.libreoffice.org/78549
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/source/window/NotebookBarAddonsMerger.cxx')
| -rw-r--r-- | vcl/source/window/NotebookBarAddonsMerger.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx index f9f4c70343fa..01c8bbd0977e 100644 --- a/vcl/source/window/NotebookBarAddonsMerger.cxx +++ b/vcl/source/window/NotebookBarAddonsMerger.cxx @@ -110,9 +110,9 @@ NotebookBarAddonsMerger::NotebookBarAddonsMerger() {} NotebookBarAddonsMerger::~NotebookBarAddonsMerger() {} void NotebookBarAddonsMerger::MergeNotebookBarAddons( - vcl::Window* pParent, const customMakeWidget& pFunction, + vcl::Window* pParent, const VclBuilder::customMakeWidget& pFunction, const css::uno::Reference<css::frame::XFrame>& m_xFrame, - const NotebookBarAddonsItem& aNotebookBarAddonsItem, NotebookBarAddonsMerger::stringmap rMap) + const NotebookBarAddonsItem& aNotebookBarAddonsItem, VclBuilder::stringmap& rMap) { std::vector<Image> aImageVec = aNotebookBarAddonsItem.aImageValues; unsigned long nIter = 0; |