rpms/openoffice.org/devel openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch, NONE, 1.1 openoffice.org.spec, 1.602, 1.603

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12602

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch 
Log Message:
jrb special

openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch:
 framework/source/helper/statusindicatorfactory.cxx |    2 ++
 framework/source/loadenv/loadenv.cxx               |    3 ++-
 framework/source/services/frame.cxx                |    2 ++
 source/helper/statusindicatorfactory.cxx           |    0 
 source/loadenv/loadenv.cxx                         |    0 
 source/services/frame.cxx                          |    0 
 6 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch ---
Index: source/helper/statusindicatorfactory.cxx
===================================================================
RCS file: /cvs/framework/framework/source/helper/statusindicatorfactory.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 statusindicatorfactory.cxx
--- openoffice.org.orig/framework/source/helper/statusindicatorfactory.cxx	23 Sep 2005 15:41:23 -0000	1.21
+++ openoffice.org/framework/source/helper/statusindicatorfactory.cxx	4 Jan 2006 21:41:06 -0000
@@ -496,9 +496,11 @@ void StatusIndicatorFactory::implts_make
 
     if (xParentWindow.is())
         xParentWindow->setVisible(sal_True);
+#if 0
     css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY);
     if (xParentWindowTop.is())
         xParentWindowTop->toFront();
+#endif
 }
 
 //-----------------------------------------------
Index: source/loadenv/loadenv.cxx
===================================================================
RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 loadenv.cxx
--- openoffice.org.orig/framework/source/loadenv/loadenv.cxx	11 Nov 2005 12:06:12 -0000	1.21
+++ openoffice.org/framework/source/loadenv/loadenv.cxx	4 Jan 2006 21:41:08 -0000
@@ -1774,9 +1774,10 @@ void LoadEnv::impl_makeFrameWindowVisibl
 
     if (xWindow.is())
         xWindow->setVisible(sal_True);
-
+#if 0
     if (xTopWindow.is())
         xTopWindow->toFront();
+#endif
 
 /* #i19976#
     We tried to prevent a toFront() call in case the user putted the
Index: source/services/frame.cxx
===================================================================
RCS file: /cvs/framework/framework/source/services/frame.cxx,v
retrieving revision 1.88
diff -u -p -u -r1.88 frame.cxx
--- openoffice.org.orig/framework/source/services/frame.cxx	11 Nov 2005 12:06:59 -0000	1.88
+++ openoffice.org/framework/source/services/frame.cxx	4 Jan 2006 21:41:09 -0000
@@ -1563,6 +1563,7 @@ sal_Bool SAL_CALL Frame::setComponent(  
     if (bIsConnected && !bWasConnected)
         implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED   );
 
+#if 0
     //_____________________________________________________________________________________________________
     // A new component window doesn't know anything about current active/focus states.
     // Set this information on it!
@@ -1573,6 +1574,7 @@ sal_Bool SAL_CALL Frame::setComponent(  
     {
         xComponentWindow->setFocus();
     }
+#endif
 
     // If it was a new component window - we must resize it to fill out
     // our container window.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -r1.602 -r1.603
--- openoffice.org.spec	4 Jan 2006 17:05:44 -0000	1.602
+++ openoffice.org.spec	4 Jan 2006 21:51:32 -0000	1.603
@@ -215,6 +215,7 @@
 Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch
 Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
 Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -882,6 +883,7 @@
 %patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch
 %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
 %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3342,6 +3344,7 @@
 %changelog
 * Wed Jan 04 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-5
 - spinbutton factory needs to be uneditable as well as combobox
+- add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb
 
 * Thu Dec 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-4
 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779#