summaryrefslogtreecommitdiff
path: root/xmloff/source/forms
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-02-26 20:17:25 +0100
committerChr. Rossmanith <ChrRossmanith@gmx.de>2013-02-26 20:18:43 +0100
commitf03daee6b44c22107f90a99ad83d8e60023e0f71 (patch)
tree46a24020a24cff541cf773d7995051d371fcc662 /xmloff/source/forms
parentaf8cc0b4b40efcb9e05b3c7a94a26d2fc503babd (diff)
removed RTL_CONSTASCII_(U)STRINGPARAM
Change-Id: I8ab8c32ee561a14dcb05b9cf04387beadccd314a
Diffstat (limited to 'xmloff/source/forms')
-rw-r--r--xmloff/source/forms/controlpropertyhdl.cxx2
-rw-r--r--xmloff/source/forms/elementexport.cxx4
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx8
-rw-r--r--xmloff/source/forms/layerimport.cxx2
-rw-r--r--xmloff/source/forms/propertyexport.cxx8
-rw-r--r--xmloff/source/forms/strings.hxx2
6 files changed, 13 insertions, 13 deletions
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index 044f1887dd4a..15b96431a2be 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 8870248f9180..d2a2dea0b236 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 f9f2e8ddca45..86fa2046359c 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 af8bb19ed9ed..f87c791e6470 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 c148ca36df1b..ec37ae8f2e69 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 3d273649b58f..c528a8cc472d 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
//============================================================