position all elements in the src file and not in the code

# Changes to be committed:

Change-Id: Idc3d2a7201c6d2e92a111ffc6cb60f88c4c0c4c2

4 files changed, 99 insertions, 71 deletions

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 211c3bb163ee..ee83a7a9c273 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -590,13 +590,12 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB
 ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ):
     ScCondFrmtEntry( pParent, pDoc, rPos ),
     maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ),
-    maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ),
-    maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maEdMin( this, ScResId( ED_COL_SCALE ) ),
-    maEdMax( this, ScResId( ED_COL_SCALE ) ),
-    maLbColMin( this, ScResId( LB_COL) ),
-    maLbColMax( this, ScResId( LB_COL) )
+    maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ),
+    maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE_MAX ) ),
+    maEdMin( this, ScResId( ED_COL_SCALE_MIN ) ),
+    maEdMax( this, ScResId( ED_COL_SCALE_MAX ) ),
+    maLbColMin( this, ScResId( LB_COL_MIN ) ),
+    maLbColMax( this, ScResId( LB_COL_MAX ) )
 {
     maLbType.SelectEntryPos(0);
     maLbColorFormat.SelectEntryPos(0);
@@ -695,8 +694,6 @@ ScFormatEntry* ScColorScale2FrmtEntry::GetEntry() const
 
 void ScColorScale2FrmtEntry::SetActive()
 {
-    maLbColScale2.Show();
-
     maLbEntryTypeMin.Show();
     maLbEntryTypeMax.Show();
 
@@ -711,8 +708,6 @@ void ScColorScale2FrmtEntry::SetActive()
 
 void ScColorScale2FrmtEntry::SetInactive()
 {
-    maLbColScale2.Hide();
-
     maLbEntryTypeMin.Hide();
     maLbEntryTypeMax.Hide();
 
@@ -751,17 +746,15 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox*, pBox )
 ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ):
     ScCondFrmtEntry( pParent, pDoc, rPos ),
     maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ),
