summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-15 10:10:18 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-17 07:57:59 +0200
commitf70fe6e651eefbc69c434256f7e74ad53519a36c (patch)
treeb249e3372dcc14b618868b1f0b7a3916b50f2312 /chart2
parent9baeb0bd8f621457d265f09bd377d7147141030d (diff)
fdo#49921 make sure all tab pages have the same dimensions
The reason is that they can be combined arbitrarily in dialogs, so changing, e.g., height of one tab can lead to "interesting" results. Cf. commits 8631dbf85fb5ed56d225e32ea5a9c36c96b0d649 and 29042d096a2c5812ae179e1553367afd21b0f71e that were the cause of the problem described fdo#49921. Change-Id: I9995002a2bd5c3604bdfa06dc817916ce61c558d
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/TabPages.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.src2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.src2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.src2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.src2
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.src2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.src2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.src4
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.src5
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.src5
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.src2
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.src2
12 files changed, 21 insertions, 11 deletions
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index c43ef24cd003..30f292a6f5fb 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -27,6 +27,8 @@
#ifndef CHART_TABPAGES_HRC
#define CHART_TABPAGES_HRC
+#include <sfx2/tabpage.hrc>
+
#include "ResourceIds.hrc"
//see attrib.hrc in old chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src
index 75da7dc5e653..5fac55791367 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.src
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.src
@@ -30,7 +30,7 @@
TabPage TP_AXIS_LABEL
{
HelpID = HID_SCH_TP_AXIS_LABEL;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
CheckBox CB_AXIS_LABEL_SCHOW_DESCR
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src
index 1173b841354a..c112837b6ece 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.src
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.src
@@ -63,7 +63,7 @@ TabPage TP_AXIS_POSITIONS
HelpID = "chart2:TabPage:TP_AXIS_POSITIONS";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_AXIS_LINE
{
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.src b/chart2/source/controller/dialogs/tp_DataLabel.src
index 0f8f12c3e48b..8e0dd0da9ee8 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.src
+++ b/chart2/source/controller/dialogs/tp_DataLabel.src
@@ -33,6 +33,6 @@ TabPage TP_DATA_DESCR
Hide = TRUE ;
HelpID = HID_SCH_DATA_DESCR ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RESOURCE_DATALABEL( 6, 8 )
};
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
index b649cb4474c9..60fd5cb1a3d4 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.src
@@ -33,6 +33,6 @@ TabPage TP_YERRORBAR
HelpID = "chart2:TabPage:TP_YERRORBAR";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RESOURCE_ERRORBARS( 260 - 12, 0 )
};
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src
index 2b0f93892fa9..dde4889b096b 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.src
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.src
@@ -33,7 +33,7 @@ TabPage TP_LEGEND_POS
Hide = TRUE ;
HelpID = HID_SCH_LEGEND_POS ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GRP_LEGEND
{
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src
index b6862cba3b77..a655f5a78861 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.src
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.src
@@ -32,5 +32,5 @@ TabPage TP_LAYOUT
HelpID = "chart2:TabPage:TP_LAYOUT";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
};
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src
index 96463a97341b..64596fba6e3b 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.src
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.src
@@ -25,6 +25,8 @@
*
************************************************************************/
+#include <sfx2/tabpage.hrc>
+
#include "tp_PolarOptions.hrc"
#include "HelpIds.hrc"
@@ -33,7 +35,7 @@ TabPage TP_POLAROPTIONS
HelpID = "chart2:TabPage:TP_POLAROPTIONS";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_CLOCKWISE
{
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index eb27b586f24b..399dbac8617f 100644
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
+#include <sfx2/tabpage.hrc>
+
#include "HelpIds.hrc"
#include "tp_Scale.hrc"
@@ -59,7 +62,7 @@ TabPage TP_SCALE
HelpID = "chart2:TabPage:TP_SCALE";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_SCALE
{
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index f307d4750062..a1ccfa40c76c 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -24,6 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
+#include <sfx2/tabpage.hrc>
+
#include "HelpIds.hrc"
#include "tp_SeriesToAxis.hrc"
@@ -32,7 +35,7 @@ TabPage TP_OPTIONS
HelpID = "chart2:TabPage:TP_OPTIONS";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine 1
{
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src
index c77d915fa583..95295463da6e 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.src
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.src
@@ -33,7 +33,7 @@ TabPage TP_ALIGNMENT
Hide = TRUE ;
HelpID = HID_SCH_ALIGNMENT ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Control CTR_DIAL
{
HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ;
diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src
index 1a283844a8d1..b78ceadc161c 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.src
+++ b/chart2/source/controller/dialogs/tp_Trendline.src
@@ -33,6 +33,6 @@ TabPage TP_TRENDLINE
HelpID = "chart2:TabPage:TP_TRENDLINE";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
RESOURCE_TRENDLINE( 260 - 12, 0 )
};