fix mis-merge... qa disabled

17 files changed, 182 insertions, 209 deletions

diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index b3d53d599844..b097563bcbef 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -255,7 +255,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
                 rSet.Put( XLineStyleItem(XLINE_NONE) );
                 rSet.Put( XFillStyleItem(XFILL_NONE) );
                 rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
-                rSet.Put( SdrTextAutoGrowHeightItem(FALSE) );
+                rSet.Put( SdrTextAutoGrowHeightItem(sal_False) );
                 // #i16874# enable kerning by default but only for new documents
                 rSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
 
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index b61043809a6e..4973b25301ab 100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -185,7 +185,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
         aAny >>= bVisible;
     if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) )
     {
-        switch ( *(INT32*)aAny.getValue() )
+        switch ( *(sal_Int32*)aAny.getValue() )
         {
             case 1 :        // automatisch
                 mnDiaMode++;
@@ -218,7 +218,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
     if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) )
         aAny >>= bLoopSound;
 
-    sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == FALSE )
+    sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False )
                                     || ( mnDiaMode == 2 )
                                     || ( bIsSound )
                                     || ( bStopSound )
@@ -228,7 +228,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
         sal_uInt8   nDirection = 0;
         sal_uInt8   nTransitionType = 0;
         sal_uInt16  nBuildFlags = 1;        // advange by mouseclick
-        INT32       nSlideTime = 0;         // muss noch !!!
+        sal_Int32       nSlideTime = 0;         // muss noch !!!
         sal_uInt8   nSpeed = 1;
 
         if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) )
@@ -251,7 +251,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
             nTransitionType = GetTransition( eFe, nDirection );
         if ( mnDiaMode == 2 )                                   // automatic ?
             nBuildFlags |= 0x400;
-        if ( bVisible == FALSE )
+        if ( bVisible == sal_False )
             nBuildFlags |= 4;
         if ( bIsSound )
             nBuildFlags |= 16;
@@ -261,7 +261,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
             nBuildFlags |= 256;
 
         if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide
-            nSlideTime = *(INT32*)aAny.getValue() << 10;        // in ticks
+            nSlideTime = *(sal_Int32*)aAny.getValue() << 10;        // in ticks
 
         mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
         *mpStrm << nSlideTime       // standtime in ticks
@@ -279,7 +279,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
     mpPptEscherEx->OpenContainer( EPP_PPDrawing );
     mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
     mpPptEscherEx->EnterGroup(0,0);
-    ImplWritePage( rLayout, aSolverContainer, NORMAL, FALSE, nPageNum );    // Die Shapes der Seite werden im PPT Dok. erzeugt
+    ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum );    // Die Shapes der Seite werden im PPT Dok. erzeugt
     mpPptEscherEx->LeaveGroup();
 
     if ( bHasBackground )
@@ -358,7 +358,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
     mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() );
     mpPptEscherEx->OpenContainer( EPP_MainMaster );
     mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
-    *mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE  // slide layout -> title and body slide
+    *mpStrm << (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE  // slide layout -> title and body slide
             << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0     // placeholderID
             << (sal_uInt32)0        // master ID ( ist gleich null bei einer masterpage )
             << (sal_uInt32)0        // notes ID ( ist gleich null wenn keine notizen vorhanden )
@@ -393,8 +393,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
 
         mpPptEscherEx->BeginAtom();
 
-        sal_Bool bFirst = TRUE;
-        sal_Bool bSimpleText = FALSE;
+        sal_Bool bFirst = sal_True;
+        sal_Bool bSimpleText = sal_False;
 
         *mpStrm << (sal_uInt16)5;                           // paragraph count
 
@@ -402,13 +402,13 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
         {
             if ( nInstance >= EPP_TEXTTYPE_CenterBody )
             {
-                bFirst = FALSE;
-                bSimpleText = TRUE;
+                bFirst = sal_False;
+                bSimpleText = sal_True;
                 *mpStrm << nLev;
             }
             mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
             mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
-            bFirst = FALSE;
+            bFirst = sal_False;
         }
         mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance );
     }
@@ -420,7 +420,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
     mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
 
     mpPptEscherEx->EnterGroup(0,0);
-    ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, TRUE );    // Die Shapes der Seite werden im PPT Dok. erzeugt
+    ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True );    // Die Shapes der Seite werden im PPT Dok. erzeugt
     mpPptEscherEx->LeaveGroup();
 
     ImplWriteBackground( aXBackgroundPropSet );
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index b24aab18115e..77b6aa67efeb 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -81,9 +81,9 @@ struct PHLayout
     sal_uInt8   nTypeOfTitle;
     sal_uInt8   nTypeOfOutliner;
 
-    BOOL    bTitlePossible;
-    BOOL    bOutlinerPossible;
-    BOOL    bSecOutlinerPossible;
+    sal_Bool    bTitlePossible;
+    sal_Bool    bOutlinerPossible;
+    sal_Bool    bSecOutlinerPossible;
 };
 
 enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3, LAYOUT = 4 };
@@ -375,7 +375,7 @@ protected:
     virtual sal_Bool ImplCreateMainNotes()=0;
 
     sal_Bool GetStyleSheets();
-    sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE );
+    sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = sal_False );
 
     sal_Bool CreateMainNotes();
 
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 04b7a0491a26..a7c9acb7948f 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -74,7 +74,8 @@ class PowerPointExport : public XmlFilterBase, public PPTWriterBase
     friend class PowerPointShapeExport;
 public:
 
-    PowerPointExport( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr  );
+    PowerPointExport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxCtxt  );
+
     ~PowerPointExport();
 
     // from FilterBase
@@ -105,7 +106,7 @@ protected:
 
     virtual sal_Bool ImplCreateDocument();
     virtual sal_Bool ImplCreateMainNotes();
-
+    virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
     sal_Bool WriteNotesMaster();
 
     void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const ::rtl::OUString& rAttributeName );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index b50d6d851def..044d47b0583a 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -790,12 +790,12 @@ sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNod
         if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
         {
         if ( p->Value >>= nType )
-            return TRUE;
+            return sal_True;
         }
     }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode,
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index a1f47590c28d..0556dd7c5d14 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -32,7 +32,7 @@
 #include "eppt.hxx"
 #include "epptdef.hxx"
 
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <tools/globname.hxx>
 #include <tools/datetime.hxx>
 #include <tools/poly.hxx>
@@ -113,31 +113,31 @@ using ::com::sun::star::uno::UNO_QUERY;
 
 static PHLayout pPHLayout[] =
 {
-    { EPP_LAYOUT_TITLESLIDE,            { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_RIGHTCOLUMN2ROWS,      { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_LEFTCOLUMN2ROWS,       { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TOPROW2COLUMN,         { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_4OBJECTS,              { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_ONLYTITLE,             { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
-    { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLERIGHTBODYLEFT,    { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE }
+    { EPP_LAYOUT_TITLESLIDE,            { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_True },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+    { EPP_LAYOUT_RIGHTCOLUMN2ROWS,      { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_LEFTCOLUMN2ROWS,       { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TOPROW2COLUMN,         { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_4OBJECTS,              { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+    { EPP_LAYOUT_ONLYTITLE,             { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_False, sal_False },
+    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False },
+    { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TITLERIGHTBODYLEFT,    { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, sal_True, sal_True, sal_False },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, sal_True, sal_True, sal_False }
 };
 
 #define PPT_WRITER_BASE_INIT_VALUES \
@@ -185,10 +185,10 @@ void PPTWriterBase::exportPPT()
     if ( !GetPageByIndex( 0, NOTICE ) )
         return;
 
-    INT32 nWidth = 21000;
+    sal_Int32 nWidth = 21000;
     if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM(  "Width" ) ) ) )
         mAny >>= nWidth;
-    INT32 nHeight = 29700;
+    sal_Int32 nHeight = 29700;
     if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
         mAny >>= nHeight;
 
@@ -254,7 +254,7 @@ void PPTWriterBase::exportPPT()
 
 sal_Bool PPTWriterBase::InitSOIface()
 {
-    while( TRUE )
+    while( sal_True )
     {
         mXDrawPagesSupplier = Reference< XDrawPagesSupplier >( mXModel, UNO_QUERY );
         if ( !mXDrawPagesSupplier.is() )
@@ -274,16 +274,16 @@ sal_Bool PPTWriterBase::InitSOIface()
         if ( !GetPageByIndex( 0, NORMAL ) )
             break;
 
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 // ---------------------------------------------------------------------------------------------
 
 sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
 {
-    while( TRUE )
+    while( sal_True )
     {
         if ( ePageType != meLatestPageType )
         {
@@ -294,7 +294,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
                 {
                     mXDrawPages = mXDrawPagesSupplier->getDrawPages();
                     if( !mXDrawPages.is() )
-                        return FALSE;
+                        return sal_False;
                 }
                 break;
 
@@ -302,7 +302,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
                 {
                     mXDrawPages = mXMasterPagesSupplier->getMasterPages();
                     if( !mXDrawPages.is() )
-                        return FALSE;
+                        return sal_False;
                 }
                 break;
                 default:
@@ -360,9 +360,9 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
                 }
             }
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 // ---------------------------------------------------------------------------------------------
@@ -372,7 +372,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
     Any aAny;
 
     if ( !GetPageByIndex( nPageNum, NORMAL ) )
-        return FALSE;
+        return sal_False;
 
     sal_uInt32 nMasterNum = GetMasterIndex( NORMAL );
     SetCurrentStyleSheet( nMasterNum );
@@ -409,7 +409,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
 
     ImplWriteSlide( nPageNum, nMasterNum, nMode, bHasBackground, aXBackgroundPropSet );
 
-    return TRUE;
+    return sal_True;
 };
 
 // ---------------------------------------------------------------------------------------------
@@ -417,12 +417,12 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
 sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
 {
     if ( !GetPageByIndex( nPageNum, NOTICE ) )
-        return FALSE;
+        return sal_False;
     SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
 
     ImplWriteNotes( nPageNum );
 
-    return TRUE;
+    return sal_True;
 };
 
 // ---------------------------------------------------------------------------------------------
@@ -430,18 +430,18 @@ sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
 sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
 {
     if ( !GetPageByIndex( nPageNum, MASTER ) )
-        return FALSE;
+        return sal_False;
     SetCurrentStyleSheet( nPageNum );
 
     if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) )                // Backgroundshape laden
-        return FALSE;
+        return sal_False;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
     if ( !( mAny >>= aXBackgroundPropSet ) )
-        return FALSE;
+        return sal_False;
 
     ImplWriteSlideMaster( nPageNum, aXBackgroundPropSet );
 
-    return TRUE;
+    return sal_True;
 };
 
 // ---------------------------------------------------------------------------------------------
@@ -675,30 +675,30 @@ sal_Bool PPTWriterBase::GetStyleSheets()
 sal_Bool PPTWriterBase::CreateMainNotes()
 {
     if ( !GetPageByIndex( 0, NOTICE ) )
-        return FALSE;
+        return sal_False;
     SetCurrentStyleSheet( 0 );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
         aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
 
     if ( !aXMasterPageTarget.is() )
-        return FALSE;
+        return sal_False;
 
     mXDrawPage = aXMasterPageTarget->getMasterPage();
     if ( !mXDrawPage.is() )
-        return FALSE;
+        return sal_False;
 
     mXPropSet = ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet >
             ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
     if ( !mXPropSet.is() )
-        return FALSE;
+        return sal_False;
 
     mXShapes = ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XShapes >
             ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
     if ( !mXShapes.is() )
-        return FALSE;
+        return sal_False;
 
     return ImplCreateMainNotes();
 }
@@ -739,9 +739,9 @@ Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect )
 
 sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
 {
-    while(TRUE)
+    while(sal_True)
     {
-        if (  ( bGroup == FALSE ) || ( GetCurrentGroupLevel() == 0 ) )
+        if (  ( bGroup == sal_False ) || ( GetCurrentGroupLevel() == 0 ) )
         {
             Any aAny( mXShapes->getByIndex( nIndex ) );
             aAny >>= mXShape;
@@ -767,7 +767,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
         sal_uInt16 nPos = mType.Search( (const char*)"Shape" );
         mType.Erase( nPos, 5 );
 
-        mbPresObj = mbEmptyPresObj = FALSE;
+        mbPresObj = mbEmptyPresObj = sal_False;
         if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
             mAny >>= mbPresObj;
 
@@ -779,9 +779,9 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
                 ? *((sal_Int32*)aAny.getValue() )
                 : 0;
 
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //  -----------------------------------------------------------------------
@@ -995,10 +995,10 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection
 sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
 {
     sal_uInt32 nShapes = mXShapes->getCount();
-    sal_Bool bOtherThanPlaceHolders = FALSE;
+    sal_Bool bOtherThanPlaceHolders = sal_False;
 
     if ( nShapes )
-    for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == FALSE ); nIndex++ ) {
+    for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == sal_False ); nIndex++ ) {
         if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) {
         if( bForOOMLX &&
             ( mType == "presentation.Page" ||
@@ -1006,9 +1006,9 @@ sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
             Reference< XSimpleText > rXText( mXShape, UNO_QUERY );
 
             if( rXText.is() && rXText->getString().getLength() != 0 )
-            bOtherThanPlaceHolders = TRUE;
+            bOtherThanPlaceHolders = sal_True;
         } else
-            bOtherThanPlaceHolders = TRUE;
+            bOtherThanPlaceHolders = sal_True;
         }
         DBG(printf("mType == %s\n", mType.GetBuffer()));
     }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index dc20e6e10807..4b7c191289b7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -29,11 +29,13 @@
 #include <boost/unordered_map.hpp>
 #include <stdio.h>
 #include <oox/drawingml/chart/chartconverter.hxx>
-#include <oox/core/tokens.hxx>
+#include <oox/token/tokens.hxx>
+#include <oox/ole/vbaproject.hxx>
 #include <epptooxml.hxx>
 #include <epptdef.hxx>
 #include <oox/export/shapes.hxx>
 
+#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
 #include <sax/fshelper.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -307,8 +309,8 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShap
     return *this;
 }
 
-PowerPointExport::PowerPointExport( const Reference< XMultiServiceFactory > & rSMgr  )
-    : XmlFilterBase( rSMgr ),
+PowerPointExport::PowerPointExport( const Reference< XComponentContext > & rxCtxt  )
+    : XmlFilterBase( rxCtxt ),
       PPTWriterBase(),
       mnLayoutFileIdMax( 1 ),
       mnSlideIdMax( 1 << 8 ),
@@ -368,6 +370,11 @@ bool PowerPointExport::exportDocument() throw()
     return true;
 }
 
+::oox::ole::VbaProject* PowerPointExport::implCreateVbaProject() const
+{
+    return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Impress" ) );
+}
+
 void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropertySet > rXPropSet )
 {
     FillStyle aFillStyle( FillStyle_NONE );
@@ -824,7 +831,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R
     pFS->startElementNS( XML_p, XML_cBhvr,
              XML_additive, pAdditive,
              FSEND );
-    WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+    WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild );
     WriteAnimationTarget( pFS, rXAnimate->getTarget() );
     WriteAnimationAttributeName( pFS, rXAnimate->getAttributeName() );
     pFS->endElementNS( XML_p, XML_cBhvr );
@@ -856,7 +863,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDe
 
 void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild )
 {
-    sal_Bool bHasFDelay = FALSE;
+    sal_Bool bHasFDelay = sal_False;
     double fDelay = 0;
     Timing eTiming;
     Event aEvent;
@@ -864,7 +871,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_
     const char* pEvent = NULL;
 
     if( rAny >>= fDelay )
-    bHasFDelay = TRUE;
+    bHasFDelay = sal_True;
     else if( rAny >>= eTiming ) {
     if( eTiming == Timing_INDEFINITE )
         pDelay = "indefinite";
@@ -914,7 +921,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_
     }
 
     if( aEvent.Offset >>= fDelay ) {
-        bHasFDelay = TRUE;
+        bHasFDelay = sal_True;
         DBG(printf ("event offset: %f\n", fDelay));
     } else if( aEvent.Offset >>= eTiming ) {
         if( eTiming == Timing_INDEFINITE )
@@ -1018,7 +1025,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     }
 
     sal_uInt32 nPresetId = 0;
-    sal_Bool bPresetId = FALSE;
+    sal_Bool bPresetId = sal_False;
     if ( pAny[ DFF_ANIM_PRESET_ID ] ) {
     rtl::OUString sPreset;
     if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset )
@@ -1026,7 +1033,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     }
 
     sal_uInt32 nPresetSubType = 0;
-    sal_Bool bPresetSubType = FALSE;
+    sal_Bool bPresetSubType = sal_False;
     if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) {
     rtl::OUString sPresetSubType;
     if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) {
@@ -1072,9 +1079,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     pFS->startElementNS( XML_p, XML_stCondLst, FSEND );
     if( aAny >>= aCondSeq ) {
         for( int i = 0; i < aCondSeq.getLength(); i ++ )
-        WriteAnimationCondition( pFS, aCondSeq[ i ], FALSE, bMainSeqChild );
+        WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild );
     } else
-        WriteAnimationCondition( pFS, aAny, FALSE, bMainSeqChild );
+        WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild );
     pFS->endElementNS( XML_p, XML_stCondLst );
     }
 
@@ -1085,9 +1092,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     pFS->startElementNS( XML_p, XML_endCondLst, FSEND );
     if( aAny >>= aCondSeq ) {
         for( int i = 0; i < aCondSeq.getLength(); i ++ )
-        WriteAnimationCondition( pFS, aCondSeq[ i ], FALSE, bMainSeqChild );
+        WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild );
     } else
-        WriteAnimationCondition( pFS, aAny, FALSE, bMainSeqChild );
+        WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild );
     pFS->endElementNS( XML_p, XML_stCondLst );
     }
 
@@ -1126,14 +1133,14 @@ void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference<
 
     pFS->startElementNS( XML_p, XML_seq, FSEND );
 
-    WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+    WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild );
 
     pFS->startElementNS( XML_p, XML_prevCondLst, FSEND );
