summaryrefslogtreecommitdiffstats
path: root/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-06-22 11:27:46 +0200
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-06-22 11:27:46 +0200
commitfe8e4404a5310fe5cf0c6ea38a08562c48404f3b (patch)
tree83724362f7478e4a79553898c576cfa63df663f0 /reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
parentAutomated merge with file:///net/so-cwsserv01/export/cws/hg_clean/ooo/DEV300 (diff)
parentCWS-TOOLING: integrate CWS impress190 (diff)
downloadcore-fe8e4404a5310fe5cf0c6ea38a08562c48404f3b.tar.gz
core-fe8e4404a5310fe5cf0c6ea38a08562c48404f3b.zip
srb1: merge from DEv300:m83
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java')
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
index 94c701431527..a28c293feef3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: FontSizeMapper.java,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,6 +27,7 @@
package com.sun.star.report.pentaho.parser.stylemapper.fo;
import com.sun.star.report.pentaho.parser.StyleMapper;
+
import org.jfree.layouting.input.style.CSSDeclarationRule;
import org.jfree.layouting.input.style.keys.font.FontStyleKeys;