diff options
Diffstat (limited to 'cui/source/tabpages/border.cxx')
| -rw-r--r-- | cui/source/tabpages/border.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index c99316337..e4ab0aa8b 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -186,7 +183,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, aWndPresets ( this, CUI_RES( WIN_PRESETS ) ), aUserDefFT ( this, CUI_RES( FT_USERDEF ) ), aFrameSel ( this, CUI_RES( WIN_FRAMESEL ) ), - + aFlSep1 ( this, CUI_RES( FL_SEPARATOR1 ) ), aFlLine ( this, CUI_RES( FL_LINE ) ), aStyleFT ( this, CUI_RES( FT_STYLE ) ), @@ -452,8 +449,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) SfxMapUnit eCoreUnit; pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); - - + + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, sal_False ); eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); @@ -741,7 +738,7 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) nMinValue == aRightMF .GetValue() || nMinValue == aTopMF .GetValue() || nMinValue == aBottomMF.GetValue() || - (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) + (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) ) { aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT ); |