dba34a: remove comphelper/optionalvalue.hxx, and the only client it had (replaced with boost/optional.hpp)

4 files changed, 42 insertions, 229 deletions

diff --git a/comphelper/inc/comphelper/optionalvalue.hxx b/comphelper/inc/comphelper/optionalvalue.hxx
deleted file mode 100644
index f63e1cde51aa..000000000000
--- a/comphelper/inc/comphelper/optionalvalue.hxx
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _COMPHELPER_OPTIONALVALUE_HXX
-#define _COMPHELPER_OPTIONALVALUE_HXX
-
-#include <com/sun/star/uno/Any.hxx>
-
-namespace comphelper
-{
-
-/** @deprecated
-    Use boost/optional.hpp instead.
-*/
-
-
-
-    /* Definition of OptionalValue template */
-
-    /** This template provides 'optionality' for the given value type.
-
-        Especially for PODs, optionality either needs to be achieved
-        by special 'magic' values (i.e. an int value is not set when
-        -1 etc.), or an additional bool denoting value
-        validity. This template encapsulates the latter into an atomic
-        data type.
-
-        @tpl Element
-        The value type that should be made optional
-     */
-    template< typename Element > class OptionalValue
-    {
-    public:
-        typedef Element ValueType;
-
-        /** Default-construct the value.
-
-            A default-constructed value is not valid. You have to
-            explicitely set a value.
-         */
-        OptionalValue() :
-            maValue(),
-            mbValid( false )
-        {
-        }
-
-        /** Construct the value.
-
-            An explicitely constructed value is valid. To create an
-            invalid value, you have to default-construct it.
-         */
-        OptionalValue( const Element& rValue ) :
-            maValue( rValue ),
-            mbValid( true )
-        {
-        }
-
-        // default copy/assignment operators are okay here
-        //OptionalValue(const OptionalValue&);
-        //OptionalValue& operator=( const OptionalValue& );
-
-        /** Query whether the value is valid
-
-            @return true, if this object contains a valid value.
-         */
-        bool isValid() const
-        {
-            return mbValid;
-        }
-
-        /** Set a value.
-
-            After this call, the object contains a valid value.
-         */
-        void setValue( const Element& rValue )
-        {
-            maValue = rValue;
-            mbValid = true;
-        }
-
-        /** Get the value.
-
-            The return value of this method is undefined, if the
-            object does not contain a valid value.
-         */
-        Element getValue() const
-        {
-            return maValue;
-        }
-
-        /** Clear the value.
-
-            After this call, the object no longer contains a valid
-            value.
-         */
-        void clearValue()
-        {
-            mbValid = false;
-        }
-
-        // NOTE: The following two methods would optimally have been
-        // implemented as operator>>=/operator<<=
-        // overloads. Unfortunately, there's already a templatized
-        // version for those two methods, namely for UNO interface
-        // types. Adding a second would lead to ambiguities.
-
-        /** Export the value into an Any.
-
-            This method extracts the value into an Any. If the value
-            is invalid, the Any will be cleared.
-
-            @return true, if the value has been successfully
-            transferred to the Any. Clearing the Any from an invalid
-            object is also considered a successful operation.
-         */
-        bool exportValue( ::com::sun::star::uno::Any& o_rAny )
-        {
-            o_rAny.clear();
-
-            if( isValid() )
-            {
-                if( !(o_rAny <<= getValue()) )
-                    return false;
-            }
-
-            return true;
-        }
-
-        /** Import the value from an Any.
-
-            This method imports the value from an Any. If the Any
-            is invalid, the object will get an invalid value.
-
-            @return true, if the value has been successfully
-            transferred from the Any. Setting the value to invalid
-            from an empty Any is also considered a successful
-            operation.
-         */
-        bool importValue( const ::com::sun::star::uno::Any& rAny )
-        {
-            clearValue();
-
-            if( rAny.hasValue() )
-            {
-                Element tmp;
-
-                if( !(rAny >>= tmp) )
-                    return false;
-
-                setValue( tmp );
-            }
-
-            return true;
-        }
-
-    private:
-        Element     maValue;
-        bool        mbValid;
-    };
-
-}
-
-#endif /* _COMPHELPER_OPTIONALVALUE_HXX */
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx
index 780a27f31503..0b8bb43d7e3e 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/cppcanvas/inc/cppcanvas/renderer.hxx
@@ -32,7 +32,7 @@
 #include <rtl/ustring.hxx>
 
 #include <boost/shared_ptr.hpp>
-#include <comphelper/optionalvalue.hxx>
+#include <boost/optional.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <cppcanvas/canvasgraphic.hxx>
 #include <cppcanvas/color.hxx>
