rpms/openoffice.org/devel workspace.vcl39.patch,1.5,1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Aug 8 15:30:53 UTC 2005
- Previous message (by thread): rpms/kdegames/devel kdegames-3.4.2-setgid.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 kdegames.spec, 1.38, 1.39 sources, 1.29, 1.30 admin-visibility.patch, 1.3, NONE
- Next message (by thread): rpms/openoffice.org/devel workspace.gslpatches4.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14281
Modified Files:
workspace.vcl39.patch
Log Message:
force patch
workspace.vcl39.patch:
padmin/source/fontentry.cxx | 6
psprint/inc/psprint/fontmanager.hxx | 2
psprint/source/fontmanager/fontcache.cxx | 40 --
psprint/source/fontmanager/fontconfig.cxx | 7
psprint/source/fontmanager/fontmanager.cxx | 17 -
psprint/source/fontsubset/sft.c | 8
psprint/source/fontsubset/sft.h | 2
toolkit/source/awt/vclxtoolkit.cxx | 5
vcl/inc/salframe.hxx | 2
vcl/inc/sallayout.hxx | 10
vcl/inc/scrbar.hxx | 1
vcl/inc/window.hxx | 2
vcl/source/app/stdtext.cxx | 5
vcl/source/app/svapp.cxx | 5
vcl/source/app/svdata.cxx | 41 +-
vcl/source/control/button.cxx | 52 ++-
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 29 -
vcl/source/control/scrbar.cxx | 88 +++--
vcl/source/gdi/bmpfast.cxx | 34 +-
vcl/source/gdi/sallayout.cxx | 49 ++
vcl/source/window/brdwin.cxx | 7
vcl/source/window/menu.cxx | 63 ++-
vcl/source/window/msgbox.cxx | 23 +
vcl/source/window/scrwnd.cxx | 11
vcl/source/window/splitwin.cxx | 15
vcl/source/window/window.cxx | 5
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 33 -
vcl/unx/gtk/window/gtkframe.cxx | 92 +++--
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 1
vcl/unx/inc/salframe.h | 1
vcl/unx/inc/wmadaptor.hxx | 21 +
vcl/unx/source/app/soicon.cxx | 3
vcl/unx/source/app/wmadaptor.cxx | 111 ++++++
vcl/unx/source/gdi/pspgraphics.cxx | 2
vcl/unx/source/gdi/xfont.cxx | 5
vcl/unx/source/window/salframe.cxx | 37 ++
vcl/win/inc/salgdi.h | 1
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 274 ++++++++++++----
vcl/win/source/gdi/winlayout.cxx | 492 ++++++++++++++++++-----------
vcl/win/source/window/salframe.cxx | 15
42 files changed, 1149 insertions(+), 476 deletions(-)
Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl39.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.vcl39.patch 7 Jul 2005 12:58:52 -0000 1.5
+++ workspace.vcl39.patch 8 Aug 2005 15:30:39 -0000 1.6
@@ -1652,90 +1652,6 @@
{ "_NET_WM_ICON_NAME", WMAdaptor::NET_WM_ICON_NAME },
{ "_NET_WM_STATE", WMAdaptor::NET_WM_STATE },
{ "_NET_WM_STATE_ABOVE", WMAdaptor::NET_WM_STATE_STAYS_ON_TOP },
-@@ -1199,37 +1200,11 @@ void NetWMAdaptor::setNetWMState( X11Sal
- * get current desktop here if work areas have different size
- * (does this happen on any platform ?)
- */
-- if( ! m_bEqualWorkAreas
-- && m_aWMAtoms[ NET_CURRENT_DESKTOP ]
-- )
-+ if( ! m_bEqualWorkAreas )
- {
-- Atom aRealType = None;
-- int nFormat = 8;
-- unsigned long nItems = 0;
-- unsigned long nBytesLeft = 0;
-- unsigned char* pProperty = NULL;
-- if( XGetWindowProperty( m_pDisplay,
-- m_pSalDisplay->GetRootWindow(),
-- m_aWMAtoms[ NET_CURRENT_DESKTOP ],
-- 0, 1,
-- False,
-- XA_CARDINAL,
-- &aRealType,
-- &nFormat,
-- &nItems,
-- &nBytesLeft,
-- &pProperty ) == 0
-- && pProperty
-- )
-- {
-- nCurrent = *(sal_Int32*)pProperty;
-- XFree( pProperty );
-- }
-- else if( pProperty )
-- {
-- XFree( pProperty );
-- pProperty = NULL;
-- }
-+ nCurrent = getCurrentWorkArea();
-+ if( nCurrent < 0 )
-+ nCurrent = 0;
- }
- Rectangle aPosSize = m_aWMWorkAreas[nCurrent];
- const SalFrameGeometry& rGeom( pFrame->GetUnmirroredGeometry() );
-@@ -1315,37 +1290,11 @@ void GnomeWMAdaptor::setGnomeWMState( X1
- * get current desktop here if work areas have different size
- * (does this happen on any platform ?)
- */
-- if( ! m_bEqualWorkAreas
-- && m_aWMAtoms[ NET_CURRENT_DESKTOP ]
-- )
-+ if( ! m_bEqualWorkAreas )
- {
-- Atom aRealType = None;
-- int nFormat = 8;
-- unsigned long nItems = 0;
-- unsigned long nBytesLeft = 0;
-- unsigned char* pProperty = NULL;
-- if( XGetWindowProperty( m_pDisplay,
-- m_pSalDisplay->GetRootWindow(),
-- m_aWMAtoms[ NET_CURRENT_DESKTOP ],
-- 0, 1,
-- False,
-- XA_CARDINAL,
-- &aRealType,
-- &nFormat,
-- &nItems,
-- &nBytesLeft,
-- &pProperty ) == 0
-- && pProperty
-- )
-- {
-- nCurrent = *(sal_Int32*)pProperty;
-- XFree( pProperty );
-- }
-- else if( pProperty )
-- {
-- XFree( pProperty );
-- pProperty = NULL;
-- }
-+ nCurrent = getCurrentWorkArea();
-+ if( nCurrent < 0 )
-+ nCurrent = 0;
- }
- Rectangle aPosSize = m_aWMWorkAreas[nCurrent];
- const SalFrameGeometry& rGeom( pFrame->GetUnmirroredGeometry() );
@@ -1972,6 +1921,10 @@ int NetWMAdaptor::handlePropertyNotify(
Size( rGeom.nWidth, rGeom.nHeight ) );
}
- Previous message (by thread): rpms/kdegames/devel kdegames-3.4.2-setgid.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 kdegames.spec, 1.38, 1.39 sources, 1.29, 1.30 admin-visibility.patch, 1.3, NONE
- Next message (by thread): rpms/openoffice.org/devel workspace.gslpatches4.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list