rpms/openoffice.org/F-10 workspace.impress161.patch, NONE, 1.1 openoffice.org.spec, 1.1696, 1.1697

Caolan McNamara caolanm at fedoraproject.org
Tue Dec 2 23:03:30 UTC 2008 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21960

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress161.patch 
Log Message:
add workspace.impress161.patch

workspace.impress161.patch:

--- NEW FILE workspace.impress161.patch ---
Index: xml/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
diff -u /dev/null xml/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx:1.1.2.1
--- /dev/null	Tue Dec  2 14:58:37 2008
+++ xml/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx	Mon Sep 22 08:03:52 2008
@@ -0,0 +1,56 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _XMLOFF_WORDWRAPPROPERTYHANDLER_HXX
+#define _XMLOFF_WORDWRAPPROPERTYHANDLER_HXX
+
+#include <xmloff/xmlprhdl.hxx>
+#include <xmloff/xmltoken.hxx>
+#include <com/sun/star/uno/Type.h>
+#include <xmloff/xmlement.hxx>
+
+/**
+    PropertyHandler for a named xml bool type:
+*/
+class SvXMLImport;
+class XMLWordWrapPropertyHdl : public XMLPropertyHandler
+{
+private:
+	SvXMLImport* mpImport;
+
+public:
+	XMLWordWrapPropertyHdl( SvXMLImport* pImport );
+	virtual ~XMLWordWrapPropertyHdl();
+
+	virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+	virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+};
+
+#endif		// _XMLOFF_NAMEDBOOLPROPERTYHANDLER_HXX
Index: xml/xmloff/source/draw/sdpropls.cxx
diff -u xml/xmloff/source/draw/sdpropls.cxx:1.102 xml/xmloff/source/draw/sdpropls.cxx:1.102.64.1
--- xml/xmloff/source/draw/sdpropls.cxx:1.102	Mon Jul  7 02:54:37 2008
+++ xml/xmloff/source/draw/sdpropls.cxx	Mon Sep 22 08:08:15 2008
@@ -48,6 +48,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <xmloff/EnumPropertyHdl.hxx>
 #include <xmloff/NamedBoolPropertyHdl.hxx>
+#include <xmloff/WordWrapPropertyHdl.hxx>
 #include "numithdl.hxx"
 #include "XMLBitmapRepeatOffsetPropertyHandler.hxx"
 #include "XMLFillBitmapSizePropertyHandler.hxx"
@@ -1131,7 +1132,7 @@
 				pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FORWARD), GetXMLToken(XML_REVERSE) );
 				break;
 			case XML_TYPE_WRAP_OPTION:
-				pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken( XML_WRAP ), GetXMLToken( XML_NO_WRAP ) );
+				pHdl = new XMLWordWrapPropertyHdl( mpImport );
 				break;
 
 			case XML_SD_TYPE_MOVE_PROTECT:
