Author: arielch
Date: Mon Feb 25 15:09:43 2013
New Revision: 1449742
URL: http://svn.apache.org/r1449742
Log:
i117782 - Re-size controls according to the optimal size
Modified:
openoffice/trunk/main/sc/source/ui/optdlg/tpcalc.cxx
openoffice/trunk/main/sc/source/ui/src/optdlg.src
Modified: openoffice/trunk/main/sc/source/ui/optdlg/tpcalc.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/optdlg/tpcalc.cxx?rev=1449742&r1=1449741&r2=1449742&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/optdlg/tpcalc.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/optdlg/tpcalc.cxx Mon Feb 25 15:09:43
2013
@@ -112,6 +112,17 @@ __EXPORT ScTpCalcOptions::~ScTpCalcOptio
void ScTpCalcOptions::Init()
{
+ const Size a6Size = aFtPrec.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
+ const Size aMin = aFtPrec.CalcMinimumSize();
+ const Point aPos = aFtPrec.GetPosPixel();
+ const long nNewX = aPos.X() + aFtPrec.GetSizePixel().Width() -
aMin.Width();
+
+ aFtPrec.SetPosPixel( Point( nNewX, aPos.Y() ) );
+ aFtPrec.SetSizePixel( aMin );
+ aBtnGeneralPrec.SetSizePixel( Size(
+ nNewX - a6Size.Width() - aBtnGeneralPrec.GetPosPixel().X(),
+ aBtnGeneralPrec.GetSizePixel().Height() ) );
+
aBtnIterate .SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl )
);
aBtnGeneralPrec.SetClickHdl( LINK(this, ScTpCalcOptions, CheckClickHdl) );
aBtnDateStd .SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl )
);
Modified: openoffice/trunk/main/sc/source/ui/src/optdlg.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/src/optdlg.src?rev=1449742&r1=1449741&r2=1449742&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/src/optdlg.src (original)
+++ openoffice/trunk/main/sc/source/ui/src/optdlg.src Mon Feb 25 15:09:43 2013
@@ -160,8 +160,9 @@ TabPage RID_SCPAGE_CALC
{
HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC";
Pos = MAP_APPFONT ( 12 , 147 ) ;
- Size = MAP_APPFONT ( 200 , 10 ) ;
+ Size = MAP_APPFONT ( 148 , 26 ) ;
Text [ en-US ] = "Limit decimals for general number format" ;
+ WordBreak = TRUE ;
};
FixedText FT_PREC
{
