summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-05-11 16:28:15 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-05-11 16:28:22 +0100
commit667910530deb61563d4812db0995da94e25220e5 (patch)
tree9e19a2c89c1b9ee8ae3610096d295e99873a3b5c /cui
parent7ac254048a5698e046bbb7deccd171cb3777af61 (diff)
Revert "Switch VclBuilder constructors to use VclPtr."
Behaves oddly; not ready yet. This reverts commit 9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c. Change-Id: I30d746eac29d1dbe78d3072b10d2e22c051e3f4e
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/customize/cfgutil.cxx4
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/customize/selector.cxx4
-rw-r--r--cui/source/dialogs/SpellDialog.cxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx6
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx2
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx2
-rw-r--r--cui/source/options/optcolor.cxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx2
-rw-r--r--cui/source/tabpages/backgrnd.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx2
12 files changed, 16 insertions, 16 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index bce7891417d6..42e2f98090df 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 VclPtr<SfxAccCfgTabListBox_Impl>::Create(pParent, nWinBits);
+ return new SfxAccCfgTabListBox_Impl(pParent, nWinBits);
}
void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index c5d3cdf4c803..c74e0e78e44b 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 VclPtr<SfxConfigFunctionListBox>::Create(pParent, nWinBits);
+ return new SfxConfigFunctionListBox(pParent, nWinBits);
}
SfxConfigFunctionListBox::~SfxConfigFunctionListBox()
@@ -408,7 +408,7 @@ VCL_BUILDER_DECL_FACTORY(SfxConfigGroupListBox)
if (!sBorder.isEmpty())
nWinBits |= WB_BORDER;
- return VclPtr<SfxConfigGroupListBox>::Create(pParent, nWinBits);
+ return new SfxConfigGroupListBox(pParent, nWinBits);
}
SfxConfigGroupListBox::~SfxConfigGroupListBox()
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index ae805ba27919..c50b487a200a 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 VclPtr<MacroEventListBox>::Create(pParent, nWinBits);
+ return new MacroEventListBox(pParent, nWinBits);
}
Size MacroEventListBox::GetOptimalSize() const
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index f941d9ce82cc..ce1cbcabcde4 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 VclPtr<SvxConfigFunctionListBox>::Create(pParent, nWinBits);
+ return new SvxConfigFunctionListBox(pParent, nWinBits);
}
SvxConfigFunctionListBox::~SvxConfigFunctionListBox()
@@ -228,7 +228,7 @@ VCL_BUILDER_DECL_FACTORY(SvxConfigGroupListBox)
if (!sBorder.isEmpty())
nWinBits |= WB_BORDER;
- return VclPtr<SvxConfigGroupListBox>::Create(pParent, nWinBits);
+ return new SvxConfigGroupListBox(pParent, nWinBits);
}
SvxConfigGroupListBox::~SvxConfigGroupListBox()
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a20bb6e14f5a..a27774cc717b 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 VclPtr<SentenceEditWindow_Impl>::Create(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB);
+ return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB);
}
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index cf487f1b0ebf..ee90eb7e17d3 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 VclPtr<ColorPreviewControl>::Create(pParent, nBits);
+ return new ColorPreviewControl(pParent, nBits);
}
void ColorPreviewControl::SetColor( const Color& rCol )
@@ -376,7 +376,7 @@ VCL_BUILDER_DECL_FACTORY(ColorFieldControl)
if (!sBorder.isEmpty())
nBits |= WB_BORDER;
- return VclPtr<ColorFieldControl>::Create(pParent, nBits);
+ return new ColorFieldControl(pParent, nBits);
}
Size ColorFieldControl::GetOptimalSize() const
@@ -769,7 +769,7 @@ VCL_BUILDER_DECL_FACTORY(ColorSliderControl)
if (!sBorder.isEmpty())
nBits |= WB_BORDER;
- return VclPtr<ColorSliderControl>::Create(pParent, nBits);
+ return new ColorSliderControl(pParent, nBits);
}
void ColorSliderControl::UpdateBitmap()
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index fdba7520c79a..2edac2d05d81 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 VclPtr<GraphicPreviewWindow>::Create(pParent, nWinBits);
+ return new GraphicPreviewWindow(pParent, nWinBits);
}
Size GraphicPreviewWindow::GetOptimalSize() const
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 6572fcb0b1bf..b65bf8c4522b 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 VclPtr<SvxHlmarkTreeLBox>::Create(pParent, nWinStyle);
+ return new SvxHlmarkTreeLBox(pParent, nWinStyle);
}
Size SvxHlmarkTreeLBox::GetOptimalSize() const
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index cdef298a0475..65064c34c4a8 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 VclPtr<ColorConfigCtrl_Impl>::Create(pParent);
+ return new ColorConfigCtrl_Impl(pParent);
}
void ColorConfigCtrl_Impl::Update ()
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1f4943c1b3ae..259a28f05fb3 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 VclPtr<OfaAutoCompleteTabPage::AutoCompleteMultiListBox>::Create(pParent, nWinBits);
+ return new OfaAutoCompleteTabPage::AutoCompleteMultiListBox(pParent, nWinBits);
}
// class OfaSmartTagOptionsTabPage ---------------------------------------------
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index e8aa044e55fd..2c9998e786c0 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 VclPtr<BackgroundPreviewImpl>::Create(pParent);
+ return new BackgroundPreviewImpl(pParent);
}
void BackgroundPreviewImpl::setBmp(bool bBmp)
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 42da252257c8..15c9541611aa 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 VclPtr<SvxCropExample>::Create(pParent, nWinStyle);
+ return new SvxCropExample(pParent, nWinStyle);
}
void SvxCropExample::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )