rebase to DEV300_m96

29 files changed, 129 insertions, 208 deletions

diff --git a/animations/prj/build.lst b/animations/prj/build.lst
index 00a1eb69c..276f25e46 100644
--- a/animations/prj/build.lst
+++ b/animations/prj/build.lst
@@ -1,3 +1,3 @@
-animations	animations	:	cppuhelper comphelper offuh NULL
+animations	animations	:	cppuhelper comphelper offuh LIBXSLT:libxslt NULL
 animations	animations						usr1	-	all	animations_mkout NULL
 animations	animations\source\animcore		nmake	-	all	animations_animcore NULL
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e98e2b747..b663187a1 100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -616,7 +616,6 @@
 #include "svx/galbrws.hxx"
 #include "svx/gallery.hxx"
 #include "svx/globl3d.hxx"
-#include "svx/globlac.hrc"
 #include "svx/globlmn.hrc"
 #include "svx/grafctrl.hxx"
 #include "svx/hlnkitem.hxx"
@@ -864,7 +863,7 @@
 #include "vcl/group.hxx"
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/lineinfo.hxx"
 #include "vcl/lstbox.hxx"
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 9e8bf7a1d..0816f2de7 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd      sd      :    filter l10n animations svx sfx2 stoc canvas NULL
+sd      sd      :    filter l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
 sd	sd										usr1	-	all	sd_mkout NULL
 sd	sd\inc									nmake		-	all	sd_inc NULL
 sd	sd\prj									get		-	all	sd_prj NULL
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b740c6d72..c269c04ef 100755..100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -5010,7 +5010,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 continue;
             }
             else if ( ( mType == "drawing.OLE2" ) || ( mType == "presentation.OLE2" )
-                        || ( mType == "presentation.Chart" ) || ( mType == "presentation.Table" )
+                        || ( mType == "presentation.Chart" ) || ( mType == "presentation.Calc" )
                             || ( mType == "presentation.OrgChart" ) )
             {
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -5201,7 +5201,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                     }
                 }
             }
-            else if ( mType == "drawing.Table" )
+            else if ( (mType == "drawing.Table") || (mType == "presentation.Table") )
             {
                 SvMemoryStream* pTmp = NULL;
                 if ( bEffect && !mbUseNewAnimations )
@@ -5390,7 +5390,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 ImplFlipBoundingBox( aPropOpt );
             aPropOpt.CreateShapeProperties( mXShape );
             aPropOpt.Commit( *mpStrm );
-            mpPptEscherEx->AddClientAnchor( maRect );
+            if ( GetCurrentGroupLevel() > 0 )		
+                mpPptEscherEx->AddChildAnchor( maRect );
+            else
+                mpPptEscherEx->AddClientAnchor( maRect );
 
             if ( pClientData )
             {
@@ -5460,7 +5463,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
 
             aPropOpt.CreateShapeProperties( mXShape );
             aPropOpt.Commit( *mpStrm );
-            mpPptEscherEx->AddClientAnchor( maRect );
+            if ( GetCurrentGroupLevel() > 0 )		
+                mpPptEscherEx->AddChildAnchor( maRect );
+            else
+                mpPptEscherEx->AddClientAnchor( maRect );
 
             *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
                     << (sal_uInt32)pClientTextBox->Tell();
@@ -5639,11 +5645,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                 aPropOpt.CreateShapeProperties( rXShape );
                 aPropOpt.Commit( *mpStrm );
                 aPropOpt2.Commit( *mpStrm, 3, ESCHER_UDefProp );
-                mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
-                *mpStrm << (sal_Int16)maRect.Top()
-                        << (sal_Int16)maRect.Left()
-                        << (sal_Int16)( maRect.GetWidth()  + maRect.Left() )
-                        << (sal_Int16)( maRect.GetHeight() + maRect.Top() );
+                if ( GetCurrentGroupLevel() > 0 )		
+                    mpPptEscherEx->AddChildAnchor( maRect );
+                else
+                    mpPptEscherEx->AddClientAnchor( maRect );
                 mpPptEscherEx->CloseContainer();
 
 
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index fbbf178c0..872df3376 100644..100755
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -270,9 +270,21 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
         else
         {
             AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId );				// Flags: Group | HaveAnchor
-            AddAtom( 8, ESCHER_ClientAnchor );
-            PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
-            *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
+            if ( mnGroupLevel == 1 )
+            {
+                AddAtom( 8, ESCHER_ClientAnchor );
+                PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
+                *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
+            }
+            else
+            {
+                AddAtom( 16, ESCHER_ChildAnchor );
+                PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
+                *mpOutStrm  << (sal_Int32)aRect.Left()
+                            << (sal_Int32)aRect.Top()
+                            << (sal_Int32)aRect.Right()
+                            << (sal_Int32)aRect.Bottom();
+            }
         }
         if ( pClientData )
         {
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 14deb7644..8ae1c06c4 100755..100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -99,7 +99,7 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize)
     if (nSize > STRING_MAXLEN)
         nSize = STRING_MAXLEN;
 
-    return xub_StrLen( nSize );
+    return static_cast< xub_StrLen >( nSize );
 }
 
 BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
diff --git a/sd/source/ui/app/accel_tmpl.src b/sd/source/ui/app/accel_tmpl.src
deleted file mode 100644
index 5afada2dd..000000000
--- a/sd/source/ui/app/accel_tmpl.src
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_ACCELERATOR
-#define SD_ACCELERATOR RID_DRAW_DEFAULTACCEL
-#include "accelids.src"
-#endif
-
-#ifndef _GLOBALACC_SRC
-#include <svx/globlac.hrc>
-#endif
-
-/** For the presentation we change some accelerator keys:
-    The navigator is moved from F5 to Shift-F5.
-    The presentation is started for F5, F9, Control-F2. The later two are
-    defined in svx/globalac.hrc.
-*/
-#define AI_SD_NAVIGATOR ACC_CODE(SID_NAVIGATOR, KEY_F5, TRUE, FALSE, FALSE )
-#define AI_PRESENTATION_F5 ACC_CODE(SID_PRESENTATION, KEY_F5, FALSE, FALSE, FALSE )
-
-Accelerator SD_ACCELERATOR
-{
-    ItemList =
-    {
-         // Funktionstasten
-        AI_ATTR_CHAR
-#if SD_ACCELERATOR != RID_GRAPHIC_DEFAULTACCEL
-        AI_PRESENTATION_F5
-        AI_PRESENTATION
-        AI_PRESENTATION_COMPAT
-#endif
-        AI_ENTER_GROUP
-        AI_COPYOBJECTS
-        AI_LEAVE_GROUP
-        AI_ATTR_TRANSFORM
-        //		AI_NAVIGATOR
-        AI_SD_NAVIGATOR
-        AI_SPELLING
-        AI_THESAURUS
-        AI_BEZIER_EDIT
-        AI_ATTR_TEXT_FITTOSIZE
-        AI_STYLE_DESIGNER
-#if SD_ACCELERATOR != RID_GRAPHIC_DEFAULTACCEL
-        AI_OUTLINEMODE
-        AI_DRAWINGMODE
-#endif
-         // A-Z Acceleratoren
-        AI_ATTR_PARA_LINESPACE_10
-        AI_ATTR_PARA_LINESPACE_20
-        AI_ATTR_PARA_LINESPACE_15
-        AI_SHOW_ITEMBROWSER
-        AI_ATTR_PARA_ADJUST_BLOCK
-        AI_ATTR_PARA_ADJUST_CENTER
-        AI_ATTR_CHAR_WEIGHT
-        AI_GROUP
-        AI_UNGROUP
-         // Weitersuchen ...
-        AI_SET_SUPER_SCRIPT
-        AI_ATTR_CHAR_POSTURE
-        AI_COMBINE
-        AI_DISMANTLE
-        AI_ATTR_PARA_ADJUST_LEFT
-        AI_ATTR_PARA_ADJUST_RIGHT
-        AI_SET_SUB_SCRIPT
-        AI_ATTR_CHAR_UNDERLINE
-        AI_STYLE_CATALOG
-#if SD_ACCELERATOR != RID_PLUGINACCEL
-// Ob das wirklich richtig ist (PlugIn-Accel) sollte mal geprueft werden !!!
-         // Anordnung
-        AI_FRAME_TO_TOP
-        AI_MOREFRONT
-        AI_FRAME_TO_BOTTOM
-        AI_MOREBACK
-         // sonstige Acceleratoren
-        AI_NEWDOC
-        AI_OPENDOC
-#endif
-        AI_SAVEDOC
-        AI_PRINTDOC
-        AI_QUITAPP
-        AI_CUT
-        AI_COPY
-        AI_PASTE
-        AI( SID_PASTE2, KEY_V, TRUE, TRUE, FALSE )
-        AI_UNDO
-        AI_REDO
-        AI_REPEAT
-        AI_DELETE
-    };
-};
-
-
-
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index a32db86f0..3ac147483 100644..100755
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -44,10 +44,10 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dockwin.hxx>
+#include <sfx2/sfxresid.hxx>
 
 #include "pres.hxx"
 #include "navigatr.hxx"
-//#include "navichld.hxx"
 #include "navigatr.hrc"
 #include "pgjump.hxx"
 #include "app.hrc"
@@ -345,7 +345,6 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
             pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN );
             pBox->EndSelection();
             delete pMenu;
-            //pBox->Invalidate();
         }
         break;
         
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index b65e3c119..5e9bb78ff 100755
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/embed/VerbAttributes.hpp>
 
 #include "sdattr.hxx"
-
+#include <sfx2/sfxresid.hxx>
 
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
@@ -489,7 +489,7 @@ void SdTPAction::OpenFileDialog()
             // filter makes the (Windows system) open file dialog follow
             // links on the desktop to directories.
             aFileDialog.AddFilter (
-                String (SdResId (STR_SFX_FILTERNAME_ALL)),
+                String (SfxResId (STR_SFX_FILTERNAME_ALL)),
                 String (RTL_CONSTASCII_USTRINGPARAM("*.*")));
 
 
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index c5bdcf132..ffda4fd50 100644..100755
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -84,6 +84,9 @@ FunctionReference FuExpandPage::Create( ViewShell* pViewSh, ::sd::Window* pWin,
 
 void FuExpandPage::DoExecute( SfxRequest& )
 {
+    if ( mpView && mpView->IsTextEdit() )
+        mpView->SdrEndTextEdit();
+
     // Selektierte Seite finden (nur Standard-Seiten)
     SdPage* pActualPage = NULL;
     USHORT i = 0;
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index 177ea82c9..229056dd6 100644..100755
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -31,7 +31,7 @@
 
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index ad484884b..671954f83 100644..100755
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -28,7 +28,7 @@
 #ifndef SD_MORPH_DLG_HXX
 #define SD_MORPH_DLG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index bd77ac135..56c03713e 100644..100755
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -29,7 +29,7 @@
 #ifndef _SD_VECTDLG_HXX
 #define _SD_VECTDLG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 6b7df9d88..73a225501 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -29,6 +29,8 @@
 
 #include <com/sun/star/presentation/XPresentation2.hpp>
 
+#include <editeng/outlobj.hxx>
+
 #include "controller/SlsSlotManager.hxx"
 #include "SlideSorter.hxx"
 #include "SlideSorterViewShell.hxx"
@@ -558,8 +560,27 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
             {
                 SdPage* pPage = aSelectedPages.GetNextElement()->GetPage();
                 SdrObject* pObj = pPage->GetPresObj(PRESOBJ_OUTLINE);
-                if (pObj!=NULL && !pObj->IsEmptyPresObj())
-                    bDisable = false;
+                if (pObj!=NULL )
+                {
+                    if( !pObj->IsEmptyPresObj() )
+                    {
+                        bDisable = false;
+                    }
+                    else
+                    {
+                        // check if the object is in edit, than its temporarely not empty
+                        SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
+                        if( pTextObj )
+                        {
+                            OutlinerParaObject* pParaObj = pTextObj->GetEditOutlinerParaObject();
+                            if( pParaObj )
+                            {
+                                delete pParaObj;
+                                bDisable = false;
+                            }
+                        }
+                    }
+                }
             }
         }
 
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index cd7cf238c..28de3260f 100755
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -291,20 +291,16 @@ SdFilterDetect::~SdFilterDetect()
                                     if ( !bRepairPackage )
                                     {
                                         // ask the user whether he wants to try to repair
-                                        RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle );
-                                        uno::Reference< task::XInteractionRequest > xRequest ( pRequest );
-
-                                        xInteraction->handle( xRequest );
-
-                                        bRepairAllowed = pRequest->isApproved();
+                                        RequestPackageReparation aRequest( aDocumentTitle );
+                                        xInteraction->handle( aRequest.GetRequest() );
+                                        bRepairAllowed = aRequest.isApproved();
                                     }
 
                                     if ( !bRepairAllowed )
                                     {
                                         // repair either not allowed or not successful
-                                        NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle );
-                                           uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest );
-                                           xInteraction->handle( xRequest );
+                                        NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+                                        xInteraction->handle( aNotifyRequest.GetRequest() );
                                     }
                                 }
 
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 88e7d42c9..e1646f9ad 100755
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -45,12 +45,6 @@ TYPEINIT1(GraphicViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new GraphicViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(GraphicViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(GraphicDocShell);
-}
-*/
 SfxViewFactory* GraphicViewShellBase::pFactory;
 SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 50b8145bd..d90a81d3e 100755
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -45,12 +45,6 @@ TYPEINIT1(ImpressViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new ImpressViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* ImpressViewShellBase::pFactory;
 SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index b0699d7ab..5ac21b934 100755
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -43,12 +43,6 @@ TYPEINIT1(OutlineViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new OutlineViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(OutlineViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* OutlineViewShellBase::pFactory;
 SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 603510df5..6cd2eff69 100755
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -52,12 +52,6 @@ TYPEINIT1(PresentationViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new PresentationViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* PresentationViewShellBase::pFactory;
 SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
     SfxViewFrame *_pFrame, SfxViewShell *pOldView)
@@ -118,7 +112,6 @@ PresentationViewShellBase::~PresentationViewShellBase (void)
 
 
 
-
 void PresentationViewShellBase::InitializeFramework (void)
 {
     com::sun::star::uno::Reference<com::sun::star::frame::XController>
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 15405d2e0..237c33e04 100755
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -43,12 +43,6 @@ TYPEINIT1(SlideSorterViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new SlideSorterViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(SlideSorterViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* SlideSorterViewShellBase::pFactory;
 SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index e475bb7dc..918f1d820 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -241,12 +241,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new ViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(ViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* ViewShellBase::pFactory;
 SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 3e119e265..428ad2f69 100755
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -34,12 +34,9 @@
 #include <svx/globl3d.hxx>
 #include <svx/svdouno.hxx>
 #include <editeng/eeitem.hxx>
-#ifndef _FLDITEM_HXX
 #include <editeng/flditem.hxx>
-#endif
-#ifndef _SVXIDS_HXX
+#include <editeng/outlobj.hxx>
 #include <svx/svxids.hrc>
-#endif
 #include <svx/svdpagv.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <svx/fmshell.hxx>
@@ -310,7 +307,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
 
         if(bDisable)
         {
-            rSet.DisableItem(SID_EXPAND_PAGE);
+            rSet.DisableItem(SID_ASSIGN_LAYOUT);
         }
     }
 
@@ -325,9 +322,26 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
             {
                 SdrObject* pObj = pPage->GetPresObj(PRESOBJ_OUTLINE);
 
-                if(pObj && !pObj->IsEmptyPresObj())
+                if (pObj!=NULL )
                 {
-                    bDisable = false;
+                    if( !pObj->IsEmptyPresObj() )
+                    {
+                        bDisable = false;
+                    }
+                    else
+                    {
+                        // check if the object is in edit, than its temporarely not empty
+                        SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
+                        if( pTextObj )
+                        {
+                            OutlinerParaObject* pParaObj = pTextObj->GetEditOutlinerParaObject();
+                            if( pParaObj )
+                            {
+                                delete pParaObj;
+                                bDisable = false;
+                            }
+                        }
+                    }
                 }
             }
         }
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 23c797a4a..06d3c5d2e 100755
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1030,9 +1030,26 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
             {
                 SdrObject* pObj = pPage->GetPresObj(PRESOBJ_OUTLINE);
 
-                if (pObj && !pObj->IsEmptyPresObj())
+                if (pObj!=NULL )
                 {
-                    bDisable = FALSE;
+                    if( !pObj->IsEmptyPresObj() )
+                    {
+                        bDisable = false;
+                    }
+                    else
+                    {
+                        // check if the object is in edit, than its temporarely not empty
+                        SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
+                        if( pTextObj )
+                        {
+                            OutlinerParaObject* pParaObj = pTextObj->GetEditOutlinerParaObject();
+                            if( pParaObj )
+                            {
+                                delete pParaObj;
+                                bDisable = false;
+                            }
+                        }
+                    }
                 }
             }
 
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index dce201fd8..7433b3eea 100755
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -99,6 +99,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     SdrGrafObj*		pNewGrafObj = NULL;
     SdrPageView*	pPV = GetSdrPageView();
     SdrObject*		pPickObj = pObj;
+    const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage();
 
     if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView))
     {
@@ -115,7 +116,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
     {
         const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
-        if( bIsGraphic || pObj->IsEmptyPresObj() )
+        if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
         {
             if( IsUndoEnabled() )
                 BegUndo(String(SdResId(STR_INSERTGRAPHIC)));	
diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx
index 47882e459..5970ed7dd 100755
--- a/sd/source/ui/view/sdview5.cxx
+++ b/sd/source/ui/view/sdview5.cxx
@@ -60,7 +60,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind )
     if( pPV )
     {
         SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() );
-        if( pPage )
+        if( pPage && !pPage->IsMasterPage() )
         {
             // first try selected shape
             if ( AreObjectsMarked() )
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 2a8a82e7f..a4a596814 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -34,8 +34,9 @@
 #include "GraphicViewShellBase.hxx"
 
 #include <sfx2/viewfrm.hxx>
+#include <svtools/svtools.hrc>
 #include <com/sun/star/lang/Locale.hpp>
-
+#include <svtools/svtdata.hxx>
 #include <utility>
 #include <vector>
 
@@ -165,7 +166,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // #87229# Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
-            String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager()));
+            String aTmp( SvtResId( STR_UNDO ) );
             aTmp += pUndoManager->GetUndoActionComment(0);
             rSet.Put(SfxStringItem(SID_UNDO, aTmp));
         }
@@ -193,7 +194,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // #87229# Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
-            String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager()));
+            String aTmp(SvtResId(STR_REDO));
             aTmp += pUndoManager->GetRedoActionComment(0);
             rSet.Put(SfxStringItem(SID_REDO, aTmp));
         }
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index ac01158b5..5794696b8 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -54,7 +54,7 @@ RESLIB1SRSFILES=\
     $(SRS)$/uitable.srs			\
     $(SRS)$/view.srs			\
     $(SRS)$/uiannotations.srs	\
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 # --- StarDraw DLL
 
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index 14de0c179..60989f862 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -1,4 +1,4 @@
-pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia NULL
+pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL
 pe	slideshow								usr1	-	all	pe_mkout NULL
 pe	slideshow\inc							nmake	-	all	pe_inc NULL
 pe	slideshow\source\engine					nmake	-	all	pe_engine pe_inc NULL
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index c8a606be6..e7282ed52 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -285,7 +285,9 @@ ShapeSharedPtr ShapeImporter::createShape(
     rtl::OUString const& shapeType ) const
 {
     if( shapeType.equalsAsciiL( 
-            RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") )) 
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ) || 
+        shapeType.equalsAsciiL( 
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape") ) ) 
     {
         // Media shape (video etc.). This is a special object
         return createMediaShape(xCurrShape, 
@@ -337,7 +339,9 @@ ShapeSharedPtr ShapeImporter::createShape(
                                   mrContext );
     }
     else if( shapeType.equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ))
+                 RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ) ||
+             shapeType.equalsAsciiL(
+                RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape") ) )
     {
         // #i46224# Mark OLE shapes as foreign content - scan them for
         // unsupported actions, and fallback to bitmap, if necessary
@@ -349,7 +353,10 @@ ShapeSharedPtr ShapeImporter::createShape(
     }
     else if( shapeType.equalsAsciiL(
                  RTL_CONSTASCII_STRINGPARAM(
-                     "com.sun.star.drawing.GraphicObjectShape") )) 
+                     "com.sun.star.drawing.GraphicObjectShape") ) ||
+             shapeType.equalsAsciiL(
+                 RTL_CONSTASCII_STRINGPARAM(
+                     "com.sun.star.presentation.GraphicObjectShape") ) ) 
     {
         GraphicObject aGraphicObject;