impress195: rebase to DEV300 m98

1 files changed, 24 insertions, 24 deletions

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 7ac049e43660..dee6ce637813 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -832,8 +832,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();
 
@@ -844,12 +844,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;
             aFontRequest.FontDescription.FontDescription.Proportion =
                 rParms.mrParms.maFontProportion.isValid() ?
@@ -1452,7 +1452,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,
@@ -1462,7 +1462,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,
@@ -1473,7 +1473,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
@@ -1493,7 +1493,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,
@@ -1503,7 +1503,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,
@@ -1533,8 +1533,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();
@@ -2953,29 +2953,29 @@ 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() ||
-                rParams.maFontProportion.isValid() )
+            if( rParams.maFontName.is_initialized() ||
+                rParams.maFontWeight.is_initialized() ||
+                rParams.maFontLetterForm.is_initialized() ||
+                rParams.maFontUnderline.is_initialized()  ||
+                rParams.maFontProportion.is_initialized() )
             {
                 ::cppcanvas::internal::OutDevState& rState = getState( aStateStack );