Kaydet (Commit) a8fb1a12 authored tarafından Miklos Vajna's avatar Miklos Vajna

xmloff: kill RTL_CONSTASCII_USTRINGPARAM in rebased code

Change-Id: I3d5227c299d78d4492c47e29385c2c5ca25cfe49
üst 57ce2ffc
......@@ -44,7 +44,7 @@ const OUString& UnoInterfaceToUniqueIdentifierMapper::registerReference( const R
}
else
{
OUString aId( RTL_CONSTASCII_USTRINGPARAM( "id" ) );
OUString aId( "id" );
aId += OUString::valueOf( mnNextId++ );
return (*maEntries.insert( IdMap_t::value_type( aId, rInterface ) ).first).first;
}
......
......@@ -88,7 +88,7 @@ void XMLGraphicsDefaultStyle::SetDefaults()
if( !xFact.is() )
return;
Reference< XPropertySet > xDefaults( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults") ) ), UNO_QUERY );
Reference< XPropertySet > xDefaults( xFact->createInstance( "com.sun.star.drawing.Defaults" ), UNO_QUERY );
if( !xDefaults.is() )
return;
// SJ: #i114750#
......@@ -105,7 +105,7 @@ void XMLGraphicsDefaultStyle::SetDefaults()
) )
bWordWrapDefault = sal_False;
const OUString sTextWordWrap( RTL_CONSTASCII_USTRINGPARAM( "TextWordWrap" ) );
const OUString sTextWordWrap( "TextWordWrap" );
Reference< XPropertySetInfo > xInfo( xDefaults->getPropertySetInfo() );
if ( xInfo->hasPropertyByName( sTextWordWrap ) )
xDefaults->setPropertyValue( sTextWordWrap, Any( bWordWrapDefault ) );
......
......@@ -35,9 +35,9 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
XMLScriptContextFactory::XMLScriptContextFactory() :
sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
sScript(RTL_CONSTASCII_USTRINGPARAM("Script")),
sURL(RTL_CONSTASCII_USTRINGPARAM("Script"))
sEventType("EventType"),
sScript("Script"),
sURL("Script")
{
}
......
......@@ -34,7 +34,7 @@ using ::com::sun::star::beans::PropertyValue;
XMLScriptExportHandler::XMLScriptExportHandler() :
sURL(RTL_CONSTASCII_USTRINGPARAM("Script"))
sURL("Script")
{
}
......
......@@ -36,10 +36,10 @@ using ::com::sun::star::uno::Any;
XMLStarBasicContextFactory::XMLStarBasicContextFactory() :
sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
sLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")),
sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")),
sStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic"))
sEventType("EventType"),
sLibrary("Library"),
sMacroName("MacroName"),
sStarBasic("StarBasic")
{
}
......@@ -83,7 +83,7 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
sMacroNameVal.copy(0,rApp.getLength()).equalsIgnoreAsciiCase( rApp ) &&
':' == sMacroNameVal[rApp.getLength()] )
{
sLibraryVal = OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice"));
sLibraryVal = "StarOffice";
sMacroNameVal = sMacroNameVal.copy( rApp.getLength()+1 );
}
else if( sMacroNameVal.getLength() > rDoc.getLength()+1 &&
......
......@@ -60,7 +60,7 @@ sal_Bool XMLShadowedPropHdl::exportXML( OUString& rStrExpValue, const Any& rValu
{
if( bValue )
{
rStrExpValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "1pt 1pt" ) );
rStrExpValue = "1pt 1pt";
}
else
{
......
......@@ -46,8 +46,7 @@ XMLAutoMarkFileContext::XMLAutoMarkFileContext(
sal_uInt16 nPrefix,
const OUString& rLocalName) :
SvXMLImportContext(rImport, nPrefix, rLocalName),
sIndexAutoMarkFileURL(
RTL_CONSTASCII_USTRINGPARAM("IndexAutoMarkFileURL"))
sIndexAutoMarkFileURL("IndexAutoMarkFileURL")
{
}
......
......@@ -119,8 +119,7 @@ Sequence< OUString > SAL_CALL
OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw()
{
return OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" ) );
return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" );
}
Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance(
......
......@@ -84,28 +84,28 @@ XMLIndexTemplateContext::XMLIndexTemplateContext(
, bOutlineLevelOK(sal_False)
, bTOC( bT )
, rPropertySet(rPropSet)
, sTokenEntryNumber(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenEntryNumber))
, sTokenEntryText(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenEntryText))
, sTokenTabStop(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenTabStop))
, sTokenText(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenText))
, sTokenPageNumber(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenPageNumber))
, sTokenChapterInfo(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenChapterInfo))
, sTokenHyperlinkStart(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenHyperlinkStart))
, sTokenHyperlinkEnd(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenHyperlinkEnd))
, sTokenBibliographyDataField(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenBibliographyDataField))
, sCharacterStyleName(RTL_CONSTASCII_USTRINGPARAM("CharacterStyleName"))
, sTokenType(RTL_CONSTASCII_USTRINGPARAM("TokenType"))
, sText(RTL_CONSTASCII_USTRINGPARAM("Text"))
, sTabStopRightAligned(RTL_CONSTASCII_USTRINGPARAM("TabStopRightAligned"))
, sTabStopPosition(RTL_CONSTASCII_USTRINGPARAM("TabStopPosition"))
, sTabStopFillCharacter(RTL_CONSTASCII_USTRINGPARAM("TabStopFillCharacter"))
, sBibliographyDataField(RTL_CONSTASCII_USTRINGPARAM("BibliographyDataField"))
, sChapterFormat(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat"))
, sChapterLevel(RTL_CONSTASCII_USTRINGPARAM("ChapterLevel")) //#i53420
, sLevelFormat(RTL_CONSTASCII_USTRINGPARAM("LevelFormat"))
, sParaStyleLevel(RTL_CONSTASCII_USTRINGPARAM("ParaStyleLevel"))
, sTokenEntryNumber(sAPI_TokenEntryNumber)
, sTokenEntryText(sAPI_TokenEntryText)
, sTokenTabStop(sAPI_TokenTabStop)
, sTokenText(sAPI_TokenText)
, sTokenPageNumber(sAPI_TokenPageNumber)
, sTokenChapterInfo(sAPI_TokenChapterInfo)
, sTokenHyperlinkStart(sAPI_TokenHyperlinkStart)
, sTokenHyperlinkEnd(sAPI_TokenHyperlinkEnd)
, sTokenBibliographyDataField(sAPI_TokenBibliographyDataField)
, sCharacterStyleName("CharacterStyleName")
, sTokenType("TokenType")
, sText("Text")
, sTabStopRightAligned("TabStopRightAligned")
, sTabStopPosition("TabStopPosition")
, sTabStopFillCharacter("TabStopFillCharacter")
, sBibliographyDataField("BibliographyDataField")
, sChapterFormat("ChapterFormat")
, sChapterLevel("ChapterLevel") //#i53420
, sLevelFormat("LevelFormat")
, sParaStyleLevel("ParaStyleLevel")
{
DBG_ASSERT( ((XML_TOKEN_INVALID != eLevelAttrName) && (NULL != pLevelNameMap))
|| ((XML_TOKEN_INVALID == eLevelAttrName) && (NULL == pLevelNameMap)),
......
......@@ -35,10 +35,6 @@ using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_STYLE_NAME;
const sal_Char sAPI_Title[] = "Title";
const sal_Char sAPI_ParaStyleHeading[] = "ParaStyleHeading";
TYPEINIT1( XMLIndexTitleTemplateContext, SvXMLImportContext );
XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext(
......@@ -47,8 +43,8 @@ XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext(
sal_uInt16 nPrfx,
const OUString& rLocalName)
: SvXMLImportContext(rImport, nPrfx, rLocalName)
, sTitle(RTL_CONSTASCII_USTRINGPARAM(sAPI_Title))
, sParaStyleHeading(RTL_CONSTASCII_USTRINGPARAM(sAPI_ParaStyleHeading))
, sTitle("Title")
, sParaStyleHeading("ParaStyleHeading")
, bStyleNameOK(sal_False)
, rTOCPropertySet(rPropSet)
{
......
......@@ -37,17 +37,17 @@ using namespace ::xmloff::token;
XMLTextMasterPageExport::XMLTextMasterPageExport( SvXMLExport& rExp ) :
XMLPageExport( rExp ),
sHeaderText( RTL_CONSTASCII_USTRINGPARAM( "HeaderText" ) ),
sHeaderOn( RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" ) ),
sHeaderShareContent( RTL_CONSTASCII_USTRINGPARAM( "HeaderIsShared" ) ),
sHeaderText( "HeaderText" ),
sHeaderOn( "HeaderIsOn" ),
sHeaderShareContent( "HeaderIsShared" ),
sHeaderTextFirst( "HeaderTextFirst" ),
sHeaderTextLeft( RTL_CONSTASCII_USTRINGPARAM( "HeaderTextLeft" ) ),
sHeaderTextLeft( "HeaderTextLeft" ),
sFirstShareContent( "FirstIsShared" ),
sFooterText( RTL_CONSTASCII_USTRINGPARAM( "FooterText" ) ),
sFooterOn( RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" ) ),
sFooterShareContent( RTL_CONSTASCII_USTRINGPARAM( "FooterIsShared" ) ),
sFooterText( "FooterText" ),
sFooterOn( "FooterIsOn" ),
sFooterShareContent( "FooterIsShared" ),
sFooterTextFirst( "FooterTextFirst" ),
sFooterTextLeft( RTL_CONSTASCII_USTRINGPARAM( "FooterTextLeft" ) )
sFooterTextLeft( "FooterTextLeft" )
{
}
......
......@@ -150,7 +150,7 @@ XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
sal_Bool /*bDefaultStyle*/ ) :
XMLShapeStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles,
nFamily ),
sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
sIsAutoUpdate( "IsAutoUpdate" ),
bAutoUpdate( sal_False )
{
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment