rpms/openoffice.org/F-11 workspace.fwk103.patch,1.3,1.4
Caolan McNamara
caolanm at fedoraproject.org
Tue Apr 28 10:57:06 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12077/F-11
Modified Files:
workspace.fwk103.patch
Log Message:
fixup
workspace.fwk103.patch:
Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/workspace.fwk103.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.fwk103.patch 28 Apr 2009 09:32:22 -0000 1.3
+++ workspace.fwk103.patch 28 Apr 2009 10:56:33 -0000 1.4
@@ -44,62 +44,62 @@ RCS file: /cvs/sw/sw/source/filter/html/
retrieving revision 1.26
retrieving revision 1.26.112.1
diff -u -r1.26 -r1.26.112.1
---- openoffice.org/sw/source/filter/html/htmlform.cxx 10 Apr 2008 16:42:33 -0000 1.26
-+++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx 20 Jun 2008 06:47:28 -0000 1.26.112.1
-@@ -706,6 +706,7 @@
+--- openoffice.org.orig/sw/source/filter/html/htmlform.cxx 20 Jun 2008 06:47:28 -0000 1.26.112.1
++++ openoffice.org/sw/source/filter/html/htmlform.cxx 10 Apr 2008 16:42:33 -0000 1.26
+@@ -706,7 +706,6 @@
sal_Bool bMinHeight,
int nToken )
{
-+ nToken = 0;
+- nToken = 0;
if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth && !bMinHeight )
return;
-@@ -721,35 +722,14 @@
+@@ -722,14 +721,35 @@
// one, no view shell will be created. That for, we have to do that of
// our own. This happens if a linked section is inserted or refreshed.
SwDocShell *pDocSh = pDoc->GetDocShell();
-- if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
-+ if( pDocSh )
++ if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
+- if( pDocSh )
{
-- SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
-+
-+ pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
++ SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
+-
+- pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
CallStartAction();
pDoc->GetEditShell( &pVSh );
}
}
-- if( !pVSh )
-- {
-- // If there is no view shell by now, but the document is loaded
-- // asynchronous, the view shell will be created delayed because
-- // the view was locked during the call to DocumentDetected. If this
-- // is the case we wait until another call to our DataAvailable
-- // link, because the SFX calls it if it creates the view.
-- ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
-- ASSERT( !IsParserWorking() || nEventId,
-- "Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
-- if( IsParserWorking() && bDocInitalized && nEventId )
-- {
-- pPendStack = new SwPendingStack( nToken, pPendStack );
-- pPendStack->pData =
-- new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
-- bMinWidth, bMinHeight );
-- SaveState( nToken );
-- eState = SVPAR_PENDING;
-- }
--
-- return;
-- }
++ if( !pVSh )
++ {
++ // If there is no view shell by now, but the document is loaded
++ // asynchronous, the view shell will be created delayed because
++ // the view was locked during the call to DocumentDetected. If this
++ // is the case we wait until another call to our DataAvailable
++ // link, because the SFX calls it if it creates the view.
++ ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
++ ASSERT( !IsParserWorking() || nEventId,
++ "Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
++ if( IsParserWorking() && bDocInitalized && nEventId )
++ {
++ pPendStack = new SwPendingStack( nToken, pPendStack );
++ pPendStack->pData =
++ new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
++ bMinWidth, bMinHeight );
++ SaveState( nToken );
++ eState = SVPAR_PENDING;
++ }
++
++ return;
++ }
uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
SwXShape *pSwShape = xTunnel.is() ?
-@@ -768,8 +748,7 @@
+@@ -748,7 +768,8 @@
ASSERT( pObj, "SdrObject nicht gefunden" );
ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
-- const SdrView* pDrawView = pVSh->GetDrawView();
-- ASSERT( pDrawView, "DrawView not found" );
-+ const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
++ const SdrView* pDrawView = pVSh->GetDrawView();
++ ASSERT( pDrawView, "DrawView not found" );
+- const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
uno::Reference< awt::XControl > xControl;
@@ -109,67 +109,67 @@ RCS file: /cvs/sw/sw/source/filter/html/
retrieving revision 1.49
retrieving revision 1.49.112.1
diff -u -r1.49 -r1.49.112.1
---- openoffice.org/sw/source/filter/html/swhtml.cxx 10 Apr 2008 16:47:35 -0000 1.49
-+++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx 20 Jun 2008 06:48:01 -0000 1.49.112.1
-@@ -114,6 +114,8 @@
+--- openoffice.org.orig/sw/source/filter/html/swhtml.cxx 20 Jun 2008 06:48:01 -0000 1.49.112.1
++++ openoffice.org/sw/source/filter/html/swhtml.cxx 10 Apr 2008 16:47:35 -0000 1.49
+@@ -114,8 +114,6 @@
#include <breakit.hxx>
#include <SwAppletImpl.hxx>
-+#include <sfx2/viewfrm.hxx>
-+
+-#include <sfx2/viewfrm.hxx>
+-
#ifndef _STATSTR_HRC
#include <statstr.hrc> // ResId fuer Statusleiste
#endif
-@@ -330,7 +332,9 @@
+@@ -332,9 +330,7 @@
bSelect( FALSE ),
bInFootEndNoteAnchor( FALSE ),
bInFootEndNoteSymbol( FALSE ),
-- bIgnoreHTMLComments( bNoHTMLComments )
-+// bIgnoreHTMLComments( bNoHTMLComments )
-+ bIgnoreHTMLComments( bNoHTMLComments ),
-+ pTempViewFrame(0)
++ bIgnoreHTMLComments( bNoHTMLComments )
+-// bIgnoreHTMLComments( bNoHTMLComments )
+- bIgnoreHTMLComments( bNoHTMLComments ),
+- pTempViewFrame(0)
{
nEventId = 0;
bUpperSpace = bViewCreated = bChkJumpMark =
-@@ -390,9 +394,7 @@
+@@ -394,7 +390,9 @@
SwDocShell* pDocSh = pDoc->GetDocShell();
if( pDocSh )
{
-- if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
-- SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
-- bViewCreated = TRUE; // dann nicht, synchron laden
-+ bViewCreated = TRUE; // nicht, synchron laden
++ if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
++ SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
++ bViewCreated = TRUE; // dann nicht, synchron laden
+- bViewCreated = TRUE; // nicht, synchron laden
// es ist ein Sprungziel vorgegeben.
-@@ -500,6 +502,9 @@
+@@ -502,9 +500,6 @@
// keiner will mehr das Doc haben, also weg damit
delete pDoc;
}
-+
-+ if ( pTempViewFrame )
-+ pTempViewFrame->DoClose();
+-
+- if ( pTempViewFrame )
+- pTempViewFrame->DoClose();
}
IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
-@@ -595,8 +600,8 @@
+@@ -600,8 +595,8 @@
// Die ViewShell vom Dokument holen, merken und als aktuelle setzen.
ViewShell *pInitVSh = CallStartAction();
--
-- if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
-+
-+ if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
++
++ if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
+-
+- if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
{
// Beim ersten Aufruf erstmal returnen, Doc anzeigen
// und auf Timer Callback warten.
-@@ -2462,8 +2467,7 @@
+@@ -2467,7 +2462,8 @@
ViewShell *pOldVSh = pVSh;
#endif
pDoc->GetEditShell( &pVSh );
-- ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
-- "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
-+ ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
++ ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
++ "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
+- ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
#ifndef PRODUCT
if( pOldVSh && !pVSh )
pVSh = 0;
@@ -179,22 +179,22 @@ RCS file: /cvs/sw/sw/source/filter/html/
retrieving revision 1.16
retrieving revision 1.16.112.1
diff -u -r1.16 -r1.16.112.1
---- openoffice.org/sw/source/filter/html/swhtml.hxx 10 Apr 2008 16:47:54 -0000 1.16
-+++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx 20 Jun 2008 06:48:01 -0000 1.16.112.1
-@@ -59,6 +59,7 @@
+--- openoffice.org.orig/sw/source/filter/html/swhtml.hxx 20 Jun 2008 06:48:01 -0000 1.16.112.1
++++ openoffice.org/sw/source/filter/html/swhtml.hxx 10 Apr 2008 16:47:54 -0000 1.16
+@@ -59,7 +59,6 @@
#include "htmlvsh.hxx"
class SfxMedium;
-+class SfxViewFrame;
+-class SfxViewFrame;
class SdrObject;
class SvxMacroTableDtor;
class SvStringsDtor;
-@@ -499,6 +500,8 @@
+@@ -500,8 +499,6 @@
sal_Bool bInFootEndNoteSymbol : 1;
sal_Bool bIgnoreHTMLComments : 1;
-+ SfxViewFrame* pTempViewFrame;
-+
+- SfxViewFrame* pTempViewFrame;
+-
void DeleteFormImpl();
void DocumentDetected();
More information about the scm-commits
mailing list