-    maLbColScale2( this, ScResId( LB_COL_SCALE2 ) ),
-    maLbColScale3( this, ScResId( LB_COL_SCALE3 ) ),
-    maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maEdMin( this, ScResId( ED_COL_SCALE ) ),
-    maEdMiddle( this, ScResId( ED_COL_SCALE ) ),
-    maEdMax( this, ScResId( ED_COL_SCALE ) ),
-    maLbColMin( this, ScResId( LB_COL) ),
-    maLbColMiddle( this, ScResId( LB_COL) ),
-    maLbColMax( this, ScResId( LB_COL) )
+    maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ),
+    maLbEntryTypeMiddle( this, ScResId( LB_TYPE_COL_SCALE_MIDDLE ) ),
+    maLbEntryTypeMax( this, ScResId( LB_TYPE_COL_SCALE_MAX ) ),
+    maEdMin( this, ScResId( ED_COL_SCALE_MIN ) ),
+    maEdMiddle( this, ScResId( ED_COL_SCALE_MIDDLE ) ),
+    maEdMax( this, ScResId( ED_COL_SCALE_MAX ) ),
+    maLbColMin( this, ScResId( LB_COL_MIN ) ),
+    maLbColMiddle( this, ScResId( LB_COL_MIDDLE ) ),
+    maLbColMax( this, ScResId( LB_COL_MAX ) )
 {
     maLbType.SelectEntryPos(0);
     if(pFormat)
@@ -807,23 +800,6 @@ void ScColorScale3FrmtEntry::Init()
 
     DBG_ASSERT( pDocSh, "DocShell not found!" );
 
-    Point aPointLb = maLbEntryTypeMiddle.GetPosPixel();
-    Point aPointEd = maEdMiddle.GetPosPixel();
-    Point aPointCol = maLbColMiddle.GetPosPixel();
-    const long nMovePos = maLbEntryTypeMiddle.GetSizePixel().Width() * 1.2;
-    aPointLb.X() += nMovePos;
-    aPointEd.X() += nMovePos;
-    aPointCol.X() += nMovePos;
-    maLbEntryTypeMiddle.SetPosPixel(aPointLb);
-    maEdMiddle.SetPosPixel(aPointEd);
-    maLbColMiddle.SetPosPixel(aPointCol);
-    aPointLb.X() += nMovePos;
-    aPointEd.X() += nMovePos;
-    aPointCol.X() += nMovePos;
-    maLbEntryTypeMax.SetPosPixel(aPointLb);
-    maEdMax.SetPosPixel(aPointEd);
-    maLbColMax.SetPosPixel(aPointCol);
-
     if ( pDocSh )
     {
         pItem = pDocSh->GetItem( SID_COLOR_TABLE );
@@ -878,9 +854,6 @@ ScFormatEntry* ScColorScale3FrmtEntry::GetEntry() const
 
 void ScColorScale3FrmtEntry::SetActive()
 {
-    maLbColScale2.Show();
-    maLbColScale3.Show();
-
     maLbEntryTypeMin.Show();
     maLbEntryTypeMiddle.Show();
     maLbEntryTypeMax.Show();
@@ -898,9 +871,6 @@ void ScColorScale3FrmtEntry::SetActive()
 
 void ScColorScale3FrmtEntry::SetInactive()
 {
-    maLbColScale2.Hide();
-    maLbColScale3.Hide();
-
     maLbEntryTypeMin.Hide();
     maLbEntryTypeMiddle.Hide();
     maLbEntryTypeMax.Hide();
@@ -999,10 +969,10 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed
 ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ):
     ScCondFrmtEntry( pParent, pDoc, rPos ),
     maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ),
-    maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE ) ),
-    maEdDataBarMin( this, ScResId( ED_COL_SCALE ) ),
-    maEdDataBarMax( this, ScResId( ED_COL_SCALE ) ),
+    maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ),
+    maLbDataBarMaxType( this, ScResId( LB_TYPE_COL_SCALE_MAX ) ),
+    maEdDataBarMin( this, ScResId( ED_COL_SCALE_MIN ) ),
+    maEdDataBarMax( this, ScResId( ED_COL_SCALE_MAX ) ),
     maBtOptions( this, ScResId( BTN_OPTIONS ) )
 {
     maLbColorFormat.SelectEntryPos(2);
@@ -1035,13 +1005,6 @@ void ScDataBarFrmtEntry::Init()
 {
     maLbDataBarMinType.SetSelectHdl( LINK( this, ScDataBarFrmtEntry, DataBarTypeSelectHdl ) );
     maLbDataBarMaxType.SetSelectHdl( LINK( this, ScDataBarFrmtEntry, DataBarTypeSelectHdl ) );
-    Point aPointEdDataBar = maEdDataBarMin.GetPosPixel();
-    Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel();
-    long nMovePos = 10;
-    aPointEdDataBar.X() += 2*nMovePos;
-    aPointLbDataBar.X() += 2*nMovePos;
-    maEdDataBarMax.SetPosPixel(aPointEdDataBar);
-    maLbDataBarMaxType.SetPosPixel(aPointLbDataBar);
 
     maBtOptions.SetClickHdl( LINK( this, ScDataBarFrmtEntry, OptionBtnHdl ) );
 
diff --git a/sc/source/ui/inc/condformatdlg.hrc b/sc/source/ui/inc/condformatdlg.hrc
index f0258567f0f5..dcb51d19be77 100644
--- a/sc/source/ui/inc/condformatdlg.hrc
+++ b/sc/source/ui/inc/condformatdlg.hrc
@@ -46,12 +46,7 @@
 #define FT_STYLE 21
 #define LB_COLOR_FORMAT 22
 
-#define LB_COL_SCALE2 23
-#define LB_COL_SCALE3 24
-#define LB_TYPE_COL_SCALE 25
-#define ED_COL_SCALE 28
 #define WD_PREVIEW 26
-#define LB_COL 27
 #define BTN_OPTIONS 30
 #define STR_CONDITION 31
 
@@ -61,4 +56,15 @@
 
 #define ED_FORMULA 35
 
+#define ED_COL_SCALE_MIN 36
+#define ED_COL_SCALE_MIDDLE 37
+#define ED_COL_SCALE_MAX 38
+
+#define LB_COL_MIN 39
+#define LB_COL_MIDDLE 40
+#define LB_COL_MAX 41
+
+#define LB_TYPE_COL_SCALE_MIN 42
+#define LB_TYPE_COL_SCALE_MIDDLE 43
+#define LB_TYPE_COL_SCALE_MAX 43
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 3147bfb03c2f..94722d040d76 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -115,8 +115,6 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry
     ListBox maLbColorFormat;
 
     //color scale ui elements
-    ListBox maLbColScale2;
-
     ListBox maLbEntryTypeMin;
     ListBox maLbEntryTypeMax;
 
@@ -146,9 +144,6 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry
     ListBox maLbColorFormat;
 
     //color scale ui elements
-    ListBox maLbColScale2;
-    ListBox maLbColScale3;
-
     ListBox maLbEntryTypeMin;
     ListBox maLbEntryTypeMiddle;
     ListBox maLbEntryTypeMax;
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index 16b26509f40f..4adff8f62fc4 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -191,7 +191,7 @@ Control RID_COND_ENTRY
             "New Style...";
         };
     };
