diff options
Diffstat (limited to 'sw/source/filter/html/htmlforw.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index ab37f60c1df9..1c7c129a6573 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,7 +129,7 @@ void lcl_html_outEvents( SvStream& rStrm, { uno::Reference< container::XChild > xChild( rFormComp, uno::UNO_QUERY ); uno::Reference< uno::XInterface > xParentIfc = xChild->getParent(); - ASSERT( xParentIfc.is(), "lcl_html_outEvents: no parent interface" ); + OSL_ENSURE( xParentIfc.is(), "lcl_html_outEvents: no parent interface" ); if( !xParentIfc.is() ) return; uno::Reference< container::XIndexAccess > xIndexAcc( xParentIfc, uno::UNO_QUERY ); @@ -142,7 +143,7 @@ void lcl_html_outEvents( SvStream& rStrm, for( nPos = 0 ; nPos < nCount; nPos++ ) { uno::Any aTmp = xIndexAcc->getByIndex(nPos); - ASSERT( aTmp.getValueType() == + OSL_ENSURE( aTmp.getValueType() == ::getCppuType( (uno::Reference<form::XFormComponent>*)0 ) || aTmp.getValueType() == ::getCppuType( (uno::Reference<form::XForm>*)0 ), @@ -399,27 +400,27 @@ void SwHTMLWriter::OutHiddenForms() uno::Reference< drawing::XDrawPageSupplier > xDPSupp( pDocSh->GetBaseModel(), uno::UNO_QUERY ); - ASSERT( xDPSupp.is(), "XTextDocument nicht vom XModel erhalten" ); + OSL_ENSURE( xDPSupp.is(), "XTextDocument nicht vom XModel erhalten" ); uno::Reference< drawing::XDrawPage > xDrawPage = xDPSupp->getDrawPage(); - ASSERT( xDrawPage.is(), "XDrawPage nicht erhalten" ); + OSL_ENSURE( xDrawPage.is(), "XDrawPage nicht erhalten" ); if( !xDrawPage.is() ) return; uno::Reference< form::XFormsSupplier > xFormsSupplier( xDrawPage, uno::UNO_QUERY ); - ASSERT( xFormsSupplier.is(), + OSL_ENSURE( xFormsSupplier.is(), "XFormsSupplier nicht vom XDrawPage erhalten" ); uno::Reference< container::XNameContainer > xTmp = xFormsSupplier->getForms(); - ASSERT( xTmp.is(), "XForms nicht erhalten" ); + OSL_ENSURE( xTmp.is(), "XForms nicht erhalten" ); uno::Reference< container::XIndexContainer > xForms( xTmp, uno::UNO_QUERY ); - ASSERT( xForms.is(), "XForms ohne container::XIndexContainer?" ); + OSL_ENSURE( xForms.is(), "XForms ohne container::XIndexContainer?" ); sal_Int32 nCount = xForms->getCount(); for( sal_Int32 i=0; i<nCount; i++) { uno::Any aTmp = xForms->getByIndex( i ); - ASSERT( aTmp.getValueType() == + OSL_ENSURE( aTmp.getValueType() == ::getCppuType((uno::Reference< form::XForm >*)0), "OutHiddenForms: falsche Reflection" ); if( aTmp.getValueType() == @@ -439,7 +440,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm ) for( sal_Int32 i=0; i<nCount; i++ ) { uno::Any aTmp = xFormComps->getByIndex( i ); - ASSERT( aTmp.getValueType() == + OSL_ENSURE( aTmp.getValueType() == ::getCppuType((uno::Reference<form::XFormComponent>*)0), "OutHiddenForm: falsche Reflection" ); if( aTmp.getValueType() != @@ -455,7 +456,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm ) if( bHiddenOnly ) { uno::Reference< beans::XPropertySet > xPropSet( xFormComp, uno::UNO_QUERY ); - OUString sPropName = OUString::createFromAscii( "ClassId" ); + OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("ClassId")); if( xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) { uno::Any aAny2 = xPropSet->getPropertyValue( sPropName ); @@ -506,7 +507,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY ); uno::Any aTmp = xFormPropSet->getPropertyValue( - OUString::createFromAscii( "Name" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -518,7 +519,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } aTmp = xFormPropSet->getPropertyValue( - OUString::createFromAscii( "TargetURL" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -531,7 +532,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } aTmp = xFormPropSet->getPropertyValue( - OUString::createFromAscii( "SubmitMethod" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitMethod")) ); if( aTmp.getValueType() == ::getCppuType((const form::FormSubmitMethod*)0) ) { form::FormSubmitMethod eMethod = @@ -544,7 +545,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } } aTmp = xFormPropSet->getPropertyValue( - OUString::createFromAscii( "SubmitEncoding" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitEncoding")) ); if( aTmp.getValueType()==::getCppuType((const form::FormSubmitEncoding*)0) ) { form::FormSubmitEncoding eEncType = @@ -571,7 +572,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, } aTmp = xFormPropSet->getPropertyValue( - OUString::createFromAscii( "TargetFrame" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& ((OUString*)aTmp.getValue())->getLength() ) { @@ -604,7 +605,7 @@ void SwHTMLWriter::OutHiddenControls( for( nPos=0; !bDone && nPos < nCount; nPos++ ) { uno::Any aTmp = rFormComps->getByIndex( nPos ); - ASSERT( aTmp.getValueType() == + OSL_ENSURE( aTmp.getValueType() == ::getCppuType((uno::Reference< form::XFormComponent>*)0), "OutHiddenControls: falsche Reflection" ); bDone = aTmp.getValueType() == @@ -617,7 +618,7 @@ void SwHTMLWriter::OutHiddenControls( for( ; nPos < nCount; nPos++ ) { uno::Any aTmp = rFormComps->getByIndex( nPos ); - ASSERT( aTmp.getValueType() == + OSL_ENSURE( aTmp.getValueType() == ::getCppuType((uno::Reference< form::XFormComponent>*)0), "OutHiddenControls: falsche Reflection" ); if( aTmp.getValueType() != @@ -627,7 +628,7 @@ void SwHTMLWriter::OutHiddenControls( *(uno::Reference< form::XFormComponent > *)aTmp.getValue(); uno::Reference< beans::XPropertySet > xPropSet( xFC, uno::UNO_QUERY ); - OUString sPropName = OUString::createFromAscii( "ClassId" ); + OUString sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")); if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) continue; @@ -645,7 +646,7 @@ void SwHTMLWriter::OutHiddenControls( OOO_STRING_SVTOOLS_HTML_O_type) += '=') += OOO_STRING_SVTOOLS_HTML_IT_hidden; aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "Name" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -656,7 +657,7 @@ void SwHTMLWriter::OutHiddenControls( sOut = '\"'; } aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "HiddenValue" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenValue")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -685,7 +686,7 @@ void SwHTMLWriter::OutHiddenControls( const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt ) { // es muss ein Draw-Format sein - ASSERT( RES_DRAWFRMFMT == rFmt.Which(), + OSL_ENSURE( RES_DRAWFRMFMT == rFmt.Which(), "GetHTMLControl nuer fuer Draw-Formate erlaubt" ); // Schauen, ob es ein SdrObject dafuer gibt @@ -697,13 +698,13 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt ) uno::Reference< awt::XControlModel > xControlModel = pFormObj->GetUnoControlModel(); - ASSERT( xControlModel.is(), "UNO-Control ohne Model" ); + OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" ); if( !xControlModel.is() ) return 0; uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); - OUString sPropName = OUString::createFromAscii( "ClassId" ); + OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("ClassId")); if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) ) return 0; @@ -728,11 +729,11 @@ static void GetControlSize( const SdrObject& rSdrObj, Size& rSz, SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, &rSdrObj ); uno::Reference< awt::XControl > xControl; SdrView* pDrawView = pVSh->GetDrawView(); - ASSERT( pDrawView && pVSh->GetWin(), "no DrawView or window!" ); + OSL_ENSURE( pDrawView && pVSh->GetWin(), "no DrawView or window!" ); if ( pDrawView && pVSh->GetWin() ) xControl = pFormObj->GetUnoControl( *pDrawView, *pVSh->GetWin() ); uno::Reference< awt::XTextLayoutConstrains > xLC( xControl, uno::UNO_QUERY ); - ASSERT( xLC.is(), "kein XTextLayoutConstrains" ); + OSL_ENSURE( xLC.is(), "kein XTextLayoutConstrains" ); if( !xLC.is() ) return; @@ -753,7 +754,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, uno::Reference< awt::XControlModel > xControlModel = pFormObj->GetUnoControlModel(); - ASSERT( xControlModel.is(), "UNO-Control ohne Model" ); + OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" ); if( !xControlModel.is() ) return rWrt; @@ -761,8 +762,6 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); -//!!! if( rHTMLWrt.pForm != pVCSbxCtrl->GetVCForm() ) -//!!! rHTMLWrt.nWarn = 1; // Control wird falscher Form zugeordnet rHTMLWrt.nFormCntrlCnt++; enum Tag { TAG_INPUT, TAG_SELECT, TAG_TEXTAREA, TAG_NONE }; @@ -784,7 +783,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, ByteString sOptions; sal_Bool bEmptyValue = sal_False; uno::Any aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "ClassId" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")) ); sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue(); sal_uInt32 nFrmOpts = HTML_FRMOPTS_CONTROL; switch( nClassId ) @@ -794,7 +793,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, eType = (form::FormComponentType::CHECKBOX == nClassId ? TYPE_CHECKBOX : TYPE_RADIO); aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "DefaultState" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")) ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && STATE_NOCHECK != *(sal_Int16*) aTmp.getValue() ) { @@ -802,7 +801,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "RefValue" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) ) { @@ -818,7 +817,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { form::FormButtonType eButtonType = form::FormButtonType_PUSH; aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "ButtonType" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonType")) ); if( aTmp.getValueType() == ::getCppuType((const form::FormButtonType*)0) ) eButtonType = *( form::FormButtonType*)aTmp.getValue(); @@ -837,7 +836,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "Label" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -851,7 +850,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, rHTMLWrt.OutNewLine( sal_True ); eTag = TAG_SELECT; aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "Dropdown" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("Dropdown")) ); if( aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue() ) { @@ -864,7 +863,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, += ByteString::CreateFromInt32( aSz.Height() ); aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "MultiSelection" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("MultiSelection")) ); if( aTmp.getValueType() == ::getBooleanCppuType() && *(sal_Bool*)aTmp.getValue() ) { @@ -879,7 +878,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, GetControlSize( rSdrObject, aSz, rWrt.pDoc ); sal_Bool bMultiLine = sal_False; - OUString sMultiLine( OUString::createFromAscii( "MultiLine" ) ); + OUString sMultiLine(RTL_CONSTASCII_USTRINGPARAM("MultiLine")); if( xPropSetInfo->hasPropertyByName( sMultiLine ) ) { aTmp = xPropSet->getPropertyValue( sMultiLine ); @@ -901,14 +900,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, += ByteString::CreateFromInt32( aSz.Width() ); aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "HScroll" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("HScroll")) ); if( aTmp.getValueType() == ::getVoidCppuType() || (aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue()) ) { const sal_Char *pWrapStr = 0; aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "HardLineBreaks" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("HardLineBreaks")) ); pWrapStr = (aTmp.getValueType() == ::getBooleanCppuType() && *(sal_Bool*)aTmp.getValue()) ? OOO_STRING_SVTOOLS_HTML_WW_hard @@ -919,7 +918,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, else { eType = TYPE_TEXT; - OUString sEchoChar( OUString::createFromAscii( "EchoChar" ) ); + OUString sEchoChar(RTL_CONSTASCII_USTRINGPARAM("EchoChar")); if( xPropSetInfo->hasPropertyByName( sEchoChar ) ) { aTmp = xPropSet->getPropertyValue( sEchoChar ); @@ -933,7 +932,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, += ByteString::CreateFromInt32( aSz.Width() ); aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "MaxTextLen" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")) ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && *(sal_Int16*) aTmp.getValue() != 0 ) { @@ -942,7 +941,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, *(sal_Int16*) aTmp.getValue() ); } - OUString sDefaultText( OUString::createFromAscii( "DefaultText" ) ); + OUString sDefaultText(RTL_CONSTASCII_USTRINGPARAM("DefaultText")); if( xPropSetInfo->hasPropertyByName( sDefaultText ) ) { aTmp = xPropSet->getPropertyValue( sDefaultText ); @@ -990,7 +989,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += TypeNames[eType]; - aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "Name" ) ); + aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -1001,7 +1000,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sOut = '\"'; } - aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "Enabled" ) ); + aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")) ); if( aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue() ) { @@ -1021,7 +1020,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( TYPE_IMAGE == eType ) { aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "ImageURL" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("ImageURL")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -1058,7 +1057,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "TabIndex" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) ) { sal_Int16 nTabIndex = *(sal_Int16*) aTmp.getValue(); @@ -1078,7 +1077,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sOut.Erase(); } - ASSERT( !bInCntnr, "Container wird fuer Controls nicht unterstuertzt" ); + OSL_ENSURE( !bInCntnr, "Container wird fuer Controls nicht unterstuertzt" ); if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) && !bInCntnr ) { // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen, @@ -1098,7 +1097,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END ); - OUString sPropName = OUString::createFromAscii( "BackgroundColor" ); + OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1108,7 +1107,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) ); } } - sPropName = OUString::createFromAscii( "TextColor" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1118,7 +1117,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) ); } } - sPropName = OUString::createFromAscii( "FontHeight" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1130,7 +1129,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxFontHeightItem( sal_Int16(nHeight * 20.), 100, RES_CHRATR_FONTSIZE ) ); } } - sPropName = OUString::createFromAscii( "FontName" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1144,7 +1143,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( !bEdit || aFName != aFixedFont.GetName() ) { FontFamily eFamily = FAMILY_DONTKNOW; - sPropName = OUString::createFromAscii( "FontFamily" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1156,7 +1155,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } } } - sPropName = OUString::createFromAscii( "FontWeight" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontWeight")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1168,7 +1167,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxWeightItem( eWeight, RES_CHRATR_WEIGHT ) ); } } - sPropName = OUString::createFromAscii( "FontSlant" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontSlant")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1179,7 +1178,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxPostureItem( eItalic, RES_CHRATR_POSTURE ) ); } } - sPropName = OUString::createFromAscii( "FontUnderline" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontUnderline")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1192,7 +1191,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, aItemSet.Put( SvxUnderlineItem( eUnderline, RES_CHRATR_UNDERLINE ) ); } } - sPropName = OUString::createFromAscii( "FontStrikeout" ); + sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontStrikeout")); if( xPropSetInfo->hasPropertyByName( sPropName ) ) { aTmp = xPropSet->getPropertyValue( sPropName ); @@ -1219,7 +1218,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( TAG_SELECT == eTag ) { aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "StringItemList" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("StringItemList")) ); if( aTmp.getValueType() == ::getCppuType((uno::Sequence<OUString>*)0) ) { rHTMLWrt.IncIndentLevel(); // der Inhalt von Select darf @@ -1231,7 +1230,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const OUString *pValues = 0; sal_Int32 nValCnt = 0; aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "ListSource" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")) ); uno::Sequence<OUString> aValList; if( aTmp.getValueType() == ::getCppuType((uno::Sequence<OUString>*)0) ) { @@ -1241,7 +1240,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } uno::Any aSelTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "DefaultSelection" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSelection")) ); const sal_Int16 *pSels = 0; sal_Int32 nSel = 0; sal_Int32 nSelCnt = 0; @@ -1302,7 +1301,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, // werden! String sVal; aTmp = xPropSet->getPropertyValue( - OUString::createFromAscii( "DefaultText" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText")) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& ((OUString*)aTmp.getValue())->getLength() ) { @@ -1325,7 +1324,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType ) { - aTmp = xPropSet->getPropertyValue( OUString::createFromAscii("Label") ); + aTmp = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { @@ -1355,7 +1354,7 @@ static void AddControl( HTMLControls& rControls, sal_uInt32 nNodeIdx ) { SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pSdrObj ); - ASSERT( pFormObj, "Doch kein FormObj" ); + OSL_ENSURE( pFormObj, "Doch kein FormObj" ); uno::Reference< awt::XControlModel > xControlModel = pFormObj->GetUnoControlModel(); if( !xControlModel.is() ) @@ -1365,7 +1364,7 @@ static void AddControl( HTMLControls& rControls, uno::Reference< uno::XInterface > xIfc = xFormComp->getParent(); uno::Reference< form::XForm > xForm(xIfc, uno::UNO_QUERY); - ASSERT( xForm.is(), "Wo ist die Form?" ); + OSL_ENSURE( xForm.is(), "Wo ist die Form?" ); if( xForm.is() ) { uno::Reference< container::XIndexContainer > xFormComps( xForm, uno::UNO_QUERY ); @@ -1400,7 +1399,7 @@ void SwHTMLWriter::GetControls() continue; const SdrObject *pSdrObj = pPosFlyFrm->GetSdrObject(); - ASSERT( pSdrObj, "Wo ist das SdrObject?" ); + OSL_ENSURE( pSdrObj, "Wo ist das SdrObject?" ); if( !pSdrObj ) continue; @@ -1444,3 +1443,4 @@ HTMLControl::~HTMLControl() {} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |