[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]
rpms/openoffice.org/devel workspace.impress63.patch, NONE, 1.1 openoffice.org.spec, 1.295, 1.296

From: fedora-cvs-commits redhat com
To: fedora-cvs-commits redhat com
Subject: rpms/openoffice.org/devel workspace.impress63.patch, NONE, 1.1 openoffice.org.spec, 1.295, 1.296
Date: Mon, 11 Jul 2005 11:33:57 -0400
Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27361

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress63.patch 
Log Message:
fix for crash with something selected in kde

workspace.impress63.patch:
 sd/source/ui/app/sdxfer.cxx                        |   14 +++++++++-----
 sd/source/ui/inc/FrameView.hxx                     |   19 +++++++++++++++++--
 sd/source/ui/view/frmview.cxx                      |   16 ++++++++++++++--
 sd/uiconfig/simpress/accelerator/de/default.xml    |    2 +-
 sd/uiconfig/simpress/accelerator/en-GB/default.xml |    2 +-
 sd/uiconfig/simpress/accelerator/en-US/default.xml |    2 +-
 sd/uiconfig/simpress/accelerator/es/default.xml    |    2 +-
 sd/uiconfig/simpress/accelerator/fr/default.xml    |    2 +-
 source/ui/view/sdview2.cxx                         |    0 
 svx/source/svdraw/svdograf.cxx                     |   15 +++++++++++++++
 10 files changed, 60 insertions(+), 14 deletions(-)