-    WriteAnimationCondition( pFS, NULL, "onPrev", 0, TRUE );
+    WriteAnimationCondition( pFS, NULL, "onPrev", 0, sal_True );
     pFS->endElementNS( XML_p, XML_prevCondLst );
 
     pFS->startElementNS( XML_p, XML_nextCondLst, FSEND );
-    WriteAnimationCondition( pFS, NULL, "onNext", 0, TRUE );
+    WriteAnimationCondition( pFS, NULL, "onNext", 0, sal_True );
     pFS->endElementNS( XML_p, XML_nextCondLst );
 
     pFS->endElementNS( XML_p, XML_seq );
@@ -1152,7 +1159,7 @@ void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Referenc
                  XML_transition, pDirection,
                  FSEND );
 
-    WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, FALSE );
+    WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, sal_False );
 
     pFS->endElementNS( XML_p, XML_animEffect );
     }
@@ -1196,7 +1203,7 @@ void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAn
 
     pFS->startElementNS( XML_p, xmlNodeType, FSEND );
 
-    WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+    WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild );
 
     pFS->endElementNS( XML_p, xmlNodeType );
 }
@@ -1215,7 +1222,7 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS )
             pFS->startElementNS( XML_p, XML_timing, FSEND );
             pFS->startElementNS( XML_p, XML_tnLst, FSEND );
 
-            WriteAnimationNode( pFS, xNode, FALSE );
+            WriteAnimationNode( pFS, xNode, sal_False );
 
             pFS->endElementNS( XML_p, XML_tnLst );
             pFS->endElementNS( XML_p, XML_timing );
@@ -1281,7 +1288,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
         ImplWriteBackground( pFS, aXBackgroundPropSet );
     }
 
-    WriteShapeTree( pFS, NORMAL, FALSE );
+    WriteShapeTree( pFS, NORMAL, sal_False );
 
     pFS->endElementNS( XML_p, XML_cSld );
 
@@ -1304,7 +1311,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
 
 void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
 {
-    if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( TRUE ) )
+    if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) )
     return;
 
     DBG(printf("write Notes %d\n----------------\n", nPageNum));
@@ -1320,7 +1327,7 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
 
     pFS->startElementNS( XML_p, XML_cSld, FSEND );
 
-    WriteShapeTree( pFS, NOTICE, FALSE );
+    WriteShapeTree( pFS, NOTICE, sal_False );
 
     pFS->endElementNS( XML_p, XML_cSld );
 
@@ -1466,7 +1473,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
     pFS->startElementNS( XML_p, XML_cSld, FSEND );
 
     ImplWriteBackground( pFS, aXBackgroundPropSet );
-    WriteShapeTree( pFS, LAYOUT, TRUE );
+    WriteShapeTree( pFS, LAYOUT, sal_True );
 
     pFS->endElementNS( XML_p, XML_cSld );
 
@@ -1580,7 +1587,7 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste
                          XML_name, aLayoutInfo[ nOffset ].sName,
                          FSEND );
     //pFS->write( MINIMAL_SPTREE ); // TODO: write actual shape tree
-    WriteShapeTree( pFS, LAYOUT, TRUE );
+    WriteShapeTree( pFS, LAYOUT, sal_True );
 
     pFS->endElementNS( XML_p, XML_cSld );
 
@@ -1612,7 +1619,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_
             DBG(printf( "leave group\n" ));
         }
 
-        if ( GetShapeByIndex( GetCurrentGroupIndex(), TRUE ) ) {
+        if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) {
             DBG(printf( "mType: \"%s\"\n", mType.GetBuffer() ));
             aDML.WriteShape( mXShape );
         }
@@ -1638,10 +1645,10 @@ sal_Bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, Pl
     if( bMaster && ShapeExport::NonEmptyText( xShape ) ) {
     WritePlaceholderShape( xShape, ePlaceholder );
 
-    return TRUE;
+    return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder )
@@ -1948,20 +1955,20 @@ void PowerPointExport::WriteTheme( sal_Int32 nThemeNum )
 
 sal_Bool PowerPointExport::ImplCreateDocument()
 {
-    mbCreateNotes = FALSE;
+    mbCreateNotes = sal_False;
 
     for( sal_uInt32 i = 0; i < mnPages; i++ )
     {
         if ( !GetPageByIndex( i, NOTICE ) )
-            return FALSE;
+            return sal_False;
 
-    if( ContainsOtherShapeThanPlaceholders( TRUE ) ) {
-        mbCreateNotes = TRUE;
+    if( ContainsOtherShapeThanPlaceholders( sal_True ) ) {
+        mbCreateNotes = sal_True;
         break;
     }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool PowerPointExport::WriteNotesMaster()
@@ -2004,7 +2011,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
     ( mAny >>= aXBackgroundPropSet ) )
     ImplWriteBackground( pFS, aXBackgroundPropSet );
 
-    WriteShapeTree( pFS, NOTICE, TRUE );
+    WriteShapeTree( pFS, NOTICE, sal_True );
 
     pFS->endElementNS( XML_p, XML_cSld );
 
@@ -2028,7 +2035,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
 
     DBG(printf("----------------\n"));
 
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool PowerPointExport::ImplCreateMainNotes()
@@ -2036,7 +2043,7 @@ sal_Bool PowerPointExport::ImplCreateMainNotes()
     if( mbCreateNotes )
     return WriteNotesMaster();
 
-    return TRUE;
+    return sal_True;
 }
 
 #define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport"
@@ -2053,9 +2060,9 @@ uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() t
     return aSeq;
 }
 
-uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< XComponentContext > & rxCtxt ) throw( uno::Exception )
 {
-    return (cppu::OWeakObject*)new PowerPointExport( rSMgr );
+    return (cppu::OWeakObject*)new PowerPointExport( rxCtxt );
 }
 
 OUString PowerPointExport::implGetImplementationName() const
@@ -2070,6 +2077,18 @@ OUString PowerPointExport::implGetImplementationName() const
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
+static struct cppu::ImplementationEntry g_entries[] =
+{
+    {
+        oox::core::PowerPointExport_createInstance,
+        oox::core::PowerPointExport_getImplementationName,
+       oox::core::PowerPointExport_getSupportedServiceNames,
+        cppu::createSingleComponentFactory,
+        0 , 0
+    },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -2080,61 +2099,13 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME "/UNO/SERVICES/" )) ) );
-            xNewKey1->createKey( oox::core::PowerPointExport_getSupportedServiceNames().getConstArray()[0] );
-
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
 {
-    uno::Reference< lang::XSingleServiceFactory > xFactory;
-    void*                                   pRet = 0;
-
-    if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
-    {
-        const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ) );
-
-        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
-                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        oox::core::PowerPointExport_getImplementationName(),
-                        oox::core::PowerPointExport_createInstance,
-                        oox::core::PowerPointExport_getSupportedServiceNames() ) );
-    }
-
-    if( xFactory.is() )
-    {
-        xFactory->acquire();
-        pRet = xFactory.get();
-    }
-
-    return pRet;
+    return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
 }
 
 #ifdef __cplusplus
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 43de6be79a22..e2878054d0b0 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -143,7 +143,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
     rBuProv     ( rProv ),
     mnInstance  ( nInstance )
 {
-    sal_Bool bHasBullet = FALSE;
+    sal_Bool bHasBullet = sal_False;
 
     sal_uInt16 nUpperDist = 0;
     sal_uInt16 nBulletChar = 0x2022;
@@ -163,7 +163,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
             case EPP_TEXTTYPE_HalfBody :
             case EPP_TEXTTYPE_QuarterBody :
             {
-                bHasBullet = TRUE;
+                bHasBullet = sal_True;
                 nUpperDist = 0x14;
             }
             break;
@@ -225,7 +225,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
         rLev.mnAsianSettings = 2;
         rLev.mnBiDi = 0;
 
-        rLev.mbExtendedBulletsUsed = FALSE;
+        rLev.mbExtendedBulletsUsed = sal_False;
         rLev.mnBulletId = 0xffff;
         rLev.mnBulletStart = 0;
         rLev.mnMappedNumType = 0;
@@ -304,7 +304,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
             {
                 PPTExParaLevel& rLevel = maParaLevel[ i ];
                 if ( i )
-                    aParagraphObj.ImplGetNumberingLevel( rBuProv, i, FALSE );
+                    aParagraphObj.ImplGetNumberingLevel( rBuProv, i, sal_False );
                 rLevel.mnTextOfs = aParagraphObj.nTextOfs;
                 rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs;
                 rLevel.mnBulletChar = aParagraphObj.cBulletId;
@@ -436,7 +436,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev
 
     switch ( eAttr )
     {
-        case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? FALSE : TRUE : ( nValue ) ? TRUE : FALSE;
+        case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? sal_False : sal_True : ( nValue ) ? sal_True : sal_False;
         case ParaAttr_BuHardFont :
         case ParaAttr_BulletFont : return ( rPara.mnBulletFont != nValue );
         case ParaAttr_BuHardColor :
@@ -460,7 +460,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev
         case CharAttr_Embossed : nFlag = 512; break;
         case CharAttr_Font : return ( rChar.mnFont != nValue );
         case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue );
-        case CharAttr_Symbol : return TRUE;
+        case CharAttr_Symbol : return sal_True;
         case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue );
         case CharAttr_FontColor : return ( rChar.mnFontColor != nValue );
         case CharAttr_Escapement : return ( rChar.mnEscapement != nValue );
@@ -474,7 +474,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev
         else
             return ( ( nValue & nFlag ) != 0 );
     }
-    return TRUE;
+    return sal_True;
 }
 
 sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index f26363cec777..abc9755be9af 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -67,13 +67,13 @@ PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star
     mnFont              ( 0 ),
     mnAsianOrComplexFont( 0xffff ),
     mnTextSize          ( 0 ),
-    mbLastPortion       ( TRUE ),
+    mbLastPortion       ( sal_True ),
     mpText              ( NULL ),
     mpFieldEntry        ( NULL )
 {
     mXPropSet = rXPropSet;
 
-    ImplGetPortionValues( rFontCollection, FALSE );
+    ImplGetPortionValues( rFontCollection, sal_False );
 }
 
 PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange,
@@ -88,7 +88,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
 {
     String aString( rXTextRange->getString() );
     String aURL;
-    BOOL bRTL_endingParen = FALSE;
+    sal_Bool bRTL_endingParen = sal_False;
 
     mnTextSize = aString.Len();
     if ( bLast )
@@ -118,14 +118,14 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
                 mpFieldEntry->aFieldUrl = aURL;
             }
         }
-        sal_Bool bSymbol = FALSE;
+        sal_Bool bSymbol = sal_False;
 
-        if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), FALSE ) )
+        if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
         {
             sal_Int16 nCharset = 0;
             mAny >>= nCharset;
             if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL )
-                bSymbol = TRUE;
+                bSymbol = sal_True;
         }
         if ( mpFieldEntry && ( nFieldType & 0x800000 ) )    // placeholder ?
         {
@@ -143,7 +143,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
             if ( bLast && pText[ aString.Len() - 1 ] == sal_Unicode(')') && rFontCollection.GetScriptDirection( aString ) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT )
             {
                 mnTextSize++;
-                bRTL_endingParen = TRUE;
+                bRTL_endingParen = sal_True;
             }
             mpText = new sal_uInt16[ mnTextSize ];
             sal_uInt16 nChar;
@@ -202,7 +202,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
             mpText[ mnTextSize - 1 ] = 0xd;
 
         if ( bPropSetsValid )
-            ImplGetPortionValues( rFontCollection, TRUE );
+            ImplGetPortionValues( rFontCollection, sal_True );
     }
 }
 
@@ -504,7 +504,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
                             xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY );
                         if ( xFieldPropSet.is() )
                         {
-                            String aFieldKind( aXTextField->getPresentation( TRUE ) );
+                            String aFieldKind( aXTextField->getPresentation( sal_True ) );
                             if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) )
                             {
                                 if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
@@ -645,13 +645,13 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
 {
     mXPropSet = rXPropSet;
 
-    bExtendedParameters = FALSE;
+    bExtendedParameters = sal_False;
 
     nDepth = 0;
     nBulletFlags = 0;
     nParaFlags = 0;
 
-    ImplGetParagraphValues( rProv, FALSE );
+    ImplGetParagraphValues( rProv, sal_False );
 }
 
     ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent,
@@ -661,7 +661,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
     mbFirstParagraph    ( aParaFlags.bFirstParagraph ),
     mbLastParagraph     ( aParaFlags.bLastParagraph )
 {
-    bExtendedParameters = FALSE;
+    bExtendedParameters = sal_False;
 
     nDepth = 0;
     nBulletFlags = 0;
@@ -700,7 +700,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
                 }
             }
         }
-        ImplGetParagraphValues( rProv, TRUE );
+        ImplGetParagraphValues( rProv, sal_True );
     }
 }
 
@@ -815,7 +815,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
             sal_Int32 nPropertyCount = aPropertySequence.getLength();
             if ( nPropertyCount )
             {
-                bExtendedParameters = TRUE;
+                bExtendedParameters = sal_True;
                 nBulletRealSize = 100;
                 nMappedNumType = 0;
 
@@ -910,7 +910,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                                 {
                                     nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize );
                                     if ( nBulletId != 0xffff )
-                                        bExtendedBulletsUsed = TRUE;
+                                        bExtendedBulletsUsed = sal_True;
                                 }
                             }
                         }
@@ -959,7 +959,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
                     {
                         if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
                         {
-                            bExtendedBulletsUsed = TRUE;
+                            bExtendedBulletsUsed = sal_True;
                             if ( nNumberingDepth & 1 )
                                 cBulletId = 0x2013;         // defaulting bullet characters for ppt97
                             else if ( nNumberingDepth == 4 )
@@ -1243,8 +1243,8 @@ ImplTextObj::ImplTextObj( int nInstance )
     mnTextSize = 0;
     mnInstance = nInstance;
     mpList = new List;
-    mbHasExtendedBullets = FALSE;
-    mbFixedCellHeightUsed = FALSE;
+    mbHasExtendedBullets = sal_False;
+    mbFixedCellHeightUsed = sal_False;
 }
 
 ImplTextObj::~ImplTextObj()
@@ -1276,11 +1276,11 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim
                 if ( aAny >>= aXParagraph )
                 {
                     if ( !aXTextParagraphE->hasMoreElements() )
-                        aParaFlags.bLastParagraph = TRUE;
+                        aParaFlags.bLastParagraph = sal_True;
                     ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv );
                     mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed;
                     mpImplTextObj->mpList->Insert( pPara, LIST_APPEND );
-                    aParaFlags.bFirstParagraph = FALSE;
+                    aParaFlags.bFirstParagraph = sal_False;
                 }
             }
         }
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index adcf65e7b9d1..6a0c9fdbc059 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -71,12 +71,12 @@ struct SOParagraph
     SOParagraph()
     {
         nDepth = 0;
-        bExtendedParameters = FALSE;
+        bExtendedParameters = sal_False;
         nParaFlags = 0;
         nBulletFlags = 0;
         nBulletOfs = 0;
         nTextOfs = 0;
-        bExtendedBulletsUsed = FALSE;
+        bExtendedBulletsUsed = sal_False;
         nBulletId = 0xffff;
         bNumberingIsNumber = sal_True;
     };
