diff options
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/backgrnd.hxx | 16 | ||||
-rw-r--r-- | cui/source/inc/cuires.hrc | 1 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 32 |
3 files changed, 25 insertions, 24 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index bd247f38587c..bebea499e75f 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -32,8 +32,6 @@ struct SvxBackgroundTable_Impl; struct SvxBackgroundPara_Impl; struct SvxBackgroundPage_Impl; class SvxBrushItem; -class XFillStyleItem; -class XFillGradientItem; /** class SvxBackgroundTabPage -------------------------------------------- @@ -87,17 +85,6 @@ private: MetricField* m_pColTransMF; CheckBox* m_pBtnPreview; - // Gradient controls - VclFrame* m_pBackGroundGradientFrame; - GradientLB* m_pLbGradients; - SvxXRectPreview* m_pCtlPreview; - - // Gradient data - XGradientListRef m_pGradientList; - SfxItemPool* m_pXPool; - XFillAttrSetItem m_aXFillAttr; - SfxItemSet& m_rXFillSet; - // Background Bitmap ---------------------------------- VclContainer* m_pBitmapContainer; VclContainer* m_pFileFrame; @@ -141,8 +128,6 @@ private: void HideColorUI_Impl(); void ShowBitmapUI_Impl(); void HideBitmapUI_Impl(); - void ShowGradientUI_Impl(); - void HideGradientUI_Impl(); sal_Bool LoadLinkedGraphic_Impl(); void RaiseLoadError_Impl(); void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); @@ -160,7 +145,6 @@ private: DECL_LINK(BackgroundColorHdl_Impl, void *); DECL_LINK( TblDestinationHdl_Impl, ListBox* ); DECL_LINK( ParaDestinationHdl_Impl, ListBox* ); - DECL_LINK(ModifyGradientHdl_Impl, void *); }; #endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index ffad575ca114..6d2df8771b85 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -42,6 +42,7 @@ // used in "tabpages" #define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) #define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) +#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230) #define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) #define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 6ae9dbc37a68..a5c1a49a6b6d 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -75,10 +75,7 @@ protected: void SavePalettes(); public: - SvxAreaTabDialog( Window* pParent, - const SfxItemSet* pAttr, - SdrModel* pModel, - const SdrView* pSdrView = NULL ); + SvxAreaTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); ~SvxAreaTabDialog(); void SetNewColorList( XColorListRef pColTab ) @@ -114,8 +111,8 @@ class SvxTransparenceTabPage : public SvxTabPage const SfxItemSet& rOutAttrs; RECT_POINT eRP; - sal_uInt16 nPageType; - sal_uInt16 nDlgType; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; // main selection RadioButton* m_pRbtTransOff; @@ -238,6 +235,13 @@ private: XHatchListRef pHatchingList; XBitmapListRef pBitmapList; + // Placeholders for pointer-based entries; these will be inited + // to point to these so that the page is usable without that + // SvxAreaTabDialog has to call the setter methods (e.g. SetColorChgd). + // Without that the pages used in SvxAreaTabDialog are not usable + ChangeType maFixed_ChangeType; + sal_Bool maFixed_sal_Bool; + ChangeType* pnColorListState; ChangeType* pnBitmapListState; ChangeType* pnGradientListState; @@ -247,7 +251,7 @@ private: sal_uInt16 nDlgType; sal_Int32 nPos; - sal_Bool* pbAreaTP; + sal_Bool* pbAreaTP; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -256,6 +260,14 @@ private: SfxMapUnit ePoolUnit; FieldUnit eFUnit; + //UUUU + bool mbOfferImportButton; + bool mbPositionsAdapted; + bool mbDirectGraphicSet; + Graphic maDirectGraphic; + OUString maDirectName; + PushButton* m_pBtnImport; + DECL_LINK(SelectDialogTypeHdl_Impl, void *); DECL_LINK( ModifyColorHdl_Impl, void * ); DECL_LINK( ModifyHatchBckgrdColorHdl_Impl, void * ); @@ -264,6 +276,10 @@ private: DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * ); DECL_LINK( ModifyBitmapHdl_Impl, void * ); DECL_LINK( ModifyStepCountHdl_Impl, void * ); + + //UUUU + DECL_LINK( ClickImportHdl_Impl, void * ); + DECL_LINK( ModifyTileHdl_Impl, void * ); DECL_LINK( ClickScaleHdl_Impl, void * ); void ClickInvisibleHdl_Impl(); @@ -273,7 +289,7 @@ private: void ClickBitmapHdl_Impl(); public: - SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); |