diff options
| author | Olivier Hallot <olivier.hallot@documentfoundation.org> | 2012-01-01 12:55:53 -0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-01-02 19:17:17 +0100 |
| commit | 6af59644d6508049409a03d1c4a598ea2bef521e (patch) | |
| tree | 6897eaf76372c606a487ebb0135962e6c7e52cb7 /oox/source/vml/vmldrawing.cxx | |
| parent | 93d2a2eb4dd13d81b9be4f087653baecb33ead67 (diff) | |
Fix for fdo43460 Part XXV getLength() to isEmpty()
Please find attached a partial fix for Easy Hack FDO43460
Part XXI
Module
oox
Diffstat (limited to 'oox/source/vml/vmldrawing.cxx')
| -rw-r--r-- | oox/source/vml/vmldrawing.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 6483f2053a42..8c6207f7737d 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -132,15 +132,15 @@ void Drawing::registerBlockId( sal_Int32 nBlockId ) void Drawing::registerOleObject( const OleObjectInfo& rOleObject ) { - OSL_ENSURE( rOleObject.maShapeId.getLength() > 0, "Drawing::registerOleObject - missing OLE object shape id" ); + OSL_ENSURE( !rOleObject.maShapeId.isEmpty(), "Drawing::registerOleObject - missing OLE object shape id" ); OSL_ENSURE( maOleObjects.count( rOleObject.maShapeId ) == 0, "Drawing::registerOleObject - OLE object already registered" ); maOleObjects.insert( OleObjectInfoMap::value_type( rOleObject.maShapeId, rOleObject ) ); } void Drawing::registerControl( const ControlInfo& rControl ) { - OSL_ENSURE( rControl.maShapeId.getLength() > 0, "Drawing::registerControl - missing form control shape id" ); - OSL_ENSURE( rControl.maName.getLength() > 0, "Drawing::registerControl - missing form control name" ); + OSL_ENSURE( !rControl.maShapeId.isEmpty(), "Drawing::registerControl - missing form control shape id" ); + OSL_ENSURE( !rControl.maName.isEmpty(), "Drawing::registerControl - missing form control name" ); OSL_ENSURE( maControls.count( rControl.maShapeId ) == 0, "Drawing::registerControl - form control already registered" ); maControls.insert( ControlInfoMap::value_type( rControl.maShapeId, rControl ) ); } @@ -210,10 +210,10 @@ const ControlInfo* Drawing::getControlInfo( const OUString& rShapeId ) const Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService, const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const { - OSL_ENSURE( rService.getLength() > 0, "Drawing::createAndInsertXShape - missing UNO shape service name" ); + OSL_ENSURE( !rService.isEmpty(), "Drawing::createAndInsertXShape - missing UNO shape service name" ); OSL_ENSURE( rxShapes.is(), "Drawing::createAndInsertXShape - missing XShapes container" ); Reference< XShape > xShape; - if( (rService.getLength() > 0) && rxShapes.is() ) try + if( !rService.isEmpty() && rxShapes.is() ) try { Reference< XMultiServiceFactory > xModelFactory( mrFilter.getModelFactory(), UNO_SET_THROW ); xShape.set( xModelFactory->createInstance( rService ), UNO_QUERY_THROW ); |