summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-01-15 16:14:34 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-01-15 19:11:55 +0100
commit6240d455e179e202bbadffd170965a1e61d5f896 (patch)
treeea739cddc849374933cc57fb64ab0b5654c19bdf
parente6ec7b16f2fda4d6624b06506ccfa2a4c5bc4cbb (diff)
move this class from the header file to the source file
Change-Id: Idd4f79718326770426b6e297c1753af062c7396d
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx22
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx17
2 files changed, 21 insertions, 18 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 994d6725085b..20e3f813324d 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1224,7 +1224,23 @@ IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl )
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 ) ),
maImgIcon( this, ScResId( IMG_ICON ) ),
maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ),
@@ -1263,7 +1279,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pPar
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();
rtl::OUString aText = maEdEntry.GetText();
@@ -1297,7 +1313,7 @@ ScColorScaleEntry* ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::CreateEntry(ScDoc
return pEntry;
}
-void ScIconSetFrmtEntry::ScIconSetFrmtDataEntry::SetFirstEntry()
+void ScIconSetFrmtDataEntry::SetFirstEntry()
{
maEdEntry.Hide();
maLbEntryType.Hide();
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 0723aa6d6bf3..a80c7d772909 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -11,6 +11,8 @@
#include "conditio.hxx"
#include <formula/funcutl.hxx>
+class ScIconSetFrmtDataEntry;
+
namespace condformat {
namespace entry {
@@ -248,21 +250,6 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
// icon set ui elements
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;
ScIconSetFrmtDateEntriesType maEntries;