summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-01-11 20:44:15 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-19 17:57:32 +0100
commit91cc656caaf65ca0402b0101ab7f22c1a3562910 (patch)
tree269bbae7578d985bbbd7ccfeab98d0c798458d27 /svtools
parent932d9136aa60bc09a7d1b8feac0aed0619a7c407 (diff)
Remove the size in the LineListBox
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/ctrlbox.hxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx21
2 files changed, 5 insertions, 18 deletions
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 99a1d5d84d23..8678b770dc6e 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -315,7 +315,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance,
Color nColor1, Color nColor2, Color nColorDist,
- sal_uInt16 nStyle, Bitmap& rBmp, XubString& rStr );
+ sal_uInt16 nStyle, Bitmap& rBmp );
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();
sal_Bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 898ce820aaa9..7ef030591ba9 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -600,7 +600,7 @@ namespace svtools
void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
Color aColor1, Color aColor2, Color aColorDist,
- sal_uInt16 nStyle, Bitmap& rBmp, XubString& rStr )
+ sal_uInt16 nStyle, Bitmap& rBmp )
{
Size aSize = GetOutputSizePixel();
aSize.Width() -= 20;
@@ -655,25 +655,13 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
}
rBmp = aVirDev.GetBitmap( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
}
-
- // Twips nach Unit
- if ( eUnit == FUNIT_POINT )
- {
- nLine1 *= 5;
- nLine2 *= 5;
- nDistance *= 5;
- rStr.AssignAscii( " pt" );
- }
-
- String aNum( GetSettings().GetLocaleI18nHelper().GetNum( nLine1+nLine2+nDistance, 2 ) );
- rStr.Insert( aNum, 0 );
}
// -----------------------------------------------------------------------
void LineListBox::ImplInit()
{
- aTxtSize.Width() = GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( "99,99 mm" ) ) );
+ aTxtSize.Width() = GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
aTxtSize.Height() = GetTextHeight();
pLineList = new ImpLineList();
eUnit = FUNIT_POINT;
@@ -905,7 +893,6 @@ void LineListBox::UpdateEntries( long nOldWidth )
ImpLineListData* pData = pLineList->GetObject( n );
if ( pData && pData->GetMinWidth() <= m_nWidth )
{
- XubString aStr;
Bitmap aBmp;
ImpGetLine( pData->GetLine1ForWidth( m_nWidth ),
pData->GetLine2ForWidth( m_nWidth ),
@@ -913,8 +900,8 @@ void LineListBox::UpdateEntries( long nOldWidth )
GetColorLine1( GetEntryCount( ) ),
GetColorLine2( GetEntryCount( ) ),
GetColorDist( GetEntryCount( ) ),
- pData->GetStyle(), aBmp, aStr );
- ListBox::InsertEntry( aStr, aBmp, LISTBOX_APPEND );
+ pData->GetStyle(), aBmp );
+ ListBox::InsertEntry( XubString( RTL_CONSTASCII_USTRINGPARAM( " " ) ), aBmp, LISTBOX_APPEND );
if ( n == nTypePos )
SelectEntryPos( GetEntryCount() - 1 );
}