diff options
| author | obo <obo@openoffice.org> | 2010-06-14 15:36:30 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-14 15:36:30 +0200 |
| commit | fcef6979902a4b520935e7d5d38924398010a9ab (patch) | |
| tree | 7ab3ce933a393572ccfc64471445f250f07a64dc /vcl/unx/kde4 | |
| parent | 865ca3f320f647d61f37243fb281dfd9571a08af (diff) | |
| parent | 8f5ff4a4cbe7d33417a7b884e1c3093168738581 (diff) | |
CWS-TOOLING: integrate CWS vcl111
Diffstat (limited to 'vcl/unx/kde4')
| -rw-r--r-- | vcl/unx/kde4/KDESalGraphics.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index e8d184e6539b..5f8b5d2ae59e 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -744,7 +744,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, { if( part == PART_BORDER ) { - int size = kapp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin); + int size = kapp->style()->pixelMetric(QStyle::PM_DefaultFrameWidth); USHORT nStyle = val.getNumericVal(); if( nStyle & FRAME_DRAW_NODRAW ) { diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 2e5b86b79f9c..6a2793b8abe3 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -148,9 +148,6 @@ void KDEXLib::Init() ((VCLKDEApplication*)m_pApplication)->disp = pSalDisplay; - XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); - XSetErrorHandler ( (XErrorHandler)X11SalData::XErrorHdl ); - pInputMethod->CreateMethod( pDisp ); pInputMethod->AddConnectionWatch( pDisp, (void*)this ); pSalDisplay->SetInputMethod( pInputMethod ); @@ -175,4 +172,4 @@ void KDEXLib::doStartup() fprintf( stderr, "called KStartupInfo::appStarted()\n" ); #endif } -}
\ No newline at end of file +} |