rpms/openoffice.org/devel openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, NONE, 1.1 openoffice.org.spec, 1.1787, 1.1788
Caolan McNamara
caolanm at fedoraproject.org
Tue Feb 10 12:41:51 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
Log Message:
Resolves: rhbz#483890 revert bad change, cure worse than disease
openoffice.org-3.0.1.ooo99050.sw.htmlload.patch:
--- NEW FILE openoffice.org-3.0.1.ooo99050.sw.htmlload.patch ---
Index: htmlform.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/html/htmlform.cxx,v
retrieving revision 1.26
retrieving revision 1.26.112.1
diff -u -r1.26 -r1.26.112.1
--- openoffice.org/sw/source/filter/htmlform.cxx 10 Apr 2008 16:42:33 -0000 1.26
+++ openoffice.org.orig/sw/source/filter/htmlform.cxx 20 Jun 2008 06:47:28 -0000 1.26.112.1
@@ -706,6 +706,7 @@
sal_Bool bMinHeight,
int nToken )
{
+ nToken = 0;
if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth && !bMinHeight )
return;
@@ -721,35 +722,14 @@
// 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 )
{
- 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;
- }
uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
SwXShape *pSwShape = xTunnel.is() ?
@@ -768,8 +748,7 @@
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;
SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
uno::Reference< awt::XControl > xControl;
Index: swhtml.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
retrieving revision 1.49
retrieving revision 1.49.112.1
diff -u -r1.49 -r1.49.112.1
--- openoffice.org/sw/source/filter/swhtml.cxx 10 Apr 2008 16:47:35 -0000 1.49
+++ openoffice.org.orig/sw/source/filter/swhtml.cxx 20 Jun 2008 06:48:01 -0000 1.49.112.1
@@ -114,6 +114,8 @@
#include <breakit.hxx>
#include <SwAppletImpl.hxx>
+#include <sfx2/viewfrm.hxx>
+
#ifndef _STATSTR_HRC
#include <statstr.hrc> // ResId fuer Statusleiste
#endif
@@ -330,7 +332,9 @@
bSelect( FALSE ),
bInFootEndNoteAnchor( FALSE ),
bInFootEndNoteSymbol( FALSE ),
- bIgnoreHTMLComments( bNoHTMLComments )
+// bIgnoreHTMLComments( bNoHTMLComments )
+ bIgnoreHTMLComments( bNoHTMLComments ),
+ pTempViewFrame(0)
{
nEventId = 0;
bUpperSpace = bViewCreated = bChkJumpMark =
@@ -390,9 +394,7 @@
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
// es ist ein Sprungziel vorgegeben.
@@ -500,6 +502,9 @@
// keiner will mehr das Doc haben, also weg damit
delete pDoc;
}
+
+ if ( pTempViewFrame )
+ pTempViewFrame->DoClose();
}
IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
@@ -595,8 +600,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 )
{
// Beim ersten Aufruf erstmal returnen, Doc anzeigen
// und auf Timer Callback warten.
@@ -2462,8 +2467,7 @@
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?" );
#ifndef PRODUCT
if( pOldVSh && !pVSh )
pVSh = 0;
Index: swhtml.hxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/html/swhtml.hxx,v
retrieving revision 1.16
retrieving revision 1.16.112.1
diff -u -r1.16 -r1.16.112.1
--- openoffice.org/sw/source/filter/swhtml.hxx 10 Apr 2008 16:47:54 -0000 1.16
+++ openoffice.org.orig/sw/source/filter/swhtml.hxx 20 Jun 2008 06:48:01 -0000 1.16.112.1
@@ -59,6 +59,7 @@
#include "htmlvsh.hxx"
class SfxMedium;
+class SfxViewFrame;
class SdrObject;
class SvxMacroTableDtor;
class SvStringsDtor;
@@ -499,6 +500,8 @@
sal_Bool bInFootEndNoteSymbol : 1;
sal_Bool bIgnoreHTMLComments : 1;
+ SfxViewFrame* pTempViewFrame;
+
void DeleteFormImpl();
void DocumentDetected();
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1787
retrieving revision 1.1788
diff -u -r1.1787 -r1.1788
--- openoffice.org.spec 9 Feb 2009 12:49:21 -0000 1.1787
+++ openoffice.org.spec 10 Feb 2009 12:41:21 -0000 1.1788
@@ -1,6 +1,6 @@
%define oootag OOO300
%define ooomilestone 15
-%define rh_rpm_release 7
+%define rh_rpm_release 8
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -139,6 +139,7 @@
Patch68: workspace.gcc44.patch
Patch69: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
Patch70: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
+Patch71: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -867,7 +868,7 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-he
-Requires: culmus-fonts
+Requires: culmus-nachlieli-clm-fonts
Obsoletes: openoffice.org-i18n < 1.9.0
Obsoletes: openoffice.org-langpack-he < 1:2.0.3
Obsoletes: openoffice.org2-langpack-he_IL < 1:3.0.0
@@ -1604,6 +1605,7 @@
%patch68 -p1 -b .workspace.gcc44.patch
%patch69 -p1 -b .ooo98885.sw.safeindex.patch
%patch70 -p1 -b .ooo98909.sfx2.missingplugins.patch
+%patch71 -p1 -R -b .ooo99050.sw.htmlload.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4101,6 +4103,11 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Tue Feb 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.8
+- culmus-fonts => culmus-nachlieli-clm-fonts
+- Resolves: rhbz#483890 revert bad change, cure worse than disease
+ openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
+
* Mon Feb 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.7
- Resolves: rhbz#484055 reusable autocorrection files
- Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
More information about the scm-commits
mailing list