Related: #i122120# Ensured Append/Modify methods in LB implementations...

always add a UI graphic preview, corrected diag mirror in bitmap pattern

(cherry picked from commit 36a8574012525fa837df6dfd1839fa65b5a2bc70)

Conflicts:
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/xtable.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/xoutdev/xtabbtmp.cxx
svx/source/xoutdev/xtabcolr.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtabgrdt.cxx
svx/source/xoutdev/xtabhtch.cxx
svx/source/xoutdev/xtable.cxx
svx/source/xoutdev/xtablend.cxx

Change-Id: Iff0744061b76d8c608e285f81bcc8e76edeb6a69

7 files changed, 27 insertions, 54 deletions

diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 06f25ef1ba2f..cf7d025c5e48 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -35,7 +35,7 @@ void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
 
     for( long i = 0; i < nCount; i++ )
     {
-        Append( const_cast< XColorEntry * >( & rTab[ i ] ));
+        Append( rTab[ i ] );
     }
     SetUpdateMode( sal_True );
 }
@@ -160,7 +160,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
         {
             pColorEntry = pColorList->GetColor( i );
             if( pColorEntry && pColorEntry->GetColor() == rCol )
-                return pColorList->Get( pColorEntry->GetName() );
+                return pColorList->GetIndex( pColorEntry->GetName() );
         }
     }
     return -1L;
@@ -270,10 +270,9 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl)
     sal_uInt16 nIdx = aLbChartColors.GetSelectEntryPos();
     if( nIdx != LISTBOX_ENTRY_NOTFOUND )
     {
-        XColorEntry aEntry( aValSetColorBox.GetItemColor( aValSetColorBox.GetSelectItemId() ),
-                            aLbChartColors.GetSelectEntry() );
+        const XColorEntry aEntry( aValSetColorBox.GetItemColor( aValSetColorBox.GetSelectItemId() ), aLbChartColors.GetSelectEntry() );
 
-        aLbChartColors.Modify( & aEntry, nIdx );
+        aLbChartColors.Modify( aEntry, nIdx );
         pColorConfig->ReplaceColorByIndex( nIdx, aEntry );
 
         aLbChartColors.SelectEntryPos( nIdx );  // reselect entry
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 148cbd81d23d..1d516c44e536 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -528,6 +528,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
         if( pWarnBox->Execute() != RET_OK )
             break;
     }
+
     delete pDlg;
     delete pWarnBox;
 
@@ -559,16 +560,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
             aLbBitmaps.Append(rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry );
             aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
 
-#ifdef WNT
-            // hack: #31355# W.P.
-            Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
-            if( sal_True ) {                // ??? overlapped with pDlg
-                                        // and srolling
-                Invalidate( aRect );
-                //aLbBitmaps.Invalidate();
-            }
-#endif
-
             *pnBitmapListState |= CT_MODIFIED;
 
             ChangeBitmapHdl_Impl( this );
@@ -649,6 +640,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
                 if( pWarnBox->Execute() != RET_OK )
                     break;
             }
+
             delete pDlg;
             delete pWarnBox;
 
@@ -661,15 +653,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
                 aLbBitmaps.Append(rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry );
                 aLbBitmaps.SelectEntryPos( aLbBitmaps.GetEntryCount() - 1 );
 
-#ifdef WNT
-                // hack: #31355# W.P.
-                Rectangle aRect( aLbBitmaps.GetPosPixel(), aLbBitmaps.GetSizePixel() );
-                if( sal_True ) {                // ??? overlapped with pDlg
-                                            // and srolling
-                    Invalidate( aRect );
-                }
-#endif
-
                 *pnBitmapListState |= CT_MODIFIED;
 
                 ChangeBitmapHdl_Impl( this );
@@ -723,15 +706,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
             if( bDifferent )
             {
                 bLoop = sal_False;
-                XBitmapEntry* pEntry = pBitmapList->GetBitmap( nPos );
-
-                pEntry->SetName( aName );
 
                 const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx());
+                const XBitmapEntry aEntry(Graphic(aBitmapEx), aName);
 
-                pEntry->SetGraphicObject(Graphic(aBitmapEx));
-
-                aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos );
+                aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), aEntry, nPos );
                 aLbBitmaps.SelectEntryPos( nPos );
 
                 *pnBitmapListState |= CT_MODIFIED;
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 35352289bb87..5411f5a374b9 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -729,9 +729,8 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
 
         pColorList->Insert( pEntry, pColorList->Count() );
 
-        m_pLbColor->Append( pEntry );
-        m_pValSetColorList->InsertItem( m_pValSetColorList->GetItemCount() + 1,
-                pEntry->GetColor(), pEntry->GetName() );
+        m_pLbColor->Append( *pEntry );
+        m_pValSetColorList->InsertItem( m_pValSetColorList->GetItemCount() + 1, pEntry->GetColor(), pEntry->GetName() );
         ImpColorCountChanged();
 
         m_pLbColor->SelectEntryPos( m_pLbColor->GetEntryCount() - 1 );
