[Libreoffice-commits] core.git: framework/inc framework/source

[Stephan Bergmann]

 framework/inc/acceleratorconst.h                        |    2 --
 framework/source/xml/acceleratorconfigurationwriter.cxx |    4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ead6507f060caafb588861d8ec8aee82bd880e67
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 18 17:36:43 2016 +0200

    Elide macro used once
    
    Change-Id: Ie0ad7834f54a5bf9cea65b4bb6d7501a90da0f24

diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index f4ac1b1..03b0303 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -24,8 +24,6 @@
 
 namespace framework{
 
-#define DOCTYPE_ACCELERATORS            "<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">"
-
 #define ATTRIBUTE_TYPE_CDATA            "CDATA"
 
 #define XMLNS_XLINK                     "xlink"
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 181acec..48a45c1 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -60,7 +60,9 @@ void AcceleratorConfigurationWriter::flush()
     // generate xml
     xExtendedCFG->startDocument();
 
-    xExtendedCFG->unknown(DOCTYPE_ACCELERATORS);
+    xExtendedCFG->unknown(
+        "<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD"
+        " OfficeDocument 1.0//EN\" \"accelerator.dtd\">");
     xExtendedCFG->ignorableWhitespace(OUString());
 
     xExtendedCFG->startElement(AL_ELEMENT_ACCELERATORLIST, xAttribs);