commit libreoffice-impress for openSUSE:Factory
Hello community, here is the log from the commit of package libreoffice-impress for openSUSE:Factory checked in at Fri Jan 7 12:11:31 CET 2011. -------- --- libreoffice-impress/libreoffice-impress.changes 2010-12-01 20:45:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-impress/libreoffice-impress.changes 2010-12-21 19:56:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-impress-3.3.0.1.tar.bz2 New: ---- libreoffice-impress-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-impress.spec ++++++ --- /var/tmp/diff_new_pack.uRpU3D/_old 2011-01-07 12:11:10.000000000 +0100 +++ /var/tmp/diff_new_pack.uRpU3D/_new 2011-01-07 12:11:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-impress (Version 3.3.0.1) +# spec file for package libreoffice-impress (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-impress -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece impress -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-impress-3.3.0.1.tar.bz2 -> libreoffice-impress-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/ChangeLog new/libreoffice-impress-3.3.0.2/ChangeLog --- old/libreoffice-impress-3.3.0.1/ChangeLog 2010-12-01 16:32:19.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/ChangeLog 2010-12-18 20:52:21.000000000 +0100 @@ -1,3 +1,50 @@ +2010-12-18 Petr Mladek <pmladek@suse.cz> [3c9f9794be7290a5e3e9c9ce05dfa1820481a39e] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + +2010-12-15 Thorsten Behrens <tbehrens@novell.com> [7074930f8c7ea96345120eee9b66d83849546570] + +This surely shouldn't need executable flag + + +2010-12-15 Christian Lippka ORACLE <christian.lippka@oracle.com> [b0be7f2318e1043f0d3c6ebfc3c264040b009c98] + +impress207: #i115993# do not insert objects as presentation objects on master pages(cherry picked from commit 056b298538918df97390c645a1a0fb690a89468e) + + +2010-12-15 Christian Lippka ORACLE <christian.lippka@oracle.com> [1bcfdb91f4a74eacc51d28c3ccc47f6842b5dad7] + +impress206: #i115898# use updated anchor for group shapes to work around ms office 2010 bug(cherry picked from commit 7736d7e159d0e69ee817def98fefdb216f711ca3) + + +2010-12-15 Christian Lippka ORACLE <christian.lippka@oracle.com> [9252273081649088bb72b1b4b1e82a45021ee3a8] + +impress206: #i115898# take into account new presentation shapes(cherry picked from commit c8c648474da56e2ecdbdcc11c269366716fe88c9) + + +2010-12-15 Christian Lippka <christian.lippka@oracle.com> [8f62cd85de50a5023a6065455677971193f0e699] + +impress206: fixed compiler warning(cherry picked from commit 8df4a00b9bc1739289e45d9f4485f355298a35eb) + + +2010-12-13 camille <camille.moulin@free.fr> [ea09dfb1e2f59f2bb78901342bd1475fc3d99355] + +Grey as default color for native tables in Impress + +Default color for native tables in Impress is blue. Most people I +heard from are unhappy with it, because it doesn't match the +corporate colors, and it's not neutral. To make it worse, if you +change the color of the whole table (to white for instance) and +insert a new line, it's blue again because it doesn't inherit +from the row above. The colors are hardcoded, and, AFAIKT, can't +be overriden by a configuration extension. IBM's Symphony has +changed this default to white with black borders, which confirms +my impression that there is a problem indeed with blue by +default. + +Signed-off-by: Thorsten Behrens <tbehrens@novell.com> + 2010-12-01 Petr Mladek <pmladek@suse.cz> [bf86cb573d06dfb1f50e942a73fbe47744300d47] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/core/drawdoc4.cxx new/libreoffice-impress-3.3.0.2/sd/source/core/drawdoc4.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/core/drawdoc4.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/core/drawdoc4.cxx 2010-12-14 17:01:30.000000000 +0100 @@ -662,11 +662,11 @@ // ---- default -------------------------------------------------- - Any aBlue1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue1") ), aDefaultCellStyleName, RGB_COLORDATA(153,204,255))); - Any aBlue2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue2") ), aDefaultCellStyleName, RGB_COLORDATA(0,153,255))); - Any aBlue3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue3") ), aDefaultCellStyleName, RGB_COLORDATA(0,102,204))); + Any aGray1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray1") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,230))); + Any aGray2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray2") ), aDefaultCellStyleName, RGB_COLORDATA(204,204,204))); + Any aGray3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray3") ), aDefaultCellStyleName, RGB_COLORDATA(179,179,179))); - implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("default")), aBlue1, aBlue3, aBlue2 ); + implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("default") ), aGray1, aGray3, aGray2 ); // ---- BW ------------------------------------------------ @@ -694,11 +694,11 @@ // ---- Gray ------------------------------------------------ - Any aGray1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray1") ), aDefaultCellStyleName, RGB_COLORDATA(230,230,230))); - Any aGray2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray2") ), aDefaultCellStyleName, RGB_COLORDATA(204,204,204))); - Any aGray3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("gray3") ), aDefaultCellStyleName, RGB_COLORDATA(179,179,179))); + Any aBlue1( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue1") ), aDefaultCellStyleName, RGB_COLORDATA(153,204,255))); + Any aBlue2( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue2") ), aDefaultCellStyleName, RGB_COLORDATA(0,153,255))); + Any aBlue3( implMakeSolidCellStyle( pSSPool, OUString( RTL_CONSTASCII_USTRINGPARAM("blue3") ), aDefaultCellStyleName, RGB_COLORDATA(0,102,204))); - implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("gray") ), aGray1, aGray3, aGray2 ); + implCreateTableTemplate( xTableFamily, OUString(RTL_CONSTASCII_USTRINGPARAM("blue")), aBlue1, aBlue3, aBlue2 ); // ---- Sun ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/epptso.cxx new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/epptso.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/epptso.cxx 2010-11-16 20:30:15.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/epptso.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -3063,7 +3063,7 @@ continue; } else if ( ( mType == "drawing.OLE2" ) || ( mType == "presentation.OLE2" ) - || ( mType == "presentation.Chart" ) || ( mType == "presentation.Table" ) + || ( mType == "presentation.Chart" ) || ( mType == "presentation.Calc" ) || ( mType == "presentation.OrgChart" ) ) { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -3253,7 +3253,7 @@ } } } - else if ( mType == "drawing.Table" ) + else if ( (mType == "drawing.Table") || (mType == "presentation.Table") ) { SvMemoryStream* pTmp = NULL; if ( bEffect && !mbUseNewAnimations ) @@ -3442,7 +3442,10 @@ ImplFlipBoundingBox( aPropOpt ); aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); - mpPptEscherEx->AddClientAnchor( maRect ); + if ( GetCurrentGroupLevel() > 0 ) + mpPptEscherEx->AddChildAnchor( maRect ); + else + mpPptEscherEx->AddClientAnchor( maRect ); if ( pClientData ) { @@ -3512,7 +3515,10 @@ aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); - mpPptEscherEx->AddClientAnchor( maRect ); + if ( GetCurrentGroupLevel() > 0 ) + mpPptEscherEx->AddChildAnchor( maRect ); + else + mpPptEscherEx->AddClientAnchor( maRect ); *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) << (sal_uInt32)pClientTextBox->Tell(); @@ -3659,11 +3665,10 @@ aPropOpt.CreateShapeProperties( rXShape ); aPropOpt.Commit( *mpStrm ); aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp ); - mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - *mpStrm << (sal_Int16)maRect.Top() - << (sal_Int16)maRect.Left() - << (sal_Int16)( maRect.GetWidth() + maRect.Left() ) - << (sal_Int16)( maRect.GetHeight() + maRect.Top() ); + if ( GetCurrentGroupLevel() > 0 ) + mpPptEscherEx->AddChildAnchor( maRect ); + else + mpPptEscherEx->AddClientAnchor( maRect ); mpPptEscherEx->CloseContainer(); uno::Reference< table::XCellRange > xCellRange( xTable, uno::UNO_QUERY_THROW ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/escherex.cxx new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/escherex.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/filter/eppt/escherex.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/filter/eppt/escherex.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -269,9 +269,21 @@ else { AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | HaveAnchor - AddAtom( 8, ESCHER_ClientAnchor ); - PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom(); + if ( mnGroupLevel == 1 ) + { + AddAtom( 8, ESCHER_ClientAnchor ); + PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); + *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom(); + } + else + { + AddAtom( 16, ESCHER_ChildAnchor ); + PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); + *mpOutStrm << (sal_Int32)aRect.Left() + << (sal_Int32)aRect.Top() + << (sal_Int32)aRect.Right() + << (sal_Int32)aRect.Bottom(); + } } if ( pClientData ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/filter/ppt/propread.cxx new/libreoffice-impress-3.3.0.2/sd/source/filter/ppt/propread.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/filter/ppt/propread.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/filter/ppt/propread.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -100,7 +100,7 @@ if (nSize > STRING_MAXLEN) nSize = STRING_MAXLEN; - return nSize; + return static_cast< xub_StrLen >( nSize ); } BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview4.cxx new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview4.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview4.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview4.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -100,6 +100,7 @@ SdrGrafObj* pNewGrafObj = NULL; SdrPageView* pPV = GetSdrPageView(); SdrObject* pPickObj = pObj; + const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage(); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView)) { @@ -116,7 +117,7 @@ if( mnAction == DND_ACTION_LINK && pPickObj && pPV ) { const bool bIsGraphic = pPickObj->ISA( SdrGrafObj ); - if( bIsGraphic || pObj->IsEmptyPresObj() ) + if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) ) { if( IsUndoEnabled() ) BegUndo(String(SdResId(STR_INSERTGRAPHIC))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview5.cxx new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview5.cxx --- old/libreoffice-impress-3.3.0.1/sd/source/ui/view/sdview5.cxx 2010-11-11 16:20:26.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/sd/source/ui/view/sdview5.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -61,7 +61,7 @@ if( pPV ) { SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() ); - if( pPage ) + if( pPage && !pPage->IsMasterPage() ) { // first try selected shape if ( AreObjectsMarked() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.3.0.1/slideshow/source/engine/shapes/shapeimporter.cxx new/libreoffice-impress-3.3.0.2/slideshow/source/engine/shapes/shapeimporter.cxx --- old/libreoffice-impress-3.3.0.1/slideshow/source/engine/shapes/shapeimporter.cxx 2010-11-11 20:08:58.000000000 +0100 +++ new/libreoffice-impress-3.3.0.2/slideshow/source/engine/shapes/shapeimporter.cxx 2010-12-15 12:27:24.000000000 +0100 @@ -286,7 +286,9 @@ rtl::OUString const& shapeType ) const { if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") )) + RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ) || + shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape") ) ) { // Media shape (video etc.). This is a special object return createMediaShape(xCurrShape, @@ -338,7 +340,9 @@ mrContext ); } else if( shapeType.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") )) + RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ) || + shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape") ) ) { // #i46224# Mark OLE shapes as foreign content - scan them for // unsupported actions, and fallback to bitmap, if necessary @@ -350,7 +354,10 @@ } else if( shapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( - "com.sun.star.drawing.GraphicObjectShape") )) + "com.sun.star.drawing.GraphicObjectShape") ) || + shapeType.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( + "com.sun.star.presentation.GraphicObjectShape") ) ) { GraphicObject aGraphicObject; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de