rebase to DEV300_m69

author: Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> 2010-01-14 19:11:13 +0100
committer: Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> 2010-01-14 19:11:13 +0100
commit: 3cc5b48005e64a6e94d7b186b5274bf2562018eb (patch)
tree: dd5d62e8e834e08a8d17ec9a7775eb98d9b3c89e /sd
parent: 4134b9134f7f9da982d6478c56fbeb9bf53711cb (diff)
parent: a2e95ebcc701038d4a1010d320a69681499f78ee (diff)
230 files changed, 1547 insertions, 1730 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 6cd1d93d9..7e75b27f9 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -1,7 +1,8 @@
-/*************************************************************************
+/************************************************************************cherex
+
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -495,75 +496,75 @@
 #include "sot/storinfo.hxx"
 
 #include "svtools/FilterConfigItem.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/brdcst.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/brdcst.hxx"
 #include "svtools/colorcfg.hxx"
 #include "svtools/colrdlg.hxx"
 #include "svtools/controldims.hrc"
-#include "svtools/ctloptions.hxx"
+#include "svl/ctloptions.hxx"
 #include "svtools/ctrlbox.hxx"
 #include "svtools/ctrltool.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
+#include "svl/eitem.hxx"
 #include "svtools/filedlg.hxx"
 #include "svtools/filter.hxx"
-#include "svtools/flagitem.hxx"
+#include "svl/flagitem.hxx"
 #include "svtools/fltcall.hxx"
-#include "svtools/fltrcfg.hxx"
-#include "svtools/globalnameitem.hxx"
-#include "svtools/hint.hxx"
-#include "svtools/historyoptions.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "svl/globalnameitem.hxx"
+#include "svl/hint.hxx"
+#include "unotools/historyoptions.hxx"
 #include "svtools/htmlout.hxx"
 #include "svtools/imap.hxx"
 #include "svtools/imapcirc.hxx"
 #include "svtools/imapobj.hxx"
 #include "svtools/imappoly.hxx"
 #include "svtools/imaprect.hxx"
-#include "svtools/inethist.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lckbitem.hxx"
-#include "svtools/lingucfg.hxx"
-#include "svtools/linguprops.hxx"
-#include "svtools/listener.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/misccfg.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/poolitem.hxx"
+#include "svl/inethist.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/languageoptions.hxx"
+#include "svl/lckbitem.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/listener.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/misccfg.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
 #include "svtools/prgsbar.hxx"
 #include "svtools/printdlg.hxx"
-#include "svtools/ptitem.hxx"
-#include "svtools/rectitem.hxx"
-#include "svtools/saveopt.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "unotools/saveopt.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
 #include "vcl/solar.hrc"
 #include "svtools/sores.hxx"
 #include "svtools/stdctrl.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hrc"
-#include "svtools/style.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hrc"
+#include "svl/style.hxx"
 #include "svtools/svmedit.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/syslocale.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/tabbar.hxx"
 #include "svtools/treelist.hxx"
-#include "svtools/undo.hxx"
+#include "svl/undo.hxx"
 #include "svtools/unoimap.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
-#include "svtools/useroptions.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
 #include "svtools/valueset.hxx"
-#include "svtools/viewoptions.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
 #include "svtools/wmf.hxx"
-#include "svtools/zforlist.hxx"
+#include "svl/zforlist.hxx"
 
 
 #include "svx/SpellDialogChildWindow.hxx"
@@ -596,7 +597,7 @@
 #include "svx/editund2.hxx"
 #include "svx/editview.hxx"
 #include "svx/eeitem.hxx"
-#include "svx/escherex.hxx"
+#include "filter/msfilter/escherex.hxx"
 #include "svx/escpitem.hxx"
 #include "svx/extrusionbar.hxx"
 #include "svx/f3dchild.hxx"
@@ -640,8 +641,8 @@
 #include "svx/lspcitem.hxx"
 #include "svx/modctrl.hxx"
 #include "svx/msdffdef.hxx"
-#include "svx/msocximex.hxx"
-#include "svx/msoleexp.hxx"
+#include "filter/msfilter/msocximex.hxx"
+#include "filter/msfilter/msoleexp.hxx"
 #include "svx/numitem.hxx"
 #include "svx/obj3d.hxx"
 #include "svx/objfac3d.hxx"
@@ -724,7 +725,7 @@
 #include "svx/svxfont.hxx"
 #include "svx/svxgrahicitem.hxx"
 #include "svx/svxids.hrc"
-#include "svx/svxmsbas.hxx"
+#include "filter/msfilter/svxmsbas.hxx"
 #include "svx/sxciaitm.hxx"
 #include "svx/sxekitm.hxx"
 #include "svx/sxelditm.hxx"
@@ -862,7 +863,7 @@
 #include "vcl/field.hxx"
 #include "vcl/fixed.hxx"
 #include "vcl/font.hxx"
-#include "vcl/fontcvt.hxx"
+#include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
 #include "vcl/gfxlink.hxx"
 #include "vcl/gradient.hxx"
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 99dca4806..bebeb1fac 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -32,9 +32,9 @@
 #define _SDATTR_HXX
 
 #include <com/sun/star/presentation/FadeEffect.hpp>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/sfx.hrc>
 
 #ifndef _SDATTR_HRC
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 1a365234f..1c9d0719a 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -42,7 +42,7 @@
 #include <sot/storage.hxx>
 #include <tools/shl.hxx>
 #include "sddllapi.h"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <sfx2/module.hxx>
 #include <vcl/vclevent.hxx>
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index f964d608f..bad50041b 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -31,7 +31,7 @@
 #ifndef _SD_SDUNDO_HXX
 #define _SD_SDUNDO_HXX
 
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "sddllapi.h"
 
 class SdDrawDocument;
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index a9f12e7e6..19796f7c5 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -46,7 +46,7 @@
 
 #include <cppuhelper/implbase7.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/unoipset.hxx>
 
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index c2caf0cc7..d3bd9a143 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -44,7 +44,7 @@
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/unoipset.hxx>
 
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index ce5a78fa1..ddb9b91cb 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -32,7 +32,7 @@
 #define _SD_UNDOMANAGER_HXX
 
 #include "misc/scopelock.hxx"
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 namespace sd
 {
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index ace6165f6..bc8bf923f 100644..100755
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd	sd	:    l10n animations svx stoc uui canvas NULL
+sd      sd      :    filter l10n animations svx stoc canvas 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/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 83355d274..67d9cfb1e 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -89,78 +89,78 @@ SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE
 SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = TRUE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
 SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = TRUE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
 SfxBoolItem RightPane SID_RIGHT_PANE
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = FALSE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
@@ -193,52 +193,52 @@ SfxVoidItem NotesChildWindow SID_NOTES_WINDOW
 SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = TRUE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
 SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI
 
 [
-    /* flags: */  
-    AutoUpdate = TRUE, 
-    Cachable = Cachable, 
-    FastCall = FALSE, 
-    HasCoreId = FALSE, 
-    HasDialog = TRUE, 
-    ReadOnlyDoc = FALSE, 
-    Toggle = FALSE, 
-    Container = FALSE, 
-    RecordAbsolute = FALSE, 
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
     RecordPerSet;
     Asynchron;
 
-    Readonly = FALSE, 
+    Readonly = FALSE,
 
-    /* config: */ 
-    AccelConfig = TRUE, 
-    MenuConfig = TRUE, 
-    StatusBarConfig = FALSE, 
-    ToolBoxConfig = TRUE, 
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
     GroupId = GID_MODIFY;
 ]
 
@@ -267,7 +267,7 @@ SfxVoidItem TaskPaneShowPanel SID_TASK_PANE (
     GroupId = GID_VIEW;
 ]
 
-interface ViewShellBaseView : View
+interface ViewShellBaseView
 {
     SID_SWITCH_SHELL
     [
@@ -353,26 +353,26 @@ interface ViewShellBaseView : View
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_RLM 
+    SID_INSERT_RLM
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_LRM         
+    SID_INSERT_LRM
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_ZWSP         
+    SID_INSERT_ZWSP
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_INSERT_ZWNBSP                
+    SID_INSERT_ZWNBSP
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
-    ]	
+    ]
     SID_RESTORE_EDITING_VIEW
     [
         ExecMethod = Execute ;
@@ -380,7 +380,7 @@ interface ViewShellBaseView : View
     ]
 }
 
-shell ViewShellBase : SfxViewShell
+shell ViewShellBase
 {
     import ViewShellBaseView[Automation];
 }
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index 743488de6..6d3267aac 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-interface DrawDocument : OfficeDocument
+interface DrawDocument
 {
     SID_PACKNGO // ole : ?, status : ?
     [
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index bdb512acf..58a6115a4 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2226,7 +2226,7 @@ interface DrawView
     
     SID_FORMATPAINTBRUSH //
     [
-        ExecMethod = FuTemporary ;
+        ExecMethod = FuPermanent ;
         StateMethod = GetMenuState ;
     ]
  
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index 2ee927d9e..159bd0522 100644
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ interface ImpressDocument : DrawDocument
 {
 }
 
-shell DrawDocShell : SfxObjectShell
+shell DrawDocShell
 {
     import ImpressDocument[Automation];
 }
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index 3e9915b07..4cd3ef0c9 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@ interface GraphicDocument : DrawDocument
 {
 }
 
-shell GraphicDocShell : SfxObjectShell
+shell GraphicDocShell
 {
     import GraphicDocument[Automation];
 }
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index 8a2c8fd97..7eb22a96c 100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -51,6 +51,11 @@ SDI2NAME=$(TARGET2)
 SIDHRCNAME=SDSLOTS.HRC
 
 SVSDI1DEPEND= \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
     sdraw.sdi \
     app.sdi \
     _docsh.sdi \
@@ -67,11 +72,15 @@ SVSDI1DEPEND= \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
-        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 SVSDI2DEPEND= \
-    sdraw.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+        $(SOLARINCXDIR)$/svx/svx.sdi \
+        $(SOLARINCXDIR)$/svx/svxitems.sdi \
+        $(SOLARINCXDIR)$/svx/xoitems.sdi \
+        sdraw.sdi \
     app.sdi \
     _docsh.sdi \
     grdocsh.sdi \
@@ -85,7 +94,6 @@ SVSDI2DEPEND= \
     ViewShellBase.sdi \
     TaskPaneViewShell.sdi \
     sdslots.hrc \
-        $(SOLARINCXDIR)$/svxslots.ilb   \
     $(PRJ)$/inc$/app.hrc
 
 # --- Targets -------------------------------------------------------
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index 8b985b103..db62ca5cd 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,8 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-import "svxslots.ilb"
-
 module
 "2DADF501-1F00-101C-A2E4-00001B4C5CE7"
 "33A1C840-1F00-101C-A2E4-00001B4C5CE7"
@@ -36,10 +34,15 @@ StarDraw
 [
 HelpText( "StarDraw Application" )
 SlotIdFile( "sdslots.hrc" )
-TypeLibFile( "sdgslots.tlb" )
 ModulePrefix( "Sd" )
 ]
 {
+        include "sfx2/sfxitems.sdi"
+        include "sfx2/sfx.sdi"
+        include "svx/svxitems.sdi"
+        include "svx/xoitems.sdi"
+        include "svx/svx.sdi"
+
         item UINT16 TbxImageItem;
 
         enum FadeEffect
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index db542fd44..3a0862a17 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -28,8 +28,6 @@
  *
  ************************************************************************/
 
-import "svxslots.ilb"
-
 module
 "2DADF501-1F00-101C-A2E4-00001B4C5CE7"
 "33A1C840-1F00-101C-A2E4-00001B4C5CE7"
@@ -37,10 +35,15 @@ StarDraw
 [
 HelpText( "StarDraw Application" )
 SlotIdFile( "sdslots.hrc" )
-TypeLibFile( "sdslots.tlb" )
 ModulePrefix( "Sd" )
 ]
 {
+        include "sfx2/sfxitems.sdi"
+        include "sfx2/sfx.sdi"
+        include "svx/svxitems.sdi"
+        include "svx/xoitems.sdi"
+        include "svx/svx.sdi"
+
         item UINT16 TbxImageItem;
 
         enum FadeEffect
diff --git a/sd/sdi/svxitems.sdi b/sd/sdi/svxitems.sdi
deleted file mode 100644
index 42d036d4e..000000000
--- a/sd/sdi/svxitems.sdi
+++ /dev/null
@@ -1,93 +0,0 @@
-enum SvxAdjust
-{
-    SVX_ADJUST_LEFT,
-    SVX_ADJUST_RIGHT,
-    SVX_ADJUST_BLOCK,
-    SVX_ADJUST_CENTER,
-    SVX_ADJUST_BLOCKLINE,
-    SVX_ADJUST_END
-}
-
-item
-{
-    INT16 Red;
-    INT16 Green;
-    INT16 Blue;
-} SvxColorItem
-
-item SvxAdjust SvxAdjustItem;
-
-item String SvxBoxInfoItem;
-
-item String SvxBoxItem;
-item String SvxBrushItem;
-item String SvxCaseMapItem;
-item String SvxCharSetColorItem;
-item String SvxColumnItem;
-item String SvxContourItem;
-item String SvxCrossedOutItem;
-item String SvxDBDescMgr;
-item String SvxDbTypeItem;
-item String SvxEscapementItem;
-item String SvxFmtBreakItem;
-item String SvxFmtSplitItem;
-item String SvxFontHeightItem;
-item String SvxFontItem;
-item String SvxFontListItem;
-item String SvxHyphenZoneItem;
-item String SvxInFrameItem;
-item String SvxKerningItem;
-item String SvxLRSpaceItem;
-item String SvxLanguageItem;
-item String SvxLineSpacingItem;
-item String SvxMacroItem;
-item String SvxNoHyphenItem;
-item String SvxNoLinebreakItem;
-item String SvxNumberInfoItem;
-item String SvxOpaqueItem;
-item String SvxOrphansItem;
-item String SvxOverlineItem;
-item String SvxPageItem;
-item String SvxPageModelItem;
-item String SvxPagePosSizeItem;
-item String SvxPaperBinItem;
-item String SvxParaDlgLimitsItem;
-item String SvxPostItAuthorItem;
-item String SvxPostItDateItem;
-item String SvxPostItTextItem;
-item String SvxPostureItem;
-item String SvxPrintItem;
-item String SvxPropSizeItem;
-item String SvxProtectItem;
-item String SvxPtrItem;
-item String SvxRulerItem;
-item String SvxSearchItem;
-item String SvxSearchControllerItem;
-item String SvxSearchItem;
-item String SvxSetItem;
-item String SvxShadowedItem;
-item String SvxShadowItem;
-item String SvxSizeItem;
-item String SvxTabStopItem;
-item String SvxULSpaceItem;
-item String SvxUnderlineItem;
-item String SvxWeightItem;
-item String SvxWidowsItem;
-item String SvxWordLineModeItem;
-item String XFillAttrSetItem;
-item String XFillBitmapItem;
-item String XFillColorItem;
-item String XFillGradientItem;
-item String XFillHatchItem;
-item String XFillStyleItem;
-item String XLineAttrSetItem;
-item String XLineColorItem;
-item String XLineDashItem;
-item String XLineEndItem;
-item String XLineEndWidthItem;
-item String XLineEndCenterItem;
-item String XLineStartItem;
-item String XLineStartWidthItem;
-item String XLineStartCenterItem;
-item String XLineStyleItem;
-item String XLineWidthItem;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index ffa177801..79ec60739 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -69,6 +69,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 #include <algorithm>
 
@@ -1715,21 +1716,16 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj )
         SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() );
         if( pObj )
         {
-            ::basegfx::B2DHomMatrix aTransform;
-
             SdrPage* pPage = pObj->GetPage();
             if( pPage )
             {
                 const Size aPageSize( pPage->GetSize() );
-                aTransform.scale( (double)aPageSize.Width(), (double)aPageSize.Height() );
-                xPolyPoly.transform( aTransform );
-                aTransform.identity();
+                xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix((double)aPageSize.Width(), (double)aPageSize.Height()));
             }
 
             const Rectangle aBoundRect( pObj->GetCurrentBoundRect() );
             const Point aCenter( aBoundRect.Center() );
-            aTransform.translate( aCenter.X(), aCenter.Y() );
-            xPolyPoly.transform( aTransform );
+            xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(aCenter.X(), aCenter.Y()));
         }
     }
 
@@ -1748,17 +1744,14 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj
         const Rectangle aBoundRect( pObj->GetCurrentBoundRect() );
         const Point aCenter( aBoundRect.Center() );
 
-        ::basegfx::B2DHomMatrix aTransform;
-        aTransform.translate( -aCenter.X(), -aCenter.Y() );
-        xPolyPoly.transform( aTransform );
+        xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y()));
 
         SdrPage* pPage = pObj->GetPage();
         if( pPage )
         {
-            aTransform.identity();
             const Size aPageSize( pPage->GetSize() );
-            aTransform.scale( 1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height() );
-            xPolyPoly.transform( aTransform );
+            xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix(
+                1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height()));
         }
     }
 
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index d00e4bd79..e652ea318 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 
 #include <tools/debug.hxx>
@@ -90,7 +90,7 @@ static Reference< XNameAccess > getNodeAccess( const Reference< XMultiServiceFac
         aArgs[0] <<= aPropValue;
 
         xConfigAccess = Reference< XNameAccess >::query(
-            xConfigProvider->createInstanceWithArguments( 
+            xConfigProvider->createInstanceWithArguments(
                 OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )),
                 aArgs ));
     }
@@ -149,7 +149,7 @@ CustomAnimationPreset::CustomAnimationPreset( CustomAnimationEffectPtr pEffect )
     maPresetId = pEffect->getPresetId();
     maProperty = pEffect->getProperty();
     mnPresetClass = pEffect->getPresetClass();
-    
+
     add( pEffect );
 
     mfDuration = pEffect->getDuration();
@@ -346,17 +346,17 @@ void CustomAnimationPresets::importEffects()
 
         uno::Reference< util::XMacroExpander > xMacroExpander;
         if( xContext.is() )
-            xMacroExpander.set( xContext->getValueByName( 
+            xMacroExpander.set( xContext->getValueByName(
                                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))),
                                 UNO_QUERY );
 
         Reference< XMultiServiceFactory > xConfigProvider(
-            xServiceFactory->createInstance( 
+            xServiceFactory->createInstance(
                 OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
             UNO_QUERY_THROW );
 
         // read path to transition effects files from config
-        Any propValue = uno::makeAny( 
+        Any propValue = uno::makeAny(
             beans::PropertyValue(
                 OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )), -1,
                 uno::makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/Misc") )),
@@ -446,13 +446,13 @@ void CustomAnimationPresets::importResources()
             return;
 
         Reference< XMultiServiceFactory > xConfigProvider(
-            xServiceFactory->createInstance( 
+            xServiceFactory->createInstance(
                 OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
             UNO_QUERY );
 
         const OUString aPropertyPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Properties" ) );
         implImportLabels( xConfigProvider, aPropertyPath, maPropertyNameMap );
-    
+
         const OUString aEffectsPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/UserInterface/Effects" ) );
         implImportLabels( xConfigProvider, aEffectsPath, maEffectNameMap );
 
@@ -526,7 +526,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
                         {
                             aEffectsList.push_back( pEffect );
                         }
-#ifdef DEBUG			
+#ifdef DEBUG
                         else
                         {
                             aMissedPresetIds += String(*pEffectNames);
@@ -548,7 +548,7 @@ void CustomAnimationPresets::importPresets( const Reference< XMultiServiceFactor
         DBG_ERROR( "sd::CustomAnimationPresets::importPresets(), Exception catched!" );
     }
 
-#ifdef DEBUG			
+#ifdef DEBUG
     if( aMissedPresetIds.Len() )
     {
         ByteString aTmp( "sd::CustomAnimationPresets::importPresets(), invalid preset id!\n" );
@@ -646,7 +646,7 @@ Reference< XAnimationNode > CustomAnimationPresets::getRandomPreset( sal_Int16 n
     if( pCategoryList && pCategoryList->size() )
     {
         sal_Int32 nCategory = (rand() * pCategoryList->size() / RAND_MAX);
-        
+
         PresetCategoryPtr pCategory = (*pCategoryList)[nCategory];
         if( pCategory.get() && pCategory->maEffects.size() )
         {
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index b8147ff95..59251f62e 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
 
 #include <rtl/uri.hxx>
@@ -171,13 +171,13 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
 
         uno::Reference< util::XMacroExpander > xMacroExpander;
         if( xContext.is() )
-            xMacroExpander.set( xContext->getValueByName( 
+            xMacroExpander.set( xContext->getValueByName(
                                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))),
                                 UNO_QUERY );
 
         // import ui strings
         Reference< XMultiServiceFactory > xConfigProvider(
-            xServiceFactory->createInstance( 
+            xServiceFactory->createInstance(
                 OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
             UNO_QUERY_THROW );
 
@@ -186,7 +186,7 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
         implImportLabels( xConfigProvider, aTransitionPath, aTransitionNameMape );
 
         // read path to transition effects files from config
-        Any propValue = uno::makeAny( 
+        Any propValue = uno::makeAny(
             beans::PropertyValue(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1,
                 uno::makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/Misc"))),
@@ -213,9 +213,9 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
                 aURL = xMacroExpander->expandMacros( aMacro );
             }
 
-            bRet |= importTransitionsFile( rList, 
-                                           xServiceFactory, 
-                                           aTransitionNameMape, 
+            bRet |= importTransitionsFile( rList,
+                                           xServiceFactory,
+                                           aTransitionNameMape,
                                            aURL );
         }
 
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 45d7a9dc1..d3c8ae37b 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -31,10 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 #include <tools/urlobj.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include "svx/xtable.hxx"
 #include <svx/svdopath.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/flditem.hxx>
 #include <svx/eeitem.hxx>
 
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 624fa6fc5..b2931d54f 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,11 +42,8 @@
 #include <svx/eeitem.hxx>
 #include <svx/scriptspaceitem.hxx>
 
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
-#ifndef _OFA_MISCCFG_HXX
-#include <svtools/misccfg.hxx>
-#endif
 #include <sfx2/printer.hxx>
 #include <sfx2/topfrm.hxx>
 #include <sfx2/app.hxx>
@@ -57,30 +54,30 @@
 #include <svx/eeitem.hxx>
 #include <svx/editstat.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 #include <svx/svdoattr.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/bulitem.hxx>
 #include <svx/numitem.hxx>
 #include <svx/svditer.hxx>
 #include <svx/unolingu.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <svx/xtable.hxx>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svx/outlobj.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 #include <comphelper/extract.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
 #ifndef _SVTOOLS_PATHOPTIONS_HXX_
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #endif
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
 
 #include "eetext.hxx"
 #include "drawdoc.hxx"
@@ -233,11 +230,11 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
         SvtLinguOptions			aOptions;
         aLinguConfig.GetOptions( aOptions );
 
-        SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage, 
+        SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage,
             ::com::sun::star::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE );
         SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK,
             ::com::sun::star::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK );
-        SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, 
+        SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL,
             ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL );
 
         mbOnlineSpell = aOptions.bIsSpellAuto;
@@ -262,7 +259,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
     }
 
     // DefTab und SpellOptions setzen
-    //OfaMiscCfg* pOfaMiscCfg = SFX_APP()->GetMiscConfig();
     // Jetzt am Modul (SD)
     USHORT nDefTab = pOptions->GetDefTab();
     SetDefaultTabulator( nDefTab );
@@ -1087,7 +1083,7 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString& rAutho
         SvtUserOptions aUserOptions;
         maAnnotationAuthors.push_back( aUserOptions.GetFullName() );
     }
-    
+
     sal_uInt16 idx = 0;
     for( std::vector< OUString >::iterator iter( maAnnotationAuthors.begin() ); iter != maAnnotationAuthors.end(); iter++ )
     {
@@ -1097,12 +1093,12 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString& rAutho
         }
         idx++;
     }
-    
+
     if( idx == maAnnotationAuthors.size() )
     {
         maAnnotationAuthors.push_back( rAuthor );
     }
-    
+
     return idx;
 }
 
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 81b302024..258b9a1fc 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -49,7 +49,7 @@
 #include <vcl/svapp.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/flditem.hxx>
 
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 2fe1f33dd..b4c4388f2 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -44,13 +44,13 @@
 #include <sfx2/docfile.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svditer.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/linkmgr.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 823848d06..4ee0e7976 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -102,7 +102,7 @@
 #include <svx/unolingu.hxx>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/outlobj.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/langitem.hxx>
@@ -119,7 +119,7 @@
 #include "shapelist.hxx"
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 75bb8df9a..9643ef867 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -54,7 +54,7 @@
 #include <basic/basmgr.hxx>
 #include <svx/pbinitem.hxx>
 #include <svx/svdundo.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/editobj.hxx>
 #ifndef _SVX_SRIPTTYPEITEM_HXX
@@ -302,8 +302,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
         case PRESOBJ_HANDOUT:
         {
             //Erste Standardseite am SdrPageObj vermerken
-            SdrPage* pFirstPage = ( (SdDrawDocument*) pModel )->GetSdPage(0, PK_STANDARD);
-            pSdrObj = new SdrPageObj( pFirstPage );
+            // #i105146# We want no content to be displayed for PK_HANDOUT,
+            // so just never set a page as content
+            pSdrObj = new SdrPageObj(0);
             pSdrObj->SetResizeProtect(TRUE);
         }
         break;
@@ -745,28 +746,17 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate )
             CalculateHandoutAreas( *static_cast< SdDrawDocument* >(GetModel() ), pMasterPage->GetAutoLayout(), false, aAreas );
 
             const bool bSkip = pMasterPage->GetAutoLayout() == AUTOLAYOUT_HANDOUT3;
-
-            sal_uInt16 nPage = 0;
             std::vector< Rectangle >::iterator iter( aAreas.begin() );
+
             while( iter != aAreas.end() )
             {
                 SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, FALSE, (*iter++), TRUE) );
-
-                const sal_uInt16 nDestinationPageNum(2 * nPage + 1);
-
-                if(nDestinationPageNum < pModel->GetPageCount())
-                {
-                    pPageObj->SetReferencedPage(pModel->GetPage(nDestinationPageNum));
-                }
-                else
-                {
-                    pPageObj->SetReferencedPage(0L);
-                }
+                // #i105146# We want no content to be displayed for PK_HANDOUT,
+                // so just never set a page as content
+                pPageObj->SetReferencedPage(0L);
 
                 if( bSkip && iter != aAreas.end() )
                     iter++;
-
-                nPage++;
             }
         }
 
@@ -2049,40 +2039,6 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
                     pObj->NbcMove(aVec);
                 }
 
-                Rectangle aBoundRect = pObj->GetCurrentBoundRect();
-
-                if (!aBorderRect.IsInside(aBoundRect))
-                {
-                    /**********************************************************
-                    * Objekt liegt nicht vollstaendig innerhalb der Raender
-                    * -> Position korrigieren
-                    **********************************************************/
-                    Point aOldPos(aBoundRect.TopLeft());
-                    aNewPos = aOldPos;
-
-                    // Position links oben ggf. korrigieren
-                    aNewPos.X() = Max(aNewPos.X(), aBorderRect.Left());
-                    aNewPos.Y() = Max(aNewPos.Y(), aBorderRect.Top());
-                    aVec = Size(aNewPos.X() - aOldPos.X(), aNewPos.Y() - aOldPos.Y());
-
-                    if (aVec.Height() != 0 || aVec.Width() != 0)
-                    {
-                        pObj->NbcMove(aVec);
-                    }
-
-                    // Position rechts unten ggf. korrigieren
-                    aOldPos = aBoundRect.BottomRight();
-                    aNewPos = aOldPos;
-                    aNewPos.X() = Min(aNewPos.X(), aBorderRect.Right());
-                    aNewPos.Y() = Min(aNewPos.Y(), aBorderRect.Bottom());
-                    aVec = Size(aNewPos.X() - aOldPos.X(), aNewPos.Y() - aOldPos.Y());
-
-                    if (aVec.Height() != 0 || aVec.Width() != 0)
-                    {
-                        pObj->NbcMove(aVec);
-                    }
-                }
-
                 pObj->SetChanged();
                 pObj->BroadcastObjectChange();
             }
@@ -2883,7 +2839,7 @@ bool SdPage::checkVisibility(
                     }
                 }
             } // check for placeholders on master
-            else if( pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) 
+            else if( (eKind != PRESOBJ_NONE) && pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) 
             {
                 // presentation objects on master slide are always invisible if slide is shown.
                 return false;
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index bfa87d633..ad59908aa 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdotext.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/outlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/xmlcnitm.hxx>
 #include <svx/svditer.hxx>
 #include <tools/list.hxx>
@@ -60,7 +60,7 @@
 
 // #90477#
 #include <tools/tenccvt.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using namespace ::sd;
 using namespace ::com::sun::star;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 10258dbb9..574c3d806 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -37,7 +37,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <svx/unoprov.hxx>
 
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 6efb3558d..ddeec77e0 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -42,14 +42,14 @@
 #include <svx/wghtitem.hxx>
 #include <svx/postitem.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/numitem.hxx>
 #include <svx/brshitem.hxx>
 #include <svx/editeng.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/langitem.hxx>
 #include <svx/charreliefitem.hxx>
 #ifndef _SVX_EMPHITEM_HXX
@@ -64,7 +64,7 @@
 #include <svx/bulitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/adjitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #define _SDR_POSITIVE
 #define _SDR_ITEMS
@@ -78,7 +78,7 @@
 #include "sdmod.hxx"
 #include "sdpage.hxx"
 #include "helpids.h"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 93a078312..ce756e65a 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -46,8 +46,8 @@
 #include <svx/fhgtitem.hxx>
 #include <svx/svdoattr.hxx>
 #include <svx/ulspitem.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/itemset.hxx>
 
 #include <svx/xflbmtit.hxx>
 #include <svx/xflbstit.hxx>
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 80d1fc559..ca07fcdfd 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -43,13 +43,13 @@
 #include <svx/wghtitem.hxx>
 #include <svx/postitem.hxx>
 #include <svx/fontitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/tstpitem.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/protitem.hxx>
 #include <svx/chrtitem.hxx>
 
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/postattr.hxx>
 #include <svx/editdata.hxx>
@@ -96,9 +96,9 @@
 #include <svx/drawitem.hxx>
 
 // #UndoRedo#
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 
-#include <svtools/lckbitem.hxx>
+#include <svl/lckbitem.hxx>
 
 
 #define CharSetItem 				SfxUInt16Item
@@ -129,8 +129,8 @@
 #define OfaStringListItem           SfxStringListItem
 #define avmedia_MediaItem           ::avmedia::MediaItem
 #include <sfx2/tplpitem.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/rectitem.hxx>
 
 #include <sfx2/frame.hxx>
 
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index fdc1f3066..336c86fa6 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -33,7 +33,7 @@
 
 #include <osl/module.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svx/xflclit.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 4f29f503b..6e9d39b40 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -58,10 +58,11 @@
 #include <tools/zcodec.hxx>
 #include <svx/svxenum.hxx>
 #include <sot/storinfo.hxx>
-#include <svx/msoleexp.hxx>
+#include <filter/msfilter/msoleexp.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/wmf.hxx>
-#include <svx/msdffimp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <svx/flditem.hxx>
 #include <sfx2/docinf.hxx>
 
@@ -222,8 +223,6 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
     }
     if ( !ImplCreateMainNotes() )
         return;
-    maTextRuleList.First();                         // rewind list, so we can get the current or next entry without
-                                                    // searching, all entrys are sorted#
     for ( i = 0; i < mnPages; i++ )
     {
         if ( !ImplCreateSlide( i ) )
@@ -274,8 +273,6 @@ PPTWriter::~PPTWriter()
     while( aStyleSheetIter < maStyleSheetList.end() )
         delete *aStyleSheetIter++;
 
-    for ( pPtr = maTextRuleList.First(); pPtr; pPtr = maTextRuleList.Next() )
-        delete (TextRuleEntry*)pPtr;
     for ( pPtr = maSlideNameList.First(); pPtr; pPtr = maSlideNameList.Next() )
         delete (::rtl::OUString*)pPtr;
     for ( pPtr = maHyperlink.First(); pPtr; pPtr = maHyperlink.Next() )
@@ -560,22 +557,12 @@ sal_Bool PPTWriter::ImplCreateDocument()
 
     mpPptEscherEx->OpenContainer( EPP_SlideListWithText );      // Animation info fuer die Slides
 
-    sal_uInt32  nShapes;
-    sal_Bool    bOtherThanPlaceHolders;
-
     for ( i = 0; i < mnPages; i++ )
     {
-        sal_uInt32  nPOffset, nPObjects;
-        sal_Bool    bOutliner, bTitle;
-
-        bOtherThanPlaceHolders = bOutliner = bTitle = FALSE;
-        nPObjects = 0;
-
         mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
         mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() );
-        *mpStrm << (sal_uInt32)0;                               // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
-        nPOffset = mpStrm->Tell();
-        *mpStrm << (sal_uInt32)0                                // flags - only bit 3 used, if set then slide contains shapes other than placeholders
+        *mpStrm << (sal_uInt32)0								// psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
+                << (sal_uInt32)4                                // flags - only bit 3 used, if set then slide contains shapes other than placeholders
                 << (INT32)0                                     // numberTexts - number of placeholder texts stored with the persist object.  Allows to display outline view without loading the slide persist objects
                 << (INT32)i + 0x100                             // slideId - Unique slide identifier, used for OLE link monikers for example
                 << (sal_uInt32)0;                               // reserved, usualy 0
@@ -584,8 +571,6 @@ sal_Bool PPTWriter::ImplCreateDocument()
             return FALSE;
         ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) );
 
-        const PHLayout& rLayout = ImplGetLayout( mXPagePropSet );
-
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
             aXName( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
 
@@ -597,113 +582,16 @@ sal_Bool PPTWriter::ImplCreateDocument()
         }
         else
             maSlideNameList.Insert( new ::rtl::OUString(), LIST_APPEND );
-
-        nShapes = mXShapes->getCount();
-
-        sal_Bool bSecOutl = FALSE;
-        if ( nShapes && ( rLayout.bTitlePossible || rLayout.bOutlinerPossible ) )
-        {
-            for ( sal_uInt32 nIndex = 0; nIndex < nShapes; nIndex++ )
-            {
-                if ( !ImplGetShapeByIndex( nIndex ) )
-                    continue;
-
-                if ( mbPresObj && ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) ) )
-                {
-                    if ( bOutliner == FALSE )
-                    {
-                        bOutliner = TRUE;
-                        mnTextStyle = EPP_TEXTSTYLE_BODY;
-                        sal_uInt32 nTextType = EPP_TEXTTYPE_Body;
-                        if ( bSecOutl )
-                            nTextType = EPP_TEXTTYPE_HalfBody;
-                        else if ( mType == "presentation.Subtitle" )
-                            nTextType = EPP_TEXTTYPE_CenterBody;
-
-                        TextRuleEntry* pRule = new TextRuleEntry( i );
-                        SvMemoryStream aExtBu( 0x200, 0x200 );
-                        if ( !mbEmptyPresObj )
-                            ImplGetText();
-                        ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pRule, aExtBu, NULL );
-                        ImplWriteExtParaHeader( aExtBu, nPObjects++, nTextType, i + 0x100 );
-                        maTextRuleList.Insert( (void*)pRule, LIST_APPEND );
-                        if ( rLayout.bSecOutlinerPossible )
-                        {
-                            if ( ( nIndex + 1 ) < nShapes )
-                            {
-                                if ( ImplGetShapeByIndex( nIndex + 1 ) && mType == "presentation.Outliner" )
-                                {
-                                    bSecOutl = TRUE;
-                                    TextRuleEntry* pTempRule = new TextRuleEntry( i );
-                                    SvMemoryStream aTmpStrm( 0x200, 0x200 );
-                                    if ( !mbEmptyPresObj )
-                                        ImplGetText();
-                                    ImplWriteTextStyleAtom( *mpStrm, nTextType, nPObjects, pTempRule, aTmpStrm, NULL );
-                                    ImplWriteExtParaHeader( aTmpStrm, nPObjects++, nTextType, i + 0x100 );
-                                    maTextRuleList.Insert( (void*)pTempRule, LIST_APPEND );
-                                }
-                            }
-                        }
-                    }
-                }
-                else if ( rLayout.bTitlePossible && ( mType == "presentation.TitleText" ) )
-                {
-                    if ( bTitle == FALSE )
-                    {
-                        bTitle = TRUE;
-                        mnTextStyle = EPP_TEXTSTYLE_TITLE;
-                        TextRuleEntry* pRule = new TextRuleEntry( i );
-                        SvMemoryStream aExtBu( 0x200, 0x200 );
-                        if ( !mbEmptyPresObj )
-                            ImplGetText();
-                        ImplWriteTextStyleAtom( *mpStrm, EPP_TEXTTYPE_Title, nPObjects, pRule, aExtBu, NULL );
-                        ImplWriteExtParaHeader( aExtBu, nPObjects++, EPP_TEXTTYPE_Title, i + 0x100 );
-                        maTextRuleList.Insert( (void*)pRule, LIST_APPEND );
-                    }
-                }
-                else
-                {
-                    if ( mbEmptyPresObj )
-                        nPObjects++;
-                    else
-                        bOtherThanPlaceHolders = TRUE;  // muss noch auf background und leeren Title/outliner geprueft werden !!!
-                }
-                if ( bOutliner && bTitle && bOtherThanPlaceHolders )
-                    break;
-            }
-        }
-        if ( nPObjects )
-        {
-            sal_uInt32 nOldPos = mpStrm->Tell();
-            mpStrm->Seek( nPOffset );
-            *mpStrm << (sal_uInt32)( ( bOtherThanPlaceHolders ) ? 4 : 0 );
-            *mpStrm << nPObjects;
-            mpStrm->Seek( nOldPos );
-        }
     }
     mpPptEscherEx->CloseContainer();    // EPP_SlideListWithText
 
     mpPptEscherEx->OpenContainer( EPP_SlideListWithText, 2 );   // Animation info fuer die notes
     for( i = 0; i < mnPages; i++ )
     {
-        if ( !ImplGetPageByIndex( i, NOTICE ) )
-            return FALSE;
-
-        nShapes = mXShapes->getCount();
-
-        bOtherThanPlaceHolders = FALSE;
-        if ( nShapes )
-        {
-            for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == FALSE ); nIndex++ )
-            {
-                 if ( ImplGetShapeByIndex( nIndex ) && ( mType != "drawing.Page" ) )
-                    bOtherThanPlaceHolders = TRUE;
-            }
-        }
         mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
         mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() );
         *mpStrm << (sal_uInt32)0
-                << (sal_uInt32)( ( bOtherThanPlaceHolders ) ? 4 : 0 )
+                << (sal_uInt32)4
                 << (INT32)0
                 << (INT32)i + 0x100
                 << (sal_uInt32)0;
@@ -2580,3 +2468,38 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rS
     return bStatus;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
+{
+    SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
+    SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE );
+    aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+
+    SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+    if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
+    {
+        SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
+        if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
+        {
+            SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
+            if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
+            {
+                UINT32 nLen = xTemp->GetSize();
+                if ( nLen )
+                {
+                    char* pTemp = new char[ nLen ];
+                    if ( pTemp )
+                    {
+                        xTemp->Seek( STREAM_SEEK_TO_BEGIN );
+                        xTemp->Read( pTemp, nLen );
+                        pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
+                        pBas->ObjectOwnsMemory( TRUE );
+                        return TRUE;
+                    }
+                }
+            }
+        }
+    }
+
+    return FALSE;
+}
+
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index ed84604e9..00f7a5fd0 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -38,7 +38,7 @@
 #include <sot/storage.hxx>
 #include <tools/gen.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/fontcvt.hxx>
+#include <unotools/fontcvt.hxx>
 #include <tools/string.hxx>
 #include "pptexanimations.hxx"
 #include <pptexsoundcollection.hxx>
@@ -85,7 +85,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/style/TabStop.hpp>
-#include <svx/msocximex.hxx>
+#include <filter/msfilter/msocximex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -756,7 +756,6 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
         sal_uInt32			mnShapeMasterTitle;
         sal_uInt32			mnShapeMasterBody;
 
-        List				maTextRuleList;		// TextRuleEntry's
         List				maHyperlink;
 
         FontCollection			maFontCollection;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3c4cf0318..0a074d96d 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -46,7 +46,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gradient.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 //#ifndef _SVX_XIT_HXX
 //#include <svx/xit.hxx>
 //#endif
@@ -4239,6 +4239,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
 
     sal_Bool bAdditionalText = FALSE;
 
+    sal_Bool bSecOutl = FALSE;
+    sal_uInt32 nPObjects = 0;
+
     SvMemoryStream* pClientTextBox = NULL;
     SvMemoryStream* pClientData = NULL;
 
@@ -5341,32 +5344,32 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 if ( !pClientTextBox )
                     pClientTextBox = new SvMemoryStream( 0x200, 0x200 );
 
-                *pClientTextBox << (sal_uInt32)( EPP_OutlineTextRefAtom << 16 ) << (sal_uInt32)4
-                                << nPlacementID;
-
                 if ( mbEmptyPresObj == FALSE )
                 {
                     if ( ( ePageType == NORMAL ) && ( bMasterPage == FALSE ) )
-                    {   // try to allocate the textruleratom
-                        TextRuleEntry*  pTextRule = (TextRuleEntry*)maTextRuleList.GetCurObject();
-                        while ( pTextRule )
+                    {
+                        sal_uInt32 nTextType = EPP_TEXTTYPE_Body;
+                        if ( mnTextStyle == EPP_TEXTSTYLE_BODY )
+                        {				
+                            if ( bSecOutl )
+                                nTextType = EPP_TEXTTYPE_HalfBody;
+                            else if ( mType == "presentation.Subtitle" )
+                                nTextType = EPP_TEXTTYPE_CenterBody;
+                            bSecOutl = sal_True;
+                        }
+                        else
+                            nTextType = EPP_TEXTTYPE_Title;
+
+                        TextRuleEntry aTextRule( nPageNumber );
+                        SvMemoryStream aExtBu( 0x200, 0x200 );
+                        ImplGetText();
+                        ImplWriteTextStyleAtom( *pClientTextBox, nTextType, nPObjects, &aTextRule, aExtBu, NULL );
+                        ImplWriteExtParaHeader( aExtBu, nPObjects++, nTextType, nPageNumber + 0x100 );
+                        SvMemoryStream* pOut = aTextRule.pOut;
+                        if ( pOut )
                         {
-                            int nRulePage = pTextRule->nPageNumber;
-                            if ( nRulePage > nPageNumber )
-                                break;
-                            else if ( nRulePage < nPageNumber )
-                                pTextRule = (TextRuleEntry*)maTextRuleList.Next();
-                            else
-                            {
-                                SvMemoryStream* pOut = pTextRule->pOut;
-                                if ( pOut )
-                                {
-                                    pClientTextBox->Write( pOut->GetData(), pOut->Tell() );
-                                    delete pOut, pTextRule->pOut = NULL;
-                                }
-                                maTextRuleList.Next();
-                                break;
-                            }
+                            pClientTextBox->Write( pOut->GetData(), pOut->Tell() );
+                            delete pOut, aTextRule.pOut = NULL;
                         }
                     }
                 }
diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx
index c466b915b..66b50b882 100644
--- a/sd/source/filter/eppt/escherex.hxx
+++ b/sd/source/filter/eppt/escherex.hxx
@@ -30,7 +30,7 @@
 
 #ifndef _PptEscherEX_HXX
 #define _PptEscherEX_HXX
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 
 // ---------------------------------------------------------------------------------------------
 // Werte fuer den ULONG im PPT_PST_TextHeaderAtom
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 726d148a8..216aadc8d 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -38,7 +38,7 @@
 #include "../ppt/pptanimations.hxx"
 #endif
 #include <pptexsoundcollection.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 8237fb96c..d4c515e56 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -60,7 +60,7 @@
 
 // --
 #include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
@@ -134,7 +134,7 @@ SdGRFFilter_ImplInteractionHdl::~SdGRFFilter_ImplInteractionHdl()
 
 void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest )
         throw( com::sun::star::uno::RuntimeException )
-{		
+{
     if( !m_xInter.is() )
         return;
 
@@ -395,7 +395,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
 
         Reference< XGraphicProvider > xProvider( xSM->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ) ), UNO_QUERY_THROW );
         Reference< XPropertySet > xShapeSet( xShape, UNO_QUERY_THROW );
-    
+
         // detect mime type of graphic
         OUString aMimeType;
         OUString sGraphicURL;
@@ -481,7 +481,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
 
         // populate filter dialog filter list and select default filter to match graphic mime type
 
-        GraphicFilter& rGF = *GetGrfFilter(); 
+        GraphicFilter& rGF = *GetGrfFilter();
         Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
         OUString aDefaultFormatName;
         USHORT nCount = rGF.GetExportFormatCount();
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index d5f7774c4..2671452a0 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/image.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include <boost/shared_ptr.hpp>
 
@@ -151,7 +151,7 @@ public:
     ButtonSetImpl();
 
     int getCount() const;
-    
+
     bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage );
     bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName );
 
@@ -200,7 +200,7 @@ int ButtonSetImpl::getCount() const
 {
     return maButtons.size();
 }
-    
+
 bool ButtonSetImpl::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage )
 {
     if( (nSet >= 0) && (nSet < static_cast<int>(maButtons.size())))
@@ -299,7 +299,7 @@ int ButtonSet::getCount() const
 {
     return mpImpl->getCount();
 }
-    
+
 bool ButtonSet::getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage )
 {
     return mpImpl->getPreview( nSet, rButtons, rImage );
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 9c9e4d609..2ae4e480c 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 #include <tools/fsys.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
@@ -50,7 +50,7 @@
 #include <sfx2/progress.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svditer.hxx>
 #include <svtools/imaprect.hxx>
 #include <svtools/imapcirc.hxx>
@@ -75,9 +75,9 @@
 #include <svx/flditem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 //#ifndef _SVDETC_HXX
 //#include <svx/svdetc.hxx>
 //#endif
@@ -368,7 +368,7 @@ String HtmlState::SetLink( const String& aLink, const String& aTarget )
 static String getParagraphStyle( SdrOutliner* pOutliner, USHORT nPara )
 {
     SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) );
-    
+
     String sStyle( RTL_CONSTASCII_USTRINGPARAM("direction:") );
     if( static_cast<const SvxFrameDirectionItem*>(aParaSet.GetItem( EE_PARA_WRITINGDIR ))->GetValue() == FRMDIR_HORI_RIGHT_TOP )
     {
@@ -688,13 +688,13 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
 
     maExportPath = aINetURLObj.GetPartBeforeLastName();	// with trailing '/'
     maIndex = aINetURLObj.GetLastName();
-    
+
     mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD );
 //    USHORT nHiddenSlides = 0;
     for( USHORT nPage = 0; nPage < mnSdPageCount; nPage++ )
     {
         pPage = mpDoc->GetSdPage( nPage, PK_STANDARD );
-        
+
         if( mbHiddenSlides || !pPage->IsExcluded() )
         {
             maPages.push_back( pPage );
@@ -1291,7 +1291,7 @@ String HtmlExport::CreateTextForPage( SdrOutliner* pOutliner,
                     aStr.Append( sStyle );
                     aStr.AppendAscii( "\">" );
                 }
-                
+
                 if(nActDepth <= 0 && bHeadLine)
                 {
                     if( nActDepth == 0 )
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 6ec482189..6ba1a54b6 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <vcl/gdimtf.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "resltn.hxx"       // enum PublishingResolution
 #include <svtools/colrdlg.hxx>
 #include <svtools/ehdl.hxx>
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 706378ac4..9cbbaaedb 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,14 +44,14 @@
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/valueset.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/impgrf.hxx>
 #include <svtools/colrdlg.hxx>
 #include <svx/colritem.hxx>
@@ -60,8 +60,8 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <pres.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "sdresid.hxx"
 #include "sdattr.hxx"
@@ -1645,7 +1645,7 @@ BOOL SdPublishingDlg::Load()
         if( !bOk )
             return sal_False;
     }
-    
+
     SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE );
 
     SvStream* pStream = aMedium.GetInStream();
@@ -1688,7 +1688,7 @@ BOOL SdPublishingDlg::Save()
     aMedium.IsRemote();
 
     SvStream* pStream = aMedium.GetOutStream();
-    
+
     if( !pStream )
         return( FALSE );
 
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index 81cb7870c..eca7a0e19 100644
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -32,6 +32,7 @@
 #define _PPTATOM_HXX_
 
 #include <svx/msdffdef.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 
 class SvStream;
 
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4332c13ca..a073196ae 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,20 +35,20 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/svxids.hrc>
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdlayer.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/colritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xflgrit.hxx>
 #include <svx/xbtmpit.hxx>
@@ -75,7 +75,7 @@
 #include <svx/gallery.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/numitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fhgtitem.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svdomedia.hxx>
@@ -88,11 +88,11 @@
 #include "../../ui/inc/FrameView.hxx"
 #include "../../ui/inc/optsitem.hxx"
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <sfx2/progress.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <svx/editstat.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <sfx2/docfac.hxx>
 #define MAX_USER_MOVE		2
 
@@ -2757,7 +2757,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( const ::rtl::OUStri
 
     MSFilterTracer aTracer( rConfigPath, pConfigData );
     aTracer.StartTracing();
-    
+
     SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium, &aTracer );
     bRet = pImport->Import();
 
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index fd851c394..58aecf103 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -31,11 +31,11 @@
 #ifndef _SD_PPTIN_HXX
 #define _SD_PPTIN_HXX
 
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 #include <svx/msdffdef.hxx>
 #include <diadef.h>
 #include <svx/svdtypes.hxx>
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index ef319c41b..1440f6df2 100644
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -34,15 +34,13 @@
 #include <com/sun/star/animations/XTimeContainer.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
-#ifndef _SD_PPTANIMATIONS_HXX
 #include "pptanimations.hxx"
-#endif
 #include <animations.hxx>
 
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
 #endif
-#include <svx/svdfppt.hxx>
+#include <filter/msfilter/svdfppt.hxx>
 
 #include <list>
 
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 9e6860fc3..41519557c 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/progress.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "../ui/inc/DrawDocShell.hxx"
 #include "../ui/inc/strings.hrc"
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 116df059a..cb4c2cbe5 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,16 +34,16 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <osl/module.hxx>
-#include <svx/msoleexp.hxx>
-#include <svx/svxmsbas.hxx>
+#include <filter/msfilter/msoleexp.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
 #include <svx/svxerr.hxx>
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 
 #include "sdpptwrp.hxx"
 #include "ppt/pptin.hxx"
 #include "drawdoc.hxx"
 #include <tools/urlobj.hxx>
-#include <svx/msfiltertracer.hxx>
+#include <filter/msfilter/msfiltertracer.hxx>
 
 // --------------
 // - Namespaces -
@@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::frame;
 
-
 typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
                                              Reference< XModel > &,
                                              Reference< XStatusIndicator > &,
@@ -63,6 +62,8 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&,
 typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*,
                                           SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
 
+typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& );
+
 // ---------------
 // - SdPPTFilter -
 // ---------------
@@ -188,32 +189,13 @@ void SdPPTFilter::PreSaveBasic()
     SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get();
     if( pFilterOptions && pFilterOptions->IsLoadPPointBasicStorage() )
     {
-        SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) );
-        SvxImportMSVBasic aMSVBas( (SfxObjectShell&) mrDocShell, *xDest, FALSE, FALSE );
-        aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
-
-        SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
-        if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
+        ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() );
+        if( pLibrary )
         {
-            SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) );
-            if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
+            SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") ));
+            if( pSaveVBA )
             {
-                SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) );
-                if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
-                {
-                    UINT32 nLen = xTemp->GetSize();
-                    if ( nLen )
-                    {
-                        char* pTemp = new char[ nLen ];
-                        if ( pTemp )
-                        {
-                            xTemp->Seek( STREAM_SEEK_TO_BEGIN );
-                            xTemp->Read( pTemp, nLen );
-                            pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ );
-                            pBas->ObjectOwnsMemory( TRUE );
-                        }
-                    }
-                }
+                pSaveVBA( (SfxObjectShell&) mrDocShell, pBas );
             }
         }
     }
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index ed2040d72..bd6c36efd 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -32,10 +32,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#include <svtools/style.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/style.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/whiter.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/xmlcnitm.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 07287bdb1..b59ab0cd8 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,11 +67,11 @@
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 // #80365# include necessary for XML progress bar at load time
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/sfxecode.hxx>
 
 #include "sderror.hxx"
@@ -515,7 +515,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
         { MAP_LEN( "BuildId" ), 0,
               &::getCppuType( (OUString *)0 ),
-              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },			
+              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
         { NULL, 0, 0, NULL, 0, 0 }
     };
 
@@ -779,7 +779,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
 
             OUString sBuildId;
             xInfoSet->getPropertyValue(sPropName) >>= sBuildId;
-            
+
             if( xModelSetInfo.is() && xModelSetInfo->hasPropertyByName(sPropName) )
             {
                 xModelSet->setPropertyValue( sPropName, Any( sBuildId ) );
@@ -806,7 +806,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
                             bTransform = true;
                     }
                 }
-                else 
+                else
                 {
                     // check for binary formats
                      const SfxFilter * pFilter = mrMedium.GetFilter();
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index f714625ea..be8bd986e 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -135,7 +135,7 @@ void SimpleReferenceComponent::operator delete(void * pPtr,
 )
     SAL_THROW(())
 {
-#if defined WNT || (defined IRIX && !defined GCC)
+#if defined WNT
     ::operator delete(pPtr); // WNT lacks a global nothrow operator delete...
 #else // WNT
     ::operator delete(pPtr, rNothrow);
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 387241b61..b7810a674 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -39,17 +39,11 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#endif
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#ifndef	_COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <rtl/ustring.h>
-#ifndef _SFXFRAME_HXX
 #include<sfx2/viewfrm.hxx>
-#endif
 
 #include <svx/AccessibleShape.hxx>
 
@@ -279,7 +273,7 @@ sal_Int32 SAL_CALL
 
 Reference<XAccessible> SAL_CALL
     AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex)
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
     ThrowIfDisposed ();
 
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 13e7dfd4f..3f1d526ca 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -40,20 +40,11 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#ifndef	_COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <rtl/ustring.h>
-#ifndef _SFXFRAME_HXX
 #include<sfx2/viewfrm.hxx>
-#endif
 
 #include <svx/AccessibleShape.hxx>
 
@@ -243,7 +234,7 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible> SAL_CALL
     AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
     ThrowIfDisposed ();
 
diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx
index 1c6a93f44..51ddad2fb 100644
--- a/sd/source/ui/animations/AnimationSchemesPane.cxx
+++ b/sd/source/ui/animations/AnimationSchemesPane.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,7 @@
 #include <svtools/controldims.hrc>
 #endif
 #include <svx/gallery.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 7ca60e03f..b019e127f 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdstr.hrc>
 #include "sdresid.hxx"
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include "CustomAnimationCreateDialog.hxx"
 #ifndef _SD_CUSTOMANIMATIONCREATEDIALOG_HRC
@@ -142,7 +142,7 @@ USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* =
 void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
 {
     const USHORT nItem = rUDEvt.GetItemId();
-    
+
     if( ListBox::GetEntryFlags(nItem) & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION )
     {
         Rectangle aOutRect( rUDEvt.GetRect() );
@@ -196,7 +196,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt )
 }
 
 // --------------------------------------------------------------------
-    
+
 class CustomAnimationCreateTabPage : public TabPage
 {
 public:
@@ -376,11 +376,11 @@ void CustomAnimationCreateTabPage::onSelectEffect()
         nPos = 0;
     else if( fDuration == 3.0 )
         nPos = 1;
-    else if( fDuration == 2.0 ) 
+    else if( fDuration == 2.0 )
         nPos = 2;
-    else if( fDuration == 1.0 ) 
+    else if( fDuration == 1.0 )
         nPos = 3;
-    else if( fDuration == 0.5 ) 
+    else if( fDuration == 0.5 )
         nPos = 4;
 
     mpCBSpeed->SelectEntryPos( nPos );
@@ -479,7 +479,7 @@ void CustomAnimationCreateTabPage::setDuration( double fDuration )
         {
             nPos = 3;
         }
-    } 
+    }
     else if( fDuration < 5.0f )
     {
         if( fDuration < 3.0f )
@@ -541,7 +541,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo
     FreeResource();
 
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
-    mbIsPreview = pOptions->IsPreviewNewEffects();	
+    mbIsPreview = pOptions->IsPreviewNewEffects();
 
     const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets();
     mpTabPages[ENTRANCE] = new CustomAnimationCreateTabPage( mpTabControl, this, ENTRANCE, rPresets.getEntrancePresets(), bHasText );
@@ -587,7 +587,7 @@ CustomAnimationCreateDialog::~CustomAnimationCreateDialog()
     storePosition();
 
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
-    pOptions->SetPreviewNewEffects( getCurrentPage()->getIsPreview() );	
+    pOptions->SetPreviewNewEffects( getCurrentPage()->getIsPreview() );
 
     delete mpTabPages[ENTRANCE];
     delete mpTabPages[EMPHASIS];
@@ -609,7 +609,7 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons
     case RID_TP_CUSTOMANIMATION_EMPHASIS:	return mpTabPages[EMPHASIS];
     case RID_TP_CUSTOMANIMATION_EXIT:		return mpTabPages[EXIT];
     case RID_TP_CUSTOMANIMATION_MISCEFFECTS:return mpTabPages[MISCEFFECTS];
-    //case RID_TP_CUSTOMANIMATION_MOTIONPATH:	
+    //case RID_TP_CUSTOMANIMATION_MOTIONPATH:
     default:
                                             return mpTabPages[MOTIONPATH];
     }
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 2f4ba4f6f..f6ffa5499 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,7 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/menubtn.hxx>
@@ -1863,7 +1863,7 @@ void CustomAnimationEffectTabPage::onSoundPreview()
     if( nPos >= 2 ) try
     {
         const OUString aSoundURL( *(String*)maSoundList.GetObject( nPos-2 ) );
-                mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ), uno::UNO_QUERY_THROW ); 
+                mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ), uno::UNO_QUERY_THROW );
         mxPlayer->start();
     }
     catch( uno::Exception& e )
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index a63f5278a..ff5257eef 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@
 #include <svtools/controldims.hrc>
 #endif
 #include <svx/gallery.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
 #include "DrawViewShell.hxx"
@@ -205,7 +205,7 @@ struct TransitionEffect
     {
         TransitionEffect aOtherEffect( rPage );
         mbEffectAmbiguous = mbEffectAmbiguous || aOtherEffect.mbEffectAmbiguous
-                                              || (mnType != aOtherEffect.mnType) 
+                                              || (mnType != aOtherEffect.mnType)
                                               || (mnSubType != aOtherEffect.mnSubType)
                                               || (mbDirection != aOtherEffect.mbDirection)
                                               || (mnFadeColor != aOtherEffect.mnFadeColor);
@@ -477,14 +477,14 @@ SlideTransitionPane::SlideTransitionPane(
 {
     // use no resource ids from here on
     FreeResource();
-    
+
     // use bold font for group headings (same font for all fixed lines):
     Font font( maFL_APPLY_TRANSITION.GetFont() );
     font.SetWeight( WEIGHT_BOLD );
     maFL_APPLY_TRANSITION.SetFont( font );
     maFL_MODIFY_TRANSITION.SetFont( font );
     maFL_ADVANCE_SLIDE.SetFont( font );
-    
+
     if( pDoc )
         mxModel.set( pDoc->getUnoModel(), uno::UNO_QUERY );
     // TODO: get correct view
@@ -874,7 +874,7 @@ void SlideTransitionPane::updateControls()
     }
 
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
-    maCB_AUTO_PREVIEW.Check( pOptions->IsPreviewTransitions() == sal_True );	
+    maCB_AUTO_PREVIEW.Check( pOptions->IsPreviewTransitions() == sal_True );
 
     mbUpdatingControls = false;
 
@@ -1069,7 +1069,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
                 aResult.mbSoundAmbiguous = false;
             }
             else
-            {			
+            {
                 aResult.maSound = lcl_getSoundFileURL( maSoundList, maLB_SOUND );
                 aResult.mbSoundAmbiguous = false;
                 maCurrentSoundFile = aResult.maSound;
@@ -1272,7 +1272,7 @@ IMPL_LINK( SlideTransitionPane, LoopSoundBoxChecked, void *, EMPTYARG )
 IMPL_LINK( SlideTransitionPane, AutoPreviewClicked, void *, EMPTYARG )
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
-    pOptions->SetPreviewTransitions( maCB_AUTO_PREVIEW.IsChecked() ? sal_True : sal_False );	
+    pOptions->SetPreviewTransitions( maCB_AUTO_PREVIEW.IsChecked() ? sal_True : sal_False );
     return 0;
 }
 
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 5f5ca8f94..200d11fb8 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -36,6 +36,7 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
@@ -196,9 +197,8 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/)
         SdrPathObj* pPathObj = mxTag->getPathObj();
         if( pPathObj )
         {
-            basegfx::B2DHomMatrix aTrans;
             const Point aRef( DragStat().Ref1() );
-            aTrans.translate(-aRef.X(), -aRef.Y());
+            basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aRef.X(), -aRef.Y()));
             aTrans.scale(double(aXFact), double(aYFact));
             aTrans.translate(aRef.X(), aRef.Y());
             basegfx::B2DPolyPolygon aDragPoly(pPathObj->GetPathPoly());
@@ -966,8 +966,8 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
         ::com::sun::star::awt::Point aPos( mxOrigin->getPosition() );
         if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) )
         {
-            ::basegfx::B2DHomMatrix aTransform;
-            aTransform.translate( aPos.X - maOriginPos.X, aPos.Y - maOriginPos.Y );
+            const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(
+                aPos.X - maOriginPos.X, aPos.Y - maOriginPos.Y));
             mxPolyPoly.transform( aTransform );
             mpPathObj->SetPathPoly( mxPolyPoly );
             maOriginPos = aPos;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 019081922..7b046aef9 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,11 @@
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <svtools/style.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/saveopt.hxx>
+#include <svl/style.hxx>
+#include <svl/itempool.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -199,7 +199,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase )
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType());
     if( pOptions )
-        mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True;	
+        mbShowAnnotations = pOptions->IsShowComments() == TRUE;	
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 17ba21aa8..7964ec1f6 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -57,11 +57,11 @@
 #include <svx/crsditem.hxx>
 
 #include <svtools/langtab.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/securityoptions.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/slstitm.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/zforlist.hxx>
 #include <svtools/svmedit.hxx>
 
 #include <linguistic/lngprops.hxx>
@@ -174,8 +174,8 @@ void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt )
         if ( !( (nKey == KEY_Z || nKey == KEY_Y) && rKeyCode.IsMod1()) )
         {
             bool bIsProtected = mpAnnotationWindow->IsProtected();
-            if (!bIsProtected || (bIsProtected && !mpAnnotationWindow->Engine()->GetEditEngine().DoesKeyChangeText(rKeyEvt)) ) 
-        
+            if (!bIsProtected || (bIsProtected && !mpAnnotationWindow->Engine()->GetEditEngine().DoesKeyChangeText(rKeyEvt)) )
+
             bDone = mpOutlinerView->PostKeyEvent( rKeyEvt );
         }
         if (bDone)
@@ -194,7 +194,7 @@ void AnnotationTextWindow::MouseMove( const MouseEvent& rMEvt )
     if ( mpOutlinerView )
     {
         mpOutlinerView->MouseMove( rMEvt );
-        SetPointer( mpOutlinerView->GetPointer( rMEvt.GetPosPixel() ) );		
+        SetPointer( mpOutlinerView->GetPointer( rMEvt.GetPosPixel() ) );
     }
 }
 
@@ -215,7 +215,7 @@ void AnnotationTextWindow::MouseButtonUp( const MouseEvent& rMEvt )
 void AnnotationTextWindow::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
-    {       
+    {
            mpAnnotationWindow->Command(rCEvt);
     }
     else
@@ -265,7 +265,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const
         if( mpOutlinerView->HasSelection() )
             return Selection( 0, mpOutlinerView->GetSelected().Len() );
         else
-        {	    
+        {
             ESelection aSelection = mpOutlinerView->GetEditView().GetSelection();
             return Selection( aSelection.nStartPos, aSelection.nEndPos );
         }
@@ -405,7 +405,7 @@ void AnnotationWindow::Rescale()
     //aMode.SetScaleX( aMode.GetScaleX() * Fraction( 8, 10 ) );
     //aMode.SetScaleY( aMode.GetScaleY() * Fraction( 8, 10 ) );
     mpOutliner->SetRefMapMode( aMode );
-    SetMapMode( aMode );	
+    SetMapMode( aMode );
     mpTextWindow->SetMapMode( aMode );
     if ( mpMeta )
     {
@@ -414,7 +414,7 @@ void AnnotationWindow::Rescale()
         nHeight = nHeight * aMode.GetScaleY().GetNumerator() / aMode.GetScaleY().GetDenominator();
         aFont.SetHeight( nHeight );
         mpMeta->SetControlFont( aFont );
-    }	
+    }
 }
 
 void AnnotationWindow::DoResize()
@@ -441,7 +441,7 @@ void AnnotationWindow::DoResize()
         mpMeta->SetPosSizePixel(0,aHeight,GetSizePixel().Width(),POSTIT_META_HEIGHT);
     else
         mpMeta->SetPosSizePixel(0,aHeight,GetSizePixel().Width()-METABUTTON_AREA_WIDTH,POSTIT_META_HEIGHT);
-    
+
     mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ;
     mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight) ) );
     if (!mpVScrollbar->IsVisible())
@@ -454,7 +454,7 @@ void AnnotationWindow::DoResize()
     mpVScrollbar->SetLineSize( mpOutliner->GetTextHeight() / 10 );
     SetScrollbar();
     mpVScrollbar->SetRange( Range(0, mpOutliner->GetTextHeight()));
-    
+
     Point aPos( mpMeta->GetPosPixel());
     Point aBase( aPos.X() + aPos.X() + GetSizePixel().Width(), aPos.Y() );
     Point aLeft = PixelToLogic( Point( aBase.X() - (METABUTTON_WIDTH+5), aBase.Y()+17 ) );
@@ -470,7 +470,7 @@ void AnnotationWindow::DoResize()
             aPos.X()+GetSizePixel().Width()-(METABUTTON_WIDTH+10),
             aPos.Y()+5 ),
             Size( METABUTTON_WIDTH, METABUTTON_HEIGHT ) ) );
-    
+
 }
 
 void AnnotationWindow::SetSizePixel( const Size& rNewSize )
@@ -578,7 +578,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
         mxAnnotation = xAnnotation;
 
         SetColor();
-        
+
         SvtUserOptions aUserOptions;
         mbProtected = aUserOptions.GetFullName() != xAnnotation->getAuthor();
 
@@ -590,7 +590,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
             std::auto_ptr< OutlinerParaObject > pOPO( pTextApi->CreateText() );
             Engine()->SetText( *pOPO.get() );
         }
-        
+
         Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) );
         Engine()->ClearModifyFlag();
         Engine()->GetUndoManager().Clear();
@@ -599,12 +599,12 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
 
         OUString sMeta( xAnnotation->getAuthor() );
         OUString sDateTime( getAnnotationDateTimeString(xAnnotation) );
-        
+
         if( sDateTime.getLength() != 0 )
         {
             if( sMeta.getLength() != 0 )
                 sMeta += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
-                
+
            sMeta += sDateTime;
         }
         mpMeta->SetText(sMeta);
@@ -617,7 +617,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
 void AnnotationWindow::SetColor()
 {
     sal_uInt16 nAuthorIdx = mpDoc->GetAnnotationAuthorIndex( mxAnnotation->getAuthor() );
-    
+
     maColor = mrManager.GetColor( nAuthorIdx );
     maColorDark = mrManager.GetColorDark( nAuthorIdx );
     maColorLight = mrManager.GetColorLight( nAuthorIdx );
@@ -666,11 +666,11 @@ void AnnotationWindow::Deactivate()
         DeleteAnnotation( xAnnotation );
     }
     else
-*/	
+*/
     {
         // write changed text back to annotation
         if ( Engine()->IsModified() )
-        {	            
+        {
             TextApiObject* pTextApi = getTextApiObject( xAnnotation );
 
             if( pTextApi )
@@ -689,15 +689,15 @@ void AnnotationWindow::Deactivate()
 
                     if( mpDoc->IsUndoEnabled() )
                         mpDoc->EndUndo();
-                
+
                     DocView()->GetDocSh()->SetModified(sal_True);
                 }
-                
-            }		    		    
+
+            }
         }
         Engine()->ClearModifyFlag();
     }
-    
+
     Engine()->GetUndoManager().Clear();
 }
 
@@ -782,7 +782,7 @@ void AnnotationWindow::MouseButtonDown( const MouseEvent& rMEvt )
 void AnnotationWindow::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
-    {       
+    {
         mrManager.ExecuteAnnotationContextMenu( mxAnnotation, this, Rectangle(rCEvt.GetMousePosPixel(),Size(1,1)) );
     }
     else
@@ -811,7 +811,7 @@ void AnnotationWindow::ExecuteSlot( USHORT nSID )
         DoResize();
     }
     else
-    {    
+    {
         SfxItemSet aEditAttr(getView()->GetAttribs());
         SfxItemSet aNewAttr(mpOutliner->GetEmptyItemSet());
 
@@ -822,7 +822,7 @@ void AnnotationWindow::ExecuteSlot( USHORT nSID )
             FontWeight eFW = ( (const SvxWeightItem&) aEditAttr.Get( EE_CHAR_WEIGHT ) ).GetWeight();
             aNewAttr.Put( SvxWeightItem( eFW == WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
         }
-        break;		    
+        break;
         case SID_ATTR_CHAR_POSTURE:
         {
             FontItalic eFI = ( (const SvxPostureItem&) aEditAttr.Get( EE_CHAR_ITALIC ) ).GetPosture();
@@ -843,7 +843,7 @@ void AnnotationWindow::ExecuteSlot( USHORT nSID )
         break;
         }
         getView()->SetAttribs( aNewAttr );
-    }   
+    }
 }
 
 }
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 7a905a588..0f97c9319 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -36,7 +36,7 @@
 #ifndef _SV_SALBTYPE_HRC //autogen
 #include <vcl/salbtype.hxx>
 #endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "app.hxx"
 #include "optsitem.hxx"
@@ -74,6 +74,10 @@ void SdOptionsItem::Commit()
         mrParent.Commit( *this );
 };
 
+void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{}
+
+
 // -----------------------------------------------------------------------------
 
 Sequence< Any >	SdOptionsItem::GetProperties( const Sequence< OUString >& rNames )
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 8ba709db6..da5d31551 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 #include <sfx2/sfx.hrc>
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #include "glob.hrc"
 #include "res_bmp.hrc"
 
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index a6513a1a1..028079a84 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,7 @@
 
 #include <svx/editeng.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #ifndef _FM_FMOBJFAC_HXX
 #include <svx/fmobjfac.hxx>
 #endif
diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx
index bc8ff01e4..6b525a0b3 100644
--- a/sd/source/ui/app/sddll1.cxx
+++ b/sd/source/ui/app/sddll1.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include "sddll.hxx"
 #include "diactrl.hxx"
 #include "tbx_ww.hxx"
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index a51c1c9f1..da211a1ad 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,8 +30,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
-#include <svtools/pathoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/languageoptions.hxx>
 #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
 #endif
@@ -39,14 +39,14 @@
 #include <vcl/virdev.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/status.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/printer.hxx>
 #include <svx/pszctrl.hxx>
 #include <svx/zoomctrl.hxx>
 #include <svx/modctrl.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/ehdl.hxx>
 
@@ -131,11 +131,6 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
 
 SdModule::~SdModule()
 {
-    // Mark the module in the global AppData structure as deleted.
-    SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW);
-    if (ppShellPointer != NULL)
-        (*ppShellPointer) = NULL;
-
     delete pSearchItem;
 
     if( pNumberFormatter )
@@ -152,6 +147,13 @@ SdModule::~SdModule()
         }
     }
 
+    mpResourceContainer.reset();
+
+    // Mark the module in the global AppData structure as deleted.
+    SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW);
+    if (ppShellPointer != NULL)
+        (*ppShellPointer) = NULL;
+
     delete mpErrorHdl;
     delete static_cast< VirtualDevice* >( mpVirtualRefDevice );
 }
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index b837633a0..c6c4026af 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,10 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#include <svtools/lckbitem.hxx>
+#include <svl/lckbitem.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include "framework/FrameworkHelper.hxx"
 
 #include <svx/dialogs.hrc>
@@ -49,7 +49,7 @@
 #include <sfx2/docfile.hxx>
 #include <svx/paperinf.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "app.hrc"
 #include "glob.hrc"
@@ -334,12 +334,12 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest)
                         pHelper->RequestView(
                             FrameworkHelper::msOutlineViewURL,
                             FrameworkHelper::msCenterPaneURL);
-                        
+
                         pHelper->RunOnResourceActivation(
                             FrameworkHelper::CreateResourceId(
                             FrameworkHelper::msOutlineViewURL,
                             FrameworkHelper::msCenterPaneURL),
-                            OutlineToImpressFinalizer(*pBase, *pDoc, *pBytes));                        
+                            OutlineToImpressFinalizer(*pBase, *pDoc, *pBytes));
                     }
                 }
             }
@@ -750,7 +750,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
                                 pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE,
                                    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L);
                             }
