rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14269

Modified Files:
	openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch 
Log Message:
fixup patch

openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch:
 gtk/app/gtkdata.cxx         |   32 +++++++++++++++++++++++++++++++-
 inc/plugins/gtk/gtkdata.hxx |    2 ++
 inc/saldisp.hxx             |    4 +++-
 source/app/saldisp.cxx      |   21 +++++++++++++--------
 source/app/salsys.cxx       |    2 +-
 5 files changed, 50 insertions(+), 11 deletions(-)

Index: openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch	16 Jun 2010 07:51:01 -0000	1.2
+++ openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch	16 Jun 2010 08:33:01 -0000	1.3
@@ -158,7 +158,7 @@ diff -ru vcl.orig/unx/source/app/saldisp
                                           pScreens[i].y_org,
                                           pScreens[i].width,
                                           pScreens[i].height );
-@@ -2673,17 +2674,20 @@
+@@ -2673,7 +2674,6 @@
      }
  }
  #endif
@@ -166,10 +166,7 @@ diff -ru vcl.orig/unx/source/app/saldisp
  #if OSL_DEBUG_LEVEL > 1
      if( m_bXinerama )
      {
-         for( std::vector< Rectangle >::const_iterator it = m_aXineramaScreens.begin(); it != m_aXineramaScreens.end(); ++it )
-             fprintf( stderr, "Xinerama screen: %ldx%ld+%ld+%ld\n", it->GetWidth(), it->GetHeight(), it->Left(), it->Top() );
-     }
--#endif
+@@ -2684,6 +2684,11 @@
  #endif // USE_XINERAMA
  }