summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 15:26:21 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 16:48:34 -0500
commitd29d9399d48f85989cc8040f5ba334c38b40a544 (patch)
treef750a00c228781b218afb903b15cdd86de2ed417 /xmloff
parent0aca9731819acdc5e0369aef0c86725d939c4f5c (diff)
targeted string re-work
Change-Id: I342f1b8ac6c8205b6c587578a6b10a6ca51758fa
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/meta/xmlversion.cxx18
-rw-r--r--xmloff/source/style/xmlbahdl.cxx10
-rw-r--r--xmloff/source/style/xmlnumfe.cxx2
-rw-r--r--xmloff/source/style/xmlnumi.cxx87
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.cxx12
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx14
-rw-r--r--xmloff/source/text/txtfldi.cxx214
-rw-r--r--xmloff/source/text/txtimp.cxx98
-rw-r--r--xmloff/source/text/txtlists.cxx5
-rw-r--r--xmloff/source/text/txtparae.cxx234
-rw-r--r--xmloff/source/text/txtparai.cxx70
-rw-r--r--xmloff/source/text/txtvfldi.cxx76
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx2
-rw-r--r--xmloff/source/transform/TransformerBase.cxx18
15 files changed, 410 insertions, 452 deletions
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 3940fddf3771..c5701d0cf8bb 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -357,12 +357,12 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
DBG_ASSERT( xServiceFactory.is(), "XMLReader::Read: got no service manager" );
Reference< XInterface > xWriter (xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))));
+ OUString("com.sun.star.xml.sax.Writer")));
DBG_ASSERT( xWriter.is(), "com.sun.star.xml.sax.Writer service missing" );
// check whether there's already a sub storage with the version info
// and delete it
- OUString sVerName( RTL_CONSTASCII_USTRINGPARAM( XMLN_VERSIONSLIST ) );
+ OUString sVerName( XMLN_VERSIONSLIST );
try {
// open (create) the sub storage with the version info
@@ -400,7 +400,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
{
com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag > aVersions;
- const OUString sDocName( RTL_CONSTASCII_USTRINGPARAM( XMLN_VERSIONSLIST ) );
+ const OUString sDocName( XMLN_VERSIONSLIST );
uno::Reference< container::XNameAccess > xRootNames( xRoot, uno::UNO_QUERY );
try {
@@ -417,7 +417,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
if ( xProps.is() )
{
try {
- xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= aParserInput.sSystemId;
+ xProps->getPropertyValue( ::rtl::OUString("URL") ) >>= aParserInput.sSystemId;
}
catch( uno::Exception& )
{}
@@ -437,7 +437,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
// get parser
Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
+ OUString("com.sun.star.xml.sax.Parser") );
DBG_ASSERT( xXMLParser.is(),
"XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
@@ -470,14 +470,14 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLVersionListPersistence_getSupportedSe
throw()
{
const rtl::OUString aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.DocumentRevisionListPersistence" ) );
+ "com.sun.star.document.DocumentRevisionListPersistence" );
const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
rtl::OUString SAL_CALL XMLVersionListPersistence_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLVersionListPersistence" ) );
+ return rtl::OUString( "XMLVersionListPersistence" );
}
uno::Reference< uno::XInterface > SAL_CALL XMLVersionListPersistence_createInstance(
@@ -491,14 +491,14 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLVersionImExportOOO_getSupportedServic
throw()
{
const rtl::OUString aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.DocumentRevisionListPersistence" ) );
+ "com.sun.star.document.DocumentRevisionListPersistence" );
const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
rtl::OUString SAL_CALL XMLVersionImExportOOO_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLVersionImExportOOo" ) );
+ return rtl::OUString( "XMLVersionImExportOOo" );
}
uno::Reference< uno::XInterface > SAL_CALL XMLVersionImExportOOO_createInstance(
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 8535c0b818d0..f4892fffc5c9 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -499,7 +499,7 @@ sal_Bool XMLColorPropHdl::importXML( const OUString& rStrImpValue, Any& rValue,
{
sal_Bool bRet = sal_False;
- const OUString astrHSL( RTL_CONSTASCII_USTRINGPARAM( "hsl" ) );
+ const OUString astrHSL( "hsl" );
if( rStrImpValue.matchIgnoreAsciiCase( astrHSL ) )
{
sal_Int32 nOpen = rStrImpValue.indexOf( '(' );
@@ -547,13 +547,13 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
Sequence< double > aHSL;
if( (rValue >>= aHSL) && (aHSL.getLength() == 3) )
{
- aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("hsl(")) );
+ aOut.append( OUString("hsl(") );
aOut.append( aHSL[0] );
- aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM(",")) );
+ aOut.append( OUString(",") );
aOut.append( aHSL[1] * 100.0 );
- aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("%,")) );
+ aOut.append( OUString("%,") );
aOut.append( aHSL[2] * 100.0 );
- aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("%)")) );
+ aOut.append( OUString("%)") );
rStrExpValue = aOut.makeStringAndClear();
bRet = sal_True;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index e44afb53e924..c4f93608ba15 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -232,7 +232,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
SvXMLExport& rExp,
const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
rExport( rExp ),
- sPrefix( OUString(RTL_CONSTASCII_USTRINGPARAM("N")) ),
+ sPrefix( OUString("N") ),
pFormatter( NULL ),
pCharClass( NULL ),
pLocaleData( NULL )
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index eddf113f6eb0..3c2d8badc73a 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -306,9 +306,9 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
const Reference< xml::sax::XAttributeList > & xAttrList )
: SvXMLImportContext( rImport, nPrfx, rLName )
-, sStarBats( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) )
-, sStarMath( RTL_CONSTASCII_USTRINGPARAM( "StarMath" ) )
-, sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM("1")) )
+, sStarBats( "StarBats" )
+, sStarMath( "StarMath" )
+, sNumFormat( OUString("1") )
, nLevel( -1L )
, nSpaceBefore( 0L )
, nMinLabelWidth( 0L )
@@ -510,47 +510,47 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
beans::PropertyValue *pProps = aPropSeq.getArray();
sal_Int32 nPos = 0;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
+ OUString(XML_UNO_NAME_NRULE_NUMBERINGTYPE );
pProps[nPos++].Value <<= (sal_Int16)eType ;
- pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_PREFIX ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_PREFIX );
pProps[nPos++].Value <<= sPrefix;
- pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_SUFFIX ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_SUFFIX );
pProps[nPos++].Value <<= sSuffix;
- pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_ADJUST ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_ADJUST );
pProps[nPos++].Value <<= eAdjust;
sal_Int32 nLeftMargin = nSpaceBefore + nMinLabelWidth;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_LEFT_MARGIN ));
+ OUString(XML_UNO_NAME_NRULE_LEFT_MARGIN );
pProps[nPos++].Value <<= (sal_Int32)nLeftMargin;
sal_Int32 nFirstLineOffset = -nMinLabelWidth;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET ));
+ OUString(XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET );
pProps[nPos++].Value <<= (sal_Int32)nFirstLineOffset;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE));
+ OUString(XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE);
pProps[nPos++].Value <<= (sal_Int16)nMinLabelDist;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE));
+ OUString(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE);
pProps[nPos++].Value <<= (sal_Int16)ePosAndSpaceMode;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY));
+ OUString(XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY);
pProps[nPos++].Value <<= (sal_Int16)eLabelFollowedBy;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION));
+ OUString(XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION);
pProps[nPos++].Value <<= (sal_Int32)nListtabStopPosition;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_FIRST_LINE_INDENT));
+ OUString(XML_UNO_NAME_NRULE_FIRST_LINE_INDENT);
pProps[nPos++].Value <<= (sal_Int32)nFirstLineIndent;
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_INDENT_AT));
+ OUString(XML_UNO_NAME_NRULE_INDENT_AT);
pProps[nPos++].Value <<= (sal_Int32)nIndentAt;
OUString sDisplayTextStyleName = GetImport().GetStyleDisplayName(
@@ -559,7 +559,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
if( !sStyleName.isEmpty() && pI18NMap )
sStyleName = pI18NMap->Get( SFX_STYLE_FAMILY_CHAR, sStyleName );
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME ));
+ OUString(XML_UNO_NAME_NRULE_CHAR_STYLE_NAME );
pProps[nPos++].Value <<= sDisplayTextStyleName;
if( bBullet )
@@ -585,8 +585,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
bStarSymbol = sal_True;
}
if( bStarSymbol )
- aFDesc.Name =
- OUString( RTL_CONSTASCII_USTRINGPARAM("StarSymbol" ) );
+ aFDesc.Name = OUString( "StarSymbol" );
}
if( cBullet )
@@ -594,12 +593,11 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
OUStringBuffer sTmp(1);
sTmp.append( cBullet );
pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_CHAR ));
+ OUString(XML_UNO_NAME_NRULE_BULLET_CHAR );
pProps[nPos++].Value <<= sTmp.makeStringAndClear();
}
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_BULLET_FONT );
pProps[nPos++].Value <<= aFDesc;
}
@@ -619,42 +617,36 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
if( !sStr.isEmpty() )
{
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_GRAPHICURL ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_GRAPHICURL );
pProps[nPos++].Value <<= sStr;
}
awt::Size aSize( nImageWidth, nImageHeight );
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_GRAPHIC_SIZE ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_GRAPHIC_SIZE );
pProps[nPos++].Value <<= aSize;
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_VERT_ORIENT ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_VERT_ORIENT );
pProps[nPos++].Value <<= (sal_Int16)eImageVertOrient;
}
if( bNum )
{
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_START_WITH ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_START_WITH );
pProps[nPos++].Value <<= (sal_Int16)nNumStartValue;
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_PARENT_NUMBERING));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_PARENT_NUMBERING);
pProps[nPos++].Value <<= (sal_Int16)nNumDisplayLevels;
}
if( ( bNum || bBullet ) && nRelSize )
{
- pProps[nPos].Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_RELSIZE ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_BULLET_RELSIZE );
pProps[nPos++].Value <<= nRelSize;
}
if( !bImage && bHasColor )
{
- pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_COLOR ));
+ pProps[nPos].Name = OUString(XML_UNO_NAME_NRULE_BULLET_COLOR );
pProps[nPos++].Value <<= m_nColor;
}
@@ -1109,10 +1101,10 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_Bool bOutl )
: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST )
-, sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) )
-, sNumberingRules( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) )
-, sName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) )
-, sIsContinuousNumbering( RTL_CONSTASCII_USTRINGPARAM( "IsContinuousNumbering" ) )
+, sIsPhysical( "IsPhysical" )
+, sNumberingRules( "NumberingRules" )
+, sName( "Name" )
+, sIsContinuousNumbering( "IsContinuousNumbering" )
, pLevelStyles( 0 )
, nLevels( 0 )
, bConsecutive( sal_False )
@@ -1260,7 +1252,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite )
if( !xFactory.is() )
return;
- Reference < XInterface > xIfc = xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.NumberingStyle")) );
+ Reference < XInterface > xIfc = xFactory->createInstance(OUString("com.sun.star.style.NumberingStyle") );
if( !xIfc.is() )
return;
Reference < XStyle > xTmp( xIfc, UNO_QUERY );
@@ -1333,7 +1325,7 @@ Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule(
if( !xFactory.is() )
return xNumRule;
- Reference < XInterface > xIfc = xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.NumberingRules")) );
+ Reference < XInterface > xIfc = xFactory->createInstance(OUString("com.sun.star.text.NumberingRules") );
if( !xIfc.is() )
return xNumRule;
@@ -1352,7 +1344,7 @@ void SvxXMLListStyleContext::SetDefaultStyle(
beans::PropertyValue *pProps = aPropSeq.getArray();
pProps->Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
+ OUString(XML_UNO_NAME_NRULE_NUMBERINGTYPE );
(pProps++)->Value <<= (sal_Int16)(bOrdered ? NumberingType::ARABIC
: NumberingType::CHAR_SPECIAL );
if( !bOrdered )
@@ -1361,9 +1353,9 @@ void SvxXMLListStyleContext::SetDefaultStyle(
awt::FontDescriptor aFDesc;
aFDesc.Name = OUString(
#if defined UNX
- RTL_CONSTASCII_USTRINGPARAM( "starbats" )
+ "starbats"
#else
- RTL_CONSTASCII_USTRINGPARAM( "StarBats" )
+ "StarBats"
#endif
);
aFDesc.Family = FAMILY_DONTKNOW ;
@@ -1371,18 +1363,17 @@ void SvxXMLListStyleContext::SetDefaultStyle(
aFDesc.CharSet = RTL_TEXTENCODING_SYMBOL ;
aFDesc.Weight = WEIGHT_DONTKNOW;
pProps->Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
+ OUString(XML_UNO_NAME_NRULE_BULLET_FONT );
(pProps++)->Value <<= aFDesc;
OUStringBuffer sTmp(1);
sTmp.append( (sal_Unicode)(0xF000 + 149) );
pProps->Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_CHAR ));
+ OUString(XML_UNO_NAME_NRULE_BULLET_CHAR );
(pProps++)->Value <<= sTmp.makeStringAndClear();
pProps->Name =
- OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME ));
- (pProps++)->Value <<=
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Numbering Symbols" ) );
+ OUString(XML_UNO_NAME_NRULE_CHAR_STYLE_NAME );
+ (pProps++)->Value <<= OUString( "Numbering Symbols" );
}
Any aAny;
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 43ba6b643d26..d907a5c5edd7 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -77,8 +77,8 @@ XMLAutoTextEventExport::XMLAutoTextEventExport(
)
: SvXMLExport(util::MeasureUnit::INCH, xServiceFactory, XML_AUTO_TEXT, nFlags)
,
- sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
- sNone(RTL_CONSTASCII_USTRINGPARAM("None"))
+ sEventType("EventType"),
+ sNone("None")
{
}
@@ -136,7 +136,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum )
// get filter component
Reference< xml::sax::XDocumentHandler > xTmpDocHandler(
xFactory->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
+ OUString("com.sun.star.comp.Oasis2OOoTransformer"),
aArgs), UNO_QUERY);
OSL_ENSURE( xTmpDocHandler.is(),
"can't instantiate OASIS transformer component" );
@@ -237,8 +237,7 @@ Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames()
OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter" ) );
+ return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter" );
}
Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(
@@ -260,8 +259,7 @@ Sequence< OUString > SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames
OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Writer.XMLAutotextEventsExporter" ) );
+ return OUString( "com.sun.star.comp.Writer.XMLAutotextEventsExporter" );
}
Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance(
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 53c558a55425..66d57c7cbbbe 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -187,7 +187,7 @@ void XMLTextMarkImportContext::StartElement(
{
if (m_sBookmarkName.isEmpty())
{
- m_sBookmarkName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown"));
+ m_sBookmarkName = ::rtl::OUString("Unknown");
}
m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName );
}
@@ -197,14 +197,10 @@ void XMLTextMarkImportContext::EndElement()
{
SvXMLImportContext::EndElement();
- static const OUString sAPI_reference_mark(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.ReferenceMark"));
- static const OUString sAPI_bookmark(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark"));
- static const OUString sAPI_fieldmark(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Fieldmark"));
- static const OUString sAPI_formfieldmark(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.FormFieldmark"));
+ static const OUString sAPI_reference_mark( "com.sun.star.text.ReferenceMark");
+ static const OUString sAPI_bookmark( "com.sun.star.text.Bookmark");
+ static const OUString sAPI_fieldmark( "com.sun.star.text.Fieldmark");
+ static const OUString sAPI_formfieldmark( "com.sun.star.text.FormFieldmark");
if (!m_sBookmarkName.isEmpty())
{
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 44257c7160e7..e162406be156 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -220,9 +220,9 @@ XMLTextFieldImportContext::XMLTextFieldImportContext(
const sal_Char* pService,
sal_uInt16 nPrefix, const OUString& rElementName)
: SvXMLImportContext( rImport, nPrefix, rElementName )
-, sIsFixed(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed))
+, sIsFixed(sAPI_is_fixed)
, rTextImportHelper(rHlp)
-, sServicePrefix(RTL_CONSTASCII_USTRINGPARAM(sAPI_textfield_prefix))
+, sServicePrefix(sAPI_textfield_prefix)
, bValid(sal_False)
{
DBG_ASSERT(NULL != pService, "Need service name!");
@@ -640,9 +640,9 @@ XMLSenderFieldImportContext::XMLSenderFieldImportContext(
sal_uInt16 nPrfx, const OUString& sLocalName,
sal_uInt16 nToken)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_extended_user,nPrfx, sLocalName)
-, sPropertyFixed(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed))
-, sPropertyFieldSubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_user_data_type))
-, sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))
+, sPropertyFixed(sAPI_is_fixed)
+, sPropertyFieldSubType(sAPI_user_data_type)
+, sPropertyContent(sAPI_content)
, bFixed(sal_True)
, nElementToken(nToken)
{
@@ -767,10 +767,10 @@ XMLAuthorFieldImportContext::XMLAuthorFieldImportContext(
sal_uInt16 nToken)
: XMLSenderFieldImportContext(rImport, rHlp, nPrfx, sLocalName, nToken)
, bAuthorFullName(sal_True)
-, sServiceAuthor(RTL_CONSTASCII_USTRINGPARAM(sAPI_author))
-, sPropertyAuthorFullName(RTL_CONSTASCII_USTRINGPARAM(sAPI_full_name))
-, sPropertyFixed(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed))
-, sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))
+, sServiceAuthor(sAPI_author)
+, sPropertyAuthorFullName(sAPI_full_name)
+, sPropertyFixed(sAPI_is_fixed)
+, sPropertyContent(sAPI_content)
{
// overwrite service name from XMLSenderFieldImportContext
SetServiceName(sServiceAuthor);
@@ -833,9 +833,9 @@ XMLPageContinuationImportContext::XMLPageContinuationImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& sLocalName)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_page_number, nPrfx, sLocalName)
-, sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
-, sPropertyUserText(RTL_CONSTASCII_USTRINGPARAM(sAPI_user_text))
-, sPropertyNumberingType(RTL_CONSTASCII_USTRINGPARAM(sAPI_numbering_type))
+, sPropertySubType(sAPI_sub_type)
+, sPropertyUserText(sAPI_user_text)
+, sPropertyNumberingType(sAPI_numbering_type)
, eSelectPage(PageNumberType_CURRENT)
, sStringOK(sal_False)
{
@@ -892,9 +892,9 @@ XMLPageNumberImportContext::XMLPageNumberImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& sLocalName)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_page_number, nPrfx, sLocalName)
-, sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
-, sPropertyNumberingType(RTL_CONSTASCII_USTRINGPARAM(sAPI_numbering_type))
-, sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM(sAPI_offset))
+, sPropertySubType(sAPI_sub_type)
+, sPropertyNumberingType(sAPI_numbering_type)
+, sPropertyOffset(sAPI_offset)
, sNumberSync(GetXMLToken(XML_FALSE))
, nPageAdjust(0)
, eSelectPage(PageNumberType_CURRENT)
@@ -1003,9 +1003,9 @@ XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& sLocalName)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_jump_edit,nPrfx, sLocalName)
-, sPropertyPlaceholderType(RTL_CONSTASCII_USTRINGPARAM(sAPI_place_holder_type))
-, sPropertyPlaceholder(RTL_CONSTASCII_USTRINGPARAM(sAPI_place_holder))
-, sPropertyHint(RTL_CONSTASCII_USTRINGPARAM(sAPI_hint))
+, sPropertyPlaceholderType(sAPI_place_holder_type)
+, sPropertyPlaceholder(sAPI_place_holder)
+, sPropertyHint(sAPI_hint)
{
}
@@ -1089,13 +1089,13 @@ XMLTimeFieldImportContext::XMLTimeFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& sLocalName)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_date_time, nPrfx, sLocalName)
-, sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format))
-, sPropertyFixed(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed))
-, sPropertyDateTimeValue(RTL_CONSTASCII_USTRINGPARAM(sAPI_date_time_value))
-, sPropertyDateTime(RTL_CONSTASCII_USTRINGPARAM(sAPI_date_time))
-, sPropertyAdjust(RTL_CONSTASCII_USTRINGPARAM(sAPI_adjust))
-, sPropertyIsDate(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_date))
-, sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed_language))
+, sPropertyNumberFormat(sAPI_number_format)
+, sPropertyFixed(sAPI_is_fixed)
+, sPropertyDateTimeValue(sAPI_date_time_value)
+, sPropertyDateTime(sAPI_date_time)
+, sPropertyAdjust(sAPI_adjust)
+, sPropertyIsDate(sAPI_is_date)
+, sPropertyIsFixedLanguage(sAPI_is_fixed_language)
, fTimeValue(0.0)
, nAdjust(0)
, nFormatKey(0)
@@ -1302,11 +1302,11 @@ XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
const sal_Char* pServiceName, sal_uInt16 nPrfx,
const OUString& sLocalName, bool bUseDisply)
: XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName)
-, sPropertyDataBaseName(RTL_CONSTASCII_USTRINGPARAM(sAPI_data_base_name))
-, sPropertyDataBaseURL(RTL_CONSTASCII_USTRINGPARAM(sAPI_data_base_u_r_l))
-, sPropertyTableName(RTL_CONSTASCII_USTRINGPARAM(sAPI_data_table_name))
-, sPropertyDataCommandType(RTL_CONSTASCII_USTRINGPARAM(sAPI_data_command_type))
-, sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible))
+, sPropertyDataBaseName(sAPI_data_base_name)
+, sPropertyDataBaseURL(sAPI_data_base_u_r_l)
+, sPropertyTableName(sAPI_data_table_name)
+, sPropertyDataCommandType(sAPI_data_command_type)
+, sPropertyIsVisible(sAPI_is_visible)
, nCommandType( sdb::CommandType::TABLE )
, bCommandTypeOK(sal_False)
, bDisplay( sal_True )
@@ -1471,8 +1471,8 @@ XMLDatabaseNextImportContext::XMLDatabaseNextImportContext(
const OUString& sLocalName) :
XMLDatabaseFieldImportContext(rImport, rHlp, pServiceName,
nPrfx, sLocalName, false),
- sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM(sAPI_condition)),
- sTrue(RTL_CONSTASCII_USTRINGPARAM(sAPI_true)),
+ sPropertyCondition(sAPI_condition),
+ sTrue(sAPI_true),
sCondition(),
bConditionOK(sal_False)
{
@@ -1482,8 +1482,8 @@ XMLDatabaseNextImportContext::XMLDatabaseNextImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx, const OUString& sLocalName)
: XMLDatabaseFieldImportContext(rImport, rHlp, sAPI_database_next, nPrfx, sLocalName, false)
-, sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM(sAPI_condition))
-, sTrue(RTL_CONSTASCII_USTRINGPARAM(sAPI_true))
+, sPropertyCondition(sAPI_condition)
+, sTrue(sAPI_true)
, bConditionOK(sal_False)
{
}
@@ -1537,7 +1537,7 @@ XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext(
sal_uInt16 nPrfx, const ::rtl::OUString& sLocalName) :
XMLDatabaseNextImportContext(rImport, rHlp, sAPI_database_select,
nPrfx, sLocalName),
- sPropertySetNumber(RTL_CONSTASCII_USTRINGPARAM(sAPI_set_number)),
+ sPropertySetNumber(sAPI_set_number),
nNumber(0),
bNumberOK(sal_False)
{
@@ -1590,9 +1590,9 @@ XMLDatabaseNumberImportContext::XMLDatabaseNumberImportContext(
XMLDatabaseFieldImportContext(rImport, rHlp, sAPI_database_number,
nPrfx, sLocalName, true),
sPropertyNumberingType(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_numbering_type)),
- sPropertySetNumber(RTL_CONSTASCII_USTRINGPARAM(sAPI_set_number)),
- sNumberFormat(RTL_CONSTASCII_USTRINGPARAM("1")),
+ sAPI_numbering_type),
+ sPropertySetNumber(sAPI_set_number),
+ sNumberFormat("1"),
sNumberSync(GetXMLToken(XML_FALSE)),
nValue(0),
bValueOK(sal_False)
@@ -1664,10 +1664,10 @@ XMLSimpleDocInfoImportContext::XMLSimpleDocInfoImportContext(
sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken,
sal_Bool bContent, sal_Bool bAuthor)
: XMLTextFieldImportContext(rImport, rHlp, MapTokenToServiceName(nToken),nPrfx, sLocalName)
-, sPropertyFixed(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed))
-, sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))
-, sPropertyAuthor(RTL_CONSTASCII_USTRINGPARAM(sAPI_author))
-, sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation))
+, sPropertyFixed(sAPI_is_fixed)
+, sPropertyContent(sAPI_content)
+, sPropertyAuthor(sAPI_author)
+, sPropertyCurrentPresentation(sAPI_current_presentation)
, bFixed(sal_False)
, bHasAuthor(bAuthor)
, bHasContent(bContent)
@@ -1808,7 +1808,7 @@ XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext(
const OUString& sLocalName, sal_uInt16 nToken) :
XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx, sLocalName,
nToken, sal_False, sal_False),
- sPropertyRevision(RTL_CONSTASCII_USTRINGPARAM(sAPI_revision))
+ sPropertyRevision(sAPI_revision)
{
bValid = sal_True;
}
@@ -1852,9 +1852,9 @@ XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
const OUString& sLocalName, sal_uInt16 nToken)
: XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx, sLocalName,nToken, sal_False, sal_False)
-, sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format))
-, sPropertyIsDate(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_date))
-, sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed_language))
+, sPropertyNumberFormat(sAPI_number_format)
+, sPropertyIsDate(sAPI_is_date)
+, sPropertyIsFixedLanguage(sAPI_is_fixed_language)
, nFormat(0)
, bFormatOK(sal_False)
, bIsDefaultLanguage(sal_True)
@@ -1961,9 +1961,9 @@ XMLUserDocInfoImportContext::XMLUserDocInfoImportContext(
XMLSimpleDocInfoImportContext(rImport, rHlp, nPrfx,
sLocalName, nToken,
sal_False, sal_False)
- , sPropertyName(RTL_CONSTASCII_USTRINGPARAM(sAPI_name))
- , sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format))
- , sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed_language))
+ , sPropertyName(sAPI_name)
+ , sPropertyNumberFormat(sAPI_number_format)
+ , sPropertyIsFixedLanguage(sAPI_is_fixed_language)
, nFormat(0)
, bFormatOK(sal_False)
, bIsDefaultLanguage( sal_True )
@@ -1992,7 +1992,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute(
{
if (!bValid)
{
- SetServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_docinfo_custom )) );
+ SetServiceName(OUString(sAPI_docinfo_custom ) );
aName = sAttrValue;
bValid = sal_True;
}
@@ -2048,8 +2048,8 @@ XMLHiddenParagraphImportContext::XMLHiddenParagraphImportContext(
sal_uInt16 nPrfx, const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_hidden_paragraph,
nPrfx, sLocalName),
- sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM(sAPI_condition)),
- sPropertyIsHidden(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_hidden)),
+ sPropertyCondition(sAPI_condition),
+ sPropertyIsHidden(sAPI_is_hidden),
sCondition(),
bIsHidden(sal_False)
{
@@ -2106,11 +2106,11 @@ XMLConditionalTextImportContext::XMLConditionalTextImportContext(
sal_uInt16 nPrfx, const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_conditional_text,
nPrfx, sLocalName),
- sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM(sAPI_condition)),
- sPropertyTrueContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_true_content)),
- sPropertyFalseContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_false_content)),
- sPropertyIsConditionTrue(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_condition_true)),
- sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
+ sPropertyCondition(sAPI_condition),
+ sPropertyTrueContent(sAPI_true_content),
+ sPropertyFalseContent(sAPI_false_content),
+ sPropertyIsConditionTrue(sAPI_is_condition_true),
+ sPropertyCurrentPresentation(sAPI_current_presentation),
bConditionOK(sal_False),
bTrueOK(sal_False),
bFalseOK(sal_False),
@@ -2194,9 +2194,9 @@ XMLHiddenTextImportContext::XMLHiddenTextImportContext(
sal_uInt16 nPrfx, const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_hidden_text,
nPrfx, sLocalName),
- sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM(sAPI_condition)),
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
- sPropertyIsHidden(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_hidden)),
+ sPropertyCondition(sAPI_condition),
+ sPropertyContent(sAPI_content),
+ sPropertyIsHidden(sAPI_is_hidden),
bConditionOK(sal_False),
bStringOK(sal_False),
bIsHidden(sal_False)
@@ -2278,10 +2278,10 @@ XMLFileNameImportContext::XMLFileNameImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_file_name,
nPrfx, sLocalName),
- sPropertyFixed(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed)),
- sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_file_format)),
+ sPropertyFixed(sAPI_is_fixed),
+ sPropertyFileFormat(sAPI_file_format),
sPropertyCurrentPresentation(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
+ sAPI_current_presentation),
nFormat(FilenameDisplayFormat::FULL),
bFixed(sal_False)
{
@@ -2370,7 +2370,7 @@ XMLTemplateNameImportContext::XMLTemplateNameImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_template_name,
nPrfx, sLocalName),
- sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_file_format)),
+ sPropertyFileFormat(sAPI_file_format),
nFormat(TemplateDisplayFormat::FULL)
{
bValid = sal_True;
@@ -2430,8 +2430,8 @@ XMLChapterImportContext::XMLChapterImportContext(
XMLTextFieldImportContext(rImport, rHlp, sAPI_chapter,
nPrfx, sLocalName),
sPropertyChapterFormat(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_chapter_format)),
- sPropertyLevel(RTL_CONSTASCII_USTRINGPARAM(sAPI_level)),
+ sAPI_chapter_format),
+ sPropertyLevel(sAPI_level),
nFormat(ChapterFormat::NAME_NUMBER),
nLevel(0)
{
@@ -2499,7 +2499,7 @@ XMLCountFieldImportContext::XMLCountFieldImportContext(
XMLTextFieldImportContext(rImport, rHlp, MapTokenToServiceName(nToken),
nPrfx, sLocalName),
sPropertyNumberingType(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_numbering_type)),
+ sAPI_numbering_type),
sNumberFormat(),
sLetterSync(),
bNumberFormatOK(sal_False)
@@ -2600,7 +2600,7 @@ XMLPageVarGetFieldImportContext::XMLPageVarGetFieldImportContext(
XMLTextFieldImportContext(rImport, rHlp, sAPI_reference_page_get,
nPrfx, sLocalName),
sPropertyNumberingType(
- RTL_CONSTASCII_USTRINGPARAM(sAPI_numbering_type)),
+ sAPI_numbering_type),
sNumberFormat(),
sLetterSync(),
bNumberFormatOK(sal_False)
@@ -2645,7 +2645,7 @@ void XMLPageVarGetFieldImportContext::PrepareField(
// display old content (#96657#)
aAny <<= GetContent();
xPropertySet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
+ OUString(sAPI_current_presentation),
aAny );
}
@@ -2662,8 +2662,8 @@ XMLPageVarSetFieldImportContext::XMLPageVarSetFieldImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_reference_page_set,
nPrfx, sLocalName),
- sPropertyOn(RTL_CONSTASCII_USTRINGPARAM(sAPI_on)),
- sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM(sAPI_offset)),
+ sPropertyOn(sAPI_on),
+ sPropertyOffset(sAPI_offset),
nAdjust(0),
bActive(sal_True)
{
@@ -2720,9 +2720,9 @@ XMLMacroFieldImportContext::XMLMacroFieldImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_macro,
nPrfx, sLocalName),
- sPropertyHint(RTL_CONSTASCII_USTRINGPARAM(sAPI_hint)),
- sPropertyMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")),
- sPropertyScriptURL(RTL_CONSTASCII_USTRINGPARAM("ScriptURL")),
+ sPropertyHint(sAPI_hint),
+ sPropertyMacroName("MacroName"),
+ sPropertyScriptURL("ScriptURL"),
bDescriptionOK(sal_False)
{
}
@@ -2773,8 +2773,8 @@ void XMLMacroFieldImportContext::PrepareField(
{
Any aAny;
- OUString sOnClick(RTL_CONSTASCII_USTRINGPARAM("OnClick"));
- OUString sPropertyMacroLibrary(RTL_CONSTASCII_USTRINGPARAM("MacroLibrary"));
+ OUString sOnClick("OnClick");
+ OUString sPropertyMacroLibrary("MacroLibrary");
aAny <<= (bDescriptionOK ? sDescription : GetContent());
xPropertySet->setPropertyValue(sPropertyHint, aAny);
@@ -2859,10 +2859,10 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
sal_uInt16 nToken, sal_uInt16 nPrfx, const OUString& sLocalName)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_get_reference, nPrfx, sLocalName)
-, sPropertyReferenceFieldPart(RTL_CONSTASCII_USTRINGPARAM(sAPI_reference_field_part))
-, sPropertyReferenceFieldSource(RTL_CONSTASCII_USTRINGPARAM(sAPI_reference_field_source))
-, sPropertySourceName(RTL_CONSTASCII_USTRINGPARAM(sAPI_source_name))
-, sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation))
+, sPropertyReferenceFieldPart(sAPI_reference_field_part)
+, sPropertyReferenceFieldSource(sAPI_reference_field_source)
+, sPropertySourceName(sAPI_source_name)
+, sPropertyCurrentPresentation(sAPI_current_presentation)
, nElementToken(nToken)
, nType(ReferenceFieldPart::PAGE_DESC)
, bNameOK(sal_False)
@@ -3052,11 +3052,11 @@ XMLDdeFieldDeclImportContext::XMLDdeFieldDeclImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& sLocalName, const SvXMLTokenMap& rMap)
: SvXMLImportContext(rImport, nPrfx, sLocalName)
-, sPropertyIsAutomaticUpdate(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_automatic_update))
-, sPropertyName(RTL_CONSTASCII_USTRINGPARAM(sAPI_name))
-, sPropertyDDECommandType(RTL_CONSTASCII_USTRINGPARAM(sAPI_dde_command_type))
-, sPropertyDDECommandFile(RTL_CONSTASCII_USTRINGPARAM(sAPI_dde_command_file))
-, sPropertyDDECommandElement(RTL_CONSTASCII_USTRINGPARAM(sAPI_dde_command_element))
+, sPropertyIsAutomaticUpdate(sAPI_is_automatic_update)
+, sPropertyName(sAPI_name)
+, sPropertyDDECommandType(sAPI_dde_command_type)
+, sPropertyDDECommandFile(sAPI_dde_command_file)
+, sPropertyDDECommandElement(sAPI_dde_command_element)
, rTokenMap(rMap)
{
DBG_ASSERT(XML_NAMESPACE_TEXT == nPrfx, "wrong prefix");
@@ -3195,7 +3195,7 @@ XMLDdeFieldImportContext::XMLDdeFieldImportContext(
XMLTextFieldImportContext(rImport, rHlp, sAPI_dde,
nPrfx, sLocalName),
sName()
- ,sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))
+ ,sPropertyContent(sAPI_content)
{
}
@@ -3311,10 +3311,10 @@ XMLUrlFieldImportContext::XMLUrlFieldImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_url,
nPrfx, sLocalName),
- sPropertyURL(RTL_CONSTASCII_USTRINGPARAM(sAPI_url)),
- sPropertyTargetFrame(RTL_CONSTASCII_USTRINGPARAM(sAPI_target_frame)),
- sPropertyRepresentation(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_representation)),
+ sPropertyURL(sAPI_url),
+ sPropertyTargetFrame(sAPI_target_frame),
+ sPropertyRepresentation(
+ sAPI_representation),
bFrameOK(sal_False)
{
}
@@ -3368,7 +3368,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_bibliography,
nPrfx, sLocalName),
- sPropertyFields(RTL_CONSTASCII_USTRINGPARAM("Fields")),
+ sPropertyFields("Fields"),
aValues()
{
bValid = sal_True;
@@ -3632,11 +3632,11 @@ XMLAnnotationImportContext::XMLAnnotationImportContext(
const OUString& sLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_annotation,
nPrfx, sLocalName),
- sPropertyAuthor(RTL_CONSTASCII_USTRINGPARAM(sAPI_author)),
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
+ sPropertyAuthor(sAPI_author),
+ sPropertyContent(sAPI_content),
// why is there no UNO_NAME_DATE_TIME, but only UNO_NAME_DATE_TIME_VALUE?
- sPropertyDate(RTL_CONSTASCII_USTRINGPARAM(sAPI_date_time_value)),
- sPropertyTextRange(RTL_CONSTASCII_USTRINGPARAM(sAPI_TextRange))
+ sPropertyDate(sAPI_date_time_value),
+ sPropertyTextRange(sAPI_TextRange)
{
bValid = sal_True;
@@ -3796,9 +3796,9 @@ XMLScriptImportContext::XMLScriptImportContext(
sal_uInt16 nPrfx,
const OUString& sLocalName)
: XMLTextFieldImportContext(rImport, rHlp, sAPI_script, nPrfx, sLocalName)
-, sPropertyScriptType(RTL_CONSTASCII_USTRINGPARAM(sAPI_script_type))
-, sPropertyURLContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_url_content))
-, sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))
+, sPropertyScriptType(sAPI_script_type)
+, sPropertyURLContent(sAPI_url_content)
+, sPropertyContent(sAPI_content)
, bContentOK(sal_False)
, bScriptTypeOK(sal_False)
, bUrlContent(sal_False)
@@ -3896,7 +3896,7 @@ void XMLMeasureFieldImportContext::PrepareField(
{
Any aAny;
aAny <<= mnKind;
- xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Kind")), aAny);
+ xPropertySet->setPropertyValue(OUString("Kind"), aAny);
}
@@ -3921,11 +3921,11 @@ XMLDropDownFieldImportContext::XMLDropDownFieldImportContext(
bNameOK( false ),
bHelpOK(false),
bHintOK(false),
- sPropertyItems( RTL_CONSTASCII_USTRINGPARAM( "Items" ) ),
- sPropertySelectedItem( RTL_CONSTASCII_USTRINGPARAM( "SelectedItem" ) ),
- sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ),
- sPropertyHelp( RTL_CONSTASCII_USTRINGPARAM( "Help" ) ),
- sPropertyToolTip( RTL_CONSTASCII_USTRINGPARAM( "Tooltip" ) )
+ sPropertyItems( "Items" ),
+ sPropertySelectedItem( "SelectedItem" ),
+ sPropertyName( "Name" ),
+ sPropertyHelp( "Help" ),
+ sPropertyToolTip( "Tooltip" )
{
bValid = sal_True;
}
@@ -4056,7 +4056,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext(
const ::rtl::OUString& sLocalName) /// element name w/o prefix
: XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName )
{
- sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
+ sServicePrefix = OUString(sAPI_presentation_prefix );
bValid = sal_True;
}
@@ -4080,7 +4080,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext(
const ::rtl::OUString& sLocalName) /// element name w/o prefix
: XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName )
{
- sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
+ sServicePrefix = OUString(sAPI_presentation_prefix );
bValid = sal_True;
}
@@ -4105,7 +4105,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext(
const ::rtl::OUString& sLocalName) /// element name w/o prefix
: XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName )
{
- sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
+ sServicePrefix = OUString(sAPI_presentation_prefix );
bValid = sal_True;
}
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b6f3bdb58e41..11395016a4af 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -906,7 +906,7 @@ namespace
{
Sequence<OUString> vListEntriesSeq(vListEntries.size());
copy(vListEntries.begin(), vListEntries.end(), ::comphelper::stl_begin(vListEntriesSeq));
- vOutParams[OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY))] = makeAny(vListEntriesSeq);
+ vOutParams[OUString(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq);
}
for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin();
pCurrent != vOutParams.end();
@@ -934,7 +934,7 @@ XMLTextImportHelper::XMLTextImportHelper(
, m_pBackpatcherImpl( MakeBackpatcherImpl() )
{
static ::rtl::OUString s_PropNameDefaultListId(
- RTL_CONSTASCII_USTRINGPARAM("DefaultListId"));
+ "DefaultListId");
Reference< XChapterNumberingSupplier > xCNSupplier( rModel, UNO_QUERY );
@@ -982,35 +982,35 @@ XMLTextImportHelper::XMLTextImportHelper(
{
Reference< XNameAccess > xFamilies(xFamiliesSupp->getStyleFamilies());
- const OUString aParaStyles(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles"));
+ const OUString aParaStyles("ParagraphStyles");
if( xFamilies->hasByName( aParaStyles ) )
{
m_pImpl->m_xParaStyles.set(xFamilies->getByName(aParaStyles),
UNO_QUERY);
}
- const OUString aCharStyles(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles"));
+ const OUString aCharStyles("CharacterStyles");
if( xFamilies->hasByName( aCharStyles ) )
{
m_pImpl->m_xTextStyles.set(xFamilies->getByName(aCharStyles),
UNO_QUERY);
}
- const OUString aNumStyles(RTL_CONSTASCII_USTRINGPARAM("NumberingStyles"));
+ const OUString aNumStyles("NumberingStyles");
if( xFamilies->hasByName( aNumStyles ) )
{
m_pImpl->m_xNumStyles.set(xFamilies->getByName(aNumStyles),
UNO_QUERY);
}
- const OUString aFrameStyles(RTL_CONSTASCII_USTRINGPARAM("FrameStyles"));
+ const OUString aFrameStyles("FrameStyles");
if( xFamilies->hasByName( aFrameStyles ) )
{
m_pImpl->m_xFrameStyles.set(xFamilies->getByName(aFrameStyles),
UNO_QUERY);
}
- const OUString aPageStyles(RTL_CONSTASCII_USTRINGPARAM("PageStyles"));
+ const OUString aPageStyles("PageStyles");
if( xFamilies->hasByName( aPageStyles ) )
{
m_pImpl->m_xPageStyles.set(xFamilies->getByName(aPageStyles),
@@ -1292,8 +1292,8 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
rFlags &= ~(CONV_FROM_STAR_BATS|CONV_FROM_STAR_MATH);
OUString sFontName;
rProp.maValue >>= sFontName;
- OUString sStarBats( RTL_CONSTASCII_USTRINGPARAM("StarBats" ) );
- OUString sStarMath( RTL_CONSTASCII_USTRINGPARAM("StarMath" ) );
+ OUString sStarBats( "StarBats" );
+ OUString sStarMath( "StarMath" );
if( sFontName.equalsIgnoreAsciiCase( sStarBats ) )
rFlags |= CONV_FROM_STAR_BATS;
else if( sFontName.equalsIgnoreAsciiCase( sStarMath ) )
@@ -1453,32 +1453,19 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
// Numberings/Bullets in table not visible aftzer save/reload (#i80724#)
sal_Bool bSetListAttrs )
{
- static ::rtl::OUString s_ParaStyleName(
- RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
- static ::rtl::OUString s_CharStyleName(
- RTL_CONSTASCII_USTRINGPARAM("CharStyleName"));
- static ::rtl::OUString s_NumberingRules(
- RTL_CONSTASCII_USTRINGPARAM("NumberingRules"));
- static ::rtl::OUString s_NumberingIsNumber(
- RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber"));
- static ::rtl::OUString s_NumberingLevel(
- RTL_CONSTASCII_USTRINGPARAM("NumberingLevel"));
- static ::rtl::OUString s_ParaIsNumberingRestart(
- RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart"));
- static ::rtl::OUString s_NumberingStartValue(
- RTL_CONSTASCII_USTRINGPARAM("NumberingStartValue"));
- static ::rtl::OUString s_PropNameListId(
- RTL_CONSTASCII_USTRINGPARAM("ListId"));
- static ::rtl::OUString s_PageDescName(
- RTL_CONSTASCII_USTRINGPARAM("PageDescName"));
- static ::rtl::OUString s_ServiceCombinedCharacters(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.text.TextField.CombinedCharacters"));
- static ::rtl::OUString s_Content(RTL_CONSTASCII_USTRINGPARAM("Content"));
- static ::rtl::OUString s_OutlineLevel(
- RTL_CONSTASCII_USTRINGPARAM("OutlineLevel"));
- static ::rtl::OUString s_NumberingStyleName(
- RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName"));
+ static ::rtl::OUString s_ParaStyleName( "ParaStyleName");
+ static ::rtl::OUString s_CharStyleName( "CharStyleName");
+ static ::rtl::OUString s_NumberingRules( "NumberingRules");
+ static ::rtl::OUString s_NumberingIsNumber( "NumberingIsNumber");
+ static ::rtl::OUString s_NumberingLevel( "NumberingLevel");
+ static ::rtl::OUString s_ParaIsNumberingRestart( "ParaIsNumberingRestart");
+ static ::rtl::OUString s_NumberingStartValue( "NumberingStartValue");
+ static ::rtl::OUString s_PropNameListId( "ListId");
+ static ::rtl::OUString s_PageDescName( "PageDescName");
+ static ::rtl::OUString s_ServiceCombinedCharacters( "com.sun.star.text.TextField.CombinedCharacters");
+ static ::rtl::OUString s_Content("Content");
+ static ::rtl::OUString s_OutlineLevel( "OutlineLevel");
+ static ::rtl::OUString s_NumberingStyleName( "NumberingStyleName");
const sal_uInt16 nFamily = bPara ? XML_STYLE_FAMILY_TEXT_PARAGRAPH
: XML_STYLE_FAMILY_TEXT_TEXT;
@@ -1909,7 +1896,7 @@ void XMLTextImportHelper::FindOutlineStyleName( ::rtl::OUString& rStyleName,
sal_Int8 nOutlineLevel )
{
static ::rtl::OUString s_HeadingStyleName(
- RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName"));
+ "HeadingStyleName");
// style name empty?
if( rStyleName.isEmpty() )
@@ -1973,10 +1960,8 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel
void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
{
- static ::rtl::OUString s_NumberingStyleName(
- RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName"));
- static ::rtl::OUString s_HeadingStyleName(
- RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName"));
+ static ::rtl::OUString s_NumberingStyleName( "NumberingStyleName");
+ static ::rtl::OUString s_HeadingStyleName( "HeadingStyleName");
if ((m_pImpl->m_pOutlineStylesCandidates != NULL || bSetEmptyLevels) &&
m_pImpl->m_xChapterNumbering.is() &&
@@ -2005,7 +1990,7 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
{
Reference<XPropertySet> xChapterNumRule(
m_pImpl->m_xChapterNumbering, UNO_QUERY);
- const OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ const OUString sName("Name");
xChapterNumRule->getPropertyValue(sName) >>= sOutlineStyleName;
}
@@ -2081,18 +2066,12 @@ void XMLTextImportHelper::SetHyperlink(
const OUString& rVisitedStyleName,
XMLEventsImportContext* pEvents)
{
- static ::rtl::OUString s_HyperLinkURL(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL"));
- static ::rtl::OUString s_HyperLinkName(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkName"));
- static ::rtl::OUString s_HyperLinkTarget(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkTarget"));
- static ::rtl::OUString s_UnvisitedCharStyleName(
- RTL_CONSTASCII_USTRINGPARAM("UnvisitedCharStyleName"));
- static ::rtl::OUString s_VisitedCharStyleName(
- RTL_CONSTASCII_USTRINGPARAM("VisitedCharStyleName"));
- static ::rtl::OUString s_HyperLinkEvents(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkEvents"));
+ static ::rtl::OUString s_HyperLinkURL( "HyperLinkURL");
+ static ::rtl::OUString s_HyperLinkName( "HyperLinkName");
+ static ::rtl::OUString s_HyperLinkTarget( "HyperLinkTarget");
+ static ::rtl::OUString s_UnvisitedCharStyleName( "UnvisitedCharStyleName");
+ static ::rtl::OUString s_VisitedCharStyleName( "VisitedCharStyleName");
+ static ::rtl::OUString s_HyperLinkEvents( "HyperLinkEvents");
Reference < XPropertySet > xPropSet( rCursor, UNO_QUERY );
Reference < XPropertySetInfo > xPropSetInfo(
@@ -2167,8 +2146,8 @@ void XMLTextImportHelper::SetRuby(
{
Reference<XPropertySet> xPropSet(rCursor, UNO_QUERY);
- OUString sRubyText(RTL_CONSTASCII_USTRINGPARAM("RubyText"));
- OUString sRubyCharStyleName(RTL_CONSTASCII_USTRINGPARAM("RubyCharStyleName"));
+ OUString sRubyText("RubyText");
+ OUString sRubyCharStyleName("RubyCharStyleName");
// if we have one Ruby property, we assume all of them are present
if (xPropSet.is() &&
@@ -2676,10 +2655,8 @@ void XMLTextImportHelper::ConnectFrameChains(
const OUString& rNextFrmName,
const Reference < XPropertySet >& rFrmPropSet )
{
- static ::rtl::OUString s_ChainNextName(
- RTL_CONSTASCII_USTRINGPARAM("ChainNextName"));
- static ::rtl::OUString s_ChainPrevName(
- RTL_CONSTASCII_USTRINGPARAM("ChainPrevName"));
+ static ::rtl::OUString s_ChainNextName( "ChainNextName");
+ static ::rtl::OUString s_ChainPrevName( "ChainPrevName");
if( rFrmName.isEmpty() )
return;
@@ -2727,8 +2704,7 @@ void XMLTextImportHelper::ConnectFrameChains(
sal_Bool XMLTextImportHelper::IsInFrame() const
{
- static ::rtl::OUString s_TextFrame(
- RTL_CONSTASCII_USTRINGPARAM("TextFrame"));
+ static ::rtl::OUString s_TextFrame( "TextFrame");
sal_Bool bIsInFrame = sal_False;
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 0d414296700f..f4d20c6a88ce 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -238,7 +238,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con
::rtl::OUString XMLTextListsHelper::GenerateNewListId() const
{
// Value of xml:id in element <text:list> has to be a valid ID type (#i92478#)
- ::rtl::OUString sTmpStr( RTL_CONSTASCII_USTRINGPARAM( "list" ) );
+ ::rtl::OUString sTmpStr( "list" );
sal_Int64 n = Time( Time::SYSTEM ).GetTime();
n += Date( Date::SYSTEM ).GetDate();
n += rand();
@@ -446,8 +446,7 @@ XMLTextListsHelper::MakeNumRule(
sal_Bool* o_pRestartNumbering,
sal_Bool* io_pSetDefaults)
{
- static ::rtl::OUString s_NumberingRules(
- RTL_CONSTASCII_USTRINGPARAM("NumberingRules"));
+ static ::rtl::OUString s_NumberingRules( "NumberingRules");
uno::Reference<container::XIndexReplace> xNumRules(i_rNumRule);
if ( !i_StyleName.isEmpty() && i_StyleName != i_ParentStyleName )
{
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 922dce1580af..b1decab06af6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -173,9 +173,9 @@ namespace
static bool lcl_ShapeFilter(const Reference<XTextContent>& xTxtContent)
{
- static const OUString sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame"));
- static const OUString sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject"));
- static const OUString sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject"));
+ static const OUString sTextFrameService("com.sun.star.text.TextFrame");
+ static const OUString sTextGraphicService("com.sun.star.text.TextGraphicObject");
+ static const OUString sTextEmbeddedService("com.sun.star.text.TextEmbeddedObject");
Reference<XShape> xShape(xTxtContent, UNO_QUERY);
if(!xShape.is())
return false;
@@ -336,8 +336,8 @@ void BoundFrames::Fill(const filter_t& rFilter)
const Reference< XEnumeration > xEnum = m_xEnumAccess->createEnumeration();
if(!xEnum.is())
return;
- const OUString our_sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType"));
- const OUString our_sAnchorFrame(RTL_CONSTASCII_USTRINGPARAM("AnchorFrame"));
+ const OUString our_sAnchorType("AnchorType");
+ const OUString our_sAnchorFrame("AnchorFrame");
while(xEnum->hasMoreElements())
{
Reference<XPropertySet> xPropSet(xEnum->nextElement(), UNO_QUERY);
@@ -413,14 +413,14 @@ void FieldParamExporter::Export()
// Save the OLE object
Reference< embed::XStorage > xTargetStg = m_pExport->GetTargetStorage();
Reference< embed::XStorage > xDstStg = xTargetStg->openStorageElement(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OLELinks")), embed::ElementModes::WRITE );
+ rtl::OUString("OLELinks"), embed::ElementModes::WRITE );
if ( !xDstStg->hasByName( sValue ) ) {
Reference< XStorageBasedDocument > xStgDoc (
m_pExport->GetModel( ), UNO_QUERY );
Reference< embed::XStorage > xDocStg = xStgDoc->getDocumentStorage();
Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OLELinks")), embed::ElementModes::READ );
+ rtl::OUString("OLELinks"), embed::ElementModes::READ );
xOleStg->copyElementTo( sValue, xDstStg, sValue );
Reference< embed::XTransactedObject > xTransact( xDstStg, UNO_QUERY );
@@ -433,7 +433,7 @@ void FieldParamExporter::Export()
{
sal_Bool bValue = false;
aValue >>= bValue;
- ExportParameter(*pCurrent, (bValue ? OUString(RTL_CONSTASCII_USTRINGPARAM( "true" )) : OUString(RTL_CONSTASCII_USTRINGPARAM("false"))) );
+ ExportParameter(*pCurrent, (bValue ? OUString("true" ) : OUString("false")) );
}
else if(aValueType == aSeqType)
{
@@ -528,14 +528,14 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
{
Reference < XPropertySet > xNumPropSet( xNumRule,
UNO_QUERY );
- const OUString sIsAutomatic( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) );
+ const OUString sIsAutomatic( "IsAutomatic" );
if( xNumPropSet.is() &&
xNumPropSet->getPropertySetInfo()
->hasPropertyByName( sIsAutomatic ) )
{
bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue();
// Check on outline style (#i73361#)
- const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) );
+ const OUString sNumberingIsOutline( "NumberingIsOutline" );
if ( bAdd &&
xNumPropSet->getPropertySetInfo()
->hasPropertyByName( sNumberingIsOutline ) )
@@ -645,14 +645,14 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
{
Reference < XPropertySet > xNumPropSet( xNumRule,
UNO_QUERY );
- const OUString sIsAutomatic( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) );
+ const OUString sIsAutomatic( "IsAutomatic" );
if( xNumPropSet.is() &&
xNumPropSet->getPropertySetInfo()
->hasPropertyByName( sIsAutomatic ) )
{
bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue();
// Check on outline style (#i73361#)
- const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) );
+ const OUString sNumberingIsOutline( "NumberingIsOutline" );
if ( bAdd &&
xNumPropSet->getPropertySetInfo()
->hasPropertyByName( sNumberingIsOutline ) )
@@ -1172,91 +1172,91 @@ XMLTextParagraphExport::XMLTextParagraphExport(
bOpenRuby( sal_False ),
mpTextListsHelper( 0 ),
maTextListsHelperStack(),
- sActualSize(RTL_CONSTASCII_USTRINGPARAM("ActualSize")),
+ sActualSize("ActualSize"),
// Implement Title/Description Elements UI (#i73249#)
- sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")),
- sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")),
- sAnchorCharStyleName(RTL_CONSTASCII_USTRINGPARAM("AnchorCharStyleName")),
- sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")),
- sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")),
- sBeginNotice(RTL_CONSTASCII_USTRINGPARAM("BeginNotice")),
- sBookmark(RTL_CONSTASCII_USTRINGPARAM("Bookmark")),
- sCategory(RTL_CONSTASCII_USTRINGPARAM("Category")),
- sChainNextName(RTL_CONSTASCII_USTRINGPARAM("ChainNextName")),
- sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")),
- sCharStyleNames(RTL_CONSTASCII_USTRINGPARAM("CharStyleNames")),
- sContourPolyPolygon(RTL_CONSTASCII_USTRINGPARAM("ContourPolyPolygon")),
- sDocumentIndex(RTL_CONSTASCII_USTRINGPARAM("DocumentIndex")),
- sDocumentIndexMark(RTL_CONSTASCII_USTRINGPARAM("DocumentIndexMark")),
- sEndNotice(RTL_CONSTASCII_USTRINGPARAM("EndNotice")),
- sFootnote(RTL_CONSTASCII_USTRINGPARAM("Footnote")),
- sFootnoteCounting(RTL_CONSTASCII_USTRINGPARAM("FootnoteCounting")),
- sFrame(RTL_CONSTASCII_USTRINGPARAM("Frame")),
- sFrameHeightAbsolute(RTL_CONSTASCII_USTRINGPARAM("FrameHeightAbsolute")),
- sFrameHeightPercent(RTL_CONSTASCII_USTRINGPARAM("FrameHeightPercent")),
- sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName")),
- sFrameWidthAbsolute(RTL_CONSTASCII_USTRINGPARAM("FrameWidthAbsolute")),
- sFrameWidthPercent(RTL_CONSTASCII_USTRINGPARAM("FrameWidthPercent")),
- sGraphicFilter(RTL_CONSTASCII_USTRINGPARAM("GraphicFilter")),
- sGraphicRotation(RTL_CONSTASCII_USTRINGPARAM("GraphicRotation")),
- sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")),
- sHeight(RTL_CONSTASCII_USTRINGPARAM("Height")),
- sHoriOrient(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")),
- sHoriOrientPosition(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")),
- sHyperLinkName(RTL_CONSTASCII_USTRINGPARAM("HyperLinkName")),
- sHyperLinkTarget(RTL_CONSTASCII_USTRINGPARAM("HyperLinkTarget")),
- sHyperLinkURL(RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL")),
- sIsAutomaticContour(RTL_CONSTASCII_USTRINGPARAM("IsAutomaticContour")),
- sIsCollapsed(RTL_CONSTASCII_USTRINGPARAM("IsCollapsed")),
- sIsPixelContour(RTL_CONSTASCII_USTRINGPARAM("IsPixelContour")),
- sIsStart(RTL_CONSTASCII_USTRINGPARAM("IsStart")),
- sIsSyncHeightToWidth(RTL_CONSTASCII_USTRINGPARAM("IsSyncHeightToWidth")),
- sIsSyncWidthToHeight(RTL_CONSTASCII_USTRINGPARAM("IsSyncWidthToHeight")),
- sNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")),
- sNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
- sPageDescName(RTL_CONSTASCII_USTRINGPARAM("PageDescName")),
- sPageStyleName(RTL_CONSTASCII_USTRINGPARAM("PageStyleName")),
- sParaChapterNumberingLevel(RTL_CONSTASCII_USTRINGPARAM("ParaChapterNumberingLevel")),
- sParaConditionalStyleName(RTL_CONSTASCII_USTRINGPARAM("ParaConditionalStyleName")),
- sParagraphService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph")),
- sParaStyleName(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")),
- sPositionEndOfDoc(RTL_CONSTASCII_USTRINGPARAM("PositionEndOfDoc")),
- sPrefix(RTL_CONSTASCII_USTRINGPARAM("Prefix")),
- sRedline(RTL_CONSTASCII_USTRINGPARAM("Redline")),
- sReferenceId(RTL_CONSTASCII_USTRINGPARAM("ReferenceId")),
- sReferenceMark(RTL_CONSTASCII_USTRINGPARAM("ReferenceMark")),
- sRelativeHeight(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight")),
- sRelativeWidth(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth")),
- sRuby(RTL_CONSTASCII_USTRINGPARAM("Ruby")),
- sRubyAdjust(RTL_CONSTASCII_USTRINGPARAM("RubyAdjust")),
- sRubyCharStyleName(RTL_CONSTASCII_USTRINGPARAM("RubyCharStyleName")),
- sRubyText(RTL_CONSTASCII_USTRINGPARAM("RubyText")),
- sServerMap(RTL_CONSTASCII_USTRINGPARAM("ServerMap")),
- sShapeService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shape")),
- sSizeType(RTL_CONSTASCII_USTRINGPARAM("SizeType")),
- sSoftPageBreak( RTL_CONSTASCII_USTRINGPARAM( "SoftPageBreak" ) ),
- sStartAt(RTL_CONSTASCII_USTRINGPARAM("StartAt")),
- sSuffix(RTL_CONSTASCII_USTRINGPARAM("Suffix")),
- sTableService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable")),
- sText(RTL_CONSTASCII_USTRINGPARAM("Text")),
- sTextContentService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent")),
- sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject")),
- sTextEndnoteService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote")),
- sTextField(RTL_CONSTASCII_USTRINGPARAM("TextField")),
- sTextFieldService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField")),
- sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")),
- sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject")),
- sTextPortionType(RTL_CONSTASCII_USTRINGPARAM("TextPortionType")),
- sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection")),
- sUnvisitedCharStyleName(RTL_CONSTASCII_USTRINGPARAM("UnvisitedCharStyleName")),
- sVertOrient(RTL_CONSTASCII_USTRINGPARAM("VertOrient")),
- sVertOrientPosition(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")),
- sVisitedCharStyleName(RTL_CONSTASCII_USTRINGPARAM("VisitedCharStyleName")),
- sWidth(RTL_CONSTASCII_USTRINGPARAM("Width")),
- sWidthType( RTL_CONSTASCII_USTRINGPARAM( "WidthType" ) ),
- sTextFieldStart( RTL_CONSTASCII_USTRINGPARAM( "TextFieldStart" ) ),
- sTextFieldEnd( RTL_CONSTASCII_USTRINGPARAM( "TextFieldEnd" ) ),
- sTextFieldStartEnd( RTL_CONSTASCII_USTRINGPARAM( "TextFieldStartEnd" ) ),
+ sTitle("Title"),
+ sDescription("Description"),
+ sAnchorCharStyleName("AnchorCharStyleName"),
+ sAnchorPageNo("AnchorPageNo"),
+ sAnchorType("AnchorType"),
+ sBeginNotice("BeginNotice"),
+ sBookmark("Bookmark"),
+ sCategory("Category"),
+ sChainNextName("ChainNextName"),
+ sCharStyleName("CharStyleName"),
+ sCharStyleNames("CharStyleNames"),
+ sContourPolyPolygon("ContourPolyPolygon"),
+ sDocumentIndex("DocumentIndex"),
+ sDocumentIndexMark("DocumentIndexMark"),
+ sEndNotice("EndNotice"),
+ sFootnote("Footnote"),
+ sFootnoteCounting("FootnoteCounting"),
+ sFrame("Frame"),
+ sFrameHeightAbsolute("FrameHeightAbsolute"),
+ sFrameHeightPercent("FrameHeightPercent"),
+ sFrameStyleName("FrameStyleName"),
+ sFrameWidthAbsolute("FrameWidthAbsolute"),
+ sFrameWidthPercent("FrameWidthPercent"),
+ sGraphicFilter("GraphicFilter"),
+ sGraphicRotation("GraphicRotation"),
+ sGraphicURL("GraphicURL"),
+ sHeight("Height"),
+ sHoriOrient("HoriOrient"),
+ sHoriOrientPosition("HoriOrientPosition"),
+ sHyperLinkName("HyperLinkName"),
+ sHyperLinkTarget("HyperLinkTarget"),
+ sHyperLinkURL("HyperLinkURL"),
+ sIsAutomaticContour("IsAutomaticContour"),
+ sIsCollapsed("IsCollapsed"),
+ sIsPixelContour("IsPixelContour"),
+ sIsStart("IsStart"),
+ sIsSyncHeightToWidth("IsSyncHeightToWidth"),
+ sIsSyncWidthToHeight("IsSyncWidthToHeight"),
+ sNumberingRules("NumberingRules"),
+ sNumberingType("NumberingType"),
+ sPageDescName("PageDescName"),
+ sPageStyleName("PageStyleName"),
+ sParaChapterNumberingLevel("ParaChapterNumberingLevel"),
+ sParaConditionalStyleName("ParaConditionalStyleName"),
+ sParagraphService("com.sun.star.text.Paragraph"),
+ sParaStyleName("ParaStyleName"),
+ sPositionEndOfDoc("PositionEndOfDoc"),
+ sPrefix("Prefix"),
+ sRedline("Redline"),
+ sReferenceId("ReferenceId"),
+ sReferenceMark("ReferenceMark"),
+ sRelativeHeight("RelativeHeight"),
+ sRelativeWidth("RelativeWidth"),
+ sRuby("Ruby"),
+ sRubyAdjust("RubyAdjust"),
+ sRubyCharStyleName("RubyCharStyleName"),
+ sRubyText("RubyText"),
+ sServerMap("ServerMap"),
+ sShapeService("com.sun.star.drawing.Shape"),
+ sSizeType("SizeType"),
+ sSoftPageBreak( "SoftPageBreak" ),
+ sStartAt("StartAt"),
+ sSuffix("Suffix"),
+ sTableService("com.sun.star.text.TextTable"),
+ sText("Text"),
+ sTextContentService("com.sun.star.text.TextContent"),
+ sTextEmbeddedService("com.sun.star.text.TextEmbeddedObject"),
+ sTextEndnoteService("com.sun.star.text.Endnote"),
+ sTextField("TextField"),
+ sTextFieldService("com.sun.star.text.TextField"),
+ sTextFrameService("com.sun.star.text.TextFrame"),
+ sTextGraphicService("com.sun.star.text.TextGraphicObject"),
+ sTextPortionType("TextPortionType"),
+ sTextSection("TextSection"),
+ sUnvisitedCharStyleName("UnvisitedCharStyleName"),
+ sVertOrient("VertOrient"),
+ sVertOrientPosition("VertOrientPosition"),
+ sVisitedCharStyleName("VisitedCharStyleName"),
+ sWidth("Width"),
+ sWidthType( "WidthType" ),
+ sTextFieldStart( "TextFieldStart" ),
+ sTextFieldEnd( "TextFieldEnd" ),
+ sTextFieldStartEnd( "TextFieldStartEnd" ),
aCharStyleNamesPropInfoCache( sCharStyleNames )
{
UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA ));
@@ -1279,8 +1279,8 @@ XMLTextParagraphExport::XMLTextParagraphExport(
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_AUTO_FRAME );
xAutoFramePropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
GetExport() );
- sFamily = OUString( RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME) );
- aPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "fr" ) );
+ sFamily = OUString( XML_STYLE_FAMILY_SD_GRAPHICS_NAME );
+ aPrefix = OUString( "fr" );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_FRAME, sFamily,
xAutoFramePropMapper, aPrefix );
@@ -1288,14 +1288,14 @@ XMLTextParagraphExport::XMLTextParagraphExport(
xSectionPropMapper = new XMLTextExportPropertySetMapper( xPropMapper,
GetExport() );
sFamily = OUString( GetXMLToken( XML_SECTION ) );
- aPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "Sect" ) );
+ aPrefix = OUString( "Sect" );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_SECTION, sFamily,
xSectionPropMapper, aPrefix );
xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_RUBY );
xRubyPropMapper = new SvXMLExportPropertyMapper( xPropMapper );
sFamily = OUString( GetXMLToken( XML_RUBY ) );
- aPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM( "Ru" ) );
+ aPrefix = OUString( "Ru" );
rAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_RUBY, sFamily,
xRubyPropMapper, aPrefix );
@@ -1456,17 +1456,17 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
{
if ( 0 == i )
{
- sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharacterStyles" ) );
+ sName = OUString( "CharacterStyles" );
nFamily = XML_STYLE_FAMILY_TEXT_TEXT;
}
else if ( 1 == i )
{
- sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "RubyStyles" ) );
+ sName = OUString( "RubyStyles" );
nFamily = XML_STYLE_FAMILY_TEXT_RUBY;
}
else
{
- sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ParagraphStyles" ) );
+ sName = OUString( "ParagraphStyles" );
nFamily = XML_STYLE_FAMILY_TEXT_PARAGRAPH;
}
@@ -1501,7 +1501,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
{
Reference < XPropertySet > xSet( xTextField, UNO_QUERY );
Reference < XText > xText;
- Any a = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")) );
+ Any a = xSet->getPropertyValue( ::rtl::OUString("TextRange") );
a >>= xText;
if ( xText.is() )
{
@@ -1603,7 +1603,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
Reference< XIndexAccess > xNumberingRules = xNumberingRulesSupp->getNumberingRules();
nCount = xNumberingRules->getCount();
// Custom outline assignment lost after re-importing sxw (#i73361#)
- const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) );
+ const OUString sNumberingIsOutline( "NumberingIsOutline" );
for( sal_Int32 i = 0; i < nCount; ++i )
{
Reference< XIndexReplace > xNumRule( xNumberingRules->getByIndex( i ), UNO_QUERY );
@@ -1618,7 +1618,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
{
Reference < XPropertySet > xNumPropSet( xNumRule,
UNO_QUERY );
- const OUString sIsAutomatic( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) );
+ const OUString sIsAutomatic( "IsAutomatic" );
if( xNumPropSet.is() &&
xNumPropSet->getPropertySetInfo()
->hasPropertyByName( sIsAutomatic ) )
@@ -1686,7 +1686,7 @@ void XMLTextParagraphExport::exportText(
{
// fixme: move string to class member, couldn't do now because
// of no incompatible build
- OUString sHasLevels( RTL_CONSTASCII_USTRINGPARAM("HasLevels") );
+ OUString sHasLevels( "HasLevels" );
if (xInfo->hasPropertyByName( sHasLevels ) )
{
xPropertySet->getPropertyValue(sHasLevels) >>= bExportLevels;
@@ -2048,7 +2048,7 @@ void XMLTextParagraphExport::exportParagraph(
{
Reference< XPropertySet > xNumRulePropSet( xNumRule, UNO_QUERY );
xNumRulePropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ) >>= sOutlineName;
+ OUString("Name") ) >>= sOutlineName;
bAssignedtoOutlineStyle = ( sListStyleName == sOutlineName );
}
}
@@ -2179,7 +2179,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
sal_Bool bAutoStyles, sal_Bool bIsProgress,
sal_Bool bPrvChrIsSpc )
{
- static OUString sMeta(RTL_CONSTASCII_USTRINGPARAM("InContentMetadata"));
+ static OUString sMeta("InContentMetadata");
bool bPrevCharIsSpace = bPrvChrIsSpc;
/* This is used for exporting to strict OpenDocument 1.2, in which case traditional
@@ -2524,7 +2524,7 @@ sal_Bool lcl_txtpara_isBoundAsChar(
const Reference < XPropertySetInfo > & rPropSetInfo )
{
sal_Bool bIsBoundAsChar = sal_False;
- OUString sAnchorType( RTL_CONSTASCII_USTRINGPARAM( "AnchorType" ) );
+ OUString sAnchorType( "AnchorType" );
if( rPropSetInfo->hasPropertyByName( sAnchorType ) )
{
TextContentAnchorType eAnchor;
@@ -2732,7 +2732,7 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
sValue.makeStringAndClear() );
}
- OUString sZOrder( RTL_CONSTASCII_USTRINGPARAM( "ZOrder" ) );
+ OUString sZOrder( "ZOrder" );
if( xPropSetInfo->hasPropertyByName( sZOrder ) )
{
sal_Int32 nZIndex = 0;
@@ -3150,7 +3150,7 @@ void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rP
GetExport().GetEventExport().Export(xEventsSupp);
// image map
- OUString sImageMap(RTL_CONSTASCII_USTRINGPARAM("ImageMap"));
+ OUString sImageMap("ImageMap");
if (rPropSet->getPropertySetInfo()->hasPropertyByName(sImageMap))
GetExport().GetImageMapExport().Export( rPropSet );
}
@@ -3323,8 +3323,8 @@ void XMLTextParagraphExport::exportTextRange(
if( bHyperlink )
{
// export events (if supported)
- OUString sHyperLinkEvents(RTL_CONSTASCII_USTRINGPARAM(
- "HyperLinkEvents"));
+ OUString sHyperLinkEvents(
+ "HyperLinkEvents");
if (xPropSetInfo->hasPropertyByName(sHyperLinkEvents))
{
Reference<XNameReplace> xName(xPropSet->getPropertyValue(sHyperLinkEvents), uno::UNO_QUERY);
@@ -3512,7 +3512,7 @@ void XMLTextParagraphExport::exportTextDeclarations()
{
OUString sUrl;
OUString sIndexAutoMarkFileURL(
- RTL_CONSTASCII_USTRINGPARAM("IndexAutoMarkFileURL"));
+ "IndexAutoMarkFileURL");
if (xPropertySet->getPropertySetInfo()->hasPropertyByName(
sIndexAutoMarkFileURL))
{
@@ -3694,7 +3694,7 @@ void XMLTextParagraphExport::exportMeta(
const Reference<XPropertySet> & i_xPortion,
sal_Bool i_bAutoStyles, sal_Bool i_isProgress)
{
- static OUString sMeta(RTL_CONSTASCII_USTRINGPARAM("InContentMetadata"));
+ static OUString sMeta("InContentMetadata");
bool doExport(!i_bAutoStyles); // do not export element if autostyles
// check version >= 1.2
@@ -3757,7 +3757,7 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections(
{
// Reference<XPropertySet> xPropSet( xControlShape, UNO_QUERY );
// Reference<XTextContent> xTextContent;
- // xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TextRange" ) ) ) >>= xTextContent;
+ // xPropSet->getPropertyValue( OUString( "TextRange" ) ) >>= xTextContent;
Reference<XTextContent> xTextContent( xControlShape, UNO_QUERY );
if( xTextContent.is() )
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 87040a7538b2..15a613837c3e 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -420,10 +420,10 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
{
if( IsXMLToken( sShow, XML_NEW ) )
pHint->SetTargetFrameName(
- OUString( RTL_CONSTASCII_USTRINGPARAM("_blank" ) ) );
+ OUString( "_blank" ) );
else if( IsXMLToken( sShow, XML_REPLACE ) )
pHint->SetTargetFrameName(
- OUString( RTL_CONSTASCII_USTRINGPARAM("_self" ) ) );
+ OUString( "_self" ) );
}
rHints.push_back( pHint );
}
@@ -914,8 +914,8 @@ void XMLMetaImportContext::InsertMeta(
const uno::Reference<rdf::XMetadatable> xMeta(
XMLTextMarkImportContext::CreateAndInsertMark(
GetImport(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.text.InContentMetadata")),
+ OUString(
+ "com.sun.star.text.InContentMetadata"),
OUString(),
i_xInsertionRange, m_XmlId),
uno::UNO_QUERY);
@@ -993,8 +993,8 @@ void XMLMetaFieldImportContext::InsertMeta(
const Reference<XPropertySet> xPropertySet(
XMLTextMarkImportContext::CreateAndInsertMark(
GetImport(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.text.textfield.MetadataField")),
+ OUString(
+ "com.sun.star.text.textfield.MetadataField"),
OUString(),
i_xInsertionRange, m_XmlId),
UNO_QUERY);
@@ -1011,11 +1011,11 @@ void XMLMetaFieldImportContext::InsertMeta(
if (-1 != nKey)
{
static ::rtl::OUString sPropertyIsFixedLanguage(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")) );
+ ::rtl::OUString("IsFixedLanguage") );
Any any;
any <<= nKey;
xPropertySet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")), any);
+ OUString("NumberFormat"), any);
if ( xPropertySet->getPropertySetInfo()->
hasPropertyByName( sPropertyIsFixedLanguage ) )
{
@@ -1099,7 +1099,7 @@ XMLIndexMarkImportContext_Impl::XMLIndexMarkImportContext_Impl(
enum XMLTextPElemTokens eTok,
XMLHints_Impl& rHnts) :
SvXMLImportContext(rImport, nPrefix, rLocalName),
- sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")),
+ sAlternativeText("AlternativeText"),
rHints(rHnts),
eToken(eTok)
{
@@ -1268,8 +1268,8 @@ void XMLIndexMarkImportContext_Impl::GetServiceName(
case XML_TOK_TEXT_TOC_MARK_START:
case XML_TOK_TEXT_TOC_MARK_END:
{
- OUString sTmp(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_com_sun_star_text_ContentIndexMark));
+ OUString sTmp(
+ sAPI_com_sun_star_text_ContentIndexMark);
sServiceName = sTmp;
break;
}
@@ -1278,8 +1278,8 @@ void XMLIndexMarkImportContext_Impl::GetServiceName(
case XML_TOK_TEXT_USER_INDEX_MARK_START:
case XML_TOK_TEXT_USER_INDEX_MARK_END:
{
- OUString sTmp(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_com_sun_star_text_UserIndexMark));
+ OUString sTmp(
+ sAPI_com_sun_star_text_UserIndexMark);
sServiceName = sTmp;
break;
}
@@ -1288,8 +1288,8 @@ void XMLIndexMarkImportContext_Impl::GetServiceName(
case XML_TOK_TEXT_ALPHA_INDEX_MARK_START:
case XML_TOK_TEXT_ALPHA_INDEX_MARK_END:
{
- OUString sTmp(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_com_sun_star_text_DocumentIndexMark));
+ OUString sTmp(
+ sAPI_com_sun_star_text_DocumentIndexMark);
sServiceName = sTmp;
break;
}
@@ -1355,7 +1355,7 @@ XMLTOCMarkImportContext_Impl::XMLTOCMarkImportContext_Impl(
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName,
nTok, rHnts),
- sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
+ sLevel("Level")
{
}
@@ -1420,8 +1420,8 @@ XMLUserIndexMarkImportContext_Impl::XMLUserIndexMarkImportContext_Impl(
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName,
nTok, rHnts),
- sUserIndexName(RTL_CONSTASCII_USTRINGPARAM("UserIndexName")),
- sLevel(RTL_CONSTASCII_USTRINGPARAM("Level"))
+ sUserIndexName("UserIndexName"),
+ sLevel("Level")
{
}
@@ -1499,12 +1499,12 @@ XMLAlphaIndexMarkImportContext_Impl::XMLAlphaIndexMarkImportContext_Impl(
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
XMLIndexMarkImportContext_Impl(rImport, nPrefix, rLocalName,
nTok, rHnts),
- sPrimaryKey(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")),
- sSecondaryKey(RTL_CONSTASCII_USTRINGPARAM("SecondaryKey")),
- sTextReading(RTL_CONSTASCII_USTRINGPARAM("TextReading")),
- sPrimaryKeyReading(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeyReading")),
- sSecondaryKeyReading(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeyReading")),
- sMainEntry(RTL_CONSTASCII_USTRINGPARAM("IsMainEntry"))
+ sPrimaryKey("PrimaryKey"),
+ sSecondaryKey("SecondaryKey"),
+ sTextReading("TextReading"),
+ sPrimaryKeyReading("PrimaryKeyReading"),
+ sSecondaryKeyReading("SecondaryKeyReading"),
+ sMainEntry("IsMainEntry")
{
}
@@ -1572,7 +1572,7 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
,sal_uInt8 nSFConvFlags
)
: SvXMLImportContext( rImport, nPrfx, rLName )
-, sTextFrame(RTL_CONSTASCII_USTRINGPARAM("TextFrame"))
+, sTextFrame("TextFrame")
, rHints( rHnts )
, pHint( 0 )
, rIgnoreLeadingSpace( rIgnLeadSpace )
@@ -1662,7 +1662,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
UNO_QUERY );
const OUString sHyperLinkURL(
- RTL_CONSTASCII_USTRINGPARAM("HyperLinkURL"));
+ "HyperLinkURL");
if (xPropSet->getPropertySetInfo()->hasPropertyByName(sHyperLinkURL))
{
@@ -2100,7 +2100,7 @@ XMLParaContext::~XMLParaContext()
if (bIsListHeader)
{
OUString sNumberingIsNumber
- (RTL_CONSTASCII_USTRINGPARAM("NumberingIsNumber"));
+ ("NumberingIsNumber");
if(xPropSet->getPropertySetInfo()->
hasPropertyByName(sNumberingIsNumber))
{
@@ -2111,9 +2111,9 @@ XMLParaContext::~XMLParaContext()
if (bIsRestart)
{
OUString sParaIsNumberingRestart
- (RTL_CONSTASCII_USTRINGPARAM("ParaIsNumberingRestart"));
+ ("ParaIsNumberingRestart");
OUString sNumberingStartValue
- (RTL_CONSTASCII_USTRINGPARAM("NumberingStartValue"));
+ ("NumberingStartValue");
if (xPropSet->getPropertySetInfo()->
hasPropertyByName(sParaIsNumberingRestart))
{
@@ -2167,9 +2167,7 @@ XMLParaContext::~XMLParaContext()
// borrow from XMLTextMarkImportContext
XMLTextMarkImportContext::CreateAndInsertMark(
GetImport(),
- OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.text.ReferenceMark")),
+ OUString( "com.sun.star.text.ReferenceMark"),
rRefName,
xRange);
}
@@ -2230,7 +2228,7 @@ XMLParaContext::~XMLParaContext()
TextContentAnchorType eAnchorType =
TextContentAnchorType_AT_PARAGRAPH;
{
- OUString sAnchorType( RTL_CONSTASCII_USTRINGPARAM( "AnchorType" ) );
+ OUString sAnchorType( "AnchorType" );
Any aAny = xPropSet->getPropertyValue( sAnchorType );
aAny >>= eAnchorType;
}
@@ -2240,7 +2238,7 @@ XMLParaContext::~XMLParaContext()
Reference<XTextRange> xRange(xAttrCursor, UNO_QUERY);
Any aPos;
aPos <<= xRange;
- OUString sTextRange( RTL_CONSTASCII_USTRINGPARAM( "TextRange" ) );
+ OUString sTextRange( "TextRange" );
xPropSet->setPropertyValue(sTextRange, aPos);
}
}
@@ -2262,7 +2260,7 @@ XMLParaContext::~XMLParaContext()
Reference < XPropertySet > xPropSet( xShape, UNO_QUERY );
TextContentAnchorType eAnchorType = TextContentAnchorType_AT_PARAGRAPH;
{
- OUString sAnchorType( RTL_CONSTASCII_USTRINGPARAM( "AnchorType" ) );
+ OUString sAnchorType( "AnchorType" );
Any aAny = xPropSet->getPropertyValue( sAnchorType );
aAny >>= eAnchorType;
}
@@ -2272,7 +2270,7 @@ XMLParaContext::~XMLParaContext()
Reference<XTextRange> xRange(xAttrCursor, UNO_QUERY);
Any aPos;
aPos <<= xRange;
- OUString sTextRange( RTL_CONSTASCII_USTRINGPARAM( "TextRange" ) );
+ OUString sTextRange( "TextRange" );
xPropSet->setPropertyValue(sTextRange, aPos);
}
}
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index bbf1fd533cf5..c9c8219d214f 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -121,13 +121,13 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
sal_Bool bType, sal_Bool bStyle, sal_Bool bValue,
sal_Bool bPresentation) :
XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, rLocalName),
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
- sPropertyHint(RTL_CONSTASCII_USTRINGPARAM(sAPI_hint)),
- sPropertyHelp(RTL_CONSTASCII_USTRINGPARAM(sAPI_help)),
- sPropertyTooltip(RTL_CONSTASCII_USTRINGPARAM(sAPI_tooltip)),
- sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible)),
- sPropertyIsDisplayFormula(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_show_formula)),
- sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
+ sPropertyContent(sAPI_content),
+ sPropertyHint(sAPI_hint),
+ sPropertyHelp(sAPI_help),
+ sPropertyTooltip(sAPI_tooltip),
+ sPropertyIsVisible(sAPI_is_visible),
+ sPropertyIsDisplayFormula(sAPI_is_show_formula),
+ sPropertyCurrentPresentation(sAPI_current_presentation),
aValueHelper(rImport, rHlp, bType, bStyle, bValue, sal_False),
bDisplayFormula(sal_False),
bDisplayNone(sal_False),
@@ -342,7 +342,7 @@ void XMLSetVarFieldImportContext::EndElement()
{
// create field/Service
Reference<XPropertySet> xPropSet;
- if (CreateField(xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_textfield_prefix)) + GetServiceName()))
+ if (CreateField(xPropSet, OUString(sAPI_textfield_prefix) + GetServiceName()))
{
Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY);
if (xDepTextField.is())
@@ -405,8 +405,8 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
sal_False,
sal_False, sal_False, sal_False, sal_True),
- sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format)),
- sPropertySequenceValue(RTL_CONSTASCII_USTRINGPARAM(sAPI_sequence_value)),
+ sPropertyNumberFormat(sAPI_number_format),
+ sPropertySequenceValue(sAPI_sequence_value),
sNumFormat(OUString::valueOf(sal_Unicode('1'))),
sNumFormatSync(GetXMLToken(XML_FALSE)),
bRefNameOK(sal_False)
@@ -479,7 +479,7 @@ XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext(
sal_True, sal_False,
sal_True, sal_True, sal_True,
sal_True),
- sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
+ sPropertySubType(sAPI_sub_type)
{
}
@@ -515,8 +515,8 @@ XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext(
sal_True, sal_False,
sal_True, sal_True, sal_True,
sal_True),
- sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)),
- sPropertyIsInput(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_input))
+ sPropertySubType(sAPI_sub_type),
+ sPropertyIsInput(sAPI_is_input)
{
}
@@ -611,7 +611,7 @@ XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext(
sal_False, sal_True,
sal_True, sal_True, sal_False,
sal_True),
- sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
+ sPropertySubType(sAPI_sub_type)
{
}
@@ -646,7 +646,7 @@ XMLExpressionFieldImportContext::XMLExpressionFieldImportContext(
sal_False, sal_True,
sal_True, sal_True, sal_False,
sal_True),
- sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
+ sPropertySubType(sAPI_sub_type)
{
bValid = sal_True; // always valid
}
@@ -683,7 +683,7 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
sal_False, sal_False,
sal_False, sal_False, sal_False,
sal_False),
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))
+ sPropertyContent(sAPI_content)
{
bValid = sal_True; // always valid
}
@@ -712,9 +712,9 @@ XMLTableFormulaImportContext::XMLTableFormulaImportContext(
const OUString& rLocalName) :
XMLTextFieldImportContext(rImport, rHlp, sAPI_table_formula,
nPrfx, rLocalName),
- sPropertyIsShowFormula(RTL_CONSTASCII_USTRINGPARAM("IsShowFormula")),
+ sPropertyIsShowFormula("IsShowFormula"),
sPropertyCurrentPresentation(
- RTL_CONSTASCII_USTRINGPARAM("CurrentPresentation")),
+ "CurrentPresentation"),
aValueHelper(rImport, rHlp, sal_False, sal_True, sal_False, sal_True),
sFormula(),
bIsShowFormula(sal_False)
@@ -849,11 +849,11 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
enum VarType eVarType) :
SvXMLImportContext(rImport, nPrfx, rLocalName),
// bug?? which properties for userfield/userfieldmaster
- sPropertyName(RTL_CONSTASCII_USTRINGPARAM(sAPI_name)),
- sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)),
- sPropertyNumberingLevel(RTL_CONSTASCII_USTRINGPARAM(sAPI_chapter_numbering_level)),
- sPropertyNumberingSeparator(RTL_CONSTASCII_USTRINGPARAM(sAPI_numbering_separator)),
- sPropertyIsExpression(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_expression)),
+ sPropertyName(sAPI_name),
+ sPropertySubType(sAPI_sub_type),
+ sPropertyNumberingLevel(sAPI_chapter_numbering_level),
+ sPropertyNumberingSeparator(sAPI_numbering_separator),
+ sPropertyIsExpression(sAPI_is_expression),
aValueHelper(rImport, rHlp, sal_True, sal_False, sal_True, sal_False),
nNumLevel(-1), cSeparationChar('.')
{
@@ -993,7 +993,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
aAny = xMaster->getPropertyValue(
// sPropertySubType
- OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
+ OUString(sAPI_sub_type)
);
sal_Int16 nType = 0;
aAny >>= nType;
@@ -1070,7 +1070,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
aAny <<= sName;
xMaster->setPropertyValue(
// sPropertyName
- OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_name))
+ OUString(sAPI_name)
, aAny);
if (eVarType != VarTypeUserField) {
@@ -1081,7 +1081,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
SetVariableType::SEQUENCE);
xMaster->setPropertyValue(
// sPropertySubType
- OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
+ OUString(sAPI_sub_type)
, aAny);
} // else : user field: no subtype
@@ -1110,10 +1110,10 @@ XMLDatabaseDisplayImportContext::XMLDatabaseDisplayImportContext(
const OUString& rLocalName) :
XMLDatabaseFieldImportContext(rImport, rHlp, sAPI_database,
nPrfx, rLocalName, false),
- sPropertyColumnName(RTL_CONSTASCII_USTRINGPARAM(sAPI_data_column_name)),
- sPropertyDatabaseFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_data_base_format)),
- sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
- sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible)),
+ sPropertyColumnName(sAPI_data_column_name),
+ sPropertyDatabaseFormat(sAPI_is_data_base_format),
+ sPropertyCurrentPresentation(sAPI_current_presentation),
+ sPropertyIsVisible(sAPI_is_visible),
aValueHelper(rImport, rHlp, sal_False, sal_True, sal_False, sal_False),
bColumnOK(sal_False),
bDisplay( sal_True ),
@@ -1169,8 +1169,8 @@ void XMLDatabaseDisplayImportContext::EndElement()
// create and prepare field master first
if (CreateField(xMaster,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_fieldmaster_database))))
+ OUString(
+ sAPI_fieldmaster_database)))
{
Any aAny;
aAny <<= sColumnName;
@@ -1182,8 +1182,8 @@ void XMLDatabaseDisplayImportContext::EndElement()
// create field
Reference<XPropertySet> xField;
if (CreateField(xField,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- sAPI_database))))
+ OUString(
+ sAPI_database)))
{
// attach field master
Reference<XDependentTextField> xDepField(xField, UNO_QUERY);
@@ -1264,10 +1264,10 @@ XMLValueImportHelper::XMLValueImportHelper(
SvXMLImport& rImprt,
XMLTextImportHelper& rHlp,
sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, sal_Bool bFormula) :
- sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
- sPropertyValue(RTL_CONSTASCII_USTRINGPARAM(sAPI_value)),
- sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format)),
- sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed_language)),
+ sPropertyContent(sAPI_content),
+ sPropertyValue(sAPI_value),
+ sPropertyNumberFormat(sAPI_number_format),
+ sPropertyIsFixedLanguage(sAPI_is_fixed_language),
rImport(rImprt),
rHelper(rHlp),
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 0a0bce3163ca..6445e91e0414 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -515,7 +515,7 @@ void XMLPropertiesTContext_Impl::StartElement(
{
if ( !aNewAttrValue.isEmpty() )
{
- aNewAttrValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
+ aNewAttrValue += rtl::OUString(" " );
}
if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_EVEN ) )
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 4b80b3c803fa..724a5979b6b9 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -928,7 +928,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
{
if ( !aStyleMirrorAttrValue.isEmpty() )
{
- aStyleMirrorAttrValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
+ aStyleMirrorAttrValue += rtl::OUString(" " );
}
if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_LEFT_PAGES ) )
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 4872a74fa6b6..e277f4ed6982 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -461,13 +461,13 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments
OUString sRelPath, sName;
Reference< XPropertySetInfo > xPropSetInfo =
m_xPropSet->getPropertySetInfo();
- OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamRelPath" ) );
+ OUString sPropName( "StreamRelPath" );
if( xPropSetInfo->hasPropertyByName(sPropName) )
{
aAny = m_xPropSet->getPropertyValue(sPropName);
aAny >>= sRelPath;
}
- sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("StreamName" ) );
+ sPropName = OUString( "StreamName" );
if( xPropSetInfo->hasPropertyByName(sPropName) )
{
aAny = m_xPropSet->getPropertyValue(sPropName);
@@ -475,7 +475,7 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments
}
if( !sName.isEmpty() )
{
- m_aExtPathPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM("../" ) );
+ m_aExtPathPrefix = OUString( "../" );
// If there is a rel path within a package, then append
// additional '../'. If the rel path contains an ':', then it is
@@ -887,7 +887,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
break;
case XML_ATACTION_SHAPEID:
{
- OUString sNewValue( RTL_CONSTASCII_USTRINGPARAM( "shape" ) );
+ OUString sNewValue( "shape" );
sNewValue += rAttrValue;
pMutableAttrList->SetValueByIndex( i, sNewValue );
break;
@@ -1074,8 +1074,8 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const
->xCharClass =
Reference < XCharacterClassification >(
xFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.i18n.CharacterClassification_Unicode")) ),
+ OUString(
+ "com.sun.star.i18n.CharacterClassification_Unicode") ),
UNO_QUERY );
OSL_ENSURE( xCharClass.is(),
@@ -1488,9 +1488,9 @@ bool XMLTransformerBase::isWriter() const
{
Reference< XServiceInfo > xSI( mxModel, UNO_QUERY );
return xSI.is() &&
- ( xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ) ) ||
- xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ) ) ) ||
- xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) ) );
+ ( xSI->supportsService( OUString( "com.sun.star.text.TextDocument" ) ) ||
+ xSI->supportsService( OUString( "com.sun.star.text.WebDocument" ) ) ||
+ xSI->supportsService( OUString( "com.sun.star.text.GlobalDocument" ) ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 01:18:44 +0000