gbuildize sd

66 files changed, 1343 insertions, 3396 deletions

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
new file mode 100644
index 000000000000..68a5c6bf1cee
--- /dev/null
+++ b/sd/AllLangResTarget_sd.mk
@@ -0,0 +1,110 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sd))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sd,sd))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sd,\
+    sd/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sd/res))
+
+$(eval $(call gb_SrsTarget_set_include,sd/res,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
+    -I$(WORKDIR)/inc/sd \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sd/res,\
+    sd/source/core/glob.src \
+    sd/source/filter/html/pubdlg.src \
+    sd/source/ui/accessibility/accessibility.src \
+    sd/source/ui/animations/CustomAnimationCreateDialog.src \
+    sd/source/ui/animations/CustomAnimationDialog.src \
+    sd/source/ui/animations/CustomAnimationPane.src \
+    sd/source/ui/animations/CustomAnimation.src \
+    sd/source/ui/animations/SlideTransitionPane.src \
+    sd/source/ui/annotations/annotations.src \
+    sd/source/ui/app/app.src \
+    sd/source/ui/app/popup.src \
+    sd/source/ui/app/res_bmp.src \
+    sd/source/ui/app/sdstring.src \
+    sd/source/ui/app/strings.src \
+    sd/source/ui/app/toolbox.src \
+    sd/source/ui/dlg/animobjs.src \
+    sd/source/ui/dlg/brkdlg.src \
+    sd/source/ui/dlg/copydlg.src \
+    sd/source/ui/dlg/custsdlg.src \
+    sd/source/ui/dlg/dlgass.src \
+    sd/source/ui/dlg/dlg_char.src \
+    sd/source/ui/dlg/dlgfield.src \
+    sd/source/ui/dlg/dlgolbul.src \
+    sd/source/ui/dlg/dlgpage.src \
+    sd/source/ui/dlg/dlgsnap.src \
+    sd/source/ui/dlg/headerfooterdlg.src \
+    sd/source/ui/dlg/inspagob.src \
+    sd/source/ui/dlg/ins_paste.src \
+    sd/source/ui/dlg/LayerDialog.src \
+    sd/source/ui/dlg/layeroptionsdlg.src \
+    sd/source/ui/dlg/masterlayoutdlg.src \
+    sd/source/ui/dlg/morphdlg.src \
+    sd/source/ui/dlg/navigatr.src \
+    sd/source/ui/dlg/PaneDockingWindow.src \
+    sd/source/ui/dlg/paragr.src \
+    sd/source/ui/dlg/present.src \
+    sd/source/ui/dlg/prltempl.src \
+    sd/source/ui/dlg/prntopts.src \
+    sd/source/ui/dlg/sdpreslt.src \
+    sd/source/ui/dlg/tabtempl.src \
+    sd/source/ui/dlg/tpaction.src \
+    sd/source/ui/dlg/tpoption.src \
+    sd/source/ui/dlg/vectdlg.src \
+    sd/source/ui/notes/NotesChildWindow.src \
+    sd/source/ui/slideshow/slideshow.src \
+    sd/source/ui/slidesorter/view/SlsResource.src \
+    sd/source/ui/table/TableDesignPane.src \
+    sd/source/ui/view/DocumentRenderer.src \
+))
+
+$(eval $(call gb_SrsTarget_add_templates,sd/res,\
+    sd/source/ui/app/menuids2_tmpl.src \
+    sd/source/ui/app/menuids3_tmpl.src \
+    sd/source/ui/app/menuids4_tmpl.src \
+    sd/source/ui/app/menuids_tmpl.src \
+    sd/source/ui/app/menuportal_tmpl.src \
+    sd/source/ui/app/menu_tmpl.src \
+    sd/source/ui/app/popup2_tmpl.src \
+    sd/source/ui/app/tbxids_tmpl.src \
+    sd/source/ui/app/toolbox2_tmpl.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/CppUnitTest_sd_uimpress.mk b/sd/CppUnitTest_sd_uimpress.mk
new file mode 100644
index 000000000000..05467d74c96d
--- /dev/null
+++ b/sd/CppUnitTest_sd_uimpress.mk
@@ -0,0 +1,93 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_uimpress))
+
+$(eval $(call gb_CppunitTest_add_package_headers,sd_uimpress,sd_qa_unit))
+
+$(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
+    $$(DEFS) \
+    -DSD_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\
+    avmedia \
+    basegfx \
+    canvastools \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    xo \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
+    sd/qa/unit/uimpress \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sd_uimpress))
+
+$(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
+    --headless \
+    --invisible \
+    "-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\
+        file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \
+    "-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/sd/qa/unit/services.rdb,\
+        file://$(if $(filter WNT,$(OS)),/)$(rdb))" \
+    $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
+        -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \
+))
+
+# vim: set noet sw=4:
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
new file mode 100644
index 000000000000..daf2c36184d1
--- /dev/null
+++ b/sd/Library_sd.mk
@@ -0,0 +1,525 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sd))
+
+$(eval $(call gb_Library_add_precompiled_header,sd,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_add_sdi_headers,sd,\
+    sd/sdi/sdgslots \
+    sd/sdi/sdslots \
+))
+
+$(eval $(call gb_Library_set_include,sd,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(realpath $(SRCDIR)/sd/sdi) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
+    -I$(WORKDIR)/inc/sd \
+    -I$(WORKDIR)/SdiTarget/sd/sdi \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,sd,\
+    $$(DEFS) \
+    -DSD_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
+$(eval $(call gb_Library_set_defs,sd,\
+    $$(DEFS) \
+    -DDBG_ANIM_LOG \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,sd,\
+    avmedia \
+    basegfx \
+    canvastools \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    oox \
+    sal \
+    salhelper \
+    sax \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
+
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/core/anminfo \
+    sd/source/core/annotations/Annotation \
+    sd/source/core/annotations/AnnotationEnumeration \
+    sd/source/core/cusshow \
+    sd/source/core/CustomAnimationCloner \
+    sd/source/core/CustomAnimationEffect \
+    sd/source/core/CustomAnimationPreset \
+    sd/source/core/drawdoc \
+    sd/source/core/drawdoc2 \
+    sd/source/core/drawdoc3 \
+    sd/source/core/drawdoc4 \
+    sd/source/core/drawdoc_animations \
+    sd/source/core/EffectMigration \
+    sd/source/core/PageListWatcher \
+    sd/source/core/pglink \
+    sd/source/core/sdattr \
+    sd/source/core/sdiocmpt \
+    sd/source/core/sdobjfac \
+    sd/source/core/sdpage \
+    sd/source/core/sdpage2 \
+    sd/source/core/sdpage_animations \
+    sd/source/core/shapelist \
+    sd/source/core/stlfamily \
+    sd/source/core/stlpool \
+    sd/source/core/stlsheet \
+    sd/source/core/text/textapi \
+    sd/source/core/TransitionPreset \
+    sd/source/core/typemap \
+    sd/source/core/undoanim \
+    sd/source/core/undo/undofactory \
+    sd/source/core/undo/undomanager \
+    sd/source/core/undo/undoobjects \
+    sd/source/filter/cgm/sdcgmfilter \
+    sd/source/filter/grf/sdgrffilter \
+    sd/source/filter/html/buttonset \
+    sd/source/filter/html/htmlex \
+    sd/source/filter/html/HtmlOptionsDialog \
+    sd/source/filter/html/sdhtmlfilter \
+    sd/source/filter/sdfilter \
+    sd/source/filter/sdpptwrp \
+    sd/source/filter/xml/sdtransform \
+    sd/source/filter/xml/sdxmlwrp \
+    sd/source/helper/simplereferencecomponent \
+    sd/source/ui/accessibility/AccessibleDocumentViewBase \
+    sd/source/ui/accessibility/AccessibleDrawDocumentView \
+    sd/source/ui/accessibility/AccessibleOutlineEditSource \
+    sd/source/ui/accessibility/AccessibleOutlineView \
+    sd/source/ui/accessibility/AccessiblePageShape \
+    sd/source/ui/accessibility/AccessiblePresentationGraphicShape \
+    sd/source/ui/accessibility/AccessiblePresentationOLEShape \
+    sd/source/ui/accessibility/AccessiblePresentationShape \
+    sd/source/ui/accessibility/AccessibleScrollPanel \
+    sd/source/ui/accessibility/AccessibleSlideSorterObject \
+    sd/source/ui/accessibility/AccessibleSlideSorterView \
+    sd/source/ui/accessibility/AccessibleTreeNode \
+    sd/source/ui/accessibility/AccessibleViewForwarder \
+    sd/source/ui/accessibility/SdShapeTypes \
+    sd/source/ui/animations/CustomAnimationCreateDialog \
+    sd/source/ui/animations/CustomAnimationDialog \
+    sd/source/ui/animations/CustomAnimationList \
+    sd/source/ui/animations/CustomAnimationPane \
+    sd/source/ui/animations/DialogListBox \
+    sd/source/ui/animations/motionpathtag \
+    sd/source/ui/animations/SlideTransitionPane \
+    sd/source/ui/animations/STLPropertySet \
+    sd/source/ui/annotations/annotationmanager \
+    sd/source/ui/annotations/annotationtag \
+    sd/source/ui/annotations/annotationwindow \
+    sd/source/ui/app/sddll \
+    sd/source/ui/app/sddll1 \
+    sd/source/ui/app/sddll2 \
+    sd/source/ui/app/sdmod \
+    sd/source/ui/app/sdmod1 \
+    sd/source/ui/app/sdmod2 \
+    sd/source/ui/app/sdpopup \
+    sd/source/ui/app/sdxfer \
+    sd/source/ui/app/tbxww \
+    sd/source/ui/app/tmplctrl \
+    sd/source/ui/controller/slidelayoutcontroller \
+    sd/source/ui/dlg/AnimationChildWindow \
+    sd/source/ui/dlg/animobjs \
+    sd/source/ui/dlg/assclass \
+    sd/source/ui/dlg/diactrl \
+    sd/source/ui/dlg/dlgctrls \
+    sd/source/ui/dlg/docprev \
+    sd/source/ui/dlg/filedlg \
+    sd/source/ui/dlg/gluectrl \
+    sd/source/ui/dlg/ins_paste \
+    sd/source/ui/dlg/LayerDialogChildWindow \
+    sd/source/ui/dlg/LayerDialogContent \
+    sd/source/ui/dlg/layeroptionsdlg \
+    sd/source/ui/dlg/LayerTabBar \
+    sd/source/ui/dlg/NavigatorChildWindow \
+    sd/source/ui/dlg/navigatr \
+    sd/source/ui/dlg/PaneChildWindows \
+    sd/source/ui/dlg/PaneDockingWindow \
+    sd/source/ui/dlg/PaneShells \
+    sd/source/ui/dlg/sdabstdlg \
+    sd/source/ui/dlg/sdtreelb \
+    sd/source/ui/dlg/SpellDialogChildWindow \
+    sd/source/ui/dlg/TemplateScanner \
+    sd/source/ui/dlg/unchss \
+    sd/source/ui/docshell/docshel2 \
+    sd/source/ui/docshell/docshel3 \
+    sd/source/ui/docshell/docshel4 \
+    sd/source/ui/docshell/docshell \
+    sd/source/ui/docshell/grdocsh \
+    sd/source/ui/docshell/sdclient \
+    sd/source/ui/framework/configuration/ChangeRequestQueue \
+    sd/source/ui/framework/configuration/ChangeRequestQueueProcessor \
+    sd/source/ui/framework/configuration/Configuration \
+    sd/source/ui/framework/configuration/ConfigurationClassifier \
+    sd/source/ui/framework/configuration/ConfigurationController \
+    sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster \
+    sd/source/ui/framework/configuration/ConfigurationControllerResourceManager \
+    sd/source/ui/framework/configuration/ConfigurationTracer \
+    sd/source/ui/framework/configuration/ConfigurationUpdater \
+    sd/source/ui/framework/configuration/GenericConfigurationChangeRequest \
+    sd/source/ui/framework/configuration/ResourceFactoryManager \
+    sd/source/ui/framework/configuration/ResourceId \
+    sd/source/ui/framework/configuration/UpdateRequest \
+    sd/source/ui/framework/factories/BasicPaneFactory \
+    sd/source/ui/framework/factories/BasicToolBarFactory \
+    sd/source/ui/framework/factories/BasicViewFactory \
+    sd/source/ui/framework/factories/ChildWindowPane \
+    sd/source/ui/framework/factories/FrameWindowPane \
+    sd/source/ui/framework/factories/FullScreenPane \
+    sd/source/ui/framework/factories/Pane \
+    sd/source/ui/framework/factories/PresentationFactory \
+    sd/source/ui/framework/factories/TaskPanelFactory \
+    sd/source/ui/framework/factories/ViewShellWrapper \
+    sd/source/ui/framework/module/CenterViewFocusModule \
+    sd/source/ui/framework/module/DrawModule \
+    sd/source/ui/framework/module/ImpressModule \
+    sd/source/ui/framework/module/ModuleController \
+    sd/source/ui/framework/module/PresentationModule \
+    sd/source/ui/framework/module/ReadOnlyModeObserver \
+    sd/source/ui/framework/module/ResourceManager \
+    sd/source/ui/framework/module/ShellStackGuard \
+    sd/source/ui/framework/module/SlideSorterModule \
+    sd/source/ui/framework/module/ToolBarModule \
+    sd/source/ui/framework/module/ToolPanelModule \
+    sd/source/ui/framework/module/ViewTabBarModule \
+    sd/source/ui/framework/tools/FrameworkHelper \
+    sd/source/ui/func/bulmaper \
+    sd/source/ui/func/fuarea \
+    sd/source/ui/func/fubullet \
+    sd/source/ui/func/fuchar \
+    sd/source/ui/func/fucon3d \
+    sd/source/ui/func/fuconarc \
+    sd/source/ui/func/fuconbez \
+    sd/source/ui/func/fuconcs \
+    sd/source/ui/func/fuconnct \
+    sd/source/ui/func/fuconrec \
+    sd/source/ui/func/fuconstr \
+    sd/source/ui/func/fuconuno \
+    sd/source/ui/func/fucopy \
+    sd/source/ui/func/fucushow \
+    sd/source/ui/func/fudraw \
+    sd/source/ui/func/fudspord \
+    sd/source/ui/func/fuediglu \
+    sd/source/ui/func/fuexpand \
+    sd/source/ui/func/fuformatpaintbrush \
+    sd/source/ui/func/fuhhconv \
+    sd/source/ui/func/fuinsert \
+    sd/source/ui/func/fuinsfil \
+    sd/source/ui/func/fuline \
+    sd/source/ui/func/fulinend \
+    sd/source/ui/func/fulink \
+    sd/source/ui/func/fumeasur \
+    sd/source/ui/func/fumorph \
+    sd/source/ui/func/fuoaprms \
+    sd/source/ui/func/fuolbull \
+    sd/source/ui/func/fuoltext \
+    sd/source/ui/func/fuoutl \
+    sd/source/ui/func/fupage \
+    sd/source/ui/func/fuparagr \
+    sd/source/ui/func/fupoor \
+    sd/source/ui/func/fuprlout \
+    sd/source/ui/func/fuprobjs \
+    sd/source/ui/func/fuscale \
+    sd/source/ui/func/fusearch \
+    sd/source/ui/func/fusel \
+    sd/source/ui/func/fusldlg \
+    sd/source/ui/func/fusnapln \
+    sd/source/ui/func/fusumry \
+    sd/source/ui/func/futempl \
+    sd/source/ui/func/futhes \
+    sd/source/ui/func/futransf \
+    sd/source/ui/func/futxtatt \
+    sd/source/ui/func/fuvect \
+    sd/source/ui/func/fuzoom \
+    sd/source/ui/func/sdundo \
+    sd/source/ui/func/sdundogr \
+    sd/source/ui/func/smarttag \
+    sd/source/ui/func/undoback \
+    sd/source/ui/func/undoheaderfooter \
+    sd/source/ui/func/undolayer \
+    sd/source/ui/func/undopage \
+    sd/source/ui/func/unmovss \
+    sd/source/ui/func/unoaprms \
+    sd/source/ui/func/unprlout \
+    sd/source/ui/presenter/CanvasUpdateRequester \
+    sd/source/ui/presenter/PresenterCanvas \
+    sd/source/ui/presenter/PresenterHelper \
+    sd/source/ui/presenter/PresenterPreviewCache \
+    sd/source/ui/presenter/PresenterTextView \
+    sd/source/ui/presenter/SlideRenderer \
+    sd/source/ui/slideshow/PaneHider \
+    sd/source/ui/slideshow/showwin \
+    sd/source/ui/slideshow/slideshow \
+    sd/source/ui/slideshow/slideshowimpl \
+    sd/source/ui/slideshow/SlideShowRestarter \
+    sd/source/ui/slideshow/slideshowviewimpl \
+    sd/source/ui/slidesorter/cache/SlsBitmapCache \
+    sd/source/ui/slidesorter/cache/SlsBitmapCompressor \
+    sd/source/ui/slidesorter/cache/SlsBitmapFactory \
+    sd/source/ui/slidesorter/cache/SlsCacheCompactor \
+    sd/source/ui/slidesorter/cache/SlsCacheConfiguration \
+    sd/source/ui/slidesorter/cache/SlsGenericPageCache \
+    sd/source/ui/slidesorter/cache/SlsPageCache \
+    sd/source/ui/slidesorter/cache/SlsPageCacheManager \
+    sd/source/ui/slidesorter/cache/SlsQueueProcessor \
+    sd/source/ui/slidesorter/cache/SlsRequestFactory \
+    sd/source/ui/slidesorter/cache/SlsRequestQueue \
+    sd/source/ui/slidesorter/controller/SlideSorterController \
+    sd/source/ui/slidesorter/controller/SlsAnimationFunction \
+    sd/source/ui/slidesorter/controller/SlsAnimator \
+    sd/source/ui/slidesorter/controller/SlsClipboard \
+    sd/source/ui/slidesorter/controller/SlsCurrentSlideManager \
+    sd/source/ui/slidesorter/controller/SlsDragAndDropContext \
+    sd/source/ui/slidesorter/controller/SlsFocusManager \
+    sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler \
+    sd/source/ui/slidesorter/controller/SlsListener \
+    sd/source/ui/slidesorter/controller/SlsPageSelector \
+    sd/source/ui/slidesorter/controller/SlsProperties \
+    sd/source/ui/slidesorter/controller/SlsScrollBarManager \
+    sd/source/ui/slidesorter/controller/SlsSelectionCommand \
+    sd/source/ui/slidesorter/controller/SlsSelectionFunction \
+    sd/source/ui/slidesorter/controller/SlsSelectionManager \
+    sd/source/ui/slidesorter/controller/SlsSelectionObserver \
+    sd/source/ui/slidesorter/controller/SlsSlotManager \
+    sd/source/ui/slidesorter/controller/SlsTransferable \
+    sd/source/ui/slidesorter/controller/SlsVisibleAreaManager \
+    sd/source/ui/slidesorter/model/SlideSorterModel \
+    sd/source/ui/slidesorter/model/SlsPageDescriptor \
+    sd/source/ui/slidesorter/model/SlsPageEnumeration \
+    sd/source/ui/slidesorter/model/SlsPageEnumerationProvider \
+    sd/source/ui/slidesorter/model/SlsVisualState \
+    sd/source/ui/slidesorter/shell/SlideSorter \
+    sd/source/ui/slidesorter/shell/SlideSorterService \
+    sd/source/ui/slidesorter/shell/SlideSorterViewShell \
+    sd/source/ui/slidesorter/view/SlideSorterView \
+    sd/source/ui/slidesorter/view/SlsButtonBar \
+    sd/source/ui/slidesorter/view/SlsFontProvider \
+    sd/source/ui/slidesorter/view/SlsFramePainter \
+    sd/source/ui/slidesorter/view/SlsInsertAnimator \
+    sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay \
+    sd/source/ui/slidesorter/view/SlsLayeredDevice \
+    sd/source/ui/slidesorter/view/SlsLayouter \
+    sd/source/ui/slidesorter/view/SlsPageObjectLayouter \
+    sd/source/ui/slidesorter/view/SlsPageObjectPainter \
+    sd/source/ui/slidesorter/view/SlsTheme \
+    sd/source/ui/slidesorter/view/SlsToolTip \
+    sd/source/ui/slidesorter/view/SlsViewCacheContext \
+    sd/source/ui/table/TableDesignPane \
+    sd/source/ui/table/tablefunction \
+    sd/source/ui/table/tableobjectbar \
+    sd/source/ui/toolpanel/ControlContainer \
+    sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
+    sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
+    sd/source/ui/toolpanel/controls/CustomAnimationPanel \
+    sd/source/ui/toolpanel/controls/DocumentHelper \
+    sd/source/ui/toolpanel/controls/MasterPageContainer \
+    sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
+    sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
+    sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
+    sd/source/ui/toolpanel/controls/MasterPageDescriptor \
+    sd/source/ui/toolpanel/controls/MasterPageObserver \
+    sd/source/ui/toolpanel/controls/MasterPagesPanel \
+    sd/source/ui/toolpanel/controls/MasterPagesSelector \
+    sd/source/ui/toolpanel/controls/PreviewValueSet \
+    sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
+    sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
+    sd/source/ui/toolpanel/controls/SlideTransitionPanel \
+    sd/source/ui/toolpanel/controls/TableDesignPanel \
+    sd/source/ui/toolpanel/LayoutMenu \
+    sd/source/ui/toolpanel/ScrollPanel \
+    sd/source/ui/toolpanel/SlideSorterCacheDisplay \
+    sd/source/ui/toolpanel/SubToolPanel \
+    sd/source/ui/toolpanel/TaskPaneControlFactory \
+    sd/source/ui/toolpanel/TaskPaneFocusManager \
+    sd/source/ui/toolpanel/TaskPaneShellManager \
+    sd/source/ui/toolpanel/TaskPaneTreeNode \
+    sd/source/ui/toolpanel/TestMenu \
+    sd/source/ui/toolpanel/TestPanel \
+    sd/source/ui/toolpanel/TitleBar \
+    sd/source/ui/toolpanel/TitledControl \
+    sd/source/ui/toolpanel/ToolPanel \
+    sd/source/ui/toolpanel/ToolPanelFactory \
+    sd/source/ui/toolpanel/ToolPanelUIElement \
+    sd/source/ui/toolpanel/ToolPanelViewShell \
+    sd/source/ui/tools/AsynchronousCall \
+    sd/source/ui/tools/ConfigurationAccess \
+    sd/source/ui/tools/EventMultiplexer \
+    sd/source/ui/tools/IconCache \
+    sd/source/ui/tools/IdleDetection \
+    sd/source/ui/tools/PreviewRenderer \
+    sd/source/ui/tools/PropertySet \
+    sd/source/ui/tools/SdGlobalResourceContainer \
+    sd/source/ui/tools/SlotStateListener \
+    sd/source/ui/tools/TimerBasedTaskExecution \
+    sd/source/ui/unoidl/DrawController \
+    sd/source/ui/unoidl/facreg \
+    sd/source/ui/unoidl/randomnode \
+    sd/source/ui/unoidl/SdUnoDrawView \
+    sd/source/ui/unoidl/SdUnoOutlineView \
+    sd/source/ui/unoidl/SdUnoSlideView \
+    sd/source/ui/unoidl/unocpres \
+    sd/source/ui/unoidl/unodoc \
+    sd/source/ui/unoidl/UnoDocumentSettings \
+    sd/source/ui/unoidl/unokywds \
+    sd/source/ui/unoidl/unolayer \
+    sd/source/ui/unoidl/unomodel \
+    sd/source/ui/unoidl/unomodule \
+    sd/source/ui/unoidl/unoobj \
+    sd/source/ui/unoidl/unopage \
+    sd/source/ui/unoidl/unopback \
+    sd/source/ui/unoidl/unopool \
+    sd/source/ui/unoidl/unosrch \
+    sd/source/ui/view/clview \
+    sd/source/ui/view/DocumentRenderer \
+    sd/source/ui/view/drawview \
+    sd/source/ui/view/drbezob \
+    sd/source/ui/view/drtxtob \
+    sd/source/ui/view/drtxtob1 \
+    sd/source/ui/view/drviews1 \
+    sd/source/ui/view/drviews2 \
+    sd/source/ui/view/drviews3 \
+    sd/source/ui/view/drviews4 \
+    sd/source/ui/view/drviews5 \
+    sd/source/ui/view/drviews6 \
+    sd/source/ui/view/drviews7 \
+    sd/source/ui/view/drviews8 \
+    sd/source/ui/view/drviews9 \
+    sd/source/ui/view/drviewsa \
+    sd/source/ui/view/drviewsb \
+    sd/source/ui/view/drviewsc \
+    sd/source/ui/view/drviewsd \
+    sd/source/ui/view/drviewse \
+    sd/source/ui/view/drviewsf \
+    sd/source/ui/view/drviewsg \
+    sd/source/ui/view/drviewsh \
+    sd/source/ui/view/drviewsi \
+    sd/source/ui/view/drviewsj \
+    sd/source/ui/view/drvwshrg \
+    sd/source/ui/view/FormShellManager \
+    sd/source/ui/view/frmview \
+    sd/source/ui/view/GraphicObjectBar \
+    sd/source/ui/view/GraphicViewShellBase \
+    sd/source/ui/view/grviewsh \
+    sd/source/ui/view/ImpressViewShellBase \
+    sd/source/ui/view/MediaObjectBar \
+    sd/source/ui/view/Outliner \
+    sd/source/ui/view/OutlinerIterator \
+    sd/source/ui/view/OutlineViewShellBase \
+    sd/source/ui/view/outlnvs2 \
+    sd/source/ui/view/outlnvsh \
+    sd/source/ui/view/outlview \
+    sd/source/ui/view/PresentationViewShellBase \
+    sd/source/ui/view/presvish \
+    sd/source/ui/view/sdruler \
+    sd/source/ui/view/sdview \
+    sd/source/ui/view/sdview2 \
+    sd/source/ui/view/sdview3 \
+    sd/source/ui/view/sdview4 \
+    sd/source/ui/view/sdview5 \
+    sd/source/ui/view/sdwindow \
+    sd/source/ui/view/SlideSorterViewShellBase \
+    sd/source/ui/view/tabcontr \
+    sd/source/ui/view/ToolBarManager \
+    sd/source/ui/view/unmodpg \
+    sd/source/ui/view/UpdateLockManager \
+    sd/source/ui/view/ViewClipboard \
+    sd/source/ui/view/viewoverlaymanager \
+    sd/source/ui/view/viewshe2 \
+    sd/source/ui/view/viewshe3 \
+    sd/source/ui/view/viewshel \
+    sd/source/ui/view/ViewShellBase \
+    sd/source/ui/view/ViewShellHint \
+    sd/source/ui/view/ViewShellImplementation \
+    sd/source/ui/view/ViewShellManager \
+    sd/source/ui/view/ViewTabBar \
+    sd/source/ui/view/WindowUpdater \
+    sd/source/ui/view/zoomlist \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,sd,\
+    sd/source/ui/app/sdresid \
+))
+
+ifeq ($(strip $(GUI)),WNT)
+$(eval $(call gb_Library_add_cxxobjects,sd,\
+    sd/source/ui/app/optsitem \
+    sd/source/ui/func/futext \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/ui/app/optsitem \
+    sd/source/ui/func/futext \
+))
+endif
+
+ifeq ($(strip $(COM)),GCC)
+$(eval $(call gb_Library_add_cxxobjects,sd,\
+    sd/source/ui/unoidl/unowcntr \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/ui/unoidl/unowcntr \
+))
+endif
+
+$(WORKDIR)/inc/sd/sduilib.hxx :
+	echo \#define DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sdui$(DLLPOSTFIX)$(DLLPOST)\" > $@
+
+$(call gb_CxxObject_get_target,sd/source/ui/dlg/sdabstdlg) : $(WORKDIR)/inc/sd/sduilib.hxx
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
new file mode 100644
index 000000000000..894e399639e1
--- /dev/null
+++ b/sd/Library_sdd.mk
@@ -0,0 +1,63 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sdd))
+
+$(eval $(call gb_Library_add_precompiled_header,sdd,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_set_include,sdd,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdd,\
+    cppu \
+    cppuhelper \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd))
+
+$(eval $(call gb_Library_add_exception_objects,sdd,\
+    sd/source/ui/unoidl/detreg \
+    sd/source/ui/unoidl/sddetect \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
new file mode 100644
index 000000000000..b1bb3de9a8eb
--- /dev/null
+++ b/sd/Library_sdfilt.mk
@@ -0,0 +1,105 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sdfilt))
+
+$(eval $(call gb_Library_add_precompiled_header,sdfilt,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_set_include,sdfilt,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,sdfilt,\
+    $$(DEFS) \
+    -DSD_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
+$(eval $(call gb_Library_set_defs,sdfilt,\
+    $$(DEFS) \
+    -DDBG_ANIM_LOG \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,sdfilt,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    editeng \
+    i18nisolang1 \
+    msfilter \
+    oox \
+    sal \
+    sax \
+    sd \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt))
+
+$(eval $(call gb_Library_add_exception_objects,sdfilt,\
+    sd/source/filter/eppt/eppt \
+    sd/source/filter/eppt/escherex \
+    sd/source/filter/eppt/pptexanimations \
+    sd/source/filter/eppt/pptexsoundcollection \
+    sd/source/filter/eppt/pptx-epptbase \
+    sd/source/filter/eppt/pptx-epptooxml \
+    sd/source/filter/eppt/pptx-grouptable \
+    sd/source/filter/eppt/pptx-stylesheet \
+    sd/source/filter/eppt/pptx-text \
+    sd/source/filter/ppt/ppt97animations \
+    sd/source/filter/ppt/pptatom \
+    sd/source/filter/ppt/pptin \
+    sd/source/filter/ppt/pptinanimations \
+    sd/source/filter/ppt/propread \
+))
+
+ifeq ($(strip $(COM)),GCC)
+$(eval $(call gb_Library_add_cxxobjects,sdfilt,\
+    sd/source/filter/eppt/epptso \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sdfilt,\
+    sd/source/filter/eppt/epptso \
+))
+endif
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
new file mode 100644
index 000000000000..e74e965781ac
--- /dev/null
+++ b/sd/Library_sdui.mk
@@ -0,0 +1,101 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sdui))
+
+$(eval $(call gb_Library_add_precompiled_header,sdui,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_set_include,sdui,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,sdui,\
+    $$(DEFS) \
+    -DSD_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdui,\
+    basegfx \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    editeng \
+    i18nisolang1 \
+    sal \
+    sd \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sdui,\
+    sd/source/filter/html/htmlattr \
+    sd/source/ui/dlg/brkdlg \
+    sd/source/ui/dlg/copydlg \
+    sd/source/ui/dlg/masterlayoutdlg \
+    sd/source/ui/dlg/morphdlg \
+    sd/source/ui/dlg/paragr \
+    sd/source/ui/dlg/present \
+    sd/source/ui/dlg/prltempl \
+    sd/source/ui/dlg/prntopts \
+    sd/source/ui/dlg/sddlgfact \
+    sd/source/ui/dlg/sdpreslt \
+    sd/source/ui/dlg/sduiexp \
+    sd/source/ui/dlg/tabtempl \
+    sd/source/ui/dlg/tpaction \
+    sd/source/ui/dlg/tpoption \
+    sd/source/ui/dlg/vectdlg \
+    sd/source/ui/dlg/custsdlg \
+    sd/source/ui/dlg/dlgass \
+    sd/source/ui/dlg/dlgassim \
+    sd/source/ui/dlg/dlgchar \
+    sd/source/ui/dlg/dlgfield \
+    sd/source/ui/dlg/dlgolbul \
+    sd/source/ui/dlg/dlgpage \
+    sd/source/ui/dlg/dlgsnap \
+    sd/source/ui/dlg/headerfooterdlg \
+    sd/source/ui/dlg/inspagob \
+    sd/source/filter/html/pubdlg \
+))
+
+# $(WORKDIR)/inc/sd/sddll0.hxx :
+	# echo "#define" DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index f88f3e569479..644de2b39cb4 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -27,6 +27,18 @@
 
 $(eval $(call gb_Module_Module,sd))
 
