mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS ooo33gsl02_OOO330

Browse Source
This commit is contained in:
Kurt Zenker
2010-07-13 14:50:40 +02:00
parent 627046c06f 985a3c7cc9
commit 8e4c720439
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/source/deployment/gui/dp_gui_dialog2.cxx
View File

@@ -1147,13 +1147,13 @@ void ExtMgrDialog::Resize()
{ {
ImplControlValue aValue; ImplControlValue aValue;
bool bNativeOK; bool bNativeOK;
Region aControlRegion( Rectangle( (const Point&)Point(), m_aProgressBar.GetSizePixel() ) ); Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() );
Region aNativeControlRegion, aNativeContentRegion; Rectangle aNativeControlRegion, aNativeContentRegion;
if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
CTRL_STATE_ENABLED, aValue, rtl::OUString(), CTRL_STATE_ENABLED, aValue, rtl::OUString(),
aNativeControlRegion, aNativeContentRegion ) ) != FALSE ) aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
{ {
nProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight(); nProgressHeight = aNativeControlRegion.GetHeight();
} }
} }
@@ -1590,13 +1590,13 @@ void UpdateRequiredDialog::Resize()
{ {
ImplControlValue aValue; ImplControlValue aValue;
bool bNativeOK; bool bNativeOK;
Region aControlRegion( Rectangle( (const Point&)Point(), m_aProgressBar.GetSizePixel() ) ); Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() );
Region aNativeControlRegion, aNativeContentRegion; Rectangle aNativeControlRegion, aNativeContentRegion;
if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
CTRL_STATE_ENABLED, aValue, rtl::OUString(), CTRL_STATE_ENABLED, aValue, rtl::OUString(),
aNativeControlRegion, aNativeContentRegion ) ) != FALSE ) aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
{ {
nProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight(); nProgressHeight = aNativeControlRegion.GetHeight();
} }
} }

10
desktop/source/splash/splash.cxx
View File

@@ -640,20 +640,18 @@ void SplashScreen::Paint( const Rectangle&)
ImplControlValue aValue( _iProgress * _barwidth / _iMax); ImplControlValue aValue( _iProgress * _barwidth / _iMax);
Rectangle aDrawRect( Point(_tlx, _tly), Size( _barwidth, _barheight ) ); Rectangle aDrawRect( Point(_tlx, _tly), Size( _barwidth, _barheight ) );
Region aControlRegion( aDrawRect ); Rectangle aNativeControlRegion, aNativeContentRegion;
Region aNativeControlRegion, aNativeContentRegion;
if( GetNativeControlRegion( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aControlRegion, if( GetNativeControlRegion( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect,
CTRL_STATE_ENABLED, aValue, rtl::OUString(), CTRL_STATE_ENABLED, aValue, rtl::OUString(),
aNativeControlRegion, aNativeContentRegion ) ) aNativeControlRegion, aNativeContentRegion ) )
{ {
long nProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight(); long nProgressHeight = aNativeControlRegion.GetHeight();
aDrawRect.Top() -= (nProgressHeight - _barheight)/2; aDrawRect.Top() -= (nProgressHeight - _barheight)/2;
aDrawRect.Bottom() += (nProgressHeight - _barheight)/2; aDrawRect.Bottom() += (nProgressHeight - _barheight)/2;
aControlRegion = Region( aDrawRect );
} }
if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aControlRegion, if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect,
CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE ) CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE )
{ {
return; return;