Kaydet (Commit) 6e3fbd15 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

we don't need the last entry for icon sets

Change-Id: If76187689bc63199dc0249626ed4ab4c904ecf18
üst cee68472
...@@ -1297,6 +1297,13 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc ...@@ -1297,6 +1297,13 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc
return pEntry; return pEntry;
} }
void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetLastEntry()
{
maEdEntry.Hide();
maLbEntryType.Hide();
maFtEntry.Hide();
}
ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ):
ScCondFrmtEntry( pParent, pDoc, rPos ), ScCondFrmtEntry( pParent, pDoc, rPos ),
maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ),
...@@ -1321,6 +1328,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ...@@ -1321,6 +1328,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const
aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2; aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
maEntries[i].SetPosPixel( aPos ); maEntries[i].SetPosPixel( aPos );
} }
maEntries.back().SetLastEntry();
} }
else else
IconSetTypeHdl(NULL); IconSetTypeHdl(NULL);
...@@ -1350,6 +1358,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl ) ...@@ -1350,6 +1358,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2; aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
maEntries[i].SetPosPixel( aPos ); maEntries[i].SetPosPixel( aPos );
} }
maEntries.back().SetLastEntry();
return 0; return 0;
} }
......
...@@ -260,6 +260,8 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry ...@@ -260,6 +260,8 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL ); ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const; ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const;
void SetLastEntry();
}; };
typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDateEntriesType; typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDateEntriesType;
ScIconSetFrmtDateEntriesType maEntries; ScIconSetFrmtDateEntriesType maEntries;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment