diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:09:49 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:09:49 +0000 |
| commit | 6ad3c06c80b65fc3143cde32b33b04e4290fff5c (patch) | |
| tree | a4ec4f565778705dc82f16aeb417e0b5c6d4ee2f /svx | |
| parent | b8cb4f3f55b5fbc0d871020363c586f767704b2d (diff) | |
INTEGRATION: CWS removedrafts (1.36.130); FILE MERGED
2005/02/17 14:08:04 cd 1.36.130.1: #i42557# Move UNOIDL types from drafts to com
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/items/frmitems.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index e17e284cbe2d..355dff354d45 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmitems.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2005-01-11 13:01:39 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:09:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,8 +213,8 @@ #ifndef _COM_SUN_STAR_TEXT_WRITINGMODE2_HPP_ #include <com/sun/star/text/WritingMode2.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_STATUS_UPPERLOWERMARGINSCALE_HPP_ -#include <drafts/com/sun/star/frame/status/UpperLowerMarginScale.hpp> +#ifndef _COM_SUN_STAR_FRAME_STATUS_UPPERLOWERMARGINSCALE_HPP_ +#include <com/sun/star/frame/status/UpperLowerMarginScale.hpp> #endif #include <comphelper/types.hxx> @@ -953,7 +953,7 @@ sal_Bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const // jetzt alles signed case 0: { - drafts::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; + ::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; aUpperLowerMarginScale.Upper = (sal_Int32)(bConvert ? TWIP_TO_MM100(nUpper) : nUpper); aUpperLowerMarginScale.Lower = (sal_Int32)(bConvert ? TWIP_TO_MM100(nLower) : nPropUpper); aUpperLowerMarginScale.ScaleUpper = (sal_Int16)nPropUpper; @@ -979,7 +979,7 @@ sal_Bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { case 0: { - drafts::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; + ::com::sun::star::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; if ( !(rVal >>= aUpperLowerMarginScale )) return sal_False; { |