summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-15 15:34:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-18 15:30:08 +0200
commit142997f2e91b4e9e994babcf3221ef07105e2cc6 (patch)
treedb6726a38683512402d87e1cbda1bb484dbee2d3 /svx
parent234bb569e8eb3569b22b36043a1454e7fa170aab (diff)
Elide const vars
Change-Id: I859614f65afb783004ca9230d3d4bfc354b5afc5
Diffstat (limited to 'svx')
-rw-r--r--svx/source/xml/xmlxtimp.cxx20
1 files changed, 6 insertions, 14 deletions
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index f9288044ab54..e2c35dedcb53 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -65,14 +65,6 @@ using namespace com::sun::star::xml::sax;
using namespace ::xmloff::token;
using namespace cppu;
-sal_Char const sXML_np__office[] = "__office";
-sal_Char const sXML_np__office_ooo[] = "___office";
-sal_Char const sXML_np__draw[] = "__draw";
-sal_Char const sXML_np__draw_ooo[] = "___draw";
-sal_Char const sXML_np__ooo[] = "__ooo";
-sal_Char const sXML_np__xlink[] = "__xlink";
-
-
enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, stice_dash, stice_hatch, stice_gradient, stice_bitmap };
@@ -327,16 +319,16 @@ SvxXMLXTableImport::SvxXMLXTableImport(
{
SetGraphicResolver( xGrfResolver );
- GetNamespaceMap().Add( sXML_np__ooo, GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
- GetNamespaceMap().Add( sXML_np__office, GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
- GetNamespaceMap().Add( sXML_np__draw, GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
- GetNamespaceMap().Add( sXML_np__xlink, GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
+ GetNamespaceMap().Add( "__ooo", GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
+ GetNamespaceMap().Add( "__office", GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
+ GetNamespaceMap().Add( "__draw", GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
+ GetNamespaceMap().Add( "__xlink", GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
// OOo namespaces for reading OOo 1.1 files
- GetNamespaceMap().Add( sXML_np__office_ooo,
+ GetNamespaceMap().Add( "___office",
GetXMLToken(XML_N_OFFICE_OOO),
XML_NAMESPACE_OFFICE );
- GetNamespaceMap().Add( sXML_np__draw_ooo,
+ GetNamespaceMap().Add( "___draw",
GetXMLToken(XML_N_DRAW_OOO),
XML_NAMESPACE_DRAW );
}