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 | |
| parent | 3dc00a8de9f9f1b1ad0c60134391638544cdd143 (diff) | |
also handle line width correctly
Change-Id: Ia564d3c9b821a09586a0bcb32ee3f827e71f43de
4 files changed, 9 insertions, 2 deletions
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index a4ad08f81e68..d677e205cac5 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -154,6 +154,7 @@ void ChartLinePanel::Initialize() if (xSelectionSupplier.is()) xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get()); + setMapUnit(SFX_MAPUNIT_100TH_MM); updateData(); } diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 6133061ee79f..ef41457fa3a5 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -110,6 +110,8 @@ protected: void SelectLineStyle(); void ActivateControls(); + void setMapUnit(SfxMapUnit eMapUnit); + private: //ui controls VclPtr<FixedText> mpFTWidth; 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: */ |