rpms/openoffice.org/devel workspace.cl12.patch, NONE, 1.1 openoffice.org.spec, 1.1850, 1.1851
Caolan McNamara
caolanm at fedoraproject.org
Fri Mar 6 09:57:30 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11234
Modified Files:
openoffice.org.spec
Added Files:
workspace.cl12.patch
Log Message:
Resolves: rhbz#488835 backport workspace.cl12
workspace.cl12.patch:
--- NEW FILE workspace.cl12.patch ---
Index: sc/source/filter/xml/xmlannoi.cxx
===================================================================
--- sc/source/filter/xml/xmlannoi.cxx (.../tags/OOO310_m3) (revision 268984)
+++ sc/source/filter/xml/xmlannoi.cxx (.../cws/cl12) (revision 268984)
@@ -216,8 +216,8 @@
pMyAnnotation->pRect = new Rectangle(aRect);
}
- if((pSdrObj->GetOutlinerParaObject()))
- pMyAnnotation->pOPO = new OutlinerParaObject( *(pSdrObj->GetOutlinerParaObject()) );
+ if( OutlinerParaObject* pOPO = pSdrObj->GetOutlinerParaObject() )
+ pMyAnnotation->pOPO = new OutlinerParaObject( *pOPO );
xShapes->remove(xShape);
}
Index: sc/source/filter/xml/xmlcelli.cxx
===================================================================
--- sc/source/filter/xml/xmlcelli.cxx (.../tags/OOO310_m3) (revision 268984)
+++ sc/source/filter/xml/xmlcelli.cxx (.../cws/cl12) (revision 268984)
@@ -644,7 +644,12 @@
if( SdrCaptionObj* pCaption = pNote->GetCaption() )
{
if( pMyAnnotation->pOPO )
+ {
+ // transfer outliner object to caption
pCaption->SetOutlinerParaObject( pMyAnnotation->pOPO );
+ // do not delete the object in ScMyImportAnnotation d'tor
+ pMyAnnotation->pOPO = 0;
+ }
else
pCaption->SetText( pMyAnnotation->sText );
// copy all items and reset shadow items
Index: sc/source/core/data/postit.cxx
===================================================================
--- sc/source/core/data/postit.cxx (.../tags/OOO310_m3) (revision 268984)
+++ sc/source/core/data/postit.cxx (.../cws/cl12) (revision 268984)
@@ -504,7 +504,7 @@
{
// copy edit text object (object must be inserted into page already)
if( OutlinerParaObject* pOPO = pCaption->GetOutlinerParaObject() )
- maNoteData.mpCaption->SetOutlinerParaObject( pOPO );
+ maNoteData.mpCaption->SetOutlinerParaObject( new OutlinerParaObject( *pOPO ) );
// copy formatting items (after text has been copied to apply font formatting)
maNoteData.mpCaption->SetMergedItemSetAndBroadcast( pCaption->GetMergedItemSet() );
// move textbox position relative to new cell, copy textbox size
Index: svx/source/outliner/outlobj.cxx
===================================================================
--- svx/source/outliner/outlobj.cxx (.../tags/OOO310_m3) (revision 268984)
+++ svx/source/outliner/outlobj.cxx (.../cws/cl12) (revision 268984)
@@ -61,6 +61,8 @@
mbIsEditDoc(bIsEditDoc),
mnRefCount(0)
{
+ if( (maParagraphDataVector.size() == 0) && (pEditTextObject->GetParagraphCount() != 0) )
+ maParagraphDataVector.resize(pEditTextObject->GetParagraphCount());
}
// destructor
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1850
retrieving revision 1.1851
diff -u -r1.1850 -r1.1851
--- openoffice.org.spec 6 Mar 2009 09:08:30 -0000 1.1850
+++ openoffice.org.spec 6 Mar 2009 09:56:59 -0000 1.1851
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -136,6 +136,7 @@
Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
Patch55: workspace.localization35.patch
+Patch56: workspace.cl12.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1606,6 +1607,7 @@
%patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
%patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
%patch55 -p0 -b .workspace.localization35.patch
+%patch56 -p0 -b .workspace.cl12.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4122,6 +4124,9 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Fri Mar 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.2
+- Resolves: rhbz#488835 backport workspace.cl12
+
* Fri Mar 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.1
- report-builder will be broken until rhbz#474391 is resolved
- drop integrated workspace.gfbcrash.patch
More information about the scm-commits
mailing list