Remove EditBoxValue again and just use the native widgets size request

Change-Id: Ib9d0f06bffc9e9d31149a622350145024a9b8a99

1 files changed, 3 insertions, 16 deletions

diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index 95fbfaa2c164..e46df3324262 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -150,12 +150,6 @@ PushButtonValue* PushButtonValue::clone() const
     return new PushButtonValue( *this );
 }
 
-EditBoxValue* EditBoxValue::clone() const
-{
-    assert( typeid( const EditBoxValue ) == typeid( *this ));
-    return new EditBoxValue( *this );
-}
-
 // These functions are mainly passthrough functions that allow access to
 // the SalFrame behind a Window object for native widget rendering purposes.
 
@@ -254,6 +248,9 @@ static std::shared_ptr< ImplControlValue > TransformControlValue( const ImplCont
             aResult.reset( pNew );
         }
         break;
+    case CTRL_GENERIC:
+            aResult.reset( new ImplControlValue( rVal ) );
+            break;
     case CTRL_MENU_POPUP:
         {
             const MenupopupValue* pMVal = static_cast<const MenupopupValue*>(&rVal);
@@ -262,16 +259,6 @@ static std::shared_ptr< ImplControlValue > TransformControlValue( const ImplCont
             aResult.reset( pNew );
         }
         break;
-    case CTRL_EDITBOX:
-        {
-            auto nTextHeight = rDev.ImplLogicToDevicePixel(Rectangle(0, 0, 0, rVal.getNumericVal())).GetHeight();
-            EditBoxValue* pNew = new EditBoxValue(nTextHeight);
-            aResult.reset(pNew);
-        }
-        break;
-    case CTRL_GENERIC:
-        aResult.reset( new ImplControlValue( rVal ) );
-        break;
     default:
         OSL_FAIL( "unknown ImplControlValue type !" );
         break;