diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:17:29 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:17:29 +0000 |
commit | 2e3c42fbd9eafbc93bd981aa6b1801f5213960d9 (patch) | |
tree | 52c0fcf98d419b74e77cad123d600105efa97fe4 /xmloff | |
parent | ab98995a04286f5bee90b63789b4303b2cbc69f2 (diff) |
INTEGRATION: CWS cjksp1_DEV300 (1.12.112); FILE MERGED
2007/09/27 04:28:35 pflin 1.12.112.2: RESYNC: (1.12-1.13); FILE MERGED
2007/04/23 07:58:07 pflin 1.12.112.1: Text grid enhancement: support xml filter
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/style/PageMasterImportContext.cxx | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index c0c360919c72..be8ad6e81f71 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PageMasterImportContext.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:26:44 $ + * last change: $Author: kz $ $Date: 2008-03-07 16:17:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,8 +67,14 @@ #include <xmloff/PageMasterStyleMap.hxx> #endif +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif + using namespace ::com::sun::star; using namespace ::xmloff::token; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const rtl::OUString& rLocalName, @@ -90,8 +96,9 @@ TYPEINIT1( PageStyleContext, XMLPropStyleContext ); PageStyleContext::PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, - SvXMLStylesContext& rStyles) : - XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER ), + SvXMLStylesContext& rStyles, + sal_Bool bDefaultStyle) : + XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER, bDefaultStyle), sPageUsage() { } @@ -202,3 +209,18 @@ void PageStyleContext::FillPropertySet( } } +// text grid enhancement for better CJK support +//set default page layout style +void PageStyleContext::SetDefaults( ) +{ + Reference < XMultiServiceFactory > xFactory ( GetImport().GetModel(), UNO_QUERY); + if (xFactory.is()) + { + Reference < XInterface > xInt = xFactory->createInstance ( + rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.text.Defaults" ) ) ); + Reference < beans::XPropertySet > xProperties ( xInt, UNO_QUERY ); + if ( xProperties.is() ) + FillPropertySet ( xProperties ); + } +} + |