diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:10:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 18:10:05 +0000 |
| commit | 65fc2f5909603bf03314fe0c7718579c20c3c42c (patch) | |
| tree | 6fdf26818b1189d98273c840eb101a0d476c1c2c /svx/source/items | |
| parent | 6ad3c06c80b65fc3143cde32b33b04e4290fff5c (diff) | |
INTEGRATION: CWS removedrafts (1.58.18); FILE MERGED
2005/02/17 14:08:04 cd 1.58.18.1: #i42557# Move UNOIDL types from drafts to com
Diffstat (limited to 'svx/source/items')
| -rw-r--r-- | svx/source/items/textitem.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx index ca5e92cf4759..1a7687f9ac31 100644 --- a/svx/source/items/textitem.cxx +++ b/svx/source/items/textitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textitem.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: rt $ $Date: 2005-02-04 11:16:56 $ + * last change: $Author: kz $ $Date: 2005-03-01 19:10:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,8 +67,8 @@ #ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include <com/sun/star/awt/FontDescriptor.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_FRAME_STATUS_FONTHEIGHT_HPP_ -#include <drafts/com/sun/star/frame/status/FontHeight.hpp> +#ifndef _COM_SUN_STAR_FRAME_STATUS_FONTHEIGHT_HPP_ +#include <com/sun/star/frame/status/FontHeight.hpp> #endif #ifndef _SV_BITMAPEX_HXX @@ -988,7 +988,7 @@ sal_Bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const { case 0: { - drafts::com::sun::star::frame::status::FontHeight aFontHeight; + ::com::sun::star::frame::status::FontHeight aFontHeight; // Point (also Twips) sind gefragt, // also umrechnen, wenn CONVERT_TWIPS nicht gesetzt ist @@ -1120,7 +1120,7 @@ sal_Bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) { case 0: { - drafts::com::sun::star::frame::status::FontHeight aFontHeight; + ::com::sun::star::frame::status::FontHeight aFontHeight; if ( rVal >>= aFontHeight ) { // Height |