[Libreoffice-commits] .: cui/source
Katarina Machalkova
bubli at kemper.freedesktop.org
Sun Sep 4 05:38:28 PDT 2011
cui/source/tabpages/tparea.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 64767120e533ce4277095f405238d54bcb354f39
Author: Katarina Machalkova <bubli at bubli.org>
Date: Sun Sep 4 14:22:11 2011 +0200
Fix for i#95158: Don't reset selected colour on tab switch
Set modified flag if position in the listbox changes
(also for bitmaps, hatching & friends)
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 62c257c..a177e92 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -947,6 +947,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( nDlgType == 0 ) // Flaechen-Dialog
{
+ sal_uInt16 nPosOrig = nPos;
XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos();
switch( eStyle )
{
@@ -954,24 +955,32 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
{
nPageType = PT_GRADIENT;
nPos = aLbGradient.GetSelectEntryPos();
+ if( nPosOrig != nPos )
+ *pnGradientListState |= CT_MODIFIED;
}
break;
case XFILL_HATCH:
{
nPageType = PT_HATCH;
nPos = aLbHatching.GetSelectEntryPos();
+ if( nPosOrig != nPos )
+ *pnHatchingListState |= CT_MODIFIED;
}
break;
case XFILL_BITMAP:
{
nPageType = PT_BITMAP;
nPos = aLbBitmap.GetSelectEntryPos();
+ if( nPosOrig != nPos )
+ *pnBitmapListState |= CT_MODIFIED;
}
break;
case XFILL_SOLID:
{
nPageType = PT_COLOR;
nPos = aLbColor.GetSelectEntryPos();
+ if( nPosOrig != nPos )
+ *pnColorTableState |= CT_MODIFIED;
}
break;
default: ;//prevent warning
More information about the Libreoffice-commits
mailing list