summaryrefslogtreecommitdiff
path: root/cui/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/inc')
-rw-r--r--cui/source/inc/cuitabarea.hxx98
-rw-r--r--cui/source/inc/cuitabline.hxx57
-rw-r--r--cui/source/inc/sdrcelldlg.hxx14
-rw-r--r--cui/source/inc/treeopt.hxx7
4 files changed, 80 insertions, 96 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index a7ce897d3f06..6bec35fa33e1 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -39,14 +39,14 @@ class SvxAreaTabDialog : public SfxTabDialog
private:
SdrModel* mpDrawModel;
- XColorList* mpColorTab;
- XColorList* mpNewColorTab;
- XGradientList* mpGradientList;
- XGradientList* mpNewGradientList;
- XHatchList* mpHatchingList;
- XHatchList* mpNewHatchingList;
- XBitmapList* mpBitmapList;
- XBitmapList* mpNewBitmapList;
+ XColorListRef mpColorTab;
+ XColorListRef mpNewColorTab;
+ XGradientListRef mpGradientList;
+ XGradientListRef mpNewGradientList;
+ XHatchListRef mpHatchingList;
+ XHatchListRef mpNewHatchingList;
+ XBitmapListRef mpBitmapList;
+ XBitmapListRef mpNewBitmapList;
const SfxItemSet& mrOutAttrs;
@@ -59,7 +59,6 @@ private:
sal_uInt16 mnDlgType;
sal_uInt16 mnPos;
sal_Bool mbAreaTP;
- sal_Bool mbDeleteColorTable;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
@@ -76,29 +75,27 @@ public:
const SdrView* pSdrView = NULL );
~SvxAreaTabDialog();
- void SetNewColorTable( XColorList* pColTab )
+ void SetNewColorTable( XColorListRef pColTab )
{ mpNewColorTab = pColTab; }
- XColorList* GetNewColorTable() const { return mpNewColorTab; }
- const XColorList* GetColorTable() const { return mpColorTab; }
+ XColorListRef GetNewColorTable() const { return mpNewColorTab; }
+ const XColorListRef GetColorList() const { return mpColorTab; }
- void SetNewGradientList( XGradientList* pGrdLst)
+ void SetNewGradientList( XGradientListRef pGrdLst)
{ mpNewGradientList = pGrdLst; }
- XGradientList* GetNewGradientList() const
+ XGradientListRef GetNewGradientList() const
{ return mpNewGradientList; }
- const XGradientList* GetGradientList() const { return mpGradientList; }
+ const XGradientListRef GetGradientList() const { return mpGradientList; }
- void SetNewHatchingList( XHatchList* pHtchLst)
+ void SetNewHatchingList( XHatchListRef pHtchLst)
{ mpNewHatchingList = pHtchLst; }
- XHatchList* GetNewHatchingList() const
+ XHatchListRef GetNewHatchingList() const
{ return mpNewHatchingList; }
- const XHatchList* GetHatchingList() const { return mpHatchingList; }
+ const XHatchListRef GetHatchingList() const { return mpHatchingList; }
- void SetNewBitmapList( XBitmapList* pBmpLst)
+ void SetNewBitmapList( XBitmapListRef pBmpLst)
{ mpNewBitmapList = pBmpLst; }
- XBitmapList* GetNewBitmapList() const { return mpNewBitmapList; }
- const XBitmapList* GetBitmapList() const { return mpBitmapList; }
-
- void DontDeleteColorTable() { mbDeleteColorTable = sal_False; }
+ XBitmapListRef GetNewBitmapList() const { return mpNewBitmapList; }
+ const XBitmapListRef GetBitmapList() const { return mpBitmapList; }
};
/************************************************************************/
@@ -231,10 +228,10 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorList* pColorTab;
- XGradientList* pGradientList;
- XHatchList* pHatchingList;
- XBitmapList* pBitmapList;
+ XColorListRef pColorTab;
+ XGradientListRef pGradientList;
+ XHatchListRef pHatchingList;
+ XBitmapListRef pBitmapList;
ChangeType* pnColorTableState;
ChangeType* pnBitmapListState;
@@ -286,12 +283,12 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
- void SetGradientList( XGradientList* pGrdLst)
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
+ void SetGradientList( XGradientListRef pGrdLst)
{ pGradientList = pGrdLst; }
- void SetHatchingList( XHatchList* pHtchLst)
+ void SetHatchingList( XHatchListRef pHtchLst)
{ pHatchingList = pHtchLst; }
- void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
+ void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
@@ -326,7 +323,7 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorList* pColorTab;
+ XColorListRef pColorTab;
ChangeType* pnColorTableState;
sal_uInt16 nPageType;
sal_uInt16 nDlgType;
@@ -358,7 +355,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
@@ -402,8 +399,8 @@ private:
const SfxItemSet& rOutAttrs;
- XColorList* pColorTab;
- XGradientList* pGradientList;
+ XColorListRef pColorTab;
+ XGradientListRef pGradientList;
ChangeType* pnGradientListState;
ChangeType* pnColorTableState;
@@ -443,8 +440,8 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
- void SetGradientList( XGradientList* pGrdLst)
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
+ void SetGradientList( XGradientListRef pGrdLst)
{ pGradientList = pGrdLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
@@ -485,8 +482,8 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorList* pColorTab;
- XHatchList* pHatchingList;
+ XColorListRef pColorTab;
+ XHatchListRef pHatchingList;
ChangeType* pnHatchingListState;
ChangeType* pnColorTableState;
@@ -529,8 +526,8 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
- void SetHatchingList( XHatchList* pHtchLst)
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
+ void SetHatchingList( XHatchListRef pHtchLst)
{ pHatchingList = pHtchLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
@@ -573,8 +570,8 @@ private:
const SfxItemSet& rOutAttrs;
- XColorList* pColorTab;
- XBitmapList* pBitmapList;
+ XColorListRef pColorTab;
+ XBitmapListRef pBitmapList;
ChangeType* pnBitmapListState;
ChangeType* pnColorTableState;
@@ -619,8 +616,8 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
- void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
+ void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
@@ -651,7 +648,7 @@ public: // FIXME: privatise these members ...
ImageButton aBtnSave;
SvxLoadSaveEmbed( Window *pParent, const ResId &aLoad,
const ResId &aSave, const ResId &aEmbed );
- XPropertyList *GetList();
+ XPropertyListRef GetList();
void HideLoadSaveEmbed();
bool GetEmbed();
void SetEmbed( bool bEmbed );
@@ -672,7 +669,7 @@ private:
ColorLB aLbColor;
FixedText aTableNameFT;
- ValueSet aValSetColorTable;
+ ValueSet aValSetColorList;
SvxXRectPreview aCtlPreviewOld;
SvxXRectPreview aCtlPreviewNew;
@@ -695,14 +692,13 @@ private:
const SfxItemSet& rOutAttrs;
- XColorList* pColorTab;
+ XColorListRef pColorTab;
ChangeType* pnColorTableState;
sal_uInt16* pPageType;
sal_uInt16* pDlgType;
sal_uInt16* pPos;
sal_Bool* pbAreaTP;
- sal_Bool bDeleteColorTable;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -751,7 +747,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
@@ -760,8 +756,6 @@ public:
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
- void SetDeleteColorTable( sal_Bool bIn ) { bDeleteColorTable = bIn; }
-
virtual void FillUserData();
};
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 31481a571114..8d8d456f7020 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -30,13 +30,7 @@
// include ---------------------------------------------------------------
#include <vector>
-
#include <svx/tabline.hxx>
-/*************************************************************************
-|*
-|* Transform-Tab-Dialog
-|*
-\************************************************************************/
class SvxLineTabDialog : public SfxTabDialog
{
@@ -46,12 +40,12 @@ private:
const SfxItemSet& rOutAttrs;
- XColorList* pColorTab;
- XColorList* mpNewColorTab;
- XDashList* pDashList;
- XDashList* pNewDashList;
- XLineEndList* pLineEndList;
- XLineEndList* pNewLineEndList;
+ XColorListRef pColorTab;
+ XColorListRef mpNewColorTab;
+ XDashListRef pDashList;
+ XDashListRef pNewDashList;
+ XLineEndListRef pLineEndList;
+ XLineEndListRef pNewLineEndList;
sal_Bool bObjSelected;
ChangeType nLineEndListState;
@@ -64,7 +58,6 @@ private:
sal_uInt16 nPosLineEndLb;
sal_uInt16 mnPos;
sal_Bool mbAreaTP;
- sal_Bool mbDeleteColorTable;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
@@ -81,19 +74,19 @@ public:
sal_Bool bHasObj = sal_True );
~SvxLineTabDialog();
- void SetNewDashList( XDashList* pInLst)
+ void SetNewDashList( XDashListRef pInLst)
{ pNewDashList = pInLst; }
- XDashList* GetNewDashList() const { return pNewDashList; }
- const XDashList* GetDashList() const { return pDashList; }
+ XDashListRef GetNewDashList() const { return pNewDashList; }
+ XDashListRef GetDashList() const { return pDashList; }
- void SetNewLineEndList( XLineEndList* pInLst)
+ void SetNewLineEndList( XLineEndListRef pInLst)
{ pNewLineEndList = pInLst; }
- XLineEndList* GetNewLineEndList() const { return pNewLineEndList; }
- const XLineEndList* GetLineEndList() const { return pLineEndList; }
+ XLineEndListRef GetNewLineEndList() const { return pNewLineEndList; }
+ XLineEndListRef GetLineEndList() const { return pLineEndList; }
- void SetNewColorTable( XColorList* pColTab ) { mpNewColorTab = pColTab; }
- XColorList* GetNewColorTable() const { return mpNewColorTab; }
- const XColorList* GetColorTable() const { return pColorTab; }
+ void SetNewColorTable( XColorListRef pColTab ) { mpNewColorTab = pColTab; }
+ XColorListRef GetNewColorTable() const { return mpNewColorTab; }
+ XColorListRef GetColorList() const { return pColorTab; }
};
/*************************************************************************
@@ -172,9 +165,9 @@ private:
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
- XColorList* pColorTab;
- XDashList* pDashList;
- XLineEndList* pLineEndList;
+ XColorListRef pColorTab;
+ XDashListRef pDashList;
+ XLineEndListRef pLineEndList;
ChangeType* pnLineEndListState;
ChangeType* pnDashListState;
@@ -232,9 +225,9 @@ public:
virtual void FillUserData();
- void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; }
- void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
- void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
+ void SetColorList( XColorListRef pColTab ) { pColorTab = pColTab; }
+ void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; }
+ void SetLineEndList( XLineEndListRef pLneEndLst) { pLineEndList = pLneEndLst; }
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
@@ -295,7 +288,7 @@ private:
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
- XDashList* pDashList;
+ XDashListRef pDashList;
ChangeType* pnDashListState;
sal_uInt16* pPageType;
@@ -336,7 +329,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
+ void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; }
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
@@ -384,7 +377,7 @@ private:
XLineAttrSetItem aXLineAttr;
SfxItemSet& rXLSet;
- XLineEndList* pLineEndList;
+ XLineEndListRef pLineEndList;
ChangeType* pnLineEndListState;
sal_uInt16* pPageType;
@@ -416,7 +409,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
- void SetLineEndList( XLineEndList* pInList ) { pLineEndList = pInList; }
+ void SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; }
void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; }
void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index 5760c58c8b6e..3714d3c59b51 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -31,22 +31,18 @@
#include <sfx2/tabdlg.hxx>
+#include <svx/xtable.hxx>
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
class SdrModel;
-
class SvxFormatCellsDialog : public SfxTabDialog
{
private:
const SfxItemSet& mrOutAttrs;
- XColorList* mpColorTab;
- XGradientList* mpGradientList;
- XHatchList* mpHatchingList;
- XBitmapList* mpBitmapList;
+ XColorListRef mpColorTab;
+ XGradientListRef mpGradientList;
+ XHatchListRef mpHatchingList;
+ XBitmapListRef mpBitmapList;
protected:
virtual void Apply();
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 178786e0be4a..a5b7fd312848 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -34,6 +34,7 @@
#include <vcl/image.hxx>
#include <vcl/fixbrd.hxx>
#include <vcl/fixed.hxx>
+#include <svx/xtable.hxx>
#include <vector>
@@ -200,7 +201,7 @@ private:
// for the ColorTabPage
SfxItemSet* pColorPageItemSet;
- XColorList* pColorTab;
+ XColorListRef pColorList;
sal_uInt16 nChangeType;
sal_uInt16 nUnknownType;
sal_uInt16 nUnknownPos;
@@ -271,8 +272,8 @@ public:
void ActivatePage( const String& rPageURL );
void ApplyItemSets();
- sal_uInt16 GetColorChanged() const { return nChangeType; }
- XColorList* GetColorTable() { return pColorTab; }
+ sal_uInt16 GetColorChanged() const { return nChangeType; }
+ XColorListRef GetColorList() { return pColorList; }
// helper functions to call the language settings TabPage from the SpellDialog
static void ApplyLanguageOptions(const SfxItemSet& rSet);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 06:02:55 +0000