[Libreoffice-commits] core.git: include/tools rsc/inc rsc/source tools/source vcl/source

[Caolán McNamara]

 include/tools/rcid.h          |    2 +-
 rsc/inc/rscdb.hxx             |    1 -
 rsc/source/parser/rscicpx.cxx |   20 --------------------
 rsc/source/parser/rscinit.cxx |    4 ----
 tools/source/rc/resmgr.cxx    |    1 -
 vcl/source/control/edit.cxx   |    4 +---
 6 files changed, 2 insertions(+), 30 deletions(-)

New commits:
commit b0da096c610b4392277a3b7fe3c7c29d2c8c3fcf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Aug 16 18:33:04 2014 +0100

    RSC_MULTILINEEDIT no longer used
    
    Change-Id: If56233b5226cec9516d5e2f8992e1b0beae733bf

diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 74fdef6..d3b4e63 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -74,7 +74,7 @@
 #define RSC_CHECKBOX            (RSC_NOTYPE + 0x50)
 #define RSC_TRISTATEBOX         (RSC_NOTYPE + 0x51)
 #define RSC_EDIT                (RSC_NOTYPE + 0x52)
-#define RSC_MULTILINEEDIT       (RSC_NOTYPE + 0x53)
+
 #define RSC_COMBOBOX            (RSC_NOTYPE + 0x54)
 #define RSC_LISTBOX             (RSC_NOTYPE + 0x55)
 
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index c688190..b8fc762 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -180,7 +180,6 @@ class RscTypCont
     RscTop *    InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
                                     RscEnum * pTriState );
     RscTop *    InitClassEdit( RscTop * pSuper );
-    RscTop *    InitClassMultiLineEdit( RscTop * pSuper );
     RscTop *    InitClassScrollBar( RscTop * pSuper );
     RscTop *    InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
     RscTop *    InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 0760f32..195f6af 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -542,26 +542,6 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper )
     return pClassEdit;
 }
 
-RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassMultiLineEdit;
-
-    // Klasse anlegen
-    nId = pHS->getID( "MultiLineEdit" );
-    pClassMultiLineEdit = new RscClass( nId, RSC_MULTILINEEDIT, pSuper );
-    pClassMultiLineEdit->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
-    aNmTb.Put( nId, CLASSNAME, pClassMultiLineEdit );
-
-    INS_WINBIT( pClassMultiLineEdit, HScroll );
-    INS_WINBIT( pClassMultiLineEdit, VScroll );
-    INS_WINBIT( pClassMultiLineEdit, IgnoreTab );
-    INS_WINBIT( pClassMultiLineEdit, AutoVScroll )
-
-    return pClassMultiLineEdit;
-}
-
 RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
 {
     Atom        nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 7068140..0aecf07 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -84,7 +84,6 @@ void RscTypCont::Init()
     RscTop   *  pClassImageButton;
     RscTop   *  pClassTriStateBox;
     RscTop   *  pClassEdit;
-    RscTop   *  pClassMultiLineEdit;
     RscTop   *  pClassListBox;
     RscTop   *  pClassComboBox;
     RscTop   *  pClassFixedText;
@@ -427,9 +426,6 @@ void RscTypCont::Init()
 
     pClassEdit = InitClassEdit( pClassControl );
     pRoot->Insert( pClassEdit );
-
-    pClassMultiLineEdit = InitClassMultiLineEdit( pClassEdit );
-    pRoot->Insert( pClassMultiLineEdit );
 }
 {
     pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index d3f02e8..a41f981 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1483,7 +1483,6 @@ OString ResMgr::GetAutoHelpId()
                     case RSC_CHECKBOX:          aHID.append( "CheckBox" );         break;
                     case RSC_TRISTATEBOX:       aHID.append( "TriStateBox" );      break;
                     case RSC_EDIT:              aHID.append( "Edit" );             break;
-                    case RSC_MULTILINEEDIT:     aHID.append( "MultiLineEdit" );    break;
                     case RSC_LISTBOX:           aHID.append( "ListBox" );          break;
                     case RSC_COMBOBOX:          aHID.append( "ComboBox" );         break;
                     case RSC_PUSHBUTTON:        aHID.append( "PushButton" );       break;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e03f0e5..bf6b283 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -177,9 +177,7 @@ Edit::Edit( Window* pParent, const ResId& rResId ) :
     ImplInit( pParent, nStyle );
     ImplLoadRes( rResId );
 
-    // Derived MultiLineEdit takes care to call Show only after MultiLineEdit
-    // ctor has already started:
-    if ( !(nStyle & WB_HIDE) && rResId.GetRT() != RSC_MULTILINEEDIT )
+    if ( !(nStyle & WB_HIDE) )
         Show();
 }