diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 14:02:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 15:12:08 +0100 |
commit | 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c (patch) | |
tree | c32e463b68bad8cfc1ab9f69792b8c10071515bf /cui | |
parent | e7473c692cad4c19f1d9eadd2547df4a50875baf (diff) |
Switch VclBuilder constructors to use VclPtr.
Change-Id: Id35a86eb52bbde6ca09a5e61a0b1a79b23be8faf
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 4 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 42e2f98090df..bce7891417d6 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -661,7 +661,7 @@ VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new SfxAccCfgTabListBox_Impl(pParent, nWinBits); + return VclPtr<SfxAccCfgTabListBox_Impl>::Create(pParent, nWinBits); } void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry, diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index c74e0e78e44b..c5d3cdf4c803 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -266,7 +266,7 @@ VCL_BUILDER_DECL_FACTORY(SfxConfigFunctionListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new SfxConfigFunctionListBox(pParent, nWinBits); + return VclPtr<SfxConfigFunctionListBox>::Create(pParent, nWinBits); } SfxConfigFunctionListBox::~SfxConfigFunctionListBox() @@ -408,7 +408,7 @@ VCL_BUILDER_DECL_FACTORY(SfxConfigGroupListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new SfxConfigGroupListBox(pParent, nWinBits); + return VclPtr<SfxConfigGroupListBox>::Create(pParent, nWinBits); } SfxConfigGroupListBox::~SfxConfigGroupListBox() diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index c50b487a200a..ae805ba27919 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -161,7 +161,7 @@ VCL_BUILDER_DECL_FACTORY(MacroEventListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new MacroEventListBox(pParent, nWinBits); + return VclPtr<MacroEventListBox>::Create(pParent, nWinBits); } Size MacroEventListBox::GetOptimalSize() const diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index ce1cbcabcde4..f941d9ce82cc 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -95,7 +95,7 @@ VCL_BUILDER_DECL_FACTORY(SvxConfigFunctionListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new SvxConfigFunctionListBox(pParent, nWinBits); + return VclPtr<SvxConfigFunctionListBox>::Create(pParent, nWinBits); } SvxConfigFunctionListBox::~SvxConfigFunctionListBox() @@ -228,7 +228,7 @@ VCL_BUILDER_DECL_FACTORY(SvxConfigGroupListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new SvxConfigGroupListBox(pParent, nWinBits); + return VclPtr<SvxConfigGroupListBox>::Create(pParent, nWinBits); } SvxConfigGroupListBox::~SvxConfigGroupListBox() diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a27774cc717b..a20bb6e14f5a 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1222,7 +1222,7 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl(vcl::Window * pParent, WinBits VCL_BUILDER_DECL_FACTORY(SentenceEditWindow) { (void)rMap; - return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB); + return VclPtr<SentenceEditWindow_Impl>::Create(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB); } diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index ee90eb7e17d3..cf487f1b0ebf 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -280,7 +280,7 @@ VCL_BUILDER_DECL_FACTORY(ColorPreviewControl) if (!sBorder.isEmpty()) nBits |= WB_BORDER; - return new ColorPreviewControl(pParent, nBits); + return VclPtr<ColorPreviewControl>::Create(pParent, nBits); } void ColorPreviewControl::SetColor( const Color& rCol ) @@ -376,7 +376,7 @@ VCL_BUILDER_DECL_FACTORY(ColorFieldControl) if (!sBorder.isEmpty()) nBits |= WB_BORDER; - return new ColorFieldControl(pParent, nBits); + return VclPtr<ColorFieldControl>::Create(pParent, nBits); } Size ColorFieldControl::GetOptimalSize() const @@ -769,7 +769,7 @@ VCL_BUILDER_DECL_FACTORY(ColorSliderControl) if (!sBorder.isEmpty()) nBits |= WB_BORDER; - return new ColorSliderControl(pParent, nBits); + return VclPtr<ColorSliderControl>::Create(pParent, nBits); } void ColorSliderControl::UpdateBitmap() diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 2edac2d05d81..fdba7520c79a 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -45,7 +45,7 @@ VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new GraphicPreviewWindow(pParent, nWinBits); + return VclPtr<GraphicPreviewWindow>::Create(pParent, nWinBits); } Size GraphicPreviewWindow::GetOptimalSize() const diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index b65bf8c4522b..6572fcb0b1bf 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -90,7 +90,7 @@ VCL_BUILDER_DECL_FACTORY(SvxHlmarkTreeLBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return new SvxHlmarkTreeLBox(pParent, nWinStyle); + return VclPtr<SvxHlmarkTreeLBox>::Create(pParent, nWinStyle); } Size SvxHlmarkTreeLBox::GetOptimalSize() const diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 65064c34c4a8..cdef298a0475 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -931,7 +931,7 @@ void ColorConfigCtrl_Impl::dispose() VCL_BUILDER_DECL_FACTORY(ColorConfigCtrl) { (void)rMap; - return new ColorConfigCtrl_Impl(pParent); + return VclPtr<ColorConfigCtrl_Impl>::Create(pParent); } void ColorConfigCtrl_Impl::Update () diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 259a28f05fb3..1f4943c1b3ae 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2463,7 +2463,7 @@ VCL_BUILDER_DECL_FACTORY(AutoCompleteMultiListBox) if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - return new OfaAutoCompleteTabPage::AutoCompleteMultiListBox(pParent, nWinBits); + return VclPtr<OfaAutoCompleteTabPage::AutoCompleteMultiListBox>::Create(pParent, nWinBits); } // class OfaSmartTagOptionsTabPage --------------------------------------------- diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 2c9998e786c0..e8aa044e55fd 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -219,7 +219,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) VCL_BUILDER_DECL_FACTORY(BackgroundPreview) { (void)rMap; - return new BackgroundPreviewImpl(pParent); + return VclPtr<BackgroundPreviewImpl>::Create(pParent); } void BackgroundPreviewImpl::setBmp(bool bBmp) diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 15c9541611aa..42da252257c8 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -796,7 +796,7 @@ VCL_BUILDER_DECL_FACTORY(SvxCropExample) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return new SvxCropExample(pParent, nWinStyle); + return VclPtr<SvxCropExample>::Create(pParent, nWinStyle); } void SvxCropExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) |