xmloff/source/style/XMLFontStylesContext.cxx | 7 +++++++
xmloff/source/style/XMLFontStylesContext_impl.hxx | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 46b934679a476207d78e1284b308c792dd79c05e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Nov 13 15:48:04 2013 +0000
clear c++11ish
Change-Id: I4eea774206a5bd1de1c10a69aceb6476c5feecbf
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx
b/xmloff/source/style/XMLFontStylesContext.cxx
index 29f4808..f6006aa 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -267,6 +267,13 @@ void XMLFontStyleContextFontFaceUri::SetFormat( const
OUString& rFormat )
{
format = rFormat;
}
+
+// the CSS2 standard (
http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing )
+// defines these format strings.
+const char* OPENTYPE_FORMAT = "opentype";
+const char* TRUETYPE_FORMAT = "truetype";
+const char* EOT_FORMAT = "embedded-opentype";
+
void XMLFontStyleContextFontFaceUri::EndElement()
{
if( linkPath.getLength() == 0 )
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx
b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 6ad621f..3bcbdde 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -88,12 +88,6 @@ public:
/// Handles <style:font-face-uri>
class XMLFontStyleContextFontFaceUri : public SvXMLStyleContext
{
- // the CSS2 standard (
http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing )
- // defines these format strings.
- const char* OPENTYPE_FORMAT = "opentype";
- const char* TRUETYPE_FORMAT = "truetype";
- const char* EOT_FORMAT = "embedded-opentype";
-
const XMLFontStyleContextFontFace& font;
OUString format;
OUString linkPath;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
