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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/taborder.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 8f82b773520f..63ce93e4948b 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -311,9 +311,10 @@ namespace pcr OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<TabOrderListBox>::Create(pParent, nWinStyle); + return new TabOrderListBox(pParent, nWinStyle); } + TabOrderListBox::~TabOrderListBox() { } diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 5a3379f1bc3e..68f774525eb3 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -158,7 +158,7 @@ VCL_BUILDER_DECL_FACTORY(ScanPreview) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - return VclPtr<ScanPreview>::Create(pParent, nWinStyle); + return new ScanPreview(pParent, nWinStyle); } SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) : |