openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1412154 [2/3] - in /incubator/ooo/branches/alg/aw080/main: filter/inc/filter/msfilter/ filter/source/msfilter/ offapi/com/sun/star/drawing/ oox/inc/oox/drawingml/ oox/source/drawingml/ oox/source/export/ oox/source/token/ sd/source/filter/...
Date Wed, 21 Nov 2012 15:42:29 GMT
Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.hxx?rev=1412154&r1=1412153&r2=1412154&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.hxx Wed Nov 21 15:42:23 2012
@@ -152,7 +152,7 @@ struct PHLayout
 
 struct SOParagraph
 {
-	sal_Bool				bExtendedParameters;
+	bool    				bExtendedParameters;
 	sal_uInt32				nParaFlags;
 	sal_Int16				nBulletFlags;
 	String					sPrefix;
@@ -170,10 +170,10 @@ struct SOParagraph
 	sal_Unicode				cBulletId;				// wenn Numbering Type == CharSpecial
 	::com::sun::star::awt::FontDescriptor		aFontDesc;
 
-	sal_Bool				bExtendedBulletsUsed;
+	bool    				bExtendedBulletsUsed;
 	sal_uInt16				nBulletId;
 	sal_uInt32				nMappedNumType;
-	sal_Bool				bNumberingIsNumber;
+	bool    				bNumberingIsNumber;
 
 	SOParagraph()
 	{
@@ -185,7 +185,7 @@ struct SOParagraph
 		nTextOfs = 0;
 		bExtendedBulletsUsed = false;
 		nBulletId = 0xffff;
-		bNumberingIsNumber = sal_True;
+		bNumberingIsNumber = true;
 	};
 };
 
@@ -221,7 +221,7 @@ struct FontCollectionEntry
 		sal_Int16				CharSet;
     
         String                  Original;
-        sal_Bool                bIsConverted;
+        bool                    bIsConverted;
 
 		FontCollectionEntry( const String& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) :
                             Scaling ( 1.0 ),
@@ -320,14 +320,14 @@ struct PPTExCharSheet
 
 				void	SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
 										FontCollection& rFontCollection, int nLevel );
-				void	Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, 
+				void	Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, bool bFirst, bool bSimpleText, 
                             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
 
 };
 
 struct PPTExParaLevel
 {
-	sal_Bool	    mbIsBullet;
+	bool    	    mbIsBullet;
 	sal_uInt16		mnBulletChar;
 	sal_uInt16		mnBulletFont;
 	sal_uInt16		mnBulletHeight;
@@ -341,7 +341,7 @@ struct PPTExParaLevel
 	sal_uInt16		mnBulletOfs;
 	sal_uInt16		mnDefaultTab;
 
-	sal_Bool		mbExtendedBulletsUsed;
+	bool    		mbExtendedBulletsUsed;
 	sal_uInt16		mnBulletId;
 	sal_uInt16		mnBulletStart;
 	sal_uInt32		mnMappedNumType;
@@ -361,7 +361,7 @@ struct PPTExParaSheet
 
 				void	SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
 										FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel );
-				void	Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
+				void	Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, bool bFirst, bool bSimpleText,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
 };
 
@@ -381,7 +381,7 @@ class PPTExStyleSheet
 
 				void			SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
 												FontCollection& rFontCollection, int nInstance, int nLevel );
-				sal_Bool		IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
+				bool    		IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
 
 				sal_uInt32		SizeOfTxCFStyleAtom() const;
 				void			WriteTxCFStyleAtom( SvStream& rSt );
@@ -476,8 +476,8 @@ class GroupTable
 		sal_uInt32				GetGroupsClosed();
 		void					ResetGroupTable( sal_uInt32 nCount );
 		void					ClearGroupTable();
-		sal_Bool                EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
-		sal_Bool				GetNextGroupEntry();
+		bool                    EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
+		bool    				GetNextGroupEntry();
 								GroupTable();
 								~GroupTable();
 };
@@ -492,17 +492,17 @@ class PropValue
 			< ::com::sun::star::beans::XPropertySet	>			mXPropSet;
 
         basegfx::B2DHomMatrix ImplGetObjectTransformation();
-		sal_Bool	ImplGetPropertyValue( const String& rString );
-		sal_Bool	ImplGetPropertyValue( const ::com::sun::star::uno::Reference
+		bool	ImplGetPropertyValue( const String& rString );
+		bool	ImplGetPropertyValue( const ::com::sun::star::uno::Reference
 						< ::com::sun::star::beans::XPropertySet > &, const String& );
 
 	public :
 
-		static sal_Bool GetPropertyValue(
+		static bool GetPropertyValue(
 				::com::sun::star::uno::Any& rAny,
 					const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
 						const String& rPropertyName,
-							sal_Bool bTestPropertyAvailability = sal_False );
+							bool bTestPropertyAvailability = false );
 
 		static ::com::sun::star::beans::PropertyState GetPropertyState(
 					const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &,
@@ -517,7 +517,7 @@ class PropStateValue : public PropValue
 		::com::sun::star::uno::Reference
 			< ::com::sun::star::beans::XPropertyState >			mXPropState;
 
-		sal_Bool	ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = sal_True );
+		bool	ImplGetPropertyValue( const String& rString, bool bGetPropertyState = true );
 
 };
 
@@ -536,7 +536,7 @@ class PortionObj : public PropStateValue
 		sal_uInt32		ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
 							const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
 		sal_uInt32		ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
-		void			ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = sal_False );
+		void			ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue = false );
 
 	public :
 
@@ -556,19 +556,19 @@ class PortionObj : public PropStateValue
 		sal_Int16		mnCharEscapement;
 
 		sal_uInt32		mnTextSize;
-		sal_Bool		mbLastPortion;
+		bool    		mbLastPortion;
 
 		sal_uInt16*		mpText;
 		FieldEntry*		mpFieldEntry;
 
 						PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
-										sal_Bool bLast, FontCollection& rFontCollection );
+										bool bLast, FontCollection& rFontCollection );
 						PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
 										FontCollection& rFontCollection );
 						PortionObj( const PortionObj& rPortionObj );
 						~PortionObj();
 
-		void			Write( SvStream* pStrm, sal_Bool bLast );
+		void			Write( SvStream* pStrm, bool bLast );
 		sal_uInt32		Count() const { return mnTextSize; };
 
 		PortionObj&		operator=( const PortionObj& rPortionObj );
@@ -576,10 +576,10 @@ class PortionObj : public PropStateValue
 
 struct ParaFlags
 {
-	sal_Bool	bFirstParagraph : 1;
-	sal_Bool	bLastParagraph	: 1;
+	bool	bFirstParagraph : 1;
+	bool	bLastParagraph	: 1;
 
-					ParaFlags() { bFirstParagraph = sal_True; bLastParagraph = sal_False; };
+					ParaFlags() { bFirstParagraph = true; bLastParagraph = false; };
 };
 
 class ParagraphObj : public List, public PropStateValue, public SOParagraph
@@ -592,8 +592,8 @@ class ParagraphObj : public List, public
 		void			ImplConstruct( const ParagraphObj& rParagraphObj );
 		void			ImplClear();
 		sal_uInt32		ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
-		void			ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False );
-		void			ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False );
+		void			ImplGetParagraphValues( PPTExBulletProvider& rBuProv, bool bGetPropStateValue = false );
+		void			ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, bool bIsBullet, bool bGetPropStateValue = false );
 
 	public :
 
@@ -601,9 +601,9 @@ class ParagraphObj : public List, public
 
 		sal_uInt32			mnTextSize;
 
-		sal_Bool			mbIsBullet;
-		sal_Bool			mbFirstParagraph;
-		sal_Bool			mbLastParagraph;
+		bool		    	mbIsBullet;
+		bool	    		mbFirstParagraph;
+		bool    			mbLastParagraph;
 
 		::com::sun::star::beans::PropertyState	meBullet;
 		::com::sun::star::beans::PropertyState	meTextAdjust;
@@ -618,8 +618,8 @@ class ParagraphObj : public List, public
 		sal_Int16								mnLineSpacing;
 		sal_Int16								mnLineSpacingTop;
 		sal_Int16								mnLineSpacingBottom;
-        sal_Bool								mbForbiddenRules;
-        sal_Bool								mbParagraphPunctation;
+        bool	    							mbForbiddenRules;
+        bool    								mbParagraphPunctation;
 		sal_uInt16								mnBiDi;
 
 						ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef,
@@ -644,8 +644,8 @@ struct ImplTextObj
 	sal_uInt32		mnTextSize;
 	int				mnInstance;
 	List*			mpList;
-	sal_Bool		mbHasExtendedBullets;
-	sal_Bool		mbFixedCellHeightUsed;
+	bool	    	mbHasExtendedBullets;
+	bool    		mbFixedCellHeightUsed;
 
 					ImplTextObj( int nInstance );
 					~ImplTextObj();
@@ -668,7 +668,7 @@ class TextObj
 		ParagraphObj*	Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); };
 		sal_uInt32		Count() const { return mpImplTextObj->mnTextSize; };
 		int				GetInstance() const { return mpImplTextObj->mnInstance; };
-		sal_Bool		HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
+		bool    		HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
 		void			WriteTextSpecInfo( SvStream* pStrm );
 
 		TextObj&		operator=( TextObj& rTextObj );
@@ -678,24 +678,19 @@ class TextObj
 struct CellBorder;
 class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvider
 {
-		sal_Bool						mbStatus;
-		sal_Bool						mbUseNewAnimations;
 		sal_uInt32						mnStatMaxValue;
 		sal_uInt32						mnLatestStatValue;
 		std::vector< PPTExStyleSheet* >	maStyleSheetList;
 		PPTExStyleSheet*				mpStyleSheet;
-
         double                          mfMap100thMmToMs;
         basegfx::B2DHomMatrix           maMap100thMmToMs;
         basegfx::B2DHomMatrix           maInvMap100thMmToMs;
-
 		basegfx::B2DVector              maDestPageSize;
         Size                            maPageSize; // #121183# Keep size in logic coordinates (100th mm)
 		basegfx::B2DVector              maNotesPageSize;
 		PageType						meLatestPageType;
 		List							maSlideNameList;
 		rtl::OUString					maBaseURI;
-
 		::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >					mXModel;
 		::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >		mXStatusIndicator;
 		::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier >	mXDrawPagesSupplier;
@@ -713,54 +708,51 @@ class PPTWriter : public GroupTable, pub
 		::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField >				mXTextField;
 		
         // the object range, split in pos and scale to keep the evtl. negative size (mirroring)
-        basegfx::B2DRange   maObjectRange;
+        basegfx::B2DRange               maObjectRange;
 //        basegfx::B2DRange               maObjectRange; // TTTT mirrored needed here ?!?
+        sal_uInt32                      mnMirrorFlags;
 //        bool                            mbMirroredX;
 //        bool                            mbMirroredY;
         double                          mfObjectRotation;
 		
-        ByteString			mType;
-		sal_Bool			mbPresObj;
-		sal_Bool			mbEmptyPresObj;
-		sal_Bool			mbStatusIndicator;
-		sal_uInt32			mnTextStyle;
+        ByteString			            mType;
+		sal_uInt32			            mnTextStyle;
+		sal_uInt32			            mnTextSize;
+		SvStorageRef		            mrStg;
+		SvStream*			            mpCurUserStrm;
+		SvStream*			            mpStrm;
+		SvStream*			            mpPicStrm;
+		PptEscherEx*		            mpPptEscherEx;
+		List				            maExOleObj;
+		sal_uInt32			            mnVBAOleOfs;
+		SvMemoryStream*		            mpVBA;
+		sal_uInt32			            mnExEmbed;
+		SvMemoryStream*		            mpExEmbed;
+		sal_uInt32			            mnPages;			// anzahl einzelner Slides ( ohne masterpages & notes & handout )
+		sal_uInt32			            mnMasterPages;		//
+		sal_uInt32			            mnDrawings;			// anzahl Slides +  masterpages + notes +  handout
+		sal_uInt32			            mnPagesWritten;
+		sal_uInt32			            mnUniqueSlideIdentifier;
+		sal_uInt32			            mnTxId;				// Identifier determined by the HOST (PP) ????
+		sal_uInt32			            mnDiaMode;			// 0 -> manuell
+							            					// 1 -> halbautomatisch
+							            					// 2 -> automatisch
+		sal_uInt32			            mnShapeMasterTitle;
+		sal_uInt32			            mnShapeMasterBody;
+		List				            maHyperlink;
+		FontCollection			        maFontCollection;
+		ppt::ExSoundCollection	        maSoundCollection;
+
+        /// bitfield
+		bool                            mbStatus : 1;
+		bool                            mbUseNewAnimations : 1;
+		bool                            mbPresObj : 1;
+		bool                            mbEmptyPresObj : 1;
+		bool                            mbStatusIndicator : 1;
+		bool                            mbFontIndependentLineSpacing : 1;
 
-		sal_Bool			mbFontIndependentLineSpacing;
-		sal_uInt32			mnTextSize;
-
-		SvStorageRef		mrStg;
-		SvStream*			mpCurUserStrm;
-		SvStream*			mpStrm;
-		SvStream*			mpPicStrm;
-		PptEscherEx*		mpPptEscherEx;
-
-		List				maExOleObj;
-		sal_uInt32			mnVBAOleOfs;
-		SvMemoryStream*		mpVBA;
-		sal_uInt32			mnExEmbed;
-		SvMemoryStream*		mpExEmbed;
-
-		sal_uInt32			mnPages;			// anzahl einzelner Slides ( ohne masterpages & notes & handout )
-		sal_uInt32			mnMasterPages;		//
-		sal_uInt32			mnDrawings;			// anzahl Slides +  masterpages + notes +  handout
-		sal_uInt32			mnPagesWritten;
-		sal_uInt32			mnUniqueSlideIdentifier;
-		sal_uInt32			mnTxId;				// Identifier determined by the HOST (PP) ????
-		sal_uInt32			mnDiaMode;			// 0 -> manuell
-												// 1 -> halbautomatisch
-												// 2 -> automatisch
-
-		sal_uInt32			mnShapeMasterTitle;
-		sal_uInt32			mnShapeMasterBody;
-
-		List				maHyperlink;
-
-		FontCollection			maFontCollection;
-		ppt::ExSoundCollection	maSoundCollection;
-	
 		PHLayout&			ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const;
 		void				ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ); 
-		
 
 		sal_uInt32			ImplProgBinaryTag( SvStream* pOutStrm = NULL );
 		sal_uInt32			ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
@@ -776,71 +768,71 @@ class PPTWriter : public GroupTable, pub
 
 	protected:
 
-		sal_Bool			ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags );
-		sal_Bool			ImplCreateCurrentUserStream();
+		bool    			ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags );
+		bool    			ImplCreateCurrentUserStream();
 		void				ImplCreateHeaderFooterStrings( SvStream& rOut,
 								::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
 		void				ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
-		sal_Bool			ImplCreateDocument();
-		sal_Bool			ImplCreateHyperBlob( SvMemoryStream& rStream );
+		bool    			ImplCreateDocument();
+		bool    			ImplCreateHyperBlob( SvMemoryStream& rStream );
 		sal_uInt32			ImplInsertBookmarkURL( const String& rBookmark, const sal_uInt32 nType,
 			const String& rStringVer0, const String& rStringVer1, const String& rStringVer2, const String& rStringVer3 );
-		sal_Bool			ImplCreateMaster( sal_uInt32 nPageNum );
-		sal_Bool			ImplCreateMainNotes();
-		sal_Bool			ImplCreateSlide( sal_uInt32 nPageNum );
-		sal_Bool			ImplCreateNotes( sal_uInt32 nPageNum );
+		bool    			ImplCreateMaster( sal_uInt32 nPageNum );
+		bool    			ImplCreateMainNotes();
+		bool    			ImplCreateSlide( sal_uInt32 nPageNum );
+		bool    			ImplCreateNotes( sal_uInt32 nPageNum );
 		void				ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet );
 		void				ImplWriteVBA( SvMemoryStream* pVBA );
 		void				ImplWriteOLE( sal_uInt32 nCnvrtFlags );
-		sal_Bool			ImplWriteAtomEnding();
+		bool    			ImplWriteAtomEnding();
 
-		sal_Bool			ImplInitSOIface();
-		sal_Bool			ImplSetCurrentStyleSheet( sal_uInt32 nPageNum );
-		sal_Bool			ImplGetPageByIndex( sal_uInt32 nIndex, PageType );
-		sal_Bool			ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = sal_False );
+		bool    			ImplInitSOIface();
+		bool    			ImplSetCurrentStyleSheet( sal_uInt32 nPageNum );
+		bool    			ImplGetPageByIndex( sal_uInt32 nIndex, PageType );
+		bool    			ImplGetShapeByIndex( sal_uInt32 nIndex, bool bGroup = false );
 		sal_uInt32			ImplGetMasterIndex( PageType ePageType );
 		void				ImplHandleRotation( EscherPropertyContainer& rPropOpt );
-		sal_Bool			ImplGetText();
-		sal_Bool			ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType,
+		bool    			ImplGetText();
+		bool    			ImplCreatePresentationPlaceholder( const bool bMaster, const PageType PageType,
 								const sal_uInt32 StyleInstance, const sal_uInt8 PlaceHolderId );
-		sal_Bool			ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+		bool    			ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
 								::com::sun::star::presentation::AnimationEffect& eEffect,
 								::com::sun::star::presentation::AnimationEffect& eTextEffect,
-								sal_Bool& bHasSound );								
+								bool& bHasSound );								
 		void				ImplWriteObjectEffect( SvStream& rSt,
 								::com::sun::star::presentation::AnimationEffect eEffect,
 								::com::sun::star::presentation::AnimationEffect eTextEffect,
 								sal_uInt16 nOrder );
-		void				ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction );
-		sal_Bool			ImplGetStyleSheets();
+		void				ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, bool bMediaClickAction );
+		bool    			ImplGetStyleSheets();
 		void				ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj );
 		void				ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj );
 		void				ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance,
 								TextRuleEntry* pTextRule, SvStream& rExtBu, EscherPropertyContainer* );
 		void				ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt );
 		void				ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& );
-		void				ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill );
+		void				ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, bool bFill );
 
 		void				ImplWritePage( const PHLayout& rLayout,
 												EscherSolverContainer& rSolver,
 													PageType ePageType,
-														sal_Bool bMaster,
+														bool bMaster,
 															int nPageNumber = 0 );
-		sal_Bool			ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
+		bool    			ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
 		void				ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
 								EscherPropertyContainer& aPropOpt );
 
-        sal_Bool							ImplCloseDocument();		// die font-, hyper-, Soundliste wird geschrieben ..
+        bool				ImplCloseDocument();		// die font-, hyper-, Soundliste wird geschrieben ..
 
 	public:
-								PPTWriter( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef& rSvStorage,
-											::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
-											::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd,
-												SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags );
+							PPTWriter( const std::vector< com::sun::star::beans::PropertyValue >&, SvStorageRef& rSvStorage,
+										::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
+										::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd,
+											SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags );
 
-								~PPTWriter();
+							~PPTWriter();
 
-		sal_Bool				IsValid() const { return mbStatus; };
+		bool				IsValid() const { return mbStatus; };
 };
 
 

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx?rev=1412154&r1=1412153&r2=1412154&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx Wed Nov 21 15:42:23 2012
@@ -231,9 +231,9 @@ void GroupTable::ImplResizeGroupTable( s
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef )
+bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet(false);
     if ( rXIndexAccessRef.is() )
     {
         GroupEntry* pNewGroup = new GroupEntry( rXIndexAccessRef );
@@ -242,7 +242,7 @@ sal_Bool GroupTable::EnterGroup( ::com::
             if ( mnMaxGroupEntry == mnCurrentGroupEntry )
                 ImplResizeGroupTable( mnMaxGroupEntry + 8 );
             mpGroupEntry[ mnCurrentGroupEntry++ ] = pNewGroup;
-            bRet = sal_True;
+            bRet = true;
         }
         else
             delete pNewGroup;
@@ -277,21 +277,21 @@ void GroupTable::ResetGroupTable( sal_uI
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool GroupTable::GetNextGroupEntry()
+bool GroupTable::GetNextGroupEntry()
 {
     while ( mnCurrentGroupEntry )
     {
         mnIndex = mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCurrentPos++;
 
         if ( mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCount > mnIndex )
-            return sal_True;
+            return true;
 
         delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
 
         if ( mnCurrentGroupEntry )
             mnGroupsClosed++;
     }
-    return sal_False;
+    return false;
 }
 
 // ---------------------------------------------------------------------------------------------
@@ -308,12 +308,12 @@ void FontCollectionEntry::ImplInit( cons
     if ( aSubstName.Len() )
     {
         Name = aSubstName;
-        bIsConverted = sal_True;
+        bIsConverted = true;
     }
     else
     {
         Name = rName;
-        bIsConverted = sal_False;
+        bIsConverted = false;
     }
 }
 
@@ -696,7 +696,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmark
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplCloseDocument()
+bool PPTWriter::ImplCloseDocument()
 {
     sal_uInt32 nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Document );
     if ( nOfs )
@@ -710,12 +710,12 @@ sal_Bool PPTWriter::ImplCloseDocument()
 			EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other );
 			aTxMasterStyleAtomStrm << (sal_uInt16)5;		// paragraph count
 			sal_uInt16 nLev;
-			sal_Bool bFirst = sal_True;
+			bool bFirst(true);
 			for ( nLev = 0; nLev < 5; nLev++ )
 			{
-				mpStyleSheet->mpParaSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, sal_False, mXPagePropSet );
-				mpStyleSheet->mpCharSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, sal_False, mXPagePropSet );
-				bFirst = sal_False;
+				mpStyleSheet->mpParaSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, false, mXPagePropSet );
+				mpStyleSheet->mpCharSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, false, mXPagePropSet );
+				bFirst = false;
 			}
         }
 
@@ -849,24 +849,24 @@ sal_Bool PPTWriter::ImplCloseDocument()
         if ( nOldPos )
         {
             mpStrm->Seek( nOldPos );
-            return sal_True;
+            return true;
         }
     }
-    return sal_False;
+    return false;
 }
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PropValue::GetPropertyValue(
+bool PropValue::GetPropertyValue(
     ::com::sun::star::uno::Any& rAny,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
             const String& rString,
-                    sal_Bool bTestPropertyAvailability )
+                    bool bTestPropertyAvailability )
 {
-    sal_Bool bRetValue = sal_True;
+    bool bRetValue(true);
     if ( bTestPropertyAvailability )
     {
-        bRetValue = sal_False;
+        bRetValue = false;
         try
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
@@ -876,7 +876,7 @@ sal_Bool PropValue::GetPropertyValue(
         }
         catch( ::com::sun::star::uno::Exception& )
         {
-            bRetValue = sal_False;
+            bRetValue = false;
         }
     }
     if ( bRetValue )
@@ -885,11 +885,11 @@ sal_Bool PropValue::GetPropertyValue(
         {
             rAny = rXPropSet->getPropertyValue( rString );
             if ( !rAny.hasValue() )
-                bRetValue = sal_False;
+                bRetValue = false;
         }
         catch( ::com::sun::star::uno::Exception& )
         {
-            bRetValue = sal_False;
+            bRetValue = false;
         }
     }
     return bRetValue;
@@ -918,7 +918,7 @@ sal_Bool PropValue::GetPropertyValue(
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PropValue::ImplGetPropertyValue( const String& rString )
+bool PropValue::ImplGetPropertyValue( const String& rString )
 {
     return GetPropertyValue( mAny, mXPropSet, rString );
 }
@@ -941,28 +941,28 @@ basegfx::B2DHomMatrix PropValue::ImplGet
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const String& rString )
+bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const String& rString )
 {
     return GetPropertyValue( mAny, aXPropSet, rString );
 }
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState )
+bool PropStateValue::ImplGetPropertyValue( const String& rString, bool bGetPropertyState )
 {
     ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE;
-    sal_Bool bRetValue = sal_True;
+    bool bRetValue(true);
 #ifdef UNX
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
             aXPropSetInfo( mXPropSet->getPropertySetInfo() );
         if ( !aXPropSetInfo.is() )
-            return sal_False;
+            return false;
 #endif
     try
     {
         mAny = mXPropSet->getPropertyValue( rString );
         if ( !mAny.hasValue() )
-            bRetValue = sal_False;
+            bRetValue = false;
         else if ( bGetPropertyState )
             ePropState = mXPropState->getPropertyState( rString );
         else
@@ -970,16 +970,16 @@ sal_Bool PropStateValue::ImplGetProperty
     }
     catch( ::com::sun::star::uno::Exception& )
     {
-        bRetValue = sal_False;
+        bRetValue = false;
     }
     return bRetValue;
 }
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplInitSOIface()
+bool PPTWriter::ImplInitSOIface()
 {
-    while( sal_True )
+    while( true )
     {
         mXDrawPagesSupplier = ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::XDrawPagesSupplier >
@@ -1003,29 +1003,29 @@ sal_Bool PPTWriter::ImplInitSOIface()
         if ( !ImplGetPageByIndex( 0, NORMAL ) )
             break;
 
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplSetCurrentStyleSheet( sal_uInt32 nPageNum )
+bool PPTWriter::ImplSetCurrentStyleSheet( sal_uInt32 nPageNum )
 {
-	sal_Bool bRet = sal_False;
+	bool bRet = false;
 	if ( nPageNum >= maStyleSheetList.size() )
 		nPageNum = 0;
 	else
-		bRet = sal_True;
+		bRet = true;
 	mpStyleSheet = maStyleSheetList[ nPageNum ];
 	return bRet;
 }
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
+bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
 {
-    while( sal_True )
+    while( true )
     {
         if ( ePageType != meLatestPageType )
         {
@@ -1036,7 +1036,7 @@ sal_Bool PPTWriter::ImplGetPageByIndex( 
                 {
                     mXDrawPages = mXDrawPagesSupplier->getDrawPages();
                     if( !mXDrawPages.is() )
-                        return sal_False;
+                        return false;
                 }
                 break;
 
@@ -1044,7 +1044,7 @@ sal_Bool PPTWriter::ImplGetPageByIndex( 
                 {
                     mXDrawPages = mXMasterPagesSupplier->getMasterPages();
                     if( !mXDrawPages.is() )
-                        return sal_False;
+                        return false;
                 }
                 break;
 				default:
@@ -1079,7 +1079,7 @@ sal_Bool PPTWriter::ImplGetPageByIndex( 
 
 		/* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is
 		   taken the property from the master */
-		sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ), sal_True );
+		bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ), true );
 		if ( bHasBackground )
 			bHasBackground = ( aAny >>= mXBackgroundPropSet );
 		if ( !bHasBackground )
@@ -1097,7 +1097,7 @@ sal_Bool PPTWriter::ImplGetPageByIndex( 
 						( aXMasterDrawPage, ::com::sun::star::uno::UNO_QUERY );
 					if ( aXMasterPagePropSet.is() )
 					{
-						sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet,
+						bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet,
 								String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
 						if ( bBackground )
 						{
@@ -1107,18 +1107,18 @@ sal_Bool PPTWriter::ImplGetPageByIndex( 
 				}
 			}
 		}
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
+bool PPTWriter::ImplGetShapeByIndex( sal_uInt32 nIndex, bool bGroup )
 {
-    while(sal_True)
+    while(true)
     {
-        if (  ( bGroup == sal_False ) || ( GetCurrentGroupLevel() == 0 ) )
+        if (  ( bGroup == false ) || ( GetCurrentGroupLevel() == 0 ) )
         {
             ::com::sun::star::uno::Any aAny( mXShapes->getByIndex( nIndex ) );
             aAny >>= mXShape;
@@ -1148,10 +1148,24 @@ sal_Bool PPTWriter::ImplGetShapeByIndex(
                 aObjTrans.getRotate(),
                 maMap100thMmToMs * aObjTrans.getTranslate()));
 
-        // use translation and scale to create range
-        maObjectRange = basegfx::B2DRange(aObjTrans.getTranslate(), aObjTrans.getTranslate() + basegfx::absolute(aObjTrans.getScale()));
+        // Use translation and scale to create range.
+        // Do not use absolute value of scale, it is WANTED
+        // that the range is really covering the unrotated, unmirrored shape
+        maObjectRange = basegfx::B2DRange(
+            aObjTrans.getTranslate(), 
+            aObjTrans.getTranslate() + aObjTrans.getScale());
 
         // use scale to detect mirrorings
+        if(aObjTrans.getScale().getX() < 0.0)
+        {
+            mnMirrorFlags |= SHAPEFLAG_FLIPH;
+        }
+
+        if(aObjTrans.getScale().getY() < 0.0)
+        {
+            mnMirrorFlags |= SHAPEFLAG_FLIPV;
+        }
+
 //        mbMirroredX = aObjTrans.getScale().getX() < 0.0;
 //        mbMirroredY = aObjTrans.getScale().getY() < 0.0;
 
@@ -1186,14 +1200,22 @@ sal_Bool PPTWriter::ImplGetShapeByIndex(
 
         mbPresObj = mbEmptyPresObj = false;
         if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
-            mAny >>= mbPresObj;
+        {
+            sal_Bool bValue(sal_False);
+            mAny >>= bValue;
+            mbPresObj = bValue;
+        }
 
         if ( mbPresObj && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ) ) ) )
-            mAny >>= mbEmptyPresObj;
+        {
+            sal_Bool bValue(sal_False);
+            mAny >>= bValue;
+            mbEmptyPresObj = bValue;
+        }
 
-        return sal_True;
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 //  -----------------------------------------------------------------------
@@ -1229,10 +1251,10 @@ sal_uInt32 PPTWriter::ImplGetMasterIndex
 
 //  -----------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplGetStyleSheets()
+bool PPTWriter::ImplGetStyleSheets()
 {
     int             nInstance, nLevel;
-    sal_Bool        bRetValue = sal_False;
+    bool bRetValue(false);
 	sal_uInt32		nPageNum;
 
 	for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ )
@@ -1368,14 +1390,14 @@ sal_Bool PPTWriter::ImplGetStyleSheets()
 
 void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
 {
-    sal_Bool            bFirstParagraph = sal_True;
+    bool            bFirstParagraph(true);
     sal_uInt32          nCharCount;
     sal_uInt32          nPropertyFlags = 0;
     sal_uInt16          nDepth = 0;
     sal_Int16           nLineSpacing;
     int                 nInstance = rTextObj.GetInstance();
 
-    for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = sal_False )
+    for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = false )
     {
         PortionObj* pPortion = (PortionObj*)pPara->First();
         nCharCount = pPara->Count();
@@ -1474,10 +1496,14 @@ void PPTWriter::ImplWriteParagraphs( SvS
             sal_uInt32 nBulletColor = pPara->nBulletColor;
             if ( nBulletColor == COL_AUTO )
             {
-                sal_Bool bIsDark = sal_False;
+                bool bIsDark(false);
                 ::com::sun::star::uno::Any aAny;
-                if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
-                    aAny >>= bIsDark;
+                if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), true ) )
+                {
+                    sal_Bool bBool(sal_False);
+                    aAny >>= bBool;
+                    bIsDark = bBool;
+                }
                 nBulletColor = bIsDark ? 0xffffff : 0x000000;
             }
             nBulletColor &= 0xffffff;
@@ -1527,10 +1553,14 @@ void PPTWriter::ImplWritePortions( SvStr
 
             if ( nCharColor == COL_AUTO )   // nCharColor depends to the background color
             {
-                sal_Bool bIsDark = sal_False;
+                bool bIsDark(false);
                 ::com::sun::star::uno::Any aAny;
-                if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
-                    aAny >>= bIsDark;
+                if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), true ) )
+                {
+                    sal_Bool bBool(sal_False);
+                    aAny >>= bBool;
+                    bIsDark = bBool;
+                }
                 nCharColor = bIsDark ? 0xffffff : 0x000000;
             }
 
@@ -1619,7 +1649,7 @@ void PPTWriter::ImplWritePortions( SvStr
 							if ( aPropSetOfNextShape.is() )
 							{
 								if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape,
-													String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), sal_True ) )
+													String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ), true ) )
 								{
 									if ( nCharColor == mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ) )
 									{
@@ -1696,10 +1726,10 @@ void PPTWriter::ImplWritePortions( SvStr
 
 //  ----------------------------------------------------------------------------------------
 //  laedt und konvertiert text aus shape, ergebnis ist mnTextSize gespeichert;
-sal_Bool PPTWriter::ImplGetText()
+bool PPTWriter::ImplGetText()
 {
     mnTextSize = 0;
-	mbFontIndependentLineSpacing = sal_False;
+	mbFontIndependentLineSpacing = false;
     mXText = ::com::sun::star::uno::Reference<
         ::com::sun::star::text::XSimpleText >
             ( mXShape, ::com::sun::star::uno::UNO_QUERY );
@@ -1708,8 +1738,12 @@ sal_Bool PPTWriter::ImplGetText()
 	{
         mnTextSize = mXText->getString().getLength();
 		::com::sun::star::uno::Any aAny;
-		if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FontIndependentLineSpacing" ) ) ), sal_True )
-			aAny >>= mbFontIndependentLineSpacing;
+		if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FontIndependentLineSpacing" ) ) ), true )
+        {
+            sal_Bool bBool(sal_False);
+			aAny >>= bBool;
+            mbFontIndependentLineSpacing = bBool;
+        }
 	}
     return ( mnTextSize != 0 );
 }
@@ -1790,11 +1824,11 @@ PortionObj::PortionObj( const ::com::sun
 {
     mXPropSet = rXPropSet;
 
-    ImplGetPortionValues( rFontCollection, sal_False );
+    ImplGetPortionValues( rFontCollection, false );
 }
 
 PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange,
-                            sal_Bool bLast, FontCollection& rFontCollection ) :
+                            bool bLast, FontCollection& rFontCollection ) :
     mnCharAttrHard          ( 0 ),
     mnCharAttr              ( 0 ),
     mnFont                  ( 0 ),
@@ -1823,7 +1857,7 @@ PortionObj::PortionObj( ::com::sun::star
             ::com::sun::star::beans::XPropertyState >
                 ( rXTextRange, ::com::sun::star::uno::UNO_QUERY );
 
-        sal_Bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() );
+        bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() );
         if ( bPropSetsValid )
             nFieldType = ImplGetTextField( rXTextRange, mXPropSet, aURL );
         if ( nFieldType )
@@ -1835,14 +1869,14 @@ PortionObj::PortionObj( ::com::sun::star
                 mpFieldEntry->aFieldUrl = aURL;
 			}
         }
-        sal_Bool bSymbol = sal_False;
+        bool bSymbol(false);
 
         if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), false ) )
         {
             sal_Int16 nCharset;
             mAny >>= nCharset;
             if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL )
-                bSymbol = sal_True;
+                bSymbol = true;
         }
         if ( mpFieldEntry && ( nFieldType & 0x800000 ) )    // placeholder ?
         {
@@ -1935,7 +1969,7 @@ PortionObj::~PortionObj()
     ImplClear();
 }
 
-void PortionObj::Write( SvStream* pStrm, sal_Bool bLast )
+void PortionObj::Write( SvStream* pStrm, bool bLast )
 {
     sal_uInt32 nCount = mnTextSize;
     if ( bLast && mbLastPortion )
@@ -1944,10 +1978,10 @@ void PortionObj::Write( SvStream* pStrm,
         *pStrm << (sal_uInt16)mpText[ i ];
 }
 
-void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue )
+void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue )
 {
 
-    sal_Bool bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), bGetPropStateValue );
+    bool bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), bGetPropStateValue );
     meFontName = ePropState;
     if ( bOk )
     {
@@ -1957,11 +1991,11 @@ void PortionObj::ImplGetPortionValues( F
         if ( mnFont == nCount )
         {
             FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
-            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
+            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), false ) )
                 mAny >>= rFontDesc.CharSet;
-            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" ) ), sal_False ) )
+            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" ) ), false ) )
                 mAny >>= rFontDesc.Family;
-            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" ) ), sal_False ) )
+            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" ) ), false ) )
                 mAny >>= rFontDesc.Pitch;
         }
     }
@@ -1984,11 +2018,11 @@ void PortionObj::ImplGetPortionValues( F
 			if ( mnAsianOrComplexFont == nCount )
 			{
 				FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
-				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetAsian" ) ), sal_False ) )
+				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetAsian" ) ), false ) )
 					mAny >>= rFontDesc.CharSet;
-				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyAsian" ) ), sal_False ) )
+				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyAsian" ) ), false ) )
 					mAny >>= rFontDesc.Family;
-				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchAsian" ) ), sal_False ) )
+				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchAsian" ) ), false ) )
 					mAny >>= rFontDesc.Pitch;
 			}
 		}
@@ -2005,11 +2039,11 @@ void PortionObj::ImplGetPortionValues( F
 			if ( mnAsianOrComplexFont == nCount )
 			{
 				FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
-				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetComplex" ) ), sal_False ) )
+				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetComplex" ) ), false ) )
 					mAny >>= rFontDesc.CharSet;
-				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyComplex" ) ), sal_False ) )
+				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyComplex" ) ), false ) )
 					mAny >>= rFontDesc.Family;
-				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchComplex" ) ), sal_False ) )
+				if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchComplex" ) ), false ) )
 					mAny >>= rFontDesc.Pitch;
 			}
 		}
@@ -2045,7 +2079,7 @@ void PortionObj::ImplGetPortionValues( F
 	}
 
     mnCharHeight = 24;
-	if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, sal_False ) )
+	if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, false ) )
 	{
 		float fVal(0.0);
 		if ( mAny >>= fVal )
@@ -2054,7 +2088,7 @@ void PortionObj::ImplGetPortionValues( F
 			meCharHeight = GetPropertyState( mXPropSet, aCharHeightName );
 		}
 	}
-	if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, sal_False ) )
+	if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, false ) )
 	{
 		float fFloat(0.0);
 		if ( mAny >>= fFloat )
@@ -2065,13 +2099,13 @@ void PortionObj::ImplGetPortionValues( F
 				mnCharAttrHard |= 1;
 		}
 	}
-	if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, sal_False ) )
+	if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, false ) )
 	{
 		com::sun::star::lang::Locale eLocale;
 		if ( mAny >>= eLocale )
 			meCharLocale = eLocale;
 	}
-	if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, sal_False ) )
+	if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, false ) )
 	{
 		::com::sun::star::awt::FontSlant aFS;
 		if ( mAny >>= aFS )
@@ -2107,7 +2141,7 @@ void PortionObj::ImplGetPortionValues( F
 
     if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), bGetPropStateValue ) )
     {
-        sal_Bool bBool(sal_False);
+        bool bBool(sal_False);
         mAny >>= bBool;
         if ( bBool )
             mnCharAttr |= 0x10;
@@ -2206,12 +2240,12 @@ sal_uInt32 PortionObj::ImplGetTextField(
     sal_uInt32 nRetValue = 0;
     sal_Int32 nFormat;
 	::com::sun::star::uno::Any aAny;
-	if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextPortionType" ) ), sal_True ) )
+	if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextPortionType" ) ), true ) )
 	{
 		String  aTextFieldType( *(::rtl::OUString*)aAny.getValue() );
 		if ( aTextFieldType == String( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ) )
 		{
-			if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) )
+			if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, true ) )
 			{
 				::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > aXTextField;
 				if ( aAny >>= aXTextField )
@@ -2225,13 +2259,13 @@ sal_uInt32 PortionObj::ImplGetTextField(
 							String aFieldKind( aXTextField->getPresentation( true ) );
 							if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) )
 							{
-								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), true )
 								{
 									sal_Bool bBool;
 									aAny >>= bBool;
 									if ( !bBool )  // Fixed DateFields gibt es in PPT nicht
 									{
-										if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
+										if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), true )
 										{
 											nFormat = *(sal_Int32*)aAny.getValue();
 											switch ( nFormat )
@@ -2253,7 +2287,7 @@ sal_uInt32 PortionObj::ImplGetTextField(
 							}
 							else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) )
 							{
-								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ), sal_True )
+								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ), true )
 									rURL = String( *(::rtl::OUString*)aAny.getValue() );
 								nRetValue = 4 << 28;
 							}
@@ -2267,13 +2301,13 @@ sal_uInt32 PortionObj::ImplGetTextField(
 							}
 							else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Time" ) ) )
 							{
-								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), true )
 								{
 									sal_Bool bBool;
 									aAny >>= bBool;
 									if ( !bBool )
 									{
-										if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+										if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), true )
 										{
 											nFormat = *(sal_Int32*)aAny.getValue();
 											nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
@@ -2291,13 +2325,13 @@ sal_uInt32 PortionObj::ImplGetTextField(
 							}
 							else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "ExtTime" ) ) )
 							{
-								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+								if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), true )
 								{
 									sal_Bool bBool;
 									aAny >>= bBool;
 									if ( !bBool )
 									{
-										if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
+										if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), true )
 										{
 											nFormat = *(sal_Int32*)aAny.getValue();
 											switch ( nFormat )
@@ -2497,7 +2531,7 @@ static void lcl_SubstituteBullet(String&
      }
 }
 
-void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue )
+void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, bool bIsBullet, bool bGetPropStateValue )
 {
 	::com::sun::star::uno::Any aAny;
 	if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaLeftMargin" ) ) ) )
@@ -2861,12 +2895,12 @@ void ParagraphObj::ImplGetNumberingLevel
         nBulletOfs = 0;
 }
 
-void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue )
+void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, bool bGetPropStateValue )
 {
     static String sNumberingLevel   ( RTL_CONSTASCII_USTRINGPARAM( "NumberingLevel" ) );
 
 	::com::sun::star::uno::Any aAny;
-	if ( GetPropertyValue( aAny, mXPropSet, sNumberingLevel, sal_True ) )
+	if ( GetPropertyValue( aAny, mXPropSet, sNumberingLevel, true ) )
     {
         if ( bGetPropStateValue )
             meBullet = GetPropertyState( mXPropSet, sNumberingLevel );
@@ -2874,20 +2908,20 @@ void ParagraphObj::ImplGetParagraphValue
 
 		if ( nDepth < 0 )
 		{
-			mbIsBullet = sal_False;
+			mbIsBullet = false;
 			nDepth = 0;
 		}
 		else
 		{
 			if ( nDepth > 4 )
 				nDepth = 4;
-			mbIsBullet = sal_True;
+			mbIsBullet = true;
 		}
     }
     else
 	{
         nDepth = 0;
-		mbIsBullet = sal_False;
+		mbIsBullet = false;
 	}
     ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue );
 
@@ -4033,7 +4067,7 @@ void PPTWriter::ImplWriteObjectEffect( S
 
 //  -----------------------------------------------------------------------
 
-void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, sal_Bool bMediaClickAction )
+void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, bool bMediaClickAction )
 {
     sal_uInt32 nSoundRef = 0;   // a reference to a sound in the sound collection, or NULL.
     sal_uInt32 nHyperLinkID = 0;// a persistent unique identifier to an external hyperlink object (only valid when action == HyperlinkAction).
@@ -4190,27 +4224,43 @@ void PPTWriter::ImplWriteClickAction( Sv
 
 //  -----------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet,
+bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet,
                                 ::com::sun::star::presentation::AnimationEffect& eEffect,
                                 ::com::sun::star::presentation::AnimationEffect& eTextEffect,
-                                sal_Bool& bIsSound )
+                                bool& bIsSound )
 {
     ::com::sun::star::uno::Any aAny;
+    
     if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ) ) )
+    {
         aAny >>= eEffect;
+    }
     else
+    {
         eEffect = ::com::sun::star::presentation::AnimationEffect_NONE;
+    }
 
     if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextEffect" ) ) ) )
+    {
         aAny >>= eTextEffect;
+    }
     else
+    {
         eTextEffect = ::com::sun::star::presentation::AnimationEffect_NONE;
+    }
+
     if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ) ) )
-        aAny >>= bIsSound;
+    {
+        sal_Bool bBool(sal_False);
+        aAny >>= bBool;
+        bIsSound = bBool;
+    }
     else
+    {
         bIsSound = false;
+    }
 
-    sal_Bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
+    bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
                         || ( eTextEffect != ::com::sun::star::presentation::AnimationEffect_NONE )
                         || bIsSound );
     return bHasEffect;
@@ -4218,10 +4268,10 @@ sal_Bool PPTWriter::ImplGetEffect( const
 
 //  -----------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPage, const PageType /* ePageType */,
+bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const PageType /* ePageType */,
 														const sal_uInt32 nStyleInstance, const sal_uInt8 nPlaceHolderId )
 {
-	sal_Bool bRet = ImplGetText();
+	bool bRet = ImplGetText();
 	if ( bRet && bMasterPage )
 	{
 		mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -4234,7 +4284,7 @@ sal_Bool PPTWriter::ImplCreatePresentati
 		aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 );
 		aPropOpt.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
 		aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
-		aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
+		aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
 		sal_uInt32 nLineFlags = 0x90001;
 		if ( aPropOpt.GetOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ) )
 			nLineFlags |= 0x10001;  // draw dashed line if no line
@@ -4244,7 +4294,7 @@ sal_Bool PPTWriter::ImplCreatePresentati
 		SvMemoryStream	aClientTextBox( 0x200, 0x200 );
         ImplWriteTextStyleAtom( aClientTextBox, nStyleInstance, 0, NULL, aExtBu, &aPropOpt );
 
-		aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+		aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 		aPropOpt.CreateShapeProperties( mXShape );
 		aPropOpt.Commit( *mpStrm );
 		mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
@@ -4277,7 +4327,7 @@ sal_Bool PPTWriter::ImplCreatePresentati
 		mpPptEscherEx->CloseContainer();    // ESCHER_SpContainer
 	}
 	else
-		bRet = sal_False;
+		bRet = false;
 	return bRet;
 }
 
@@ -4286,22 +4336,22 @@ sal_Bool PPTWriter::ImplCreatePresentati
 void PPTWriter::ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& rSolver )
 {
     sal_uInt32 nId = mpPptEscherEx->GenerateShapeId();
-    mpPptEscherEx->AddShape( nType, nFlags, nId );
+    mpPptEscherEx->AddShape( nType, nFlags | mnMirrorFlags, nId );
     rSolver.AddShape( mXShape, nId );
 }
 
-void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSolverContainer& rSolver, sal_Bool bFill )
+void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSolverContainer& rSolver, bool bFill )
 {
     mnTextStyle = EPP_TEXTSTYLE_TEXT;
     mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
     ImplCreateShape( ESCHER_ShpInst_TextBox, 0xa00, rSolver );
     if ( bFill )
-        rPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
+        rPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
 	if ( ImplGetText() )
-		rPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+		rPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 }
 
-void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber )
+void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, bool bMasterPage, int nPageNumber )
 {
     // #119551# PPT does not support groups of polygons and text (MS patch KB2289187) 
     // sal_uInt32  nGroupLevel = 0;
@@ -4314,7 +4364,7 @@ void PPTWriter::ImplWritePage( const PHL
 
     nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0;
 
-    sal_Bool bIsTitlePossible = sal_True;           // bei mehr als einem title geht powerpoint in die knie
+    bool bIsTitlePossible = true;           // bei mehr als einem title geht powerpoint in die knie
     sal_uInt32  nOutlinerCount = 0;             // die gliederungsobjekte muessen dem layout entsprechen,
     sal_uInt32  nPrevTextStyle = 0;                // es darf nicht mehr als zwei geben
 
@@ -4322,7 +4372,7 @@ void PPTWriter::ImplWritePage( const PHL
 
     bool bAdditionalText = false;
     double fTextRotation(0.0);
-	sal_Bool bSecOutl = sal_False;
+	bool bSecOutl(false);
 	sal_uInt32 nPObjects = 0;
     SvMemoryStream* pClientTextBox = NULL;
     SvMemoryStream* pClientData = NULL;
@@ -4349,24 +4399,24 @@ void PPTWriter::ImplWritePage( const PHL
 
         if ( ImplGetShapeByIndex( GetCurrentGroupIndex(), true ) )
         {
-            sal_Bool bIsSound;
-			sal_Bool bMediaClickAction = sal_False;
+            bool bIsSound(false);
+			bool bMediaClickAction(false);
             ::com::sun::star::presentation::AnimationEffect eAe;
             ::com::sun::star::presentation::AnimationEffect eTe;
 
             if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "PresentationOrder" ) ) ) )
                 nEffectCount = *(sal_uInt16*)mAny.getValue();
 
-            sal_Bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound );
+            bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound );
 			::com::sun::star::presentation::ClickAction eCa = ::com::sun::star::presentation::ClickAction_NONE;
             if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ) ) )
                 mAny >>= eCa;
 
-            sal_Bool bGroup = mType == "drawing.Group";
-            sal_Bool bOpenBezier   = mType == "drawing.OpenBezier";
-            sal_Bool bClosedBezier = mType == "drawing.ClosedBezier";
-            sal_Bool bPolyPolygon  = mType == "drawing.PolyPolygon";
-            sal_Bool bPolyLine = mType == "drawing.PolyLine";
+            bool bGroup = mType == "drawing.Group";
+            bool bOpenBezier   = mType == "drawing.OpenBezier";
+            bool bClosedBezier = mType == "drawing.ClosedBezier";
+            bool bPolyPolygon  = mType == "drawing.PolyPolygon";
+            bool bPolyLine = mType == "drawing.PolyLine";
 
 			List        aAdjustmentList;
             Rectangle   aPolyBoundRect;
@@ -4402,13 +4452,13 @@ void PPTWriter::ImplWritePage( const PHL
             }
             else
             {
-                sal_Bool bIsFontwork = sal_False;
-				sal_Bool bIsHatching = sal_False;
+                bool bIsFontwork(false);
+				bool bIsHatching(false);
                 ::com::sun::star::uno::Any aAny;
 				::com::sun::star::drawing::FillStyle eFS;
-                if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" ) ), sal_True ) )
+                if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" ) ), true ) )
                     aAny >>= bIsFontwork;
-				if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ), sal_True ) )
+				if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ), true ) )
 				{
 					aAny >>= eFS;
 					bIsHatching = eFS == ::com::sun::star::drawing::FillStyle_HATCH;
@@ -4425,21 +4475,21 @@ void PPTWriter::ImplWritePage( const PHL
 					mType = "drawing.dontknow";
                 }
             }
+            
             sal_uInt8 nPlaceHolderAtom = EPP_PLACEHOLDER_NONE;
-
             mnTextSize = 0;
             mnTextStyle = EPP_TEXTSTYLE_NORMAL;
 
             if ( mType == "drawing.Custom" )
             {
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
-				sal_uInt32 nMirrorFlags;
+				// TTTT: not needed here sal_uInt32 nMirrorFlags;
 				rtl::OUString sCustomShapeType;
-				MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType );
+				MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, /*nMirrorFlags, */sCustomShapeType );
 				if ( sCustomShapeType.equalsAscii( "col-502ad400" ) || sCustomShapeType.equalsAscii( "col-60da8460" ) )
 				{	// sj: creating metafile for customshapes that can't be saved to ms format properly
 					ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
-					if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
+					if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), false ) )
 					{
 						aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
 						SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
@@ -4453,13 +4503,13 @@ void PPTWriter::ImplWritePage( const PHL
 				}
 				else
 				{
-	                ImplCreateShape( eShapeType, nMirrorFlags | 0xa00, aSolverContainer );
+	                ImplCreateShape( eShapeType, /*nMirrorFlags | */0xa00, aSolverContainer );
 					aPropOpt.CreateCustomShapeProperties( eShapeType, mXShape );
-					aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape);
+					aPropOpt.CreateFillProperties( mXPropSet, true, mXShape);
 					if ( ImplGetText() )
 					{
 						if ( !aPropOpt.IsFontWork() )
-							aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_True, sal_True );
+							aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, true, true );
 					}
 				}
             }
@@ -4492,9 +4542,9 @@ void PPTWriter::ImplWritePage( const PHL
                 {
                     ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa00, aSolverContainer );          // Flags: Connector | HasSpt
                 }
-                aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
+                aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
 				if ( ImplGetText() )
-					aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_False );
+					aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, false );
             }
             else if ( mType == "drawing.Ellipse" )
             {
@@ -4510,9 +4560,9 @@ void PPTWriter::ImplWritePage( const PHL
                 {
                     mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                     ImplCreateShape( ESCHER_ShpInst_Ellipse, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
-                    aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
+                    aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
 					if ( ImplGetText() )
-						aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_False );
+						aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, false );
 				}
                 else
                 {
@@ -4522,7 +4572,7 @@ void PPTWriter::ImplWritePage( const PHL
                         continue;
 
                     Polygon aPolygon(aOutline.getB2DPolygon(0));
-					sal_Bool bNeedText = sal_True;
+					bool bNeedText(true);
 
                     if ( mfObjectRotation )
 					{
@@ -4532,7 +4582,7 @@ void PPTWriter::ImplWritePage( const PHL
 							// #119551# PPT does not support groups of polygons and text (MS patch KB2289187) 
                             // mpPptEscherEx->EnterGroup( 0,0 );
 							// nGroupLevel = mpPptEscherEx->GetGroupLevel();
-							bNeedText = sal_False;
+							bNeedText = false;
 							bAdditionalText = true;
                             fTextRotation = mfObjectRotation;
 							mnTextSize = 0;
@@ -4546,20 +4596,20 @@ void PPTWriter::ImplWritePage( const PHL
 
                     if(aOutline.isClosed())
                     {
-                        if ( aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_False, aNewRect, &aPolygon ) )
-                            aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
+                        if ( aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, &aPolygon ) )
+                            aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
                     }
                     else
                     {
-                        if ( aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_False, aNewRect, &aPolygon ) )
-                            aPropOpt.CreateLineProperties( mXPropSet, sal_False );
+                        if ( aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, &aPolygon ) )
+                            aPropOpt.CreateLineProperties( mXPropSet, false );
                     }
 
                     maObjectRange = basegfx::B2DRange(aNewRect.X, aNewRect.Y, aNewRect.X + aNewRect.Width, aNewRect.Y + aNewRect.Height);
                     maObjectRange.transform(maMap100thMmToMs);
 
                     if ( bNeedText && ImplGetText() )
-						aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_False );
+						aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, false );
                 }
             }
             else if ( mType == "drawing.Control" )
@@ -4671,7 +4721,7 @@ void PPTWriter::ImplWritePage( const PHL
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 sal_uInt32 nSpFlags = SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_OLESHAPE;
                 ImplCreateShape( ESCHER_ShpInst_HostControl, nSpFlags, aSolverContainer );
-                if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False  ) )
+                if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), false  ) )
                     aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
                 //export form control graphic
                 else if ( aPropOpt.CreateBlipPropertiesforOLEControl(mXPropSet,mXShape))
@@ -4700,7 +4750,7 @@ void PPTWriter::ImplWritePage( const PHL
             {
                 sal_uInt16 nSpType, nSpFlags;
                 ::com::sun::star::awt::Rectangle aNewRect;
-                if ( aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) == sal_False )
+                if ( aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) == false )
                     continue;
 
                 maObjectRange = basegfx::B2DRange(aNewRect.X, aNewRect.Y, aNewRect.X + aNewRect.Width, aNewRect.Y + aNewRect.Height);
@@ -4719,7 +4769,7 @@ void PPTWriter::ImplWritePage( const PHL
             else if ( mType == "drawing.Line" )
             {
                 ::com::sun::star::awt::Rectangle aNewRect;
-                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_LINE, sal_False, aNewRect, NULL );
+                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_LINE, false, aNewRect, NULL );
 
                 // remember hor/ver mirror; it is part of aNewRect since it gets created
                 // from the two single points of the line. It's needed for thr flags below.
@@ -4760,7 +4810,7 @@ void PPTWriter::ImplWritePage( const PHL
 
                 ImplCreateShape( ESCHER_ShpInst_Line, nFlags, aSolverContainer );
                 aPropOpt.AddOpt( ESCHER_Prop_shapePath, ESCHER_ShapeComplex );
-                aPropOpt.CreateLineProperties( mXPropSet, sal_False );
+                aPropOpt.CreateLineProperties( mXPropSet, false );
                 mfObjectRotation = 0.0;
             }
             else if ( bPolyPolygon )
@@ -4777,7 +4827,7 @@ void PPTWriter::ImplWritePage( const PHL
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
-                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_False, aNewRect, NULL );
+                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, NULL );
 
                 maObjectRange = basegfx::B2DRange(aNewRect.X, aNewRect.Y, aNewRect.X + aNewRect.Width, aNewRect.Y + aNewRect.Height);
                 maObjectRange.transform(maMap100thMmToMs);
@@ -4787,7 +4837,7 @@ void PPTWriter::ImplWritePage( const PHL
                 //maObjectPosition = basegfx::B2DPoint(aNewRect.X, aNewRect.Y);
                 //maObjectScale = maMap100thMmToMs * basegfx::B2DVector(aNewRect.Width, aNewRect.Height);
 
-                aPropOpt.CreateFillProperties( mXPropSet, sal_True , mXShape );
+                aPropOpt.CreateFillProperties( mXPropSet, true , mXShape );
                 mfObjectRotation = 0.0;
             }
             else if ( bPolyLine )
@@ -4804,12 +4854,12 @@ void PPTWriter::ImplWritePage( const PHL
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
-                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_False, aNewRect, NULL );
+                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, NULL );
                 
                 maObjectRange = basegfx::B2DRange(aNewRect.X, aNewRect.Y, aNewRect.X + aNewRect.Width, aNewRect.Y + aNewRect.Height);
                 maObjectRange.transform(maMap100thMmToMs);
                 
-                aPropOpt.CreateLineProperties( mXPropSet, sal_False );
+                aPropOpt.CreateLineProperties( mXPropSet, false );
                 mfObjectRotation = 0.0;
             }
             else if ( bOpenBezier )
@@ -4826,12 +4876,12 @@ void PPTWriter::ImplWritePage( const PHL
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
-                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_True, aNewRect, NULL );
+                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, true, aNewRect, NULL );
                 
                 maObjectRange = basegfx::B2DRange(aNewRect.X, aNewRect.Y, aNewRect.X + aNewRect.Width, aNewRect.Y + aNewRect.Height);
                 maObjectRange.transform(maMap100thMmToMs);
                 
-                aPropOpt.CreateLineProperties( mXPropSet, sal_False );
+                aPropOpt.CreateLineProperties( mXPropSet, false );
                 mfObjectRotation = 0.0;
             }
             else if ( bClosedBezier )
@@ -4848,12 +4898,12 @@ void PPTWriter::ImplWritePage( const PHL
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
-                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_True, aNewRect, NULL );
+                aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, true, aNewRect, NULL );
                 
                 maObjectRange = basegfx::B2DRange(aNewRect.X, aNewRect.Y, aNewRect.X + aNewRect.Width, aNewRect.Y + aNewRect.Height);
                 maObjectRange.transform(maMap100thMmToMs);
 
-                aPropOpt.CreateFillProperties( mXPropSet, sal_True , mXShape );
+                aPropOpt.CreateFillProperties( mXPropSet, true , mXShape );
                 mfObjectRotation = 0.0;
             }
             else if ( ( mType == "drawing.GraphicObject" ) || ( mType == "presentation.GraphicObject" ) )
@@ -4885,7 +4935,7 @@ void PPTWriter::ImplWritePage( const PHL
 						have to create a simpe Rectangle with fill bitmap instead (while not allowing BitmapMode_Repeat).
 						*/
                         ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa00, aSolverContainer );       // Flags: Connector | HasSpt
-                        if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), sal_True, sal_True, sal_False ) )
+                        if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), true, true, false ) )
                         {
                             aPropOpt.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone );
                             aPropOpt.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
@@ -4893,14 +4943,14 @@ void PPTWriter::ImplWritePage( const PHL
                             aPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0x8000000 );
                             aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );
                             if ( ImplGetText() )
-								aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_False );
+								aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, false );
                         }
                     }
                     else
                     {
                         ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
 
-                        if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), sal_False, sal_True ) )
+                        if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ), false, true ) )
                         {
                             aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
                         }
@@ -4927,7 +4977,7 @@ void PPTWriter::ImplWritePage( const PHL
                         mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                         nPlaceHolderAtom = EPP_PLACEHOLDER_MASTERNOTESBODYIMAGE;
                         ImplCreateShape( ESCHER_ShpInst_Rectangle, 0x200, aSolverContainer );
-                        aPropOpt.CreateLineProperties( mXPropSet, sal_False );
+                        aPropOpt.CreateLineProperties( mXPropSet, false );
                         aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x10001 );
                     }
                     else if ( rLayout.bTitlePossible && bIsTitlePossible )
@@ -4955,12 +5005,12 @@ void PPTWriter::ImplWritePage( const PHL
 								aPropertyOptions.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 );
 								aPropertyOptions.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
 								aPropertyOptions.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
-								aPropertyOptions.CreateFillProperties( mXPropSet, sal_True, mXShape );
+								aPropertyOptions.CreateFillProperties( mXPropSet, true, mXShape );
 								sal_uInt32 nLineFlags = 0x90001;
 								if ( aPropertyOptions.GetOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ) )
 									nLineFlags |= 0x10001;  // draw dashed line if no line
 								aPropertyOptions.AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags );
-								aPropertyOptions.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+								aPropertyOptions.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 								ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
 								aPropertyOptions.Commit( *mpStrm );
 								mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
@@ -5003,8 +5053,8 @@ void PPTWriter::ImplWritePage( const PHL
 							nPlaceHolderAtom = rLayout.nTypeOfTitle;
 							ImplCreateShape( ESCHER_ShpInst_Rectangle, 0x220, aSolverContainer );          // Flags: HaveAnchor | HaveMaster
 							aPropOpt.AddOpt( ESCHER_Prop_hspMaster, mnShapeMasterTitle );
-							aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
-							aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+							aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
+							aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 							ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
 							if ( mbEmptyPresObj )
 							{
@@ -5052,12 +5102,12 @@ void PPTWriter::ImplWritePage( const PHL
 								aPropOpt2.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
 								aPropOpt2.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90001 );
 								aPropOpt2.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
-								aPropOpt2.CreateFillProperties( mXPropSet, sal_True, mXShape  );
+								aPropOpt2.CreateFillProperties( mXPropSet, true, mXShape  );
 								sal_uInt32 nLineFlags = 0x90001;
 								if ( aPropOpt2.GetOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ) )
 									nLineFlags |= 0x10001;  // draw dashed line if no line
 								aPropOpt2.AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags );
-								aPropOpt2.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+								aPropOpt2.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 								ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 );
 								aPropOpt2.Commit( *mpStrm );
 								mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
@@ -5108,8 +5158,8 @@ void PPTWriter::ImplWritePage( const PHL
 							mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
 							ImplCreateShape( ESCHER_ShpInst_Rectangle, 0x220, aSolverContainer );          // Flags: HaveAnchor | HaveMaster
 							aPropOpt.AddOpt( ESCHER_Prop_hspMaster, mnShapeMasterBody );
-							aPropOpt.CreateFillProperties( mXPropSet, sal_True, mXShape );
-							aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+							aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
+							aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 							ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
 							if ( mbEmptyPresObj )
 							{
@@ -5234,7 +5284,7 @@ void PPTWriter::ImplWritePage( const PHL
 					continue;
 				else
 				{
-					mbPresObj = sal_False;
+					mbPresObj = false;
                     mType = "drawing.Text";
 	                ImplCreateTextShape( aPropOpt, aSolverContainer, true );
                 }
@@ -5245,7 +5295,7 @@ void PPTWriter::ImplWritePage( const PHL
 					continue;
 				else
 				{
-					mbPresObj = sal_False;
+					mbPresObj = false;
                     mType = "drawing.Text";
 	                ImplCreateTextShape( aPropOpt, aSolverContainer, true );
                 }
@@ -5256,7 +5306,7 @@ void PPTWriter::ImplWritePage( const PHL
 					continue;
 				else
 				{
-					mbPresObj = sal_False;
+					mbPresObj = false;
                     mType = "drawing.Text";
 	                ImplCreateTextShape( aPropOpt, aSolverContainer, true );
                 }
@@ -5267,7 +5317,7 @@ void PPTWriter::ImplWritePage( const PHL
 					continue;
 				else
 				{
-					mbPresObj = sal_False;
+					mbPresObj = false;
                     mType = "drawing.Text";
 	                ImplCreateTextShape( aPropOpt, aSolverContainer, true );
                 }
@@ -5281,7 +5331,7 @@ void PPTWriter::ImplWritePage( const PHL
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
 
-                if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ), sal_False ) )
+                if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ) ), false ) )
                     aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
             }
 			else if ( mType == "drawing.Media" )
@@ -5292,7 +5342,7 @@ void PPTWriter::ImplWritePage( const PHL
 				if ( aPropOpt.CreateMediaGraphicProperties( mXShape ) )
 					aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
 				::com::sun::star::uno::Any aAny;
-				if ( PropValue::GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), sal_True ) )
+				if ( PropValue::GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), true ) )
 				{
 					rtl::OUString aMediaURL;
 					if ( (aAny >>= aMediaURL ) &&  aMediaURL.getLength() )
@@ -5378,7 +5428,7 @@ void PPTWriter::ImplWritePage( const PHL
                 mfObjectRotation = 0.0;
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
-                if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
+                if ( aPropOpt.CreateGraphicProperties( mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), false ) )
                     aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
             }
             else
@@ -5387,7 +5437,7 @@ void PPTWriter::ImplWritePage( const PHL
             }
             sal_Int32 nPlacementID = -1;
 
-            sal_Bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) ||
+            bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) ||
                                         nPlaceHolderAtom || nOlePictureId );
             if ( bClientData )
             {
@@ -5479,7 +5529,7 @@ void PPTWriter::ImplWritePage( const PHL
 								nTextType = EPP_TEXTTYPE_HalfBody;
 							else if ( mType == "presentation.Subtitle" )
 								nTextType = EPP_TEXTTYPE_CenterBody;
-							bSecOutl = sal_True;
+							bSecOutl = true;
 						}
 						else
 							nTextType = EPP_TEXTTYPE_Title;
@@ -5656,7 +5706,7 @@ struct CellBorder
 	CellBorder() : mnPos ( 0 ), mnLength( 0 ){};
 };
 
-sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2)
+bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2)
 {
 	const sal_Int32 nLineWidth(2 * (pCellBorder->maCellBorder.OuterLineWidth + pCellBorder->maCellBorder.InnerLineWidth));
 
@@ -5686,9 +5736,9 @@ sal_Bool PPTWriter::ImplCreateCellBorder
 					<< nX2
 					<< nY2;
 		mpPptEscherEx->CloseContainer();
-		return sal_True;
+		return true;
 	}
-	return sal_False;
+	return false;
 }
 
 //get merged cell's width
@@ -5825,7 +5875,7 @@ void PPTWriter::ImplCreateTable( uno::Re
 
 				aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x1000100 );
 				aPropOpt2.AddOpt( ESCHER_Prop_tableProperties, 1 );
-				aPropOpt2.AddOpt( ESCHER_Prop_tableRowProperties, sal_True, aMemStrm.Tell(), static_cast< sal_uInt8* >( const_cast< void* >( aMemStrm.GetData() ) ), aMemStrm.Tell() );
+				aPropOpt2.AddOpt( ESCHER_Prop_tableRowProperties, true, aMemStrm.Tell(), static_cast< sal_uInt8* >( const_cast< void* >( aMemStrm.GetData() ) ), aMemStrm.Tell() );
 				aPropOpt.CreateShapeProperties( rXShape );
 				aPropOpt.Commit( *mpStrm );
 				aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp );
@@ -5849,21 +5899,25 @@ void PPTWriter::ImplCreateTable( uno::Re
 							sal_Int32 nRight  = GetCellRight( nColumn, maObjectRange, aColumns, xCell );
 							sal_Int32 nBottom = GetCellBottom( nRow,  maObjectRange, aRows, xCell );
 							
-							mbFontIndependentLineSpacing = sal_False;
+							mbFontIndependentLineSpacing = false;
 							mXPropSet = uno::Reference< beans::XPropertySet >( xCell, uno::UNO_QUERY_THROW );
 							mXText = uno::Reference< text::XSimpleText >( xCell, uno::UNO_QUERY_THROW );
 							mnTextSize = mXText->getString().getLength();
 
 							::com::sun::star::uno::Any aAny;
-							if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FontIndependentLineSpacing" ) ) ), sal_True )
-								aAny >>= mbFontIndependentLineSpacing;
+							if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FontIndependentLineSpacing" ) ) ), true )
+                            {
+                                sal_Bool bBool(sal_False);
+								aAny >>= bBool;
+                                mbFontIndependentLineSpacing = bBool;
+                            }
 
 							EscherPropertyContainer aPropOptSp;
 							mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
 							ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa02, aSolverContainer );          // Flags: Connector | HasSpt | Child
-							aPropOptSp.CreateFillProperties( mXPropSet, sal_True );
+							aPropOptSp.CreateFillProperties( mXPropSet, true );
 							aPropOptSp.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90000 );
-							aPropOptSp.CreateTextProperties( mXPropSet, mnTxId += 0x60, sal_False, sal_True );
+							aPropOptSp.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true );
 							aPropOptSp.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapSquare );
 
 							SvMemoryStream aClientTextBox( 0x200, 0x200 );
@@ -5914,7 +5968,7 @@ void PPTWriter::ImplCreateTable( uno::Re
 						CellBorder aCellBorder;
 						aCellBorder.mnPos = aColumns[ nColumn ].first;
 						aCellBorder.mnLength = aColumns[ nColumn ].second;
-						sal_Bool bTop = sal_False;
+						bool bTop(false);
 						//write nLine*nColumn cell's top border
 						if ( nLine < xRows->getCount() )
 						{	// top border
@@ -5972,7 +6026,7 @@ void PPTWriter::ImplCreateTable( uno::Re
 						CellBorder aCellBorder;
 						aCellBorder.mnPos = aRows[ nRow].first;
 						aCellBorder.mnLength = aRows[ nRow].second;
-						sal_Bool bLeft = sal_False;
+						bool bLeft(false);
 						if ( nLine < xColumns->getCount() )
 						{	// left border
 							uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine, nRow ), uno::UNO_QUERY_THROW );

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoashp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoashp.hxx?rev=1412154&r1=1412153&r2=1412154&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoashp.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoashp.hxx Wed Nov 21 15:42:23 2012
@@ -53,9 +53,12 @@ class SdrAShapeObjGeoData : public SdrOb
 {
 	public:
 
-	bool	bMirroredX;
-	bool	bMirroredY;
-	double		fObjectRotation;
+    // TTTT: MirrorX/Y removed, is part of object transformation now
+//	bool	bMirroredX;
+//	bool	bMirroredY;
+
+    // TTTT: Should be obsolete
+	// double		fObjectRotation; // TTTT: Is this needed? Check, may remove some extra handling
 
 	com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue >
 				aAdjustmentSeq;
@@ -83,7 +86,8 @@ class SVX_DLLPUBLIC SdrObjCustomShape : 
 {
 private:
 	// fObjectRotation is containing the object rotation in degrees.
-	double fObjectRotation;
+    // TTTT: SHould be obsolete
+	// double fObjectRotation;
 
 protected:
 	virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
@@ -140,12 +144,13 @@ public:
 
 	bool UseNoFillStyle() const;
 
-	bool IsMirroredX() const;
-	bool IsMirroredY() const;
-	void SetMirroredX( const bool bMirroredX );
-	void SetMirroredY( const bool bMirroredY );
+    // TTTT: MirroredX/Y removed
+	//bool IsMirroredX() const;
+	//bool IsMirroredY() const;
+	//void SetMirroredX( const bool bMirroredX );
+	//void SetMirroredY( const bool bMirroredY );
 
-	double GetObjectRotation() const;
+	//double GetObjectRotation() const;
 	double GetExtraTextRotation() const;
 
 	SdrObjCustomShape(SdrModel& rSdrModel);



Mime
View raw message