@@ -109,16 +109,16 @@ namespace cppcanvas
         struct Parameters
         {
             /// Optionally forces the fill color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maFillColor;
+            ::boost::optional< Color::IntSRGBA >            maFillColor;
 
             /// Optionally forces the line color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maLineColor;
+            ::boost::optional< Color::IntSRGBA >        maLineColor;
 
             /// Optionally forces the text color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maTextColor;
+            ::boost::optional< Color::IntSRGBA >        maTextColor;
 
             /// Optionally forces the given fontname for all text actions
-            ::comphelper::OptionalValue< ::rtl::OUString >          maFontName;
+            ::boost::optional< ::rtl::OUString >        maFontName;
 
             /** Optionally transforms all text output actions with the
                 given matrix (in addition to the overall canvas
@@ -128,16 +128,16 @@ namespace cppcanvas
                 rect coordinate system, i.e. the metafile is assumed
                 to be contained in the unit rect.
              */
-            ::comphelper::OptionalValue< ::basegfx::B2DHomMatrix >  maTextTransformation;
+            ::boost::optional< ::basegfx::B2DHomMatrix >    maTextTransformation;
 
             /// Optionally forces the given font weight for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >                 maFontWeight;
+            ::boost::optional< sal_Int8 >                   maFontWeight;
 
             /// Optionally forces the given font letter form (italics etc.) for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >                 maFontLetterForm;
+            ::boost::optional< sal_Int8 >                   maFontLetterForm;
 
             /// Optionally forces underlining for all text actions
-            ::comphelper::OptionalValue< bool >                     maFontUnderline;
+            ::boost::optional< bool >                       maFontUnderline;
         };
     };
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 1423cd42ed93..006d55a01de6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -831,8 +831,8 @@ namespace cppcanvas
         {
             rendering::FontRequest aFontRequest;
 
-            if( rParms.mrParms.maFontName.isValid() )
-                aFontRequest.FontDescription.FamilyName = rParms.mrParms.maFontName.getValue();
+            if( rParms.mrParms.maFontName.is_initialized() )
+                aFontRequest.FontDescription.FamilyName = *rParms.mrParms.maFontName;
             else
                 aFontRequest.FontDescription.FamilyName = rFont.GetName();
 
@@ -843,12 +843,12 @@ namespace cppcanvas
 
             // TODO(F2): improve vclenum->panose conversion
             aFontRequest.FontDescription.FontDescription.Weight =
-                rParms.mrParms.maFontWeight.isValid() ?
-                rParms.mrParms.maFontWeight.getValue() :
+                rParms.mrParms.maFontWeight.is_initialized() ?
+                *rParms.mrParms.maFontWeight :
                 ::canvas::tools::numeric_cast<sal_Int8>( ::basegfx::fround( rFont.GetWeight() ) );
             aFontRequest.FontDescription.FontDescription.Letterform =
-                rParms.mrParms.maFontLetterForm.isValid() ?
-                rParms.mrParms.maFontLetterForm.getValue() :
+                rParms.mrParms.maFontLetterForm.is_initialized() ?
+                *rParms.mrParms.maFontLetterForm :
                 (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
 
             LanguageType aLang = rFont.GetLanguage();
@@ -1445,7 +1445,7 @@ namespace cppcanvas
                         break;
 
                     case META_LINECOLOR_ACTION:
-                        if( !rParms.maLineColor.isValid() )
+                        if( !rParms.maLineColor.is_initialized() )
                         {
                             setStateColor( static_cast<MetaLineColorAction*>(pCurrAct),
                                            getState( rStates ).isLineColorSet,
@@ -1455,7 +1455,7 @@ namespace cppcanvas
                         break;
 
                     case META_FILLCOLOR_ACTION:
-                        if( !rParms.maFillColor.isValid() )
+                        if( !rParms.maFillColor.is_initialized() )
                         {
                             setStateColor( static_cast<MetaFillColorAction*>(pCurrAct),
                                            getState( rStates ).isFillColorSet,
@@ -1466,7 +1466,7 @@ namespace cppcanvas
 
                     case META_TEXTCOLOR_ACTION:
                     {
-                        if( !rParms.maTextColor.isValid() )
+                        if( !rParms.maTextColor.is_initialized() )
                         {
                             // Text color is set unconditionally, thus, no
                             // use of setStateColor here
@@ -1486,7 +1486,7 @@ namespace cppcanvas
                     break;
 
                     case META_TEXTFILLCOLOR_ACTION:
-                        if( !rParms.maTextColor.isValid() )
+                        if( !rParms.maTextColor.is_initialized() )
                         {
                             setStateColor( static_cast<MetaTextFillColorAction*>(pCurrAct),
                                            getState( rStates ).isTextFillColorSet,
@@ -1496,7 +1496,7 @@ namespace cppcanvas
                         break;
 
                     case META_TEXTLINECOLOR_ACTION:
-                        if( !rParms.maTextColor.isValid() )
+                        if( !rParms.maTextColor.is_initialized() )
                         {
                             setStateColor( static_cast<MetaTextLineColorAction*>(pCurrAct),
                                            getState( rStates ).isTextLineColorSet,
@@ -1526,8 +1526,8 @@ namespace cppcanvas
                         // TODO(Q2): define and use appropriate enumeration types
                         rState.textReliefStyle          = (sal_Int8)rFont.GetRelief();
                         rState.textOverlineStyle        = (sal_Int8)rFont.GetOverline();
-                        rState.textUnderlineStyle       = rParms.maFontUnderline.isValid() ?
-                            (rParms.maFontUnderline.getValue() ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) :
+                        rState.textUnderlineStyle       = rParms.maFontUnderline.is_initialized() ?
+                            (*rParms.maFontUnderline ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) :
                             (sal_Int8)rFont.GetUnderline();
                         rState.textStrikeoutStyle       = (sal_Int8)rFont.GetStrikeout();
                         rState.textEmphasisMarkStyle    = (sal_Int8)rFont.GetEmphasisMark();
@@ -2946,28 +2946,28 @@ namespace cppcanvas
                 getState( aStateStack ).textLineColor = pColor->getDeviceColor( 0x000000FF );
 
             // apply overrides from the Parameters struct
-            if( rParams.maFillColor.isValid() )
+            if( rParams.maFillColor.is_initialized() )
             {
                 getState( aStateStack ).isFillColorSet = true;
-                getState( aStateStack ).fillColor = pColor->getDeviceColor( rParams.maFillColor.getValue() );
+                getState( aStateStack ).fillColor = pColor->getDeviceColor( *rParams.maFillColor );
             }
-            if( rParams.maLineColor.isValid() )
+            if( rParams.maLineColor.is_initialized() )
             {
                 getState( aStateStack ).isLineColorSet = true;
-                getState( aStateStack ).lineColor = pColor->getDeviceColor( rParams.maLineColor.getValue() );
+                getState( aStateStack ).lineColor = pColor->getDeviceColor( *rParams.maLineColor );
             }
-            if( rParams.maTextColor.isValid() )
+            if( rParams.maTextColor.is_initialized() )
             {
                 getState( aStateStack ).isTextFillColorSet = true;
                 getState( aStateStack ).isTextLineColorSet = true;
                 getState( aStateStack ).textColor =
                     getState( aStateStack ).textFillColor =
-                    getState( aStateStack ).textLineColor = pColor->getDeviceColor( rParams.maTextColor.getValue() );
+                    getState( aStateStack ).textLineColor = pColor->getDeviceColor( *rParams.maTextColor );
             }
-            if( rParams.maFontName.isValid() ||
-                rParams.maFontWeight.isValid() ||
-                rParams.maFontLetterForm.isValid() ||
-                rParams.maFontUnderline.isValid() )
+            if( rParams.maFontName.is_initialized() ||
+                rParams.maFontWeight.is_initialized() ||
+                rParams.maFontLetterForm.is_initialized() ||
+                rParams.maFontUnderline.is_initialized() )
             {
                 ::cppcanvas::internal::OutDevState& rState = getState( aStateStack );
 
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index bc4cf6688ca3..56ce197b7e8e 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2069,7 +2069,7 @@ namespace cppcanvas
                         rCanvas->getUNOCanvas()->getDevice(),
                         aResultingPolyPolygon ) );
 
-                if( rParms.maTextTransformation.isValid() )
+                if( rParms.maTextTransformation.is_initialized() )
                 {
                     return ActionSharedPtr(
                         new OutlineAction(
@@ -2085,7 +2085,7 @@ namespace cppcanvas
                             rVDev,
                             rCanvas,
                             rState,
-                            rParms.maTextTransformation.getValue() ) );
+                            *rParms.maTextTransformation ) );
                 }
                 else
                 {
@@ -2186,7 +2186,7 @@ namespace cppcanvas
                     rShadowColor == aEmptyColor )
                 {
                     // nope
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                     {
                         return ActionSharedPtr( new TextAction(
                                                     aStartPoint,
@@ -2195,7 +2195,7 @@ namespace cppcanvas
                                                     nLen,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     }
                     else
                     {
@@ -2211,7 +2211,7 @@ namespace cppcanvas
                 else
                 {
                     // at least one of the effects requested
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                         return ActionSharedPtr( new EffectTextAction(
                                                     aStartPoint,
                                                     aReliefOffset,
@@ -2224,7 +2224,7 @@ namespace cppcanvas
                                                     rVDev,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     else
                         return ActionSharedPtr( new EffectTextAction(
                                                     aStartPoint,
@@ -2250,7 +2250,7 @@ namespace cppcanvas
                     rShadowColor == aEmptyColor )
                 {
                     // nope
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                         return ActionSharedPtr( new TextArrayAction(
                                                     aStartPoint,
                                                     rText,
@@ -2259,7 +2259,7 @@ namespace cppcanvas
                                                     aCharWidths,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     else
                         return ActionSharedPtr( new TextArrayAction(
                                                     aStartPoint,
@@ -2273,7 +2273,7 @@ namespace cppcanvas
                 else
                 {
                     // at least one of the effects requested
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                         return ActionSharedPtr( new EffectTextArrayAction(
                                                     aStartPoint,
                                                     aReliefOffset,
@@ -2287,7 +2287,7 @@ namespace cppcanvas
                                                     rVDev,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     else
                         return ActionSharedPtr( new EffectTextArrayAction(
                                                     aStartPoint,