Index: xml/xmloff/source/style/WordWrapPropertyHdl.cxx
diff -u /dev/null xml/xmloff/source/style/WordWrapPropertyHdl.cxx:1.1.2.1
--- /dev/null	Tue Dec  2 14:58:41 2008
+++ xml/xmloff/source/style/WordWrapPropertyHdl.cxx	Mon Sep 22 08:04:16 2008
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ * $Revision$
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_xmloff.hxx"
+#include <xmloff/xmlimp.hxx>
+#include <xmloff/WordWrapPropertyHdl.hxx>
+#include "xmlkywd.hxx"
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmluconv.hxx>
+#include <comphelper/extract.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/uno/Any.hxx>
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
+using namespace ::com::sun::star::uno;
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// class XMLWordWrapPropertyHdl
+//
+
+XMLWordWrapPropertyHdl::XMLWordWrapPropertyHdl( SvXMLImport* pImport )
+: mpImport( pImport )
+{
+}
+
+XMLWordWrapPropertyHdl::~XMLWordWrapPropertyHdl()
+{
+	// Nothing to do
+}
+
+sal_Bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
+{
+	sal_Bool bValue = sal_False, bRetValue = sal_False;
+	if( rStrImpValue == GetXMLToken( xmloff::token::XML_WRAP ) )
+	{
+		bValue = sal_True;
+		bRetValue = sal_True;
+	}
+	if( rStrImpValue == GetXMLToken( xmloff::token::XML_NO_WRAP ) )
+	{
+		bValue = sal_False;
+		bRetValue = sal_True;
+	}
+	if ( bRetValue && mpImport )
+	{
+		sal_Int32 nUPD, nBuildId;
+		if( mpImport->getBuildIds( nUPD, nBuildId ) )
+		{
+		    if( nUPD == 300 )
+		    {
+			    if( ( nBuildId > 0 ) && (nBuildId < 9316 ) )
+					bValue = bValue ? sal_False : sal_True;		// treat OOo 3.0 beta1 as OOo 2.x
+		    }
+            else if( ( nUPD == 680 ) || ( nUPD >= 640 && nUPD <= 645 ) )
+				bValue = bValue ? sal_False : sal_True;
+		}
+		rValue <<= bValue;
+	}
+	return bRetValue;
+}
+
+sal_Bool XMLWordWrapPropertyHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const
+{
+	if( ::cppu::any2bool( rValue ) )
+	{
+		rStrExpValue = GetXMLToken( xmloff::token::XML_WRAP );
+	}
+	else
+	{
+		rStrExpValue = GetXMLToken( xmloff::token::XML_NO_WRAP );
+	}
+	return sal_True;
+}
+
Index: xml/xmloff/source/style/makefile.mk
diff -u xml/xmloff/source/style/makefile.mk:1.32 xml/xmloff/source/style/makefile.mk:1.32.120.1
--- xml/xmloff/source/style/makefile.mk:1.32	Thu Apr 10 15:41:04 2008
+++ xml/xmloff/source/style/makefile.mk	Mon Sep 22 08:08:16 2008
@@ -121,7 +121,8 @@
 		PageMasterImportContext.cxx		\
 		PagePropertySetContext.cxx		\
 		PageHeaderFooterContext.cxx		\
-		StyleMap.cxx		\
+		StyleMap.cxx					\
+		WordWrapPropertyHdl.cxx			\
 		XMLBitmapRepeatOffsetPropertyHandler.cxx \
 		XMLFillBitmapSizePropertyHandler.cxx \
 		XMLBitmapLogicalSizePropertyHandler.cxx \
@@ -209,6 +210,7 @@
 		$(SLO)$/PagePropertySetContext.obj		\
 		$(SLO)$/PageHeaderFooterContext.obj		\
 		$(SLO)$/StyleMap.obj					\
+		$(SLO)$/WordWrapPropertyHdl.obj			\
 		$(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \
 		$(SLO)$/XMLFillBitmapSizePropertyHandler.obj	\
 		$(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj	\
Index: installation/scp2/source/ooo/file_library_ooo.scp
diff -u installation/scp2/source/ooo/file_library_ooo.scp:1.303.2.3 installation/scp2/source/ooo/file_library_ooo.scp:1.303.2.3.4.1
--- installation/scp2/source/ooo/file_library_ooo.scp:1.303.2.3	Tue Oct 21 06:18:37 2008
+++ installation/scp2/source/ooo/file_library_ooo.scp	Thu Oct 23 04:36:55 2008
@@ -1273,7 +1273,7 @@
     Styles = (PACKED, UNO_COMPONENT);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
@@ -1392,7 +1392,7 @@
 STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
@@ -1538,7 +1538,7 @@
 
 STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr)
 STD_UNO_LIB_FILE( gid_File_Lib_Xmx , xmx)
-STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Xof , xof)
 
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
Index: graphics/svx/source/svdraw/svdfppt.cxx
diff -u graphics/svx/source/svdraw/svdfppt.cxx:1.163 graphics/svx/source/svdraw/svdfppt.cxx:1.163.98.3
--- graphics/svx/source/svdraw/svdfppt.cxx:1.163	Tue Jul  1 16:18:43 2008
+++ graphics/svx/source/svdraw/svdfppt.cxx	Fri Oct 10 02:23:05 2008
@@ -2972,6 +2972,7 @@
 												Rectangle aEmpty;
 												aShapeHd.SeekToBegOfRecord( rStCtrl );
 												sal_Int32 nShapeId;
