Tag: cws_src680_fwk23
User: as      
Date: 05/10/11 22:54:02

Modified:
 /dba/dbaccess/source/core/dataaccess/
  documentdefinition.cxx

Log:
 #124984# dont remove frame from the global desktop tree

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: documentdefinition.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.27&r2=1.27.8.1
Delta lines:  +12 -3
--------------------
--- documentdefinition.cxx      8 Jul 2005 10:37:18 -0000       1.27
+++ documentdefinition.cxx      12 Oct 2005 05:53:59 -0000      1.27.8.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: documentdefinition.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.27.8.1 $
  *
- *  last change: $Author: obo $ $Date: 2005/07/08 10:37:18 $
+ *  last change: $Author: as $ $Date: 2005/10/12 05:53:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -691,7 +691,15 @@
                                                                {
                                                                        
m_xFrameLoader.set(m_xORB->createInstance(SERVICE_FRAME_DESKTOP),UNO_QUERY);
                                                                }
+                                /*
                                                                // remove the 
frame from the desktop because we need full control of it.
+
+                                ... no ... dont remove the frame from the 
desktop tree.
+                                Otherwhise it can happen that sometimes no 
active frame will be defined
+                                and some funstions behind the menu of this 
frame cant work.
+
+                                see #124984# for further informations
+
                                                                if ( 
m_xFrameLoader.is() )
                                                                {
                                                                        
Reference<XFramesSupplier> xSup(m_xFrameLoader,UNO_QUERY);
@@ -701,6 +709,7 @@
                                                                                
xFrames->remove(xFrame);
                                                                        }
                                                                }
+                                */
 
                                                                //      
Reference<XStateChangeBroadcaster> xBrd(m_xEmbeddedObject,UNO_QUERY);
                                                                m_xListener = 
new OEmbedObjectHolder(m_xEmbeddedObject,this);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to