From 7f447b911cdbc4cdda9d429b4db600fd6c6d02f4 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 18 Apr 2005 10:30:27 +0000 Subject: INTEGRATION: CWS swqbugfixes23 (1.31.172); FILE MERGED 2005/04/07 14:58:02 fme 1.31.172.1: #i46921# Disabled tolerant stuff for performance reasons --- sw/source/core/unocore/unoport.cxx | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'sw/source/core/unocore/unoport.cxx') diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index f229933f357a..9268ad050269 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoport.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: rt $ $Date: 2005-01-27 12:38:01 $ + * last change: $Author: obo $ $Date: 2005-04-18 11:30:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,15 +118,15 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include #endif -#ifndef _COM_SUN_STAR_BEANS_SETPROPERTYTOLERANTFAILED_HPP_ -#include -#endif -#ifndef _COM_SUN_STAR_BEANS_GETPROPERTYTOLERANTRESULT_HPP_ -#include -#endif -#ifndef _COM_SUN_STAR_BEANS_TOLERANTPROPERTYSETRESULTTYPE_HPP_ -#include -#endif +//#ifndef _COM_SUN_STAR_BEANS_SETPROPERTYTOLERANTFAILED_HPP_ +//#include +//#endif +//#ifndef _COM_SUN_STAR_BEANS_GETPROPERTYTOLERANTRESULT_HPP_ +//#include +//#endif +//#ifndef _COM_SUN_STAR_BEANS_TOLERANTPROPERTYSETRESULTTYPE_HPP_ +//#include +//#endif using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -622,6 +622,9 @@ Sequence< Any > SwXTextPortion::getPropertyValues( /* -----------------------------29.09.03 11:44-------------------------------- ---------------------------------------------------------------------------*/ + +/* disabled for #i46921# + uno::Sequence< SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< Any >& rValues ) @@ -827,6 +830,10 @@ uno::Sequence< GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPro return aResult; } + +*/ + + /* -----------------------------02.04.01 11:44-------------------------------- ---------------------------------------------------------------------------*/ -- cgit v1.2.3