+												aProcessData.pTableRowProperties = NULL;
 												SdrObject* pObj = ImportObj( rStCtrl, (void*)&aProcessData, aEmpty, aEmpty, 0, &nShapeId );
 												if ( pObj )
 												{
@@ -7239,7 +7240,7 @@
 			nPosition |= aPt1.Y() < aPt2.Y() ? LinePositionBLTR : LinePositionTLBR;
 
 		std::set< sal_Int32 >::const_iterator aRow( rRows.find( aPt1.Y() < aPt2.Y() ? aPt1.Y() : aPt2.Y() ) );
-		std::set< sal_Int32 >::const_iterator aColumn( rRows.find( aPt1.X() < aPt2.X() ? aPt1.X() : aPt2.X() ) );
+		std::set< sal_Int32 >::const_iterator aColumn( rColumns.find( aPt1.X() < aPt2.X() ? aPt1.X() : aPt2.X() ) );
 		if ( ( aRow != rRows.end() ) && ( aColumn != rColumns.end() ) )
 		{
 			nPosition |= ( std::distance( rRows.begin(), aRow ) * rColumns.size() ) + std::distance( rColumns.begin(), aColumn );
@@ -7499,7 +7500,7 @@
 				}
 			}
 			::sdr::table::SdrTableObj* pTable = new ::sdr::table::SdrTableObj( pSdrModel );
-			pTable->SetSnapRect( pGroup->GetSnapRect() );
+			pTable->uno_lock();
 			Reference< XTable > xTable( pTable->getTable() );
 			try
 			{
@@ -7565,11 +7566,14 @@
 						}
 					}
 				}
-				SdrObject::Free( pGroup );
+				pTable->uno_unlock();
+				pTable->SetSnapRect( pGroup->GetSnapRect() );
 				pRet = pTable;
+				SdrObject::Free( pGroup );
 			}
 			catch( Exception& )
 			{
+				pTable->uno_unlock();
 				SdrObject* pObj = pTable;
 				SdrObject::Free( pObj );
 			}
Index: graphics/svx/source/table/tablerow.cxx
diff -u graphics/svx/source/table/tablerow.cxx:1.3 graphics/svx/source/table/tablerow.cxx:1.3.252.1
--- graphics/svx/source/table/tablerow.cxx:1.3	Thu Apr 10 20:32:04 2008
+++ graphics/svx/source/table/tablerow.cxx	Mon Sep 29 07:47:49 2008
@@ -129,36 +129,15 @@
 	throwIfDisposed();
 	if( nCount )
 	{
-		if( nIndex < static_cast< sal_Int32 >( maCells.size() ) )
-		{
-			CellVector::iterator aIter( maCells.begin() );
-			while( nIndex-- )
-				aIter++;
-			while( nCount-- )
-			{
-				CellRef xCell;
-				if( pIter )
-					xCell = (*(*pIter)++);
-				else
-					xCell = mxTableModel->createCell();
-				
-				maCells.insert( aIter, xCell );
-			}
-		}
+		if( nIndex >= static_cast< sal_Int32 >( maCells.size() ) )
+			nIndex = static_cast< sal_Int32 >( maCells.size() );
+		if ( pIter )
+			maCells.insert( maCells.begin() + nIndex, *pIter, (*pIter) + nCount );
 		else
 		{
-			nIndex = static_cast< sal_Int32 >( maCells.size() );
-			maCells.resize( nIndex + nCount );
-			while(nCount--)
-			{
-				CellRef xCell;
-				if( pIter )
-					xCell = (*(*pIter)++);
-				else
-					xCell = mxTableModel->createCell();
-			
-				maCells[nIndex++] = xCell;
-			}
+			maCells.reserve( maCells.size() + nCount );
+			for ( sal_Int32 i = 0; i < nCount; i++ )
+				maCells.insert( maCells.begin() + nIndex + i, mxTableModel->createCell() );
 		}
 	}
 }
Index: graphics/sd/source/core/drawdoc4.cxx
diff -u graphics/sd/source/core/drawdoc4.cxx:1.58 graphics/sd/source/core/drawdoc4.cxx:1.58.56.2
--- graphics/sd/source/core/drawdoc4.cxx:1.58	Mon Jul  7 06:31:53 2008
+++ graphics/sd/source/core/drawdoc4.cxx	Wed Oct 29 03:31:32 2008
@@ -1012,11 +1012,19 @@
 			if (mbHasOnlineSpellErrors)
 			{
 				sd::ModifyGuard aGuard( this );
-
-				// Text aus Outliner holen
+				SdrModel* pModel = pObj->GetModel();
+				sal_Bool bLock = sal_False;
+				if ( pModel )
+				{
+					bLock = pModel->isLocked();
+					pModel->setLock( sal_True );
+				}
+				// taking text from the outliner
 				((SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() );
 
 				pObj->BroadcastObjectChange();
+				if ( pModel )
+					pModel->setLock( bLock );
 			}
 		}
 
Index: graphics/sd/source/filter/xml/sdtransform.cxx
diff -u graphics/sd/source/filter/xml/sdtransform.cxx:1.3.2.1 graphics/sd/source/filter/xml/sdtransform.cxx:1.3.2.1.12.2
--- graphics/sd/source/filter/xml/sdtransform.cxx:1.3.2.1	Fri Aug 15 06:03:34 2008
+++ graphics/sd/source/filter/xml/sdtransform.cxx	Mon Sep 22 09:45:35 2008
@@ -199,7 +199,6 @@
 
 void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape )
 {
-	const SfxItemSet& rSet = rTextShape.GetMergedItemSet();
 /*
 	if( (rSet.GetItemState( EE_PARA_LRSPACE ) == SFX_ITEM_SET) && (rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_SET) )
 	{
@@ -209,12 +208,6 @@
 		rTextShape.SetMergedItem( aItem );
 	}
 */
-    if( rSet.GetItemState( SDRATTR_TEXT_WORDWRAP ) == SFX_ITEM_SET )
-    {
-		SdrTextWordWrapItem aItem( *static_cast<const SdrTextWordWrapItem*>(rSet.GetItem( SDRATTR_TEXT_WORDWRAP )) );
-		aItem.SetValue( !aItem.GetValue() );
-		rTextShape.SetMergedItem( aItem );
-    }
 
 	if(!rTextShape.IsEmptyPresObj())
 	{
@@ -337,15 +330,6 @@
 		    bRet = true;
         }
 	}
-
-    if( rSet.GetItemState( SDRATTR_TEXT_WORDWRAP ) == SFX_ITEM_SET )
-    {
-		SdrTextWordWrapItem aItem( *static_cast<const SdrTextWordWrapItem*>(rSet.GetItem( SDRATTR_TEXT_WORDWRAP )) );
-		aItem.SetValue( !aItem.GetValue() );
-		rSet.Put( aItem );
-        bRet = true;
-    }
-
 	return bRet;
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1696
retrieving revision 1.1697
diff -u -r1.1696 -r1.1697
--- openoffice.org.spec	1 Dec 2008 23:01:52 -0000	1.1696
+++ openoffice.org.spec	2 Dec 2008 23:02:59 -0000	1.1697
@@ -132,6 +132,7 @@
 Patch59: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
 Patch60: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
 Patch61: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch62: workspace.impress161.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1388,6 +1389,7 @@
 %patch59 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
 %patch60 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
 %patch61 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch62 -p1 -b .workspace.impress161.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3754,7 +3756,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Dec 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Wed Dec 02 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
@@ -3763,6 +3765,7 @@
 - Resolves: ooo#96279 mediawiki proxies problem
 - add openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
 - Resolves: rhbz#474058 messy patch
+- add workspace.impress161.patch
 
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred

More information about the fedora-extras-commits mailing list