@@ -46,7 +46,7 @@ class SvxAreaTabDialog : public SfxTabDialog
4646 sal_uInt16 m_nColorTabPage;
4747 sal_uInt16 m_nGradientTabPage;
4848 sal_uInt16 m_nHatchTabPage;
49- // sal_uInt16 m_nBitmapTabPage;
49+ sal_uInt16 m_nBitmapTabPage;
5050 sal_uInt16 m_nPatternTabPage;
5151
5252private:
@@ -553,6 +553,65 @@ public:
553553
554554/* ***********************************************************************/
555555
556+ class SvxBitmapTabPage : public SvxTabPage
557+ {
558+ using TabPage::ActivatePage;
559+ using TabPage::DeactivatePage;
560+ private:
561+
562+ VclPtr<SvxPresetListBox> m_pBitmapLB;
563+ VclPtr<PushButton> m_pBtnImport;
564+ VclPtr<SvxXRectPreview> m_pCtlBitmapPreview;
565+
566+ const SfxItemSet& m_rOutAttrs;
567+
568+ XBitmapListRef m_pBitmapList;
569+ ChangeType* m_pnBitmapListState;
570+ XFillStyleItem m_aXFStyleItem;
571+ XFillBitmapItem m_aXBitmapItem;
572+
573+ sal_uInt16* m_nPageType;
574+ sal_uInt16 m_nDlgType;
575+ sal_Int32* m_nPos;
576+
577+ bool * m_pbAreaTP;
578+
579+ XFillAttrSetItem m_aXFillAttr;
580+ SfxItemSet& m_rXFSet;
581+
582+ DECL_LINK_TYPED ( ModifyBitmapHdl, ValueSet*, void );
583+ DECL_LINK_TYPED ( ClickRenameHdl, SvxPresetListBox*, void );
584+ DECL_LINK_TYPED ( ClickDeleteHdl, SvxPresetListBox*, void );
585+ DECL_LINK_TYPED ( ClickImportHdl, Button*, void );
586+ void ClickBitmapHdl_Impl ();
587+ sal_Int32 SearchBitmapList (const OUString& rBitmapName);
588+
589+ public:
590+ SvxBitmapTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs );
591+ virtual ~SvxBitmapTabPage ();
592+ virtual void dispose () override ;
593+
594+ void Construct ();
595+
596+ static VclPtr<SfxTabPage> Create ( vcl::Window*, const SfxItemSet* );
597+
598+ virtual bool FillItemSet ( SfxItemSet* ) override ;
599+ virtual void Reset ( const SfxItemSet * ) override ;
600+ virtual void ActivatePage ( const SfxItemSet& rSet ) override ;
601+ virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override ;
602+ virtual void PointChanged ( vcl::Window* pWindow, RECT_POINT eRP ) override ;
603+
604+ void SetBitmapList ( XBitmapListRef pBmpLst) { m_pBitmapList = pBmpLst; }
605+
606+ void SetPageType ( sal_uInt16* pInType ) { m_nPageType = pInType; }
607+ void SetDlgType ( sal_uInt16 nInType ) { m_nDlgType = nInType; }
608+ void SetPos ( sal_Int32* pInPos ) { m_nPos = pInPos; }
609+ void SetAreaTP ( bool * pIn ) { m_pbAreaTP = pIn; }
610+ void SetBmpChgd ( ChangeType* pIn ) { m_pnBitmapListState = pIn; }
611+ };
612+
613+ /* ***********************************************************************/
614+
556615class SvxPatternTabPage : public SvxTabPage
557616{
558617 using TabPage::ActivatePage;
0 commit comments