-                            
+
                             // clear document info
                             using namespace ::com::sun::star;
                             uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -1023,7 +1023,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer (
                     break;
                 case ERRCODE_IO_PENDING:
                     break;
-                
+
                 default:
                     bLoop = false;
                     nReadByteCount = 0;
@@ -1062,7 +1062,7 @@ void OutlineToImpressFinalizer::operator() (bool)
         {
 /*
             sd::OutlineViewPageChangesGuard aGuard( pView );
-            
+
             // Remove the first empty pages
             USHORT nPageCount = mrDocument.GetPageCount();
             mrDocument.RemovePage( --nPageCount );  // notes page
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 75d5dcbbb..e3279781a 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,10 +33,10 @@
 #include <svx/eeitem.hxx>
 #include <svx/flditem.hxx>
 #include <sfx2/printer.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/flagitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/inethist.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/flagitem.hxx>
+#include <unotools/useroptions.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -85,7 +85,7 @@
 #include "sdabstdlg.hxx"
 #include "tpoption.hrc"
 #include "prntopts.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 /** retrieves the page that is currently painted. This will only be the master page
     if the current drawn view only shows the master page*/
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index be9fbb0e7..d370dfd45 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,10 +36,10 @@
 
 #include <svx/editeng.hxx>
 #include <svx/flditem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "strings.hrc"
 #include "sdpopup.hxx"
@@ -294,7 +294,7 @@ SvxFieldData* SdFieldPopup::GetField()
             if( pDocSh )
             {
                 SvxExtFileField aFileField( *pFileField );
-                
+
                 String aName;
                 if( pDocSh->HasName() )
                     aName = pDocSh->GetMedium()->GetName();
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 5142539f0..d3918a877 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -49,13 +49,13 @@
 #include <svx/svdotext.hxx>
 #include <svx/outlobj.hxx>
 #include <sot/storage.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/editobj.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <tools/urlobj.hxx>
 #include <sot/formats.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/outliner.hxx>
 
 //#ifndef _SVDETC_HXX //autogen
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 63021a95e..e13f5309c 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/bindings.hxx>
 #include <svx/svxids.hrc>
 #include <svx/grafctrl.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <sfx2/viewsh.hxx>
 #ifndef _SFX_IMAGEMGR_HXX
 #include <sfx2/imagemgr.hxx>
@@ -311,7 +311,7 @@ void SdTbxControl::StateChanged( USHORT nSId,
                 Image aImage = GetImage( m_xFrame, 
                                          aSlotURL,
                                          hasBigImages(),
-                                         GetToolBox().GetDisplayBackground().GetColor().IsDark() );
+                                         GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
 
                 // !-Operator prueft, ob Image nicht vorhanden ist
                 if( !!aImage )
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index a51ae3863..8714b3754 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -37,8 +37,8 @@
 
 #include <vcl/menu.hxx>
 #include <vcl/status.hxx>
-#include <svtools/style.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/style.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
 
 #include "tmplctrl.hxx"
diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx
index e93594c78..41ffbec37 100644
--- a/sd/source/ui/dlg/LayerDialogContent.cxx
+++ b/sd/source/ui/dlg/LayerDialogContent.cxx
@@ -38,7 +38,7 @@
 #include <svx/gallery.hxx>
 #include <svx/colritem.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/msgbox.hxx>
 
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx
index 6f1ae1df2..d4ebe02ae 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -263,7 +263,7 @@ void PaneDockingWindow::InitializeTitleToolBox (void)
     Image aImage = Image (aBitmap, Color (COL_LIGHTMAGENTA));
     Image aImageHC = Image (aBitmapHC, Color (BMP_COLOR_HIGHCONTRAST));
     mpTitleToolBox->InsertItem (1,
-        GetSettings().GetStyleSettings().GetMenuBarColor().IsDark() 
+        GetSettings().GetStyleSettings().GetHighContrastMode()
         ? aImageHC 
         : aImage);
     mpTitleToolBox->ShowItem (1);
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 8a51c44e1..09d557b5e 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -39,7 +39,7 @@
 #include <svx/xoutbmp.hxx>
 
 #include <time.h>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <sfx2/dispatch.hxx>
@@ -138,7 +138,7 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
     {
         const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
         SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) );
-        SetDrawMode( GetDisplayBackground().GetColor().IsDark() 
+        SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() 
             ? ViewShell::OUTPUT_DRAWMODE_CONTRAST 
             : ViewShell::OUTPUT_DRAWMODE_COLOR );
     }
@@ -601,7 +601,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls )
             aVD.SetOutputSize( aObjSize );
             const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
             aVD.SetBackground( Wallpaper( rStyles.GetFieldColor() ) );
-            aVD.SetDrawMode( GetDisplayBackground().GetColor().IsDark() 
+            aVD.SetDrawMode( rStyles.GetHighContrastMode()
                 ? ViewShell::OUTPUT_DRAWMODE_CONTRAST 
                 : ViewShell::OUTPUT_DRAWMODE_COLOR );
             aVD.Erase();
diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx
index 0c695fd23..e0508faa8 100644
--- a/sd/source/ui/dlg/celltempl.cxx
+++ b/sd/source/ui/dlg/celltempl.cxx
@@ -35,8 +35,8 @@
 #undef SD_DLLIMPLEMENTATION
 #endif
 
-#include <svtools/style.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/style.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/dialogs.hrc>
 #include <svx/drawitem.hxx>
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index d20b57cde..d377270b4 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <sfx2/doctempl.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
@@ -49,7 +49,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <fadedef.h>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include "DrawDocShell.hxx"
 #include <vcl/gdimtf.hxx>
 #include <vcl/wintypes.hxx>
@@ -66,7 +66,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -142,7 +142,7 @@ public:
     void SetClickHdl (const Link& rLink);
     bool IsEnabled (void);
     void Enable (bool bEnable);
-    
+
 private:
     PushButton maNextButton1;
     PushButton maNextButton2;
@@ -907,7 +907,7 @@ void AssistentDlgImpl::TemplateScanDone (
         TemplateDir* pDir = *I;
         if (pDir == NULL)
             continue;
-        
+
         // HACK! presnt directory is always initially selected.
         // We have to look at the first entry to get a URL.
         if (pDir->maEntries.size() > 0)
@@ -932,7 +932,7 @@ void AssistentDlgImpl::TemplateScanDone (
         TemplateDir* pDir = *I;
         if (pDir == NULL)
             continue;
-        
+
         // HACK! layout directory is always initially selected.
         // We have to look at the first entry to get a URL.
         if (pDir->maEntries.size() > 0)
@@ -973,11 +973,11 @@ void AssistentDlgImpl::SetStartType( StartType eType )
     mpPage1TemplateLB->Show(eType == ST_TEMPLATE);
     mpPage1OpenLB->Show(eType == ST_OPEN);
     mpPage1OpenPB->Show(eType == ST_OPEN);
-    
+
     if (eType == ST_OPEN)
         maFinishButton.SetText(maOpenStr);
     else
-        maFinishButton.SetText(maCreateStr);	
+        maFinishButton.SetText(maCreateStr);
 }
 
 StartType AssistentDlgImpl::GetStartType()
@@ -2027,7 +2027,7 @@ void NextButton::ForceFocusEventBroadcast (void)
         maNextButton2.Hide();
     }
 }
-    
+
 
 
 
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index f2181c45c..cd8c6129c 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 #endif
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 #include "sdpage.hxx"
 #include "Outliner.hxx"
@@ -47,8 +47,8 @@
 #include "dlgassim.hxx"
 
 SdPageListControl::SdPageListControl(
-    ::Window* pParent, 
-    const ResId& rResId ) 
+    ::Window* pParent,
+    const ResId& rResId )
     : SvTreeListBox(pParent, rResId)
 {
     // Tree-ListBox mit Linien versehen
@@ -320,7 +320,7 @@ void TemplateCache::Load()
     aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) );
     SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); // Download
     SvStream* pStream = aMedium.GetInStream();
-    
+
     if( !pStream )
         return;
 
@@ -364,7 +364,7 @@ void TemplateCache::Save()
     aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( "template.sod" ) ) );
     SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE ); // Download
     SvStream* pStream = aMedium.GetInStream();
-    
+
     if( !pStream )
         return;
 
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index ed1f4e423..d6234ff98 100644
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/dateitem.hxx>
+#include <svl/dateitem.hxx>
 #include "drawdoc.hxx"
 #include <svx/svdotext.hxx>
 #include <svtools/svtreebx.hxx>
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 5f11b83cf..5775578a0 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -44,7 +44,7 @@
 #include "sdresid.hxx"
 #include "dlg_char.hxx"
 #include <svx/svxids.hrc>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 /*************************************************************************
 |*
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index c9cd19ed2..d7703e943 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,12 +40,12 @@
 #include <svx/editeng.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/flditem.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/langitem.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "strings.hrc"
 #include "dlgfield.hrc"
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index db24d3fa6..c96de9a95 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -48,11 +48,11 @@
 #include <svx/numitem.hxx>
 
 #include <svx/dialogs.hrc>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdmark.hxx>
 #include "View.hxx"
 #include <svx/svdobj.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <drawdoc.hxx>
 
 #ifndef _SD_SDRESID_HXX
@@ -64,7 +64,7 @@
 #include "bulmaper.hxx"
 #include "DrawDocShell.hxx"
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index b49d06d32..2b45bb6ed 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -35,7 +35,7 @@
 #undef SD_DLLIMPLEMENTATION
 #endif
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
@@ -48,7 +48,7 @@
 #include "dlgpage.hxx"
 
 #include "DrawDocShell.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/flagsdef.hxx>
 #include <svx/svxenum.hxx>
 
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index b4dd3ca83..d49028304 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -38,8 +38,8 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dlgutil.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/aeitem.hxx>
 
 #include "dlgsnap.hrc"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 9c61c2fc4..40be6e1ca 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -67,7 +67,11 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage
 {
     mpObj = pObj;
     mnShowPage = nShowPage;
-    mxSlideShow.clear();
+    if (mxSlideShow.is())
+    {
+        mxSlideShow->end();
+        mxSlideShow.clear();
+    }
     updateViewSettings();
 }
 
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 66c180190..ce73239ad 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -36,7 +36,7 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index 979d16532..ac0f09d68 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -31,6 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
+#ifdef SD_DLLIMPLEMENTATION
+#undef SD_DLLIMPLEMENTATION
+#endif
+
 #include "ins_paste.hrc"
 #include "ins_paste.hxx"
 
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx
index 8421651c0..e2c1f74e0 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -34,7 +34,7 @@
 #ifdef SD_DLLIMPLEMENTATION
 #undef SD_DLLIMPLEMENTATION
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "strings.hrc"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index d4e298436..079a514eb 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -47,8 +47,8 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xenum.hxx>
 #include <svx/svdobj.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index f3df24122..f2151f19f 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -36,11 +36,11 @@
 #include <unotools/localfilehelper.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/menu.hxx>
@@ -863,7 +863,7 @@ void SdNavigatorWin::SetDragImage()
 
 void SdNavigatorWin::ApplyImageList()
 {
-    const bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0;
+    const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     maToolbox.SetImageList( bHighContrast ? maImageListH : maImageList );
 
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index e82aa2dff..f608ba592 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -37,9 +37,9 @@
 
 #include <vcl/field.hxx>
 
-#include <svtools/cjkoptions.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/editdata.hxx>
 #include <svx/dialogs.hrc>
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 349fb7871..ec059e771 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <comphelper/processfactory.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include "sdattr.hxx"
 #include "present.hxx"
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 5234db760..311a41d1a 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -41,7 +41,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/flstitem.hxx>
 #include <svx/drawitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/tabline.hxx>
 #include <svx/bulitem.hxx>
 #include <svx/eeitem.hxx>
@@ -49,7 +49,7 @@
 #include <vcl/graph.hxx>
 #include <svx/lrspitem.hxx>
 #include <svx/numitem.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #include "DrawDocShell.hxx"
 #include "glob.hrc"
@@ -59,7 +59,7 @@
 #include "enumdlg.hrc"
 //#include "enumdlg.hxx"
 #include "bulmaper.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svxgrahicitem.hxx>
 #include <svx/flagsdef.hxx>
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index b3b697273..6c0801374 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -42,7 +42,7 @@
 #include "sdresid.hxx"
 #include "prntopts.hxx"
 #include "app.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index b6eb7023c..ae71c3619 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -36,7 +36,7 @@
 #endif
 
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/new.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 79b5fb8cd..48fcfe792 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -35,7 +35,7 @@
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 4d08c991d..147661ea6 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -40,18 +40,18 @@
 #include <svx/svxids.hrc>
 
 #include <svx/drawitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/ofaitem.hxx>
 #include <svx/svxgrahicitem.hxx>
 #include <svx/svdmodel.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 
 #include <svx/dialogs.hrc>
 
 #include <svx/svxdlg.hxx>
 #include <svx/tabline.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/xtable.hxx>
 
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 3e4788cb3..8041cfcae 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,10 +54,10 @@
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svx/svdpagv.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/colritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/docfile.hxx>
@@ -68,7 +68,7 @@
 #include <svx/xtable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svx/drawitem.hxx>
 #include "View.hxx"
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 73f7710b5..e57c8ab79 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -58,7 +58,7 @@
 #include "tpoption.hxx"
 #include "strings.hrc"
 #include "app.hrc"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #define DLGWIN this->GetParent()->GetParent()
 
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 6c40d4239..59d2ed4e4 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -32,9 +32,9 @@
 #include "precompiled_sd.hxx"
 
 
-#include <svtools/itemset.hxx>
-#include <svtools/style.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/itemset.hxx>
+#include <svl/style.hxx>
+#include <svl/smplhint.hxx>
 #include <svx/svdobj.hxx>
 
 #include "unchss.hxx"
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 43ec814ea..bd6313315 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -374,7 +374,7 @@ BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName )
     {
         String aDesc( SdResId( STR_WARN_PAGE_EXISTS ) );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc, RID_SVXDLG_NAME ) : 0;
+        AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0;
         if( aNameDlg )
         {
             aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE );
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 814800c8b..b25c8e5fc 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -51,7 +51,7 @@
 #include <svx/outliner.hxx>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/unolingu.hxx>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 1ab413281..058a1f4ae 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,8 +41,8 @@
 #endif
 #include <svx/flstitem.hxx>
 #include <svx/eeitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/flagitem.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -50,7 +50,7 @@
 #include <sfx2/dispatch.hxx>
 #endif
 #include <svx/svdotext.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <sfx2/printer.hxx>
 #include <svtools/ctrltool.hxx>
 #ifndef _SFX_ECODE_HXX //autogen
@@ -63,11 +63,11 @@
 #include "unomodel.hxx"
 #endif
 
-#include <svtools/fltrcfg.hxx>
+#include <unotools/fltrcfg.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svx/svxmsbas.hxx>
-#include <svtools/saveopt.hxx>
+//#include <svx/svxmsbas.hxx>
+#include <unotools/saveopt.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <comphelper/processfactory.hxx>
@@ -783,14 +783,14 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark)
                 {
                     SdPage* pPage = pDrawViewShell->GetActualPage();
                     nPageNumber = pPage->GetPageNum();
-                    nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND; 
+                    nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND;
                 }
                 else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "nextslide" ) ) ) )
                 {
                     SdPage* pPage = pDrawViewShell->GetActualPage();
                     nPageNumber = pPage->GetPageNum() + 2;
                     if ( nPageNumber >= mpDoc->GetPageCount() )
-                        nPageNumber = SDRPAGE_NOTFOUND; 
+                        nPageNumber = SDRPAGE_NOTFOUND;
                 }
             }
         }
@@ -837,7 +837,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark)
                 ::rtl::OUString sViewURL;
                 switch (eNewPageKind)
                 {
-                    case PK_STANDARD: 
+                    case PK_STANDARD:
                         sViewURL = FrameworkHelper::msImpressViewURL;
                         break;
                     case PK_NOTES:
@@ -915,11 +915,11 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark)
                 }
             }
         }
-        
+
         SfxBindings& rBindings = (pDrawViewShell->GetViewFrame()!=NULL
             ? pDrawViewShell->GetViewFrame()
             : SfxViewFrame::Current() )->GetBindings();
-                
+
         rBindings.Invalidate(SID_NAVIGATOR_STATE, TRUE, FALSE);
         rBindings.Invalidate(SID_NAVIGATOR_PAGENAME);
     }
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 1ecfaa6ab..1097bd680 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -44,8 +44,8 @@
 #include <sfx2/srchitem.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/flstitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/printer.hxx>
 #ifndef _SFX_DOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
@@ -55,16 +55,16 @@
 #include <svx/drawitem.hxx>
 #include <svx/srchdlg.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/filter.hxx>
 #ifndef _SO_CLSIDS_HXX
 #include <sot/clsids.hxx>
 #endif
 #include <sfx2/topfrm.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/visitem.hxx>
 
 #include <svx/svdoutl.hxx>
 
@@ -92,7 +92,6 @@
 #include "FrameView.hxx"
 #endif
 #include "unomodel.hxx"
-#include "formatclipboard.hxx"
 #include "undo/undomanager.hxx"
 #include "undo/undofactory.hxx"
 #include "OutlineView.hxx"
@@ -169,7 +168,6 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
                                BOOL bDataObject,
                                DocumentType eDocumentType,BOOL bScriptSupport) :
     SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ?  SFX_CREATE_MODE_EMBEDDED : eMode),
-    mpFormatClipboard(new SdFormatClipboard()),
     mpDoc(NULL),
     mpUndoManager(NULL),
     mpPrinter(NULL),
@@ -196,7 +194,6 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode,
                                BOOL bDataObject,
                                DocumentType eDocumentType) :
     SfxObjectShell(eMode == SFX_CREATE_MODE_INTERNAL ?  SFX_CREATE_MODE_EMBEDDED : eMode),
-    mpFormatClipboard(new SdFormatClipboard()),
     mpDoc(pDoc),
     mpUndoManager(NULL),
     mpPrinter(NULL),
@@ -235,9 +232,6 @@ DrawDocShell::~DrawDocShell()
         mpDoc->SetSdrUndoManager( 0 );
     delete mpUndoManager;
 
-    if(mpFormatClipboard)
-        delete mpFormatClipboard;
-
     if (mbOwnPrinter)
         delete mpPrinter;
 
diff --git a/sd/source/ui/docshell/formatclipboard.cxx b/sd/source/ui/docshell/formatclipboard.cxx
deleted file mode 100644
index 0bc6d6fcd..000000000
--- a/sd/source/ui/docshell/formatclipboard.cxx
+++ /dev/null
@@ -1,237 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: formatclipboard.cxx,v $
- * $Revision: 1.10 $
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "formatclipboard.hxx"
-#include <svx/globl3d.hxx>
-
-// header for class SfxItemIter
-#include <svtools/itemiter.hxx>
-
-// header for class SfxStyleSheet
-#include <svtools/style.hxx>
-
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
-
-SdFormatClipboard::SdFormatClipboard()
-        : m_pItemSet(0)
-        , m_bPersistentCopy(false)
-        , m_nType_Inventor(0)
-        , m_nType_Identifier(0)
-{
-}
-SdFormatClipboard::~SdFormatClipboard()
-{
-    if(m_pItemSet)
-        delete m_pItemSet;
-}
-
-bool SdFormatClipboard::HasContent() const
-{
-    return m_pItemSet!=0;
-}
-
-bool SdFormatClipboard::CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
-{
-    if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor )
-        return false;
-    switch(nObjectIdentifier)
-    {
-        case OBJ_NONE:
-        case OBJ_GRUP:
-            return false;
-        case OBJ_LINE:
-        case OBJ_RECT:
-        case OBJ_CIRC:
-        case OBJ_SECT:
-        case OBJ_CARC:
-        case OBJ_CCUT:
-        case OBJ_POLY:
-        case OBJ_PLIN:
-        case OBJ_PATHLINE:
-        case OBJ_PATHFILL:
-        case OBJ_FREELINE:
-        case OBJ_FREEFILL:
-        case OBJ_SPLNLINE:
-        case OBJ_SPLNFILL:
-        case OBJ_TEXT:
-        case OBJ_TEXTEXT:
-        case OBJ_TITLETEXT:
-            return true;
-        case OBJ_OUTLINETEXT:
-        case OBJ_GRAF:
-        case OBJ_OLE2:
-        case OBJ_EDGE:
-        case OBJ_CAPTION:
-            return false;
-        case OBJ_PATHPOLY:
-        case OBJ_PATHPLIN:
-            return true;
-        case OBJ_PAGE:
-        case OBJ_MEASURE:
-        case OBJ_DUMMY:
-        case OBJ_FRAME:
-        case OBJ_UNO:
-            return false;
-        case OBJ_CUSTOMSHAPE:
-            return true;
-        default:
-            return false;
-    }
-}
-
-bool SdFormatClipboard::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
-{
-    if( !HasContent() )
-        return false;
-    if( !CanCopyThisType( nObjectInventor, nObjectIdentifier ) )
-        return false;
-    return true;
-}
-
-void SdFormatClipboard::Copy( ::sd::View& rDrawView, bool bPersistentCopy )
-{
-    this->Erase();
-    m_bPersistentCopy = bPersistentCopy;
-
-    const SdrMarkList& rMarkList = rDrawView.GetMarkedObjectList();
-    if( rMarkList.GetMarkCount() >= 1 )
-    {
-        BOOL bOnlyHardAttr = FALSE;
-        m_pItemSet = new SfxItemSet( rDrawView.GetAttrFromMarked(bOnlyHardAttr) );
-
-        SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-        m_nType_Inventor = pObj->GetObjInventor();
-        m_nType_Identifier = pObj->GetObjIdentifier();
-    }
-}
-
-void SdFormatClipboard::Paste( ::sd::View& rDrawView, bool, bool )
-{
-    if( !rDrawView.AreObjectsMarked() )
-    {
-        if(!m_bPersistentCopy)
-            this->Erase();
-        return;
-    }
-
-    SdrObject* pObj = 0;
-
-    bool bWrongTargetType = false;
-    {
-        const SdrMarkList& rMarkList = rDrawView.GetMarkedObjectList();
-        if( rMarkList.GetMarkCount() != 1 )
-            bWrongTargetType = true;
-        else
-        {
-            pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-            if( pObj && pObj->GetStyleSheet() )
-                bWrongTargetType = !this->HasContentForThisType( pObj->GetObjInventor(), pObj->GetObjIdentifier() );
-        }
-    }
-    if( bWrongTargetType )
-    {
-        if(!m_bPersistentCopy)
-            this->Erase();
-        return;
-    }
-    if(m_pItemSet)
-    {
-        //modify source itemset
-        {
-            boost::shared_ptr< SfxItemSet > pTargetSet;
-            
-            if( pObj->GetStyleSheet() )
-            {
-                pTargetSet.reset( new SfxItemSet( pObj->GetStyleSheet()->GetItemSet() ) );
-            }
-            else
-            {
-                SdrModel* pModel = pObj->GetModel();
-                if( pModel )
-                {
-                    pTargetSet.reset( new SfxItemSet( pModel->GetItemPool() ) );
-                }
-            }
-
-            if( pTargetSet.get() )
-            {
-                USHORT nWhich=0;
-                SfxItemState nSourceState;
-                SfxItemState nTargetState;
-                const SfxPoolItem* pSourceItem=0;
-                const SfxPoolItem* pTargetItem=0;
-                SfxItemIter aSourceIter(*m_pItemSet);
-                pSourceItem = aSourceIter.FirstItem();
-                while( pSourceItem!=NULL )
-                {
-                    if (!IsInvalidItem(pSourceItem))
-                    {
-                        nWhich = pSourceItem->Which();
-                        if(nWhich)
-                        {
-                            nSourceState = m_pItemSet->GetItemState( nWhich );
-                            nTargetState = pTargetSet->GetItemState( nWhich );
-                            pTargetItem = pTargetSet->GetItem( nWhich );
-                            
-                            if(!pTargetItem)
-                                m_pItemSet->ClearItem(nWhich);
-                            else if( (*pSourceItem) == (*pTargetItem) )
-                            {
-                                //do not set items which have the same content in source and target
-                                m_pItemSet->ClearItem(nWhich);
-                            }
-                        }
-                    }
-                    pSourceItem = aSourceIter.NextItem();
-                }//end while
-            }
-        }
-        BOOL bReplaceAll = TRUE;
-        rDrawView.SetAttrToMarked(*m_pItemSet, bReplaceAll);
-    }
-    if(!m_bPersistentCopy)
-        this->Erase();
-}
-
-void SdFormatClipboard::Erase()
-{
-    if(m_pItemSet)
-    {
-        delete m_pItemSet;
-        m_pItemSet = 0;
-    }
-    m_nType_Inventor=0;
-    m_nType_Identifier=0;
-    m_bPersistentCopy = false;
-}
diff --git a/sd/source/ui/docshell/makefile.mk b/sd/source/ui/docshell/makefile.mk
index f9e34eb03..d33faaf69 100644
--- a/sd/source/ui/docshell/makefile.mk
+++ b/sd/source/ui/docshell/makefile.mk
@@ -47,7 +47,6 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/formatclipboard.obj		\
         $(SLO)$/docshell.obj \
         $(SLO)$/docshel2.obj \
         $(SLO)$/docshel3.obj \
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 69fddfe16..fcc2ddc7c 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -45,7 +45,7 @@
 #include "app.hrc"
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <cppuhelper/compbase1.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <comphelper/stl_types.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index aae1dec75..4c4dc4fc0 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -54,8 +54,8 @@
 #include <svx/bulitem.hxx>
 #include <svx/brshitem.hxx>
 #include <vcl/graph.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <svx/numitem.hxx>
 #include <svx/eeitem.hxx>
 
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 43642cff7..acd4b292a 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -37,8 +37,8 @@
 #include <svx/svxids.hrc>
 #include <svx/tabarea.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
@@ -85,7 +85,6 @@ void FuArea::DoExecute( SfxRequest& rReq )
         AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL,
                                                                         &aNewAttr, 
                                                                         mpDoc,
