[Libreoffice-commits] .: xmloff/inc xmloff/source
Luboš Luňák
l.lunak at suse.cz
Fri Feb 1 06:05:21 PST 2013
xmloff/inc/xmloff/XMLFontStylesContext.hxx | 82 ----------------
xmloff/source/style/XMLFontStylesContext.cxx | 1
xmloff/source/style/XMLFontStylesContext_impl.hxx | 109 ++++++++++++++++++++++
3 files changed, 110 insertions(+), 82 deletions(-)
New commits:
commit c2d14df725768ec9c3b6b65a4e02baa0faf41676
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Feb 1 15:04:29 2013 +0100
move implementation class to a non-public header
Change-Id: I61731f472405e46828204ffb1cacf1c9e6a9b5bf
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index 3519875..afd495c 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
@@ -84,88 +84,6 @@ public:
};
-/// Handles <style:font-face>
-class XMLFontStyleContextFontFace : public SvXMLStyleContext
-{
- ::com::sun::star::uno::Any aFamilyName;
- ::com::sun::star::uno::Any aStyleName;
- ::com::sun::star::uno::Any aFamily;
- ::com::sun::star::uno::Any aPitch;
- ::com::sun::star::uno::Any aEnc;
-
- SvXMLImportContextRef xStyles;
-
- XMLFontStylesContext *GetStyles()
- {
- return ((XMLFontStylesContext *)&xStyles);
- }
-
-public:
-
- TYPEINFO();
-
- XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- XMLFontStylesContext& rStyles );
- virtual ~XMLFontStyleContextFontFace();
-
- void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName,
- const OUString& rValue );
-
- void FillProperties( ::std::vector< XMLPropertyState > &rProps,
- sal_Int32 nFamilyNameIdx,
- sal_Int32 nStyleNameIdx,
- sal_Int32 nFamilyIdx,
- sal_Int32 nPitchIdx,
- sal_Int32 nCharsetIdx ) const;
-
- OUString familyName() const;
-
- SvXMLImportContext * CreateChildContext(
- sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
-};
-
-/// Handles <style:font-face-src>
-class XMLFontStyleContextFontFaceSrc : public SvXMLImportContext
-{
- const XMLFontStyleContextFontFace& font;
-public:
-
- TYPEINFO();
-
- XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
- const XMLFontStyleContextFontFace& font );
-
- virtual SvXMLImportContext * CreateChildContext(
- sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
-};
-
-/// Handles <style:font-face-uri>
-class XMLFontStyleContextFontFaceUri : public SvXMLStyleContext
-{
- const XMLFontStyleContextFontFace& font;
- void handleEmbeddedFont( const OUString& url );
-public:
-
- TYPEINFO();
-
- XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const ::rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- const XMLFontStyleContextFontFace& font );
-
- virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName,
- const OUString& rValue );
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index ebc6a28..e822fc6 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -18,6 +18,7 @@
*/
#include <xmloff/XMLFontStylesContext.hxx>
+#include "XMLFontStylesContext_impl.hxx"
#include <com/sun/star/awt/FontFamily.hpp>
#include <com/sun/star/awt/FontPitch.hpp>
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx
new file mode 100644
index 0000000..1787bf2
--- /dev/null
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _XMLOFF_XMLFONTSTYLESCONTEXT_IMPL_HXX_
+#define _XMLOFF_XMLFONTSTYLESCONTEXT_IMPL_HXX_
+
+#include <xmloff/xmlstyle.hxx>
+
+/// Handles <style:font-face>
+class XMLFontStyleContextFontFace : public SvXMLStyleContext
+{
+ ::com::sun::star::uno::Any aFamilyName;
+ ::com::sun::star::uno::Any aStyleName;
+ ::com::sun::star::uno::Any aFamily;
+ ::com::sun::star::uno::Any aPitch;
+ ::com::sun::star::uno::Any aEnc;
+
+ SvXMLImportContextRef xStyles;
+
+ XMLFontStylesContext *GetStyles()
+ {
+ return ((XMLFontStylesContext *)&xStyles);
+ }
+
+public:
+
+ TYPEINFO();
+
+ XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ const ::rtl::OUString& rLName,
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ XMLFontStylesContext& rStyles );
+ virtual ~XMLFontStyleContextFontFace();
+
+ void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName,
+ const OUString& rValue );
+
+ void FillProperties( ::std::vector< XMLPropertyState > &rProps,
+ sal_Int32 nFamilyNameIdx,
+ sal_Int32 nStyleNameIdx,
+ sal_Int32 nFamilyIdx,
+ sal_Int32 nPitchIdx,
+ sal_Int32 nCharsetIdx ) const;
+
+ OUString familyName() const;
+
+ SvXMLImportContext * CreateChildContext(
+ sal_uInt16 nPrefix,
+ const ::rtl::OUString& rLocalName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+};
+
+/// Handles <style:font-face-src>
+class XMLFontStyleContextFontFaceSrc : public SvXMLImportContext
+{
+ const XMLFontStyleContextFontFace& font;
+public:
+
+ TYPEINFO();
+
+ XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ const ::rtl::OUString& rLName,
+ const XMLFontStyleContextFontFace& font );
+
+ virtual SvXMLImportContext * CreateChildContext(
+ sal_uInt16 nPrefix,
+ const ::rtl::OUString& rLocalName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+};
+
+/// Handles <style:font-face-uri>
+class XMLFontStyleContextFontFaceUri : public SvXMLStyleContext
+{
+ const XMLFontStyleContextFontFace& font;
+ void handleEmbeddedFont( const OUString& url );
+public:
+
+ TYPEINFO();
+
+ XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx,
+ const ::rtl::OUString& rLName,
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+ const XMLFontStyleContextFontFace& font );
+
+ virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName,
+ const OUString& rValue );
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list