summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlplug.cxx
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-06-29 21:24:12 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-06-29 21:52:54 +0000
commitba0a57702cdef7a0389c06841711d7e3079d471c (patch)
tree223c0dd50de4b71cf7df9d0073f7cacca1f18c8d /sw/source/filter/html/htmlplug.cxx
parent8a7ede404ca4980f169c4ce634805ea5c1b6b56e (diff)
remove OUString wrap for string literals
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw/source/filter/html/htmlplug.cxx')
-rw-r--r--sw/source/filter/html/htmlplug.cxx36
1 files changed, 18 insertions, 18 deletions
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;