[Libreoffice-commits] .: Branch 'integration/dev300_m98' - cppcanvas/inc

[Michael Meeks]

 cppcanvas/inc/cppcanvas/renderer.hxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 06aec799a509d30c5fbbcb33b72759e0a82014bb
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Feb 17 12:36:08 2011 +0000

    trivial merge fix

diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx
index 4dae021..5fbaf68 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/cppcanvas/inc/cppcanvas/renderer.hxx
@@ -138,10 +138,7 @@ namespace cppcanvas
             ::boost::optional< sal_Int8 >					maFontLetterForm;
 
             /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >					maFontProportion;
-
-            /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >					maFontProportion;
+            ::boost::optional< sal_Int8 >					maFontProportion;
 
             /// Optionally forces underlining for all text actions
             ::boost::optional< bool >						maFontUnderline;