@@ -796,20 +795,18 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
         // if not existing the entry is entered
         if( bDifferent )
         {
-            XColorEntry* pEntry = pColorList->GetColor( nPos );
-
             Color aTmpColor (aAktuellColor);
+
             if (eCM != CM_RGB)
                 ConvertColorValues (aTmpColor, CM_RGB);
 
-            pEntry->SetColor( aTmpColor );
-            pEntry->SetName( aName );
+            const XColorEntry aEntry(aTmpColor, aName);
 
-            m_pLbColor->Modify( pEntry, nPos );
+            m_pLbColor->Modify( aEntry, nPos );
             m_pLbColor->SelectEntryPos( nPos );
-            /////
-            m_pValSetColorList->SetItemColor( nPos + 1, pEntry->GetColor() );
-            m_pValSetColorList->SetItemText( nPos + 1, pEntry->GetName() );
+
+            m_pValSetColorList->SetItemColor( nPos + 1, aEntry.GetColor() );
+            m_pValSetColorList->SetItemText( nPos + 1, aEntry.GetName() );
             m_pEdtName->SetText( aName );
 
             m_pCtlPreviewOld->Invalidate();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 379803020d1b..db2b50799c85 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
 
         pGradientList->Insert( pEntry, nCount );
 
-        m_pLbGradients->Append( pEntry );
+        m_pLbGradients->Append( *pEntry, pGradientList->GetUiBitmap( nCount ) );
 
         m_pLbGradients->SelectEntryPos( m_pLbGradients->GetEntryCount() - 1 );
 
@@ -560,7 +560,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
 
                 delete pGradientList->Replace( pEntry, nPos );
 
-                m_pLbGradients->Modify( pEntry, nPos );
+                m_pLbGradients->Modify( *pEntry, nPos, pGradientList->GetUiBitmap( nPos ) );
 
                 m_pLbGradients->SelectEntryPos( nPos );
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index c386e368c9c4..2be33ae73dae 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -530,7 +530,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
 
         pHatchingList->Insert( pEntry, nCount );
 
-        aLbHatchings.Append( pEntry );
+        aLbHatchings.Append( *pEntry, pHatchingList->GetUiBitmap( nCount ) );
 
         aLbHatchings.SelectEntryPos( aLbHatchings.GetEntryCount() - 1 );
 
@@ -603,7 +603,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
 
                 delete pHatchingList->Replace( pEntry, nPos );
 
-                aLbHatchings.Modify( pEntry, nPos );
+                aLbHatchings.Modify( *pEntry, nPos, pHatchingList->GetUiBitmap( nPos ) );
 
                 aLbHatchings.SelectEntryPos( nPos );
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 14ceb6bcf9a0..e58b7a91ad72 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
             long nDashCount = pDashList->Count();
             pDashList->Insert( pEntry, nDashCount );
             const Bitmap aBitmap = pDashList->GetUiBitmap( nDashCount );
-            aLbLineStyles.Append( pEntry, &aBitmap );
+            aLbLineStyles.Append( *pEntry, pDashList->GetUiBitmap( nDashCount ) );
 
             aLbLineStyles.SelectEntryPos( aLbLineStyles.GetEntryCount() - 1 );
 
@@ -672,8 +672,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
                 XDashEntry* pEntry = new XDashEntry( aDash, aName );
 
                 delete pDashList->Replace( pEntry, nPos );
-                const Bitmap aBitmap = pDashList->GetUiBitmap( nPos );
-                aLbLineStyles.Modify( pEntry, nPos, &aBitmap );
+                aLbLineStyles.Modify( *pEntry, nPos, pDashList->GetUiBitmap( nPos ) );
 
                 aLbLineStyles.SelectEntryPos( nPos );
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 93ab7b026a4b..6756aec1840d 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -365,13 +365,13 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
         // if not existing, enter the entry
         if( bDifferent )
         {
-            XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos );
+            const XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos );
 
-            pEntry->SetName( aName );
             aEdtName.SetText( aName );
 
-            const Bitmap aUiBitmap( pLineEndList->GetUiBitmap( nPos ) );
-            aLbLineEnds.Modify( pEntry, nPos, &aUiBitmap );
+            const XLineEndEntry aEntry(pEntry->GetLineEnd(), aName);
+
+            aLbLineEnds.Modify( aEntry, nPos, pLineEndList->GetUiBitmap( nPos ) );
             aLbLineEnds.SelectEntryPos( nPos );
 
             *pnLineEndListState |= CT_MODIFIED;
@@ -467,10 +467,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
 
                 long nLineEndCount = pLineEndList->Count();
                 pLineEndList->Insert( pEntry, nLineEndCount );
-                const Bitmap aBitmap = pLineEndList->GetUiBitmap( nLineEndCount );
 
                 // add to the ListBox
-                aLbLineEnds.Append( pEntry, &aBitmap );
+                aLbLineEnds.Append( *pEntry, pLineEndList->GetUiBitmap( nLineEndCount ) );
                 aLbLineEnds.SelectEntryPos( aLbLineEnds.GetEntryCount() - 1 );
 
                 *pnLineEndListState |= CT_MODIFIED;