diff options
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/meta/xmlmetae.cxx | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 1cf8042d1e23..81f05076c846 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1453,9 +1453,9 @@ static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, cons } -static const sal_Char* gpStrHeaderTextPrefix = "hdr"; -static const sal_Char* gpStrFooterTextPrefix = "ftr"; -static const sal_Char* gpStrDateTimeTextPrefix = "dtd"; +static const sal_Char gpStrHeaderTextPrefix[] = "hdr"; +static const sal_Char gpStrFooterTextPrefix[] = "ftr"; +static const sal_Char gpStrDateTimeTextPrefix[] = "dtd"; HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( const Reference<XDrawPage>& xDrawPage ) { @@ -1516,7 +1516,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls() if( !maHeaderDeclsVector.empty() ) { // export header decls - const OUString aPrefix( OUString::createFromAscii( gpStrHeaderTextPrefix ) ); + const OUString aPrefix( gpStrHeaderTextPrefix ); std::vector< OUString >::iterator aIter; sal_Int32 nIndex; for( nIndex = 1, aIter = maHeaderDeclsVector.begin(); aIter != maHeaderDeclsVector.end(); ++aIter, ++nIndex ) @@ -1533,7 +1533,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls() if( !maFooterDeclsVector.empty() ) { // export footer decls - const OUString aPrefix( OUString::createFromAscii( gpStrFooterTextPrefix ) ); + const OUString aPrefix( gpStrFooterTextPrefix ); std::vector< OUString >::iterator aIter; sal_Int32 nIndex; for( nIndex = 1, aIter = maFooterDeclsVector.begin(); aIter != maFooterDeclsVector.end(); ++aIter, ++nIndex ) @@ -1550,7 +1550,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls() if( !maDateTimeDeclsVector.empty() ) { // export footer decls - const OUString aPrefix( OUString::createFromAscii( gpStrDateTimeTextPrefix ) ); + const OUString aPrefix( gpStrDateTimeTextPrefix ); std::vector< DateTimeDeclImpl >::iterator aIter; sal_Int32 nIndex; for( nIndex = 1, aIter = maDateTimeDeclsVector.begin(); aIter != maDateTimeDeclsVector.end(); ++aIter, ++nIndex ) diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 315c9f9048d7..6532545505f1 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -295,10 +295,10 @@ void SvXMLMetaExport::MExport_() } } -static const char *s_xmlns = "xmlns"; -static const char *s_xmlns2 = "xmlns:"; -static const char *s_meta = "meta:"; -static const char *s_href = "xlink:href"; +static const char * const s_xmlns = "xmlns"; +static const char * const s_xmlns2 = "xmlns:"; +static const char * const s_meta = "meta:"; +static const char * const s_href = "xlink:href"; SvXMLMetaExport::SvXMLMetaExport( SvXMLExport& i_rExp, |