diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-03-30 13:09:38 +0200 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-03-30 13:09:38 +0200 |
| commit | 9ffefc5a02fe8c45c8dc6c2627b67e32101b2960 (patch) | |
| tree | afee5e279f0c16588eddf233e1b330aa3a9c5254 | |
| parent | 754c2fcb779f9c2cbe37f1bf99cf49cec01a0947 (diff) | |
chartpositioning: #i100778# avoid assertions upon opening of pos&size dialog
| -rw-r--r-- | chart2/source/controller/dialogs/tp_DiagramPosition.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/tp_DiagramPosition.cxx b/chart2/source/controller/dialogs/tp_DiagramPosition.cxx index 68150dceeb22..c8e2ec552192 100644 --- a/chart2/source/controller/dialogs/tp_DiagramPosition.cxx +++ b/chart2/source/controller/dialogs/tp_DiagramPosition.cxx @@ -30,13 +30,13 @@ #include "tp_DiagramPosition.hxx" #include "tp_DiagramPosition.hrc" +#include "ConfigurationAccess.hxx" #include "DiagramHelper.hxx" #include "ResId.hxx" #include "chartview/ChartSfxItemIds.hxx" #include <svx/svxids.hrc> #include <svx/svdview.hxx> -//GetModuleFieldUnit #include <svx/dlgutil.hxx> #include <svl/rectitem.hxx> #include <svl/aeitem.hxx> @@ -129,7 +129,7 @@ DiagramPositionTabPage::DiagramPositionTabPage( Window* pParent, const SfxItemSe void DiagramPositionTabPage::Construct() { // get range and work area - meDlgUnit = GetModuleFieldUnit( GetItemSet() ); + meDlgUnit = ConfigurationAccess::getFieldUnit(); SetFieldUnit( maMtrPosX, meDlgUnit, TRUE ); SetFieldUnit( maMtrPosY, meDlgUnit, TRUE ); SetFieldUnit( maMtrWidth, meDlgUnit, TRUE ); diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index c1ec0eabcccc..bd971752954c 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -99,8 +99,6 @@ const USHORT nLegendWhichPairs[] = const USHORT nDiagramWhichPairs[] = { - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx SCHATTR_DIAGRAM_START, SCHATTR_DIAGRAM_END, SID_ATTR_TRANSFORM_POS_Y, SID_ATTR_TRANSFORM_POS_Y, SID_ATTR_TRANSFORM_WIDTH, SID_ATTR_TRANSFORM_HEIGHT, |