--- NEW FILE workspace.impress63.patch ---
Index: source/ui/app/sdxfer.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/app/sdxfer.cxx,v
retrieving revision 1.40
retrieving revision 1.40.160.1
diff -u -r1.40 -r1.40.160.1
--- openoffice.org.orig/sd/source/ui/app/sdxfer.cxx	7 Feb 2005 14:41:17 -0000	1.40
+++ openoffice.org/sd/source/ui/app/sdxfer.cxx	8 Jul 2005 12:44:40 -0000	1.40.160.1
@@ -363,20 +363,24 @@
 	}
 	else if( pSdView && !pSdDrawDocumentIntern )
 	{
-		bOwnDocument = TRUE;
-
 		const SdrMarkList& rMarkList = pSdView->GetMarkedObjectList();
 
 		if( rMarkList.GetMarkCount() == 1 )
 			CreateObjectReplacement( rMarkList.GetMark( 0 )->GetObj() );
 
+		if( pSourceDoc )
+			pSourceDoc->CreatingDataObj(this);
 		pSdDrawDocumentIntern = (SdDrawDocument*) pSdView->GetAllMarkedModel();
+		if( pSourceDoc )
+			pSourceDoc->CreatingDataObj(0);
 
 		if( !aDocShellRef.Is() && pSdDrawDocumentIntern->GetDocSh() )
-		{
-			// DocShell schon vorhanden ( AllocModel() )
 			aDocShellRef = pSdDrawDocumentIntern->GetDocSh();
-			bOwnDocument = FALSE;
+
+		if( !aDocShellRef.Is() )
+		{
+			DBG_ERROR( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" );
+			bOwnDocument = TRUE;
 		}
 
 		// Groesse der Source-Seite uebernehmen
Index: source/ui/inc/FrameView.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/FrameView.hxx,v
retrieving revision 1.3
retrieving revision 1.3.180.1
diff -u -r1.3 -r1.3.180.1
--- openoffice.org.orig/sd/source/ui/inc/FrameView.hxx	27 Jan 2005 14:15:20 -0000	1.3
+++ openoffice.org/sd/source/ui/inc/FrameView.hxx	6 Jul 2005 12:04:06 -0000	1.3.180.1
@@ -133,13 +133,26 @@
 				 { aVisArea = rVisArea; }
 	const Rectangle GetVisArea() { return aVisArea; }
 
-	void SetPageKind(PageKind eKind)
-				 { ePageKind = eKind; }
+	void SetPageKind(PageKind eKind) { ePageKind = eKind; }
 	const PageKind GetPageKind() { return ePageKind; }
 
+	/** is used in FrameView::ReadUserDataSequence() only to store the
+		page kind that was selected while last saving this document */
+	void SetPageKindOnLoad(PageKind eKind) { ePageKindOnLoad = eKind; }
+
+	/** can be used to get the page kind that was selected on last save of this document */
+	const PageKind GetPageKindOnLoad() { return ePageKindOnLoad; }
+
 	void SetSelectedPage (USHORT nPage);
 	const USHORT GetSelectedPage (void) const;
 
+	/** is used in FrameView::ReadUserDataSequence() only to store the
+		page that was selected while last saving this document */
+	void SetSelectedPageOnLoad (USHORT nPage) { nSelectedPageOnLoad = nPage; }
+
+	/** can be used to get the page that was selected on last save of this document */
+	const USHORT GetSelectedPageOnLoad (void) const { return nSelectedPageOnLoad; }
+
 	void SetViewShEditMode(EditMode eMode, PageKind eKind);
 	EditMode GetViewShEditMode(PageKind eKind);
 
@@ -214,6 +227,8 @@
 	Rectangle		aVisArea;		   // Sichtbarer Bereich
 	PageKind		ePageKind;		   // Seitentyp (Standard, Notizen, Handzettel)
 	USHORT			nSelectedPage;	   // Selektierte Seite
+	PageKind		ePageKindOnLoad;
+	USHORT			nSelectedPageOnLoad;
 	EditMode        eStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage)
 	EditMode        eNotesEditMode;    // Editmode im Notizen-Modus (Page/MasterPage)
 	EditMode        eHandoutEditMode;  // Editmode im Handzettel-Modus (Page/MasterPage)
Index: source/ui/view/frmview.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/frmview.cxx,v
retrieving revision 1.25
retrieving revision 1.25.176.1
diff -u -r1.25 -r1.25.176.1
--- openoffice.org.orig/sd/source/ui/view/frmview.cxx	27 Jan 2005 14:22:22 -0000	1.25
+++ openoffice.org/sd/source/ui/view/frmview.cxx	6 Jul 2005 12:04:43 -0000	1.25.176.1
@@ -248,7 +248,9 @@
 		bNoAttribs = pFrameView->IsNoAttribs() ;
 		aVisArea = pFrameView->GetVisArea();
 		ePageKind = pFrameView->GetPageKind();
+		ePageKindOnLoad = pFrameView->GetPageKindOnLoad();
 		nSelectedPage = pFrameView->GetSelectedPage();
+		nSelectedPageOnLoad = pFrameView->GetSelectedPageOnLoad();
 		eStandardEditMode = pFrameView->GetViewShEditMode(PK_STANDARD);
 		eNotesEditMode = pFrameView->GetViewShEditMode(PK_NOTES);
 		eHandoutEditMode = pFrameView->GetViewShEditMode(PK_HANDOUT);
@@ -282,7 +284,9 @@
 		bNoAttribs = FALSE;
 		aVisArea = Rectangle( Point(), Size(0, 0) );
 		ePageKind = PK_STANDARD;
+		ePageKindOnLoad = PK_STANDARD;
 		nSelectedPage = 0;
+		nSelectedPageOnLoad = 0;
 		eStandardEditMode = EM_PAGE;
 		eNotesEditMode = EM_PAGE;
 		eHandoutEditMode = EM_MASTERPAGE;
@@ -994,14 +998,22 @@
 			{
 				if( pValue->Value >>= nInt16 )
 				{
-					SetPageKind( (PageKind)nInt16 );
+					SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
+					if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
+                        SetPageKind( (PageKind)nInt16 );
+
+					SetPageKindOnLoad( (PageKind)nInt16 );
 				}
 			}
 			else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SelectedPage ) ) )
 			{
 				if( pValue->Value >>= nInt16 )
 				{
-					SetSelectedPage( (USHORT)nInt16 );
+					SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
+					if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
+						SetSelectedPage( (USHORT)nInt16 );
+
+					SetSelectedPageOnLoad( (USHORT)nInt16 );
 				}
 			}
 			else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLayerMode ) ) )
