compilerplugins/clang/methodcycles.py | 4 ++--
cui/source/options/optcolor.cxx | 2 +-
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2 +-
include/vcl/NotebookBarAddonsMerger.hxx | 2 +-
include/vcl/builder.hxx | 2 +-
include/vcl/builderfactory.hxx | 8 ++++----
sfx2/source/appl/newhelp.cxx | 10 +++++-----
sfx2/source/sidebar/SidebarToolBox.cxx | 4 ++--
svtools/source/contnr/fileview.cxx | 2 +-
svtools/source/control/ctrlbox.cxx | 6 +++---
svtools/source/control/inettbc.cxx | 2 +-
svx/source/dialog/langbox.cxx | 4 ++--
svx/source/dialog/relfld.cxx | 2 +-
svx/source/dialog/txencbox.cxx | 2 +-
sw/source/uibase/utlui/numfmtlb.cxx | 2 +-
vcl/source/window/builder.cxx | 3 +--
vcl/source/window/printdlg.cxx | 4 ++--
17 files changed, 30 insertions(+), 31 deletions(-)
New commits:
commit a06b83ff927d8973c8b4a2de9a0c7ce5cd4b1f96
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Sep 3 10:47:07 2019 +0300
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Sep 3 12:00:40 2019 +0200
Parent reference should be const in VCL builder entry points
Change-Id: I2331e19f5e23e0dde8edd22befc7287515adf37e
Reviewed-on: https://gerrit.libreoffice.org/78536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/methodcycles.py
b/compilerplugins/clang/methodcycles.py
index 9093cebc420c..18b63c71f777 100755
--- a/compilerplugins/clang/methodcycles.py
+++ b/compilerplugins/clang/methodcycles.py
@@ -119,9 +119,9 @@ for caller in definitionSet:
if "::~" in caller:
to_be_removed.add(caller)
# dyload entry points for VCL builder
- if "(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap)" in caller:
+ if "(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap)" in caller:
to_be_removed.add(caller)
- if "(VclPtr<vcl::Window> &,VclPtr<vcl::Window> &,std::::map<rtl::OString,
rtl::OUString, std::less<rtl::OString>, std::allocator<std::pair<const
rtl::OString, rtl::OUString> > > &)" in caller:
+ if "(VclPtr<vcl::Window> &,const VclPtr<vcl::Window>
&,std::::map<rtl::OString, rtl::OUString, std::less<rtl::OString>,
std::allocator<std::pair<const rtl::OString, rtl::OUString> > > &)" in caller:
to_be_removed.add(caller)
# find all the UNO load-by-symbol-name entrypoints
uno_constructor_entrypoints = set()
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 8e241ce744db..7cf455e821fd 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -859,7 +859,7 @@ void ColorConfigCtrl_Impl::dispose()
VclVBox::dispose();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeColorConfigCtrl(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeColorConfigCtrl(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
{
rRet = VclPtr<ColorConfigCtrl_Impl>::Create(pParent);
}
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index e7782a560c8a..cfc8143a2288 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -79,7 +79,7 @@ static constexpr auto BROWSER_STANDARD_FLAGS =
BrowserMode::COLUMNSELECTION | Br
{
}
- extern "C" SAL_DLLPUBLIC_EXPORT void
makeDbaIndexFieldsControl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap &)
+ extern "C" SAL_DLLPUBLIC_EXPORT void
makeDbaIndexFieldsControl(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window>
& pParent, VclBuilder::stringmap &)
{
rRet = VclPtr<IndexFieldsControl>::Create(pParent, WB_BORDER |
WB_NOTABSTOP);
}
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx
b/include/vcl/NotebookBarAddonsMerger.hxx
index ef6a3291e9f8..913e50734472 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -61,7 +61,7 @@ class NotebookBarAddonsMerger
{
public:
typedef std::map<OString, OUString> stringmap;
- typedef void (*customMakeWidget)(VclPtr<vcl::Window>& rRet,
VclPtr<vcl::Window>& pParent,
+ typedef void (*customMakeWidget)(VclPtr<vcl::Window>& rRet, const
VclPtr<vcl::Window>& pParent,
stringmap& rVec);
NotebookBarAddonsMerger();
~NotebookBarAddonsMerger();
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index adefc6d39713..4cdd10930dea 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -65,7 +65,7 @@ public:
typedef std::map<OString, OUString> stringmap;
typedef std::map<OString, std::pair<OString, OString>> accelmap;
/// These functions create a new widget with parent pParent and return it
in rRet
- typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet,
VclPtr<vcl::Window> &pParent, stringmap &rVec);
+ typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet, const
VclPtr<vcl::Window> &pParent, stringmap &rVec);
public:
VclBuilder(vcl::Window* pParent, const OUString& sUIRootDir, const
OUString& sUIFile,
diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx
index 0781726c0ffb..719f1d8b206c 100644
--- a/include/vcl/builderfactory.hxx
+++ b/include/vcl/builderfactory.hxx
@@ -14,21 +14,21 @@
#include <vcl/builder.hxx>
#define VCL_BUILDER_FACTORY(typeName) \
- extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
+ extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
{ \
(void)rMap; \
rRet = VclPtr<typeName>::Create(pParent); \
}
#define VCL_BUILDER_FACTORY_ARGS(typeName,arg1) \
- extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
+ extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
{ \
(void)rMap; \
rRet = VclPtr<typeName>::Create(pParent,arg1); \
}
#define VCL_BUILDER_FACTORY_CONSTRUCTOR(typeName,arg2) \
- extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
+ extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
{ \
OUString sBorder = BuilderUtils::extractCustomProperty(rMap); \
WinBits wb = arg2; \
@@ -38,7 +38,7 @@
}
#define VCL_BUILDER_FACTORY_EXTERN(typeName) \
- extern "C" void make##typeName(VclPtr<vcl::Window> & rRet,
VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+ extern "C" void make##typeName(VclPtr<vcl::Window> & rRet, const
VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
#endif
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index bc99149df834..6a77c164a1b0 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -285,7 +285,7 @@ ContentListBox_Impl::ContentListBox_Impl(vcl::Window*
pParent, WinBits nStyle)
InitRoot();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeContentListBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeContentListBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nWinStyle = WB_TABSTOP;
OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
@@ -470,7 +470,7 @@ IndexBox_Impl::IndexBox_Impl(vcl::Window* pParent, WinBits
nStyle)
EnableUserDraw(true);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeIndexBox(VclPtr<vcl::Window> & rRet,
VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeIndexBox(VclPtr<vcl::Window> & rRet,
const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
@@ -846,7 +846,7 @@ void IndexTabPage_Impl::OpenKeyword()
// class SearchBox_Impl --------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSearchBox(VclPtr<vcl::Window> & rRet,
VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSearchBox(VclPtr<vcl::Window> & rRet,
const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
{
WinBits nWinBits =
WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN;
VclPtrInstance<SearchBox_Impl> pComboBox(pParent, nWinBits);
@@ -877,7 +877,7 @@ void SearchBox_Impl::Select()
// class SearchResultsBox_Impl -------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSearchResultsBox(VclPtr<vcl::Window>
& rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSearchResultsBox(VclPtr<vcl::Window>
& rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
@@ -1135,7 +1135,7 @@ BookmarksBox_Impl::BookmarksBox_Impl(vcl::Window*
pParent, WinBits nStyle)
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeBookmarksBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeBookmarksBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nWinBits =
WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx
b/sfx2/source/sidebar/SidebarToolBox.cxx
index d040fcdba796..c3f7ea376782 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -331,14 +331,14 @@ public:
}
};
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSidebarToolBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSidebarToolBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
VclPtrInstance<SidebarToolBox> pBox(pParent);
pBox->InitToolBox(rMap);
rRet = pBox;
}
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeNotebookbarToolBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void
makeNotebookbarToolBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
{
VclPtrInstance<NotebookbarToolBox> pBox(pParent);
pBox->InitToolBox(rMap);
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 37290b734750..23a32c0590b9 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -879,7 +879,7 @@ void SvtFileView::dispose()
Control::dispose();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvtFileView(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSvtFileView(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 92f40861aeef..d731cacf8cf3 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -339,7 +339,7 @@ FontNameBox::FontNameBox( vcl::Window* pParent, WinBits
nWinStyle ) :
InitFontMRUEntriesFile();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeFontNameBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeFontNameBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
bool bDropdown = BuilderUtils::extractDropdown(rMap);
WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
@@ -725,7 +725,7 @@ Size FontStyleBox::GetOptimalSize() const
return ComboBox::GetOptimalSize();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeFontStyleBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeFontStyleBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
bool bDropdown = BuilderUtils::extractDropdown(rMap);
WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
@@ -925,7 +925,7 @@ FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits
nWinSize ) :
ImplInit();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeFontSizeBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeFontSizeBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
bool bDropdown = BuilderUtils::extractDropdown(rMap);
WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index d3c957f01c56..e40b8f703fe1 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1412,7 +1412,7 @@ SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits
_nStyle, INetProtocol eSmart
Init(bSetDefaultHelpID);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvtURLBox(VclPtr<vcl::Window> & rRet,
VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSvtURLBox(VclPtr<vcl::Window> & rRet,
const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
{
WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|
WB_DROPDOWN|WB_AUTOHSCROLL;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 8bcea7b1d17f..a51290c0df9b 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -93,7 +93,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > &
rLangSeq, sal_Int16 nL
&& std::find(rLangSeq.begin(), rLangSeq.end(), nLang) !=
rLangSeq.end();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageBox(VclPtr<vcl::Window> &
rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageBox(VclPtr<vcl::Window> &
rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
bool bDropdown = BuilderUtils::extractDropdown(rMap);
@@ -106,7 +106,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxLanguageBox(VclPtr<vcl::Window> & rR
rRet = pLanguageBox;
}
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
{
WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
bool bDropdown = BuilderUtils::extractDropdown(rMap);
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 9f1afca1da66..fc2c7a4df643 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -30,7 +30,7 @@ SvxRelativeField::SvxRelativeField(
SetMax( 9999 );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr<vcl::Window>
& rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr<vcl::Window>
& rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
OUString const custom(BuilderUtils::extractCustomProperty(rMap));
FieldUnit const eUnit(BuilderUtils::detectUnit(custom));
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 3d0cb086bf25..0eec2058e451 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -41,7 +41,7 @@ SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent,
WinBits nBits )
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxTextEncodingBox(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
{
WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
bool bDropdown = BuilderUtils::extractDropdown(rMap);
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx
b/sw/source/uibase/utlui/numfmtlb.cxx
index ebe6ba2322d2..703e78a87674 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -61,7 +61,7 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits
nStyle) :
Init();
}
-extern "C" SAL_DLLPUBLIC_EXPORT void makeNumFormatListBox(VclPtr<vcl::Window>
& rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeNumFormatListBox(VclPtr<vcl::Window>
& rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap)
{
WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1606c18625fb..3f81651e15eb 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2330,8 +2330,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window
*pParent, const OString &
{
if (customMakeWidget pFunction = GetCustomMakeWidget(name))
{
- VclPtr<vcl::Window> xParent(pParent);
- pFunction(xWindow, xParent, rMap);
+ pFunction(xWindow, pParent, rMap);
if (xWindow->GetType() == WindowType::PUSHBUTTON)
setupFromActionName(static_cast<Button*>(xWindow.get()), rMap,
m_xFrame);
else if (xWindow->GetType() == WindowType::MENUBUTTON)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index a9ddf591a768..0efcbab73225 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -57,12 +57,12 @@ enum
ORIENTATION_LANDSCAPE
};
-extern "C" SAL_DLLPUBLIC_EXPORT void
makePrintPreviewWindow(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void
makePrintPreviewWindow(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap &)
{
rRet = VclPtr<PrintDialog::PrintPreviewWindow>::Create(pParent);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeShowNupOrderWindow(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void
makeShowNupOrderWindow(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap &)
{
rRet = VclPtr<PrintDialog::ShowNupOrderWindow>::Create(pParent);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
