[Libreoffice-commits] .: 3 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/condformat/condformatdlgentry.cxx |   14 ++++++++++++++
 sc/source/ui/inc/condformatdlgentry.hxx        |    3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit d05351723055dd56e8732c4ac2104cd8111e2a54
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 2 17:36:46 2012 +0100

    this method is not implemented
    
    Change-Id: Ief364d7c835d75e6caf4fb0d639d8e67b7bdcd2a

diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 9ff9840..885443d 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -266,7 +266,6 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
     typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDateEntriesType;
     ScIconSetFrmtDateEntriesType maEntries;
 
-    ScFormatEntry* createIconSetEntry();
     virtual rtl::OUString GetExpressionString();
 
     void Init();
commit 6e3fbd15986804fa86a3c3a6ff49047da9c5d7f6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 2 17:14:03 2012 +0100

    we don't need the last entry for icon sets
    
    Change-Id: If76187689bc63199dc0249626ed4ab4c904ecf18

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 66079e1..f648bea 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1297,6 +1297,13 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc
     return pEntry;
 }
 
+void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetLastEntry()
+{
+    maEdEntry.Hide();
+    maLbEntryType.Hide();
+    maFtEntry.Hide();
+}
+
 ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ):
         ScCondFrmtEntry( pParent, pDoc, rPos ),
         maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ),
@@ -1321,6 +1328,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const
             aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
             maEntries[i].SetPosPixel( aPos );
         }
+        maEntries.back().SetLastEntry();
     }
     else
         IconSetTypeHdl(NULL);
@@ -1350,6 +1358,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
         aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
         maEntries[i].SetPosPixel( aPos );
     }
+    maEntries.back().SetLastEntry();
 
     return 0;
 }
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 99d602c..9ff9840 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -260,6 +260,8 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
         ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
 
         ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const;
+
+        void SetLastEntry();
     };
     typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDateEntriesType;
     ScIconSetFrmtDateEntriesType maEntries;
commit cee68472a07069776093987d579fa1ac2cc2fd8a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 2 17:11:45 2012 +0100

    small fixes for iconset UI
    
    Change-Id: I724397b50404753a9ca235d9e0eca13bdcf5b341

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 86dec0d..66079e1 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1256,6 +1256,10 @@ ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pPar
                 assert(false);
         }
     }
+    else
+    {
+        maLbEntryType.SelectEntryPos(1);
+    }
     FreeResource();
 }
 
@@ -1300,6 +1304,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const
 {
     Init();
     FreeResource();
+    maLbColorFormat.SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) );
 
     if(pFormat)
     {