diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 08:34:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 08:34:55 +0000 |
| commit | 39b4daad141bd00fc6fb646bb634bd667bea6ef2 (patch) | |
| tree | 52dae58c6291e0c65d5c33b3030ed033e4bd9803 /svx/source/dialog/border.cxx | |
| parent | 99ea6a6c41a2f837d9a71c01a999bcfc54554c8e (diff) | |
INTEGRATION: CWS swmergeborders (1.17.442); FILE MERGED
2004/02/26 10:15:21 os 1.17.442.3: #i25027# range extended, query connect attribute from parent
2004/02/23 16:09:01 os 1.17.442.2: #i25027# use Writer's inherited SfxBoolItem for 'merge'
2004/02/19 15:09:18 os 1.17.442.1: #i25027# merge border CheckBox added
Diffstat (limited to 'svx/source/dialog/border.cxx')
| -rw-r--r-- | svx/source/dialog/border.cxx | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/svx/source/dialog/border.cxx b/svx/source/dialog/border.cxx index 406019828b1c..aa4fd8fc99e1 100644 --- a/svx/source/dialog/border.cxx +++ b/svx/source/dialog/border.cxx @@ -2,9 +2,9 @@ * * $RCSfile: border.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:00:45 $ + * last change: $Author: hr $ $Date: 2004-03-09 09:34:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,9 @@ #ifndef _SV_MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif +#ifndef SFX_ITEMCONNECT_HXX +#include <sfx2/itemconnect.hxx> +#endif // ----------------------------------------------------------------------- @@ -121,6 +124,7 @@ static USHORT pRanges[] = { SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, + SID_ATTR_BORDER_CONNECT, 0 }; @@ -252,6 +256,8 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, aEdShadowSize ( this, ResId( ED_SHADOWSIZE ) ), aFtShadowColor ( this, ResId( FT_SHADOWCOLOR ) ), aLbShadowColor ( this, ResId( LB_SHADOWCOLOR ) ), + aPropertiesFL ( this, ResId( FL_PROPERTIES ) ), + aMergeWithNextCB( this, ResId( CB_MERGEWITHNEXT ) ), aShadowImgLstH( ResId(ILH_SDW_BITMAPS)), aShadowImgLst( ResId(IL_SDW_BITMAPS)), aBorderImgLstH( ResId(ILH_PRE_BITMAPS)), @@ -366,6 +372,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, aLbShadowColor.CopyEntries( aLbLineColor ); } FreeResource(); + } // ----------------------------------------------------------------------- @@ -845,6 +852,14 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) } } } + + USHORT nConnectWhich = GetWhich(SID_ATTR_BORDER_CONNECT); + if(aMergeWithNextCB.IsVisible() && + SFX_ITEM_AVAILABLE <= rSet.GetItemState( nConnectWhich, TRUE )) + { + aMergeWithNextCB.Check(static_cast< const SfxBoolItem& >(rSet.Get(nConnectWhich)).GetValue()); + aMergeWithNextCB.SaveValue(); + } } // ----------------------------------------------------------------------- @@ -903,6 +918,17 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) SvxBorderLine* pCoreLine; SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER ); + if(aMergeWithNextCB.IsVisible() && + aMergeWithNextCB.GetSavedValue() != aMergeWithNextCB.IsChecked()) + { + //Writer needs it's own derived SfxBoolItem + SfxBoolItem* pBoolItem = static_cast< SfxBoolItem* >( + rOldSet.Get( GetWhich(SID_ATTR_BORDER_CONNECT)).Clone()); + pBoolItem->SetValue(aMergeWithNextCB.IsChecked()); + rCoreAttrs.Put(*pBoolItem); + delete pBoolItem; + } + SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich ); const SfxPoolItem* pOld = 0; @@ -1549,6 +1575,11 @@ void SvxBorderTabPage::SetSWMode(BYTE nSet) //#define SW_BORDER_MODE_TABLE 0x02 //#define SW_BORDER_MODE_FRAME 0x04 nSWMode = nSet; + if(SW_BORDER_MODE_PARA == nSet) + { + aPropertiesFL.Show(); + aMergeWithNextCB.Show(); + } } /* -----------------------------03.06.2002 10:15------------------------------ |