diff options
Diffstat (limited to 'include/sfx2/dinfdlg.hxx')
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 4fb5e9ee810d..447d8e302ef0 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -525,19 +525,6 @@ public: inline CmisPropertyLine* GetLine() const { return m_pLine; } }; -class CmisPropertiesTypeBox : public ListBox -{ -private: - CmisPropertyLine* m_pLine; - -public: - inline CmisPropertiesTypeBox( - Window* pParent, const ResId& rResId, CmisPropertyLine* pLine ) : - ListBox( pParent, rResId ), m_pLine( pLine ) {} - - inline CmisPropertyLine* GetLine() const { return m_pLine; } -}; - class CmisPropertiesDateField : public DateField { private: @@ -594,20 +581,17 @@ public: struct CmisPropertyLine { - SelectableFixedText m_aNameBox; - CmisPropertiesTypeBox m_aTypeBox; + FixedText m_aName; + FixedText m_aType; CmisPropertiesEdit m_aValueEdit; CmisPropertiesDateField m_aDateField; CmisPropertiesTimeField m_aTimeField; CmisPropertiesYesNoButton m_aYesNoButton; - Point m_aDatePos; - Point m_aTimePos; - Size m_aDateTimeSize; - bool m_bTypeLostFocus; - + Point m_aDatePos; + Point m_aTimePos; + Size m_aDateTimeSize; + bool m_bTypeLostFocus; CmisPropertyLine( Window* pParent ); - - void SetRemoved(); }; // class CmisPropertiesWindow ------------------------------------------ @@ -615,8 +599,8 @@ struct CmisPropertyLine class CmisPropertiesWindow : public Window { private: - SelectableFixedText m_aNameBox; - ListBox m_aTypeBox; + FixedText m_aName; + FixedText m_aType; Edit m_aValueEdit; DateField m_aDateField; TimeField m_aTimeField; @@ -631,9 +615,7 @@ private: Timer m_aEditLoseFocusTimer; Timer m_aBoxLoseFocusTimer; - DECL_LINK( TypeHdl, CmisPropertiesTypeBox* ); DECL_LINK( EditLoseFocusHdl, CmisPropertiesEdit* ); - DECL_LINK( BoxLoseFocusHdl, CmisPropertiesTypeBox* ); bool IsLineValid( CmisPropertyLine* pLine ) const; void ValidateLine( CmisPropertyLine* pLine, bool bIsFromTypeBox ); @@ -646,7 +628,7 @@ public: ~CmisPropertiesWindow(); void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); - sal_uInt16 GetVisibleLineCount() const; + sal_uInt16 GetLineCount() const; inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny ); bool AreAllLinesValid() const; @@ -697,7 +679,7 @@ private: protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = NULL ); |