[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2

[Michael Meeks]

 include/sfx2/dinfdlg.hxx |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit a912d1f017895898ade559ea02fdb378021cd9ee
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Jul 1 18:42:44 2015 +0100

    tdf#92355 - use ScopedVclPtr as a replacement for in-line widgets.
    
    Change-Id: Iccabcf6df662c0c4814a4c4f20d690778799e049
    Reviewed-on: https://gerrit.libreoffice.org/16683
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 3bb88d9..eb589bd 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -391,24 +391,23 @@ public:
 
 struct CustomPropertyLine
 {
-    VclPtr<ComboBox>                      m_aNameBox;
-    VclPtr<CustomPropertiesTypeBox>       m_aTypeBox;
-    VclPtr<CustomPropertiesEdit>          m_aValueEdit;
-    VclPtr<CustomPropertiesDateField>     m_aDateField;
-    VclPtr<CustomPropertiesTimeField>     m_aTimeField;
-    const OUString                        m_sDurationFormat;
-    VclPtr<CustomPropertiesDurationField> m_aDurationField;
-    VclPtr<CustomPropertiesEditButton>    m_aEditButton;
-    VclPtr<CustomPropertiesYesNoButton>   m_aYesNoButton;
-    VclPtr<CustomPropertiesRemoveButton>  m_aRemoveButton;
+    ScopedVclPtr<ComboBox>                      m_aNameBox;
+    ScopedVclPtr<CustomPropertiesTypeBox>       m_aTypeBox;
+    ScopedVclPtr<CustomPropertiesEdit>          m_aValueEdit;
+    ScopedVclPtr<CustomPropertiesDateField>     m_aDateField;
+    ScopedVclPtr<CustomPropertiesTimeField>     m_aTimeField;
+    const OUString                              m_sDurationFormat;
+    ScopedVclPtr<CustomPropertiesDurationField> m_aDurationField;
+    ScopedVclPtr<CustomPropertiesEditButton>    m_aEditButton;
+    ScopedVclPtr<CustomPropertiesYesNoButton>   m_aYesNoButton;
+    ScopedVclPtr<CustomPropertiesRemoveButton>  m_aRemoveButton;
 
     bool                            m_bIsDate;
     bool                            m_bIsRemoved;
     bool                            m_bTypeLostFocus;
 
     CustomPropertyLine( vcl::Window* pParent );
-
-    void    SetRemoved();
+    void SetRemoved();
 };
 
 // class CustomPropertiesWindow ------------------------------------------