diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-02 22:35:57 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-03 18:04:24 +0100 |
commit | ce90f99a2d66c2b998ad3f9f028e2ea623a757f5 (patch) | |
tree | ec8f3adaeca225e22ae41eee80be114aadc25d17 /oox | |
parent | make sure uno::Any works with fast operator+ (diff) | |
download | core-ce90f99a2d66c2b998ad3f9f028e2ea623a757f5.tar.gz core-ce90f99a2d66c2b998ad3f9f028e2ea623a757f5.zip |
fixes for where fast string operator+ is not perfectly source compatible
Change-Id: I80af0399037e4f68113338139e7f2ad2400e65ab
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/shapes.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index ae9f1b302236..bc48e602c23c 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1349,8 +1349,8 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bo for( sal_Int32 i=0; i < nLength; i++ ) if( EscherPropertyContainer::GetAdjustmentValue( aAdjustmentSeq[ i ], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) ) mpFS->singleElementNS( XML_a, XML_gd, - XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? ( OString( "adj" ) + OString::valueOf( i + 1 ) ).getStr() : "adj"), - XML_fmla, (OString("val ") + OString::valueOf( nValue )).getStr(), + XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? OString( "adj" + OString::valueOf( i + 1 ) ).getStr() : "adj"), + XML_fmla, OString("val " + OString::valueOf( nValue )).getStr(), FSEND ); } diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 191f27fc1f43..87b8e5521899 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -112,7 +112,7 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; using ::sax_fastparser::FSHelperPtr; -#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr() +#define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr() struct CustomShapeTypeTranslationTable { @@ -859,7 +859,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, Graph pFS->singleElementNS( mnXmlNamespace, XML_cNvPr, XML_id, I32S( GetNewShapeID( xShape ) ), - XML_name, bHaveName ? USS( sName ) : (OString("Picture ") + OString::valueOf( mnPictureIdMax++ )).getStr(), + XML_name, bHaveName ? USS( sName ) : OString( "Picture " + OString::valueOf( mnPictureIdMax++ )).getStr(), XML_descr, bHaveDesc ? USS( sDescr ) : NULL, FSEND ); // OOXTODO: //cNvPr children: XML_extLst, XML_hlinkClick, XML_hlinkHover diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 5973885d96da..4ae067c94be0 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -286,7 +286,7 @@ void PresentationFragmentHandler::finalizeImport() } catch( uno::Exception& ) { - OSL_FAIL( (rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(), " + OSL_FAIL( OString(rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(), " "exception caught: ") + rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 789821b4bcc0..a59f2e18192c 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -214,7 +214,7 @@ void SlideFragmentHandler::finalizeImport() } catch( uno::Exception& ) { - OSL_FAIL( (rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), " + OSL_FAIL( OString(rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), " "exception caught: ") + rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), |