From c2e68ed88f1a42c8015bed48571e21f3b40afe28 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 6 Jun 2008 12:56:46 +0000 Subject: INTEGRATION: CWS os113 (1.35.8); FILE MERGED 2008/05/22 05:41:07 os 1.35.8.3: #i88463# added parameter at methods of SfxTabPage to suppress deep search for WhichId 2008/05/09 15:49:54 os 1.35.8.2: RESYNC: (1.35-1.36); FILE MERGED 2008/04/23 09:07:21 os 1.35.8.1: #i88463# SfxTabPage::GetWhich() makes access of the secondary pool. It breaks use of table borders in Writer --- svx/source/dialog/border.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'svx/source') diff --git a/svx/source/dialog/border.cxx b/svx/source/dialog/border.cxx index cc1f6a94ce48..64acd3077d2d 100644 --- a/svx/source/dialog/border.cxx +++ b/svx/source/dialog/border.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: border.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.37 $ * * This file is part of OpenOffice.org. * @@ -275,7 +275,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, SetFieldUnit( aEdShadowSize, eFUnit ); - USHORT nWhich = GetWhich( SID_ATTR_BORDER_INNER ); + USHORT nWhich = GetWhich( SID_ATTR_BORDER_INNER, sal_False ); BOOL bIsDontCare = TRUE; if ( rCoreAttrs.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE ) @@ -454,7 +454,9 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const Color aColBlack = RGBCOL(COL_BLACK); pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); - pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER ); + + + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False ); eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); @@ -670,7 +672,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) BOOL bPut = TRUE; USHORT nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER ); - USHORT nBoxInfoWhich = GetWhich( SID_ATTR_BORDER_INNER ); + USHORT nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False ); const SfxItemSet& rOldSet = GetItemSet(); SvxBoxItem aBoxItem ( nBoxWhich ); SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich ); @@ -796,7 +798,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) rCoreAttrs.Put( aBoxItem ); bAttrsChanged |= TRUE; } - pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER ); + pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, sal_False ); if ( !pOld || !( *(const SvxBoxInfoItem*)pOld == aBoxInfoItem ) ) { -- cgit