diff options
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/hfedtdlg.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/popmenu.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/scuitphfedit.hxx | 58 | ||||
| -rw-r--r-- | sc/source/ui/inc/tphfedit.hxx | 5 |
4 files changed, 40 insertions, 27 deletions
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 967411899c45..56a50a9e3602 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -37,7 +37,7 @@ public: Window* pParent, const SfxItemSet& rCoreSet, const String& rPageStyle, - sal_uInt16 nResId = RID_SCDLG_HFEDIT ); + sal_uInt16 nResId = RID_SCDLG_HFEDIT ); ~ScHFEditDlg(); diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index e3c10b3d77b7..70bfeedb228a 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -32,7 +32,9 @@ protected: virtual void Select(); public: ScPopupMenu() : nSel(0),bHit(false) {} + ScPopupMenu(const ResId& rRes) : PopupMenu(rRes),nSel(0),bHit(false) {} + sal_uInt16 GetSelected() const { return nSel; } sal_Bool WasHit() const { return bHit; } }; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index b95a3a0b6024..0c3a0d8080d9 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -21,6 +21,7 @@ #define SCUI_TPHFEDIT_HXX #include "tphfedit.hxx" +//#include <boost/graph/graph_concepts.hpp> //=================================================================== enum ScHFEntryId @@ -47,41 +48,46 @@ class ScHFEditPage : public SfxTabPage { public: virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); void SetNumType(SvxNumType eNumType); void ClearTextAreas(); protected: ScHFEditPage( Window* pParent, - sal_uInt16 nResId, const SfxItemSet& rCoreSet, - sal_uInt16 nWhich, bool bHeader ); + sal_uInt16 nWhich, + bool bHeader ); virtual ~ScHFEditPage(); private: - FixedText aFtLeft; - ScEditWindow aWndLeft; - FixedText aFtCenter; - ScEditWindow aWndCenter; - FixedText aFtRight; - ScEditWindow aWndRight; - FixedText maFtDefinedHF; - ListBox maLbDefined; - FixedText maFtCustomHF; - ImageButton aBtnText; - ScExtIButton aBtnFile; - ImageButton aBtnTable; - ImageButton aBtnPage; - ImageButton aBtnLastPage; - ImageButton aBtnDate; - ImageButton aBtnTime; - FixedLine aFlInfo; - FixedInfo aFtInfo; - ScPopupMenu aPopUpFile; - - sal_uInt16 nWhich; - String aCmdArr[6]; + //FixedText aFtLeft; + ScEditWindow* m_pWndLeft; + //FixedText aFtCenter; + ScEditWindow* m_pWndCenter; + //FixedText aFtRight; + ScEditWindow* m_pWndRight; + FixedText* m_pFtDefinedHF; + ListBox* m_pLbDefined; + FixedText* m_pFtCustomHF; + PushButton* m_pBtnText; + ScExtIButton* m_pBtnFile; + PushButton* m_pBtnTable; + PushButton* m_pBtnPage; + PushButton* m_pBtnLastPage; + PushButton* m_pBtnDate; + PushButton* m_pBtnTime; + + FixedText* m_pFtConfidential; + FixedText* m_pFtPage; + FixedText* m_pFtOfQuestion; + FixedText* m_pFtOf; + FixedText* m_pFtNone; + FixedText* m_pFtCreatedBy; + FixedText* m_pFtCustomized; + + sal_uInt16 nWhich; + OUString aCmdArr[6]; private: #ifdef _TPHFEDIT_CXX @@ -95,7 +101,7 @@ private: bool IsDateEntry(EditTextObject* pTextObj); bool IsExtFileNameEntry(EditTextObject* pTextObj); DECL_LINK( ListHdl_Impl, ListBox* ); - DECL_LINK( ClickHdl, ImageButton* ); + DECL_LINK( ClickHdl, PushButton* ); DECL_LINK( MenuHdl, ScExtIButton* ); #endif }; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index f3d5e3307e6c..5a0c899a1b87 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -56,6 +56,7 @@ class SC_DLLPUBLIC ScEditWindow : public Control { public: ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLocation eLoc ); + ScEditWindow( Window* pParent, WinBits nBits , ScEditWindowLocation eLoc ); ~ScEditWindow(); using Control::SetFont; @@ -72,6 +73,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); inline ScHeaderEditEngine* GetEditEngine() const {return pEdEngine;} + + void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; } protected: virtual void Paint( const Rectangle& rRect ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -81,6 +84,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ); virtual void GetFocus(); virtual void LoseFocus(); + virtual void Resize(); private: ScHeaderEditEngine* pEdEngine; @@ -116,6 +120,7 @@ protected: public: ScExtIButton(Window* pParent, const ResId& rResId ); + ScExtIButton(Window* pParent, WinBits nBits ); void SetPopupMenu(PopupMenu* pPopUp); |