diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-29 23:18:44 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-30 05:45:25 +0200 |
commit | bead8d010987d53b313e30b65e56d04ee80469ef (patch) | |
tree | 9a1e2db699f00bc86fea3dc6bf6c41cf1153b94d /svx/source | |
parent | 3dc00a8de9f9f1b1ad0c60134391638544cdd143 (diff) |
also handle line width correctly
Change-Id: Ia564d3c9b821a09586a0bcb32ee3f827e71f43de
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index c025c86f00d4..616cf5a29147 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -100,6 +100,7 @@ void LinePropertyPanel::dispose() void LinePropertyPanel::Initialize() { + setMapUnit(maWidthControl.GetCoreMetric()); } VclPtr<vcl::Window> LinePropertyPanel::Create ( diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index c04fa3f2b402..96564663eedd 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -220,8 +220,6 @@ void LinePropertyPanelBase::Initialize() mpIMGWidthIcon[6] = Image(SVX_RES(IMG_WIDTH7_ICON)); mpIMGWidthIcon[7] = Image(SVX_RES(IMG_WIDTH8_ICON)); - // meMapUnit = maWidthControl.GetCoreMetric(); - FillLineStyleList(); SelectLineStyle(); Link<> aLink = LINK( this, LinePropertyPanelBase, ChangeLineStyleHdl ); @@ -925,6 +923,11 @@ void LinePropertyPanelBase::ActivateControls() mpBoxArrowProps->Enable( bLineStyle ); } +void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit) +{ + meMapUnit = eMapUnit; +} + }} // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |