Commits

Anonymous committed df5cde7

CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells

Comments (0)

Files changed (8)

sd/source/ui/dlg/prltempl.cxx

 			AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
 			AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
     		AddTabPage( RID_SVXPAGE_TEXTATTR );
+            AddTabPage( RID_SVXPAGE_PICK_BULLET );
+            AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
+            AddTabPage( RID_SVXPAGE_PICK_BMP );
+            AddTabPage( RID_SVXPAGE_NUM_OPTIONS );	
     		AddTabPage( RID_SVXPAGE_TABULATOR );
 		}
 		break;

sd/source/ui/dlg/prltempl.src

 				Identifier = RID_SVXPAGE_TEXTATTR ;
 				PageResID = RID_SVXPAGE_TEXTATTR ;
 				Text [ en-US ] = "Text" ;
+			};
+			PageItem
+			{
+				Identifier = RID_SVXPAGE_PICK_BULLET ;
+				PageResID = RID_SVXPAGE_PICK_BULLET ;
+				Text [ en-US ] = "Bullets" ;
+			};
+			PageItem
+			{
+				Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
+				PageResID = RID_SVXPAGE_PICK_SINGLE_NUM ;
+				Text [ en-US ] = "Numbering type" ;
+			};
+			PageItem
+			{
+				Identifier = RID_SVXPAGE_PICK_BMP ;
+				PageResID = RID_SVXPAGE_PICK_BMP ;
+				Text [ en-US ] = "Graphics" ;
+			};
+			PageItem
+			{
+				Identifier = RID_SVXPAGE_NUM_OPTIONS ;
+				PageResID = RID_SVXPAGE_NUM_OPTIONS ;
+				Text [ en-US ] = "Customize" ;
 			};		
 			PageItem
 			{

svx/source/dialog/imapwnd.cxx

 
 	if ( pSdrObj )
 	{
-		SfxItemSet		aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG );
+		SfxItemSet		aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
 
 		SfxEventNamesItem aNamesItem(SID_EVENTCONFIG);
 		aNamesItem.AddEvent( String::CreateFromAscii( "MouseOver" ), String(), SFX_EVENT_MOUSEOVER_OBJECT );
 		aNamesItem.AddEvent( String::CreateFromAscii( "MouseOut" ), String(), SFX_EVENT_MOUSEOUT_OBJECT );
+		aSet.Put( aNamesItem );
 		
         SvxMacroItem    aMacroItem(SID_ATTR_MACROITEM);
 		IMapObject*		pIMapObj = GetIMapObj( pSdrObj );

svx/source/msfilter/msdffimp.cxx

 		nColorCode &= 0x00ffffff;
 
 	sal_uInt8 nUpper = (sal_uInt8)( nColorCode >> 24 );
-    if( nUpper & 0x19 )      // if( nUpper & 0x1f )
+    
+	// sj: below change from 0x1b to 0x19 was done because of i84812 (0x02 -> rgb color),
+	// now I have some problems to fix i104685 (there the color value is 0x02000000 whichs requires
+	// a 0x2 scheme color to be displayed properly), the color docu seems to be incomplete
+	if( nUpper & 0x19 )      // if( nUpper & 0x1f )
 	{
 		if( ( nUpper & 0x08 ) || ( ( nUpper & 0x10 ) == 0 ) )
 		{

svx/source/svdraw/svdfppt.cxx

 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <svx/writingmodeitem.hxx>
 #include <vcl/print.hxx>
 #include <svx/svxfont.hxx>
 	nHardCount += pParaObj->GetAttrib( PPT_ParaAttr_BulletOfs, nBulletOfs, nDestinationInstance );
 
 	if ( nIsBullet )
-	{
 		rNumberFormat.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
 
-		UINT32 nFontHeight = 24;
-		PPTPortionObj* pPtr = pParaObj->First();
-		if ( pPtr )
-			pPtr->GetAttrib( PPT_CharAttr_FontHeight, nFontHeight, nDestinationInstance );
+	UINT32 nFontHeight = 24;
+	PPTPortionObj* pPtr = pParaObj->First();
+	if ( pPtr )
+		pPtr->GetAttrib( PPT_CharAttr_FontHeight, nFontHeight, nDestinationInstance );
+	if ( nIsBullet )
 		nHardCount += ImplGetExtNumberFormat( rManager, rNumberFormat, pParaObj->pParaSet->mnDepth,
 													pParaObj->mnInstance, nDestinationInstance, rStartNumbering, nFontHeight, pParaObj );
 
-		if ( rNumberFormat.GetNumberingType() != SVX_NUM_BITMAP )
-			pParaObj->UpdateBulletRelSize( nBulletHeight );
-		if ( nHardCount )
-			ImplGetNumberFormat( rManager, rNumberFormat, pParaObj->pParaSet->mnDepth );
-	}
+	if ( rNumberFormat.GetNumberingType() != SVX_NUM_BITMAP )
+		pParaObj->UpdateBulletRelSize( nBulletHeight );
+	if ( nHardCount )
+		ImplGetNumberFormat( rManager, rNumberFormat, pParaObj->pParaSet->mnDepth );
 
 	if ( nHardCount )
 	{
 			case SVX_NUM_CHARS_UPPER_LETTER_N :
 			case SVX_NUM_CHARS_LOWER_LETTER_N :
 			{
-				PPTPortionObj* pPtr = pParaObj->First();
 				if ( pPtr )
 				{
 					sal_uInt32 nFont;
 					if ( nRetValue != nTmp )
 						bIsHardAttribute = 1;
 				}
-				if ( nRetValue && ( nDestinationInstance == TSS_TYPE_TEXT_IN_SHAPE ) )
-				{
-					nRetValue = 0;			// no inheritance for standard textobjects
-					bIsHardAttribute = 1;	// this attribute must be hard formatted
-				}
 			}
 			break;
 			case PPT_CharAttr_Font :
 				if ( pRule )
 				{
 					pRule->SetLevel( pParaSet->mnDepth, aNumberFormat );
-					if ( nDestinationInstance == 0xffffffff )
+					sal_uInt16 i, n;
+					for ( i = 0; i < pRule->GetLevelCount(); i++ )
 					{
-						sal_uInt16 i, n;
-						for ( i = 0; i < pRule->GetLevelCount(); i++ )
+						if ( i != pParaSet->mnDepth )
 						{
 							n = i > 4 ? 4 : i;
 
 							const PPTParaLevel& rParaLevel = mrStyleSheet.mpParaSheet[ nInstance ]->maParaLevel[ n ];
 							const PPTCharLevel& rCharLevel = mrStyleSheet.mpCharSheet[ nInstance ]->maCharLevel[ n ];
 							sal_uInt32 nColor;
-                            if ( rParaLevel.mnBuFlags & ( 1 << PPT_ParaAttr_BuHardColor ) )
-                                nColor = rParaLevel.mnBulletColor;
-                            else
-                                nColor = rCharLevel.mnFontColor;
+							if ( rParaLevel.mnBuFlags & ( 1 << PPT_ParaAttr_BuHardColor ) )
+								nColor = rParaLevel.mnBulletColor;
+							else
+								nColor = rCharLevel.mnFontColor;
 							aNumberFormat2.SetBulletColor( rManager.MSO_CLR_ToColor( nColor ) );
 							pRule->SetLevel( i, aNumberFormat2 );
 						}
 		xPropSet->setPropertyValue( sLeftBorder, Any( nLeftDist ) );
 		xPropSet->setPropertyValue( sBottomBorder, Any( nLowerDist ) );
 
+		static const rtl::OUString	sTextVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) );
+		const SdrTextVertAdjust eTextVertAdjust(((const SdrTextVertAdjustItem&)pObj->GetMergedItem(SDRATTR_TEXT_VERTADJUST)).GetValue());
+		drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP );
+		if ( eTextVertAdjust == SDRTEXTVERTADJUST_CENTER )
+			eVA = drawing::TextVerticalAdjust_CENTER;
+		else if ( eTextVertAdjust == SDRTEXTVERTADJUST_BOTTOM )
+			eVA = drawing::TextVerticalAdjust_BOTTOM;
+		xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
+
 		SfxItemSet aSet( pObj->GetMergedItemSet() );
 		XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue());
 		::com::sun::star::drawing::FillStyle eFS( com::sun::star::drawing::FillStyle_NONE );

xmloff/source/style/GradientStyle.cxx

 		case XML_TOK_GRADIENT_ANGLE:
 			{
 				sal_Int32 nValue;
-				SvXMLUnitConverter::convertNumber( nValue, rStrValue, 0, 360 );
+				SvXMLUnitConverter::convertNumber( nValue, rStrValue, 0, 3600 );
 				aGradient.Angle = sal_Int16( nValue );
 			}
 			break;

xmloff/source/style/HatchStyle.cxx

 			case XML_TOK_HATCH_ROTATION:
 				{
 					sal_Int32 nValue;
-					rUnitConverter.convertNumber( nValue, rStrValue, 0, 360 );
+					rUnitConverter.convertNumber( nValue, rStrValue, 0, 3600 );
 					aHatch.Angle = sal_Int16( nValue );
 				}
 				break;

xmloff/source/style/TransGradientStyle.cxx

 		case XML_TOK_GRADIENT_ANGLE:
 			{
 				sal_Int32 nValue;
-				SvXMLUnitConverter::convertNumber( nValue, rStrValue, 0, 360 );
+				SvXMLUnitConverter::convertNumber( nValue, rStrValue, 0, 3600 );
 				aGradient.Angle = sal_Int16( nValue );
 			}
 			break;