diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 16:28:15 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-11 16:28:22 +0100 |
commit | 667910530deb61563d4812db0995da94e25220e5 (patch) | |
tree | 9e19a2c89c1b9ee8ae3610096d295e99873a3b5c /sfx2 | |
parent | 7ac254048a5698e046bbb7deccd171cb3777af61 (diff) |
Revert "Switch VclBuilder constructors to use VclPtr."
Behaves oddly; not ready yet.
This reverts commit 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c.
Change-Id: I30d746eac29d1dbe78d3072b10d2e22c051e3f4e
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/control/templateremoteview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 0f147606eeef..3b261724f1d4 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -297,7 +297,7 @@ VCL_BUILDER_DECL_FACTORY(ContentListBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<ContentListBox_Impl>::Create(pParent, nWinStyle); + return new ContentListBox_Impl(pParent, nWinStyle); } ContentListBox_Impl::~ContentListBox_Impl() @@ -490,7 +490,7 @@ VCL_BUILDER_DECL_FACTORY(IndexBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - VclPtrInstance<IndexBox_Impl> pListBox(pParent, nWinBits); + IndexBox_Impl* pListBox = new IndexBox_Impl(pParent, nWinBits); pListBox->EnableAutoSize(true); return pListBox; } @@ -875,7 +875,7 @@ VCL_BUILDER_DECL_FACTORY(SearchBox) { (void)rMap; WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN; - VclPtrInstance<SearchBox_Impl> pComboBox(pParent, nWinBits); + SearchBox_Impl* pComboBox = new SearchBox_Impl(pParent, nWinBits); pComboBox->EnableAutoSize(true); return pComboBox; } @@ -910,7 +910,7 @@ VCL_BUILDER_DECL_FACTORY(SearchResultsBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - VclPtrInstance<SearchResultsBox_Impl> pListBox(pParent, nWinBits); + SearchResultsBox_Impl* pListBox = new SearchResultsBox_Impl(pParent, nWinBits); pListBox->EnableAutoSize(true); return pListBox; } @@ -1177,7 +1177,7 @@ VCL_BUILDER_DECL_FACTORY(BookmarksBox) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinBits |= WB_BORDER; - VclPtrInstance<BookmarksBox_Impl> pListBox(pParent, nWinBits); + BookmarksBox_Impl* pListBox = new BookmarksBox_Impl(pParent, nWinBits); pListBox->EnableAutoSize(true); return pListBox; } diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 144964595b3a..ffc0b7b3b3f1 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -57,7 +57,7 @@ TemplateRemoteView::TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, VCL_BUILDER_DECL_FACTORY(TemplateRemoteView) { (void)rMap; - return VclPtr<TemplateRemoteView>::Create(pParent, WB_VSCROLL, false); + return new TemplateRemoteView(pParent, WB_VSCROLL, false); } void TemplateRemoteView::showRootRegion() diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index ea4ca888cffe..c9e8a2a12ecf 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -119,7 +119,7 @@ void SfxPreviewWin_Impl::Paint( vcl::RenderContext& /*rRenderContext*/, const Re VCL_BUILDER_DECL_FACTORY(SfxPreviewWin) { (void)rMap; - return VclPtr<SfxPreviewWin_Impl>::Create(pParent, 0); + return new SfxPreviewWin_Impl(pParent, 0); } class SfxNewFileDialog_Impl |