Kaydet (Commit) 6240d455 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

move this class from the header file to the source file

Change-Id: Idd4f79718326770426b6e297c1753af062c7396d
üst e6ec7b16
...@@ -1224,7 +1224,23 @@ IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl ) ...@@ -1224,7 +1224,23 @@ IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl )
return 0; return 0;
} }
ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry ): class ScIconSetFrmtDataEntry : public Control
{
private:
FixedImage maImgIcon;
FixedText maFtEntry;
Edit maEdEntry;
ListBox maLbEntryType;
public:
ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const;
void SetFirstEntry();
};
ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry ):
Control( pParent, ScResId( RID_ICON_SET_ENTRY ) ), Control( pParent, ScResId( RID_ICON_SET_ENTRY ) ),
maImgIcon( this, ScResId( IMG_ICON ) ), maImgIcon( this, ScResId( IMG_ICON ) ),
maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ), maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ),
...@@ -1263,7 +1279,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pPar ...@@ -1263,7 +1279,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pPar
FreeResource(); FreeResource();
} }
ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const
{ {
sal_Int32 nPos = maLbEntryType.GetSelectEntryPos(); sal_Int32 nPos = maLbEntryType.GetSelectEntryPos();
rtl::OUString aText = maEdEntry.GetText(); rtl::OUString aText = maEdEntry.GetText();
...@@ -1297,7 +1313,7 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc ...@@ -1297,7 +1313,7 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc
return pEntry; return pEntry;
} }
void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetFirstEntry() void ScIconSetFrmtDataEntry::SetFirstEntry()
{ {
maEdEntry.Hide(); maEdEntry.Hide();
maLbEntryType.Hide(); maLbEntryType.Hide();
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include "conditio.hxx" #include "conditio.hxx"
#include <formula/funcutl.hxx> #include <formula/funcutl.hxx>
class ScIconSetFrmtDataEntry;
namespace condformat { namespace condformat {
namespace entry { namespace entry {
...@@ -248,21 +250,6 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry ...@@ -248,21 +250,6 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
// icon set ui elements // icon set ui elements
ListBox maLbIconSetType; ListBox maLbIconSetType;
class ScIconSetFrmtDataEntry : public Control
{
private:
FixedImage maImgIcon;
FixedText maFtEntry;
Edit maEdEntry;
ListBox maLbEntryType;
public:
ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL );
ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const;
void SetFirstEntry();
};
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