+$(eval $(call gb_Module_add_targets,sd,\
+    CppUnitTest_sd_uimpress \
+    Library_sd \
+    Library_sdd \
+    Library_sdfilt \
+    Library_sdui \
+    Package_inc \
+    Package_qa_unit \
+    Package_uiconfig \
+    Package_xml \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
     JunitTest_sd_unoapi \
 ))
diff --git a/sd/Package_inc.mk b/sd/Package_inc.mk
new file mode 100644
index 000000000000..fcf22384d8dc
--- /dev/null
+++ b/sd/Package_inc.mk
@@ -0,0 +1,32 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,sd_inc,$(SRCDIR)/sd/inc))
+
+$(eval $(call gb_Package_add_file,sd_inc,inc/sd/sddll.hxx,sddll.hxx))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Package_qa_unit.mk b/sd/Package_qa_unit.mk
new file mode 100644
index 000000000000..a440805e768e
--- /dev/null
+++ b/sd/Package_qa_unit.mk
@@ -0,0 +1,41 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,sd_qa_unit,$(WORKDIR)/CustomTarget/sd/qa/unit))
+
+$(eval $(call gb_Package_add_customtarget,sd_qa_unit,sd/qa/unit))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,sd/qa/unit,\
+    $(foreach newcomponentfile,\
+        framework/util/fwk \
+        , $(OUTDIR)/xml/component/$(newcomponentfile).component) \
+    $(foreach oldcomponentfile, \
+        i18npool \
+        , $(OUTDIR)/xml/$(oldcomponentfile).component) \
+))
+
+# vim: set noet sw=4:
diff --git a/sd/Package_uiconfig.mk b/sd/Package_uiconfig.mk
new file mode 100644
index 000000000000..de77ff4bc7be
--- /dev/null
+++ b/sd/Package_uiconfig.mk
@@ -0,0 +1,129 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,sd_uiconfig,$(SRCDIR)/sd/uiconfig))
+
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/menubar/menubar.xml,sdraw/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/statusbar/statusbar.xml,sdraw/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/3dobjectsbar.xml,sdraw/toolbar/3dobjectsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/alignmentbar.xml,sdraw/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/arrowsbar.xml,sdraw/toolbar/arrowsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/arrowshapes.xml,sdraw/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/basicshapes.xml,sdraw/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/bezierobjectbar.xml,sdraw/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/calloutshapes.xml,sdraw/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/choosemodebar.xml,sdraw/toolbar/choosemodebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/colorbar.xml,sdraw/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/commentsbar.xml,sdraw/toolbar/commentsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/connectorsbar.xml,sdraw/toolbar/connectorsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml,sdraw/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/ellipsesbar.xml,sdraw/toolbar/ellipsesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/extrusionobjectbar.xml,sdraw/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/findbar.xml,sdraw/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/flowchartshapes.xml,sdraw/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fontworkobjectbar.xml,sdraw/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fontworkshapetype.xml,sdraw/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formcontrols.xml,sdraw/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formdesign.xml,sdraw/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formsfilterbar.xml,sdraw/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formsnavigationbar.xml,sdraw/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formtextobjectbar.xml,sdraw/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fullscreenbar.xml,sdraw/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/gluepointsobjectbar.xml,sdraw/toolbar/gluepointsobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/graffilterbar.xml,sdraw/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/graphicobjectbar.xml,sdraw/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/insertbar.xml,sdraw/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/linesbar.xml,sdraw/toolbar/linesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/masterviewtoolbar.xml,sdraw/toolbar/masterviewtoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/mediaobjectbar.xml,sdraw/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/moreformcontrols.xml,sdraw/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/optimizetablebar.xml,sdraw/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/optionsbar.xml,sdraw/toolbar/optionsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/positionbar.xml,sdraw/toolbar/positionbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/rectanglesbar.xml,sdraw/toolbar/rectanglesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/standardbar.xml,sdraw/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/starshapes.xml,sdraw/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/symbolshapes.xml,sdraw/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/tableobjectbar.xml,sdraw/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/textbar.xml,sdraw/toolbar/textbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/textobjectbar.xml,sdraw/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/toolbar.xml,sdraw/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/viewerbar.xml,sdraw/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/zoombar.xml,sdraw/toolbar/zoombar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/menubar/menubar.xml,simpress/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/statusbar/statusbar.xml,simpress/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/3dobjectsbar.xml,simpress/toolbar/3dobjectsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/alignmentbar.xml,simpress/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/arrowsbar.xml,simpress/toolbar/arrowsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/arrowshapes.xml,simpress/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/basicshapes.xml,simpress/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/bezierobjectbar.xml,simpress/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/calloutshapes.xml,simpress/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/choosemodebar.xml,simpress/toolbar/choosemodebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/colorbar.xml,simpress/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/commentsbar.xml,simpress/toolbar/commentsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/commontaskbar.xml,simpress/toolbar/commontaskbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/connectorsbar.xml,simpress/toolbar/connectorsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/drawingobjectbar.xml,simpress/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/ellipsesbar.xml,simpress/toolbar/ellipsesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/extrusionobjectbar.xml,simpress/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/findbar.xml,simpress/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/flowchartshapes.xml,simpress/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fontworkobjectbar.xml,simpress/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fontworkshapetype.xml,simpress/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formcontrols.xml,simpress/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formdesign.xml,simpress/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formsfilterbar.xml,simpress/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formsnavigationbar.xml,simpress/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formtextobjectbar.xml,simpress/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fullscreenbar.xml,simpress/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/gluepointsobjectbar.xml,simpress/toolbar/gluepointsobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/graffilterbar.xml,simpress/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/graphicobjectbar.xml,simpress/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/insertbar.xml,simpress/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/linesbar.xml,simpress/toolbar/linesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/masterviewtoolbar.xml,simpress/toolbar/masterviewtoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/mediaobjectbar.xml,simpress/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/moreformcontrols.xml,simpress/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/optimizetablebar.xml,simpress/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/optionsbar.xml,simpress/toolbar/optionsbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/outlinetoolbar.xml,simpress/toolbar/outlinetoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/positionbar.xml,simpress/toolbar/positionbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/rectanglesbar.xml,simpress/toolbar/rectanglesbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/slideviewobjectbar.xml,simpress/toolbar/slideviewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/slideviewtoolbar.xml,simpress/toolbar/slideviewtoolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/standardbar.xml,simpress/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/starshapes.xml,simpress/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/symbolshapes.xml,simpress/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/tableobjectbar.xml,simpress/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/textbar.xml,simpress/toolbar/textbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/textobjectbar.xml,simpress/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/toolbar.xml,simpress/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/viewerbar.xml,simpress/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/zoombar.xml,simpress/toolbar/zoombar.xml))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
new file mode 100644
index 000000000000..f29a9dc4bd8c
--- /dev/null
+++ b/sd/Package_xml.mk
@@ -0,0 +1,62 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
+
+$(eval $(call gb_Package_add_file,sd_xml,AccessibleDrawDocumentView.xml,xml/AccessibleDrawDocumentView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessibleOutlineView.xml,xml/AccessibleOutlineView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessiblePageShape.xml,xml/AccessiblePageShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessiblePresentationGraphicShape.xml,xml/AccessiblePresentationGraphicShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessiblePresentationOLEShape.xml,xml/AccessiblePresentationOLEShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessiblePresentationShape.xml,xml/AccessiblePresentationShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessibleSlideViewObject.xml,xml/AccessibleSlideViewObject.xml))
+$(eval $(call gb_Package_add_file,sd_xml,AccessibleSlideView.xml,xml/AccessibleSlideView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,DrawingView.xml,xml/DrawingView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,effects.xml,xml/effects.xml))
+$(eval $(call gb_Package_add_file,sd_xml,HandoutView.xml,xml/HandoutView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,NotesView.xml,xml/NotesView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,OutlineView.xml,xml/OutlineView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,PresentationView.xml,xml/PresentationView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdDocLinkTargets.xml,xml/SdDocLinkTargets.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdDrawPagesAccess.xml,xml/SdDrawPagesAccess.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdDrawPage.xml,xml/SdDrawPage.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdGenericDrawPage.xml,xml/SdGenericDrawPage.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdLayerManager.xml,xml/SdLayerManager.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdLayer.xml,xml/SdLayer.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdMasterPagesAccess.xml,xml/SdMasterPagesAccess.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdMasterPage.xml,xml/SdMasterPage.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdPageLinkTargets.xml,xml/SdPageLinkTargets.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdXCustomPresentationAccess.xml,xml/SdXCustomPresentationAccess.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdXCustomPresentation.xml,xml/SdXCustomPresentation.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdXImpressDocument.xml,xml/SdXImpressDocument.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdXPresentation.xml,xml/SdXPresentation.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SdXShape.xml,xml/SdXShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,SlidesView.xml,xml/SlidesView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,transitions-ogl.xml,xml/transitions-ogl.xml))
+$(eval $(call gb_Package_add_file,sd_xml,transitions.xml,xml/transitions.xml))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/inc/makefile.mk b/sd/inc/makefile.mk
deleted file mode 100644
index 1101f31d8025..000000000000
--- a/sd/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=sd
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index c8fbbe63346a..dc4c16095d6c 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,48 +1,3 @@
 sd      sd      :    filter TRANSLATIONS:translations animations svx sfx2 stoc canvas LIBXSLT:libxslt oox ure NULL
 sd	sd										usr1	-	all	sd_mkout NULL
