summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-19 17:47:31 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 12:26:07 +0100
commite218bbcbf60345115772ccb2fa63418c13895bd0 (patch)
tree29d9fb87ba270b6e5464b1440fb931868d4e3f4a /include
parentb129ee5021b7f56dfd936d53a46d274880edc0a9 (diff)
Move OutputDevice members to VclPtr: starmath, svx.
Change-Id: I1a5174334f41bc319e0806b9d324be64ba6d0135
Diffstat (limited to 'include')
-rw-r--r--include/svx/dialcontrol.hxx6
-rw-r--r--include/svx/dlgctrl.hxx4
-rw-r--r--include/svx/float3d.hxx2
-rw-r--r--include/svx/numvset.hxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 58ae42a3b8d7..787a0ca2cc5f 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -124,9 +124,9 @@ public:
protected:
struct DialControl_Impl
{
- std::unique_ptr<DialControlBmp> mxBmpEnabled;
- std::unique_ptr<DialControlBmp> mxBmpDisabled;
- std::unique_ptr<DialControlBmp> mxBmpBuffered;
+ ScopedVclPtr<DialControlBmp> mpBmpEnabled;
+ ScopedVclPtr<DialControlBmp> mpBmpDisabled;
+ ScopedVclPtr<DialControlBmp> mpBmpBuffered;
Link maModifyHdl;
VclPtr<NumericField> mpLinkField;
sal_Int32 mnLinkedFieldValueMultiplyer;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 15794fa60c82..9dd124193574 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -358,8 +358,8 @@ class SdrModel;
class SvxPreviewBase : public Control
{
private:
- SdrModel* mpModel;
- VirtualDevice* mpBufferDevice;
+ SdrModel* mpModel;
+ VclPtr<VirtualDevice> mpBufferDevice;
protected:
void InitSettings(bool bForeground, bool bBackground);
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 44d62800d5d2..4f12058b1fa9 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -171,7 +171,7 @@ private:
// Model, Page, View etc. for favourites
FmFormModel* pModel;
- VirtualDevice* pVDev;
+ VclPtr<VirtualDevice> pVDev;
E3dView* p3DView;
SfxBindings* pBindings;
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 374219902745..d4a13cb1d3b8 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -53,7 +53,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
sal_uInt16 nPageType;
bool bHTMLMode;
Rectangle aOrgRect;
- VirtualDevice* pVDev;
+ VclPtr<VirtualDevice> pVDev;
com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter;
com::sun::star::lang::Locale aLocale;