diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2001-10-23 09:54:35 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2001-10-23 09:54:35 +0000 |
commit | 96478db6c8e2522349d4548f1af13ab680705531 (patch) | |
tree | 80b11e44de2374bae92f162f141c49cdb2606b50 /sd/source | |
parent | #92924#: exception specifications (diff) | |
download | core-96478db6c8e2522349d4548f1af13ab680705531.tar.gz core-96478db6c8e2522349d4548f1af13ab680705531.zip |
#92924#: gcc-3.0.1 needs lvalue
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 25 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 7 |
2 files changed, 20 insertions, 12 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 288ec12d4cb6..034feee01f95 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eppt.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: sj $ $Date: 2001-08-23 13:55:55 $ + * last change: $Author: hr $ $Date: 2001-10-23 10:54:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -405,7 +405,8 @@ sal_Bool PPTWriter::ImplCreateSummaryInformation() if ( (*(::rtl::OUString*)mAny.getValue() ).getLength() ) { aPropItem.Clear(); - aPropItem.Write( String( *(::rtl::OUString*)mAny.getValue() ) ); + String aTmpStr( *(::rtl::OUString*)mAny.getValue() ); + aPropItem.Write( aTmpStr ); aPropSet.AddProperty( PID_AUTHOR, aPropItem ); } } @@ -414,7 +415,8 @@ sal_Bool PPTWriter::ImplCreateSummaryInformation() if ( (*(::rtl::OUString*)mAny.getValue() ).getLength() ) { aPropItem.Clear(); - aPropItem.Write( String( *(::rtl::OUString*)mAny.getValue() ) ); + String aTmpStr( *(::rtl::OUString*)mAny.getValue() ); + aPropItem.Write( aTmpStr ); aPropSet.AddProperty( PID_LASTAUTHOR, aPropItem ); } } @@ -423,7 +425,8 @@ sal_Bool PPTWriter::ImplCreateSummaryInformation() if ( (*(::rtl::OUString*)mAny.getValue() ).getLength() ) { aPropItem.Clear(); - aPropItem.Write( String( *(::rtl::OUString*)mAny.getValue() ) ); + String aTmpStr( *(::rtl::OUString*)mAny.getValue() ); + aPropItem.Write( aTmpStr ); aPropSet.AddProperty( PID_SUBJECT, aPropItem ); } } @@ -432,7 +435,8 @@ sal_Bool PPTWriter::ImplCreateSummaryInformation() if ( (*(::rtl::OUString*)mAny.getValue() ).getLength() ) { aPropItem.Clear(); - aPropItem.Write( String( *(::rtl::OUString*)mAny.getValue() ) ); + String aTmpStr( *(::rtl::OUString*)mAny.getValue() ); + aPropItem.Write( aTmpStr ); aPropSet.AddProperty( PID_TITLE, aPropItem ); } } @@ -441,7 +445,8 @@ sal_Bool PPTWriter::ImplCreateSummaryInformation() if ( (*(::rtl::OUString*)mAny.getValue() ).getLength() ) { aPropItem.Clear(); - aPropItem.Write( String( *(::rtl::OUString*)mAny.getValue() ) ); + String aTmpStr( *(::rtl::OUString*)mAny.getValue() ); + aPropItem.Write( aTmpStr ); aPropSet.AddProperty( PID_KEYWORDS, aPropItem ); } } @@ -450,7 +455,8 @@ sal_Bool PPTWriter::ImplCreateSummaryInformation() if ( (*(::rtl::OUString*)mAny.getValue() ).getLength() ) { aPropItem.Clear(); - aPropItem.Write( String( *(::rtl::OUString*)mAny.getValue() ) ); + String aTmpStr( *(::rtl::OUString*)mAny.getValue() ); + aPropItem.Write( aTmpStr ); aPropSet.AddProperty( PID_COMMENTS, aPropItem ); } } @@ -599,7 +605,8 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() ::rtl::OUString aUValue( aXDocumentInfo->getUserFieldValue( i ) ); if ( aUValue.getLength() ) { - aPropItem.Write( String( aUValue ) ); + String aTmpStr( aUValue ); + aPropItem.Write( aTmpStr ); aDict.AddProperty( nNextId, aXDocumentInfo->getUserFieldName( i ) ); aUserPropSet.AddProperty( nNextId++, aPropItem ); } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 80923d4a976a..673713150018 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2,9 +2,9 @@ * * $RCSfile: epptso.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: ka $ $Date: 2001-09-13 10:35:11 $ + * last change: $Author: hr $ $Date: 2001-10-23 10:54:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -4439,7 +4439,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *mpExEmbed << (sal_uInt32)( EPP_ExControlAtom << 16 ) << (sal_uInt32)4 << nPageId; - PPTExOleObjEntry* pEntry = new PPTExOleObjEntry( OCX_CONTROL, String(), mpExEmbed->Tell() ); + String aEmptyString; + PPTExOleObjEntry* pEntry = new PPTExOleObjEntry( OCX_CONTROL, aEmptyString, mpExEmbed->Tell() ); pEntry->xControlModel = aXControlModel; maExOleObj.Insert( pEntry ); |