@@ -90,7 +90,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 = TRUE );
+        sal_Bool    ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = sal_True );
 
 };
 
@@ -122,7 +122,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 = FALSE );
+        void            ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = sal_False );
 
     public :
 
@@ -165,7 +165,7 @@ struct ParaFlags
     sal_Bool    bFirstParagraph : 1;
     sal_Bool    bLastParagraph  : 1;
 
-                    ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; };
+                    ParaFlags() { bFirstParagraph = sal_True; bLastParagraph = sal_False; };
 };
 
 class ParagraphObj : public List, public PropStateValue, public SOParagraph
@@ -182,8 +182,8 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph
         void            ImplClear();
         sal_uInt32      ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
         ::com::sun::star::awt::Size         ImplMapSize( const ::com::sun::star::awt::Size& rSize );
-        void            ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
-        void            ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
+        void            ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False );
+        void            ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False );
 
     public :
 
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index aa00ce1505bb..369ce5142325 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -299,7 +299,7 @@
     MenuItem\
     {\
         Identifier = SID_OUTLINE_TEXT_AUTOFIT ; \
-        HelpID = SID_OUTLINE_TEXT_AUTOFIT ; \
+        HelpID = CMD_SID_OUTLINE_TEXT_AUTOFIT ; \
         Text [ en-US ] = "~Autofit Text" ; \
     };
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 891a3cdbccc3..a892577516c9 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -449,7 +449,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
     Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
 
     // Dokumentnamen einfuegen
-    InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, TRUE, LIST_APPEND,
+    InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, sal_True, LIST_APPEND,
                  reinterpret_cast< void* >( 1 )
     );
 }
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 94fd29678c08..12baddf142cc 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -90,6 +90,7 @@ public:
     virtual void            Activate( sal_Bool bMDI );
     virtual void            Deactivate( sal_Bool bMDI );
     virtual sal_Bool            InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    virtual sal_Bool        ImportFrom( SfxMedium &rMedium );
     virtual sal_Bool            ConvertFrom( SfxMedium &rMedium );
     virtual sal_Bool            Save();
     virtual sal_Bool            SaveAsOwnFormat( SfxMedium& rMedium );
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 0f2cd228bdff..1842903602ff 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -171,10 +171,10 @@ protected:
     Point maWinPos;
     Point maViewOrigin;
     Size maViewSize;
+    Size maPrevSize; // contains previous window size in logical coords
     sal_uInt16 mnMinZoom;
     sal_uInt16 mnMaxZoom;
 
-    sal_uInt16 mnMaxZoom;
     /** This flag tells whether to re-calculate the minimal zoom factor
         depening on the current zoom factor.  Its default value is now sal_False.
     */
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e4950bd79910..ab0b61951171 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -124,7 +124,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
     {
         case SID_OUTLINE_TEXT_AUTOFIT:
         {
-            SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
+            ::svl::IUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
             SdrObject* pObj = NULL;
             const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
             if( rMarkList.GetMarkCount() == 1 )
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 6503e70066d1..2c3b0bd4a796 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -682,7 +682,7 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                 const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&)
                             pArgs->Get( nId );
 
-                static const USHORT aWhichTable[]=
+                static const sal_uInt16 aWhichTable[]=
                 {
                     EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL,
                     EE_PARA_LRSPACE, EE_PARA_LRSPACE,
@@ -699,7 +699,7 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                         rItem.GetRight(), rItem.GetTxtLeft(),
                         rItem.GetTxtFirstLineOfst(), nId );
 
-                const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
+                const sal_Int16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                 const SvxLRSpaceItem& rOrigLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE );
                 const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET );
                 if( nOutlineLevel != -1 &&
@@ -832,7 +832,7 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
                             rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
                             rLRSpaceItem.GetTxtFirstLineOfst(), nId );
 
-                    const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
+                    const sal_Int16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
                     const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET );
                     if( nOutlineLevel != -1 &&
                         rNumBulletItem.GetNumRule() &&
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 811a4a15e19e..99b1427936e2 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -683,7 +683,7 @@ void Window::UpdateMapOrigin(sal_Bool bInvalidate)
             // resizes
             maWinPos.X() -= (aWinSize.Width() - maPrevSize.Width()) / 2;
             maWinPos.Y() -= (aWinSize.Height() - maPrevSize.Height()) / 2;
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
 
         if ( maWinPos.X() > maViewSize.Width() - aWinSize.Width() )