rpms/openoffice.org/F-13 openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch, NONE, 1.1 openoffice.org-3.3.0.ooo93818.sw.postitprint.patch, NONE, 1.1 openoffice.org.spec, 1.2176, 1.2177

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20018

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch 
	openoffice.org-3.3.0.ooo93818.sw.postitprint.patch 
Log Message:
Resolves: rhbz#586446 openoffice.org-3.3.0.ooo93818.sw.postitprint.patch

openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch:
 unosett.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch ---
diff -r 03068afc23c6 sw/source/core/unocore/unosett.cxx
--- a/sw/source/core/unocore/unosett.cxx	Sun Apr 25 15:43:24 2010 +0100
+++ b/sw/source/core/unocore/unosett.cxx	Tue Apr 27 16:55:25 2010 +0100
@@ -1659,9 +1659,8 @@
 				aPropertyValues.Insert(pData, aPropertyValues.Count());
 			}
 		 	Size aSize = rFmt.GetGraphicSize();
-			aSize.Width() = TWIP_TO_MM100( aSize.Width() );
-			aSize.Height() = TWIP_TO_MM100( aSize.Height() );
-			pData = new PropValData((void*)&aSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
+		 	awt::Size aAwtSize(TWIP_TO_MM100(aSize.Width()), TWIP_TO_MM100(aSize.Height()));
+			pData = new PropValData((void*)&aAwtSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
 			aPropertyValues.Insert(pData, aPropertyValues.Count());
 
 			const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();

openoffice.org-3.3.0.ooo93818.sw.postitprint.patch:
 postit.cxx |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE openoffice.org-3.3.0.ooo93818.sw.postitprint.patch ---
diff -r 03068afc23c6 sw/source/ui/docvw/postit.cxx
--- a/sw/source/ui/docvw/postit.cxx	Sun Apr 25 15:43:24 2010 +0100
+++ b/sw/source/ui/docvw/postit.cxx	Wed Apr 28 11:31:24 2010 +0100
@@ -730,12 +730,6 @@
 	mpOutliner->SetUpdateMode( TRUE );
 	Rescale();
 
-	OutputDevice* pDev = aShell->GetDoc()->getReferenceDevice(TRUE);
-	if ( pDev )
-	{
-		mpOutliner->SetRefDevice( pDev );
-	}
-
 	mpOutlinerView = new OutlinerView ( mpOutliner, mpPostItTxt );
 	mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT);
 	mpOutliner->InsertView(mpOutlinerView );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2176
retrieving revision 1.2177
diff -u -p -r1.2176 -r1.2177
--- openoffice.org.spec	25 Apr 2010 17:25:51 -0000	1.2176
+++ openoffice.org.spec	28 Apr 2010 11:01:35 -0000	1.2177
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 17
+%define rh_rpm_release 18
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -142,6 +142,8 @@ Patch71: openoffice.org-3.2.0.ooo109766.
 Patch72: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
 Patch73: openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
 Patch74: openoffice.org-3.3.0.ooo110747.plugin.patch
+Patch75: openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch
+Patch76: openoffice.org-3.3.0.ooo93818.sw.postitprint.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1716,6 +1718,8 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch72 -p0 -b .ooo110142.svx.safercolornames.patch
 %patch73 -p1 -b .ooo110523.rdf.resetsecprefs.patch
 %patch74 -p1 -b .ooo110747.plugin.patch
+%patch75 -p1 -b .ooo101131.sw.size.mismatch.patch
+%patch76 -p1 -b .ooo93818.sw.postitprint.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4201,6 +4205,10 @@ fi
 %endif
 
 %changelog
+* Wed Apr 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.18
+- Resolves: rhbz#586446 openoffice.org-3.3.0.ooo93818.sw.postitprint.patch
+- add openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch
+
 * Sun Apr 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.17
 - Resolves: rhbz#583386 docx import crash