[Libreoffice-commits] core.git: xmloff/source
Chr. Rossmanith
ChrRossmanith at gmx.de
Tue Feb 26 11:19:48 PST 2013
xmloff/source/draw/ximpstyl.cxx | 8 ++---
xmloff/source/forms/controlpropertyhdl.cxx | 2 -
xmloff/source/forms/elementexport.cxx | 4 +-
xmloff/source/forms/gridcolumnproptranslator.cxx | 8 ++---
xmloff/source/forms/layerimport.cxx | 2 -
xmloff/source/forms/propertyexport.cxx | 8 ++---
xmloff/source/forms/strings.hxx | 2 -
xmloff/source/meta/MetaImportComponent.cxx | 17 +++++------
xmloff/source/meta/xmlmetae.cxx | 24 +++++----------
xmloff/source/script/XMLEventExport.cxx | 2 -
xmloff/source/script/XMLStarBasicExportHandler.cxx | 10 +++---
xmloff/source/script/xmlscripti.cxx | 8 ++---
xmloff/source/style/PageMasterExportPropMapper.cxx | 16 +++++-----
xmloff/source/style/PageMasterImportContext.cxx | 4 +-
xmloff/source/style/PageMasterPropHdl.cxx | 2 -
xmloff/source/style/XMLPageExport.cxx | 13 +++-----
xmloff/source/style/numehelp.cxx | 32 ++++++++++-----------
xmloff/source/style/styleexp.cxx | 16 +++++-----
18 files changed, 84 insertions(+), 94 deletions(-)
New commits:
commit f03daee6b44c22107f90a99ad83d8e60023e0f71
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Tue Feb 26 20:17:25 2013 +0100
removed RTL_CONSTASCII_(U)STRINGPARAM
Change-Id: I8ab8c32ee561a14dcb05b9cf04387beadccd314a
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 73a1d63..61c1a48 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1245,8 +1245,8 @@ void SdXMLStylesContext::EndElement()
{
uno::Reference< beans::XPropertySetInfo > xInfoSetInfo( xInfoSet->getPropertySetInfo() );
- if( xInfoSetInfo->hasPropertyByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayouts" ) ) ) )
- xInfoSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageLayouts" ) ), uno::makeAny( getPageLayouts() ) );
+ if( xInfoSetInfo->hasPropertyByName( OUString( "PageLayouts" ) ) )
+ xInfoSet->setPropertyValue( OUString( "PageLayouts" ), uno::makeAny( getPageLayouts() ) );
}
}
@@ -1288,7 +1288,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const
{
if(GetSdImport().GetLocalDocStyleFamilies().is()) try
{
- const OUString sGraphicStyleName(OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")));
+ const OUString sGraphicStyleName(OUString("graphics"));
uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW );
ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, rtl::OUString());
@@ -1303,7 +1303,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const
{
if(GetSdImport().GetLocalDocStyleFamilies().is()) try
{
- const OUString sCellStyleName(OUString(RTL_CONSTASCII_USTRINGPARAM("cell")));
+ const OUString sCellStyleName(OUString("cell"));
uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW );
ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString());
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index 044f188..15b9643 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -296,7 +296,7 @@ namespace xmloff
return sal_False;
if ( !_rStrExpValue.isEmpty() )
- _rStrExpValue += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) );
+ _rStrExpValue += " ";
_rStrExpValue += aOut.makeStringAndClear();
return sal_True;
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 8870248..d2a2dea 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -379,7 +379,7 @@ namespace xmloff
// later on imported, it overwrites anything which has previously been imported for
// CharStrikeout.
// #i27729#
- exportedProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharCrossedOut" ) ) );
+ exportedProperty( OUString( "CharCrossedOut" ) );
}
if ( m_eType == LISTBOX )
@@ -1960,7 +1960,7 @@ namespace xmloff
try
{
// currently exchanging the data with a database column?
- ::rtl::OUString sBoundFieldPropertyName( RTL_CONSTASCII_USTRINGPARAM( "BoundField" ) );
+ ::rtl::OUString sBoundFieldPropertyName( "BoundField" );
if ( m_xPropertyInfo.is() && m_xPropertyInfo->hasPropertyByName( sBoundFieldPropertyName ) )
{
Reference< XPropertySet > xBoundField;
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index f9f2e8d..86fa204 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -42,15 +42,15 @@ namespace xmloff
namespace
{
//----------------------------------------------------------------
- ::rtl::OUString getParaAlignProperty()
+ OUString getParaAlignProperty()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" ) );
+ return OUString( "ParaAdjust" );
}
//----------------------------------------------------------------
- ::rtl::OUString getAlignProperty()
+ OUString getAlignProperty()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Align" ) );
+ return OUString( "Align" );
}
//----------------------------------------------------------------
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index af8bb19..f87c791 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -542,7 +542,7 @@ void OFormLayerXMLImport_Impl::documentDone( )
&& FormCellBindingHelper::isCellBindingAllowed( rImport.GetModel() )
)
{
- static ::rtl::OUString s_sIndex( RTL_CONSTASCII_USTRINGPARAM( ":index" ) );
+ static OUString s_sIndex( ":index" );
::std::vector< ModelStringPair >::const_iterator aEnd = m_aCellValueBindings.end();
for ( ::std::vector< ModelStringPair >::const_iterator aCellBindings = m_aCellValueBindings.begin();
aCellBindings != aEnd;
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index c148ca3..ec37ae8 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -454,11 +454,11 @@ namespace xmloff
exportedProperty(PROPERTY_TIMEFORMAT);
// the following properties should have been exported at the shape already:
- exportedProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VerticalAlign" ) ) );
- exportedProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ) );
- exportedProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScaleMode" ) ) );
+ exportedProperty( "VerticalAlign" );
+ exportedProperty( "WritingMode" );
+ exportedProperty( "ScaleMode" );
// ditto the TextWritingMode
- exportedProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ) );
+ exportedProperty( "WritingMode" );
}
//---------------------------------------------------------------------
diff --git a/xmloff/source/forms/strings.hxx b/xmloff/source/forms/strings.hxx
index 3d27364..c528a8c 100644
--- a/xmloff/source/forms/strings.hxx
+++ b/xmloff/source/forms/strings.hxx
@@ -31,7 +31,7 @@ namespace xmloff
#ifndef XMLFORM_IMPLEMENT_STRINGS
#define XMLFORM_CONSTASCII_STRING(ident, string) extern const ConstAsciiString ident
#else
- #define XMLFORM_CONSTASCII_STRING(ident, string) extern const ConstAsciiString ident = {RTL_CONSTASCII_STRINGPARAM(string)}
+ #define XMLFORM_CONSTASCII_STRING(ident, string) extern const ConstAsciiString ident = {string}
#endif
//============================================================
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index d1e7a8f..d19bb05 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -53,9 +53,9 @@ SvXMLImportContext* XMLMetaImportComponent::CreateContext(
IsXMLToken(rLocalName, XML_DOCUMENT_META) )
{
if (!mxDocProps.is()) {
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ throw uno::RuntimeException(OUString(
"XMLMetaImportComponent::CreateContext: setTargetDocument "
- "has not been called")), *this);
+ "has not been called"), *this);
}
return new SvXMLMetaDocumentContext(
*this, nPrefix, rLocalName, mxDocProps);
@@ -72,24 +72,23 @@ void SAL_CALL XMLMetaImportComponent::setTargetDocument(
{
mxDocProps = uno::Reference< document::XDocumentProperties >::query( xDoc );
if( !mxDocProps.is() )
- throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ throw lang::IllegalArgumentException(OUString(
"XMLMetaImportComponent::setTargetDocument: argument is no "
- "XDocumentProperties")), uno::Reference<uno::XInterface>(*this), 0);
+ "XDocumentProperties"), uno::Reference<uno::XInterface>(*this), 0);
}
uno::Sequence< rtl::OUString > SAL_CALL
XMLMetaImportComponent_getSupportedServiceNames()
throw()
{
- const rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.document.XMLOasisMetaImporter" ) );
- const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
+ const OUString aServiceName( "com.sun.star.document.XMLOasisMetaImporter" );
+ const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-rtl::OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw()
+OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLMetaImportComponent" ) );
+ return OUString( "XMLMetaImportComponent" );
}
uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance(
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 5653dc0..0da8be6 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -272,36 +272,28 @@ void SvXMLMetaExport::_MExport()
if ( aDocStatistic[nInd].Value >>= nValue )
{
::rtl::OUString aValue = rtl::OUString::valueOf( nValue );
- if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "TableCount" ) ) ) )
+ if ( aDocStatistic[nInd].Name == "TableCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_TABLE_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "ObjectCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "ObjectCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_OBJECT_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "ImageCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "ImageCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_IMAGE_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "PageCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "PageCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_PAGE_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "ParagraphCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "ParagraphCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "WordCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "WordCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_WORD_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "CharacterCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "CharacterCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_CHARACTER_COUNT, aValue );
- else if ( aDocStatistic[nInd].Name.equals( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "CellCount" ) ) ) )
+ else if ( aDocStatistic[nInd].Name == "CellCount" )
mrExport.AddAttribute(
XML_NAMESPACE_META, XML_CELL_COUNT, aValue );
else
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index 43e4848..0eda53d 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -45,7 +45,7 @@ using ::xmloff::token::XML_EVENT_LISTENERS;
XMLEventExport::XMLEventExport(SvXMLExport& rExp,
const XMLEventNameTranslation* pTranslationTable) :
- sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
+ sEventType("EventType"),
rExport(rExp),
bExtNamespace(false)
{
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index eadcbbe..bfa1155 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -35,11 +35,11 @@ using ::com::sun::star::beans::PropertyValue;
XMLStarBasicExportHandler::XMLStarBasicExportHandler() :
- sStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic")),
- sLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")),
- sMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")),
- sStarOffice(RTL_CONSTASCII_USTRINGPARAM("StarOffice")),
- sApplication(RTL_CONSTASCII_USTRINGPARAM("application"))
+ sStarBasic("StarBasic"),
+ sLibrary("Library"),
+ sMacroName("MacroName"),
+ sStarOffice("StarOffice"),
+ sApplication("application")
{
}
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index 343f94d..2e86608 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -90,8 +90,8 @@ SvXMLImportContext* XMLScriptChildContext::CreateChildContext(
if ( m_xDocumentScripts.is() )
{ // document supports embedding scripts/macros
- ::rtl::OUString aBasic( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) );
- aBasic += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":Basic" ) );
+ OUString aBasic( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) );
+ aBasic += OUString( ":Basic" );
if ( m_aLanguage == aBasic && nPrefix == XML_NAMESPACE_OOO && IsXMLToken( rLocalName, XML_LIBRARIES ) )
pContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel );
@@ -144,7 +144,7 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext(
else if ( IsXMLToken( rLName, XML_SCRIPT ) )
{
::rtl::OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) );
- aAttrName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":language" ) );
+ aAttrName += ":language";
if ( xAttrList.is() )
{
::rtl::OUString aLanguage = xAttrList->getValueByName( aAttrName );
@@ -154,7 +154,7 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext(
uno::Sequence< beans::PropertyValue > aMedDescr = m_xModel->getArgs();
sal_Int32 nNewLen = aMedDescr.getLength() + 1;
aMedDescr.realloc( nNewLen );
- aMedDescr[nNewLen-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BreakMacroSignature" ) );
+ aMedDescr[nNewLen-1].Name = "BreakMacroSignature";
aMedDescr[nNewLen-1].Value <<= (sal_Bool)sal_True;
m_xModel->attachResource( m_xModel->getURL(), aMedDescr );
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 15088db..7fc9a3b 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -448,14 +448,14 @@ void XMLPageMasterExportPropMapper::ContextFilter(
if (pPrint)
{
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_ANNOTATIONS), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintAnnotations")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_CHARTS), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintCharts")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_DRAWING), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintDrawing")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_FORMULAS), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintFormulas")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_GRID), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintGrid")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_HEADERS), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintHeaders")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_OBJECTS), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintObjects")), rPropSet);
- lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_ZEROVALUES), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintZeroValues")), rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_ANNOTATIONS), "PrintAnnotations", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_CHARTS), "PrintCharts", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_DRAWING), "PrintDrawing", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_FORMULAS), "PrintFormulas", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_GRID), "PrintGrid", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_HEADERS), "PrintHeaders", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_OBJECTS), "PrintObjects", rPropSet);
+ lcl_AddState(rPropState, aPropMapper->FindEntryIndex(CTF_PM_PRINT_ZEROVALUES), "PrintZeroValues", rPropSet);
}
SvXMLExportPropertyMapper::ContextFilter(rPropState,rPropSet);
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 4a8bcbe..fe312d6 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -162,7 +162,7 @@ void PageStyleContext::FillPropertySet(
uno::Any aPageUsage;
XMLPMPropHdl_PageStyleLayout aPageUsageHdl;
if (aPageUsageHdl.importXML(sPageUsage, aPageUsage, GetImport().GetMM100UnitConverter()))
- rPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyleLayout")), aPageUsage);
+ rPropSet->setPropertyValue(OUString("PageStyleLayout"), aPageUsage);
}
}
@@ -174,7 +174,7 @@ void PageStyleContext::SetDefaults( )
if (xFactory.is())
{
Reference < XInterface > xInt = xFactory->createInstance (
- rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.Defaults" ) ) );
+ OUString ( "com.sun.star.text.Defaults" ) );
Reference < beans::XPropertySet > xProperties ( xInt, UNO_QUERY );
if ( xProperties.is() )
FillPropertySet ( xProperties );
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index cb4d976..399a853 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -325,7 +325,7 @@ sal_Bool XMLPMPropHdl_Print::exportXML(
if( getBOOL( rValue ) )
{
if( !rStrExpValue.isEmpty() )
- rStrExpValue += OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) );
+ rStrExpValue += " ";
rStrExpValue += sAttrValue;
}
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 89fa46a..371bf42 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -157,8 +157,8 @@ sal_Bool XMLPageExport::exportStyle(
XMLPageExport::XMLPageExport( SvXMLExport& rExp ) :
rExport( rExp ),
- sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
- sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) )
+ sIsPhysical( "IsPhysical" ),
+ sFollowStyle( "FollowStyle" )
{
xPageMasterPropHdlFactory = new XMLPageMasterPropHdlFactory;
xPageMasterPropSetMapper = new XMLPageMasterPropSetMapper(
@@ -167,8 +167,8 @@ XMLPageExport::XMLPageExport( SvXMLExport& rExp ) :
xPageMasterExportPropMapper = new XMLPageMasterExportPropMapper(
xPageMasterPropSetMapper, rExp);
- rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_PAGE_MASTER, OUString( RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_PAGE_MASTER_NAME ) ),
- xPageMasterExportPropMapper, OUString( RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ) ), sal_False );
+ rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_PAGE_MASTER, OUString( XML_STYLE_FAMILY_PAGE_MASTER_NAME ),
+ xPageMasterExportPropMapper, OUString( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ), sal_False );
Reference< XStyleFamiliesSupplier > xFamiliesSupp( GetExport().GetModel(),
UNO_QUERY );
@@ -181,8 +181,7 @@ XMLPageExport::XMLPageExport( SvXMLExport& rExp ) :
"getStyleFamilies() from XModel failed for export!" );
if( xFamilies.is() )
{
- const OUString aPageStyleName(
- RTL_CONSTASCII_USTRINGPARAM( "PageStyles" ));
+ const OUString aPageStyleName("PageStyles");
if( xFamilies->hasByName( aPageStyleName ) )
{
@@ -228,7 +227,7 @@ void XMLPageExport::exportDefaultStyle()
Reference < lang::XMultiServiceFactory > xFactory (GetExport().GetModel(), UNO_QUERY);
if (xFactory.is())
{
- OUString sTextDefaults ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.Defaults" ) );
+ OUString sTextDefaults ( "com.sun.star.text.Defaults" );
Reference < XPropertySet > xPropSet (xFactory->createInstance ( sTextDefaults ), UNO_QUERY);
if (xPropSet.is())
{
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 697d88a..f5e0241 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -45,10 +45,10 @@ XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xTempNumberFormatsSupplier)
: xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()),
pExport(NULL),
- sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT)),
- sType(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE)),
- msCurrencySymbol(RTL_CONSTASCII_USTRINGPARAM(XML_CURRENCYSYMBOL)),
- msCurrencyAbbreviation(RTL_CONSTASCII_USTRINGPARAM(XML_CURRENCYABBREVIATION)),
+ sStandardFormat(XML_STANDARDFORMAT),
+ sType(XML_TYPE),
+ msCurrencySymbol(XML_CURRENCYSYMBOL),
+ msCurrencyAbbreviation(XML_CURRENCYABBREVIATION),
aNumberFormats()
{
}
@@ -58,8 +58,8 @@ XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
SvXMLExport& rTempExport )
: xNumberFormats(xTempNumberFormatsSupplier.is() ? xTempNumberFormatsSupplier->getNumberFormats() : ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > ()),
pExport(&rTempExport),
- sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT)),
- sType(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE)),
+ sStandardFormat(XML_STANDARDFORMAT),
+ sType(XML_TYPE),
sAttrValueType(rTempExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, GetXMLToken(XML_VALUE_TYPE))),
sAttrValue(rTempExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, GetXMLToken(XML_VALUE))),
sAttrDateValue(rTempExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, GetXMLToken(XML_DATE_VALUE))),
@@ -67,8 +67,8 @@ XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
sAttrBooleanValue(rTempExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, GetXMLToken(XML_BOOLEAN_VALUE))),
sAttrStringValue(rTempExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, GetXMLToken(XML_STRING_VALUE))),
sAttrCurrency(rTempExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, GetXMLToken(XML_CURRENCY))),
- msCurrencySymbol(RTL_CONSTASCII_USTRINGPARAM(XML_CURRENCYSYMBOL)),
- msCurrencyAbbreviation(RTL_CONSTASCII_USTRINGPARAM(XML_CURRENCYABBREVIATION)),
+ msCurrencySymbol(XML_CURRENCYSYMBOL),
+ msCurrencyAbbreviation(XML_CURRENCYABBREVIATION),
aNumberFormats()
{
}
@@ -244,17 +244,17 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
try
{
uno::Reference <beans::XPropertySet> xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat));
- if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_CURRENCYSYMBOL))) >>= sCurrencySymbol)
+ if ( xNumberPropertySet->getPropertyValue(OUString(XML_CURRENCYSYMBOL)) >>= sCurrencySymbol)
{
- rtl::OUString sCurrencyAbbreviation;
- if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_CURRENCYABBREVIATION))) >>= sCurrencyAbbreviation)
+ OUString sCurrencyAbbreviation;
+ if ( xNumberPropertySet->getPropertyValue(OUString(XML_CURRENCYABBREVIATION)) >>= sCurrencyAbbreviation)
{
if ( !sCurrencyAbbreviation.isEmpty())
sCurrencySymbol = sCurrencyAbbreviation;
else
{
if ( sCurrencySymbol.getLength() == 1 && sCurrencySymbol.toChar() == NfCurrencyEntry::GetEuroSymbol() )
- sCurrencySymbol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EUR"));
+ sCurrencySymbol = "EUR";
}
}
return sal_True;
@@ -281,9 +281,9 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu
try
{
uno::Reference <beans::XPropertySet> xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat));
- xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STANDARDFORMAT))) >>= bIsStandard;
+ xNumberPropertySet->getPropertyValue(OUString(XML_STANDARDFORMAT)) >>= bIsStandard;
sal_Int16 nNumberType = sal_Int16();
- if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_TYPE))) >>= nNumberType )
+ if ( xNumberPropertySet->getPropertyValue(OUString(XML_TYPE)) >>= nNumberType )
{
return nNumberType;
}
@@ -330,7 +330,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
uno::Reference <beans::XPropertySet> xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat));
if ( xNumberPropertySet->getPropertyValue(msCurrencySymbol) >>= rCurrencySymbol)
{
- rtl::OUString sCurrencyAbbreviation;
+ OUString sCurrencyAbbreviation;
if ( xNumberPropertySet->getPropertyValue(msCurrencyAbbreviation) >>= sCurrencyAbbreviation)
{
if ( !sCurrencyAbbreviation.isEmpty())
@@ -338,7 +338,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
else
{
if ( rCurrencySymbol.getLength() == 1 && rCurrencySymbol.toChar() == NfCurrencyEntry::GetEuroSymbol() )
- rCurrencySymbol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EUR"));
+ rCurrencySymbol = OUString("EUR");
}
}
return sal_True;
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 1cb096c..b9ca2ad 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -56,11 +56,11 @@ XMLStyleExport::XMLStyleExport(
const OUString& rPoolStyleName,
SvXMLAutoStylePoolP *pAutoStyleP ) :
rExport( rExp ),
- sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
- sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
- sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) ),
- sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) ),
- sOutlineLevel( RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) ),
+ sIsPhysical( "IsPhysical" ),
+ sIsAutoUpdate( "IsAutoUpdate" ),
+ sFollowStyle( "FollowStyle" ),
+ sNumberingStyleName( "NumberingStyleName" ),
+ sOutlineLevel( "OutlineLevel" ),
sPoolStyleName( rPoolStyleName ),
pAutoStylePool( pAutoStyleP )
{
@@ -195,7 +195,7 @@ sal_Bool XMLStyleExport::exportStyle(
{
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DEFAULT_OUTLINE_LEVEL,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "" )));
+ OUString( "" ));
}
}
}
@@ -246,7 +246,7 @@ sal_Bool XMLStyleExport::exportStyle(
Reference< XPropertySet > xNumRulePropSet
(xNumRule, UNO_QUERY);
xNumRulePropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) )
+ OUString("Name") )
>>= sOutlineName;
bSuppressListStyle = ( sListName == sOutlineName );
}
@@ -299,7 +299,7 @@ sal_Bool XMLStyleExport::exportStyle(
if ( bNoInheritedListStyle )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_LIST_STYLE_NAME,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "" )));
+ OUString( "" ));
}
}
More information about the Libreoffice-commits
mailing list