-                                                                        RID_SVXDLG_AREA,
                                                                         mpView) : 0;
         if( pDlg && (pDlg->Execute() == RET_OK) )
         {
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index d9b35052d..afaed44aa 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/bindings.hxx>
 #endif
 #include <svx/eeitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/fontitem.hxx>
 #include "OutlineViewShell.hxx"
 #include "DrawViewShell.hxx"
@@ -49,12 +49,9 @@
 #include <svx/svdoutl.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/ctloptions.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/ctloptions.hxx>
+#include <svl/itempool.hxx>
 
-#ifdef IRIX
-#include <basic/sbx.hxx>
-#endif
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include "drawview.hxx"
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index afecd4b42..638b14d97 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -35,7 +35,7 @@
 #include <vcl/waitobj.hxx>
 
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index e36e81ed2..6044b86fd 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -35,8 +35,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdocirc.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 52d224386..38cfe90d3 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -34,9 +34,9 @@
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 
 #include "fuconbez.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdopath.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 979c16bbf..dabef14c9 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -40,7 +40,7 @@
 #include <svx/dialmgr.hxx>
 
 #include "app.hrc"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnedit.hxx>
@@ -53,7 +53,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdocirc.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/xtable.hxx>
@@ -73,7 +73,7 @@
 // #109583#
 #include <svx/writingmodeitem.hxx>
 #include <svx/gallery.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #include "sdresid.hxx"
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 07a538264..eec0319c2 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -40,7 +40,7 @@
 #include <svx/dialmgr.hxx>
 
 #include "app.hrc"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnedit.hxx>
@@ -53,7 +53,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdocirc.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/xtable.hxx>
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 6072ec814..499550b21 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -34,7 +34,7 @@
 #include "fuconstr.hxx"
 
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 8ffc4e50f..ceeba1da0 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -32,11 +32,11 @@
 #include "precompiled_sd.hxx"
 
 #include "fuconuno.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 
 #include <svx/fmglob.hxx>
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index a313fd874..65acaa1d1 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -76,7 +76,7 @@
 #include "sdresid.hxx"
 #include "drawview.hxx"
 #include "fusel.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/msgbox.hxx>
 #include "slideshow.hxx"
 #include <svx/sdrhittesthelper.hxx>
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index f54949de4..8db5ab6ae 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 #include "fuediglu.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index ba757a302..f9ed2c0de 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -31,19 +31,30 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
+#include <sfx2/request.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+
+#include <svl/itemiter.hxx>
+
+#include <svx/globl3d.hxx>
+#include <svx/svxids.hrc>
+#include <svx/svdotable.hxx>
+#include <svx/outliner.hxx>
+#include <svx/eeitem.hxx>
+#include <svx/editeng.hxx>
+
 #define _SD_DLL // fuer SD_MOD()
 #include "sdmod.hxx"
 
 #include "fuformatpaintbrush.hxx"
-#include "formatclipboard.hxx"
-#include "View.hxx"
-#include "ViewShell.hxx"
+#include "drawview.hxx"
 #include "DrawDocShell.hxx"
-// header for class SfxBindings
-#include <sfx2/bindings.hxx>
-/*
-#include <svx/svxids.hrc>
-*/
+#include "DrawViewShell.hxx"
+#include "FrameView.hxx"
+#include "drawdoc.hxx"
+#include "Outliner.hxx"
+#include "ViewShellBase.hxx"
 
 #ifndef SD_WINDOW_SHELL_HXX
 #include "Window.hxx"
@@ -51,66 +62,137 @@
 
 namespace sd {
 
-TYPEINIT1( FuFormatPaintBrush, FuPoor );
+TYPEINIT1( FuFormatPaintBrush, FuText );
 
-FuFormatPaintBrush::FuFormatPaintBrush(
-            ViewShell* pViewSh
-            , ::sd::Window* pWin
-            , ::sd::View* pView
-            , SdDrawDocument* pDoc
-            , SfxRequest& rReq ) 
-        : FuPoor(pViewSh, pWin, pView, pDoc, rReq)
+FuFormatPaintBrush::FuFormatPaintBrush( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) 
+: FuText(pViewSh, pWin, pView, pDoc, rReq)
+, mbPermanent( false )
+, mbOldIsQuickTextEditMode( true )
 {
 }
 
 FunctionReference FuFormatPaintBrush::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
 {
     FunctionReference xFunc( new FuFormatPaintBrush( pViewSh, pWin, pView, pDoc, rReq ) );
+    xFunc->DoExecute( rReq );
     return xFunc;
 }
 
+void FuFormatPaintBrush::DoExecute( SfxRequest& rReq )
+{
+    const SfxItemSet *pArgs = rReq.GetArgs();
+    if( pArgs && pArgs->Count() >= 1 )
+    {
+        mbPermanent = static_cast<bool>(((SfxBoolItem &)pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue());
+    }
+
+    if( mpView )
+    {
+        mpView->TakeFormatPaintBrush( mpItemSet );
+    }
+}
+
+void FuFormatPaintBrush::implcancel()
+{
+    if( mpViewShell && mpViewShell->GetViewFrame() )
+    {			
+        SfxViewFrame* pViewFrame = mpViewShell->GetViewFrame();
+        pViewFrame->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
+        pViewFrame->GetDispatcher()->Execute(SID_OBJECT_SELECT, SFX_CALLMODE_ASYNCHRON);
+    }
+}
+
+static void unmarkimpl( SdrView* pView )
+{
+    pView->SdrEndTextEdit();
+    pView->UnMarkAll();
+}
+
 BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
 {
     if(mpView&&mpWindow)
     {
-        USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-        BOOL bToggle = FALSE;
-        mpView->UnMarkAll();
-        mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE);
+        SdrViewEvent aVEvt;
+        SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+
+        if( (eHit == SDRHIT_TEXTEDIT) || (eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) ))
+        {
+            SdrObject* pPickObj=0;
+            SdrPageView* pPV=0;
+            USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+            mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPickObj, pPV, SDRSEARCH_PICKMARKABLE);
+
+            if( (pPickObj != 0) && !pPickObj->IsEmptyPresObj() )
+            {
+                // if we text hit another shape than the one currently selected, unselect the old one now
+                const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
+                if( rMarkList.GetMarkCount() >= 1 )
+                {
+                    if( rMarkList.GetMarkCount() == 1 )
+                    {
+                        if( rMarkList.GetMark(0)->GetMarkedSdrObj() != pPickObj )
+                        {
+
+                            // if current selected shape is not that of the hit text edit, deselect it
+                            unmarkimpl( mpView );
+                        }
+                    }
+                    else
+                    {
+                        // more than one shape selected, deselect all of them
+                        unmarkimpl( mpView );
+                    }
+                }
+                MouseEvent aMEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), 0 );
+                return FuText::MouseButtonDown(aMEvt);
+            }
+
+            if( aVEvt.pObj == 0 )
+                aVEvt.pObj = pPickObj;
+        }
+
+        unmarkimpl( mpView );
+
+        if( aVEvt.pObj )
+        {	
+            USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+            BOOL bToggle = FALSE;
+            mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE);
+            return TRUE;
+        }
     }
     return FALSE;
 }
 
 BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt)
 {
-    SdFormatClipboard* pFormatClipboard = 0;
-    if(mpViewShell)
-        pFormatClipboard = mpViewShell->GetDocSh()->mpFormatClipboard;
-    if(mpView&&mpWindow&&pFormatClipboard&&pFormatClipboard->HasContent())
+    BOOL bReturn = FALSE;
+    if( mpWindow && mpView )
     {
-        USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-        SdrObject* pObj=0;
-        SdrPageView* pPV=0;
-        BOOL bOverMarkableObject = mpView->PickObj( 
-             mpWindow->PixelToLogic( rMEvt.GetPosPixel() )
-            ,nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE);
-
-        if(bOverMarkableObject && pFormatClipboard->HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
+        if ( mpView->IsTextEdit() )
+        {
+            bReturn = FuText::MouseMove( rMEvt );
             mpWindow->SetPointer(Pointer(POINTER_FILL));
+        }
         else
-            mpWindow->SetPointer(Pointer(POINTER_ARROW));
+        {
+            USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+            SdrObject* pObj=0;
+            SdrPageView* pPV=0;
+            BOOL bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE);
+
+            if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
+                mpWindow->SetPointer(Pointer(POINTER_FILL));
+            else
+                mpWindow->SetPointer(Pointer(POINTER_ARROW));
+        }
     }
-    else
-        mpWindow->SetPointer(Pointer(POINTER_ARROW));
-    return FALSE;
+    return bReturn;
 }
 
 BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt)
 {
-    SdFormatClipboard* pFormatClipboard = 0;
-    if(mpViewShell)
-        pFormatClipboard = mpViewShell->GetDocSh()->mpFormatClipboard;
-    if( pFormatClipboard && mpView && mpView->AreObjectsMarked() )
+    if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() )
     {
         bool bNoCharacterFormats = false;
         bool bNoParagraphFormats = false;
@@ -120,37 +202,97 @@ BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt)
             else if( rMEvt.GetModifier() & KEY_MOD1 )
                 bNoParagraphFormats = true;
         }
-        pFormatClipboard->Paste( *mpView, bNoCharacterFormats, bNoParagraphFormats );
+
+        OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+        if( pOLV )
+            pOLV->MouseButtonUp(rMEvt);
+
+        Paste( bNoCharacterFormats, bNoParagraphFormats );
         if(mpViewShell)
             mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
+
+        if( mbPermanent )
+            return TRUE;
     }
-    if(mpViewShell && pFormatClipboard && !pFormatClipboard->HasContent() )
-        mpViewShell->Cancel();
+
+    implcancel();
     return TRUE;
 }
 
 BOOL FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt)
 {
-    if( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE && mpViewShell )
+    if( (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) && mpViewShell )
     {
-        SdFormatClipboard* pFormatClipboard = mpViewShell->GetDocSh()->mpFormatClipboard;
-        if(pFormatClipboard)
-        {
-            pFormatClipboard->Erase();
-            mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
-            mpViewShell->Cancel();
-
-            return TRUE;
-        }
+        implcancel();
+        return TRUE;
     }
     return FuPoor::KeyInput(rKEvt);
 }
 
 void FuFormatPaintBrush::Activate()
 {
+    mbOldIsQuickTextEditMode = mpViewShell->GetFrameView()->IsQuickEdit();
+    if( !mbOldIsQuickTextEditMode  )
+    {
+        mpViewShell->GetFrameView()->SetQuickEdit(TRUE);
+        mpView->SetQuickTextEditMode(TRUE);
+    }
 }
 
 void FuFormatPaintBrush::Deactivate()
 {
+    if( !mbOldIsQuickTextEditMode  )
+    {
+        mpViewShell->GetFrameView()->SetQuickEdit(FALSE);
+        mpView->SetQuickTextEditMode(FALSE);
+    }
+}
+
+bool FuFormatPaintBrush::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
+{
+    if( mpItemSet.get() == 0 )
+        return false;
+    if( !mpView || (!mpView->SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) )
+        return false;
+    return true;
+}
+
+void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphFormats )
+{
+    const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
+    if(mpItemSet.get() && (rMarkList.GetMarkCount() == 1) )
+    {
+        SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+    
+        if( mpDoc->IsUndoEnabled() )
+        {
+            String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) );
+            mpDoc->BegUndo( sLabel );
+            mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,TRUE));
+        }
+
+        mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats );
+        
+        if( mpDoc->IsUndoEnabled() )
+        {
+            mpDoc->EndUndo();
+        }
+    }
+}
+
+/* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet )
+{
+    const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList();
+    const ULONG nMarkCount = rMarkList.GetMarkCount();
+    
+    if( nMarkCount == 1 )
+    {
+        SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+        if( pObj && rDrawViewShell.GetDrawView()->SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
+            return;
+    }
+    rSet.DisableItem( SID_FORMATPAINTBRUSH );
 }
+
+
 } // end of namespace sd
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 5005aac45..a8cb5a023 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <cppuhelper/bootstrap.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/langitem.hxx>
 #include <svx/fontitem.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 13adb0199..3c28fa9bf 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,13 +44,13 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #include <svtools/sores.hxx>
 #include <svtools/insdlg.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/globalnameitem.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/globalnameitem.hxx>
+#include <unotools/pathoptions.hxx>
 #include <svx/pfiledlg.hxx>
 #include <svx/impgrf.hxx>
 #include <svx/dialogs.hrc>
@@ -64,7 +64,7 @@
 #include <sot/clsids.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
@@ -526,7 +526,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
                     {
                         // the default size will be set later
                     }
-                
+
                     aSize =Size( aSz.Width, aSz.Height );
 
                     aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) );
@@ -644,7 +644,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
                         {
                             //HMHmpView->HideMarkHdl();
                             pObj->SetLogicRect(aRect);
-                            
+
                             if ( nAspect != embed::Aspects::MSOLE_ICON )
                             {
                                 Size aTmp = OutputDevice::LogicToLogic( aRect.GetSize(), MAP_100TH_MM, aMapUnit );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 7cc086083..588dc6e65 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -38,7 +38,7 @@
 #ifndef _EDITENG_HXX
 #include <svx/editeng.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/msgbox.hxx>
@@ -48,7 +48,7 @@
 #include <svx/svdoutl.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sot/formats.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 641f04441..fb3b70f99 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -38,8 +38,8 @@
 #include <svx/tabline.hxx>
 #include <svx/xenum.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/xdef.hxx>
 #include <sfx2/bindings.hxx>
@@ -98,7 +98,7 @@ void FuLine::DoExecute( SfxRequest& rReq )
         mpView->GetAttributes( *pNewAttr );
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,RID_SVXDLG_LINE,pObj,bHasMarked) : 0;
+        SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,pObj,bHasMarked) : 0;
         if( pDlg && (pDlg->Execute() == RET_OK) )
         {
             mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 2244fe72c..3f901a4c3 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -140,7 +140,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
         }
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc, RID_SVXDLG_NAME ) : 0;
+        AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0;
 
         if( pDlg )
         {
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 3148e4eae..46c18c479 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -42,13 +42,13 @@
 #include <svx/svdogrp.hxx>
 #include <svx/eeitem.hxx>
 
-
 #include "View.hxx"
 #include "ViewShell.hxx"
 #include "Window.hxx"
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 #include "strings.hrc"
 #include "sdresid.hxx"
@@ -264,9 +264,8 @@ void FuMorph::ImpEqualizePolyPointCount(::basegfx::B2DPolygon& rSmall, const ::b
     const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter());
     const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmall));
     const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter());
-    ::basegfx::B2DHomMatrix aTrans;
-
-    aTrans.translate(-aSrcPos.getX(), -aSrcPos.getY());
+    
+    basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aSrcPos.getX(), -aSrcPos.getY()));
     aTrans.scale(aDstSize.getWidth() / aSrcSize.getWidth(), aDstSize.getHeight() / aSrcSize.getHeight());
     aTrans.translate(aDstPos.getX(), aDstPos.getY());
 
@@ -499,16 +498,15 @@ sal_Bool FuMorph::ImpMorphPolygons(
         for(sal_uInt16 i(0); i < nSteps; i++)
         {
             fValue += fFactor;
-            ::basegfx::B2DPolyPolygon* pNewPolyPoly3D = ImpCreateMorphedPolygon(rPolyPoly1, rPolyPoly2, fValue);
+            ::basegfx::B2DPolyPolygon* pNewPolyPoly2D = ImpCreateMorphedPolygon(rPolyPoly1, rPolyPoly2, fValue);
 
-            const ::basegfx::B2DRange aNewPolySize(::basegfx::tools::getRange(*pNewPolyPoly3D));
+            const ::basegfx::B2DRange aNewPolySize(::basegfx::tools::getRange(*pNewPolyPoly2D));
             const ::basegfx::B2DPoint aNewS(aNewPolySize.getCenter());
             const ::basegfx::B2DPoint aRealS(aStartCenter + (aDelta * fValue));
-            ::basegfx::B2DHomMatrix aTrans;
             const ::basegfx::B2DPoint aDiff(aRealS - aNewS);
-            aTrans.translate(aDiff.getX(), aDiff.getY());
-            pNewPolyPoly3D->transform(aTrans);
-            rPolyPolyList3D.Insert(pNewPolyPoly3D, LIST_APPEND);
+
+            pNewPolyPoly2D->transform(basegfx::tools::createTranslateB2DHomMatrix(aDiff));
+            rPolyPolyList3D.Insert(pNewPolyPoly2D, LIST_APPEND);
         }
     }
     return TRUE;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index db7550726..4a0705c1d 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -46,7 +46,7 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include "svx/xtable.hxx"
 
 #include "strings.hrc"
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index bdaa99855..d77b01d6a 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -34,11 +34,11 @@
 
 #include "fuolbull.hxx"
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/outliner.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 
 #include <svx/editdata.hxx>
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 31de19e34..5368a66a9 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -40,14 +40,14 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <vcl/prntypes.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <stlsheet.hxx>
 #ifndef _SVX_SVDORECT_HXX
 #include <svx/svdorect.hxx>
@@ -59,7 +59,7 @@
 #include <svx/frmdiritem.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xsetit.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/ulspitem.hxx>
 #include <svx/lrspitem.hxx>
 
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 777af1142..6fa1c7ee7 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -35,7 +35,7 @@
 #include "fupoor.hxx"
 
 #include <svx/svxids.hrc>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 5ff569609..d1cf9e94d 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -35,8 +35,8 @@
 #include "fuprlout.hxx"
 #include <vcl/wrkwin.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/itempool.hxx>
 #include <sot/storage.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 94ce4a410..3162871f8 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -36,9 +36,9 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/outliner.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 
 #include "app.hrc"
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 4ec3b7a71..e15e4ac88 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -139,7 +139,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
-            pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr, RID_SVXDLG_ZOOM);
+            pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr);
         }
 
         if( pDlg )
@@ -169,12 +169,11 @@ void FuScale::DoExecute( SfxRequest& rReq )
 
             delete pDlg;
 
-    //		SvxZoomType eZT = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ();
-            switch (((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ())
+            switch (((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetType ())
             {
                 case SVX_ZOOM_PERCENT:
                 {
-                    nValue = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetValue ();
+                    nValue = ((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetValue ();
 
                     mpViewShell->SetZoom( nValue );
 
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 0c6ca10c2..7bf64f622 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -40,15 +40,15 @@
 #include <svx/polysc3d.hxx>
 #include "drawview.hxx"
 #include <svtools/imapobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xfillit0.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 67c178399..549252df8 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -33,7 +33,7 @@
 
 
 #include "fusldlg.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index ca271774f..941999ebe 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 #include "fusnapln.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/request.hxx>
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 08f8281c0..e81d98569 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -42,7 +42,7 @@
 #include <svx/bulitem.hxx>
 #include <svx/svxids.hrc>   // fuer SID_OBJECT_SELECT
 #include <sfx2/bindings.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/eeitem.hxx>
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index cb1e38e3a..45bfeffa0 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -39,14 +39,14 @@
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
 #include <svx/editstat.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/svdotext.hxx>
 #ifndef _SVDOGROUP_HXX //autogen
 #include <svx/svdogrp.hxx>
 #endif
 #include <svx/flditem.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 15c13e62c..32726db55 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
-                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView, RID_SVXDLG_CAPTION ) );
+                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
 
                     const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
                     SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -114,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet,mpView, RID_SVXDLG_TRANSFORM) );
+                    std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
                     if( pDlg.get() && (pDlg->Execute() == RET_OK) )
                     {
                         rReq.Done( *( pDlg->GetOutputItemSet() ) );
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index b1ee91552..7f48aed7d 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -79,7 +79,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq )
     if( !pArgs )
     {
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, mpView );
+        SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView );
 
         USHORT nResult = pDlg->Execute();
 
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index db7f030c3..8c28dec0a 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <tools/link.hxx>
 
 namespace sd {
@@ -159,7 +160,8 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> SAL_CALL
         getAccessibleChild (sal_Int32 nIndex)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException,
+            ::com::sun::star::lang::IndexOutOfBoundsException);
 
 
     //=====  XAccessibleComponent  ============================================
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index c6404c2c0..bba70ad71 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -33,7 +33,6 @@
 
 #include "AccessibleDocumentViewBase.hxx"
 
-
 namespace accessibility {
 
 
@@ -78,7 +77,8 @@ public:
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
         getAccessibleChild (sal_Int32 nIndex)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException,
+            ::com::sun::star::lang::IndexOutOfBoundsException);
 
 
     //=====  lang::XEventListener  ============================================
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index ce4ba45f5..1c31132b3 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -33,8 +33,8 @@
 
 #include <memory>
 #include <vcl/svapp.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <svx/unoedsrc.hxx>
 #include <svx/editdata.hxx>
 #include <svx/unoforou.hxx>
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 43099ef56..ccea601a2 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -52,7 +52,6 @@ class SfxPrinter;
 struct SdrDocumentStreamInfo;
 struct SpellCallbackInfo;
 class AbstractSvxNameDialog;
-class SdFormatClipboard;
 
 namespace sd {
 
@@ -209,9 +208,6 @@ public:
 
     void					ClearUndoBuffer();
 
-public:
-    SdFormatClipboard*      mpFormatClipboard;
-
 protected:
 
     SdDrawDocument* 		mpDoc;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index 9ba6cc036..04daa9895 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -31,7 +31,7 @@
 #ifndef SD_TOOLS_EVENT_MULTIPLEXER_HXX
 #define SD_TOOLS_EVENT_MULTIPLEXER_HXX
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <set>
 #include <memory>
diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
index d1c99cff4..be432055a 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -34,7 +34,7 @@
 #include <ViewShellManager.hxx>
 
 #include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 class VclWindowEvent;
 class FmFormShell;
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index 346707739..15ecbb04d 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -34,7 +34,7 @@
 #include "drawview.hxx"
 #include <vcl/image.hxx>
 #include <vcl/virdev.hxx>
-#include <svtools/listener.hxx>
+#include <svl/listener.hxx>
 #include <memory>
 
 
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 93df2d1a9..32e6596dd 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -264,6 +264,10 @@ public:
     
     CustomHandleManager& getCustomHandleManager() const;
 
+    /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration
+        and not cached, so do not use it excessive (f.e. in status updates) */
+    ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const;
+
 protected:
     osl::Mutex maMutex;
 
diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx
index d6d67c805..8fdf227f4 100644
--- a/sd/source/ui/inc/ViewShellHint.hxx
+++ b/sd/source/ui/inc/ViewShellHint.hxx
@@ -31,7 +31,7 @@
 #ifndef SD_VIEW_SHELL_HINT_HXX
 #define SD_VIEW_SHELL_HINT_HXX
 
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index 9482d7b5a..c8b467b68 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -31,8 +31,8 @@
 #ifndef SD_OUTPUT_DEVICE_UPDATER_HXX
 #define SD_OUTPUT_DEVICE_UPDATER_HXX
 
-#include <svtools/lstner.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/lstner.hxx>
+#include <svl/ctloptions.hxx>
 #include "sddllapi.h"
 
 #ifndef INCLUDED_VECTOR
@@ -65,7 +65,7 @@ class ViewShell;
     this document is reformatted when the monitored option changes.</p>
 */
 class SD_DLLPUBLIC WindowUpdater
-    : public SfxListener
+    : public utl::ConfigurationListener
 {
 public:
     explicit WindowUpdater (void);
@@ -116,7 +116,7 @@ public:
     /** Callback that waits for notifications of a
         <type>SvtCTLOptions</type> object.
     */
-    virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint);
+    virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint);
 
 private:
     /// Options to monitor for changes.
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 4e0252bed..67567f7cb 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -32,7 +32,7 @@
 #define _SD_DIACTRL_HXX
 
 #include "dlgctrls.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <svx/itemwin.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index e1379ffa7..d137677dd 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -37,7 +37,7 @@
 
 #include <rtl/ref.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/colorcfg.hxx>
 #include "fadedef.h"
 #include "sddllapi.h"
diff --git a/sd/source/ui/inc/formatclipboard.hxx b/sd/source/ui/inc/formatclipboard.hxx
deleted file mode 100644
index 02583faaa..000000000
--- a/sd/source/ui/inc/formatclipboard.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: formatclipboard.hxx,v $
- * $Revision: 1.4 $
- *
- * 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 _SDFORMATCLIPBOARD_HXX
-#define _SDFORMATCLIPBOARD_HXX
-
-#include "View.hxx"
-// header for class SfxItemSet
-#include <svtools/itemset.hxx>
-
-//-----------------------------------------------------------------------------
-/** This class acts as data container and execution class for the format paintbrush feature in draw and impress.
-*/
-
-class SdFormatClipboard
-{
-public:
-    SdFormatClipboard();
-    virtual ~SdFormatClipboard();
-
-    bool HasContent() const;
-    bool CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
-    bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
-
-    void Copy( ::sd::View& rDrawView, bool bPersistentCopy=false );
-    void Paste( ::sd::View& rDrawView
-        , bool bNoCharacterFormats=false, bool bNoParagraphFormats=false );
-    void Erase();
-
-private:
-    SfxItemSet* m_pItemSet;
-    bool   m_bPersistentCopy;
-    UINT32 m_nType_Inventor;
-    UINT16 m_nType_Identifier;
-};
-
-#endif
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index f3199dfbf..fb4a9512e 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -31,7 +31,7 @@
 #ifndef SD_FU_CONSTRUCT_UNO_CONTROL_HXX
 #define SD_FU_CONSTRUCT_UNO_CONTROL_HXX
 
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include "fuconstr.hxx"
 
 namespace sd {
diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx
index 5685ce6fd..e6d01bda2 100644
--- a/sd/source/ui/inc/fuformatpaintbrush.hxx
+++ b/sd/source/ui/inc/fuformatpaintbrush.hxx
@@ -31,15 +31,17 @@
 #ifndef SD_FU_FORMATPAINTBRUSH_HXX
 #define SD_FU_FORMATPAINTBRUSH_HXX
 
-#include "fupoor.hxx"
+#include "futext.hxx"
 
 // header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
+#include <boost/scoped_ptr.hpp>
 
 namespace sd {
 
-class FuFormatPaintBrush
-    : public FuPoor
+class DrawViewShell;
+
+class FuFormatPaintBrush : public FuText
 {
 public:
     TYPEINFO();
@@ -54,14 +56,22 @@ public:
     virtual void Activate();
     virtual void Deactivate();
 
+    static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet );
+    static bool CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier );
+
 private:
-        FuFormatPaintBrush (
-        ViewShell* pViewSh, 
-        ::sd::Window* pWin, 
-        ::sd::View* pView,
-        SdDrawDocument* pDoc,
-        SfxRequest& rReq);
+    FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq);
 
