diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-18 14:01:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 14:00:59 +0100 |
| commit | a6c5f2ba6bca8ad95a3731e2770a1d216c9925a0 (patch) | |
| tree | c47bd705cc43795cc03b726f1b5003a0cf0bda51 /extensions/source/bibliography/general.hxx | |
| parent | 4b339818bb036b409dd5dc00d645c62063e63de5 (diff) | |
rework RID_TP_GENERAL conversion to make widgets visible, etc.
Change-Id: I93e30198e27631ad4a6865fd202af16094c26a41
Diffstat (limited to 'extensions/source/bibliography/general.hxx')
| -rw-r--r-- | extensions/source/bibliography/general.hxx | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 169cda60fabc..409ccf58873d 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/sdbc/XRowSetListener.hpp> #include <svtools/stdctrl.hxx> +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <svtools/svmedit.hxx> @@ -44,6 +45,9 @@ typedef cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener > BibGe class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage { + VclGrid* pGrid; + VclScrolledWindow* pScrolledWindow; + FixedText* pIdentifierFT; FixedText* pAuthTypeFT; FixedText* pYearFT; @@ -86,18 +90,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage FixedText* pCustom4FT; FixedText* pCustom5FT; - ScrollBar aHoriScroll; - ScrollBar aVertScroll; - FixedText* aFixedTexts[ FIELD_COUNT ]; sal_Int16 nFT2CtrlMap[ FIELD_COUNT ]; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > aControls[ FIELD_COUNT ]; - Size aStdSize; - Point aBasePos; - OUString aBibTypeArr[ TYPE_COUNT ]; OUString sErrorPrefix; OUString sTableErrorString; @@ -120,19 +118,14 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage BibDataManager* pDatMan; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - AddXControl( const OUString& rName, Point aPos, Size aSize, const OString& sHelpId, - sal_Int16& rIndex ); - - void AddControlWithError( const OUString& rColumnName, const Point& rPos, - const Size& rSize, OUString& rErrorString, const OUString& aColumnUIName, - const OString& sHelpId, sal_uInt16 nIndexInFTArray ); - - void AdjustScrollbars(); + AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId, + sal_Int16& rIndex, std::vector<Window*>& rChildren ); - DECL_LINK( ScrollHdl, ScrollBar* ); + void AddControlWithError( const OUString& rColumnName, FixedText& rLabel, + OUString& rErrorString, + const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<Window*>& rChildren ); protected: - virtual void Resize() SAL_OVERRIDE; void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts public: |