diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/inc/border.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 34 | ||||
-rw-r--r-- | cui/source/inc/cuitabline.hxx | 14 | ||||
-rw-r--r-- | cui/source/inc/sdrcelldlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/treeopt.hxx | 6 | ||||
-rw-r--r-- | cui/source/options/optchart.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optchart.hxx | 4 | ||||
-rw-r--r-- | cui/source/options/optcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/border.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 30 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 7 |
18 files changed, 82 insertions, 80 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index a9e634a1e22c..f0c6a0dd888a 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -37,7 +37,6 @@ // forward --------------------------------------------------------------- class SvxBorderLine; -class XColorTable; #include <svx/flagsdef.hxx> diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index e9d66bb36f7b..224b667f2d09 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -39,8 +39,8 @@ private: SdrModel* mpDrawModel; // const SdrView* mpView; - XColorTable* mpColorTab; - XColorTable* mpNewColorTab; + XColorList* mpColorTab; + XColorList* mpNewColorTab; XGradientList* mpGradientList; XGradientList* mpNewGradientList; XHatchList* mpHatchingList; @@ -76,10 +76,10 @@ public: const SdrView* pSdrView = NULL ); ~SvxAreaTabDialog(); - void SetNewColorTable( XColorTable* pColTab ) + void SetNewColorTable( XColorList* pColTab ) { mpNewColorTab = pColTab; } - XColorTable* GetNewColorTable() const { return mpNewColorTab; } - const XColorTable* GetColorTable() const { return mpColorTab; } + XColorList* GetNewColorTable() const { return mpNewColorTab; } + const XColorList* GetColorTable() const { return mpColorTab; } void SetNewGradientList( XGradientList* pGrdLst) { mpNewGradientList = pGrdLst; } @@ -243,7 +243,7 @@ private: const SfxItemSet& rOutAttrs; RECT_POINT eRP; - XColorTable* pColorTab; + XColorList* pColorTab; XGradientList* pGradientList; XHatchList* pHatchingList; XBitmapList* pBitmapList; @@ -302,7 +302,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet ); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } void SetGradientList( XGradientList* pGrdLst) { pGradientList = pGrdLst; } void SetHatchingList( XHatchList* pHtchLst) @@ -350,7 +350,7 @@ private: const SfxItemSet& rOutAttrs; RECT_POINT eRP; - XColorTable* pColorTab; + XColorList* pColorTab; ChangeType* pnColorTableState; sal_uInt16 nPageType; //add CHINA001 sal_uInt16 nDlgType; //add CHINA001 @@ -382,7 +382,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet ); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } //CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } //CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001 @@ -432,7 +432,7 @@ private: const SfxItemSet& rOutAttrs; - XColorTable* pColorTab; + XColorList* pColorTab; XGradientList* pGradientList; ChangeType* pnGradientListState; @@ -473,7 +473,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } void SetGradientList( XGradientList* pGrdLst) { pGradientList = pGrdLst; } @@ -519,7 +519,7 @@ private: const SfxItemSet& rOutAttrs; RECT_POINT eRP; - XColorTable* pColorTab; + XColorList* pColorTab; XHatchList* pHatchingList; ChangeType* pnHatchingListState; @@ -563,7 +563,7 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } void SetHatchingList( XHatchList* pHtchLst) { pHatchingList = pHtchLst; } @@ -611,7 +611,7 @@ private: const SfxItemSet& rOutAttrs; - XColorTable* pColorTab; + XColorList* pColorTab; XBitmapList* pBitmapList; ChangeType* pnBitmapListState; @@ -657,7 +657,7 @@ public: virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; } void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } @@ -723,7 +723,7 @@ private: const SfxItemSet& rOutAttrs; - XColorTable* pColorTab; + XColorList* pColorTab; ChangeType* pnColorTableState; sal_uInt16* pPageType; @@ -779,7 +779,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; } diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 828dd7527196..163418cc3cec 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -39,8 +39,8 @@ private: const SfxItemSet& rOutAttrs; - XColorTable* pColorTab; - XColorTable* mpNewColorTab; + XColorList* pColorTab; + XColorList* mpNewColorTab; XDashList* pDashList; XDashList* pNewDashList; XLineEndList* pLineEndList; @@ -84,9 +84,9 @@ public: XLineEndList* GetNewLineEndList() const { return pNewLineEndList; } const XLineEndList* GetLineEndList() const { return pLineEndList; } - void SetNewColorTable( XColorTable* pColTab ) { mpNewColorTab = pColTab; } - XColorTable* GetNewColorTable() const { return mpNewColorTab; } - const XColorTable* GetColorTable() const { return pColorTab; } + void SetNewColorTable( XColorList* pColTab ) { mpNewColorTab = pColTab; } + XColorList* GetNewColorTable() const { return mpNewColorTab; } + const XColorList* GetColorTable() const { return pColorTab; } }; /************************************************************************* @@ -166,7 +166,7 @@ private: XLineAttrSetItem aXLineAttr; SfxItemSet& rXLSet; - XColorTable* pColorTab; + XColorList* pColorTab; XDashList* pDashList; XLineEndList* pLineEndList; @@ -231,7 +231,7 @@ public: virtual void FillUserData(); - void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; } + void SetColorTable( XColorList* pColTab ) { pColorTab = pColTab; } void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; } void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; } void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index 2c740da184ba..fd17127ab3d4 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -27,7 +27,7 @@ #include <sfx2/tabdlg.hxx> -class XColorTable; +class XColorList; class XGradientList; class XHatchList; class XBitmapList; @@ -38,7 +38,7 @@ class SvxFormatCellsDialog : public SfxTabDialog private: const SfxItemSet& mrOutAttrs; - XColorTable* mpColorTab; + XColorList* mpColorTab; XGradientList* mpGradientList; XHatchList* mpHatchingList; XBitmapList* mpBitmapList; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 6274fe2b70c5..ae85d9456204 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -43,7 +43,7 @@ CreateTabPage GetSSOCreator( void ); class SfxModule; class SfxShell; class SfxItemSet; -class XColorTable; +class XColorList; class OfaOptionsTreeListBox : public SvTreeListBox { using SvListView::Collapse; @@ -197,7 +197,7 @@ private: // for the ColorTabPage SfxItemSet* pColorPageItemSet; - XColorTable* pColorTab; + XColorList* pColorTab; sal_uInt16 nChangeType; sal_uInt16 nUnknownType; sal_uInt16 nUnknownPos; @@ -269,7 +269,7 @@ public: void ApplyItemSets(); sal_uInt16 GetColorChanged() const { return nChangeType; } - XColorTable* GetColorTable() { return pColorTab; } + XColorList* GetColorTable() { return pColorTab; } // helper functions to call the language settings TabPage from the SpellDialog static void ApplyLanguageOptions(const SfxItemSet& rSet); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 1d29a272a08c..d920d5267d61 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -73,7 +73,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe aValSetColorBox.Show(); pChartOptions = new SvxChartOptions; - pColorTab = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTab = new XColorList( SvtPathOptions().GetPalettePath() ); const SfxPoolItem* pItem = NULL; if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET ) @@ -159,7 +159,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) { pColorEntry = pColorTab->GetColor( i ); if( pColorEntry && pColorEntry->GetColor() == rCol ) - return SAL_STATIC_CAST( XPropertyTable*, pColorTab )->Get( pColorEntry->GetName() ); + return SAL_STATIC_CAST( XPropertyList*, pColorTab )->Get( pColorEntry->GetName() ); } } return -1L; diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 300ad6c93294..54b01d0f218a 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -35,7 +35,7 @@ #ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> #endif -// header for XColorTable +// header for XColorList #include <svx/xtable.hxx> #include "cfgchart.hxx" @@ -61,7 +61,7 @@ private: SvxChartOptions* pChartOptions; SvxChartColorTableItem* pColorConfig; - XColorTable* pColorTab; + XColorList* pColorTab; DECL_LINK( ResetToDefaults, void * ); DECL_LINK( ListClickedHdl, ChartColorLB * ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index c84c2f7e1ab2..733322821399 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -945,7 +945,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe } } - XColorTable aColorTable( SvtPathOptions().GetPalettePath() ); + XColorList aColorTable( SvtPathOptions().GetPalettePath() ); aColorBoxes[0]->InsertAutomaticEntry(); for( sal_Int32 i = 0; i < aColorTable.Count(); i++ ) { diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 074e5d5f6c2e..ab0ad2fbc810 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1205,7 +1205,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) if ( SfxViewFrame::Current() && SfxViewFrame::Current()->GetDispatcher() ) pPtr = (const OfaPtrItem*)SfxViewFrame::Current()-> GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON ); - pColorTab = pPtr ? (XColorTable*)pPtr->GetValue() : XColorTable::GetStdColorTable(); + pColorTab = pPtr ? (XColorList*)pPtr->GetValue() : XColorList::GetStdColorList(); rColPage.SetColorTable( pColorTab ); rColPage.SetPageType( &nUnknownType ); @@ -2640,7 +2640,7 @@ short OfaTreeOptionsDialog::Execute() const OfaPtrItem* pPtr = (const OfaPtrItem*)SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GET_COLORTABLE, SFX_CALLMODE_SYNCHRON ); if( pPtr ) { - XColorTable* _pColorTab = (XColorTable*)pPtr->GetValue(); + XColorList* _pColorTab = (XColorList*)pPtr->GetValue(); if( _pColorTab && _pColorTab->GetPath() == GetColorTable()->GetPath() && diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 938ae0868580..f84bc459ea6c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1194,7 +1194,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; const Size aSize15x15 = Size( 15, 15 ); FASTBOOL bOwn = sal_False; @@ -1204,7 +1204,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() if ( !pColorTable ) { bOwn = sal_True; - pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTable = new XColorList( SvtPathOptions().GetPalettePath() ); } if ( pColorTable ) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 578f29deac8f..cac29eddbe52 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -38,7 +38,7 @@ #define LINESTYLE_HTML_MAX 5 -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorList #include <svx/drawitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/shaditem.hxx> @@ -335,10 +335,10 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, FillValueSets(); FillLineListBox_Impl(); - // ColorBox aus der XColorTable fuellen. + // ColorBox aus der XColorList fuellen. SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; DBG_ASSERT( pDocSh, "DocShell not found!" ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 50ce94bd633d..18bc03872773 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -46,7 +46,7 @@ #include <cuires.hrc> #include "chardlg.hrc" -#include <svx/xtable.hxx> // XColorTable +#include <svx/xtable.hxx> // XColorList #include "chardlg.hxx" #include "editeng/fontitem.hxx" #include <editeng/postitem.hxx> @@ -715,7 +715,7 @@ void SvxCharNamePage::Initialize() // fill the color box SfxObjectShell* pDocSh = SfxObjectShell::Current(); //DBG_ASSERT( pDocSh, "DocShell not found!" ); - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; FASTBOOL bKillTable = sal_False; const SfxPoolItem* pItem = NULL; @@ -728,7 +728,7 @@ void SvxCharNamePage::Initialize() if ( !pColorTable ) { - pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTable = new XColorList( SvtPathOptions().GetPalettePath() ); bKillTable = sal_True; } @@ -1787,7 +1787,7 @@ void SvxCharEffectsPage::Initialize() // fill the color box SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; FASTBOOL bKillTable = sal_False; if ( pDocSh ) @@ -1799,7 +1799,7 @@ void SvxCharEffectsPage::Initialize() if ( !pColorTable ) { - pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTable = new XColorList( SvtPathOptions().GetPalettePath() ); bKillTable = sal_True; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9e9219c24acd..f6d63fe6a17a 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1609,7 +1609,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); - XColorTable* pColorTable = NULL; + XColorList* pColorTable = NULL; FASTBOOL bKillTable = sal_False; if ( pDocSh ) { @@ -1620,7 +1620,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if ( !pColorTable ) { - pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); + pColorTable = new XColorList( SvtPathOptions().GetPalettePath() ); bKillTable = sal_True; } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index d67c513c97e6..65a7c9ae8132 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -593,8 +593,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pEntry ) { pBitmapList->Insert( pEntry ); - - aLbBitmaps.Append( pEntry ); + const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight()); + aLbBitmaps.Append(aUiSize, *pEntry ); aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 ); #ifdef WNT @@ -701,7 +701,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) XBitmapEntry* pEntry = new XBitmapEntry( aGraphic, aName ); pBitmapList->Insert( pEntry ); - aLbBitmaps.Append( pEntry ); + const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight()); + aLbBitmaps.Append(aUiSize, *pEntry ); aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 ); #ifdef WNT @@ -756,6 +757,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) long nCount = pBitmapList->Count(); sal_Bool bDifferent = sal_False; sal_Bool bLoop = sal_True; + const Size aUiSize(pBitmapList->getUiBitmapWidth(), pBitmapList->getUiBitmapHeight()); while( bLoop && pDlg->Execute() == RET_OK ) { @@ -780,7 +782,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) pEntry->SetGraphicObject(Graphic(aBitmapEx)); - aLbBitmaps.Modify( pEntry, nPos ); + aLbBitmaps.Modify( aUiSize, *pEntry, nPos ); aLbBitmaps.SelectEntryPos( nPos ); // Flag fuer modifiziert setzen diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 326ec9b6e5be..1928e2333b2b 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -524,7 +524,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) ConvertColorValues (aAktuellColor, CM_RGB); pEntry = new XColorEntry( aAktuellColor, aName ); - pColorTab->Insert( pColorTab->Count(), pEntry ); + pColorTab->Insert( pEntry, pColorTab->Count() ); aLbColor.Append( pEntry ); aValSetColorTable.InsertItem( aValSetColorTable.GetItemCount() + 1, @@ -643,7 +643,7 @@ IMPL_LINK( SvxColorTabPage, ClickWorkOnHdl_Impl, void *, EMPTYARG ) ConvertColorValues (aTmpColor, CM_RGB); pColorDlg->SetColor (aTmpColor); - pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
+ pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY ); if( pColorDlg->Execute() == RET_OK ) { @@ -698,7 +698,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG ) { pEntry = pColorTab->Remove( i + 1 ); DBG_ASSERT( pEntry, "ColorEntry nicht vorhanden (2) !" ); - pColorTab->Insert( i, pEntry ); + pColorTab->Insert( pEntry, i ); } // Listbox und ValueSet aktualisieren @@ -765,14 +765,14 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) aPathURL.removeFinalSlash(); // Tabelle speichern - XColorTable* pColTab = new XColorTable( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool ); + XColorList* pColTab = new XColorList( aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool ); pColTab->SetName( aURL.getName() ); // XXX if( pColTab->Load() ) { if( pColTab ) { // Pruefen, ob Tabelle geloescht werden darf: - const XColorTable *pTempTable = 0; + const XColorList *pTempTable = 0; SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); if( pArea ) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index a78837113a1d..b6efd27812c1 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -301,7 +301,7 @@ void SvxLineTabPage::FillListboxes() { // Linienstile sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos(); - aLbLineStyle.FillStyles(); + // aLbLineStyle.FillStyles(); aLbLineStyle.Fill( pDashList ); aLbLineStyle.SelectEntryPos( nOldSelect ); @@ -728,22 +728,22 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { case 0: // Rounded, default { - pNew = new XLineJointItem(XLINEJOINT_ROUND); + pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_ROUND); break; } case 1: // - none - { - pNew = new XLineJointItem(XLINEJOINT_NONE); + pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_NONE); break; } case 2: // Miter { - pNew = new XLineJointItem(XLINEJOINT_MITER); + pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_MITER); break; } case 3: // Bevel { - pNew = new XLineJointItem(XLINEJOINT_BEVEL); + pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL); break; } } @@ -895,22 +895,22 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl() { case 0: // Rounded, default { - rXLSet.Put(XLineJointItem(XLINEJOINT_ROUND)); + rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND)); break; } case 1: // - none - { - rXLSet.Put(XLineJointItem(XLINEJOINT_NONE)); + rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE)); break; } case 2: // Miter { - rXLSet.Put(XLineJointItem(XLINEJOINT_MITER)); + rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER)); break; } case 3: // Bevel { - rXLSet.Put(XLineJointItem(XLINEJOINT_BEVEL)); + rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL)); break; } } @@ -1344,15 +1344,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINEJOINT)) { - XLineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue(); + const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue(); switch(eLineJoint) { - case XLINEJOINT_ROUND : maLBEdgeStyle.SelectEntryPos(0); break; - case XLINEJOINT_NONE : maLBEdgeStyle.SelectEntryPos(1); break; - case XLINEJOINT_MITER : maLBEdgeStyle.SelectEntryPos(2); break; - case XLINEJOINT_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break; - case XLINEJOINT_MIDDLE : break; + case com::sun::star::drawing::LineJoint_MIDDLE : // fallback to round, unused value + case com::sun::star::drawing::LineJoint_ROUND : maLBEdgeStyle.SelectEntryPos(0); break; + case com::sun::star::drawing::LineJoint_NONE : maLBEdgeStyle.SelectEntryPos(1); break; + case com::sun::star::drawing::LineJoint_MITER : maLBEdgeStyle.SelectEntryPos(2); break; + case com::sun::star::drawing::LineJoint_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break; } } else diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index a9116e88e3f3..4a5adb6e2bea 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -626,8 +626,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) long nDashCount = pDashList->Count(); pDashList->Insert( pEntry, nDashCount ); - Bitmap* pBitmap = pDashList->GetBitmap( nDashCount ); - aLbLineStyles.Append( pEntry, pBitmap ); + const Bitmap aBitmap = pDashList->GetUiBitmap( nDashCount ); + aLbLineStyles.Append( pEntry, &aBitmap ); aLbLineStyles.SelectEntryPos( aLbLineStyles.GetEntryCount() - 1 ); @@ -707,8 +707,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) XDashEntry* pEntry = new XDashEntry( aDash, aName ); delete pDashList->Replace( pEntry, nPos ); - Bitmap* pBitmap = pDashList->GetBitmap( nPos ); - aLbLineStyles.Modify( pEntry, nPos, pBitmap ); + const Bitmap aBitmap = pDashList->GetUiBitmap( nPos ); + aLbLineStyles.Modify( pEntry, nPos, &aBitmap ); aLbLineStyles.SelectEntryPos( nPos ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 942e3f93f6e1..210f3d4c7dd9 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -407,7 +407,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) pEntry->SetName( aName ); aEdtName.SetText( aName ); - aLbLineEnds.Modify( pEntry, nPos, pLineEndList->GetBitmap( nPos ) ); + const Bitmap aUiBitmap( pLineEndList->GetUiBitmap( nPos ) ); + aLbLineEnds.Modify( pEntry, nPos, &aUiBitmap ); aLbLineEnds.SelectEntryPos( nPos ); // Flag fuer modifiziert setzen @@ -505,10 +506,10 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) long nLineEndCount = pLineEndList->Count(); pLineEndList->Insert( pEntry, nLineEndCount ); - Bitmap* pBitmap = pLineEndList->GetBitmap( nLineEndCount ); + const Bitmap aBitmap = pLineEndList->GetUiBitmap( nLineEndCount ); // Zur ListBox hinzufuegen - aLbLineEnds.Append( pEntry, pBitmap ); + aLbLineEnds.Append( pEntry, &aBitmap ); aLbLineEnds.SelectEntryPos( aLbLineEnds.GetEntryCount() - 1 ); // Flag fuer modifiziert setzen |