diff options
Diffstat (limited to 'svx/source/sidebar/line/LinePropertyPanelBase.cxx')
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 8d26da31ffa4..de49e322a2a8 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -65,9 +65,9 @@ namespace LinePropertyPanelBase::LinePropertyPanelBase( - vcl::Window* pParent, + weld::Widget* pParent, const uno::Reference<css::frame::XFrame>& rxFrame) -: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame), +: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui"), mxTBColor(m_xBuilder->weld_toolbar("color")), mxColorDispatch(new ToolbarUnoDispatcher(*mxTBColor, *m_xBuilder, rxFrame)), mxLineStyleTB(m_xBuilder->weld_toolbar("linestyle")), @@ -97,11 +97,6 @@ LinePropertyPanelBase::LinePropertyPanelBase( LinePropertyPanelBase::~LinePropertyPanelBase() { - disposeOnce(); -} - -void LinePropertyPanelBase::dispose() -{ mxLineWidthPopup.reset(); mxFTWidth.reset(); mxTBWidth.reset(); @@ -117,8 +112,6 @@ void LinePropertyPanelBase::dispose() mxLBCapStyle.reset(); mxGridLineProps.reset(); mxBoxArrowProps.reset(); - - PanelLayout::dispose(); } void LinePropertyPanelBase::Initialize() @@ -417,7 +410,7 @@ void LinePropertyPanelBase::SetWidthIcon() return; } - tools::Long nVal = LogicToLogic(mnWidthCoreValue * 10, meMapUnit, MapUnit::MapPoint); + tools::Long nVal = OutputDevice::LogicToLogic(mnWidthCoreValue * 10, meMapUnit, MapUnit::MapPoint); if(nVal <= 6) mxTBWidth->set_item_icon_name(SELECTWIDTH, maIMGWidthIcon[0]); |