+    void DoExecute( SfxRequest& rReq );
+    
+    bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
+    void Paste( bool, bool );
+    
+    void implcancel();
+    
+    ::boost::shared_ptr<SfxItemSet> mpItemSet;
+    bool   mbPermanent;
+    bool   mbOldIsQuickTextEditMode;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index ed8fd7ff6..b5e463241 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -85,6 +85,7 @@ public:
     virtual ~SdOptionsItem();
 
     virtual void			Commit();
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( 
                                 const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames );
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index be671dadb..17847c492 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -40,7 +40,7 @@
 #include "sddllapi.h"
 #include <tools/string.hxx>
 #include <svtools/svtreebx.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <tools/ref.hxx>
 #include "sdxfer.hxx"
 
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index f3d8e7b9d..11ff9b726 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -34,7 +34,7 @@
 #include <svtools/transfer.hxx>
 #include <vcl/graph.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 // ------------------
 // - SdTransferable -
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 317cbe083..de9491568 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -52,7 +52,7 @@
 
 #include <rtl/ref.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <svx/fmdmod.hxx>
 
diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx
index 90e3f3a3c..4a7d91e87 100755
--- a/sd/source/ui/notes/EditWindow.cxx
+++ b/sd/source/ui/notes/EditWindow.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,12 +41,12 @@
 #include <vcl/scrbar.hxx>
 #include <svx/eeitem.hxx>
 #include "sdresid.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/fhgtitem.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/fontitem.hxx>
 #include <svx/editstat.hxx>
 
@@ -189,10 +189,10 @@ EditEngine* EditWindow::CreateEditEngine (void)
                 rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE);
             mpEditEngineItemPool->SetPoolDefaultItem(
                 SvxFontItem(
-                    aFont.GetFamily(), 
+                    aFont.GetFamily(),
                     aFont.GetName(),
-                    aFont.GetStyleName(), 
-                    aFont.GetPitch(), 
+                    aFont.GetStyleName(),
+                    aFont.GetPitch(),
                     aFont.GetCharSet(),
                     rFntDta.nFontInfoId));
         }
@@ -216,7 +216,7 @@ EditEngine* EditWindow::CreateEditEngine (void)
                 UniString::CreateFromAscii("XXXX"))));
 
         pEditEngine->SetControlWord(
-                (pEditEngine->GetControlWord() 
+                (pEditEngine->GetControlWord()
                     | EE_CNTRL_AUTOINDENTING) &
                 (~EE_CNTRL_UNDOATTRIBS) &
                 (~EE_CNTRL_PASTESPECIAL));
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 1ec20a11f..8890c608f 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,10 +35,10 @@
 
 #include <i18npool/mslangid.hxx>
 #include <cppcanvas/vclfactory.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/colritem.hxx>
 #include <svx/editeng.hxx>
 #include <svx/editstat.hxx>
@@ -106,7 +106,7 @@ public:
     const OUString msTopPropertyName;
     const OUString msTopRelativePropertyName;
     const OUString msTotalHeightPropertyName;
-    
+
     Implementation (void);
     ~Implementation (void);
 
@@ -397,10 +397,10 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
                 rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE);
             mpEditEngineItemPool->SetPoolDefaultItem(
                 SvxFontItem(
-                    aFont.GetFamily(), 
+                    aFont.GetFamily(),
                     aFont.GetName(),
-                    aFont.GetStyleName(), 
-                    aFont.GetPitch(), 
+                    aFont.GetStyleName(),
+                    aFont.GetPitch(),
                     aFont.GetCharSet(),
                     rFntDta.nFontInfoId));
         }
@@ -414,7 +414,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
                 UniString::CreateFromAscii("XXXX"))));
 
         pEditEngine->SetControlWord(
-                (pEditEngine->GetControlWord() 
+                (pEditEngine->GetControlWord()
                     | EE_CNTRL_AUTOINDENTING) &
                 (~EE_CNTRL_UNDOATTRIBS) &
                 (~EE_CNTRL_PASTESPECIAL));
@@ -512,23 +512,23 @@ void PresenterTextView::Implementation::SetFontDescriptor (
     CheckTop();
     mnTotalHeight = -1;
 }
- 
- 
- 
- 
+
+
+
+
 sal_Int32 PresenterTextView::Implementation::GetTop (void) const
 {
     return mnTop;
 }
- 
- 
- 
- 
+
+
+
+
 void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop)
 {
     if (nTop == mnTop)
         return;
- 
+
     mnTop = nTop;
     mxBitmap = NULL;
     CheckTop();
@@ -571,7 +571,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi
     else if (rsDistance.endsWithAsciiL("l", 1))
     {
         const sal_Int32 nLines (rsDistance.copy(0,rsDistance.getLength()-1).toInt32());
-        // Take the height of the first line as the height of every line. 
+        // Take the height of the first line as the height of every line.
         const sal_uInt32 nFirstLineHeight (mpEditEngine->GetLineHeight(0,0));
         nDistance = nFirstLineHeight * nLines;
     }
@@ -597,13 +597,13 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void
         mpOutputDevice->SetFillColor();
         mpOutputDevice->SetBackground(Wallpaper());
         mpOutputDevice->Erase();
- 
+
         MapMode aMapMode (mpOutputDevice->GetMapMode());
         aMapMode.SetOrigin(Point(0,0));
         mpOutputDevice->SetMapMode(aMapMode);
         const Rectangle aWindowBox (Point(0,0), maSize);
         mpOutputDevice->DrawRect(aWindowBox);
-        
+
         mpEditEngine->Clear();
         mpEditEngine->SetText(msText);
         mpEditEngine->SetPaperSize(maSize);
@@ -646,13 +646,13 @@ void PresenterTextView::Implementation::CheckTop (void)
         mnTotalHeight = mpEditEngine->GetTextHeight();
     if (mpEditEngine!=NULL && mnTop >= mnTotalHeight)
         mnTop = mnTotalHeight - mpEditEngine->GetLineHeight(0,0);
- 
+
     if (mnTotalHeight < maSize.Height())
         mnTop = 0;
- 
+
     if (mnTotalHeight - mnTop < maSize.Height())
         mnTop = mnTotalHeight - maSize.Height();
- 
+
     if (mnTop < 0)
         mnTop = 0;
 }
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 1310e0497..10b81ce51 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -35,7 +35,7 @@
 
 #include "showwindow.hxx"
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <sfx2/viewfrm.hxx>
 
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 78a6c6df4..6da2950a9 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -44,7 +44,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #include <sfx2/topfrm.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6bbb771a1..22867cb79 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -46,8 +46,8 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <vos/process.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/urihelper.hxx>
 
 #include <toolkit/unohlp.hxx>
 
@@ -169,7 +169,9 @@ public:
     bool nextSlide();
     bool previousSlide();
 
-    void displayCurrentSlide( const Reference< XSlideShow >& xShow );
+    void displayCurrentSlide(
+        const Reference< XSlideShow >& xShow,
+        const bool bSkipAllMainSequenceEffects);
 
     sal_Int32 getNextSlideIndex() const;
     sal_Int32 getPreviousSlideIndex() const;
@@ -466,29 +468,58 @@ bool AnimationSlideController::previousSlide()
     return jumpToSlideIndex( getPreviousSlideIndex() );
 }
 
-void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow )
+void AnimationSlideController::displayCurrentSlide(
+    const Reference< XSlideShow >& xShow,
+    const bool bSkipAllMainSequenceEffects)
 {
     const sal_Int32 nCurrentSlideNumber = getCurrentSlideNumber();
 
     if( xShow.is() && (nCurrentSlideNumber != -1 ) )
     {
-        Sequence< PropertyValue > aProperties;
         Reference< XDrawPage > xSlide;
         Reference< XAnimationNode > xAnimNode;
-
+        ::std::vector<PropertyValue> aProperties;
+        
         const sal_Int32 nNextSlideNumber = getNextSlideNumber();
         if( getSlideAPI( nNextSlideNumber, xSlide, xAnimNode )  )
         {
             Sequence< Any > aValue(2);
             aValue[0] <<= xSlide;
             aValue[1] <<= xAnimNode;
-            aProperties.realloc(1);
-            aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Prefetch" ) );
-            aProperties[0].Value <<= aValue;
+            aProperties.push_back(
+                PropertyValue(
+                    OUString( RTL_CONSTASCII_USTRINGPARAM( "Prefetch" ) ),
+                    -1,
+                    Any(aValue),
+                    PropertyState_DIRECT_VALUE));
+        }
+        if (bSkipAllMainSequenceEffects)
+        {
+            // Add one property that prevents the slide transition from being
+            // shown (to speed up the transition to the previous slide) and
+            // one to show all main sequence effects so that the user can
+            // continue to undo effects.
+            aProperties.push_back(
+                PropertyValue(
+                    OUString( RTL_CONSTASCII_USTRINGPARAM("SkipAllMainSequenceEffects")),
+                    -1,
+                    Any(sal_True),
+                    PropertyState_DIRECT_VALUE));
+            aProperties.push_back(
+                PropertyValue(
+                    OUString( RTL_CONSTASCII_USTRINGPARAM("SkipSlideTransition")),
+                    -1,
+                    Any(sal_True),
+                    PropertyState_DIRECT_VALUE));
         }
 
+        // Convert vector into uno Sequence.
+        Sequence< PropertyValue > aPropertySequence (aProperties.size());
+        for (int nIndex=0,nCount=aProperties.size();nIndex<nCount; ++nIndex)
+            aPropertySequence[nIndex] = aProperties[nIndex];
+        
         if( getSlideAPI( nCurrentSlideNumber, xSlide, xAnimNode ) )
-            xShow->displaySlide( xSlide, xAnimNode, aProperties );
+            xShow->displaySlide( xSlide, xAnimNode, aPropertySequence );
     }
 }
 
@@ -730,6 +761,9 @@ void SAL_CALL SlideshowImpl::disposing()
 
     setActiveXToolbarsVisible( sal_True );
 
+    Application::EnableNoYieldMode(false);
+    Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+
     mbDisposed = true;
 }
 
@@ -1235,9 +1269,12 @@ void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideSho
 
 // ---------------------------------------------------------
 
-void SlideshowImpl::slideEnded()
+void SlideshowImpl::slideEnded(const bool bReverse)
 {
-    gotoNextSlide();
+    if (bReverse)
+        gotoPreviousSlide(true);
+    else
+        gotoNextSlide();
 }
 
 // ---------------------------------------------------------
@@ -1387,14 +1424,14 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
 
 // ---------------------------------------------------------
 
-void SlideshowImpl::displayCurrentSlide()
+void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
 {
     stopSound();
     removeShapeEvents();
 
     if( mpSlideController.get() && mxShow.is() )
     {
-        mpSlideController->displayCurrentSlide( mxShow );
+        mpSlideController->displayCurrentSlide( mxShow, bSkipAllMainSequenceEffects );
         registerShapeEvents(mpSlideController->getCurrentSlideNumber());
         update();
 
@@ -1822,11 +1859,34 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG )
 {
     mnUpdateEvent = 0;
 
+    return updateSlideShow();
+}
+
+
+
+
+IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG )
+{
+    Application::EnableNoYieldMode(false);
+    Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+    if (mbDisposed)
+        return 0;
+    return updateSlideShow();
+}
+
+
+
+
+sal_Int32 SlideshowImpl::updateSlideShow (void)
+{
     // doing some nMagic
     const rtl::Reference<SlideshowImpl> this_(this);
 
     Reference< XSlideShow > xShow( mxShow );
-    if( xShow.is() ) try
+    if ( ! xShow.is())
+        return 0;
+
+    try
     {
         // TODO(Q3): Evaluate under various systems and setups,
         // whether this is really necessary. Under WinXP and Matrox
@@ -1841,32 +1901,37 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG )
         if( !xShow->update(fUpdate) )
             fUpdate = -1.0;
         
-        if( mxShow.is() && ( fUpdate >= 0.0 ) )
+        if (mxShow.is() && (fUpdate >= 0.0))
         {
-/*
-            if( fUpdate < 0.25 )
+            if (::basegfx::fTools::equalZero(fUpdate))
             {
-                mnUpdateEvent = Application::PostUserEvent(LINK(this, SlideshowImpl, updateHdl));
+                // Use post yield listener for short update intervalls.
+                Application::EnableNoYieldMode(true);
+                Application::AddPostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
             }
             else
-*/
             {
                 // Avoid busy loop when the previous call to update()
-                // returns 0.  The minimum value is small enough to allow
-                // high frame rates.  Values larger than 0 are typically
-                // also larger then the small minimum value and thus are
-                // used to determine the frame rate.
-                const float MIN_UPDATE = 0.01f; // 10ms corresponds to 100 frames per second.
-                if( fUpdate < MIN_UPDATE )
-                    fUpdate = MIN_UPDATE;
-                else
-                {
-                    const float MAX_UPDATE = 4.0f; // do not wait longer than 4 seconds for next refresh, because dilbert said so
-                    if( fUpdate > MAX_UPDATE )
-                        fUpdate = MAX_UPDATE;
-                }
-                maUpdateTimer.SetTimeout( 
-                    ::std::max( 1UL, static_cast<ULONG>(fUpdate * 1000.0) ) );
+                // returns a small positive number but not 0 (which is
+                // handled above).  Also, make sure that calls to update()
+                // have a minimum frequency.
+                // => Allow up to 60 frames per second.  Call at least once
+                // every 4 seconds.
+                const static sal_Int32 mnMaximumFrameCount (60);
+                const static double mnMinimumTimeout (1.0 / mnMaximumFrameCount);
+                const static double mnMaximumTimeout (4.0);
+                fUpdate = ::basegfx::clamp(fUpdate, mnMinimumTimeout, mnMaximumTimeout);
+
+                // Make sure that the maximum frame count has not been set
+                // too high (only then conversion to milliseconds and long
+                // integer may lead to zero value.)
+                OSL_ASSERT(static_cast<ULONG>(fUpdate * 1000.0) > 0);
+                
+                Application::EnableNoYieldMode(false);
+                Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+
+                // Use a timer for the asynchronous callback.
+                maUpdateTimer.SetTimeout(static_cast<ULONG>(fUpdate * 1000.0));
                 maUpdateTimer.Start();
             }
         }
@@ -1875,11 +1940,10 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG )
     {
         static_cast<void>(e);
         DBG_ERROR(
-            (OString("sd::SlideshowImpl::updateHdl(), "
-                     "exception caught: ") +
-             rtl::OUStringToOString(
-                 comphelper::anyToString( cppu::getCaughtException() ),
-                 RTL_TEXTENCODING_UTF8 )).getStr() );
+            (OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ")
+                + rtl::OUStringToOString(
+                    comphelper::anyToString( cppu::getCaughtException() ),
+                    RTL_TEXTENCODING_UTF8 )).getStr() );
     }
     return 0;
 }
@@ -1968,11 +2032,17 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
                 break;
 
             case KEY_PAGEUP:
+                if(rKEvt.GetKeyCode().IsMod2())
+                {
+                    gotoPreviousSlide();
+                    break;
+                }
+                // warning, fall through!
             case KEY_LEFT:
             case KEY_UP:
             case KEY_P:
             case KEY_BACKSPACE:
-                gotoPreviousSlide();
+                gotoPreviousEffect();
                 break;
 
             case KEY_HOME:
@@ -2930,6 +3000,30 @@ void SAL_CALL SlideshowImpl::gotoNextEffect(  ) throw (RuntimeException)
 
 // --------------------------------------------------------------------
 
+void SAL_CALL SlideshowImpl::gotoPreviousEffect(  ) throw (RuntimeException)
+{
+    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+
+    if( mxShow.is() && mpSlideController.get() && mpShowWindow )
+    {
+        if( mbIsPaused )
+            resume();
+
+        const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
+        if( (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) )
+        {
+            mpShowWindow->RestartShow();
+        }
+        else
+        {
+            mxShow->previousEffect();
+            update();
+        }
+    }
+}
+
+// --------------------------------------------------------------------
+
 void SAL_CALL SlideshowImpl::gotoFirstSlide(  ) throw (RuntimeException)
 {
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
@@ -3050,6 +3144,11 @@ void SAL_CALL SlideshowImpl::gotoNextSlide(  ) throw (RuntimeException)
 
 void SAL_CALL SlideshowImpl::gotoPreviousSlide(  ) throw (RuntimeException)
 {
+    gotoPreviousSlide(false);
+}
+
+void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
+{
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
 
     if( mxShow.is() && mpSlideController.get() ) try
@@ -3070,8 +3169,22 @@ void SAL_CALL SlideshowImpl::gotoPreviousSlide(  ) throw (RuntimeException)
         }
         else
         {
-            if( mpSlideController->previousSlide() )
-                displayCurrentSlide();
+            if( mpSlideController->previousSlide())
+                displayCurrentSlide(bSkipAllMainSequenceEffects);
+            else if (bSkipAllMainSequenceEffects)
+            {
+                // We could not go to the previous slide (probably because
+                // the current slide is already the first one).  We still
+                // have to call displayCurrentSlide because the calling
+                // slideshow can not determine whether there is a previous
+                // slide or not and has already prepared for a slide change.
+                // This slide change has to be completed now, even when
+                // changing to the same slide.
+                // Note that in this special case we do NOT pass
+                // bSkipAllMainSequenceEffects because we display the same
+                // slide as before and do not want to show all its effects.
+                displayCurrentSlide(false);
+            }
         }
     }
     catch( Exception& e )
@@ -3522,19 +3635,20 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded(  ) throw (::com::sun
 
 // ---------------------------------------------------------
 
-void SlideShowListenerProxy::slideEnded() throw (RuntimeException)
+void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException)
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         if( maListeners.getLength() >= 0 )
-            maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideEnded ) );
+            maListeners.forEach<XSlideShowListener>(
+                boost::bind( &XSlideShowListener::slideEnded, _1, bReverse) );
     }
 
     {
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
         if( mxController.is() )
-            mxController->slideEnded();
+            mxController->slideEnded(bReverse);
     }
 }
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index f904d1195..5d167cde8 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,8 +62,8 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/saveopt.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -166,7 +166,7 @@ public:
     virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException);
     virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException);
     virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL slideEnded() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException);
     virtual void SAL_CALL hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException);
 
     // css::lang::XEventListener:
@@ -208,6 +208,7 @@ public:
     virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoNextEffect(  ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL gotoPreviousEffect(  ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoFirstSlide(  ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoNextSlide(  ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoPreviousSlide(  ) throw (css::uno::RuntimeException);
@@ -237,7 +238,7 @@ public:
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow
-    void slideEnded();
+    void slideEnded(const bool bReverse);
     void hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException);
     void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent);
 
@@ -264,7 +265,7 @@ private:
 
     // internal
     bool startShow( PresentationSettingsEx* pPresSettings );
-    bool startPreview( 
+    bool startPreview(
         const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage,
         const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode,
         ::Window* pParent );
@@ -278,7 +279,7 @@ private:
 
     void createSlideList( bool bAll, bool bStartWithActualSlide, const String& rPresSlide );
 
-    void displayCurrentSlide();
+    void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false);
 
     void displaySlideNumber( sal_Int32 nSlide );
     void displaySlideIndex( sal_Int32 nIndex );
@@ -297,6 +298,7 @@ private:
     void setActiveXToolbarsVisible( sal_Bool bVisible );
 
     DECL_LINK( updateHdl, Timer* );
+    DECL_LINK( PostYieldListener, void* );
     DECL_LINK( ReadyForNextInputHdl, Timer* );
     DECL_LINK( endPresentationHdl, void* );
     DECL_LINK( ContextMenuSelectHdl, Menu * );
@@ -314,7 +316,7 @@ private:
     long getRestoreSlide() const { return mnRestoreSlide; }
 
 private:
-    bool startShowImpl( 
+    bool startShowImpl(
         const css::uno::Sequence< css::beans::PropertyValue >& aProperties );
 
     SfxViewFrame* getViewFrame() const;
@@ -330,6 +332,14 @@ private:
     css::uno::Reference< css::presentation::XSlideShow > createSlideShow() const;
 
     void setAutoSaveState( bool bOn );
+    void gotoPreviousSlide (const bool bSkipAllMainSequenceEffects);
+
+    /** Called by PostYieldListener and updateHdl handlers this method is
+        responsible to call the slideshow update() method and, depending on
+        its return value, wait for a certain amount of time before another
+        call to update() is scheduled.
+    */
+    sal_Int32 updateSlideShow (void);
 
     css::uno::Reference< css::presentation::XSlideShow > mxShow;
     comphelper::ImplementationReference< ::sd::SlideShowView, css::presentation::XSlideShowView > mxView;
@@ -348,9 +358,9 @@ private:
     ::Window*       mpParentWindow;
     ShowWindow*		mpShowWindow;
     PushButton* 	mpTimeButton;
-    
+
     boost::shared_ptr< AnimationSlideController > mpSlideController;
-    
+
     long			mnRestoreSlide;
     Point			maSlideOrigin;
     Point			maPopupMousePos;
@@ -383,7 +393,7 @@ private:
 
     /// used in updateHdl to prevent recursive calls
     sal_Int32		mnEntryCounter;
- 
+
     sal_Int32		mnLastSlideNumber;
     WrappedShapeEventImplMap	maShapeEventMap;
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 609059569..5f3137e91 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -38,6 +38,8 @@
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
 #include <cppcanvas/vclfactory.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
 
@@ -384,16 +386,12 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation(  ) throw (Ru
     Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1,
                             ( aWindowSize.Height() - aOutputSize.Height() ) >> 1 );
 
-    ::basegfx::B2DHomMatrix aMatrix;
-
     maPresentationArea = Rectangle( aOutputOffset, aOutputSize );
     mrOutputWindow.SetPresentationArea( maPresentationArea );
 
-    // scale presentation into available window rect (minus 10%)
-    aMatrix.scale( aOutputSize.Width(), aOutputSize.Height() );
-
-    // center in the window
-    aMatrix.translate( aOutputOffset.X(), aOutputOffset.Y() );
+    // scale presentation into available window rect (minus 10%); center in the window
+    const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createScaleTranslateB2DHomMatrix(
+        aOutputSize.Width(), aOutputSize.Height(), aOutputOffset.X(), aOutputOffset.Y()));
 
     geometry::AffineMatrix2D aRes;
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index f04bac24a..667a601e9 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -56,8 +56,8 @@
 #include <cppcanvas/spritecanvas.hxx>
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/saveopt.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -115,7 +115,7 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject
 };
 
 ///////////////////////////////////////////////////////////////////////
-// SlideShowViewListeners 
+// SlideShowViewListeners
 ///////////////////////////////////////////////////////////////////////
 
 typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector;
@@ -134,10 +134,10 @@ protected:
     ::osl::Mutex& mrMutex;
 };
 
-typedef ::std::auto_ptr< SlideShowViewListeners >	SlideShowViewListenersPtr; 
+typedef ::std::auto_ptr< SlideShowViewListeners >	SlideShowViewListenersPtr;
 
 ///////////////////////////////////////////////////////////////////////
-// SlideShowViewPaintListeners 
+// SlideShowViewPaintListeners
 ///////////////////////////////////////////////////////////////////////
 
 typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener,
@@ -151,10 +151,10 @@ public:
 protected:
     virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rListener, const ::com::sun::star::awt::PaintEvent& rEvent ) throw( ::com::sun::star::uno::Exception );
 };
-typedef ::std::auto_ptr< SlideShowViewPaintListeners >	SlideShowViewPaintListenersPtr; 
+typedef ::std::auto_ptr< SlideShowViewPaintListeners >	SlideShowViewPaintListenersPtr;
 
 ///////////////////////////////////////////////////////////////////////
-// SlideShowViewMouseListeners 
+// SlideShowViewMouseListeners
 ///////////////////////////////////////////////////////////////////////
 
 typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base;
@@ -169,11 +169,11 @@ protected:
                              const WrappedMouseEvent& 			  		rEvent ) throw( ::com::sun::star::uno::Exception );
 };
 
-typedef ::std::auto_ptr< SlideShowViewMouseListeners >	SlideShowViewMouseListenersPtr; 
+typedef ::std::auto_ptr< SlideShowViewMouseListeners >	SlideShowViewMouseListenersPtr;
 
 
 ///////////////////////////////////////////////////////////////////////
-// SlideShowViewMouseMotionListeners 
+// SlideShowViewMouseMotionListeners
 ///////////////////////////////////////////////////////////////////////
 
 typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener,
@@ -188,7 +188,7 @@ protected:
     virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >&	rListener,
                              const WrappedMouseMotionEvent& 		  		rEvent ) throw( ::com::sun::star::uno::Exception );
 };
-typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners >	SlideShowViewMouseMotionListenersPtr; 
+typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners >	SlideShowViewMouseMotionListenersPtr;
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -203,13 +203,13 @@ typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::presentation::XSlide
                                             ::com::sun::star::awt::XMouseListener,
                                             ::com::sun::star::awt::XMouseMotionListener > SlideShowView_Base;
 
-class SlideShowView : public ::comphelper::OBaseMutex, 
+class SlideShowView : public ::comphelper::OBaseMutex,
                     public SlideShowView_Base
 {
-public:        
-    SlideShowView( ShowWindow&     rOutputWindow, 
-                   SdDrawDocument* pDoc, 
-                   AnimationMode   eAnimationMode, 
+public:
+    SlideShowView( ShowWindow&     rOutputWindow,
+                   SdDrawDocument* pDoc,
+                   AnimationMode   eAnimationMode,
                    SlideshowImpl*  pSlideShow,
                    bool            bFullScreen );
 
@@ -249,7 +249,7 @@ public:
     virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-    
+
     // XMouseMotionListener implementation
     virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 8a5380913..1c478af40 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -160,12 +160,13 @@ IMPL_LINK(QueueProcessor, ProcessRequestHdl, Timer*, EMPTYARG)
 void QueueProcessor::ProcessRequests (void)
 {
     OSL_ASSERT(mpCacheContext.get()!=NULL);
-    
-    while ( ! mrQueue.IsEmpty() && ! mbIsPaused)
-    {
-        if ( ! mpCacheContext->IsIdle())
-            break;
 
+    // Never process more than one request at a time in order to prevent the
+    // lock up of the edit view.
+    if ( ! mrQueue.IsEmpty()
+        && ! mbIsPaused
+        &&  mpCacheContext->IsIdle())
+    {
         CacheKey aKey = NULL;
         RequestPriorityClass ePriorityClass (NOT_VISIBLE);
         {
@@ -182,25 +183,12 @@ void QueueProcessor::ProcessRequests (void)
 
         if (aKey != NULL)
             ProcessOneRequest(aKey, ePriorityClass);
-
-        // Requests of lower priority are processed one at a time.
-        {
-            ::osl::MutexGuard aGuard (mrQueue.GetMutex());
-            if ( ! mrQueue.IsEmpty())
-                if (mrQueue.GetFrontPriorityClass() > 0)
-                    break;
-        }
     }
 
     // Schedule the processing of the next element(s).
     {
         ::osl::MutexGuard aGuard (mrQueue.GetMutex());
         if ( ! mrQueue.IsEmpty())
-            /*
-            if (bIsShowingFullScreenShow)
-                Start(mnTimeBetweenRequestsWhenNotIdle);
-            else
-            */
             Start(mrQueue.GetFrontPriorityClass());
     }
 }
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index c8355752c..26b66e698 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -604,7 +604,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent)
 
             case VCLEVENT_WINDOW_GETFOCUS:
                 if (pActiveWindow != NULL && pWindow == pActiveWindow)
-                    GetFocusManager().ShowFocus();
+                    GetFocusManager().ShowFocus(false);
                 break;
 
             case VCLEVENT_WINDOW_LOSEFOCUS:
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index 9cb8c7d38..7e834de12 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -133,17 +133,17 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection)
         }
 
         if (mbPageIsFocused)
-            ShowFocusIndicator(GetFocusedPageDescriptor());
+            ShowFocusIndicator(GetFocusedPageDescriptor(), true);
     }
 }
 
 
 
 
-void FocusManager::ShowFocus (void)
+void FocusManager::ShowFocus (const bool bScrollToFocus)
 {
     mbPageIsFocused = true;
-    ShowFocusIndicator(GetFocusedPageDescriptor());
+    ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus);
 }
 
 
@@ -254,20 +254,25 @@ void FocusManager::HideFocusIndicator (const model::SharedPageDescriptor& rpDesc
 
 
 
-void FocusManager::ShowFocusIndicator (const model::SharedPageDescriptor& rpDescriptor)
+void FocusManager::ShowFocusIndicator (
+    const model::SharedPageDescriptor& rpDescriptor,
+    const bool bScrollToFocus)
 {
     if (rpDescriptor.get() != NULL)
     {
         rpDescriptor->SetFocus ();
-        
-        // Scroll the focused page object into the visible area and repaint
-        // it, so that the focus indicator becomes visible.
-        view::SlideSorterView& rView (mrSlideSorter.GetView());
-        mrSlideSorter.GetController().GetSelectionManager()->MakeRectangleVisible (
-            rView.GetPageBoundingBox (
-                GetFocusedPageDescriptor(),
-                view::SlideSorterView::CS_MODEL,
-                view::SlideSorterView::BBT_INFO));
+
+        if (bScrollToFocus)
+        {
+            // Scroll the focused page object into the visible area and repaint
+            // it, so that the focus indicator becomes visible.
+            view::SlideSorterView& rView (mrSlideSorter.GetView());
+            mrSlideSorter.GetController().GetSelectionManager()->MakeRectangleVisible (
+                rView.GetPageBoundingBox (
+                    GetFocusedPageDescriptor(),
+                    view::SlideSorterView::CS_MODEL,
+                    view::SlideSorterView::BBT_INFO));
+        }
 
         mrSlideSorter.GetView().RequestRepaint (rpDescriptor);
         NotifyFocusChangeListeners();
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 204b31223..0cffec5f1 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <cppuhelper/compbase4.hxx>
 
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <tools/link.hxx>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a55e8a5c9..ac41e4454 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -88,10 +88,10 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/aeitem.hxx>
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
@@ -905,7 +905,7 @@ void SlotManager::RenameSlide (void)
             DBG_ASSERT(pFact, "Dialogdiet fail!");
             AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog(
                 mrSlideSorter.GetActiveWindow(),
-                aPageName, aDescr, RID_SVXDLG_NAME);
+                aPageName, aDescr);
             DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
             aNameDlg->SetText( aTitle );
             aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true );
@@ -1085,6 +1085,14 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
         rSelector.SelectPage (nInsertionIndex);
     }
 
+    // Is there a stored insertion position?
+    else if (mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() >= 0)
+    {
+        nInsertionIndex
+            = mrSlideSorter.GetController().GetSelectionManager()->GetInsertionPosition() - 1;
+        rSelector.SelectPage(nInsertionIndex);
+    }
+    
     // Select the last page when there is at least one page.
     else if (rSelector.GetPageCount() > 0)
     {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index acc60b525..626fd500f 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -87,8 +87,11 @@ public:
     void MoveFocus (FocusMoveDirection eDirection);
 
     /** Show the focus indicator of the current slide.
+        @param bScrollToFocus
+            When <TRUE/> (the default) then the view is scrolled so that the
+            focus rectangle lies inside its visible area.
     */
-    void ShowFocus (void);
+    void ShowFocus (const bool bScrollToFocus = true);
 
     /** Hide the focus indicator.
     */
@@ -215,8 +218,13 @@ private:
         made visible.
         @param pDescriptor
             When NULL is given then the call is ignored.
+        @param bScrollToFocus
+            When <TRUE/> (the default) then the view is scrolled so that the
+            focus rectangle lies inside its visible area.
     */
-    void ShowFocusIndicator (const model::SharedPageDescriptor& rpDescriptor);
+    void ShowFocusIndicator (
+        const model::SharedPageDescriptor& rpDescriptor,
+        const bool bScrollToFocus);
 
     /** Call all currently registered listeners that a focus change has
         happended.  The focus may be hidden or shown or moved from one page
diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
index d8cf4a97a..7a3684fd2 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
@@ -89,6 +89,7 @@ protected:
         OverlayManager.  This registration is done on demand.
     */
     void EnsureRegistration (void);
+    void RemoveRegistration();
 };
 
 