-sd	sd\inc									nmake		-	all	sd_inc NULL
-sd	sd\prj									get		-	all	sd_prj NULL
-sd	sd\source\ui\inc						get		-	all	sd_sinc NULL
-sd	sd\res									get		-	all	sd_res NULL
-sd	sd\res\imagelst							get		-	all	sd_resil NULL
-sd	sd\sdi									nmake	-	all	sd_sdi NULL
-sd	sd\source\helper						nmake	-	all sd_helper sd_inc NULL
-sd	sd\source\ui\func						nmake	-	all	sd_func sd_sdi sd_inc NULL
-sd	sd\source\ui\view						nmake	-	all	sd_view sd_sdi sd_inc NULL
-sd	sd\source\ui\app						nmake	-	all	sd_app sd_sdi sd_inc NULL
-sd	sd\source\ui\dlg						nmake	-	all	sd_dlg sd_sdi sd_inc NULL
-sd	sd\source\core							nmake	-	all	sd_core sd_sdi sd_inc NULL
-sd	sd\source\core\undo						nmake	-	all	sd_undo sd_core sd_inc NULL
-sd	sd\source\core\text						nmake	-	all sd_text sd_inc NULL
-sd	sd\source\core\annotations				nmake	-	all sd_annotations sd_inc NULL
-sd	sd\source\ui\docshell					nmake	-	all	sd_docsh sd_sdi sd_inc NULL
-sd	sd\source\ui\unoidl						nmake	-	all	sd_unid sd_sdi sd_inc NULL
-sd	sd\source\ui\accessibility				nmake	-	all	sd_accessibility sd_inc NULL
-sd	sd\source\ui\toolpanel  				nmake	-	all	sd_toolpanel sd_sdi sd_inc NULL
-sd	sd\source\ui\toolpanel\controls			nmake	-	all	sd_toolpanel_controls sd_sdi sd_inc NULL
-sd	sd\source\ui\tools      				nmake	-	all	sd_tools sd_inc NULL
-sd	sd\source\ui\slidesorter\shell			nmake	-	all	sd_slsshell sd_sdi sd_inc NULL
-sd	sd\source\ui\slidesorter\model			nmake	-	all	sd_slsmodel sd_inc NULL
-sd	sd\source\ui\slidesorter\view			nmake	-	all	sd_slsview sd_inc NULL
-sd	sd\source\ui\slidesorter\controller		nmake	-	all	sd_slscontroller sd_sdi sd_inc NULL
-sd	sd\source\ui\slidesorter\cache			nmake	-	all	sd_slscache sd_inc NULL
-sd	sd\source\ui\controller					nmake	-	all	sd_controller sd_inc NULL
-sd	sd\source\ui\notes						nmake	-	all	sd_notes sd_inc NULL
-sd	sd\source\ui\table						nmake	-	all	sd_table sd_sdi sd_inc NULL
-sd	sd\source\filter\ppt					nmake	-	all	sd_ppt sd_inc NULL
-sd	sd\source\filter						nmake	-	all	sd_filt sd_sdi sd_ppt sd_inc NULL
-sd	sd\source\filter\cgm					nmake	-	all	sd_cgm sd_inc NULL
-sd	sd\source\filter\eppt					nmake	-	all	sd_eppt sd_inc NULL
-sd	sd\source\filter\grf					nmake	-	all	sd_grf sd_inc NULL
-sd	sd\source\filter\xml					nmake	-	all	sd_filter_xml sd_inc NULL
-sd	sd\source\filter\html					nmake	-	all	sd_html sd_inc NULL
-sd	sd\source\ui\animations					nmake	-	all sd_animations sd_inc NULL
-sd	sd\source\ui\slideshow					nmake	-	all sd_slideshow sd_sdi sd_inc NULL
-sd	sd\source\ui\presenter       	        nmake	-	all sd_presenter sd_inc NULL
-sd	sd\source\ui\framework\configuration	nmake	-	all sd_framework_configuration sd_inc NULL
-sd	sd\source\ui\framework\module       	nmake	-	all sd_framework_module sd_inc NULL
-sd	sd\source\ui\framework\factories       	nmake	-	all sd_framework_factories sd_inc NULL
-sd	sd\source\ui\framework\tools           	nmake	-	all sd_framework_tools sd_inc NULL
-sd	sd\source\ui\annotations				nmake	-	all sd_uiannotations sd_inc NULL
-sd	sd\util									nmake	-	all	sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
-sd	sd\qa\unit								nmake	-	all	sd_qa_cppunit sd_util NULL
+sd	sd\prj									nmake		-	all	sd_prj NULL
diff --git a/sd/prj/d.lst b/sd/prj/d.lst
index ad4a52aae1e5..e69de29bb2d1 100644
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@ -1,60 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%COMMON_OUTDIR%\srs\core_srs.hid %COMMON_DEST%\res%_EXT%\sdcore_srs.hid
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\sdi.lib %_DEST%\lib%_EXT%\sdi.lib
-..\%__SRC%\slb\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\bin\sd?????.dll %_DEST%\bin%_EXT%\sd?????.dll
-..\%__SRC%\bin\sd??????.dll %_DEST%\bin%_EXT%\sd??????.dll
-..\%__SRC%\bin\sd*.res %_DEST%\bin%_EXT%\sd*.res
-..\%__SRC%\bin\sd???????.dll %_DEST%\bin%_EXT%\sd???????.dll
-..\%__SRC%\bin\emp?????.* %_DEST%\bin%_EXT%\emp?????.*
-
-mkdir: %_DEST%\pck%_EXT%
-..\res\webview\common.inc %_DEST%\pck%_EXT%\common.inc
-..\res\webview\common.pl %_DEST%\pck%_EXT%\common.pl
-..\res\webview\edit.asp %_DEST%\pck%_EXT%\edit.asp
-..\res\webview\edit.pl %_DEST%\pck%_EXT%\edit.pl
-..\res\webview\editpic.asp %_DEST%\pck%_EXT%\editpic.asp
-..\res\webview\editpic.pl %_DEST%\pck%_EXT%\editpic.pl
-..\res\webview\index.pl %_DEST%\pck%_EXT%\index.pl
-..\res\webview\poll.asp %_DEST%\pck%_EXT%\poll.asp
-..\res\webview\poll.pl %_DEST%\pck%_EXT%\poll.pl
-..\res\webview\savepic.asp %_DEST%\pck%_EXT%\savepic.asp
-..\res\webview\savepic.pl %_DEST%\pck%_EXT%\savepic.pl
-..\res\webview\show.asp %_DEST%\pck%_EXT%\show.asp
-..\res\webview\show.pl %_DEST%\pck%_EXT%\show.pl
-..\res\webview\webview.asp %_DEST%\pck%_EXT%\webcast.asp
-..\res\webview\webview.pl %_DEST%\pck%_EXT%\webcast.pl
-
-..\res\buttons\*.zip %_DEST%\pck%_EXT%\*.zip
-
-mkdir: %_DEST%\inc%_EXT%\sd
-..\inc\sddll.hxx %_DEST%\inc%_EXT%\sd\sddll.hxx
-
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\uiconfig\sdraw\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar\*.xml
-..\uiconfig\simpress\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar\*.xml
-..\uiconfig\sdraw\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar\*.xml
-..\uiconfig\simpress\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar\*.xml
-..\uiconfig\sdraw\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar\*.xml
-..\uiconfig\simpress\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar\*.xml
-
-..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
-..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
-..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
diff --git a/sd/source/filter/grf/makefile.mk b/sd/prj/makefile.mk
index 7b6ad7121cce..e312a7ccab65 100644..100755
--- a/sd/source/filter/grf/makefile.mk
+++ b/sd/prj/makefile.mk
@@ -25,20 +25,16 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-PRJNAME=sd
-TARGET=grf
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/sdgrffilter.obj	
 
