diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:52:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:52:43 +0000 |
| commit | 208b00d3c3ef9934230c1c36fc65e0a3aa4d5274 (patch) | |
| tree | 6fe82b8558eaf5197ed50fc151c5634321b438cc /vcl | |
| parent | 84d259ff324af9caa9c545dd5e2a8e9be752ecbd (diff) | |
INTEGRATION: CWS svp01 (1.204.40); FILE MERGED
2006/07/25 10:17:50 pl 1.204.40.3: RESYNC: (1.205-1.207); FILE MERGED
2006/06/27 13:01:33 pl 1.204.40.2: RESYNC: (1.204-1.205); FILE MERGED
2006/05/22 16:35:34 pl 1.204.40.1: #135265# free plugin abstraction of dependency on X11 specific SalData
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index d18a5aa4613e..9d81d4b5bc69 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.207 $ + * $Revision: 1.208 $ * - * last change: $Author: kz $ $Date: 2006-07-19 16:55:52 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:52:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -485,8 +485,8 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, SystemParentData* pParentData ) XSetWMProtocols( GetXDisplay(), GetShellWindow(), a, n ); XClassHint* pClass = XAllocClassHint(); - pClass->res_name = const_cast<char*>(SalData::getFrameResName()); - pClass->res_class = const_cast<char*>(SalData::getFrameClassName()); + pClass->res_name = const_cast<char*>(X11SalData::getFrameResName()); + pClass->res_class = const_cast<char*>(X11SalData::getFrameClassName()); XSetClassHint( GetXDisplay(), GetShellWindow(), pClass ); XFree( pClass ); @@ -570,7 +570,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, SystemParentData* pParentData ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentData* pSystemParent ) { - SalData* pSalData = GetSalData(); + X11SalData* pSalData = GetX11SalData(); // initialize frame geometry memset( &maGeometry, 0, sizeof(maGeometry) ); @@ -754,9 +754,9 @@ void X11SalFrame::SetExtendedFrameStyle( SalExtStyle nStyle ) mnExtStyle = nStyle; XClassHint* pClass = XAllocClassHint(); - rtl::OString aResHint = SalData::getFrameResName( mnExtStyle ); + rtl::OString aResHint = X11SalData::getFrameResName( mnExtStyle ); pClass->res_name = const_cast<char*>(aResHint.getStr()); - pClass->res_class = const_cast<char*>(SalData::getFrameClassName()); + pClass->res_class = const_cast<char*>(X11SalData::getFrameClassName()); XSetClassHint( GetXDisplay(), GetShellWindow(), pClass ); XFree( pClass ); } |