Index: source/ui/view/sdview2.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/sdview2.cxx,v
retrieving revision 1.42
retrieving revision 1.42.108.2
diff -u -r1.42 -r1.42.108.2
Index: uiconfig/simpress/accelerator/de/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/de/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.148.1
diff -u -r1.2 -r1.2.148.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/de/default.xml	24 Feb 2005 17:13:16 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/de/default.xml	6 Jul 2005 11:32:08 -0000	1.2.148.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_H" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_T" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/en-GB/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/en-GB/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -r1.2 -r1.2.8.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/en-GB/default.xml	24 Jun 2005 11:30:49 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/en-GB/default.xml	6 Jul 2005 11:32:24 -0000	1.2.8.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/en-US/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/en-US/default.xml,v
retrieving revision 1.4
retrieving revision 1.4.240.1
diff -u -r1.4 -r1.4.240.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/en-US/default.xml	26 Nov 2004 15:04:42 -0000	1.4
+++ openoffice.org/sd/uiconfig/simpress/accelerator/en-US/default.xml	6 Jul 2005 11:32:39 -0000	1.4.240.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/es/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/es/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.148.1
diff -u -r1.2 -r1.2.148.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/es/default.xml	24 Feb 2005 17:13:28 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/es/default.xml	6 Jul 2005 11:32:53 -0000	1.2.148.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: uiconfig/simpress/accelerator/fr/default.xml
===================================================================
RCS file: /cvs/graphics/sd/uiconfig/simpress/accelerator/fr/default.xml,v
retrieving revision 1.2
retrieving revision 1.2.148.1
diff -u -r1.2 -r1.2.148.1
--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/fr/default.xml	24 Feb 2005 17:13:39 -0000	1.2
+++ openoffice.org/sd/uiconfig/simpress/accelerator/fr/default.xml	6 Jul 2005 11:33:04 -0000	1.2.148.1
@@ -42,7 +42,7 @@
 	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
 	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
 	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
-	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:Navigator"/>
+	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
 	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
 	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
Index: source/svdraw/svdograf.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/svdraw/svdograf.cxx,v
retrieving revision 1.65
retrieving revision 1.65.380.1
diff -u -r1.65 -r1.65.380.1
--- openoffice.org.orig/svx/source/svdraw/svdograf.cxx	11 Jan 2005 13:03:26 -0000	1.65
+++ openoffice.org/svx/source/svdraw/svdograf.cxx	6 Jul 2005 16:00:41 -0000	1.65.380.1
@@ -940,6 +940,21 @@
 				// get BitmapEx
 				Graphic aTempGraphic = GetTransformedGraphic();
 				Size aPixelSize(aSnapRectPixel.GetSize());
+
+				// #i48495#
+				// When this is done on a very fine resolution OutputDevice (e.g. PDF export) it may lead
+				// to problems since huge pixel bitmaps may be created. Sizes need to be cropped here. Later
+				// it may be nice to have the quadratic pixel size configurable somewhere.
+				const sal_uInt32 nMaxBitmapPixels(800L * 800L);
+				const sal_uInt32 nAllPixels(aPixelSize.getWidth() * aPixelSize.getHeight());
+
+				if(nAllPixels > nMaxBitmapPixels)
+				{
+					const double fScale(sqrt((double)nMaxBitmapPixels) / sqrt((double)nAllPixels));
+					aPixelSize.setWidth(FRound(aPixelSize.getWidth() * fScale));
+					aPixelSize.setHeight(FRound(aPixelSize.getHeight() * fScale));
+				}
+
 				BitmapEx aTempBitmapEx = aTempGraphic.GetBitmapEx(&aPixelSize);
 
 				// paint


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- openoffice.org.spec	11 Jul 2005 14:18:29 -0000	1.295
+++ openoffice.org.spec	11 Jul 2005 15:33:17 -0000	1.296
@@ -1,5 +1,5 @@
 %define ooo2ver 116
-%define ooo_rpm_release 2.cmc2
+%define ooo_rpm_release 2.cmc3
 %define build_fc4 0
 %define build_fc5 1
 
@@ -126,6 +126,7 @@
 Patch58: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
 Patch59: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
 Patch60: openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch
+Patch61: workspace.impress63.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -766,6 +767,7 @@
 %patch58 -p1 -b .ooo51774.rsc.parallel.patch
 %patch59 -p1 -b .oooXXXXX.extensions.evolution.patch
 %patch60 -p1 -b .rhXXXXX.desktop.noexpand.patch
+%patch61 -p1 -b .workspace.impress63.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -2947,10 +2949,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-2.cmc2
+* Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-2.cmc3
 - enable evo addressbook in addressbook wizard
 - rh#162875# extra leading / from file picker
 - update fpicker stuff
+- add workspace.impress63.patch for rh#162158#
 
 * Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-2
 - add openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]