diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-06-05 09:53:42 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-06-05 18:32:57 +0200 |
commit | d14933447c6e9a94a341d5385ada59ec322748bd (patch) | |
tree | 4722661a260c636bbb01345c39687b33f9d01cb7 | |
parent | d17d8da64b2a9589d3194a370e3e39c647aa28a2 (diff) |
sidebar conversion tutorial: Change boost::scoped_ptr's to normal pointers.
Change-Id: Ibcea80bcd75f3bec8367251c557ee859afd8dfbb
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index affafa310de1..4edabc5b134d 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -159,12 +159,12 @@ void AlignmentPropertyPanel::Initialize() mpMtrAngle->InsertValue(315, FUNIT_CUSTOM); mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount()); - mpTBHorizontal->SetAccessibleRelationLabeledBy(mpTBHorizontal.get()); - mpTBVertical->SetAccessibleRelationLabeledBy(mpTBVertical.get()); - mpMFLeftIndent->SetAccessibleRelationLabeledBy(mpFTLeftIndent.get()); - mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate.get()); + mpTBHorizontal->SetAccessibleRelationLabeledBy(mpTBHorizontal); + mpTBVertical->SetAccessibleRelationLabeledBy(mpTBVertical); + mpMFLeftIndent->SetAccessibleRelationLabeledBy(mpFTLeftIndent); + mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate); #ifdef HAS_IA2 - mpMtrAngle->SetMpSubEditAccLableBy(mpFtRotate.get()); + mpMtrAngle->SetMpSubEditAccLableBy(mpFtRotate); #endif } diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index b600affc1759..eae2d2a85b5e 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -59,16 +59,16 @@ public: private: //ui controls - ::boost::scoped_ptr< ToolBox > mpTBHorizontal; - ::boost::scoped_ptr< ToolBox > mpTBVertical; - ::boost::scoped_ptr< FixedText > mpFTLeftIndent; - ::boost::scoped_ptr< MetricField > mpMFLeftIndent; - ::boost::scoped_ptr< CheckBox > mpCBXWrapText; - ::boost::scoped_ptr< CheckBox > mpCBXMergeCell; - ::boost::scoped_ptr< FixedText > mpFtRotate; - ::boost::scoped_ptr< svx::sidebar::SidebarDialControl > mpCtrlDial; - ::boost::scoped_ptr< MetricBox > mpMtrAngle; - ::boost::scoped_ptr< CheckBox > mpCbStacked; + ToolBox* mpTBHorizontal; + ToolBox* mpTBVertical; + FixedText* mpFTLeftIndent; + MetricField* mpMFLeftIndent; + CheckBox* mpCBXWrapText; + CheckBox* mpCBXMergeCell; + FixedText* mpFtRotate; + svx::sidebar::SidebarDialControl* mpCtrlDial; + MetricBox* mpMtrAngle; + CheckBox* mpCbStacked; ::sfx2::sidebar::ControllerItem maAlignHorControl; ::sfx2::sidebar::ControllerItem maAlignVerControl; |