@@ -147,6 +148,7 @@ class SelectionRectangleOverlay
 {
 public:
     SelectionRectangleOverlay (ViewOverlay& rViewOverlay);
+    virtual ~SelectionRectangleOverlay();
 
     void Start (const Point& rAnchor);
     void Update (const Point& rSecondCorner);
@@ -176,6 +178,7 @@ class InsertionIndicatorOverlay
 {
 public:
     InsertionIndicatorOverlay (ViewOverlay& rViewOverlay);
+    virtual ~InsertionIndicatorOverlay();
 
     /** Given a position in model coordinates this method calculates the
         insertion marker both as an index in the document and as a rectangle
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index f067e879d..fb75dc576 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -60,7 +60,7 @@
 #include "sdresid.hxx"
 #include "glob.hrc"
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/xlndsit.hxx>
@@ -72,10 +72,10 @@
 #include <algorithm>
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 #ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 
 using namespace std;
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
index a5d861a86..bdbdbca8b 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
@@ -256,7 +256,7 @@ namespace sd { namespace slidesorter { namespace view {
 // class for all derived SdPageObjectPrimitives. The SdPageObjectBasePrimitive itself
 // is pure virtual
 
-class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BasePrimitive2D
+class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufferedDecompositionPrimitive2D
 {
 private:
     // the inner range of the SdPageObject visualisation
@@ -275,7 +275,7 @@ public:
 };
 
 SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange)
-:	drawinglayer::primitive2d::BasePrimitive2D(),
+:	drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(),
     maRange(rRange)
 {
 }
@@ -286,7 +286,7 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive()
 
 bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const
 {
-    if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive))
+    if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive))
     {
         const SdPageObjectBasePrimitive& rCompare = static_cast< const SdPageObjectBasePrimitive& >(rPrimitive);
         return (getPageObjectRange() == rCompare.getPageObjectRange());
@@ -306,7 +306,7 @@ private:
 
 protected:
     // method which is to be used to implement the local decomposition of a 2D primitive.
-    virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+    virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
     // constructor and destructor
@@ -325,7 +325,7 @@ public:
     DeclPrimitrive2DIDBlock()
 };
 
-Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
+Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
 {
     // add bitmap primitive
     // to avoid scaling, use the Bitmap pixel size as primitive size
@@ -385,7 +385,7 @@ private:
 
 protected:
     // method which is to be used to implement the local decomposition of a 2D primitive.
-    virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+    virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
     // constructor and destructor
@@ -399,7 +399,7 @@ public:
 const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorOffset(1);
 const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorThickness(3);
 
-Primitive2DSequence SdPageObjectSelectPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
+Primitive2DSequence SdPageObjectSelectPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
 {
     Primitive2DSequence xRetval(2);
 
@@ -470,7 +470,7 @@ class SdPageObjectBorderPrimitive : public SdPageObjectBasePrimitive
 {
 protected:
     // method which is to be used to implement the local decomposition of a 2D primitive.
-    virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+    virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
     // constructor and destructor
@@ -481,7 +481,7 @@ public:
     DeclPrimitrive2DIDBlock()
 };
 
-Primitive2DSequence SdPageObjectBorderPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
+Primitive2DSequence SdPageObjectBorderPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
 {
     // since old Width/Height calculations always added a single pixel value,
     // it is necessary to create a inner range which is one display unit less
@@ -524,7 +524,7 @@ private:
 
 protected:
     // method which is to be used to implement the local decomposition of a 2D primitive.
-    virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+    virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
     // constructor and destructor
@@ -537,7 +537,7 @@ public:
 
 const sal_Int32 SdPageObjectFocusPrimitive::mnFocusIndicatorOffset(2);
 
-Primitive2DSequence SdPageObjectFocusPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
+Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
 {
     Primitive2DSequence xRetval(2);
 
@@ -633,7 +633,7 @@ private:
 
 protected:
     // method which is to be used to implement the local decomposition of a 2D primitive.
-    virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
+    virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
     // constructor and destructor
@@ -683,6 +683,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c
     return *mpFadeEffectIconBitmap;
 }
 
+
 const sal_Int32 SdPageObjectFadeNameNumberPrimitive::mnCommentsIndicatorOffset(9);
 BitmapEx* SdPageObjectFadeNameNumberPrimitive::mpCommentsIconBitmap = 0;
 
@@ -701,7 +702,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getCommentsIconBitmap() con
     return *mpCommentsIconBitmap;
 }
 
-Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
+Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
 {
     const xub_StrLen nTextLength(getPageName().Len());
     const sal_uInt32 nCount(
@@ -727,8 +728,8 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecompositio
 
     // get font attributes
     basegfx::B2DVector aTextSizeAttribute;
-    const drawinglayer::primitive2d::FontAttributes aFontAttributes(
-        drawinglayer::primitive2d::getFontAttributesFromVclFont(
+    const drawinglayer::attribute::FontAttribute aFontAttribute(
+        drawinglayer::primitive2d::getFontAttributeFromVclFont(
             aTextSizeAttribute, 
             getPageNameFont(),
             false,
@@ -834,7 +835,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecompositio
                 0, 
                 aPageName.Len(), 
                 aDXArray, 
-                aFontAttributes, 
+                aFontAttribute, 
                 aLocale, 
                 aFontColor));
     }
@@ -875,7 +876,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecompositio
                 0, 
                 nNumberLen, 
                 aDXArray, 
-                aFontAttributes, 
+                aFontAttribute, 
                 aLocale, 
                 aFontColor));
 
@@ -1190,12 +1191,16 @@ void PageObjectViewObjectContact::ActionChanged (void)
     // Even when we are called from destructor we still have to invalide
     // the preview bitmap in the cache.
     const SdrPage* pPage = GetPage();
-    SdDrawDocument* pDocument = dynamic_cast<SdDrawDocument*>(pPage->GetModel());
-    if (mpCache!=NULL && pPage!=NULL && pDocument!=NULL)
+
+    if(pPage)
     {
-        cache::PageCacheManager::Instance()->InvalidatePreviewBitmap(
-            pDocument->getUnoModel(),
-            GetPage());
+        SdDrawDocument* pDocument = dynamic_cast<SdDrawDocument*>(pPage->GetModel());
+        if (mpCache!=NULL && pPage!=NULL && pDocument!=NULL)
+        {
+            cache::PageCacheManager::Instance()->InvalidatePreviewBitmap(
+                pDocument->getUnoModel(),
+                pPage);
+        }
     }
 
     // call parent
@@ -1211,7 +1216,7 @@ void PageObjectViewObjectContact::ActionChanged (void)
 // Very simple primitive which just remembers the discrete data and applies
 // it at decomposition time.
 
-class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BasePrimitive2D
+class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufferedDecompositionPrimitive2D
 {
 private:
     basegfx::B2DRange           maLogicRange;
@@ -1220,7 +1225,7 @@ private:
     basegfx::BColor             maRGBColor;
 
 protected:
-    virtual drawinglayer::primitive2d::Primitive2DSequence createLocalDecomposition(
+    virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
         const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
@@ -1229,7 +1234,7 @@ public:
         sal_uInt32 nDiscreteOffset,
         sal_uInt32 nDiscreteWidth,
         const basegfx::BColor& rRGBColor)
-    :   drawinglayer::primitive2d::BasePrimitive2D(),
+    :   drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(),
         maLogicRange(rLogicRange),
         mnDiscreteOffset(nDiscreteOffset),
         mnDiscreteWidth(nDiscreteWidth),
@@ -1247,7 +1252,7 @@ public:
     DeclPrimitrive2DIDBlock()
 };
 
-drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocalDecomposition(
+drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::create2DDecomposition(
     const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
 {
     // get logic sizes in object coordinate system
@@ -1277,7 +1282,7 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL
 
 bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const
 {
-    if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive))
+    if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive))
     {
         const MouseOverEffectPrimitive& rCompare = static_cast< const MouseOverEffectPrimitive& >(rPrimitive);
 
diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
index d41b5947e..cdb75248b 100644
--- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
@@ -55,6 +55,8 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/sdrpagewindow.hxx>
@@ -165,9 +167,7 @@ OverlayBase::OverlayBase (ViewOverlay& rViewOverlay)
 
 OverlayBase::~OverlayBase (void)
 {
-    OverlayManager* pOverlayManager = getOverlayManager();
-    if (pOverlayManager != NULL)
-        pOverlayManager->remove(*this);
+    OSL_ENSURE(!getOverlayManager(), "Please call RemoveRegistration() in the derived class; it's too late to call it in the base class since virtual methods will be missing when called in the destructor.");
 }
 
 
@@ -186,6 +186,16 @@ void OverlayBase::EnsureRegistration (void)
 
 
 
+void OverlayBase::RemoveRegistration()
+{
+    OverlayManager* pOverlayManager = getOverlayManager();
+    if (pOverlayManager != NULL)
+        pOverlayManager->remove(*this);
+}
+
+
+
+
 //=====  SubstitutionOverlay  =================================================
 
 SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay)
@@ -200,6 +210,7 @@ SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay)
 
 SubstitutionOverlay::~SubstitutionOverlay (void)
 {
+    RemoveRegistration();
 }
 
 
@@ -245,8 +256,7 @@ void SubstitutionOverlay::Clear (void)
 
 void SubstitutionOverlay::Move (const Point& rOffset)
 {
-    basegfx::B2DHomMatrix aTranslation;
-    aTranslation.translate(rOffset.X(), rOffset.Y());
+    const basegfx::B2DHomMatrix aTranslation(basegfx::tools::createTranslateB2DHomMatrix(rOffset.X(), rOffset.Y()));
 
     maShapes.transform(aTranslation);
     maPosition += rOffset;
@@ -316,6 +326,13 @@ SelectionRectangleOverlay::SelectionRectangleOverlay (ViewOverlay& rViewOverlay)
 
 
 
+SelectionRectangleOverlay::~SelectionRectangleOverlay()
+{
+    RemoveRegistration();
+}
+
+
+
 
 Rectangle SelectionRectangleOverlay::GetSelectionRectangle (void)
 {
@@ -391,6 +408,14 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (ViewOverlay& rViewOverlay)
 
 
 
+InsertionIndicatorOverlay::~InsertionIndicatorOverlay()
+{
+    RemoveRegistration();
+}
+
+
+
+
 void InsertionIndicatorOverlay::SetPositionAndSize (const Rectangle& aNewBoundingBox)
 {
     EnsureRegistration();
@@ -509,6 +534,7 @@ MouseOverIndicatorOverlay::MouseOverIndicatorOverlay (ViewOverlay& rViewOverlay)
 
 MouseOverIndicatorOverlay::~MouseOverIndicatorOverlay (void)
 {
+    RemoveRegistration();
 }
 
 
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 0b6cb9a89..1ad94b793 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -50,7 +50,7 @@
 #include <vcl/bmpacc.hxx>
 //#include <vcl/toolbox.hxx>
 
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
@@ -457,6 +457,10 @@ void TableDesignPane::updateLayout()
 
             Point aPos( pValueSet->GetPosPixel() );
 
+            // The following line may look like a no-op but without it the
+            // control is placed off-screen when RTL is active.
+            pValueSet->SetPosPixel(pValueSet->GetPosPixel());
+
             // shift show options section down
             const long nOptionsPos = aPos.Y() + aValueSetSize.Height();
             for( sal_Int32 nId = FL_STYLE_OPTIONS; nId <= CB_BANDED_COLUMNS; ++nId )
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index e5a278e40..8d5921dee 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -57,12 +57,12 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 
 #include "framework/FrameworkHelper.hxx"
 #include "app.hrc"
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 2707d019d..b82444da0 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -39,8 +39,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 7b479e102..15f9b9f09 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -61,9 +61,9 @@
 #include <sfx2/objface.hxx>
 #include "sdresid.hxx"
 #include <vcl/image.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
-#include "taskpane/TitledControl.hxx"
+#include "taskpane/TitledControl.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <comphelper/processfactory.hxx>
@@ -808,7 +808,7 @@ SfxRequest LayoutMenu::CreateRequest (
 
 void LayoutMenu::Fill (void)
 {
-    const bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0;
+    const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     SvtLanguageOptions aLanguageOptions;
     sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled();
     SdDrawDocument* pDocument = mrBase.GetDocument();
@@ -917,8 +917,13 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
                 if (GetShellManager() != NULL)
                     GetShellManager()->MoveToTop(this);
                 if (rEvent.IsMouseEvent())
-                    mrBase.GetViewFrame()->GetDispatcher()->ExecutePopup(
-                        SdResId(RID_TASKPANE_LAYOUTMENU_POPUP));
+                {
+                    // Do not show the context menu when the mouse was not
+                    // pressed over an item.
+                    if (GetItemId(rEvent.GetMousePosPixel()) > 0)
+                        mrBase.GetViewFrame()->GetDispatcher()->ExecutePopup(
+                            SdResId(RID_TASKPANE_LAYOUTMENU_POPUP));
+                }
                 else
                 {
                     // When the command event was not caused by a mouse
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index 85c8d0ee7..c32176cc4 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -47,7 +47,7 @@
 #include <vcl/bitmapex.hxx>
 #include <tools/color.hxx>
 #include <svx/xdash.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/svdobj.hxx>
diff --git a/sd/source/ui/toolpanel/TitleToolBox.cxx b/sd/source/ui/toolpanel/TitleToolBox.cxx
index 2c2c40f56..75704cb96 100644
--- a/sd/source/ui/toolpanel/TitleToolBox.cxx
+++ b/sd/source/ui/toolpanel/TitleToolBox.cxx
@@ -77,7 +77,7 @@ void TitleToolBox::AddItem (ToolBoxId aId)
 
         case TBID_DOCUMENT_CLOSE:
             InsertItem (TBID_DOCUMENT_CLOSE,
-                GetSettings().GetStyleSettings().GetMenuBarColor().IsDark() 
+                GetSettings().GetStyleSettings().GetHighContrastMode()
                 ? maImageHC : maImage, 0 );
             break;
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 72ce4d505..72e363df0 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -60,8 +60,8 @@
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include "sdresid.hxx"
 #include "tools/TimerBasedTaskExecution.hxx"
 #include "pres.hxx"
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
index 399604ab3..5d59853c8 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
@@ -39,7 +39,7 @@
 #include <hash_map>
 #include <set>
 #include <vector>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 21bf17de2..3cb8d6072 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -62,12 +62,12 @@
 #include "drawview.hxx"
 #endif
 #include <vcl/image.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/mnumgr.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svxids.hrc>
@@ -76,7 +76,7 @@
 #include "stlpool.hxx"
 #include "unmovss.hxx"
 #include <sfx2/request.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 using namespace ::sd::toolpanel::controls;
 #define MasterPagesSelector
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 7e082a514..a59b63a3d 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,10 +63,10 @@
 
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
@@ -83,7 +83,7 @@
 #include <svx/impgrf.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <sot/storage.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/util/XArchiver.hpp>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 7a88d6261..a350f21cf 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -40,8 +40,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/stl_types.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemprop.hxx>
-#include <svtools/style.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/style.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 8a8880d39..20742fe33 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -54,7 +54,7 @@
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svdmodel.hxx>
 #include <sdresid.hxx>
 #include <glob.hrc>
@@ -68,7 +68,7 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <svx/svdorect.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
@@ -322,6 +322,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
         { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP),				WID_PAGE_TOP,		&::getCppuType((const sal_Int32*)0),			0,	0},
         { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT),			WID_PAGE_HEIGHT,	&::getCppuType((const sal_Int32*)0),			0,	0},
         { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION),		WID_PAGE_ORIENT,	&::getCppuType((const view::PaperOrientation*)0),0,	0},
+        { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER),			WID_PAGE_NUMBER,	&::getCppuType((const sal_Int16*)0),			beans::PropertyAttribute::READONLY,	0},
         { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH),			WID_PAGE_WIDTH,		&::getCppuType((const sal_Int32*)0),			0,	0},
         { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), 			WID_PAGE_LAYOUT,	&::getCppuType((const sal_Int16*)0),			0,	0},
         { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  , 		0,     0},
@@ -1001,7 +1002,21 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
         aAny <<= (sal_Int16)( GetPage()->GetAutoLayout() );
         break;
     case WID_PAGE_NUMBER:
-        aAny <<= (sal_Int16)((sal_uInt16)((GetPage()->GetPageNum()-1)>>1) + 1);
+        {
+            const sal_uInt16 nPageNumber(GetPage()->GetPageNum());
+
+            if(nPageNumber > 0)
+            {
+                // for all other pages calculate the number
+                aAny <<= (sal_Int16)((sal_uInt16)((nPageNumber-1)>>1) + 1);
+            }
+            else
+            {
+                // for pages with number 0 (Handout Master, Handout page)
+                // return 0
+                aAny <<= (sal_Int16)0;
+            }
+        }
         break;
     case WID_PAGE_DURATION:
         aAny <<= (sal_Int32)(GetPage()->GetTime());
@@ -1014,7 +1029,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
     }
     case WID_PAGE_LDBITMAP:
         {
-            BOOL bHC = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark();
+            BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
             Reference< awt::XBitmap > xBitmap(
                 VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) );
             aAny <<= xBitmap;
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index c5bf5b213..24cdd842a 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 
 #ifndef _SVX_UNOPAGE_HXX
 #include <svx/unopage.hxx>
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index d30ba6898..d7b9da0ca 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 #include <comphelper/extract.hxx>
 #include <rtl/uuid.h>
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 49a9f3640..9edd046ea 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -35,8 +35,8 @@
 
 #include <limits.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/shell.hxx>
 #include <svx/svxids.hrc>
@@ -44,7 +44,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/grfflt.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/grafctrl.hxx>
 
 
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 77f403987..984f392d5 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -38,8 +38,8 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 8a67904c1..1c0846e6a 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -56,8 +56,8 @@
 #include <svx/eeitem.hxx>
 #include <svx/forbiddencharacterstable.hxx>
 #include <svx/srchdlg.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
 #include <svx/editeng.hxx>
 #include <vcl/metric.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -334,6 +334,9 @@ void Outliner::EndSpelling (void)
 {
     if (mbViewShellValid)
     {
+        // Keep old view shell alive until we release the outliner view.
+        ::boost::shared_ptr<ViewShell> pOldViewShell (mpViewShell);
+
         ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current());
         if (pBase != NULL)
             mpViewShell = pBase->GetMainViewShell();
@@ -1303,7 +1306,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
         // Outliner code.
         framework::FrameworkHelper::Instance(rBase)->RequestSynchronousUpdate();
         SetViewShell(rBase.GetMainViewShell());
-        
+
         // Switching to another view shell has intermediatly called
         // EndSpelling().  A PrepareSpelling() is pending, so call that now.
         PrepareSpelling();
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index f4727b711..82b32c3ea 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -49,7 +49,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index e22f1991b..90a920ad2 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -31,6 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
+#include <comphelper/processfactory.hxx>
+
+#include <com/sun/star/frame/UnknownModuleException.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 #include "ViewShellBase.hxx"
 #include <algorithm>
 #include "EventMultiplexer.hxx"
@@ -84,7 +91,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/msgbox.hxx>
 
@@ -96,6 +103,11 @@ using namespace sd;
 
 using ::sd::framework::FrameworkHelper;
 using ::rtl::OUString;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::frame;
+using namespace com::sun::star::container;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
 
 namespace {
 
@@ -1252,6 +1264,47 @@ CustomHandleManager& ViewShellBase::getCustomHandleManager() const
     return *mpImpl->mpCustomHandleManager.get();
 }
 
+::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const
+{
+    ::rtl::OUString aLabel;
+
+    if ( aCmdURL.getLength() > 0 ) try
+    {
+        Reference< XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+
+        Reference< XModuleManager > xModuleManager( xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW );
+        Reference< XInterface > xIfac( GetMainViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW );
+
+        ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
+
+        if( aModuleIdentifier.getLength() > 0 )
+        {
+            Reference< XNameAccess > xNameAccess( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ) ) ), UNO_QUERY );
+            if( xNameAccess.is() )
+            {
+                Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW );
+                Sequence< PropertyValue > aPropSeq;
+                if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
+                {
+                    for( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+                    {
+                        if( aPropSeq[i].Name.equalsAscii( "Name" ))
+                        {
+                            aPropSeq[i].Value >>= aLabel;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch ( Exception& )
+    {
+    }
+
+    return aLabel;
+}
+
 
 
 //===== ViewShellBase::Implementation =========================================
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 4b870f432..90269fb89 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -60,7 +60,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/imapdlg.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbstar.hxx>
diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx
index 47174560d..ffd57b414 100644
--- a/sd/source/ui/view/WindowUpdater.cxx
+++ b/sd/source/ui/view/WindowUpdater.cxx
@@ -42,7 +42,7 @@
 #endif
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <algorithm>
 
@@ -52,7 +52,7 @@ WindowUpdater::WindowUpdater (void)
     : mpViewShell (NULL),
       mpDocument (NULL)
 {
-    StartListening (maCTLOptions);
+    maCTLOptions.AddListener(this);
 }
 
 
@@ -60,7 +60,7 @@ WindowUpdater::WindowUpdater (void)
 
 WindowUpdater::~WindowUpdater (void) throw ()
 {
-    EndListening (maCTLOptions);
+    maCTLOptions.RemoveListener(this);
 }
 
 
@@ -163,33 +163,29 @@ void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const
 
 
 
-void WindowUpdater::Notify (SfxBroadcaster&, const SfxHint& rHint)
+void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    const SfxSimpleHint& rSimpleHint = static_cast<const SfxSimpleHint&>(rHint);
-    if (rSimpleHint.GetId() == SFX_HINT_CTL_SETTINGS_CHANGED)
-    {
-        // #110094#-7
-        // Clear the master page cache so that master pages will be redrawn.
-        //if (mpViewShell != NULL)
-        //{
-        //    SdView* pView = mpViewShell->GetView();
-        //    if (pView != NULL)
-        //        pView->ReleaseMasterPagePaintCache ();
-        //}
-        // Set the current state at all registered output devices.
-        tWindowList::iterator aWindowIterator (maWindowList.begin());
-        while (aWindowIterator != maWindowList.end())
-            Update (*aWindowIterator++);
-
-        // Reformat the document for the modified state to take effect.
-        if (mpDocument != NULL)
-            mpDocument->ReformatAllTextObjects();
-        
-        // Invalidate the windows to make the modified state visible.
-        aWindowIterator = maWindowList.begin();
-        while (aWindowIterator != maWindowList.end())
-            (*aWindowIterator++)->Invalidate();
-    }
+    // #110094#-7
+    // Clear the master page cache so that master pages will be redrawn.
+    //if (mpViewShell != NULL)
+    //{
+    //    SdView* pView = mpViewShell->GetView();
+    //    if (pView != NULL)
+    //        pView->ReleaseMasterPagePaintCache ();
+    //}
+    // Set the current state at all registered output devices.
+    tWindowList::iterator aWindowIterator (maWindowList.begin());
+    while (aWindowIterator != maWindowList.end())
+        Update (*aWindowIterator++);
+
+    // Reformat the document for the modified state to take effect.
+    if (mpDocument != NULL)
+        mpDocument->ReformatAllTextObjects();
+    
+    // Invalidate the windows to make the modified state visible.
+    aWindowIterator = maWindowList.begin();
+    while (aWindowIterator != maWindowList.end())
+        (*aWindowIterator++)->Invalidate();
 }
 
 
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 118ca66bd..22ba1d0b2 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -36,7 +36,7 @@
 #endif
 #include <svx/svdpagv.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/outliner.hxx>
 #ifndef _VIEW3D_HXX //autogen
 #include <svx/view3d.hxx>
@@ -48,12 +48,12 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdorect.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/bulitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/numitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 4797fd0c8..32ef899ff 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -39,10 +39,10 @@
 #include <sfx2/objface.hxx>
 
 #include <svx/svxids.hrc>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svdopath.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/dispatch.hxx>
 
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 9dafcd8bc..9fdf6a2b4 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -39,14 +39,14 @@
 #include <svx/adjitem.hxx>
 #include <vcl/vclenum.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/style.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/style.hxx>
+#include <svl/languageoptions.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <svx/escpitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svx/scripttypeitem.hxx>
 #include <svx/outlobj.hxx>
 #include <svx/writingmodeitem.hxx>
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 3873169af..55dfee47d 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -46,9 +46,9 @@
 #endif
 #include <vcl/vclenum.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/style.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -65,14 +65,14 @@
 #include <svx/outlobj.hxx>
 #include <svx/flstitem.hxx>
 #include <svx/editeng.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SVX_SRIPTTYPEITEM_HXX //autogen
 #include <svx/scripttypeitem.hxx>
 #endif
 #include <svx/svdoutl.hxx>
 #include <svx/writingmodeitem.hxx>
 #include <svx/frmdiritem.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 
 #include "app.hrc"
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index ec8bf518a..f9e7b8e05 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1196,25 +1196,15 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
             {
                 // set pages for all available handout presentation objects
                 sd::ShapeList& rShapeList = pMaster->GetPresentationShapeList();
-
-                sal_uInt16 nPgNum = 0;
                 SdrObject* pObj = 0;
+                
                 while( (pObj = rShapeList.getNextShape(pObj)) != 0 )
                 {
                     if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT )
                     {
-                        const sal_uInt16 nDestinationPageNum(2 * nPgNum + 1);
-
-                        if(nDestinationPageNum < GetDoc()->GetPageCount())
-                        {
-                            static_cast<SdrPageObj*>(pObj)->SetReferencedPage(GetDoc()->GetPage(nDestinationPageNum));
-                        }
-                        else
-                        {
-                            static_cast<SdrPageObj*>(pObj)->SetReferencedPage(0L);
-                        }
-
-                        nPgNum++;
+                        // #i105146# We want no content to be displayed for PK_HANDOUT,
+                        // so just never set a page as content
+                        static_cast<SdrPageObj*>(pObj)->SetReferencedPage(0);
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 187f021f9..521e51a58 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -52,7 +52,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/eeitem.hxx>
 #include <basic/sbstar.hxx>
 #include <svx/flditem.hxx>
@@ -467,7 +467,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 DBG_ASSERT(pFact, "Dialogdiet fail!");
-                AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr, RID_SVXDLG_NAME );
+                AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr );
                 DBG_ASSERT(aNameDlg, "Dialogdiet fail!");
                 aNameDlg->SetText( aTitle );
                 aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true );
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 0c5d28410..a409412a2 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -51,13 +51,13 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/ptitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/ptitem.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
 #include <svx/fmshell.hxx>
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 4521b3397..fd02e5ee9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -35,7 +35,7 @@
 
 #include "DrawViewShell.hxx"
 #include <vcl/msgbox.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/fmglob.hxx>
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 5f8e75d2d..e8bd90493 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -81,12 +81,8 @@
 #include "fusumry.hxx"
 #include "fucushow.hxx"
 #include "drawview.hxx"
-#ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
-#endif
 #include "Window.hxx"
-#include "fuformatpaintbrush.hxx"
-#include "formatclipboard.hxx"
 #include "DrawDocShell.hxx"
 #include "TaskPaneViewShell.hxx"
 #include "framework/FrameworkHelper.hxx"
@@ -501,35 +497,6 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
     USHORT nSId = rReq.GetSlot();
     switch( nSId )
     {
-        case SID_FORMATPAINTBRUSH:
-        {
-            SdFormatClipboard* pFormatClipboard = GetDocSh()->mpFormatClipboard;
-            if(pFormatClipboard)
-            {
-                if( pFormatClipboard->HasContent() )
-                {
-                    pFormatClipboard->Erase();
-                    GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
-                    Cancel();
-                    rReq.Ignore ();
-                }
-                else
-                {
-                    bool bPersistentCopy = false;
-                    const SfxItemSet *pArgs = rReq.GetArgs();
-                    if( pArgs && pArgs->Count() >= 1 )
-                    {
-                        bPersistentCopy = static_cast<bool>(((SfxBoolItem &)pArgs->Get(
-                                                SID_FORMATPAINTBRUSH)).GetValue());
-                    }
-
-                    pFormatClipboard->Copy( *mpDrawView, bPersistentCopy );
-                    SetCurrentFunction( FuFormatPaintBrush::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
-                    GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
-                }
-            }
-        }
-        break;
         case SID_FONTWORK:
         {
             if ( rReq.GetArgs() )
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index c4864e51d..12ef791c5 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -46,11 +46,11 @@
 #include <svx/svdpagv.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <svx/fmshell.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
+#include <svl/whiter.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/unolingu.hxx>
@@ -58,11 +58,11 @@
 #include <svx/fontworkbar.hxx>
 
 // #UndoRedo#
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/app.hxx>
 #include <svtools/insdlg.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/request.hxx>
 
@@ -87,7 +87,6 @@
 #include "zoomlist.hxx"
 #include "slideshow.hxx"
 #include "drawview.hxx"
-#include "formatclipboard.hxx"
 #include "ViewShellBase.hxx"
 #include "ViewShellManager.hxx"
 #include "LayerTabBar.hxx"
@@ -95,6 +94,7 @@
 #include "Window.hxx"
 #include "fuediglu.hxx"
 #include "fubullet.hxx"
+#include "fuformatpaintbrush.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -249,19 +249,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
     const ULONG nMarkCount = rMarkList.GetMarkCount();
 
     //format paintbrush
-    {
-        SdFormatClipboard* pFormatClipboard = GetDocSh()->mpFormatClipboard;
-        bool bHasContent = pFormatClipboard && pFormatClipboard->HasContent();
-        rSet.Put(SfxBoolItem(SID_FORMATPAINTBRUSH,bHasContent));
-        if( ( nMarkCount!=1 && !bHasContent ) || mpDrawView->IsTextEdit() )
-            rSet.DisableItem( SID_FORMATPAINTBRUSH );
-        if( !bHasContent && nMarkCount==1 )
-        {
-            SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-            if( !pFormatClipboard->CanCopyThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) )
-                rSet.DisableItem( SID_FORMATPAINTBRUSH );
-        }
-    }
+    FuFormatPaintBrush::GetMenuState( *this, rSet );
 
     // Stati der SfxChild-Windows (Animator, Fontwork etc.)
     SetChildWindowState( rSet );
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 57064c6a7..c74253d9b 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -47,10 +47,10 @@
 #ifndef _SFX_DISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
 #endif
@@ -60,7 +60,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <sot/storage.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <basic/sbstar.hxx>
 
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index c766e94e0..be5e3a079 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -42,14 +42,14 @@
 #include <svx/zoomitem.hxx>
 #endif
 #include <svx/svdpagv.hxx>
-#include <svtools/ptitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdopath.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/zoomslideritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index af83e39f1..fc910d17c 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@
 #include <svx/fmshell.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include "app.hrc"
 #include "strings.hrc"
@@ -252,7 +252,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
 
             String aLayerTitle( pLayer->GetTitle() );
             String aLayerDesc( pLayer->GetDescription() );
-            
+
             String aOldLayerName( aLayerName );
             String aOldLayerTitle( aLayerTitle );
             String aOldLayerDesc( aLayerDesc );
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index edd3eea82..c590d891a 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -53,7 +53,7 @@
 #endif
 #include <sfx2/dispatch.hxx>
 #include <svx/svdoole2.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/grafctrl.hxx>
 #include "stlsheet.hxx"
@@ -127,7 +127,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
-                AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME);
+                AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
                 
                 pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
@@ -162,7 +162,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
-                AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC);
+                AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
 
                 if(RET_OK == pDlg->Execute())
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index de5b21a19..a71a6287d 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -36,10 +36,10 @@
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index d580c4423..125815622 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -40,10 +40,10 @@
 
 #include "undo/undomanager.hxx"
 #include <vcl/waitobj.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/editstat.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/fmshell.hxx>
 #include <vcl/scrbar.hxx>
@@ -51,7 +51,7 @@
 #include <svx/svdundo.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdograf.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -64,11 +64,11 @@
 #include <svx/svdouno.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/ipclient.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <sfx2/topfrm.hxx>
 #include <sfx2/docfile.hxx>
 
@@ -106,7 +106,7 @@
 #include "anminfo.hxx"
 #include "optsitem.hxx"
 #include "Window.hxx"
-
+#include "fuformatpaintbrush.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -203,13 +203,22 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
 
     if(HasCurrentFunction())
     {
-        if(GetOldFunction() == GetCurrentFunction())
+        if( (nSId == SID_FORMATPAINTBRUSH) && (GetCurrentFunction()->GetSlotID() == SID_TEXTEDIT) )
+        {
+            // save text edit mode for format paintbrush!
+            SetOldFunction( GetCurrentFunction() );
+        }
+        else
         {
-            SetOldFunction(0);
+            if(GetOldFunction() == GetCurrentFunction())
+            {
+                SetOldFunction(0);
+            }
         }
 
         if ( nSId != SID_TEXTEDIT && nSId != SID_ATTR_CHAR && nSId != SID_TEXT_FITTOSIZE &&
              nSId != SID_ATTR_CHAR_VERTICAL && nSId != SID_TEXT_FITTOSIZE_VERTICAL &&
+             nSId != SID_FORMATPAINTBRUSH &&
              mpDrawView->IsTextEdit() )
         {
             mpDrawView->SdrEndTextEdit();
@@ -526,8 +535,18 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
         }
         break;
 
+        case SID_FORMATPAINTBRUSH:
+        {
+            SetCurrentFunction( FuFormatPaintBrush::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
+            rReq.Done();
+            SfxBindings& rBind = GetViewFrame()->GetBindings();
+            rBind.Invalidate( nSId );
+            rBind.Update( nSId );
+            break;
+        }
+        
         default:
-        break;
+           break;
     }
 
     if(HasOldFunction())
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 8e1a0b55d..7b0fb0677 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -47,9 +47,9 @@
 #include <svx/flditem.hxx>
 #endif
 #include <sfx2/viewfrm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/whiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/tplpitem.hxx>
 #ifndef _BINDING_HXX //autogen
 #include <sfx2/bindings.hxx>
@@ -63,7 +63,7 @@
 #include <tools/urlobj.hxx>
 #include <svx/fmshell.hxx>
 #include <sfx2/topfrm.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 
 #ifndef SD_FRAME_VIEW
 #include "FrameView.hxx"
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index a1b87c98e..8d44a19fe 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sd.hxx"
 
 #include "DrawViewShell.hxx"
-#include <svtools/aeitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/itemset.hxx>
 #include <sfx2/request.hxx>
 #ifndef _SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index 30f1f6b62..e99afae6b 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -34,7 +34,7 @@
 #include "DrawViewShell.hxx"
 #include <svx/xtable.hxx>
 #include "sdattr.hxx"
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <svx/eeitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svditer.hxx>
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 8d71d70c0..6647d924b 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -33,7 +33,7 @@
 
 #include "DrawViewShell.hxx"
 #include <com/sun/star/embed/EmbedMisc.hpp>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #ifndef _SVXIDS_HRC //autogen
 #include <svx/svxids.hrc>
 #endif
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index f807a67b0..7599e0d6a 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #ifndef _ZOOMITEM_HXX //autogen
 #include <svx/zoomitem.hxx>
 #endif
@@ -49,7 +49,7 @@
 #include <svx/flditem.hxx>
 #include <svx/editstat.hxx>
 #include "optsitem.hxx"
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include "Outliner.hxx"
@@ -254,7 +254,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
             if( xPresentation.is() )
             {
                 if( ( SID_REHEARSE_TIMINGS != rReq.GetSlot() ) )
-                    xPresentation->start(); 
+                    xPresentation->start();
                 else
                     xPresentation->rehearseTimings();
             }
@@ -548,7 +548,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
                                 pOldFldItem->GetField()->ISA( SvxExtTimeField ) ||
                                 pOldFldItem->GetField()->ISA( SvxExtFileField ) ||
                                 pOldFldItem->GetField()->ISA( SvxAuthorField ) ||
-                                pOldFldItem->GetField()->ISA( SvxPageField ) || 
+                                pOldFldItem->GetField()->ISA( SvxPageField ) ||
                                 pOldFldItem->GetField()->ISA( SvxPagesField )) )
             {
                 // Feld selektieren, so dass es beim Insert geloescht wird
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 7619c5816..7c6fdd43e 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -55,9 +55,9 @@
 #include <svx/svdotext.hxx>
 #include <sfx2/dispatch.hxx>
 #include <vcl/scrbar.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <svx/editstat.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <svx/svdorect.hxx>
 #include <sot/formats.hxx>
@@ -67,7 +67,7 @@
 #include <svx/unolingu.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svx/outlobj.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
 #include <svtools/cliplistener.hxx>
 #include <sfx2/srchitem.hxx>
 #include <svx/editobj.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 79419148b..479c125a7 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -46,11 +46,11 @@
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/style.hxx>
+#include <svl/itempool.hxx>
+#include <svl/style.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdundo.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/adjitem.hxx>
 #include <svx/tstpitem.hxx>
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 0c9f44a37..b84a91b90 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sd.hxx"
 
 #include "Ruler.hxx"
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <svx/ruler.hxx>
 #ifndef _SVXIDS_HXX //autogen
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 89a503518..7eea7f8fb 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -99,6 +99,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <svx/unoapi.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 #include <numeric>
 
@@ -447,20 +448,19 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
 
                             aVclFont.SetHeight( 500 );
 
-                            const drawinglayer::primitive2d::FontAttributes aFontAttributes(
-                                drawinglayer::primitive2d::getFontAttributesFromVclFont(
+                            const drawinglayer::attribute::FontAttribute aFontAttribute(
+                                drawinglayer::primitive2d::getFontAttributeFromVclFont(
                                     aTextSizeAttribute, 
                                     aVclFont,
                                     false,
                                     false));
 
                             // fill text matrix
-                            basegfx::B2DHomMatrix aTextMatrix;
-
-                            aTextMatrix.scale(aTextSizeAttribute.getX(), aTextSizeAttribute.getY());
-                            aTextMatrix.shearX(fShearX);
-                            aTextMatrix.rotate(fRotate);
-                            aTextMatrix.translate(fPosX, fPosY);
+                            const basegfx::B2DHomMatrix aTextMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
+                                aTextSizeAttribute.getX(), aTextSizeAttribute.getY(),
+                                fShearX, 
+                                fRotate, 
+                                fPosX, fPosY));
 
                             // create DXTextArray (can be empty one)
                             const ::std::vector< double > aDXArray;
@@ -476,7 +476,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                                     0, 
                                     nTextLength, 
                                     aDXArray, 
-                                    aFontAttributes, 
+                                    aFontAttribute, 
                                     aLocale, 
                                     aFontColor));
                             drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef);
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 9040f5148..a01e6ee5c 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -52,8 +52,8 @@
 #include <sfx2/childwin.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpagv.hxx>
-#include <svtools/urlbmk.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/outliner.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/dbexch.hrc>
@@ -963,7 +963,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n
                     String          aTitle( SdResId( STR_TITLE_NAMEGROUP ) );
                     String          aDesc( SdResId( STR_DESC_NAMEGROUP ) );
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                    AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc, RID_SVXDLG_NAME ) : 0;
+                    AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc ) : 0;
                     if( pDlg )
                     {
                         pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 84dbf3d0f..3cb2140f4 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,11 +36,11 @@
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <sot/filelist.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #ifndef _EDITDATA_HXX
 #include <svx/editdata.hxx>
 #endif
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/xexch.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
@@ -55,7 +55,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sot/clsids.hxx>
 #ifndef _FM_FMMODEL_HXX
 #include <svx/fmmodel.hxx>
@@ -1485,9 +1485,9 @@ bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPaste
 
     xComponent->dispose();
     xComponent.clear();
-    
+
     delete pModel;
-    
+
     return bRet;
 }
 
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index bcc7b6450..1f237837c 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/docfile.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/svdundo.hxx>
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index cefbf1cb2..e75c84283 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,7 +59,7 @@
 #include <svx/fmshell.hxx>
 #include <sfx2/dispatch.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
 #endif
@@ -452,7 +452,7 @@ void ViewShell::SetZoomRect(const Rectangle& rZoomRect)
         mpContentWindow->UpdateMapOrigin();
 
         // #i74769# see above
-        mpContentWindow->Invalidate(INVALIDATE_CHILDREN); 
+        mpContentWindow->Invalidate(INVALIDATE_CHILDREN);
     }
 
     Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel();
@@ -800,7 +800,7 @@ BOOL ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*)
     {
         if( GetView() )
             bReturn = GetView()->getSmartTags().RequestHelp(rHEvt);
-    
+
         if(!bReturn && HasCurrentFunction())
         {
             bReturn = GetCurrentFunction()->RequestHelp(rHEvt);
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 03276941e..7f0a63ee1 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -59,11 +59,10 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/outliner.hxx>
-#include <svtools/misccfg.hxx>
 #include <svx/editstat.hxx>
 #include <tools/multisel.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/intitem.hxx>
+#include <svl/style.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -92,7 +91,7 @@
 #include <svx/svxids.hrc>
 #endif
 #include <sfx2/request.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <basic/sbstar.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 9974f5829..f68c1cba9 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -48,7 +48,7 @@
 #ifndef _SCRBAR_HXX //autogen
 #include <vcl/scrbar.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svx/ruler.hxx>
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
@@ -90,7 +90,7 @@
 #include <svx/svdoutl.hxx>
 
 // #96090#
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include <sfx2/request.hxx>
 #include "SpellDialogChildWindow.hxx"
 
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 9413519fa..d74700307 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -172,6 +172,7 @@ SHL2STDLIBS= \
             $(VCLLIB) \
                         $(SOTLIB) \
             $(TOOLSLIB) \
+              $(UNOTOOLSLIB)      \
             $(UCBHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
@@ -250,7 +251,7 @@ DEF5NAME=$(SHL5TARGET)
 
 SHL5STDLIBS = $(ISDLIB) \
               $(SVXCORELIB)       \
-              $(SVXMSFILTERLIB)   \
+              $(MSFILTERLIB)   \
               $(SFX2LIB)          \
               $(SVTOOLLIB)        \
               $(SOTLIB)           \
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index ac6b782f3..622133934 100644
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
@@ -2,7 +2,7 @@ PPTEXPORTER_1_0 {
         global:
                 ExportPPT;
                 ImportPPT;
-
+                SaveVBA;
         local:
                 *;
 };
author	Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>	2010-01-14 19:11:13 +0100
committer	Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>	2010-01-14 19:11:13 +0100
commit	3cc5b48005e64a6e94d7b186b5274bf2562018eb (patch)
tree	dd5d62e8e834e08a8d17ec9a7775eb98d9b3c89e /sd
parent	4134b9134f7f9da982d6478c56fbeb9bf53711cb (diff)
parent	a2e95ebcc701038d4a1010d320a69681499f78ee (diff)