diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:49:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:49:40 +0000 |
| commit | 27c2b1ea884de5b51909651dc15951db1662b920 (patch) | |
| tree | b6ad2c654ca1a115f9654263b854714af4b48fb6 /extensions/source/propctrlr/handlerhelper.cxx | |
| parent | ab70aaf25a358679ef33ac67f1516b863617878d (diff) | |
INTEGRATION: CWS oj14 (1.2.66); FILE MERGED
2006/12/18 16:52:33 oj 1.2.66.4: RESYNC: (1.4-1.6); FILE MERGED
2006/11/08 15:07:18 oj 1.2.66.3: merge conflicts resolved
2006/11/07 12:06:26 oj 1.2.66.2: RESYNC: (1.2-1.4); FILE MERGED
2006/07/04 11:07:26 oj 1.2.66.1: property browser adjustments to remove form dependency
Diffstat (limited to 'extensions/source/propctrlr/handlerhelper.cxx')
| -rw-r--r-- | extensions/source/propctrlr/handlerhelper.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 6cbffc26f..8d94df14f 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: handlerhelper.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2006-12-13 16:57:36 $ + * last change: $Author: rt $ $Date: 2007-07-06 08:49:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,9 +42,6 @@ #ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" #endif -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_STRINGREPRESENTATION_HXX -#include "stringrepresentation.hxx" -#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif @@ -62,6 +59,9 @@ #endif /** === begin UNO includes === **/ +#ifndef _COM_SUN_STAR_INSPECTION_STRINGREPRESENTATION_HPP_ +#include "com/sun/star/inspection/StringRepresentation.hpp" +#endif #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif @@ -247,7 +247,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any PropertyHandlerHelper::convertToPropertyValue( const Reference< XTypeConverter >& _rxTypeConverter, + Any PropertyHandlerHelper::convertToPropertyValue( const Reference< XComponentContext >& _rxContext,const Reference< XTypeConverter >& _rxTypeConverter, const Property& _rProperty, const Any& _rControlValue ) { Any aPropertyValue( _rControlValue ); @@ -264,8 +264,8 @@ namespace pcr ::rtl::OUString sControlValue; _rControlValue >>= sControlValue; - StringRepresentation aConversionHelper( _rxTypeConverter ); - aPropertyValue = aConversionHelper.convertStringRepresentationToPropertyValue( sControlValue, _rProperty.Type ); + Reference< XStringRepresentation > xConversionHelper = StringRepresentation::create( _rxContext,_rxTypeConverter ); + aPropertyValue = xConversionHelper->convertToPropertyValue( sControlValue, _rProperty.Type ); } else { @@ -284,7 +284,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any PropertyHandlerHelper::convertToControlValue( const Reference< XTypeConverter >& _rxTypeConverter, + Any PropertyHandlerHelper::convertToControlValue( const Reference< XComponentContext >& _rxContext,const Reference< XTypeConverter >& _rxTypeConverter, const Any& _rPropertyValue, const Type& _rControlValueType ) { Any aControlValue( _rPropertyValue ); @@ -294,8 +294,8 @@ namespace pcr if ( _rControlValueType.getTypeClass() == TypeClass_STRING ) { - StringRepresentation aConversionHelper( _rxTypeConverter ); - aControlValue <<= aConversionHelper.convertPropertyValueToStringRepresentation( _rPropertyValue ); + Reference< XStringRepresentation > xConversionHelper = StringRepresentation::create( _rxContext,_rxTypeConverter ); + aControlValue <<= xConversionHelper->convertToControlValue( _rPropertyValue ); } else { |