summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r--sw/source/filter/xml/swxml.cxx22
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx60
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx69
-rw-r--r--sw/source/filter/xml/xmltexte.cxx40
-rw-r--r--sw/source/filter/xml/xmltexti.cxx26
7 files changed, 112 insertions, 113 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 83b4acabd85b..d5d46ac144f6 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -361,7 +361,7 @@ sal_Int32 ReadThroughComponent(
uno::Reference <beans::XPropertySet > xProps( xStream, uno::UNO_QUERY );
Any aAny = xProps->getPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) );
+ OUString("Encrypted") );
bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() &&
*(sal_Bool *)aAny.getValue();
@@ -699,7 +699,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW );
beans::NamedValue aLateInitSettings(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LateInitSettings" ) ),
+ ::rtl::OUString( "LateInitSettings" ),
makeAny( xLateInitSettings )
);
@@ -732,19 +732,19 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
OUString *pSeq = aFamiliesSeq.getArray();
if( aOpt.IsFrmFmts() )
// SFX_STYLE_FAMILY_FRAME;
- *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles"));
+ *pSeq++ = OUString("FrameStyles");
if( aOpt.IsPageDescs() )
// SFX_STYLE_FAMILY_PAGE;
- *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"));
+ *pSeq++ = OUString("PageStyles");
if( aOpt.IsTxtFmts() )
{
// (SFX_STYLE_FAMILY_CHAR|SFX_STYLE_FAMILY_PARA);
- *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles"));
- *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles"));
+ *pSeq++ = OUString("CharacterStyles");
+ *pSeq++ = OUString("ParagraphStyles");
}
if( aOpt.IsNumRules() )
// SFX_STYLE_FAMILY_PSEUDO;
- *pSeq++ = OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyles"));
+ *pSeq++ = OUString("NumberingStyles");
OUString sStyleInsertModeFamilies(
RTL_CONSTASCII_USTRINGPARAM("StyleInsertModeFamilies"));
@@ -815,12 +815,12 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
}
else
{
- StreamPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName"));
+ StreamPath = ::rtl::OUString("dummyObjectName");
}
if( !StreamPath.isEmpty() )
{
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
+ sPropName = OUString("StreamRelPath");
xInfoSet->setPropertyValue( sPropName, makeAny( StreamPath ) );
}
}
@@ -852,13 +852,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
{
const sal_Bool bShapePositionInHoriL2R = !bOASIS;
xInfoSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ShapePositionInHoriL2R")),
+ OUString("ShapePositionInHoriL2R"),
makeAny( bShapePositionInHoriL2R ) );
}
{
const sal_Bool bTextDocInOOoFileFormat = !bOASIS;
xInfoSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TextDocInOOoFileFormat")),
+ OUString("TextDocInOOoFileFormat"),
makeAny( bTextDocInOOoFileFormat ) );
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 6f8b0cd3679f..adb314ea82ed 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -221,9 +221,9 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
if ( !aDocHierarchicalName.isEmpty() )
aName = aDocHierarchicalName;
else
- aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ) );
+ aName = ::rtl::OUString( "dummyObjectName" );
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
+ sPropName = OUString("StreamRelPath");
xInfoSet->setPropertyValue( sPropName, makeAny( aName ) );
}
@@ -292,7 +292,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
if( pOrigFileName )
{
PropertyValue *pProps = aProps.getArray();
- pProps->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FileName") );
+ pProps->Name = OUString("FileName");
(pProps++)->Value <<= OUString( *pOrigFileName );
}
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 1d508071057c..3cb4fb7e0a80 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -362,7 +362,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
sal_Int32 nIndex = 0;
Reference < XIndexContainer > xBox = IndexedPropertyValues::create( comphelper::getProcessComponentContext() );
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "Views") );
+ pValue[nIndex].Name = OUString( "Views");
pValue[nIndex++].Value <<= Reference < XIndexAccess > ( xBox, UNO_QUERY );
SwDoc *pDoc = getDoc();
@@ -372,16 +372,16 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" );
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaTop") );
+ pValue[nIndex].Name = OUString( "ViewAreaTop");
pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Top() ) : rRect.Top();
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaLeft") );
+ pValue[nIndex].Name = OUString( "ViewAreaLeft");
pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Left() ) : rRect.Left();
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaWidth") );
+ pValue[nIndex].Name = OUString( "ViewAreaWidth");
pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.GetWidth() ) : rRect.GetWidth();
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaHeight") );
+ pValue[nIndex].Name = OUString( "ViewAreaHeight");
pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.GetHeight() ) : rRect.GetHeight();
// "show redline mode" cannot simply be read from the document
@@ -399,11 +399,11 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
}
}
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ShowRedlineChanges") );
+ pValue[nIndex].Name = OUString( "ShowRedlineChanges");
pValue[nIndex++].Value.setValue( &bShowRedlineChanges, ::getBooleanCppuType() );
sal_Bool bInBrowse = pDoc->get(IDocumentSettingAccess::BROWSE_MODE);
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "InBrowseMode") );
+ pValue[nIndex].Name = OUString( "InBrowseMode");
pValue[nIndex++].Value.setValue( &bInBrowse, ::getBooleanCppuType() );
if ( nIndex < NUM_EXPORTED_VIEW_SETTINGS )
@@ -416,7 +416,7 @@ void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps)
Reference< XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
if( xFac.is() )
{
- Reference< XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), UNO_QUERY );
+ Reference< XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY );
if( xProps.is() )
SvXMLUnitConverter::convertPropertySet( rProps, xProps );
}
@@ -521,8 +521,8 @@ void SwXMLExport::_ExportContent()
// OOo
OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportOOO_getSupportedServiceNames()
@@ -542,8 +542,8 @@ Reference< XInterface > SAL_CALL SwXMLExportOOO_createInstance(
OUString SAL_CALL SwXMLExportStylesOOO_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLStylesExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLStylesExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportStylesOOO_getSupportedServiceNames()
@@ -565,8 +565,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(
OUString SAL_CALL SwXMLExportContentOOO_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLContentExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLContentExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportContentOOO_getSupportedServiceNames()
@@ -588,8 +588,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(
OUString SAL_CALL SwXMLExportMetaOOO_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLMetaExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLMetaExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportMetaOOO_getSupportedServiceNames()
@@ -609,8 +609,8 @@ Reference< XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(
OUString SAL_CALL SwXMLExportSettingsOOO_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLSettingsExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLSettingsExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportSettingsOOO_getSupportedServiceNames()
@@ -631,8 +631,8 @@ Reference< XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(
// OASIS
OUString SAL_CALL SwXMLExport_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExport_getSupportedServiceNames()
@@ -652,8 +652,8 @@ Reference< XInterface > SAL_CALL SwXMLExport_createInstance(
OUString SAL_CALL SwXMLExportStyles_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisStylesExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisStylesExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportStyles_getSupportedServiceNames()
@@ -675,8 +675,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance(
OUString SAL_CALL SwXMLExportContent_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisContentExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisContentExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportContent_getSupportedServiceNames()
@@ -699,8 +699,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance(
OUString SAL_CALL SwXMLExportMeta_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisMetaExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisMetaExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportMeta_getSupportedServiceNames()
@@ -720,8 +720,8 @@ Reference< XInterface > SAL_CALL SwXMLExportMeta_createInstance(
OUString SAL_CALL SwXMLExportSettings_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisSettingsExporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisSettingsExporter" );
}
Sequence< OUString > SAL_CALL SwXMLExportSettings_getSupportedServiceNames()
@@ -781,8 +781,8 @@ OUString SAL_CALL SwXMLExport::getImplementationName()
return SwXMLExportSettings_getImplementationName();
default:
// generic name for 'unknown' cases
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.SwXMLExport" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.SwXMLExport" );
}
}
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 205b04600c22..07d81cf9b336 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -919,7 +919,7 @@ OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const
{
String sServiceName;
if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
- sServiceName = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle") );
+ sServiceName = OUString("com.sun.star.style.FrameStyle");
else
sServiceName = SvXMLStylesContext::GetServiceName( nFamily );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 558fbb70ab2f..3adac9ab2faa 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1094,7 +1094,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
if( !xFac.is() )
return;
- Reference< XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), UNO_QUERY );
+ Reference< XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY );
if( !xProps.is() )
return;
@@ -1294,26 +1294,26 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
sal_Int16 nTmp = document::PrinterIndependentLayout::DISABLED;
aAny <<= nTmp;
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("PrinterIndependentLayout") ),
+ OUString("PrinterIndependentLayout"),
aAny );
}
if( ! bAddExternalLeading )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("AddExternalLeading")), makeAny( false ) );
+ OUString("AddExternalLeading"), makeAny( false ) );
}
if( ! bUseFormerLineSpacing )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UseFormerLineSpacing")), makeAny( true ) );
+ OUString("UseFormerLineSpacing"), makeAny( true ) );
}
if( !bUseFormerObjectPositioning )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UseFormerObjectPositioning")), makeAny( true ) );
+ OUString("UseFormerObjectPositioning"), makeAny( true ) );
}
if( !bUseOldNumbering )
@@ -1322,7 +1322,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
sal_Bool bOldNum = true;
aAny.setValue(&bOldNum, ::getBooleanCppuType());
xProps->setPropertyValue
- (OUString( RTL_CONSTASCII_USTRINGPARAM("UseOldNumbering")),
+ (OUString("UseOldNumbering"),
aAny );
}
@@ -1332,27 +1332,26 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
sal_Bool bTmp = true;
aAny.setValue(&bTmp, ::getBooleanCppuType());
xProps->setPropertyValue
- (OUString( RTL_CONSTASCII_USTRINGPARAM
- ("OutlineLevelYieldsNumbering")),
+ (OUString("OutlineLevelYieldsNumbering"),
aAny );
}
if( !bAddParaSpacingToTableCells )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("AddParaSpacingToTableCells")), makeAny( false ) );
+ OUString("AddParaSpacingToTableCells"), makeAny( false ) );
}
if( !bUseFormerTextWrapping )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UseFormerTextWrapping")), makeAny( true ) );
+ OUString("UseFormerTextWrapping"), makeAny( true ) );
}
if( !bConsiderWrapOnObjPos )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ConsiderTextWrapOnObjPos")), makeAny( false ) );
+ OUString("ConsiderTextWrapOnObjPos"), makeAny( false ) );
}
// #i47448#
@@ -1369,53 +1368,53 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
if( !bIgnoreFirstLineIndentInNumbering && bDocumentPriorSO8 )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("IgnoreFirstLineIndentInNumbering")), makeAny( true ) );
+ OUString("IgnoreFirstLineIndentInNumbering"), makeAny( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bDoNotJustifyLinesWithManualBreak && bDocumentPriorSO8 )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotJustifyLinesWithManualBreak")), makeAny( true ) );
+ OUString("DoNotJustifyLinesWithManualBreak"), makeAny( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bDoNotResetParaAttrsForNumFont && bDocumentPriorSO8 )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotResetParaAttrsForNumFont")), makeAny( true ) );
+ OUString("DoNotResetParaAttrsForNumFont"), makeAny( true ) );
}
if ( !bLoadReadonly )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("LoadReadonly") ), makeAny( false ) );
+ OUString("LoadReadonly"), makeAny( false ) );
}
// This flag has to be set for all documents < SO8
if ( !bDoNotCaptureDrawObjsOnPage && bDocumentPriorSO8 )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("DoNotCaptureDrawObjsOnPage") ), makeAny( true ) );
+ OUString("DoNotCaptureDrawObjsOnPage"), makeAny( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bClipAsCharacterAnchoredWriterFlyFrames && bDocumentPriorSO8 )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ClipAsCharacterAnchoredWriterFlyFrames") ), makeAny( true ) );
+ OUString("ClipAsCharacterAnchoredWriterFlyFrames"), makeAny( true ) );
}
if ( !bUnixForceZeroExtLeading )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UnxForceZeroExtLeading") ), makeAny( true ) );
+ OUString("UnxForceZeroExtLeading"), makeAny( true ) );
}
if ( !bUseOldPrinterMetrics )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UseOldPrinterMetrics") ), makeAny( true ) );
+ OUString("UseOldPrinterMetrics"), makeAny( true ) );
}
// Old LO versions had 66 as the value for small caps percentage, later changed to 80.
@@ -1425,25 +1424,25 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
if ( !bSmallCapsPercentage66 )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("SmallCapsPercentage66") ), makeAny( true ) );
+ OUString("SmallCapsPercentage66"), makeAny( true ) );
}
if ( !bTabOverflow )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("TabOverflow") ), makeAny( false ) );
+ OUString("TabOverflow"), makeAny( false ) );
}
if ( !bUnbreakableNumberings )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("UnbreakableNumberings") ), makeAny( false ) );
+ OUString("UnbreakableNumberings"), makeAny( false ) );
}
if ( !bClippedPictures )
{
xProps->setPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("ClippedPictures") ), makeAny( false ) );
+ OUString("ClippedPictures"), makeAny( false ) );
}
if ( !bBackgroundParaOverDrawings )
@@ -1545,8 +1544,8 @@ void SwXMLImport::initialize(
OUString SAL_CALL SwXMLImport_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisImporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisImporter" );
}
uno::Sequence< OUString > SAL_CALL SwXMLImport_getSupportedServiceNames()
@@ -1566,8 +1565,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(
OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisStylesImporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisStylesImporter" );
}
uno::Sequence< OUString > SAL_CALL SwXMLImportStyles_getSupportedServiceNames()
@@ -1590,8 +1589,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(
OUString SAL_CALL SwXMLImportContent_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisContentImporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisContentImporter" );
}
uno::Sequence< OUString > SAL_CALL SwXMLImportContent_getSupportedServiceNames()
@@ -1614,8 +1613,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(
OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisMetaImporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisMetaImporter" );
}
uno::Sequence< OUString > SAL_CALL SwXMLImportMeta_getSupportedServiceNames()
@@ -1635,8 +1634,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(
OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisSettingsImporter" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.XMLOasisSettingsImporter" );
}
uno::Sequence< OUString > SAL_CALL SwXMLImportSettings_getSupportedServiceNames()
@@ -1674,8 +1673,8 @@ OUString SAL_CALL SwXMLImport::getImplementationName()
return SwXMLImportSettings_getImplementationName();
default:
// generic name for 'unknown' cases
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.SwXMLImport" ) );
+ return OUString(
+ "com.sun.star.comp.Writer.SwXMLImport" );
}
}
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 70df7066ef84..36b6efebffe7 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -301,35 +301,35 @@ static void lcl_addFrameProperties(
return;
::rtl::OUString aURL;
- Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
+ Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") );
aAny >>= aURL;
::rtl::OUString aName;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")));
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName"));
aAny >>= aName;
sal_Bool bIsAutoScroll = sal_False, bIsScrollingMode;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")));
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll"));
aAny >>= bIsAutoScroll;
if ( !bIsAutoScroll )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") );
aAny >>= bIsScrollingMode;
}
sal_Bool bIsBorderSet, bIsAutoBorder = sal_False;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") );
aAny >>= bIsAutoBorder;
if ( !bIsAutoBorder )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") );
aAny >>= bIsBorderSet;
}
sal_Int32 nWidth, nHeight;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") );
aAny >>= nWidth;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") );
aAny >>= nHeight;
if( !bIsAutoScroll )
@@ -551,27 +551,27 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
::rtl::OUString aStr;
- Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")) );
+ Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCodeBase") );
aAny2 >>= aStr;
if (!aStr.isEmpty() )
lcl_addURL(rXMLExport, aStr);
- aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")) );
+ aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletName") );
aAny2 >>= aStr;
if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr );
- aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")) );
+ aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCode") );
aAny2 >>= aStr;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr );
sal_Bool bScript = sal_False;
- aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")) );
+ aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletIsScript") );
aAny2 >>= bScript;
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bScript ? XML_TRUE : XML_FALSE );
uno::Sequence < beans::PropertyValue > aProps;
- aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")) );
+ aAny2 = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") );
aAny2 >>= aProps;
sal_Int32 i = aProps.getLength();
@@ -598,11 +598,11 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
::rtl::OUString aStr;
- Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")) );
+ Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginURL") );
aAny2 >>= aStr;
lcl_addURL( rXMLExport, aStr );
- aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")) );
+ aAny2 = xSet->getPropertyValue( ::rtl::OUString("PluginMimeType") );
aAny2 >>= aStr;
if (!aStr.isEmpty())
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr );
@@ -617,12 +617,12 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
::rtl::OUString aStr;
- Any aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
+ Any aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameURL") );
aAny2 >>= aStr;
lcl_addURL( rXMLExport, aStr );
- aAny2 = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
+ aAny2 = xSet->getPropertyValue( ::rtl::OUString("FrameName") );
aAny2 >>= aStr;
if (!aStr.isEmpty())
@@ -656,7 +656,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
sURL += rOLEObj.GetCurrentPersistName();
if ( ( rXMLExport.getExportFlags() & EXPORT_OASIS ) == 0 )
- sURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "?oasis=false" ) );
+ sURL += ::rtl::OUString( "?oasis=false" );
rXMLExport.AddEmbeddedObjectAsBase64( sURL );
}
@@ -667,7 +667,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
uno::Sequence < beans::PropertyValue > aProps;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("AppletCommands") );
aAny >>= aProps;
sal_Int32 i = aProps.getLength();
@@ -693,7 +693,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
uno::Reference < beans::XPropertySet > xSet( rObjRef->getComponent(), uno::UNO_QUERY );
uno::Sequence < beans::PropertyValue > aProps;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("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 7f59deb0a96a..e2f5b0d0e74c 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -572,7 +572,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
embed::OOoEmbeddedObjectFactory::create(::comphelper::getProcessComponentContext());
uno::Sequence< beans::PropertyValue > aMediaDescriptor( 1 );
- aMediaDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+ aMediaDescriptor[0].Name = ::rtl::OUString("URL");
aMediaDescriptor[0].Value <<= ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
if ( pDoc && pDoc->GetDocShell() && pDoc->GetDocShell()->GetMedium() )
{
@@ -581,7 +581,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
if ( xInteraction.is() )
{
aMediaDescriptor.realloc( 2 );
- aMediaDescriptor[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ) );
+ aMediaDescriptor[1].Name = ::rtl::OUString( "InteractionHandler" );
aMediaDescriptor[1].Value <<= xInteraction;
}
}
@@ -718,10 +718,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
if ( xSet.is() )
{
if( bValidURL )
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")),
+ xSet->setPropertyValue( ::rtl::OUString("PluginURL"),
makeAny( ::rtl::OUString( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
if( bValidMimeType )
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMimeType")),
+ xSet->setPropertyValue( ::rtl::OUString("PluginMimeType"),
makeAny( ::rtl::OUString( rMimeType ) ) );
}
@@ -848,31 +848,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameURL"),
makeAny( ::rtl::OUString( URIHelper::SmartRel2Abs(
INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) ) );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameName"),
makeAny( ::rtl::OUString( rName ) ) );
if ( eScrollMode == ScrollingAuto )
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoScroll"),
makeAny( sal_True ) );
else
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameIsScrollingMode"),
makeAny( (sal_Bool) (eScrollMode == ScrollingYes) ) );
if ( bIsBorderSet )
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameIsBorder"),
makeAny( bHasBorder ) );
else
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameIsAutoBorder"),
makeAny( sal_True ) );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameMarginWidth"),
makeAny( sal_Int32( aMargin.Width() ) ) );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")),
+ xSet->setPropertyValue( ::rtl::OUString("FrameMarginHeight"),
makeAny( sal_Int32( aMargin.Height() ) ) );
}
@@ -942,7 +942,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
}
catch ( uno::Exception& )
{
- aParaName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands"));
+ aParaName = ::rtl::OUString("PluginCommands");
try
{
xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
generated by cgit (git 2.34.1) at 2024-07-24 22:02:09 +0000