[Libreoffice-commits] core.git: sfx2/inc sfx2/source

[Caolán McNamara]

 sfx2/inc/sfx2/mgetempl.hxx      |    1 -
 sfx2/source/dialog/mgetempl.cxx |    5 -----
 sfx2/source/dialog/mgetempl.src |    9 +--------
 3 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 866a9a57fedf92767f64fc9348722ce42e17cde4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 13 12:29:00 2013 +0000

    remove aDescED which is always hidden and never used
    
    looks like it got replaced by FT_DESC over 13 years
    ago without getting removed, FT_DESC should have had
    the helpid associated with ED_DESC.
    
    Change-Id: I7aa0887d75b114ebc7c863920e0d58f71c3a7a31

diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index f7816b3..6fce1f4 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -61,7 +61,6 @@ class SfxManageStyleSheetPage : public SfxTabPage
 
     FixedLine aDescGb;
     FixedInfo aDescFt;
-    MultiLineEdit aDescED;
 
     SfxStyleSheetBase *pStyle;
     SfxStyleFamilies *pFamilies;
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 3d127ad..d252b6e 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -61,7 +61,6 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
 
     aDescGb     ( this, SfxResId( GB_DESC ) ),
     aDescFt     ( this, SfxResId( FT_DESC ) ),
-    aDescED     ( this, SfxResId( ED_DESC ) ),
 
     pStyle( &( (SfxStyleDialog*)GetParentDialog() )->GetStyleSheet() ),
 
@@ -80,13 +79,9 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
 {
     FreeResource();
 
-    if ( IsBackground() )
-        aDescED.SetBackground( GetBackground() );
     FixedInfo* pInfo = new FixedInfo( this );
-    aDescED.SetFont( pInfo->GetFont() );
     delete pInfo;
 
-    aDescED.Hide();
     aDescFt.Show();
 
     // this Page needs ExchangeSupport
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 64f145c..80199dd 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -103,19 +103,12 @@ TabPage TP_MANAGE_STYLES
     };
     FixedText FT_DESC
     {
+        HelpID = "sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC";
         Pos = MAP_APPFONT ( 12 , 88  ) ;
         Size = MAP_APPFONT ( 236 , 85 ) ;
         WordBreak = TRUE ;
         Hide = TRUE ;
     };
-    MultiLineEdit ED_DESC
-    {
-        HelpID = "sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC";
-        Pos = MAP_APPFONT ( 12 , 88  ) ;
-        Size = MAP_APPFONT ( 236 , 85 ) ;
-        ReadOnly = TRUE ;
-        IgnoreTab = TRUE;
-    };
     FixedLine GB_DESC
     {
         Pos = MAP_APPFONT ( 6 , 77  ) ;