-# --- Targets --------------------------------------------------------------
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
-.INCLUDE : target.mk
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/sd/qa/unit/Makefile b/sd/qa/unit/Makefile
new file mode 100644
index 000000000000..6327da159097
--- /dev/null
+++ b/sd/qa/unit/Makefile
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+MYDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST))))
+
+all : services.rdb
+
+services.rdb : $(foreach newcomponentfile,\
+		framework/util/fwk \
+	, $(OUTDIR)/xml/component/$(newcomponentfile).component)
+
+services.rdb : $(foreach oldcomponentfile, \
+		i18npool \
+	, $(OUTDIR)/xml/$(oldcomponentfile).component)
+
+services.rdb :
+	echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@
+	$(gb_AWK) -- \
+		'/^<\?xml version.*/ { next; } \
+		{ gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
+		$^ >> $@
+	echo '</components>' >> $@
+
+.PHONY : all
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/qa/unit/makefile.mk b/sd/qa/unit/makefile.mk
deleted file mode 100644
index 958711f13813..000000000000
--- a/sd/qa/unit/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):  Michael Meeks <michael.meeks@novell.com>
-#                  Caolan McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-PRJ=..$/..
-PRJNAME=sd
-TARGET=qa_unit
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/uimpress.obj
-SHL1STDLIBS= \
-    $(BASICLIB)	\
-    $(SFXLIB)		\
-    $(SVTOOLLIB)	\
-    $(SVLLIB)		\
-    $(SVXCORELIB)		\
-    $(CANVASTOOLSLIB) \
-    $(EDITENGLIB)		\
-    $(SVXLIB)		\
-    $(BASEGFXLIB) \
-    $(DRAWINGLAYERLIB) \
-    $(I18NISOLANGLIB) \
-    $(VCLLIB)		\
-    $(CPPULIB)		\
-    $(CPPCANVASLIB)	\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)	\
-    $(UCBHELPERLIB)	\
-    $(SALLIB)		\
-    $(SALHELPERLIB)	\
-    $(TOOLSLIB)	\
-    $(TKLIB)	\
-    $(SOTLIB)	\
-    $(UNOTOOLSLIB) \
-    $(XMLOFFLIB)	\
-    $(AVMEDIALIB)	\
-    $(CPPUNITLIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1LIBS=$(SLB)$/sdraw3.lib $(SLB)$/sdraw3_2.lib $(SLB)$/sdraw3_3.lib
-DEF1NAME = $(SHL1TARGET)
-SHL1VERSIONMAP=version.map
-
-.INCLUDE: target.mk
-
-.IF "$(OS)" == "WNT"
-my_file = file:///
-.ELSE
-my_file = file://
-.END
-
-ALLTAR: test
-
-test_components = \
-    component/framework/util/fwk \
-    i18npool
-
-#Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.input : makefile.mk
-    $(MKDIRHIER) $(@:d)
-    echo \
-        '<list>$(test_components:^"<filename>":+".component</filename>")</list>' \
-        > $@
-
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/$(TARGET)/services.input
-    $(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@.tmp \
-        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/$(TARGET)/services.input
-    cat $(MISC)/$@.tmp | sed 's|/program/|/|g' > $@
-
-#Tweak things so that we use the .res files in the solver
-STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
-.EXPORT : STAR_RESOURCEPATH
-
-.IF "$(OS)" != "DRAGONFLY"
-
-test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
-    @echo ----------------------------------------------------------
-    @echo - start unit test \#1 on library $(SHL1TARGETN)
-    @echo ----------------------------------------------------------
-    $(CPPUNITTESTER) $(SHL1TARGETN) --headless --invisible \
-        '-env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb $(my_file)$(SOLARBINDIR)$/types.rdb' \
-        '-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'\
-        -env:URE_INTERNAL_LIB_DIR="$(my_file)$(SOLARSHAREDBIN)" \
-        -env:OOO_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)" \
-        -env:BRAND_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)"
-
-.ELSE
-
-test .PHONY: $(SHL1TARGETN)
-    @echo ----------------------------------------------------------
-    @echo - WARNING!!, test disabled on your platform
-    @echo - Please test manually, and enable if it works
-    @echo ----------------------------------------------------------
-
-.ENDIF
-
diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx
index 80f6f0f084b2..c34f72454c67 100644
--- a/sd/qa/unit/uimpress.cxx
+++ b/sd/qa/unit/uimpress.cxx
@@ -28,12 +28,8 @@
 
 #include "precompiled_sd.hxx"
 
-#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
 #include <sal/config.h>
+#include <sal/cppunit.h>
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
deleted file mode 100755
index a950aad5d7a5..000000000000
--- a/sd/sdi/makefile.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=sd
-TARGET=sdslots
-TARGET2=sdgslots
-SDI1EXPORT=sdraw
-SDI2EXPORT=sdraw
-SVSDIINC=$(PRJ)$/source$/ui$/inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.IF "$(L10N_framework)"==""
-
-# --- Files --------------------------------------------------------
-
-
-SDI1NAME=$(TARGET)
-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 \
-    docshell.sdi \
-    drtxtob.sdi \
-        drbezob.sdi \
-        drgrfob.sdi \
-    _drvwsh.sdi \
-    drviewsh.sdi \
-        mediaob.sdi \
-        tables.sdi\
-    outlnvsh.sdi \
-    SlideSorterController.sdi \
-    ViewShellBase.sdi \
-    ToolPanelViewShell.sdi \
-    sdslots.hrc \
-    $(PRJ)$/inc$/app.hrc
-
-SVSDI2DEPEND= \
-        $(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 \
-    drtxtob.sdi \
-        drbezob.sdi \
-        drgrfob.sdi \
-    _drvwsh.sdi \
-    grviewsh.sdi \
-        mediaob.sdi \
-    outlnvsh.sdi \
-    ViewShellBase.sdi \
-    ToolPanelViewShell.sdi \
-    sdslots.hrc \
-    $(PRJ)$/inc$/app.hrc
-
-# --- Targets -------------------------------------------------------
-.ENDIF
-.INCLUDE :  target.mk
diff --git a/sd/source/core/annotations/makefile.mk b/sd/source/core/annotations/makefile.mk
deleted file mode 100644
index 7f5258a5e474..000000000000
--- a/sd/source/core/annotations/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=annotations
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/Annotation.obj  \
-           $(SLO)$/AnnotationEnumeration.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/core/makefile.mk b/sd/source/core/makefile.mk
deleted file mode 100644
index 4100edf49434..000000000000
--- a/sd/source/core/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=core
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-IENV+=-I..\ui\inc
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = glob.src
-
-SLOFILES = $(SLO)$/stlsheet.obj  \
-           $(SLO)$/stlfamily.obj \
-           $(SLO)$/stlpool.obj	\
-           $(SLO)$/drawdoc.obj \
-           $(SLO)$/drawdoc2.obj \
-           $(SLO)$/drawdoc3.obj \
-           $(SLO)$/drawdoc4.obj \
-           $(SLO)$/drawdoc_animations.obj\
-           $(SLO)$/sdpage.obj \
-           $(SLO)$/sdpage2.obj	\
-           $(SLO)$/sdattr.obj \
-           $(SLO)$/sdobjfac.obj \
-           $(SLO)$/anminfo.obj	\
-           $(SLO)$/sdiocmpt.obj	\
-           $(SLO)$/typemap.obj	\
-           $(SLO)$/pglink.obj   \
-           $(SLO)$/cusshow.obj  \
-           $(SLO)$/PageListWatcher.obj  \
-           $(SLO)$/sdpage_animations.obj\
-           $(SLO)$/CustomAnimationPreset.obj\
-           $(SLO)$/CustomAnimationEffect.obj\
-           $(SLO)$/TransitionPreset.obj\
-           $(SLO)$/undoanim.obj\
-           $(SLO)$/EffectMigration.obj\
-           $(SLO)$/CustomAnimationCloner.obj\
-           $(SLO)$/shapelist.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/core/text/makefile.mk b/sd/source/core/text/makefile.mk
deleted file mode 100644
index 73b3e8a4ae44..000000000000
--- a/sd/source/core/text/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=text
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/textapi.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/core/undo/makefile.mk b/sd/source/core/undo/makefile.mk
deleted file mode 100644
index e9b3753b0b24..000000000000
--- a/sd/source/core/undo/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=undo
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/undomanager.obj  \
-           $(SLO)$/undofactory.obj	\
-           $(SLO)$/undoobjects.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/filter/cgm/makefile.mk b/sd/source/filter/cgm/makefile.mk
deleted file mode 100644
index 510a727c51d3..000000000000
--- a/sd/source/filter/cgm/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sd
-TARGET=cgm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(EXCEPTIONSFILES)
-
-EXCEPTIONSFILES = $(SLO)$/sdcgmfilter.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/sd/source/filter/eppt/makefile.mk b/sd/source/filter/eppt/makefile.mk
deleted file mode 100644
index 2a911038e07b..000000000000
--- a/sd/source/filter/eppt/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sd
-TARGET=eppt
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)"=="GCC"
-NOOPTFILES= $(SLO)$/epptso.obj
-.ENDIF
-
-SLOFILES =  $(SLO)$/eppt.obj			\
-            $(SLO)$/epptso.obj			\
-            $(SLO)$/escherex.obj		\
-            $(SLO)$/pptexanimations.obj		\
-            $(SLO)$/pptexsoundcollection.obj	\
-            $(SLO)$/pptx-epptbase.obj		\
-            $(SLO)$/pptx-epptooxml.obj		\
-            $(SLO)$/pptx-stylesheet.obj		\
-            $(SLO)$/pptx-grouptable.obj		\
-            $(SLO)$/pptx-text.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx
index bf7a90c431b6..12256d4ca742 100644
--- a/sd/source/filter/html/buttonset.hxx
+++ b/sd/source/filter/html/buttonset.hxx
@@ -29,6 +29,8 @@
 #ifndef _SD_HTMLEX_BUTTONSET_HXX
 #define _SD_HTMLEX_BUTTONSET_HXX
 
+#include <sddllapi.h>
+
 #include <rtl/ustring.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <vector>
@@ -36,7 +38,7 @@
 class Image;
 class ButtonSetImpl;
 
-class ButtonSet
+class SD_DLLPUBLIC ButtonSet
 {
 public:
     ButtonSet();
diff --git a/sd/source/filter/html/makefile.mk b/sd/source/filter/html/makefile.mk
deleted file mode 100644
index dc228764323c..000000000000
--- a/sd/source/filter/html/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sd
-TARGET=html
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE;
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-INCPRE += ..$/..$/ui$/inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	$(SLO)$/HtmlOptionsDialog.obj\
-            $(SLO)$/buttonset.obj \
-            $(SLO)$/sdhtmlfilter.obj	\
-            $(SLO)$/htmlex.obj			\
-            $(SLO)$/htmlattr.obj		\
-            $(SLO)$/pubdlg.obj			
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	pubdlg.src					
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES = \
-            $(SLO)$/HtmlOptionsDialog.obj\
-            $(SLO)$/sdhtmlfilter.obj	\
-            $(SLO)$/buttonset.obj \
-            $(SLO)$/htmlex.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET)_ui.lib
-LIB2OBJFILES = \
-            $(SLO)$/htmlattr.obj \
-            $(SLO)$/buttonset.obj \
-            $(SLO)$/pubdlg.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/sd/source/filter/makefile.mk b/sd/source/filter/makefile.mk
deleted file mode 100644
index 78d383e03c5d..000000000000
--- a/sd/source/filter/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=sd
-TARGET=filter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(dbg_anim_log)"!="" || "$(DBG_ANIM_LOG)"!=""
-CDEFS+= -DDBG_ANIM_LOG
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-        $(EXCEPTIONSFILES)
-
-EXCEPTIONSFILES= \
-        $(SLO)$/sdfilter.obj	\
-        $(SLO)$/sdpptwrp.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sd/source/filter/ppt/makefile.mk b/sd/source/filter/ppt/makefile.mk
deleted file mode 100644
index bb00675147f5..000000000000
--- a/sd/source/filter/ppt/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sd
-TARGET=ppt
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(dbg_anim_log)"!="" || "$(DBG_ANIM_LOG)"!=""
-CDEFS+= -DDBG_ANIM_LOG
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/propread.obj \
-        $(SLO)$/pptin.obj \
-        $(SLO)$/pptinanimations.obj \
-        $(SLO)$/pptatom.obj \
-        $(SLO)$/ppt97animations.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/sd/source/filter/xml/makefile.mk b/sd/source/filter/xml/makefile.mk
deleted file mode 100644
index 3abe1f6bd355..000000000000
--- a/sd/source/filter/xml/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sd
-TARGET=xml
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/sdtransform.obj \
-        $(SLO)$/sdxmlwrp.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/sd/source/helper/makefile.mk b/sd/source/helper/makefile.mk
deleted file mode 100644
index 7c87f3e675fe..000000000000
--- a/sd/source/helper/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=sd
-TARGET=helper
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-        $(SLO)$/simplereferencecomponent.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sd/source/ui/accessibility/makefile.mk b/sd/source/ui/accessibility/makefile.mk
deleted file mode 100755
index 25d79aa7f8da..000000000000
--- a/sd/source/ui/accessibility/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=accessibility
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/slidesorter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      									\
-    $(SLO)$/AccessibleDocumentViewBase.obj			\
-    $(SLO)$/AccessibleDrawDocumentView.obj			\
-    $(SLO)$/AccessibleOutlineView.obj				\
-    $(SLO)$/AccessiblePresentationShape.obj			\
-    $(SLO)$/AccessiblePresentationGraphicShape.obj	\
-    $(SLO)$/AccessiblePresentationOLEShape.obj		\
-    $(SLO)$/AccessibleViewForwarder.obj				\
-    $(SLO)$/AccessibleOutlineEditSource.obj			\
-    $(SLO)$/AccessiblePageShape.obj					\
-    $(SLO)$/AccessibleScrollPanel.obj				\
-    $(SLO)$/AccessibleSlideSorterView.obj			\
-    $(SLO)$/AccessibleSlideSorterObject.obj			\
-    $(SLO)$/AccessibleTreeNode.obj					\
-    $(SLO)$/SdShapeTypes.obj
-
-
-EXCEPTIONSFILES= 
-
-SRS2NAME = accessibility
-SRC2FILES = accessibility.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/animations/makefile.mk b/sd/source/ui/animations/makefile.mk
deleted file mode 100755
index db010bf4ef23..000000000000
--- a/sd/source/ui/animations/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=animui
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-    CustomAnimationPane.src\
-    CustomAnimationDialog.src\
-    CustomAnimationCreateDialog.src\
-    SlideTransitionPane.src\
-    CustomAnimation.src
-
-SLOFILES =  \
-        $(SLO)$/CustomAnimationCreateDialog.obj\
-        $(SLO)$/CustomAnimationDialog.obj\
-        $(SLO)$/CustomAnimationPane.obj \
-        $(SLO)$/CustomAnimationList.obj \
-        $(SLO)$/DialogListBox.obj \
-        $(SLO)$/SlideTransitionPane.obj \
-        $(SLO)$/STLPropertySet.obj \
-        $(SLO)$/motionpathtag.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/sd/source/ui/annotations/makefile.mk b/sd/source/ui/annotations/makefile.mk
deleted file mode 100644
index 40a5c9181f16..000000000000
--- a/sd/source/ui/annotations/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=uiannotations
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        annotations.src
-
-SLOFILES = \
-        $(SLO)$/annotationwindow.obj \
-        $(SLO)$/annotationtag.obj \
-        $(SLO)$/annotationmanager.obj
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
deleted file mode 100755
index 6a134c28b2ec..000000000000
--- a/sd/source/ui/app/makefile.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=app
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-NO_HID_FILES=app.src
-.EXPORT : NO_HID_FILES
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        app.src 			\
-        toolbox.src			\
-        strings.src 		\
-        res_bmp.src 		\
-        popup.src			\
-        sdstring.src
-
-SLOFILES =	\
-        $(EXCEPTIONSFILES)		\
-        $(SLO)$/sdresid.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/optsitem.obj		\
-        $(SLO)$/sddll.obj		\
-        $(SLO)$/sddll1.obj      	\
-        $(SLO)$/sddll2.obj      	\
-        $(SLO)$/sdmod.obj		\
-        $(SLO)$/sdmod1.obj		\
-        $(SLO)$/sdmod2.obj		\
-        $(SLO)$/sdpopup.obj		\
-        $(SLO)$/sdxfer.obj		\
-        $(SLO)$/tbxww.obj		\
-        $(SLO)$/tmplctrl.obj
-
-.IF "$(GUI)" == "WNT"
-
-NOOPTFILES=\
-    $(SLO)$/optsitem.obj
-
-.ENDIF
-
-# --- Tagets -------------------------------------------------------
-
-all: \
-    $(INCCOM)$/sddll0.hxx   \
-    ALLTAR
-
-$(INCCOM)$/sddll0.hxx: makefile.mk
-    @echo $@
-.IF "$(GUI)"=="UNX"
-    echo \#define DLL_NAME \"libsd$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE			# "$(GUI)"=="UNX"
-    echo \#define DLL_NAME \"sd$(DLLPOSTFIX).DLL\" >$@
-.ENDIF			# "$(GUI)"=="UNX"
-
-LOCALIZE_ME =  tbxids_tmpl.src menuids2_tmpl.src menu_tmpl.src menuids_tmpl.src menuids4_tmpl.src popup2_tmpl.src toolbox2_tmpl.src menuportal_tmpl.src menuids3_tmpl.src
-
-
-.INCLUDE :  target.mk
-
-$(SRS)$/app.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
-$(SRS)$/$(SRS1NAME).srs  : $(LOCALIZE_ME_DEST)
-
diff --git a/sd/source/ui/controller/makefile.mk b/sd/source/ui/controller/makefile.mk
deleted file mode 100755
index 51508660c58e..000000000000
--- a/sd/source/ui/controller/makefile.mk
+++ /dev/null
@@ -1,50 +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
-#
-# 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.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=controller
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-        $(SLO)$/slidelayoutcontroller.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index 2fadfdaa826d..9dc7f75a56a9 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -29,10 +29,6 @@
 // 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 8671ff3941da..5e0eac41d9c4 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -29,9 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#ifdef SD_DLLIMPLEMENTATION
-#undef SD_DLLIMPLEMENTATION
-#endif
 #include <svl/itemset.hxx>
 
 #include "strings.hrc"
diff --git a/sd/source/ui/dlg/makefile.mk b/sd/source/ui/dlg/makefile.mk
deleted file mode 100755
index 13492daa3726..000000000000
--- a/sd/source/ui/dlg/makefile.mk
+++ /dev/null
@@ -1,196 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=dlg
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-    masterlayoutdlg.src\
-    headerfooterdlg.src\
-    ins_paste.src\
-    inspagob.src\
-    present.src\
-    dlg_char.src\
-    paragr.src\
-    tabtempl.src\
-    dlgpage.src\
-    tpaction.src\
-    animobjs.src\
-    prltempl.src\
-    prntopts.src\
-    dlgsnap.src\
-    copydlg.src\
-    tpoption.src\
-    dlgass.src\
-    navigatr.src\
-    sdpreslt.src\
-    morphdlg.src\
-    dlgfield.src\
-    custsdlg.src\
-    brkdlg.src\
-    vectdlg.src\
-    dlgolbul.src \
-    LayerDialog.src			\
-    PaneDockingWindow.src \
-    layeroptionsdlg.src
-
-SLOFILES =  \
-        $(SLO)$/masterlayoutdlg.obj \
-        $(SLO)$/headerfooterdlg.obj \
-        $(SLO)$/inspagob.obj \
-        $(SLO)$/ins_paste.obj \
-        $(SLO)$/present.obj  \
-        $(SLO)$/dlgctrls.obj \
-        $(SLO)$/dlgchar.obj \
-        $(SLO)$/paragr.obj \
-        $(SLO)$/tabtempl.obj \
-        $(SLO)$/dlgpage.obj  \
-        $(SLO)$/diactrl.obj  \
-        $(SLO)$/gluectrl.obj  \
-        $(SLO)$/sdtreelb.obj \
-        $(SLO)$/animobjs.obj \
-        $(SLO)$/prltempl.obj \
-        $(SLO)$/prntopts.obj \
-        $(SLO)$/dlgsnap.obj  \
-        $(SLO)$/copydlg.obj  \
-        $(SLO)$/dlgolbul.obj \
-        $(SLO)$/tpaction.obj \
-        $(SLO)$/tpoption.obj \
-        $(SLO)$/filedlg.obj   \
-        $(SLO)$/unchss.obj  \
-        $(SLO)$/dlgassim.obj	\
-        $(SLO)$/dlgass.obj  \
-        $(SLO)$/assclass.obj \
-        $(SLO)$/navigatr.obj \
-        $(SLO)$/sdpreslt.obj \
-        $(SLO)$/morphdlg.obj	\
-        $(SLO)$/dlgfield.obj	\
-        $(SLO)$/custsdlg.obj	\
-        $(SLO)$/brkdlg.obj      \
-        $(SLO)$/vectdlg.obj		\
-        $(SLO)$/docprev.obj     \
-        $(SLO)$/SpellDialogChildWindow.obj \
-        $(SLO)$/AnimationChildWindow.obj	\
-        $(SLO)$/LayerDialogChildWindow.obj	\
-        $(SLO)$/LayerDialogContent.obj		\
-        $(SLO)$/LayerTabBar.obj				\
-        $(SLO)$/NavigatorChildWindow.obj	\
-        $(SLO)$/TemplateScanner.obj \
-        $(SLO)$/sduiexp.obj \
-        $(SLO)$/sddlgfact.obj \
-        $(SLO)$/sdabstdlg.obj \
-        $(SLO)$/PaneChildWindows.obj			\
-        $(SLO)$/PaneDockingWindow.obj			\
-        $(SLO)$/PaneShells.obj
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES= \
-        $(SLO)$/dlgctrls.obj \
-        $(SLO)$/diactrl.obj  \
-        $(SLO)$/gluectrl.obj  \
-        $(SLO)$/sdtreelb.obj \
-        $(SLO)$/animobjs.obj \
-        $(SLO)$/filedlg.obj   \
-        $(SLO)$/unchss.obj  \
-        $(SLO)$/assclass.obj \
-        $(SLO)$/navigatr.obj \
-        $(SLO)$/docprev.obj     \
-        $(SLO)$/ins_paste.obj \
-        $(SLO)$/AnimationChildWindow.obj	\
-        $(SLO)$/LayerDialogChildWindow.obj	\
-        $(SLO)$/LayerDialogContent.obj		\
-        $(SLO)$/LayerTabBar.obj				\
-        $(SLO)$/NavigatorChildWindow.obj	\
-        $(SLO)$/SpellDialogChildWindow.obj \
-        $(SLO)$/TemplateScanner.obj \
-        $(SLO)$/sdabstdlg.obj \
-        $(SLO)$/PaneChildWindows.obj		\
-        $(SLO)$/PaneDockingWindow.obj		\
-        $(SLO)$/PaneShells.obj			\
-        $(SLO)$/layeroptionsdlg.obj
-
-
-LIB2TARGET= $(SLB)$/sdui.lib
-
-LIB2OBJFILES= \
-        $(SLO)$/masterlayoutdlg.obj\
-        $(SLO)$/headerfooterdlg.obj\
-        $(SLO)$/sduiexp.obj \
-        $(SLO)$/sddlgfact.obj \
-        $(SLO)$/brkdlg.obj \
-        $(SLO)$/copydlg.obj \
-        $(SLO)$/custsdlg.obj \
-        $(SLO)$/dlgchar.obj \
-        $(SLO)$/dlgass.obj \
-        $(SLO)$/dlgassim.obj \
-        $(SLO)$/dlgfield.obj \
-        $(SLO)$/dlgpage.obj \
-        $(SLO)$/dlgsnap.obj \
-        $(SLO)$/ins_paste.obj \
-        $(SLO)$/inspagob.obj \
-        $(SLO)$/morphdlg.obj \
-        $(SLO)$/dlgolbul.obj \
-        $(SLO)$/paragr.obj \
-        $(SLO)$/present.obj \
-        $(SLO)$/prltempl.obj \
-        $(SLO)$/sdpreslt.obj \
-        $(SLO)$/tabtempl.obj \
-        $(SLO)$/tpaction.obj \
-        $(SLO)$/tpoption.obj \
-        $(SLO)$/vectdlg.obj \
-        $(SLO)$/prntopts.obj \
-        $(SLO)$/layeroptionsdlg.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(INCCOM)$/sduilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    echo \#define DLL_NAME \"libsdui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    echo $(EMQ)#define DLL_NAME $(EMQ)"sdui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SLO)$/sdabstdlg.obj : $(INCCOM)$/sduilib.hxx
-
diff --git a/sd/source/ui/docshell/makefile.mk b/sd/source/ui/docshell/makefile.mk
deleted file mode 100644
index 5b4ed1995b22..000000000000
--- a/sd/source/ui/docshell/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=docshell
-ENABLE_EXCEPTIONS=TRUE
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/docshell.obj \
-        $(SLO)$/docshel2.obj \
-        $(SLO)$/docshel3.obj \
-        $(SLO)$/docshel4.obj \
-        $(SLO)$/sdclient.obj \
-        $(SLO)$/grdocsh.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/framework/configuration/makefile.mk b/sd/source/ui/framework/configuration/makefile.mk
deleted file mode 100644
index cdc41491b307..000000000000
--- a/sd/source/ui/framework/configuration/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=framework_configuration
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      										\
-    $(SLO)$/ChangeRequestQueue.obj						\
-    $(SLO)$/ChangeRequestQueueProcessor.obj				\
-    $(SLO)$/Configuration.obj							\
-    $(SLO)$/ConfigurationClassifier.obj					\
-    $(SLO)$/ConfigurationController.obj					\
-    $(SLO)$/ConfigurationControllerBroadcaster.obj		\
-    $(SLO)$/ConfigurationControllerResourceManager.obj	\
-    $(SLO)$/ConfigurationTracer.obj						\
-    $(SLO)$/ConfigurationUpdater.obj					\
-    $(SLO)$/GenericConfigurationChangeRequest.obj		\
-    $(SLO)$/ResourceId.obj								\
-    $(SLO)$/ResourceFactoryManager.obj					\
-    $(SLO)$/UpdateRequest.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/framework/factories/makefile.mk b/sd/source/ui/framework/factories/makefile.mk
deleted file mode 100644
index 23e780ba1eca..000000000000
--- a/sd/source/ui/framework/factories/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=framework_factories
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/BasicPaneFactory.obj			\
-    $(SLO)$/BasicToolBarFactory.obj			\
-    $(SLO)$/BasicViewFactory.obj			\
-    $(SLO)$/ChildWindowPane.obj				\
-    $(SLO)$/FrameWindowPane.obj				\
-    $(SLO)$/FullScreenPane.obj				\
-    $(SLO)$/Pane.obj						\
-    $(SLO)$/PresentationFactory.obj			\
-    $(SLO)$/TaskPanelFactory.obj			\
-    $(SLO)$/ViewShellWrapper.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/framework/module/makefile.mk b/sd/source/ui/framework/module/makefile.mk
deleted file mode 100755
index bec9b1a04075..000000000000
--- a/sd/source/ui/framework/module/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=framework_module
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/CenterViewFocusModule.obj		\
-    $(SLO)$/DrawModule.obj					\
-    $(SLO)$/ImpressModule.obj				\
-    $(SLO)$/ModuleController.obj			\
-    $(SLO)$/PresentationModule.obj			\
-    $(SLO)$/ReadOnlyModeObserver.obj		\
-    $(SLO)$/ResourceManager.obj				\
-    $(SLO)$/ShellStackGuard.obj				\
-    $(SLO)$/SlideSorterModule.obj			\
-    $(SLO)$/ToolPanelModule.obj             \
-    $(SLO)$/ToolBarModule.obj				\
-    $(SLO)$/ViewTabBarModule.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/framework/tools/makefile.mk b/sd/source/ui/framework/tools/makefile.mk
deleted file mode 100644
index b09d0fa19b25..000000000000
--- a/sd/source/ui/framework/tools/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=framework_tools
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      					\
-    $(SLO)$/FrameworkHelper.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index de4c7968fbe3..13c0e38fd473 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -29,10 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
-#ifdef SD_DLLIMPLEMENTATION
-#undef SD_DLLIMPLEMENTATION
-#endif
-
 #include <svx/svxids.hrc>
 
 //-> Fonts & Items
diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk
deleted file mode 100755
index e4df8fe9d65a..000000000000
--- a/sd/source/ui/func/makefile.mk
+++ /dev/null
@@ -1,185 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util\sd
-PRJNAME=sd
-TARGET=func
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-        $(SLO)$/fuformatpaintbrush.obj	\
-        $(SLO)$/fuhhconv.obj	\
-        $(SLO)$/undoheaderfooter.obj    \
-        $(SLO)$/undolayer.obj	\
-        $(SLO)$/fupoor.obj		\
-        $(SLO)$/fudraw.obj		\
-        $(SLO)$/fuzoom.obj		\
-        $(SLO)$/fusel.obj		\
-        $(SLO)$/fuconstr.obj 	\
-        $(SLO)$/fuconrec.obj 	\
-        $(SLO)$/fuconuno.obj 	\
-        $(SLO)$/fuconbez.obj 	\
-        $(SLO)$/fuediglu.obj 	\
-        $(SLO)$/fusldlg.obj 	\
-        $(SLO)$/fuscale.obj		\
-        $(SLO)$/futransf.obj 	\
-        $(SLO)$/futext.obj		\
-        $(SLO)$/fuline.obj		\
-        $(SLO)$/sdundo.obj		\
-        $(SLO)$/sdundogr.obj 	\
-        $(SLO)$/fuoaprms.obj 	\
-        $(SLO)$/unoaprms.obj 	\
-        $(SLO)$/fuarea.obj		\
-        $(SLO)$/fuchar.obj		\
-        $(SLO)$/fuconarc.obj 	\
-        $(SLO)$/fuparagr.obj 	\
-        $(SLO)$/fubullet.obj 	\
-        $(SLO)$/futempl.obj		\
-        $(SLO)$/fuoutl.obj		\
-        $(SLO)$/fuoltext.obj 	\
-        $(SLO)$/fuinsert.obj 	\
-        $(SLO)$/fupage.obj		\
-        $(SLO)$/undopage.obj 	\
-        $(SLO)$/fuprlout.obj 	\
-        $(SLO)$/fuprobjs.obj 	\
-        $(SLO)$/fulinend.obj 	\
-        $(SLO)$/fusnapln.obj 	\
-        $(SLO)$/fuolbull.obj 	\
-        $(SLO)$/fucopy.obj		\
-        $(SLO)$/fulink.obj		\
-        $(SLO)$/futhes.obj		\
-        $(SLO)$/fusearch.obj 	\
-        $(SLO)$/fuinsfil.obj 	\
-        $(SLO)$/futxtatt.obj 	\
-        $(SLO)$/fumeasur.obj 	\
-        $(SLO)$/fuconnct.obj 	\
-        $(SLO)$/unprlout.obj 	\
-        $(SLO)$/fudspord.obj 	\
-        $(SLO)$/unmovss.obj		\
-        $(SLO)$/fucon3d.obj		\
-        $(SLO)$/fumorph.obj		\
-        $(SLO)$/fuexpand.obj    \
-        $(SLO)$/fusumry.obj     \
-        $(SLO)$/fucushow.obj	\
-        $(SLO)$/fuvect.obj		\
-        $(SLO)$/bulmaper.obj    \
-        $(SLO)$/undoback.obj    \
-        $(SLO)$/fuconcs.obj		\
-        $(SLO)$/smarttag.obj
-
-.IF "$(GUI)" == "WNT"
-
-NOOPTFILES=\
-    $(SLO)$/futext.obj
-
-.ENDIF # wnt
-
-LIB1TARGET=	$(SLB)$/$(TARGET).lib
-LIB1OBJFILES= \
-        $(SLO)$/fuformatpaintbrush.obj	\
-        $(SLO)$/fuhhconv.obj	\
-        $(SLO)$/undoheaderfooter.obj    \
-        $(SLO)$/undolayer.obj	\
-        $(SLO)$/fupoor.obj		\
-        $(SLO)$/fudraw.obj		\
-        $(SLO)$/fuzoom.obj		\
-        $(SLO)$/fusel.obj		\
-        $(SLO)$/fuconstr.obj 	\
-        $(SLO)$/fuconrec.obj 	\
-        $(SLO)$/fuconuno.obj 	\
-        $(SLO)$/fuconbez.obj 	\
-        $(SLO)$/fuediglu.obj 	\
-        $(SLO)$/fusldlg.obj 	\
-        $(SLO)$/fuscale.obj		\
-        $(SLO)$/futransf.obj 	\
-        $(SLO)$/futext.obj		\
-        $(SLO)$/fuline.obj		\
-        $(SLO)$/sdundo.obj		\
-        $(SLO)$/sdundogr.obj 	\
-        $(SLO)$/fuoaprms.obj 	\
-        $(SLO)$/unoaprms.obj 	\
-        $(SLO)$/fuarea.obj		\
-        $(SLO)$/fuchar.obj		\
-        $(SLO)$/fuconarc.obj 	\
-        $(SLO)$/fuparagr.obj 	\
-        $(SLO)$/fubullet.obj 	\
-        $(SLO)$/futempl.obj		\
-        $(SLO)$/fuoutl.obj		\
-        $(SLO)$/fuoltext.obj	\
-        $(SLO)$/smarttag.obj
-            
-LIB3TARGET=	$(SLB)$/$(TARGET)_2.lib
-LIB3OBJFILES= \
-        $(SLO)$/fuinsert.obj 	\
-        $(SLO)$/fupage.obj		\
-        $(SLO)$/undopage.obj 	\
-        $(SLO)$/fuprlout.obj 	\
-        $(SLO)$/fuprobjs.obj 	\
-        $(SLO)$/fulinend.obj 	\
-        $(SLO)$/fusnapln.obj 	\
-        $(SLO)$/fuolbull.obj 	\
-        $(SLO)$/fucopy.obj		\
-        $(SLO)$/fulink.obj		\
-        $(SLO)$/futhes.obj		\
-        $(SLO)$/fusearch.obj 	\
-        $(SLO)$/fuinsfil.obj 	\
-        $(SLO)$/futxtatt.obj 	\
-        $(SLO)$/fumeasur.obj 	\
-        $(SLO)$/fuconnct.obj 	\
-        $(SLO)$/unprlout.obj 	\
-        $(SLO)$/fudspord.obj 	\
-        $(SLO)$/unmovss.obj		\
-        $(SLO)$/fucon3d.obj		\
-        $(SLO)$/fumorph.obj		\
-        $(SLO)$/fuexpand.obj    \
-        $(SLO)$/fusumry.obj     \
-        $(SLO)$/fucushow.obj	\
-        $(SLO)$/fuvect.obj		\
-        $(SLO)$/bulmaper.obj    \
-        $(SLO)$/undoback.obj    \
-        $(SLO)$/fuconcs.obj
-
-LIB2TARGET=	$(SLB)$/$(TARGET)_ui.lib
-LIB2OBJFILES= \
-        $(SLO)$/bulmaper.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sd/source/ui/inc/bulmaper.hxx b/sd/source/ui/inc/bulmaper.hxx
index 53f466b354c6..6b9eb3b50ef0 100644
--- a/sd/source/ui/inc/bulmaper.hxx
+++ b/sd/source/ui/inc/bulmaper.hxx
@@ -29,14 +29,14 @@
 #ifndef INCLUDED_SD_BULMAPER_HXX
 #define INCLUDED_SD_BULMAPER_HXX
 
-#include "tools/solar.h"
+#include <sddllapi.h>
 
 class SfxItemSet;
 class SvxBulletItem;
 class SvxNumberFormat;
 class SvxNumRule;
 
-class SdBulletMapper
+class SD_DLLPUBLIC SdBulletMapper
 {
 public:
 /* #i35937#
diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx
index 173e57bbe9b8..4e763dc7558a 100644
--- a/sd/source/ui/inc/ins_paste.hxx
+++ b/sd/source/ui/inc/ins_paste.hxx
@@ -29,6 +29,8 @@
 #ifndef _SD_INS_PASTE_HXX_
 #define _SD_INS_PASTE_HXX_
 
+#include <sddllapi.h>
+
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/dialog.hxx>
@@ -38,7 +40,7 @@
 // - SdInsertPasteDlg -
 // --------------------
 
-class SdInsertPasteDlg : public ModalDialog
+class SD_DLLPUBLIC SdInsertPasteDlg : public ModalDialog
 {
 private:
 
diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx
index 311a9f59d531..5bfd0bcc26f8 100644
--- a/sd/source/ui/inc/layeroptionsdlg.hxx
+++ b/sd/source/ui/inc/layeroptionsdlg.hxx
@@ -30,6 +30,8 @@
 #ifndef _SD_LAYER_DLG_HXX_
 #define _SD_LAYER_DLG_HXX_
 
+#include <sddllapi.h>
+
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/dialog.hxx>
@@ -40,7 +42,7 @@
 
 class SfxItemSet;
 
-class SdInsertLayerDlg : public ModalDialog
+class SD_DLLPUBLIC SdInsertLayerDlg : public ModalDialog
 {
 private:
     FixedText           maFtName;
diff --git a/sd/source/ui/notes/makefile.mk b/sd/source/ui/notes/makefile.mk
deleted file mode 100755
index a4b0e457cdc3..000000000000
--- a/sd/source/ui/notes/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=notes
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      					\
-    $(SLO)$/EditWindow.obj			\
-    $(SLO)$/NotesChildWindow.obj	\
-    $(SLO)$/NotesDockingWindow.obj	\
-    $(SLO)$/TextLogger.obj
-
-
-
-EXCEPTIONSFILES=
-
-SRS2NAME = notes
-SRC2FILES = NotesChildWindow.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/presenter/makefile.mk b/sd/source/ui/presenter/makefile.mk
deleted file mode 100644
index fe6232098bd2..000000000000
--- a/sd/source/ui/presenter/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=presenter
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=.. ..$/slidesorter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/CanvasUpdateRequester.obj		\
-    $(SLO)$/PresenterCanvas.obj				\
-    $(SLO)$/PresenterHelper.obj				\
-    $(SLO)$/PresenterPreviewCache.obj		\
-    $(SLO)$/PresenterTextView.obj			\
-    $(SLO)$/SlideRenderer.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slideshow/makefile.mk b/sd/source/ui/slideshow/makefile.mk
deleted file mode 100755
index 62062d7e5461..000000000000
--- a/sd/source/ui/slideshow/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slideshow
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_PRESENTER_EXTRA_UI)"=="YES"
-ENABLE_PRESENTER_EXTRA_UI is not used anymore
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =							\
-    $(SLO)$/slideshow.obj			\
-    $(SLO)$/showwin.obj				\
-    $(SLO)$/slideshowimpl.obj		\
-    $(SLO)$/slideshowviewimpl.obj	\
-    $(SLO)$/PaneHider.obj			\
-    $(SLO)$/SlideShowRestarter.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        slideshow.src
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk
deleted file mode 100755
index 58862a28645a..000000000000
--- a/sd/source/ui/slidesorter/cache/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slscache
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/SlsBitmapCache.obj				\
-    $(SLO)$/SlsBitmapCompressor.obj			\
-    $(SLO)$/SlsBitmapFactory.obj			\
-    $(SLO)$/SlsCacheCompactor.obj			\
-    $(SLO)$/SlsCacheConfiguration.obj		\
-    $(SLO)$/SlsGenericPageCache.obj			\
-    $(SLO)$/SlsPageCache.obj				\
-    $(SLO)$/SlsPageCacheManager.obj			\
-    $(SLO)$/SlsQueueProcessor.obj			\
-    $(SLO)$/SlsRequestFactory.obj			\
-    $(SLO)$/SlsRequestQueue.obj				
-
-
-EXCEPTIONSFILES= 
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slidesorter/controller/makefile.mk b/sd/source/ui/slidesorter/controller/makefile.mk
deleted file mode 100755
index 460ef16ed3f1..000000000000
--- a/sd/source/ui/slidesorter/controller/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slscontroller
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/SlideSorterController.obj		\
-    $(SLO)$/SlsAnimator.obj	    			\
-    $(SLO)$/SlsAnimationFunction.obj	    \
-    $(SLO)$/SlsClipboard.obj	    		\
-    $(SLO)$/SlsCurrentSlideManager.obj	    \
-    $(SLO)$/SlsDragAndDropContext.obj		\
-    $(SLO)$/SlsFocusManager.obj				\
-    $(SLO)$/SlsInsertionIndicatorHandler.obj\
-    $(SLO)$/SlsListener.obj					\
-    $(SLO)$/SlsPageSelector.obj				\
-    $(SLO)$/SlsProperties.obj				\
-    $(SLO)$/SlsScrollBarManager.obj			\
-    $(SLO)$/SlsSelectionCommand.obj	    	\
-    $(SLO)$/SlsSelectionFunction.obj		\
-    $(SLO)$/SlsSelectionManager.obj	    	\
-    $(SLO)$/SlsSelectionObserver.obj	   	\
-    $(SLO)$/SlsSlotManager.obj				\
-    $(SLO)$/SlsTransferable.obj				\
-    $(SLO)$/SlsVisibleAreaManager.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slidesorter/makefile.mk b/sd/source/ui/slidesorter/makefile.mk
deleted file mode 100644
index c294bf05ffa0..000000000000
--- a/sd/source/ui/slidesorter/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slidesorter
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/SlideSorter.obj					\
-    $(SLO)$/SlideSorterChildWindow.obj		\
-    $(SLO)$/SlideSorterViewShell.obj
-
-EXCEPTIONSFILES= 
-
-SRS2NAME = slidesorter
-SRC2FILES = SlsChildWindow.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slidesorter/model/makefile.mk b/sd/source/ui/slidesorter/model/makefile.mk
deleted file mode 100755
index 0347d05a8100..000000000000
--- a/sd/source/ui/slidesorter/model/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slsmodel
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/SlsPageDescriptor.obj			\
-    $(SLO)$/SlsPageEnumeration.obj			\
-    $(SLO)$/SlsPageEnumerationProvider.obj	\
-    $(SLO)$/SlsVisualState.obj				\
-    $(SLO)$/SlideSorterModel.obj
-
-EXCEPTIONSFILES= 
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slidesorter/shell/makefile.mk b/sd/source/ui/slidesorter/shell/makefile.mk
deleted file mode 100755
index 94209c34dc2b..000000000000
--- a/sd/source/ui/slidesorter/shell/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slsshell
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      						\
-    $(SLO)$/SlideSorter.obj				\
-    $(SLO)$/SlideSorterService.obj		\
-    $(SLO)$/SlideSorterViewShell.obj
-
-EXCEPTIONSFILES= 
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/slidesorter/view/makefile.mk b/sd/source/ui/slidesorter/view/makefile.mk
deleted file mode 100755
index 3c5fc39c3ede..000000000000
--- a/sd/source/ui/slidesorter/view/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=slsview
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..
-
-IMGLST_SRS=$(SRS)$/$(TARGET).srs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-    SlsResource.src
-
-SLOFILES =      							\
-    $(SLO)$/SlideSorterView.obj				\
-    $(SLO)$/SlsButtonBar.obj				\
-    $(SLO)$/SlsFontProvider.obj				\
-    $(SLO)$/SlsFramePainter.obj				\
-    $(SLO)$/SlsInsertAnimator.obj			\
-    $(SLO)$/SlsInsertionIndicatorOverlay.obj\
-    $(SLO)$/SlsLayeredDevice.obj			\
-    $(SLO)$/SlsLayouter.obj					\
-    $(SLO)$/SlsPageObjectLayouter.obj		\
-    $(SLO)$/SlsPageObjectPainter.obj		\
-    $(SLO)$/SlsTheme.obj					\
-    $(SLO)$/SlsToolTip.obj					\
-    $(SLO)$/SlsViewCacheContext.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/table/makefile.mk b/sd/source/ui/table/makefile.mk
deleted file mode 100644
index f35602349230..000000000000
--- a/sd/source/ui/table/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=uitable
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-    TableDesignPane.src\
-
-SLOFILES = \
-        $(SLO)$/tablefunction.obj\
-        $(SLO)$/tableobjectbar.obj\
-        $(SLO)$/TableDesignPane.obj
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sd/source/ui/toolpanel/controls/makefile.mk b/sd/source/ui/toolpanel/controls/makefile.mk
deleted file mode 100755
index b2218e55008c..000000000000
--- a/sd/source/ui/toolpanel/controls/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=tpcontrols
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/..$/ ..$/..$/slidesorter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/AllMasterPagesSelector.obj		\
-    $(SLO)$/CurrentMasterPagesSelector.obj	\
-    $(SLO)$/DocumentHelper.obj				\
-    $(SLO)$/MasterPageObserver.obj			\
-    $(SLO)$/MasterPagesPanel.obj			\
-    $(SLO)$/MasterPagesSelector.obj			\
-    $(SLO)$/MasterPageContainer.obj			\
-    $(SLO)$/MasterPageContainerFiller.obj	\
-    $(SLO)$/MasterPageContainerProviders.obj\
-    $(SLO)$/MasterPageContainerQueue.obj	\
-    $(SLO)$/MasterPageDescriptor.obj		\
-    $(SLO)$/PreviewValueSet.obj				\
-    $(SLO)$/RecentlyUsedMasterPages.obj		\
-    $(SLO)$/RecentMasterPagesSelector.obj	\
-    $(SLO)$/CustomAnimationPanel.obj		\
-    $(SLO)$/SlideTransitionPanel.obj		\
-    $(SLO)$/TableDesignPanel.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/toolpanel/makefile.mk b/sd/source/ui/toolpanel/makefile.mk
deleted file mode 100755
index 262b32535ef3..000000000000
--- a/sd/source/ui/toolpanel/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=toolpanel
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-PRJINC=..$/slidesorter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      								\
-    $(SLO)$/ControlContainer.obj				\
-    $(SLO)$/ScrollPanel.obj						\
-    $(SLO)$/SubToolPanel.obj					\
-    $(SLO)$/TitleBar.obj 						\
-    $(SLO)$/TitledControl.obj 					\
-    $(SLO)$/TaskPaneControlFactory.obj 			\
-    $(SLO)$/TaskPaneFocusManager.obj 			\
-    $(SLO)$/TaskPaneShellManager.obj 			\
-    $(SLO)$/TaskPaneTreeNode.obj 			    \
-    $(SLO)$/ToolPanel.obj                       \
-    $(SLO)$/ToolPanelViewShell.obj              \
-    $(SLO)$/ToolPanelFactory.obj                \
-    $(SLO)$/ToolPanelUIElement.obj              \
-                                                \
-    $(SLO)$/LayoutMenu.obj                      \
-    $(SLO)$/TestMenu.obj                        \
-    $(SLO)$/TestPanel.obj						\
-    $(SLO)$/SlideSorterCacheDisplay.obj
-
-EXCEPTIONSFILES=
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/tools/makefile.mk b/sd/source/ui/tools/makefile.mk
deleted file mode 100644
index 67ea9e718b91..000000000000
--- a/sd/source/ui/tools/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=uitools
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =      							\
-    $(SLO)$/AsynchronousCall.obj			\
-    $(SLO)$/ConfigurationAccess.obj			\
-    $(SLO)$/IconCache.obj					\
-    $(SLO)$/IdleDetection.obj				\
-    $(SLO)$/EventMultiplexer.obj			\
-    $(SLO)$/PreviewRenderer.obj				\
-    $(SLO)$/PropertySet.obj					\
-    $(SLO)$/SdGlobalResourceContainer.obj	\
-    $(SLO)$/SlotStateListener.obj			\
-    $(SLO)$/TimerBasedTaskExecution.obj
-
-EXCEPTIONSFILES=
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/unoidl/makefile.mk b/sd/source/ui/unoidl/makefile.mk
deleted file mode 100755
index cf4910b29186..000000000000
--- a/sd/source/ui/unoidl/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=unoidl
-ENABLE_EXCEPTIONS=TRUE
-AUTOSEG=true
-LIBTARGET = NO
-PRJINC=..$/slidesorter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COM)"=="GCC"
-NOOPTFILES= $(SLO)$/unowcntr.obj
-.ENDIF
-
-SLO1FILES =      \
-        $(SLO)$/DrawController.obj \
-        $(SLO)$/SdUnoSlideView.obj\
-        $(SLO)$/SdUnoOutlineView.obj\
-        $(SLO)$/SdUnoDrawView.obj \
-        $(SLO)$/unopool.obj \
-        $(SLO)$/UnoDocumentSettings.obj \
-        $(SLO)$/facreg.obj \
-        $(SLO)$/unomodel.obj    \
-        $(SLO)$/unopage.obj     \
-        $(SLO)$/unolayer.obj    \
-        $(SLO)$/unocpres.obj    \
-        $(SLO)$/unoobj.obj		\
-        $(SLO)$/unosrch.obj		\
-        $(SLO)$/unowcntr.obj	\
-        $(SLO)$/unokywds.obj	\
-        $(SLO)$/unopback.obj	\
-        $(SLO)$/unodoc.obj      \
-        $(SLO)$/unomodule.obj	\
-        $(SLO)$/randomnode.obj
-
-SLO2FILES = \
-    $(SLO)$/sddetect.obj		\
-    $(SLO)$/detreg.obj
-
-SLOFILES = \
-    $(SLO1FILES) \
-    $(SLO2FILES)
-
-LIB1TARGET = \
-    $(SLB)$/$(TARGET).lib
-
-LIB1OBJFILES = \
-    $(SLO1FILES)
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk
deleted file mode 100644
index def8f795c634..000000000000
--- a/sd/source/ui/view/makefile.mk
+++ /dev/null
@@ -1,122 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..
-
-PROJECTPCH=sd
-PROJECTPCHSOURCE=$(PRJ)$/util$/sd
-PRJNAME=sd
-TARGET=view
-
-AUTOSEG=true
-PRJINC=..$/slidesorter
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        DocumentRenderer.src
-
-SLOFILES =	\
-        $(SLO)$/sdview.obj	\
-        $(SLO)$/sdview2.obj	\
-        $(SLO)$/sdview3.obj	\
-        $(SLO)$/sdview4.obj	\
-        $(SLO)$/sdview5.obj	\
-        $(SLO)$/viewshel.obj \
-        $(SLO)$/viewshe2.obj \
-        $(SLO)$/viewshe3.obj \
-        $(SLO)$/sdwindow.obj \
-        $(SLO)$/drviewsh.obj \
-        $(SLO)$/drviews1.obj \
-        $(SLO)$/drviews2.obj \
-        $(SLO)$/drviews3.obj \
-        $(SLO)$/drviews4.obj \
-        $(SLO)$/drviews5.obj \
-        $(SLO)$/drviews6.obj \
-        $(SLO)$/drviews7.obj \
-        $(SLO)$/drviews8.obj \
-        $(SLO)$/drviews9.obj \
-        $(SLO)$/drviewsa.obj \
-        $(SLO)$/drviewsb.obj \
-        $(SLO)$/drviewsc.obj \
-        $(SLO)$/drviewsd.obj \
-        $(SLO)$/drviewse.obj \
-        $(SLO)$/drviewsf.obj \
-        $(SLO)$/drviewsg.obj \
-        $(SLO)$/drviewsi.obj \
-        $(SLO)$/drviewsj.obj \
-        $(SLO)$/drvwshrg.obj \
-        $(SLO)$/drawview.obj \
-        $(SLO)$/grviewsh.obj \
-        $(SLO)$/outlnvsh.obj \
-        $(SLO)$/outlnvs2.obj \
-        $(SLO)$/presvish.obj \
-        $(SLO)$/outlview.obj \
-        $(SLO)$/tabcontr.obj \
-        $(SLO)$/drbezob.obj	\
-        $(SLO)$/drtxtob.obj	\
-        $(SLO)$/drtxtob1.obj	\
-        $(SLO)$/sdruler.obj	\
-        $(SLO)$/frmview.obj	\
-        $(SLO)$/clview.obj  \
-        $(SLO)$/zoomlist.obj	\
-        $(SLO)$/unmodpg.obj	\
-        $(SLO)$/DocumentRenderer.obj			\
-        $(SLO)$/FormShellManager.obj			\
-        $(SLO)$/GraphicObjectBar.obj			\
-        $(SLO)$/GraphicViewShellBase.obj		\
-        $(SLO)$/ImpressViewShellBase.obj		\
-        $(SLO)$/MediaObjectBar.obj				\
-        $(SLO)$/Outliner.obj					\
-        $(SLO)$/OutlinerIterator.obj			\
-        $(SLO)$/OutlineViewShellBase.obj		\
-        $(SLO)$/SlideSorterViewShellBase.obj	\
-        $(SLO)$/PresentationViewShellBase.obj	\
-        $(SLO)$/ToolBarManager.obj				\
-        $(SLO)$/UpdateLockManager.obj			\
-        $(SLO)$/ViewClipboard.obj				\
-        $(SLO)$/ViewShellBase.obj				\
-        $(SLO)$/ViewShellImplementation.obj		\
-        $(SLO)$/ViewShellManager.obj			\
-        $(SLO)$/ViewShellHint.obj				\
-        $(SLO)$/ViewTabBar.obj					\
-        $(SLO)$/WindowUpdater.obj				\
-        $(SLO)$/viewoverlaymanager.obj
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sd/source/unotypes/makefile.mk b/sd/source/unotypes/makefile.mk
deleted file mode 100644
index 5f7d45daade6..000000000000
--- a/sd/source/unotypes/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=sd
-TARGET=unotypesanim
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-PRIVATERDB = slideshow.rdb
-UNOUCRRDB = $(SOLARBINDIR)$/$(PRIVATERDB)
-UNOUCRDEP = $(UNOUCRRDB)
-UNOUCROUT = $(OUT)$/inc
-
-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
deleted file mode 100755
index 8eda79e40484..000000000000
--- a/sd/util/makefile.mk
+++ /dev/null
@@ -1,301 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=sd
-TARGET=sdraw3
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Resources ----------------------------------------------------
-
-RESLIB1NAME=sd
-RESLIB1IMAGES=$(PRJ)$/res/imagelst $(PRJ)$/res
-RESLIB1SRSFILES=\
-    $(SRS)$/app.srs				\
-    $(SRS)$/dlg.srs				\
-    $(SRS)$/core.srs			\
-    $(SRS)$/html.srs			\
-    $(SRS)$/accessibility.srs	\
-    $(SRS)$/notes.srs			\
-    $(SRS)$/animui.srs			\
-    $(SRS)$/slideshow.srs		\
-    $(SRS)$/slsview.srs			\
-    $(SRS)$/uitable.srs			\
-    $(SRS)$/view.srs			\
-    $(SRS)$/uiannotations.srs	\
-
-
-# --- StarDraw DLL
-
-SHL1TARGET= sd$(DLLPOSTFIX)
-SHL1USE_EXPORTS=name
-SHL1IMPLIB= sdi
-
-# dynamic libraries
-SHL1STDLIBS+= \
-    $(EDITENGLIB) \
-    $(SVXCORELIB) \
-    $(SVXLIB) \
-    $(SFXLIB) \
-    $(BASICLIB) \
-    $(CPPCANVASLIB) \
-    $(BASEGFXLIB) \
-    $(DRAWINGLAYERLIB) \
-    $(BASEGFXLIB) \
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(SVLLIB) \
-    $(SOTLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(I18NISOLANGLIB) \
-    $(OOXLIB) \
-    $(SAXLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(CANVASTOOLSLIB) \
-    $(SALLIB) \
-    $(SALHELPERLIB) \
-    $(AVMEDIALIB)
-
-SHL1LIBS= $(LIB3TARGET) $(LIB5TARGET) $(LIB6TARGET)
-SHL1DEPN+=	makefile.mk
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-DEF1DEPN        =$(MISC)$/$(SHL1TARGET).flt
-DEF1NAME	=$(SHL1TARGET)
-DEFLIB1NAME = $(TARGET) $(LIB5TARGET:b) $(LIB6TARGET:b)
-
-.IF "$(GUI)" == "WNT"
-SHL1RES=    $(RCTARGET)
-.ENDIF
-
-# --- Linken der Applikation ---------------------------------------
-
-LIB2TARGET=$(SLB)$/sdmod.lib
-LIB2OBJFILES=   \
-            $(SLO)$/sdmod1.obj      \
-            $(SLO)$/sdmod2.obj      \
-            $(SLO)$/sdmod.obj
-
-LIB3TARGET=$(SLB)$/sdraw3.lib
-LIB3FILES=      \
-            $(SLB)$/view.lib        \
-            $(SLB)$/app.lib			\
-            $(SLB)$/docshell.lib    \
-            $(SLB)$/dlg.lib			\
-            $(SLB)$/core.lib		\
-            $(SLB)$/undo.lib		\
-            $(SLB)$/annotations.lib	\
-            $(SLB)$/text.lib		\
-            $(SLB)$/helper.lib		\
-            $(SLB)$/xml.lib			\
-            $(SLB)$/cgm.lib			\
-            $(SLB)$/uitable.lib		\
-            $(SLB)$/uiannotations.lib\
-            $(SLB)$/grf.lib \
-            $(SLB)$/controller.lib
-
-LIB5TARGET=$(SLB)$/sdraw3_2.lib
-LIB5FILES=      \
-            $(SLB)$/html.lib		\
-            $(SLB)$/filter.lib		\
-            $(SLB)$/unoidl.lib		\
-            $(SLB)$/animui.lib		\
-            $(SLB)$/accessibility.lib	\
-            $(SLB)$/toolpanel.lib		\
-            $(SLB)$/uitools.lib			\
-            $(SLB)$/tpcontrols.lib
-
-LIB6TARGET=$(SLB)$/sdraw3_3.lib
-LIB6FILES=      								\
-            $(SLB)$/func.lib        			\
-            $(SLB)$/func_2.lib        			\
-            $(SLB)$/slsshell.lib				\
-            $(SLB)$/slsmodel.lib				\
-            $(SLB)$/slsview.lib					\
-            $(SLB)$/slscontroller.lib			\
-            $(SLB)$/slscache.lib				\
-            $(SLB)$/slideshow.lib				\
-            $(SLB)$/framework_configuration.lib	\
-            $(SLB)$/framework_factories.lib		\
-            $(SLB)$/framework_module.lib		\
-            $(SLB)$/framework_tools.lib			\
-            $(SLB)$/presenter.lib
-
-# sdd
-SHL2TARGET= sdd$(DLLPOSTFIX)
-SHL2IMPLIB= sddimp
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=		$(SHL2TARGET)
-
-SHL2STDLIBS= \
-            $(SFX2LIB) \
-            $(SVXCORELIB) \
-            $(SVTOOLLIB) \
-            $(SVLLIB) \
-            $(VCLLIB) \
-                        $(SOTLIB) \
-            $(TOOLSLIB) \
-              $(UNOTOOLSLIB)      \
-            $(UCBHELPERLIB) \
-            $(CPPUHELPERLIB) \
-            $(CPPULIB) \
-            $(SALLIB)
-
-SHL2OBJS=   $(SLO)$/sddetect.obj \
-        $(SLO)$/detreg.obj
-
-SHL2DEPN+=  makefile.mk
-
-# sdui
-SHL4TARGET= sdui$(DLLPOSTFIX)
-SHL4IMPLIB= sduiimp
-SHL4VERSIONMAP= sdui.map
-SHL4DEF=$(MISC)$/$(SHL4TARGET).def
-DEF4NAME=       $(SHL4TARGET)
-SHL4LIBS=   $(SLB)$/sdui_all.lib
-
-LIB4TARGET=	$(SLB)$/sdui_all.lib
-LIB4FILES=	\
-    $(SLB)$/sdui.lib \
-    $(SLB)$/func_ui.lib \
-    $(SLB)$/html_ui.lib
-
-SHL4STDLIBS= \
-    $(ISDLIB) \
-    $(EDITENGLIB) \
-    $(SVXCORELIB) \
-    $(SVXLIB) \
-    $(SFXLIB) \
-    $(BASEGFXLIB) \
-    $(SO2LIB) \
-    $(SVTOOLLIB) \
-    $(VCLLIB) \
-    $(SVLLIB) \
-    $(SOTLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(I18NISOLANGLIB) \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(CANVASLIB) \
-    $(SALLIB)
-
-.IF "$(GUI)$(COM)" == "WNTMSC"
-.IF "$(ENABLE_PCH)" != ""
-#target sd
-SHL1OBJS += $(SLO)$/pchname.obj \
-            $(SLO)$/pchname_ex.obj
-#target sdd
-SHL2OBJS += $(SLO)$/pchname.obj \
-            $(SLO)$/pchname_ex.obj
-#target sdui
-SHL4OBJS += $(SLO)$/pchname.obj \
-            $(SLO)$/pchname_ex.obj
-.ENDIF # "$(ENABLE_PCH)" != ""
-.ENDIF # "$(GUI)$(COM)" == "WNTMSC"
-
-# $(ISDLIB) is build in SHL1TARGET
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-SHL4DEPN=$(SHL1TARGETN)
-SHL5DEPN=$(SHL1TARGETN)
-.ELSE
-SHL4DEPN=$(SHL1IMPLIBN)
-SHL5DEPN=$(SHL1IMPLIBN)
-.ENDIF
-
-# ppt import/export library
-SHL5TARGET    = sdfilt$(DLLPOSTFIX)
-SHL5IMPLIB    = sdfilti
-SHL5VERSIONMAP= sdfilt.map
-SHL5DEF       = $(MISC)$/$(SHL5TARGET).def
-SHL5LIBS      = $(SLB)$/ppt.lib $(SLB)$/eppt.lib
-
-DEF5NAME=$(SHL5TARGET)
-
-SHL5STDLIBS = $(ISDLIB) \
-              $(EDITENGLIB)       \
-              $(SVXCORELIB)       \
-              $(MSFILTERLIB)      \
-              $(OOXLIB)           \
-              $(SAXLIB)           \
-              $(SFX2LIB)          \
-              $(SVTOOLLIB)        \
-              $(SOTLIB)           \
-              $(VCLLIB)           \
-              $(SVLLIB)           \
-              $(SOTLIB)           \
-              $(UNOTOOLSLIB)      \
-              $(TOOLSLIB)         \
-              $(UCBHELPERLIB)     \
-              $(CPPUHELPERLIB)    \
-              $(CPPULIB)          \
-              $(SALLIB)           \
-              $(COMPHELPERLIB)    \
-              $(I18NISOLANGLIB)
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @$(TYPE) sd.flt > $@
-
-ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component $(MISC)/sdfilt.component
-
-$(MISC)/sd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sd.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sd.component
-
-$(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sdd.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sdd.component
-
-$(MISC)/sdfilt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        sdfilt.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt sdfilt.component