-    ListBox LB_TYPE_COL_SCALE
+    ListBox LB_TYPE_COL_SCALE_MIN
     {
         Pos = MAP_APPFONT( 5, 32 );
         Size = MAP_APPFONT( 80, 60 );
@@ -209,6 +209,42 @@ Control RID_COND_ENTRY
             "AutoMax";
         };
     };
+    ListBox LB_TYPE_COL_SCALE_MIDDLE
+    {
+        Pos = MAP_APPFONT( 100, 32 );
+        Size = MAP_APPFONT( 80, 60 );
+        Border = TRUE;
+        DropDown = TRUE;
+        StringList [ en-US ] =
+        {
+            "Min";
+            "Max";
+            "Percentile";
+            "Value";
+            "Percent";
+            "Formula";
+            "AutoMin";
+            "AutoMax";
+        };
+    };
+    ListBox LB_TYPE_COL_SCALE_MAX
+    {
+        Pos = MAP_APPFONT( 195, 32 );
+        Size = MAP_APPFONT( 80, 60 );
+        Border = TRUE;
+        DropDown = TRUE;
+        StringList [ en-US ] =
+        {
+            "Min";
+            "Max";
+            "Percentile";
+            "Value";
+            "Percent";
+            "Formula";
+            "AutoMin";
+            "AutoMax";
+        };
+    };
     Window WD_PREVIEW
     {
         Pos = MAP_APPFONT( 175, 32 );
@@ -216,16 +252,44 @@ Control RID_COND_ENTRY
         Text [ en-US ] = "Example";
         Border = TRUE;
     };
-    Edit ED_COL_SCALE
+    Edit ED_COL_SCALE_MIN
     {
         Pos = MAP_APPFONT( 5, 48 );
-        Size = MAP_APPFONT( 60, 12 );
+        Size = MAP_APPFONT( 80, 12 );
         Border = TRUE;
     };
-    ListBox LB_COL
+    Edit ED_COL_SCALE_MIDDLE
+    {
+        Pos = MAP_APPFONT( 100, 48 );
+        Size = MAP_APPFONT( 80, 12 );
+        Border = TRUE;
+    };
+    Edit ED_COL_SCALE_MAX
+    {
+        Pos = MAP_APPFONT( 195, 48 );
+        Size = MAP_APPFONT( 80, 12 );
+        Border = TRUE;
+    };
+    ListBox LB_COL_MIN
     {
         Pos = MAP_APPFONT( 5, 62 );
-        Size = MAP_APPFONT( 60, 40 );
+        Size = MAP_APPFONT( 80, 40 );
+        Border = TRUE;
+        DropDown = TRUE;
+        DDExtraWidth = TRUE;
+    };
+    ListBox LB_COL_MIDDLE
+    {
+        Pos = MAP_APPFONT( 100, 62 );
+        Size = MAP_APPFONT( 80, 40 );
+        Border = TRUE;
+        DropDown = TRUE;
+        DDExtraWidth = TRUE;
+    };
+    ListBox LB_COL_MAX
+    {
+        Pos = MAP_APPFONT( 195, 62 );
+        Size = MAP_APPFONT( 80, 40 );
         Border = TRUE;
         DropDown = TRUE;
         DDExtraWidth = TRUE;