[Libreoffice-commits] core.git: 2 commits - cui/source

[Miklos Vajna]

 cui/source/tabpages/tparea.cxx |   30 ------------------------------
 1 file changed, 30 deletions(-)

New commits:
commit 2032e9f5d7683e49b8753d7c7362899c690005b6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Mar 31 09:32:53 2014 +0200

    cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl
    
    This is unused since commit 5627d0bdaf1385df9d90dcec3a319c82c089c2ca
    (Fix #86988#: Redesign of dialogs, 2001-05-15), and just getting rid of
    it avoids a crash on Insert -> Frame -> Area -> Bitmap in Writer.
    
    Copy&paste of problematic code, take 3.
    
    Change-Id: Ide488585bbc6aed157fa6058bcfd1cd0a6d2c7aa

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 74b748d..85ae669 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2061,21 +2061,6 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
 
     m_pBxBitmap->Show();
 
-    // set table text
-    OUString        aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += ": ";
-    INetURLObject   aURL( pBitmapList->GetPath() );
-
-    aURL.Append( pBitmapList->GetName() );
-    DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-
-    if( aURL.getBase().getLength() > 18 )
-    {
-        aString += aURL.getBase().copy( 0, 15 );
-        aString += "...";
-    }
-    else
-        aString += aURL.getBase();
-
     ModifyBitmapHdl_Impl( this );
     ModifyTileHdl_Impl( m_pTsbOriginal );
 }
commit f4fa202b31277276dc4f05046c82152c0830ef21
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Mar 31 09:30:17 2014 +0200

    cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl
    
    This is unused since commit 5627d0bdaf1385df9d90dcec3a319c82c089c2ca
    (Fix #86988#: Redesign of dialogs, 2001-05-15), and just getting rid of it
    avoids a crash on Insert -> Frame -> Area -> Gradient in Writer.
    
    Copy&paste of problematic code, take 2.
    
    Change-Id: I5be2b0b3280826d50ea196f95f8ac92d7856ae7d

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 73be1ba..74b748d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1880,21 +1880,6 @@ void SvxAreaTabPage::ClickGradientHdl_Impl()
     // Controls for Hatch-Background
     m_pFlHatchBckgrd->Hide();
 
-    // set table text
-    OUString        aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += ": ";
-    INetURLObject   aURL( pGradientList->GetPath() );
-
-    aURL.Append( pGradientList->GetName() );
-    DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-
-    if( aURL.getBase().getLength() > 18 )
-    {
-        aString += aURL.getBase().copy( 0, 15 );
-        aString += "...";
-    }
-    else
-        aString += aURL.getBase();
-
     ModifyGradientHdl_Impl( this );
     ModifyStepCountHdl_Impl( m_pTsbStepCount );
 }