diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/html/SwAppletImpl.cxx | 14 | ||||
-rw-r--r-- | sw/source/filter/html/htmlform.cxx | 64 | ||||
-rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 36 | ||||
-rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 38 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 20 |
9 files changed, 93 insertions, 93 deletions
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 4f3432c20feb..a70bbce6e49c 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -137,14 +137,14 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName, uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( OUString("AppletCode"), uno::makeAny( rCode ) ); - xSet->setPropertyValue( OUString("AppletName"), uno::makeAny( rName ) ); - xSet->setPropertyValue( OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) ); - xSet->setPropertyValue( OUString("AppletDocBase"), uno::makeAny( sDocBase ) ); + xSet->setPropertyValue("AppletCode", uno::makeAny( rCode ) ); + xSet->setPropertyValue("AppletName", uno::makeAny( rName ) ); + xSet->setPropertyValue("AppletIsScript", uno::makeAny( sal_Bool(bMayScript) ) ); + xSet->setPropertyValue("AppletDocBase", uno::makeAny( sDocBase ) ); if ( !rCodeBase.isEmpty() ) - xSet->setPropertyValue( OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) ); + xSet->setPropertyValue("AppletCodeBase", uno::makeAny( rCodeBase ) ); else - xSet->setPropertyValue( OUString("AppletCodeBase"), uno::makeAny( sDocBase ) ); + xSet->setPropertyValue("AppletCodeBase", uno::makeAny( sDocBase ) ); } } #ifdef SOLAR_JAVA @@ -185,7 +185,7 @@ void SwApplet_Impl::FinishApplet() { uno::Sequence < beans::PropertyValue > aProps; aCommandList.FillSequence( aProps ); - xSet->setPropertyValue( OUString("AppletCommands"), uno::makeAny( aProps ) ); + xSet->setPropertyValue("AppletCommands", uno::makeAny( aProps ) ); } } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index ec85cccaf179..1f553615cd6d 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -623,25 +623,25 @@ static void lcl_html_setFixedFontProperty( DEFAULTFONT_FLAGS_ONLYONE ) ); Any aTmp; aTmp <<= OUString( aFixedFont.GetName() ); - rPropSet->setPropertyValue( OUString("FontName"), aTmp ); + rPropSet->setPropertyValue("FontName", aTmp ); aTmp <<= OUString( aFixedFont.GetStyleName() ); - rPropSet->setPropertyValue( OUString("FontStyleName"), + rPropSet->setPropertyValue("FontStyleName", aTmp ); aTmp <<= (sal_Int16) aFixedFont.GetFamily(); - rPropSet->setPropertyValue( OUString("FontFamily"), aTmp ); + rPropSet->setPropertyValue("FontFamily", aTmp ); aTmp <<= (sal_Int16) aFixedFont.GetCharSet(); - rPropSet->setPropertyValue( OUString("FontCharset"), + rPropSet->setPropertyValue("FontCharset", aTmp ); aTmp <<= (sal_Int16) aFixedFont.GetPitch(); - rPropSet->setPropertyValue( OUString("FontPitch"), aTmp ); + rPropSet->setPropertyValue("FontPitch", aTmp ); float fVal(10.); aTmp.setValue( &fVal, ::getCppuType(&fVal )); - rPropSet->setPropertyValue( OUString("FontHeight"), aTmp ); + rPropSet->setPropertyValue("FontHeight", aTmp ); } class SwHTMLFormPendingStackData_Impl: public SwPendingStackData @@ -1408,7 +1408,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend ) Any aTmp; aTmp <<= OUString(sName); - xFormPropSet->setPropertyValue( OUString("Name"), aTmp ); + xFormPropSet->setPropertyValue("Name", aTmp ); if( aAction.Len() ) { @@ -1421,12 +1421,12 @@ void SwHTMLParser::NewForm( sal_Bool bAppend ) aAction = aURLObj.GetPartBeforeLastName(); } aTmp <<= OUString(aAction); - xFormPropSet->setPropertyValue( OUString("TargetURL"), + xFormPropSet->setPropertyValue("TargetURL", aTmp ); FormSubmitMethod eMethod = (FormSubmitMethod)nMethod; aTmp.setValue( &eMethod, ::getCppuType((const FormSubmitMethod*)0) ); - xFormPropSet->setPropertyValue( OUString("SubmitMethod"), + xFormPropSet->setPropertyValue("SubmitMethod", aTmp ); FormSubmitEncoding eEncType = (FormSubmitEncoding)nEncType; @@ -1705,21 +1705,21 @@ void SwHTMLParser::InsertInput() Any aTmp; aTmp <<= OUString(sName); - xPropSet->setPropertyValue( OUString("Name"), aTmp ); + xPropSet->setPropertyValue("Name", aTmp ); if( HTML_IT_HIDDEN != eType ) { if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { aTmp <<= (sal_Int16) (sal_Int16)nTabIndex ; - xPropSet->setPropertyValue( OUString("TabIndex"), aTmp ); + xPropSet->setPropertyValue("TabIndex", aTmp ); } if( bDisabled ) { sal_Bool bFalse = sal_False; aTmp.setValue(&bFalse, ::getBooleanCppuType() ); - xPropSet->setPropertyValue( OUString("Enabled"), aTmp ); + xPropSet->setPropertyValue("Enabled", aTmp ); } } @@ -1736,10 +1736,10 @@ void SwHTMLParser::InsertInput() { if( !bValue ) aTmp <<= OUString( OOO_STRING_SVTOOLS_HTML_on ); - xPropSet->setPropertyValue( OUString("RefValue"), + xPropSet->setPropertyValue("RefValue", aTmp ); aTmp <<= OUString(); - xPropSet->setPropertyValue( OUString("Label"), + xPropSet->setPropertyValue("Label", aTmp ); // Beim RadioButton darf die DefaultChecked-Property // erst gesetzt werden, wenn das Control angelegt und ein @@ -1781,7 +1781,7 @@ void SwHTMLParser::InsertInput() OUString("ButtonType"), aTmp ); aTmp <<= (sal_Int16) 0 ; - xPropSet->setPropertyValue( OUString("Border"), + xPropSet->setPropertyValue("Border", aTmp ); } break; @@ -1810,7 +1810,7 @@ void SwHTMLParser::InsertInput() ; } aTmp <<= OUString(sText); - xPropSet->setPropertyValue( OUString("Label"), + xPropSet->setPropertyValue("Label", aTmp ); aTmp.setValue( &eButtonType, @@ -1842,7 +1842,7 @@ void SwHTMLParser::InsertInput() if( HTML_IT_PASSWORD == eType ) { aTmp <<= (sal_Int16)'*' ; - xPropSet->setPropertyValue( OUString("EchoChar"), + xPropSet->setPropertyValue("EchoChar", aTmp ); } @@ -1855,7 +1855,7 @@ void SwHTMLParser::InsertInput() break; case HTML_IT_HIDDEN: - xPropSet->setPropertyValue( OUString("HiddenValue"), + xPropSet->setPropertyValue("HiddenValue", aTmp ); bHidden = sal_True; break; @@ -1936,7 +1936,7 @@ void SwHTMLParser::InsertInput() if( HTML_IT_RADIO == eType ) { aTmp <<= (sal_Int16) nChecked ; - xPropSet->setPropertyValue( OUString("DefaultState"), aTmp ); + xPropSet->setPropertyValue("DefaultState", aTmp ); } if( HTML_IT_IMAGE == eType ) @@ -1945,7 +1945,7 @@ void SwHTMLParser::InsertInput() // Download der Grafik erst dann am XModel anmelden kann, // wenn das Control eingefuegt ist. aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link(), false)); - xPropSet->setPropertyValue( OUString("ImageURL"), + xPropSet->setPropertyValue("ImageURL", aTmp ); } @@ -2107,15 +2107,15 @@ void SwHTMLParser::NewTextArea() Any aTmp; aTmp <<= OUString(sName); - xPropSet->setPropertyValue( OUString("Name"), aTmp ); + xPropSet->setPropertyValue("Name", aTmp ); sal_Bool bTrue = sal_True; aTmp.setValue( &bTrue, ::getBooleanCppuType() ); - xPropSet->setPropertyValue( OUString("MultiLine"), + xPropSet->setPropertyValue("MultiLine", aTmp ); - xPropSet->setPropertyValue( OUString("VScroll"), aTmp ); + xPropSet->setPropertyValue("VScroll", aTmp ); if( HTML_WM_OFF == nWrap ) - xPropSet->setPropertyValue( OUString("HScroll"), + xPropSet->setPropertyValue("HScroll", aTmp ); if( HTML_WM_HARD == nWrap ) xPropSet->setPropertyValue( @@ -2124,7 +2124,7 @@ void SwHTMLParser::NewTextArea() if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { aTmp <<= (sal_Int16)nTabIndex ; - xPropSet->setPropertyValue( OUString("TabIndex"), + xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -2134,7 +2134,7 @@ void SwHTMLParser::NewTextArea() { sal_Bool bFalse = sal_False; aTmp.setValue( &bFalse, ::getBooleanCppuType() ); - xPropSet->setPropertyValue( OUString("Enabled"), + xPropSet->setPropertyValue("Enabled", aTmp ); } @@ -2202,7 +2202,7 @@ void SwHTMLParser::EndTextArea() Any aTmp; aTmp <<= OUString(pFormImpl->GetText()); - rPropSet->setPropertyValue( OUString("DefaultText"), + rPropSet->setPropertyValue("DefaultText", aTmp ); pFormImpl->EraseText(); @@ -2385,12 +2385,12 @@ void SwHTMLParser::NewSelect() Any aTmp; aTmp <<= OUString(sName); - xPropSet->setPropertyValue( OUString("Name"), aTmp ); + xPropSet->setPropertyValue("Name", aTmp ); if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { aTmp <<= (sal_Int16)nTabIndex ; - xPropSet->setPropertyValue( OUString("TabIndex"), + xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -2398,7 +2398,7 @@ void SwHTMLParser::NewSelect() { sal_Bool bFalse = sal_False; aTmp.setValue( &bFalse, ::getBooleanCppuType() ); - xPropSet->setPropertyValue( OUString("Enabled"), + xPropSet->setPropertyValue("Enabled", aTmp ); } @@ -2408,7 +2408,7 @@ void SwHTMLParser::NewSelect() { sal_Bool bTrue = sal_True; aTmp.setValue( &bTrue, ::getBooleanCppuType() ); - xPropSet->setPropertyValue( OUString("Dropdown"), + xPropSet->setPropertyValue("Dropdown", aTmp ); } else @@ -2519,7 +2519,7 @@ void SwHTMLParser::EndSelect() aAny.setValue( &aValueList, ::getCppuType((uno::Sequence<OUString>*)0) ); - rPropSet->setPropertyValue( OUString("ListSource"), + rPropSet->setPropertyValue("ListSource", aAny ); size_t nSelCnt = pFormImpl->GetSelectedList().size(); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 79afa49ea834..d976e1a7a53e 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -974,7 +974,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, append('=').append(TypeNames[eType]); } - aTmp = xPropSet->getPropertyValue( OUString("Name") ); + aTmp = xPropSet->getPropertyValue("Name"); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { @@ -986,7 +986,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sOut.append('\"'); } - aTmp = xPropSet->getPropertyValue( OUString("Enabled") ); + aTmp = xPropSet->getPropertyValue("Enabled"); if( aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue() ) { @@ -1314,7 +1314,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType ) { - aTmp = xPropSet->getPropertyValue(OUString("Label")); + aTmp = xPropSet->getPropertyValue("Label"); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && !((OUString*)aTmp.getValue())->isEmpty() ) { diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 6e5235f4ded2..d6f1a3a7df9f 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -417,15 +417,15 @@ void SwHTMLParser::InsertEmbed() if ( xSet.is() ) { if( bHasURL ) - xSet->setPropertyValue( OUString("PluginURL"), + xSet->setPropertyValue("PluginURL", uno::makeAny( OUString( aURL ) ) ); if( bHasType ) - xSet->setPropertyValue( OUString("PluginMimeType"), + xSet->setPropertyValue("PluginMimeType", uno::makeAny( OUString( aType ) ) ); uno::Sequence < beans::PropertyValue > aProps; aCmdLst.FillSequence( aProps ); - xSet->setPropertyValue( OUString("PluginCommands"), uno::makeAny( aProps ) ); + xSet->setPropertyValue("PluginCommands", uno::makeAny( aProps ) ); } } @@ -887,23 +887,23 @@ void SwHTMLParser::InsertFloatingFrame() sal_Bool bHasBorder = aFrameDesc.HasFrameBorder(); Size aMargin = aFrameDesc.GetMargin(); - xSet->setPropertyValue( OUString("FrameURL"), uno::makeAny( OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) ); - xSet->setPropertyValue( OUString("FrameName"), uno::makeAny( aName ) ); + xSet->setPropertyValue("FrameURL", uno::makeAny( OUString( aFrameDesc.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ) ) ); + xSet->setPropertyValue("FrameName", uno::makeAny( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( OUString("FrameIsAutoScroll"), + xSet->setPropertyValue("FrameIsAutoScroll", uno::makeAny( sal_True ) ); else - xSet->setPropertyValue( OUString("FrameIsScrollingMode"), + xSet->setPropertyValue("FrameIsScrollingMode", uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); - xSet->setPropertyValue( OUString("FrameIsBorder"), + xSet->setPropertyValue("FrameIsBorder", uno::makeAny( bHasBorder ) ); - xSet->setPropertyValue( OUString("FrameMarginWidth"), + xSet->setPropertyValue("FrameMarginWidth", uno::makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( OUString("FrameMarginHeight"), + xSet->setPropertyValue("FrameMarginHeight", uno::makeAny( sal_Int32( aMargin.Height() ) ) ); } } @@ -1023,7 +1023,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, OUString aStr; String aURL; - aAny = xSet->getPropertyValue( OUString("PluginURL") ); + aAny = xSet->getPropertyValue("PluginURL"); if( (aAny >>= aStr) && !aStr.isEmpty() ) { aURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), @@ -1040,7 +1040,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } OUString aType; - aAny = xSet->getPropertyValue( OUString("PluginMimeType") ); + aAny = xSet->getPropertyValue("PluginMimeType"); if( (aAny >>= aType) && !aType.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type) @@ -1072,7 +1072,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // CODEBASE OUString aCd; - aAny = xSet->getPropertyValue( OUString("AppletCodeBase") ); + aAny = xSet->getPropertyValue("AppletCodeBase"); if( (aAny >>= aCd) && !aCd.isEmpty() ) { String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) ); @@ -1088,7 +1088,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // CODE OUString aClass; - aAny = xSet->getPropertyValue( OUString("AppletCode") ); + aAny = xSet->getPropertyValue("AppletCode"); aAny >>= aClass; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code) .append("=\""); @@ -1098,7 +1098,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // NAME OUString aAppletName; - aAny = xSet->getPropertyValue( OUString("AppletName") ); + aAny = xSet->getPropertyValue("AppletName"); aAny >>= aAppletName; if( !aAppletName.isEmpty() ) { @@ -1110,7 +1110,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } sal_Bool bScript = sal_False; - aAny = xSet->getPropertyValue( OUString("AppletIsScript") ); + aAny = xSet->getPropertyValue("AppletIsScript"); aAny >>= bScript; if( bScript ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript); @@ -1149,7 +1149,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // und ein </APPLET> schreiben uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( OUString("AppletCommands") ); + aAny = xSet->getPropertyValue("AppletCommands"); aAny >>= aProps; SvCommandList aCommands; @@ -1208,7 +1208,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // fuer Plugins die Parameter als Optionen schreiben uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( OUString("PluginCommands") ); + aAny = xSet->getPropertyValue("PluginCommands"); aAny >>= aProps; SvCommandList aCommands; diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index d8a4faf258d2..c628862df1dc 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -408,7 +408,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, OUString aMime("application/binary"); uno::Any aAny2; aAny2 <<= aMime; - xSet->setPropertyValue( OUString("MediaType"), aAny2 ); + xSet->setPropertyValue("MediaType", aAny2 ); pDoc->WriteLayoutCache( *pStream ); } @@ -522,7 +522,7 @@ bool SwXMLWriter::WriteThroughComponent( OUString aMime("text/xml"); uno::Any aAny; aAny <<= aMime; - xSet->setPropertyValue( OUString("MediaType"), aAny ); + xSet->setPropertyValue("MediaType", aAny ); OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index fca627d3af85..84ab0971bf98 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -414,7 +414,7 @@ void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps) Reference< XMultiServiceFactory > xFac( GetModel(), UNO_QUERY ); if( xFac.is() ) { - Reference< XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY ); + Reference< XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), UNO_QUERY ); if( xProps.is() ) SvXMLUnitConverter::convertPropertySet( rProps, xProps ); } diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 2be3074a4004..c5f20d05c0b1 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1088,7 +1088,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC if( !xFac.is() ) return; - Reference< XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY ); + Reference< XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), UNO_QUERY ); if( !xProps.is() ) return; diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 54217e8d2e4b..3e7703538952 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -297,35 +297,35 @@ static void lcl_addFrameProperties( return; OUString aURL; - Any aAny = xSet->getPropertyValue( OUString("FrameURL") ); + Any aAny = xSet->getPropertyValue("FrameURL"); aAny >>= aURL; OUString aName; - aAny = xSet->getPropertyValue( OUString("FrameName")); + aAny = xSet->getPropertyValue("FrameName"); aAny >>= aName; sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode; - aAny = xSet->getPropertyValue( OUString("FrameIsAutoScroll")); + aAny = xSet->getPropertyValue("FrameIsAutoScroll"); aAny >>= bIsAutoScroll; if ( !bIsAutoScroll ) { - aAny = xSet->getPropertyValue( OUString("FrameIsScrollingMode") ); + aAny = xSet->getPropertyValue("FrameIsScrollingMode"); aAny >>= bIsScrollingMode; } sal_Bool bIsBorderSet, bIsAutoBorder = sal_False; - aAny = xSet->getPropertyValue( OUString("FrameIsAutoBorder") ); + aAny = xSet->getPropertyValue("FrameIsAutoBorder"); aAny >>= bIsAutoBorder; if ( !bIsAutoBorder ) { - aAny = xSet->getPropertyValue( OUString("FrameIsBorder") ); + aAny = xSet->getPropertyValue("FrameIsBorder"); aAny >>= bIsBorderSet; } sal_Int32 nWidth, nHeight; - aAny = xSet->getPropertyValue( OUString("FrameMarginWidth") ); + aAny = xSet->getPropertyValue("FrameMarginWidth"); aAny >>= nWidth; - aAny = xSet->getPropertyValue( OUString("FrameMarginHeight") ); + aAny = xSet->getPropertyValue("FrameMarginHeight"); aAny >>= nHeight; if( !bIsAutoScroll ) @@ -547,27 +547,27 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); OUString aStr; - Any aAny2 = xSet->getPropertyValue( OUString("AppletCodeBase") ); + Any aAny2 = xSet->getPropertyValue("AppletCodeBase"); aAny2 >>= aStr; if (!aStr.isEmpty() ) lcl_addURL(rXMLExport, aStr); - aAny2 = xSet->getPropertyValue( OUString("AppletName") ); + aAny2 = xSet->getPropertyValue("AppletName"); aAny2 >>= aStr; if (!aStr.isEmpty()) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr ); - aAny2 = xSet->getPropertyValue( OUString("AppletCode") ); + aAny2 = xSet->getPropertyValue("AppletCode"); aAny2 >>= aStr; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); sal_Bool bScript = sal_False; - aAny2 = xSet->getPropertyValue( OUString("AppletIsScript") ); + aAny2 = xSet->getPropertyValue("AppletIsScript"); aAny2 >>= bScript; rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bScript ? XML_TRUE : XML_FALSE ); uno::Sequence < beans::PropertyValue > aProps; - aAny2 = xSet->getPropertyValue( OUString("AppletCommands") ); + aAny2 = xSet->getPropertyValue("AppletCommands"); aAny2 >>= aProps; sal_Int32 i = aProps.getLength(); @@ -594,11 +594,11 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); OUString aStr; - Any aAny2 = xSet->getPropertyValue( OUString("PluginURL") ); + Any aAny2 = xSet->getPropertyValue("PluginURL"); aAny2 >>= aStr; lcl_addURL( rXMLExport, aStr ); - aAny2 = xSet->getPropertyValue( OUString("PluginMimeType") ); + aAny2 = xSet->getPropertyValue("PluginMimeType"); aAny2 >>= aStr; if (!aStr.isEmpty()) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr ); @@ -613,12 +613,12 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); OUString aStr; - Any aAny2 = xSet->getPropertyValue( OUString("FrameURL") ); + Any aAny2 = xSet->getPropertyValue("FrameURL"); aAny2 >>= aStr; lcl_addURL( rXMLExport, aStr ); - aAny2 = xSet->getPropertyValue( OUString("FrameName") ); + aAny2 = xSet->getPropertyValue("FrameName"); aAny2 >>= aStr; if (!aStr.isEmpty()) @@ -663,7 +663,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( OUString("AppletCommands") ); + aAny = xSet->getPropertyValue("AppletCommands"); aAny >>= aProps; sal_Int32 i = aProps.getLength(); @@ -689,7 +689,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( { uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY ); uno::Sequence < beans::PropertyValue > aProps; - aAny = xSet->getPropertyValue( OUString("PluginCommands") ); + aAny = xSet->getPropertyValue("PluginCommands"); aAny >>= aProps; sal_Int32 i = aProps.getLength(); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index a84f99c57a77..717c5949b604 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -716,10 +716,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( if ( xSet.is() ) { if( bValidURL ) - xSet->setPropertyValue( OUString("PluginURL"), + xSet->setPropertyValue("PluginURL", makeAny( OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); if( bValidMimeType ) - xSet->setPropertyValue( OUString("PluginMimeType"), + xSet->setPropertyValue("PluginMimeType", makeAny( OUString( rMimeType ) ) ); } @@ -846,31 +846,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( OUString("FrameURL"), + xSet->setPropertyValue("FrameURL", makeAny( OUString( URIHelper::SmartRel2Abs( INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) ) ); - xSet->setPropertyValue( OUString("FrameName"), + xSet->setPropertyValue("FrameName", makeAny( OUString( rName ) ) ); if ( eScrollMode == ScrollingAuto ) - xSet->setPropertyValue( OUString("FrameIsAutoScroll"), + xSet->setPropertyValue("FrameIsAutoScroll", makeAny( sal_True ) ); else - xSet->setPropertyValue( OUString("FrameIsScrollingMode"), + xSet->setPropertyValue("FrameIsScrollingMode", makeAny( (sal_Bool) (eScrollMode == ScrollingYes) ) ); if ( bIsBorderSet ) - xSet->setPropertyValue( OUString("FrameIsBorder"), + xSet->setPropertyValue("FrameIsBorder", makeAny( bHasBorder ) ); else - xSet->setPropertyValue( OUString("FrameIsAutoBorder"), + xSet->setPropertyValue("FrameIsAutoBorder", makeAny( sal_True ) ); - xSet->setPropertyValue( OUString("FrameMarginWidth"), + xSet->setPropertyValue("FrameMarginWidth", makeAny( sal_Int32( aMargin.Width() ) ) ); - xSet->setPropertyValue( OUString("FrameMarginHeight"), + xSet->setPropertyValue("FrameMarginHeight", makeAny( sal_Int32( aMargin.Height() ) ) ); } |