ooo-build r11266 - in trunk: . patches/src680

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Jan 15 12:04:29 2008
New Revision: 11266
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11266&view=rev

Log:
2008-01-15  Noel Power  <noel power novell com>

        * patches/src680/apply: backport cws-thiscomponent
        * patches/src680/cws-thiscomponent-basctl.diff:
        * patches/src680/cws-thiscomponent-sfx2.diff:



Added:
   trunk/patches/src680/cws-thiscomponent-basctl.diff
   trunk/patches/src680/cws-thiscomponent-sfx2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan 15 12:04:29 2008
@@ -289,6 +289,8 @@
 # not for upstreaming: hack to work even on gcc's with broken -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+cws-thiscomponent-basctl.diff
+cws-thiscomponent-sfx2.diff
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff

Added: trunk/patches/src680/cws-thiscomponent-basctl.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/cws-thiscomponent-basctl.diff	Tue Jan 15 12:04:29 2008
@@ -0,0 +1,77 @@
+cvs diff: Diffing basctl
+cvs diff: Diffing basctl/inc
+cvs diff: Diffing basctl/inc/pch
+cvs diff: Diffing basctl/prj
+cvs diff: Diffing basctl/sdi
+cvs diff: Diffing basctl/source
+cvs diff: Diffing basctl/source/accessibility
+cvs diff: Diffing basctl/source/basicide
+Index: basctl/source/basicide/basides1.cxx
+===================================================================
+RCS file: /cvs/script/basctl/source/basicide/basides1.cxx,v
+retrieving revision 1.53
+retrieving revision 1.53.24.1
+diff -u -p -b -w -B -r1.53 -r1.53.24.1
+--- basctl/source/basicide/basides1.cxx	9 Oct 2007 15:21:36 -0000	1.53
++++ basctl/source/basicide/basides1.cxx	8 Jan 2008 14:31:04 -0000	1.53.24.1
+@@ -1146,7 +1146,8 @@ void BasicIDEShell::SetCurWindow( IDEBas
+ 		if ( pCurWin )
+ 		{
+ 			SetWindow( pCurWin );
+-            SfxObjectShell::SetWorkingDocument( pCurWin->GetDocument().getDocumentOrNull() );
++            if ( pCurWin->GetDocument().isDocument() )
++                SfxObjectShell::SetWorkingDocument( pCurWin->GetDocument().getDocument() );
+ 		}
+ 		else
+ 		{
+@@ -1365,8 +1366,8 @@ void __EXPORT BasicIDEShell::Activate( B
+ {
+ 	if ( bMDI )
+ 	{
+-        if ( pCurWin )
+-            SfxObjectShell::SetWorkingDocument( pCurWin->GetDocument().getDocumentOrNull() );
++        if ( pCurWin && pCurWin->GetDocument().isDocument() )
++            SfxObjectShell::SetWorkingDocument( pCurWin->GetDocument().getDocument() );
+ 
+ 		if( pCurWin && pCurWin->IsA( TYPE( DialogWindow ) ) )
+ 			((DialogWindow*)pCurWin)->UpdateBrowser();
+@@ -1418,10 +1419,6 @@ void __EXPORT BasicIDEShell::Deactivate(
+ */
+ 
+ 		ShowObjectDialog( FALSE, FALSE );
+-
+-        Reference< XModel > xWorkingDoc( SfxObjectShell::GetWorkingDocument() );
+-        if ( pCurWin && xWorkingDoc.is() && pCurWin->IsDocument( ScriptDocument( xWorkingDoc ) ) )
+-            SfxObjectShell::SetWorkingDocument( NULL );
+ 	}
+ }
+ 
+Index: basctl/source/basicide/basidesh.cxx
+===================================================================
+RCS file: /cvs/script/basctl/source/basicide/basidesh.cxx,v
+retrieving revision 1.45
+retrieving revision 1.45.24.1
+diff -u -p -b -w -B -r1.45 -r1.45.24.1
+--- basctl/source/basicide/basidesh.cxx	9 Oct 2007 15:22:02 -0000	1.45
++++ basctl/source/basicide/basidesh.cxx	8 Jan 2008 14:31:05 -0000	1.45.24.1
+@@ -242,7 +242,8 @@ __EXPORT BasicIDEShell::~BasicIDEShell()
+ 	SetWindow( 0 );
+ 	SetCurWindow( 0 );
+     SfxObjectShell* pCurrentShell( SfxObjectShell::Current() );
+-    SfxObjectShell::SetWorkingDocument( pCurrentShell ? pCurrentShell->GetModel() : Reference< frame::XModel >() );
++    if ( pCurrentShell )
++        SfxObjectShell::SetWorkingDocument( pCurrentShell->GetModel() );
+ 
+ 	// Alle Fenster zerstoeren:
+ 	IDEBaseWindow* pWin = aIDEWindowTable.First();
+cvs diff: Diffing basctl/source/dlged
+cvs diff: Diffing basctl/source/inc
+cvs diff: Diffing basctl/uiconfig
+cvs diff: Diffing basctl/uiconfig/basicide
+cvs diff: Diffing basctl/uiconfig/basicide/accelerator
+cvs diff: Diffing basctl/uiconfig/basicide/accelerator/en-GB
+cvs diff: Diffing basctl/uiconfig/basicide/accelerator/en-US
+cvs diff: Diffing basctl/uiconfig/basicide/menubar
+cvs diff: Diffing basctl/uiconfig/basicide/statusbar
+cvs diff: Diffing basctl/uiconfig/basicide/toolbar
+cvs diff: Diffing basctl/util

Added: trunk/patches/src680/cws-thiscomponent-sfx2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/cws-thiscomponent-sfx2.diff	Tue Jan 15 12:04:29 2008
@@ -0,0 +1,59 @@
+cvs diff: Diffing sfx2
+cvs diff: Diffing sfx2/inc
+cvs diff: Diffing sfx2/inc/pch
+cvs diff: Diffing sfx2/inc/sfx2
+cvs diff: Diffing sfx2/prj
+cvs diff: Diffing sfx2/qa
+cvs diff: Diffing sfx2/qa/complex
+cvs diff: Diffing sfx2/qa/complex/DocHelper
+cvs diff: Diffing sfx2/qa/complex/docinfo
+cvs diff: Diffing sfx2/qa/unoapi
+cvs diff: Diffing sfx2/qa/unoapi/testdocuments
+cvs diff: Diffing sfx2/sdi
+cvs diff: Diffing sfx2/source
+cvs diff: Diffing sfx2/source/appl
+cvs diff: Diffing sfx2/source/bastyp
+cvs diff: Diffing sfx2/source/config
+cvs diff: Diffing sfx2/source/control
+cvs diff: Diffing sfx2/source/dialog
+cvs diff: Diffing sfx2/source/doc
+cvs diff: Diffing sfx2/source/explorer
+cvs diff: Diffing sfx2/source/inc
+cvs diff: Diffing sfx2/source/inet
+cvs diff: Diffing sfx2/source/menu
+cvs diff: Diffing sfx2/source/notify
+cvs diff: Diffing sfx2/source/statbar
+cvs diff: Diffing sfx2/source/toolbox
+cvs diff: Diffing sfx2/source/view
+Index: sfx2/source/view/viewsh.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/view/viewsh.cxx,v
+retrieving revision 1.79
+retrieving revision 1.79.44.1
+diff -u -p -b -w -B -r1.79 -r1.79.44.1
+--- sfx2/source/view/viewsh.cxx	7 Nov 2007 10:44:11 -0000	1.79
++++ sfx2/source/view/viewsh.cxx	8 Jan 2008 14:30:42 -0000	1.79.44.1
+@@ -912,18 +912,9 @@ void SfxViewShell::Activate( BOOL bMDI )
+ 
+ //--------------------------------------------------------------------
+ 
+-void SfxViewShell::Deactivate(BOOL bMDI)
++void SfxViewShell::Deactivate(BOOL /*bMDI*/)
+ {
+ 	DBG_CHKTHIS(SfxViewShell, 0);
+-	if ( bMDI )
+-	{
+-		SfxObjectShell *pSh = GetViewFrame()->GetObjectShell();
+-        Reference< XModel > xDoc;
+-        if ( pSh )
+-            xDoc = pSh->GetModel();
+-		if ( xDoc.is() && ( xDoc == SfxObjectShell::GetWorkingDocument() ) )
+-		    SfxObjectShell::SetWorkingDocument( Reference< XModel >() );
+-    }
+ }
+ 
+ //--------------------------------------------------------------------
+cvs diff: Diffing sfx2/util
+cvs diff: Diffing sfx2/util/defs
+cvs diff: Diffing sfx2/win
+cvs diff: Diffing sfx2/win/res