Merge branch 'master' into feature/gnumake4

Conflicts: connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/evoab/LCatalog.cxx connectivity/source/drivers/evoab/LColumnAlias.cxx connectivity/source/drivers/evoab/LColumnAlias.hxx connectivity/source/drivers/evoab/LColumns.cxx connectivity/source/drivers/evoab/LColumns.hxx connectivity/source/drivers/evoab/LConfigAccess.cxx connectivity/source/drivers/evoab/LConfigAccess.hxx connectivity/source/drivers/evoab/LConnection.cxx connectivity/source/drivers/evoab/LConnection.hxx connectivity/source/drivers/evoab/LDatabaseMetaData.cxx connectivity/source/drivers/evoab/LDatabaseMetaData.hxx connectivity/source/drivers/evoab/LDriver.cxx connectivity/source/drivers/evoab/LDriver.hxx connectivity/source/drivers/evoab/LFolderList.cxx connectivity/source/drivers/evoab/LFolderList.hxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LPreparedStatement.cxx connectivity/source/drivers/evoab/LPreparedStatement.hxx connectivity/source/drivers/evoab/LResultSet.cxx connectivity/source/drivers/evoab/LResultSet.hxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab/LStatement.cxx connectivity/source/drivers/evoab/LStatement.hxx connectivity/source/drivers/evoab/LTable.cxx connectivity/source/drivers/evoab/LTable.hxx connectivity/source/drivers/evoab/LTables.cxx connectivity/source/drivers/evoab/LTables.hxx connectivity/source/drivers/evoab/evoab.xml connectivity/source/drivers/evoab/makefile.mk editeng/Library_editeng.mk framework/Library_fwe.mk framework/test/test.cxx idl/prj/d.lst idl/util/idlpch.cxx linguistic/Makefile linguistic/Module_linguistic.mk linguistic/inc/linguistic/lngdllapi.h linguistic/inc/linguistic/lngprophelp.hxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/prj/d.lst linguistic/qa/unoapi/Test.java linguistic/source/grammarchecker.cxx linguistic/source/grammarchecker.hxx linguistic/source/hyphdta.cxx linguistic/source/lngprophelp.cxx linguistic/source/makefile.mk linguistic/source/spelldta.cxx sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/inc/sfx2/qswin32.h sfx2/prj/build.lst sfx2/qa/cppunit/makefile.mk xmlscript/inc/xmlscript/xcrdllapi.h xmlscript/prj/d.lst xmlscript/util/makefile.mk
author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-06-19 12:24:29 +0200
committer: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-06-19 12:24:29 +0200
commit: 92667c8edbaee9a252b1d5d221eb62849f76697c (patch)
tree: 8f1d329f2259b7d5bff054bc14d0965637df6961 /framework
parent: baecdfb578cb7bc992944857ad4d8882ef7e842c (diff)
parent: 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff)
574 files changed, 6159 insertions, 4990 deletions
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index 10baea76a9e1..2bf8ccb8a7d5 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -39,8 +39,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
 
 $(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/classes \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc/classes) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -52,8 +52,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
 
 $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/services \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc/services) \
     -I$(OUTDIR)/inc \
 ))
 
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index d7dba37635ff..d7dba37635ff 100755..100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index 840d88ce14e8..73d9ca1ffbb5 100755..100644
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -42,12 +42,8 @@ $(eval $(call gb_JunitTest_add_jars,framework_unoapi,\
     $(OUTDIR)/bin/jurt.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_sourcefiles,framework_unoapi,\
-    framework/qa/unoapi/Test \
-))
-
 $(eval $(call gb_JunitTest_add_classes,framework_unoapi,\
-    org.openoffice.framework.qa.unoapi.Test \
+    org.openoffice.test.UnoApiTest \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 87dc9bfeca82..7665b91d06ed 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -28,9 +28,9 @@
 $(eval $(call gb_Library_Library,fwe))
 
 $(eval $(call gb_Library_set_include,fwe,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(SRCDIR)/framework/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
@@ -47,13 +47,11 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\
     cppuhelper \
     fwi \
     sal \
-    stl \
     svl \
     svt \
     tl \
     utl \
     vcl \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
@@ -92,4 +90,5 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
     framework/source/fwe/xml/xmlnamespaces \
 ))
 
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 33b7bc94b2b4..748bee52c022 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -34,9 +34,9 @@ $(eval $(call gb_Library_add_defs,fwi,\
 ))
 
 $(eval $(call gb_Library_set_include,fwi,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(SRCDIR)/framework/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
@@ -49,14 +49,12 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     cppuhelper \
     i18nisolang1 \
     sal \
-    stl \
     svl \
     svt \
     tk \
     tl \
     utl \
     vcl \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 3953d129afc2..f999b751b43b 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -32,9 +32,9 @@ $(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/
 $(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
 
 $(eval $(call gb_Library_set_include,fwk,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
-    -I$(SRCDIR)/framework/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
     i18nisolang1 \
     sal \
     sot \
-    stl \
     svl \
     svt \
     tk \
@@ -128,7 +127,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/services/substitutepathvars \
     framework/source/services/tabwindowservice \
     framework/source/services/taskcreatorsrv \
-    framework/source/services/uriabbreviation \
     framework/source/services/urltransformer \
     framework/source/uiconfiguration/globalsettings \
     framework/source/uiconfiguration/graphicnameaccess \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 928c723d3f80..8c925653dc63 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,fwl))
 $(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
 
 $(eval $(call gb_Library_set_include,fwl,\
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/source/inc \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
     fwi \
     i18nisolang1 \
     sal \
-    stl \
     svl \
     svt \
     tk \
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index dbd486c40de1..d540079c0f51 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,fwm))
 $(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
 
 $(eval $(call gb_Library_set_include,fwm,\
-    -I$(SRCDIR)/framework/inc/pch \
-    -I$(SRCDIR)/framework/inc \
-    -I$(SRCDIR)/framework/source/inc \
+    -I$(realpath $(SRCDIR)/framework/inc/pch) \
+    -I$(realpath $(SRCDIR)/framework/inc) \
+    -I$(realpath $(SRCDIR)/framework/source/inc) \
     -I$(WORKDIR)/inc/framework/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/framework \
@@ -45,14 +45,12 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
     cppuhelper \
     fwi \
     sal \
-    stl \
     svl \
     svt \
     tk \
     tl \
     utl \
     vcl \
-    vos3 \
     $(gb_STDLIBS) \
 ))
 
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
new file mode 100644
index 000000000000..e8fe7c6ffb28
--- /dev/null
+++ b/framework/Library_lomenubar.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
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.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,lomenubar))
+
+$(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
+
+# FIXME pkg-config call belong in ./configure obviously
+
+$(eval $(call gb_Library_set_include,lomenubar,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+	$(shell pkg-config --cflags-only-I dbusmenu-gtk-0.4) \
+))
+
+$(eval $(call gb_Library_set_ldflags,lomenubar,\
+	$$(LDFLAGS) \
+	$(shell pkg-config --libs dbusmenu-gtk-0.4) \
+	$(GTK_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,lomenubar,\
+	sal \
+	cppu \
+	cppuhelper \
+	X11 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,lomenubar,\
+	framework/source/lomenubar/MenuItemInfo \
+	framework/source/lomenubar/AwtKeyToDbusmenuString \
+	framework/source/lomenubar/DesktopJob \
+	framework/source/lomenubar/FrameJob \
+	framework/source/lomenubar/FrameHelper \
+	framework/source/lomenubar/MenuItemStatusListener \
+	framework/source/lomenubar/exports \
+))
+
+# vim: set noet sw=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 82e5a34e51cf..aaccaab669f2 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -40,6 +40,12 @@ $(eval $(call gb_Module_add_targets,framework,\
     Package_unotypes \
 ))
 
+ifeq ($(ENABLE_LOMENUBAR),TRUE)
+$(eval $(call gb_Module_add_targets,framework,\
+    Library_lomenubar \
+))
+endif
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
     JunitTest_framework_complex \
     JunitTest_framework_unoapi \
diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd
index 5217b635cd14..5217b635cd14 100644..100755
--- a/framework/dtd/accelerator.dtd
+++ b/framework/dtd/accelerator.dtd
diff --git a/framework/dtd/event.dtd b/framework/dtd/event.dtd
index bf83b6458383..bf83b6458383 100644..100755
--- a/framework/dtd/event.dtd
+++ b/framework/dtd/event.dtd
diff --git a/framework/dtd/groupuinames.dtd b/framework/dtd/groupuinames.dtd
index 7feb3c5e0618..7feb3c5e0618 100644..100755
--- a/framework/dtd/groupuinames.dtd
+++ b/framework/dtd/groupuinames.dtd
diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd
index e79fdbbb42db..e79fdbbb42db 100644..100755
--- a/framework/dtd/image.dtd
+++ b/framework/dtd/image.dtd
diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd
index df118322742c..df118322742c 100644..100755
--- a/framework/dtd/menubar.dtd
+++ b/framework/dtd/menubar.dtd
diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd
index 3b380317b65e..3b380317b65e 100644..100755
--- a/framework/dtd/statusbar.dtd
+++ b/framework/dtd/statusbar.dtd
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd
index 258f9ddb3066..258f9ddb3066 100644..100755
--- a/framework/dtd/toolbar.dtd
+++ b/framework/dtd/toolbar.dtd
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index f17f8c1e1cbb..d2df1bac7931 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ namespace framework{
 } // namespace framework
 
 #endif // _FRAMEWORK_ACCELERATORCONST_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/arguments.h b/framework/inc/arguments.h
index 6b395d1e6e98..e52133e17889 100644
--- a/framework/inc/arguments.h
+++ b/framework/inc/arguments.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,3 +172,5 @@ enum EArgument
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_ARGUMENTS_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 936f6cf0cdbb..8c4f1611b4f3 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@ class FWE_DLLPUBLIC ActionTriggerContainer :    public PropertySetContainer,
 }
 
 #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 3f373f272afd..16a0522a777e 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
-#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP_
 #include <com/sun/star/awt/XBitmap.hpp>
-#endif
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -132,3 +131,5 @@ class ActionTriggerPropertySet :  public ThreadHelpBase                       ,
 }
 
 #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index f3579e98fcc1..c1090b7ab648 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@ class ActionTriggerSeparatorPropertySet :   public ThreadHelpBase
 }
 
 #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 7c337b023ba3..4ae7d17eddb2 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,9 +44,7 @@
 //_________________________________________________________________________________________________________________
 #include <sal/types.h>
 
-#ifndef __SGI_STL_ITERATOR
 #include <iterator>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -343,3 +342,5 @@ class CheckedIterator
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 43972eeefa1b..71f817bf8fb7 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ class FWI_DLLPUBLIC Converter
 }       // namespace framework
 
 #endif  // #ifndef __FRAMEWORK_CLASSES_CONVERTER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx
index 34442c2e2a67..60447c3a13fd 100644
--- a/framework/inc/classes/droptargetlistener.hxx
+++ b/framework/inc/classes/droptargetlistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
 #include <com/sun/star/frame/XFrame.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -49,9 +48,7 @@
 //_________________________________________________________________________________________________________________
 #include <cppuhelper/implbase1.hxx>
 
-#ifndef _SOT_EXCHANGE_HXX_
 #include <sot/exchange.hxx>
-#endif
 
 namespace framework
 {
@@ -106,3 +103,5 @@ class DropTargetListener : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_CLASSES_DROPTARGETLISTENER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 516c50a1141a..328272204b56 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,7 @@
 #include <classes/filtercachedata.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <general.h>
 #include <queries.h>
 
@@ -445,3 +444,5 @@ class FilterCache   :   private ThreadHelpBase
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index e6ac179fee50..ba77457f5ada 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble
                with solaris headers ...
 */
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <vector>
 #include <iterator>
 
@@ -469,7 +470,7 @@ struct ContentHandler
 // and could be used in a generic way
 //*****************************************************************************************************************
 template< class HashType >
-class SetNodeHash : public ::std::hash_map< ::rtl::OUString                    ,
+class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString                    ,
                                             HashType                           ,
                                             OUStringHashCode                   ,
                                             ::std::equal_to< ::rtl::OUString > >
@@ -510,7 +511,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString                    ,
 // It's an optimism to find registered services faster!
 // The preferred hash maps file extensions to preferred types to find these ones faster.
 //*****************************************************************************************************************
-class PerformanceHash   :   public  ::std::hash_map<    ::rtl::OUString                     ,
+class PerformanceHash   :   public  ::boost::unordered_map<    ::rtl::OUString                     ,
                                                         OUStringList                        ,
                                                         OUStringHashCode                    ,
                                                         ::std::equal_to< ::rtl::OUString >  >
@@ -798,62 +799,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
         ::rtl::OUString m_sProductName                 ;
         ::rtl::OUString m_sFormatVersion               ;
 };
-/*DRAFT
-class FilterCFGListener : public  css::util::XChangesListener
-                        , private ThreadHelpBase
-                        , public  ::cppu::OWeakObject
-{
-    public:
-
-        enum ECFGType
-        {
-            E_TYPE          ,
-            E_FILTER        ,
-            E_LOADER        ,
-            E_DETECTOR      ,
-            E_CONTENTHANDLER
-        };
-
-    private:
-
-        // read only access to the configuration, where we are regsieterd as changes listener.
-        css::uno::Reference< css::uno::XInterface > m_xCFG;
-
-        // indicates, for which type of configuration item we listen.
-        ECFGType m_eType;
-
-        DataContainer* m_pData;
-
-        // we must know, if we are already registered as listener or not.
-        //    That can be usefull to supress double registration calls ...
-        //    which may will force double call backs in our disposing method!
-        //    Such superflous calls can be dangerous.
-        sal_Bool m_bListening;
-
-    public:
-
-        DECLARE_XINTERFACE
-
-        FilterCFGListener( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
-                                 ECFGType                                                eType ,
-                                 DataContainer*                                          pData );
-
-        void startListening();
-        void stopListening ();
-
-        virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& aEvent ) throw(css::uno::RuntimeException);
-        virtual void SAL_CALL disposing      ( const css::lang::EventObject&  aEvent ) throw(css::uno::RuntimeException);
-
-    private:
-
-        FileType       impl_readType    ( const css::uno::Reference< css::uno::XInterface >& xNode );
-        Filter         impl_readFilter  ( const css::uno::Reference< css::uno::XInterface >& xNode );
-        Detector       impl_readDetector( const css::uno::Reference< css::uno::XInterface >& xNode );
-        Loader         impl_readLoader  ( const css::uno::Reference< css::uno::XInterface >& xNode );
-        ContentHandler impl_readHandler ( const css::uno::Reference< css::uno::XInterface >& xNode );
-};
-*/
 
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index bd3aee81694b..f96a0373c1ca 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <macros/debug.hxx>
 #include <general.h>
 
@@ -57,7 +56,6 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <cppuhelper/weakref.hxx>
-#include <vos/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/evntpost.hxx>
 
@@ -105,14 +103,6 @@ class FrameContainer : private ThreadHelpBase
         TFrameContainer m_aContainer;
         /// one container item can be the current active frame. Its neccessary for Desktop or Frame implementation.
         css::uno::Reference< css::frame::XFrame > m_xActiveFrame;
-/*DEPRECATEME
-        /// indicates using of the automatic async quit feature in case last task will be closed
-        sal_Bool m_bAsyncQuit;
-        /// used to execute the terminate request asyncronous
-        ::vcl::EventPoster m_aAsyncCall;
-        /// used for async quit feature (must be weak to prevent us against strange situations!)
-        css::uno::WeakReference< css::frame::XDesktop > m_xDesktop;
-*/
 
     //_______________________________________
     // interface
@@ -149,3 +139,5 @@ class FrameContainer : private ThreadHelpBase
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index e8a9da8d6d6c..c726ed213a23 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ class FWE_DLLPUBLIC FwkResId : public ResId
 }
 
 #endif // __FRAMEWORK_CLASSES_FWKRESID
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 7d01b3c6f9d8..9ddbe9bbfaf4 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index 673a110a5097..70f126c229dc 100755..100644
--- a/framework/inc/classes/fwlresid.hxx
+++ b/framework/inc/classes/fwlresid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ class FwlResId : public ResId
 }
 
 #endif // __FRAMEWORK_CLASSES_FwlResId
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 2001314e9edb..aae6d3f0e075 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase
 }
 
 #endif // __FRAMEWORK_CLASSES_IMAGEWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 11e56a7b522e..3920890e02c7 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,7 +53,6 @@
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/debug.hxx>
 
-// #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #define REFERENCE                                       ::com::sun::star::uno::Reference
@@ -75,21 +75,12 @@ class MenuManager : public ThreadHelpBase           ,
                     public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
 {
     public:
-        // #110897#
         MenuManager(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             REFERENCE< XFRAME >& rFrame,
             Menu* pMenu,
             sal_Bool bDelete,
             sal_Bool bDeleteChildren );
-#if 0
-        MenuManager(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-            REFERENCE< XFRAME >& rFrame,
-            AddonMenu*          pAddonMenu,
-            sal_Bool            bDelete,
-            sal_Bool            bDeleteChildren );
-#endif
 
         virtual ~MenuManager();
 
@@ -105,11 +96,14 @@ class MenuManager : public ThreadHelpBase           ,
 
         void    RemoveListener();
 
-        // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
         static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
-        static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages);
+        static void FillMenuImages(
+            ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,
+            Menu* _pMenu,
+            sal_Bool bShowMenuImages
+        );
 
     protected:
         DECL_LINK( Highlight, Menu * );
@@ -151,14 +145,12 @@ class MenuManager : public ThreadHelpBase           ,
         sal_Bool                            m_bDeleteChildren;
         sal_Bool                            m_bActive;
         sal_Bool                            m_bIsBookmarkMenu;
-        sal_Bool                            m_bWasHiContrast;
         sal_Bool                            m_bShowMenuImages;
         ::rtl::OUString                     m_aMenuItemCommand;
         Menu*                               m_pVCLMenu;
         REFERENCE< XFRAME >                 m_xFrame;
         ::std::vector< MenuItemHandler* >   m_aMenuItemHandlerVector;
 
-        // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >             m_xURLTransformer;
 };
@@ -166,3 +158,5 @@ class MenuManager : public ThreadHelpBase           ,
 } // namespace
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index d62debc5b2a2..4018353c32ac 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -256,3 +257,5 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index ffdcaa1f253b..52a53a9b5179 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -198,3 +199,5 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 8c9bd2e854b0..22fd6740c397 100644..100755
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -69,19 +69,19 @@
 #define RID_IMAGE_STATUSBAR_LOGO                (RID_IMAGE_START+0)
 
 // License Dialog
-#define DLG_LICENSE                         (RID_FWK_DIALOG_START+256)
-#define ML_LICENSE                          (RID_FWK_DIALOG_START+11)
-#define FT_INFO1                            (RID_FWK_DIALOG_START+12)
-#define FT_INFO2                            (RID_FWK_DIALOG_START+13)
-#define FT_INFO3                            (RID_FWK_DIALOG_START+14)
-#define FT_INFO2_1                          (RID_FWK_DIALOG_START+15)
-#define FT_INFO3_1                          (RID_FWK_DIALOG_START+16)
-#define FL_DIVIDE                           (RID_FWK_DIALOG_START+17)
-#define PB_PAGEDOWN                         (RID_FWK_DIALOG_START+18)
-#define IMG_ARROW                           (RID_FWK_DIALOG_START+19)
-#define LICENSE_ACCEPT                      (RID_FWK_DIALOG_START+20)
-#define LICENSE_NOTACCEPT                   (RID_FWK_DIALOG_START+21)
-#define PB_DECLINE                          (RID_FWK_DIALOG_START+22)
-#define PB_ACCEPT                           (RID_FWK_DIALOG_START+23)
+#define DLG_LICENSE                             (RID_FWK_DIALOG_START+256)
+#define ML_LICENSE                              (RID_FWK_DIALOG_START+11)
+#define FT_INFO1                                (RID_FWK_DIALOG_START+12)
+#define FT_INFO2                                (RID_FWK_DIALOG_START+13)
+#define FT_INFO3                                (RID_FWK_DIALOG_START+14)
+#define FT_INFO2_1                              (RID_FWK_DIALOG_START+15)
+#define FT_INFO3_1                              (RID_FWK_DIALOG_START+16)
+#define FL_DIVIDE                               (RID_FWK_DIALOG_START+17)
+#define PB_PAGEDOWN                             (RID_FWK_DIALOG_START+18)
+#define IMG_ARROW                               (RID_FWK_DIALOG_START+19)
+#define LICENSE_ACCEPT                          (RID_FWK_DIALOG_START+20)
+#define LICENSE_NOTACCEPT                       (RID_FWK_DIALOG_START+21)
+#define PB_DECLINE                              (RID_FWK_DIALOG_START+22)
+#define PB_ACCEPT                               (RID_FWK_DIALOG_START+23)
 
 #endif
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index e3c26d190ce9..406c8bb3275c 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,5 @@ class FWE_DLLPUBLIC RootActionTriggerContainer :  public PropertySetContainer,
 }
 
 #endif // __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx
index 233987768b82..369cf544427f 100644
--- a/framework/inc/classes/servicemanager.hxx
+++ b/framework/inc/classes/servicemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,7 +229,7 @@ class ServiceManager
 
             @param      "sRegistryFile", file name of user registry.
             @return     A reference to a new initialized servicemanager with a valid registry.
-                        It can be NULL, if an error occured.
+                        It can be NULL, if an error occurred.
 
             @onerror    Return a NULL-reference.
         *//*-*****************************************************************************************************/
@@ -278,3 +279,5 @@ class ServiceManager
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_CLASSES_SERVICEMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 19c68d6a332c..f42e3c84c434 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ class TaskCreator : private ThreadHelpBase
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_TASKCREATOR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index bc4d770a0c1c..192f37e06728 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -182,3 +183,5 @@ class Wildcard
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
deleted file mode 100644
index fac23bd26648..000000000000
--- a/framework/inc/commands.h
+++ /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.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_COMMANDS_H_
-#define __FRAMEWORK_COMMANDS_H_
-
-//_________________________________________________________________________________________________________________
-//  includes
-//_________________________________________________________________________________________________________________
-
-#include <macros/generic.hxx>
-#include <vos/process.hxx>
-#include <rtl/ustring.hxx>
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-/*-************************************************************************************************************//**
-    @short          These values describe some command line arguments of our office.
-                    We need it e.g. to detect running mode of it - plugin, headless ...
-*//*-*************************************************************************************************************/
-
-#define COMMAND_PLUGIN    DECLARE_ASCII("-plugin"     ) /// office is plugged into a browser
-#define COMMAND_HEADLESS  DECLARE_ASCII("-headless"   ) /// office runs in headless mode for scripting
-#define COMMAND_INVISIBLE DECLARE_ASCII("-invisible"  ) /// office runs in invisible mode which supress splash screen and first empry document
-#define COMMAND_SERVER    DECLARE_ASCII("-server"     ) /// office runs as server
-}       //  namespace framework
-
-#endif  //  #ifndef __FRAMEWORK_TARGETS_H_
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index 0b2f7d547b2e..c6a607b8b6f8 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
 #include <threadhelp/resetableguard.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/debug.hxx>
@@ -389,3 +388,5 @@ class BaseDispatcher    :   // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_BASEDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/blankdispatcher.hxx b/framework/inc/dispatch/blankdispatcher.hxx
index bd0e5b1d34dd..2dc31be0f64c 100644
--- a/framework/inc/dispatch/blankdispatcher.hxx
+++ b/framework/inc/dispatch/blankdispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,3 +128,5 @@ class BlankDispatcher   :   // -interfaces  ... are supported by our BaseDispatc
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_BLANKDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 40233269b3a0..81d884298ad9 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -320,3 +321,5 @@ class CloseDispatcher : public css::lang::XTypeProvider
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_DISPATCH_CLOSEDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/createdispatcher.hxx b/framework/inc/dispatch/createdispatcher.hxx
index 41b448455b0e..e05fc56924ca 100644
--- a/framework/inc/dispatch/createdispatcher.hxx
+++ b/framework/inc/dispatch/createdispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,3 +126,5 @@ class CreateDispatcher  :   // -interfaces  ... are supported by our BaseDispatc
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_CREATEDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 124698145340..202e1fe5ed25 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ class DispatchInformationProvider : public  css::frame::XDispatchInformationProv
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 15e2a1df5987..9e095f69855a 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
 #include <classes/protocolhandlercache.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/debug.hxx>
@@ -126,9 +125,6 @@ class DispatchProvider  :   // interfaces
         /// different dispatcher to handle special dispatch calls, protocols or URLs (they will be created on demand.)
         css::uno::Reference< css::frame::XDispatch > m_xMenuDispatcher     ;
         css::uno::Reference< css::frame::XDispatch > m_xHelpAgentDispatcher;
-/*      css::uno::Reference< css::frame::XDispatch > m_xBlankDispatcher    ;
-        css::uno::Reference< css::frame::XDispatch > m_xSelfDispatcher     ;
-        css::uno::Reference< css::frame::XDispatch > m_xDefaultDispatcher  ;*/
         /// cache of some other dispatch provider which are registered inside configuration to handle special URL protocols
         HandlerCache m_aProtocolHandlerCache;
 
@@ -171,3 +167,5 @@ class DispatchProvider  :   // interfaces
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_DISPATCH_DISPATCHPROVIDER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx
index 84eaf284255b..56d092552a77 100644
--- a/framework/inc/dispatch/helpagentdispatcher.hxx
+++ b/framework/inc/dispatch/helpagentdispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -203,3 +204,4 @@ class HelpAgentDispatcher : public  css::lang::XTypeProvider
 
 #endif // _FRAMEWORK_DISPATCH_HELPAGENTDISPATCHER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index e811e9ddec7c..29c553d2173b 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,9 +58,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakref.hxx>
 
-#ifndef __SGI_STL_DEQUE
 #include <deque>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -324,3 +323,5 @@ class InterceptionHelper : public  css::frame::XDispatchProvider
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index f1c6dc34d194..52ba1aad0350 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,7 +75,7 @@ namespace framework{
 /**
     @short          protocol handler for "mailto:" URLs
     @descr          It's a special dispatch object which is used registered for "mailto:*" URLs and
-                    will be automaticly used from the framework dispatch mechanism if such URL occured.
+                    will be automaticly used from the framework dispatch mechanism if such URL occurred.
 
     @base           ThreadHelpBase
                         exports a lock member to guarantee right initialize value of it
@@ -143,3 +144,5 @@ class MailToDispatcher : // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 30016a96f499..a43800a13499 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -175,7 +176,7 @@ class MenuDispatcher   :   // interfaces
             @seealso    method loadCancelled()
 
             @param      "xControl"  , css::uno::Reference to a valid listener for state events.
-            @param      "aURL"      , URL about listener will be informed, if something occured.
+            @param      "aURL"      , URL about listener will be informed, if something occurred.
             @return     -
 
             @onerror    -
@@ -334,3 +335,5 @@ class MenuDispatcher   :   // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 25bb1db58086..671af774107c 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,86 +32,32 @@
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-
-#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
 #include <threadhelp/threadhelpbase.hxx>
-#endif
-
-#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 #include <threadhelp/resetableguard.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
 #include <macros/xinterface.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
 #include <macros/xtypeprovider.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
 #include <macros/xserviceinfo.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
 #include <macros/debug.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
 #include <macros/generic.hxx>
-#endif
-
-#ifndef __FRAMEWORK_GENERAL_H_
 #include <general.h>
-#endif
-
-#ifndef __FRAMEWORK_STDTYPES_H_
 #include <stdtypes.h>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-
-#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_FRAME_XNOTIFYINGDISPATCH_HPP_
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_
 #include <com/sun/star/frame/XStatusListener.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
 #include <com/sun/star/frame/XFrame.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_UTIL_URL_HPP_
 #include <com/sun/star/util/URL.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-
-#ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -213,3 +160,5 @@ class Oxt_Handler  :   // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index e8002834dff9..33651c59cca4 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,12 +64,8 @@
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_URI_XURLREFERENCEFACTORY_HPP_
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_URI_XURLREFERENCE_HPP_
 #include <com/sun/star/uri/XUriReference.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -197,3 +194,5 @@ class PopupMenuDispatcher :   // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/selfdispatcher.hxx b/framework/inc/dispatch/selfdispatcher.hxx
index 1bbca4d20ed5..f9afd0bf796b 100644
--- a/framework/inc/dispatch/selfdispatcher.hxx
+++ b/framework/inc/dispatch/selfdispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ class SelfDispatcher   :   // -interfaces  ... are supported by our BaseDispatch
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_SELFDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 8b93b8734265..19336bf3d69c 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,7 +75,7 @@ namespace framework{
 /**
     @short          protocol handler for "service:*" URLs
     @descr          It's a special dispatch/provider object which is registered for such URL pattern and will
-                    be automaticly used by the framework dispatch mechanism if such URL occured.
+                    be automaticly used by the framework dispatch mechanism if such URL occurred.
                     His job is to create any registered uno components which must be coded inside
                     dispatched URL (may with some optional given parameters). After that such created
                     service must be hold his self alive. Such mechanism can be usefull for UI components
@@ -147,3 +148,5 @@ class ServiceHandler : // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index e2ff8955a423..1939fb7c108c 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -195,3 +196,5 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_DISPATCH_STARTMODULEDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index b191ab3e31c5..d16f97a3b564 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,7 +75,7 @@ namespace framework{
 /**
     @short          protocol handler for "systemexec:*" URLs
     @descr          It's a special dispatch/provider object which is registered for such URL pattern and will
-                    be automaticly used by the framework dispatch mechanism if such URL occured.
+                    be automaticly used by the framework dispatch mechanism if such URL occurred.
                     It forwards all URL's to the underlying operating system.
                     So it would e.g. be possible to open HTML files outside the office within a web browser.
 
@@ -143,3 +144,5 @@ class SystemExec : // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index 97284a7b264b..fc279d9dac3d 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,11 +43,10 @@ namespace framework{
 
 //_________________________________________________________________________________________________________________
 
-static ::rtl::OUString CMD_UNO_SHOWSTARTMODULE = ::rtl::OUString::createFromAscii(".uno:ShowStartModule");
-static ::rtl::OUString CMD_UNO_CLOSEDOC        = ::rtl::OUString::createFromAscii(".uno:CloseDoc"       );
-static ::rtl::OUString CMD_UNO_CLOSEWIN        = ::rtl::OUString::createFromAscii(".uno:CloseWin"       );
-static ::rtl::OUString CMD_UNO_CLOSEFRAME      = ::rtl::OUString::createFromAscii(".uno:CloseFrame"     );
+#define CMD_UNO_SHOWSTARTMODULE ".uno:ShowStartModule"
 
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_DISPATCHCOMMANDS_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 1817b60d90e9..05af2f8ce35f 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -30,19 +30,19 @@
 
 #include "svl/solar.hrc"
 
-#define RID_FWK_START               260
+#define RID_FWK_START                       260
 
-#define RID_GROUPS_OFFSET           32000
-#define RID_GROUPS_END              32767
+#define RID_GROUPS_OFFSET                   32000
+#define RID_GROUPS_END                      32767
 
 #define RID_FWK_DIALOG_START_CORRECT        (RID_FWK_START + 2048)
 
-#define DLG_FILTER_SELECT           (RID_FWK_DIALOG_START_CORRECT + 0)
+#define DLG_FILTER_SELECT                   (RID_FWK_DIALOG_START_CORRECT + 0)
 
-#define STR_FILTER_DOWNLOAD         (RID_FWK_START+0)
-#define STR_FILTER_CHOOSER          (RID_FWK_START+1)
-#define STR_FILTER_OTHERS           (RID_FWK_START+2)
-#define STR_FILTER_ZIPPED           (RID_FWK_START+3)
+#define STR_FILTER_DOWNLOAD                 (RID_FWK_START+0)
+#define STR_FILTER_CHOOSER                  (RID_FWK_START+1)
+#define STR_FILTER_OTHERS                   (RID_FWK_START+2)
+#define STR_FILTER_ZIPPED                   (RID_FWK_START+3)
 
 // ResIds for BackingWindow
 #define DLG_BACKING                         (RID_FWK_DIALOG_START_CORRECT+100)
@@ -57,13 +57,7 @@
 #define STR_BACKING_TPLREP                  9
 
 #define RES_BACKING_IMAGES                  (DLG_BACKING+1)
-#define RES_BACKING_IMAGES_HC               (DLG_BACKING+2)
 
-#define BMP_BACKING_BACKGROUND_LEFT         1
-#define BMP_BACKING_BACKGROUND_MIDDLE       2
-#define BMP_BACKING_BACKGROUND_RIGHT        3
-#define BMP_BACKING_BACKGROUND_RTL_LEFT     4
-#define BMP_BACKING_BACKGROUND_RTL_RIGHT    5
 #define BMP_BACKING_EXT                     6
 #define BMP_BACKING_REG                     7
 #define BMP_BACKING_INFO                    8
diff --git a/framework/inc/framework/acceleratorinfo.hxx b/framework/inc/framework/acceleratorinfo.hxx
index 6b0519ceed98..a18eea4e9551 100644
--- a/framework/inc/framework/acceleratorinfo.hxx
+++ b/framework/inc/framework/acceleratorinfo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@ KeyCode GetKeyCodeFromCommandURL( ::com::sun::star::uno::Reference< ::com::sun::
 }
 
 #endif // __FRAMEWORK_HELPER_ACCELERATORINFO_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx
index 67c4115a3621..78983cd2341d 100644
--- a/framework/inc/framework/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,8 +30,6 @@
 #define __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
 
 #include <com/sun/star/container/XIndexContainer.hpp>
-
-// #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/menu.hxx>
 #include <framework/fwedllapi.h>
@@ -55,11 +54,9 @@ namespace framework
             // to optimize the time of creation of a menu from a actiontrigger structure.
             // IMPORTANT: The caller must ensure that the menu pointer is valid through the
             //            life time of the XIndexContainer object!!!
-            //
             // @param pNewMenu = Must be a valid menu. Please be aware that this implementation is based on
             //                   the above mentioned restriction!!!
 
-            // #110897#
             static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
                 const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier );
@@ -77,3 +74,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx
index da3c9bb8740b..0ec30f5432b0 100644
--- a/framework/inc/framework/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,18 +52,19 @@ namespace framework
 class FWE_DLLPUBLIC AddonMenu : public PopupMenu
 {
     public:
-                        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-                        ~AddonMenu();
+        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+        ~AddonMenu();
 
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 };
 
 class AddonMenuManager;
+
 class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
 {
     public:
-                                ~AddonPopupMenu();
+        ~AddonPopupMenu();
 
         // Check if command URL string has the unique prefix to identify addon popup menus
         static sal_Bool         IsCommandURLPrefix( const rtl::OUString& aCmdURL );
@@ -71,12 +73,12 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
         const rtl::OUString&    GetCommandURL() const { return m_aCommandURL; }
 
     protected:
-        void                    Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
+        void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
 
     private:
-                                AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+        AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
 
-    rtl::OUString               m_aCommandURL;
+        rtl::OUString               m_aCommandURL;
 
     friend class AddonMenuManager;
 };
@@ -139,3 +141,5 @@ class FWE_DLLPUBLIC AddonMenuManager
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx
index 6e41fcbafdd1..b095f787f71a 100644
--- a/framework/inc/framework/addonsoptions.hxx
+++ b/framework/inc/framework/addonsoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,9 +313,9 @@ class FWE_DLLPUBLIC AddonsOptions
             @onerror    An empty image
         *//*-*****************************************************************************************************/
 
-        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
+        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
+        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const;
 
-        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const;
     //-------------------------------------------------------------------------------------------------------------
     //  private methods
     //-------------------------------------------------------------------------------------------------------------
@@ -372,3 +373,5 @@ class FWE_DLLPUBLIC AddonsOptions
 }
 
 #endif  // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx
index 0ee25dea1ab2..ce42da483c3f 100644
--- a/framework/inc/framework/bmkmenu.hxx
+++ b/framework/inc/framework/bmkmenu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,17 +54,19 @@ class BmkMenu_Impl;
 class FWE_DLLPUBLIC BmkMenu : public AddonMenu
 {
     public:
-                        enum BmkMenuType
-                        {
-                            BMK_NEWMENU,
-                            BMK_WIZARDMENU
-                        };
+        enum BmkMenuType
+        {
+            BMK_NEWMENU,
+            BMK_WIZARDMENU
+        };
 
                         BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                                 BmkMenuType nType );
-                        ~BmkMenu();
+                 BmkMenuType nType
+        );
 
-    void                Initialize(); // Synchrones Laden der Eintraege
+        ~BmkMenu();
+
+        void Initialize(); // Synchrones Laden der Eintraege
 
     protected:
         BmkMenu::BmkMenuType m_nType;
@@ -71,7 +74,8 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu
 
     private:
                         BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                                 BmkMenuType, BmkMenu* pRoot );
+                 BmkMenuType, BmkMenu* pRoot
+        );
 
         BmkMenu_Impl*   _pImp;
 };
@@ -79,3 +83,5 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/configimporter.hxx b/framework/inc/framework/configimporter.hxx
index 6038f7bdd325..cffd99ecf6f5 100644
--- a/framework/inc/framework/configimporter.hxx
+++ b/framework/inc/framework/configimporter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ namespace framework
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_CONFIGIMPORTER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/documentundoguard.hxx b/framework/inc/framework/documentundoguard.hxx
index da2976e895e1..31b6b45d4bb5 100755..100644
--- a/framework/inc/framework/documentundoguard.hxx
+++ b/framework/inc/framework/documentundoguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -68,3 +69,5 @@ namespace framework
 //......................................................................................................................
 
 #endif // FRAMEWORK_DOCUMENTUNDOGUARD_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index 4c07be58d1c7..e9cbc25dcd2f 100644
--- a/framework/inc/framework/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-// #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 namespace framework
@@ -50,12 +50,10 @@ struct FWE_DLLPUBLIC EventsConfig
 class FWE_DLLPUBLIC EventsConfiguration
 {
     public:
-        // #110897#
         static sal_Bool LoadEventsConfig(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rInStream, EventsConfig& aItems );
 
-        // #110897#
         static sal_Bool StoreEventsConfig(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rOutStream, const EventsConfig& aItems );
@@ -64,3 +62,5 @@ class FWE_DLLPUBLIC EventsConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx
index 61fe08cc7018..d40d571a191f 100644
--- a/framework/inc/framework/framelistanalyzer.hxx
+++ b/framework/inc/framework/framelistanalyzer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -212,3 +213,5 @@ class FWE_DLLPUBLIC FrameListAnalyzer
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/fwedllapi.h b/framework/inc/framework/fwedllapi.h
index c3aa1bb81d1d..f47450bf149b 100644
--- a/framework/inc/framework/fwedllapi.h
+++ b/framework/inc/framework/fwedllapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef INCLUDED_FWEDLLAPI_H
 #define INCLUDED_FWEDLLAPI_H
 
@@ -11,3 +12,5 @@
 #define FWE_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif /* INCLUDED_FWEDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/iguard.hxx b/framework/inc/framework/iguard.hxx
index 7c00858b208d..a5674c2763df 100755..100644
--- a/framework/inc/framework/iguard.hxx
+++ b/framework/inc/framework/iguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ class SAL_NO_VTABLE IGuard
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_IGUARD_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index 02042e44a2e2..9010af0cf10e 100644
--- a/framework/inc/framework/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,12 +41,22 @@
 namespace framework
 {
 
-typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast );
+typedef Image ( *pfunc_getImage)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    bool bBig
+);
 
 pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast );
+Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    bool bBig
+);
 
 }
 
-#endif // __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/imutex.hxx b/framework/inc/framework/imutex.hxx
index 5466edc4cf76..10b15ae60317 100644
--- a/framework/inc/framework/imutex.hxx
+++ b/framework/inc/framework/imutex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ class SAL_NO_VTABLE IMutex
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx
index 03c8fde19736..caef8e8ff35a 100644
--- a/framework/inc/framework/interaction.hxx
+++ b/framework/inc/framework/interaction.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ public:
 }       //  namespace framework
 
 #endif  // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index be3437c5e45c..1671a594ec06 100644
--- a/framework/inc/framework/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,7 +88,7 @@ class FWE_DLLPUBLIC MenuConfiguration
         };
 
         MenuConfiguration(
-            // #110897#-1 use const when giving a uno reference by reference
+            // use const when giving a uno reference by reference
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
 
         virtual ~MenuConfiguration();
@@ -117,10 +118,12 @@ class FWE_DLLPUBLIC MenuConfiguration
         static sal_Bool IsWindowListItemId( sal_uInt16 nId );
 
     private:
-        // #110897#-1 do not hold the uno reference by reference
+        // do not hold the uno reference by reference
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager;
 };
 
 }
 
 #endif // __FRAMEWORK_XML_MENUCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index f6ca60d4fecc..d6b8d88e89a6 100644
--- a/framework/inc/framework/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
 }
 
 #endif // __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index 0e24357fe71e..692daaa11447 100644
--- a/framework/inc/framework/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -270,3 +271,5 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx
index fd4292fc340f..c8e8324f2b97 100644
--- a/framework/inc/framework/sfxhelperfunctions.hxx
+++ b/framework/inc/framework/sfxhelperfunctions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,39 +37,70 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <svtools/statusbarcontroller.hxx>
 
-typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
-typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL );
-typedef void ( *pfunc_getRefreshToolbars)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-typedef void ( *pfunc_createDockingWindow)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
-typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
-typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    ToolBox* pToolbox,
+    unsigned short nID,
+    const ::rtl::OUString& aCommandURL );
+
+typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    StatusBar* pStatusBar,
+    unsigned short nID,
+    const ::rtl::OUString& aCommandURL );
+
+typedef void ( *pfunc_getRefreshToolbars)(
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+
+typedef void ( *pfunc_createDockingWindow)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& rResourceURL );
+
+typedef bool ( *pfunc_isDockingWindowVisible)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& rResourceURL );
+
+typedef void ( *pfunc_activateToolPanel)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+    const ::rtl::OUString& i_rPanelURL );
+
 
 namespace framework
 {
-
 FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
-
-FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
+FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    ToolBox* pToolbox,
+    unsigned short nID,
+    const ::rtl::OUString& aCommandURL );
 
 FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
-
-FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL );
+FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    StatusBar* pStatusBar,
+    unsigned short nID,
+     const ::rtl::OUString& aCommandURL );
 
 FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
-
-FWE_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+FWE_DLLPUBLIC void SAL_CALL RefreshToolbars(
+     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
 
 FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
-
-FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& rResourceURL );
 
 FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
-
-FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& rResourceURL );
 
 FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
-
-FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+    const ::rtl::OUString& i_rPanelURL );
 }
 
 #endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx
index bd93831cba7a..080def952a3c 100644
--- a/framework/inc/framework/statusbarconfiguration.hxx
+++ b/framework/inc/framework/statusbarconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ class FWE_DLLPUBLIC StatusBarConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index 1b448cef13ac..ed1ded3d06c5 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,7 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <framework/fwedllapi.h>
 
 //_______________________________________________
@@ -182,7 +183,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
         void impl_appendProductExtension (::rtl::OUStringBuffer& sTitle);
         void impl_appendModuleName (::rtl::OUStringBuffer& sTitle);
         void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle);
-        void impl_appendEvalVersion (::rtl::OUStringBuffer& sTitle);
 
         void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
         ::rtl::OUString impl_getSubTitle ();
@@ -226,3 +226,5 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
 } // namespace framework
 
 #endif // _FRAMEWORK_TITLEHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index 453d94810fbc..63abfcd4824d 100644
--- a/framework/inc/framework/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,8 +38,6 @@
 #endif
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-
-// #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 namespace framework
@@ -47,13 +46,11 @@ namespace framework
 class FWE_DLLPUBLIC ToolBoxConfiguration
 {
     public:
-        // #110897#
         static sal_Bool LoadToolBox(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration );
 
-        // #110897#
         static sal_Bool StoreToolBox(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
@@ -63,3 +60,5 @@ class FWE_DLLPUBLIC ToolBoxConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx
index 9cd7266b33c8..bfac08a086a5 100755..100644
--- a/framework/inc/framework/undomanagerhelper.hxx
+++ b/framework/inc/framework/undomanagerhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -158,3 +159,5 @@ namespace framework
 //......................................................................................................................
 
 #endif // FRAMEWORK_UNDOMANAGERHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
index 8f4b50cf77e0..c2bf28e5d3a6 100644
--- a/framework/inc/fwidllapi.h
+++ b/framework/inc/fwidllapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef INCLUDED_FWIDLLAPI_H
 #define INCLUDED_FWIDLLAPI_H
 
@@ -11,3 +12,5 @@
 #define FWI_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif /* INCLUDED_FWIDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h
index a22303386b68..3bc4fc5e1b06 100644
--- a/framework/inc/fwkdllapi.h
+++ b/framework/inc/fwkdllapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef INCLUDED_FWKDLLAPI_H
 #define INCLUDED_FWKDLLAPI_H
 
@@ -6,3 +7,5 @@
 #include <fwidllapi.h>
 
 #endif /* INCLUDED_FWKDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/general.h b/framework/inc/general.h
index 086bfdd2f1dd..f674a3039644 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,14 +56,6 @@ namespace css = ::com::sun::star;
 namespace framework {
 
 //-----------------------------------------------------------------------------
-/** status event mapped from load event of frame loader
-
-    @todo think about me
-          should be moved to another more specific place.
- */
-static const ::rtl::OUString FEATUREDESCRIPTOR_LOADSTATE = DECLARE_ASCII("loadFinishedOrCancelled");
-
-//-----------------------------------------------------------------------------
 /** Those macro is used to make it more clear where a synchronized block will start.
     Because normal documentation code wont be recognized by some developers to be real
     I need something where they are thinking about.
@@ -80,3 +73,5 @@ static const ::rtl::OUString FEATUREDESCRIPTOR_LOADSTATE = DECLARE_ASCII("loadFi
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_GENERAL_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 1f11edf755d9..30f4091f3b61 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ class DockingAreaDefaultAcceptor    :   private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/fixeddocumentproperties.hxx b/framework/inc/helper/fixeddocumentproperties.hxx
index 8d6ef2031d9c..d7013236526f 100644
--- a/framework/inc/helper/fixeddocumentproperties.hxx
+++ b/framework/inc/helper/fixeddocumentproperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef __FRAMEWORK_HELPER_FIXEDDOCUMENTPROPERTIES_HXX_
 #define __FRAMEWORK_HELPER_FIXEDDOCUMENTPROPERTIES_HXX_
 
@@ -55,3 +56,5 @@ struct FixedDocumentProperties
 }
 
 #endif // __FRAMEWORK_SERVICES_FIXEDDOCUMENTPROPERTIES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/ilayoutnotifications.hxx b/framework/inc/helper/ilayoutnotifications.hxx
index db63ea15c7b4..5746bff53e9e 100755..100644
--- a/framework/inc/helper/ilayoutnotifications.hxx
+++ b/framework/inc/helper/ilayoutnotifications.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ class ILayoutNotifications
 }
 
 #endif // __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 5698974930ca..fe3f27be167c 100755..100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,8 +31,14 @@
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/util/XChangesListener.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
+#include <cppuhelper/implbase1.hxx>
+
 #include <i18npool/lang.h>
 #include <svl/languageoptions.hxx>
 #include <rtl/ustring.hxx>
@@ -119,7 +126,178 @@ FWI_DLLPUBLIC void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
         const ::rtl::OUString & rKeyboardLang,
         const ::rtl::OUString & rGuessedTextLang );
 
+//It's common for an object to want to create and own a Broadcaster and set
+//itself as a Listener on its own Broadcaster member.
+//
+//However, calling addListener on a Broadcaster means that the Broadcaster adds
+//a reference to the Listener leading to an ownership cycle where the Listener
+//owns the Broadcaster which "owns" the Listener.
+//
+//The WeakContainerListener allows breaking this cycle and retrofitting
+//afflicted implentations fairly easily.
+//
+//OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
+//which forwards the events to the OriginalListener without taking ownership of
+//it.
+class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::container::XContainerListener>
+{
+    private:
+        com::sun::star::uno::WeakReference<com::sun::star::container::XContainerListener> mxOwner;
+
+    public:
+        WeakContainerListener(com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner)
+            : mxOwner(xOwner)
+        {
+        }
+
+        virtual ~WeakContainerListener()
+        {
+        }
+
+        // container.XContainerListener
+        virtual void SAL_CALL elementInserted(const com::sun::star::container::ContainerEvent& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->elementInserted(rEvent);
+        }
+
+        virtual void SAL_CALL elementRemoved(const com::sun::star::container::ContainerEvent& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->elementRemoved(rEvent);
+        }
+
+        virtual void SAL_CALL elementReplaced(const com::sun::star::container::ContainerEvent& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->elementReplaced(rEvent);
+        }
+
+        // lang.XEventListener
+        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->disposing(rEvent);
+
+        }
+};
+
+class WeakChangesListener : public ::cppu::WeakImplHelper1<com::sun::star::util::XChangesListener>
+{
+    private:
+        com::sun::star::uno::WeakReference<com::sun::star::util::XChangesListener> mxOwner;
+
+    public:
+        WeakChangesListener(com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner)
+            : mxOwner(xOwner)
+        {
+        }
+
+        virtual ~WeakChangesListener()
+        {
+        }
+
+        // util.XChangesListener
+        virtual void SAL_CALL changesOccurred(const com::sun::star::util::ChangesEvent& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->changesOccurred(rEvent);
+        }
+
+        // lang.XEventListener
+        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->disposing(rEvent);
+
+        }
+};
+
+class WeakEventListener : public ::cppu::WeakImplHelper1<com::sun::star::lang::XEventListener>
+{
+    private:
+        com::sun::star::uno::WeakReference<com::sun::star::lang::XEventListener> mxOwner;
+
+    public:
+        WeakEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner)
+            : mxOwner(xOwner)
+        {
+        }
+
+        virtual ~WeakEventListener()
+        {
+        }
+
+        // lang.XEventListener
+        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->disposing(rEvent);
+
+        }
+};
+
+class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star::document::XEventListener>
+{
+    private:
+        com::sun::star::uno::WeakReference<com::sun::star::document::XEventListener> mxOwner;
+
+    public:
+        WeakDocumentEventListener(com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner)
+            : mxOwner(xOwner)
+        {
+        }
+
+        virtual ~WeakDocumentEventListener()
+        {
+        }
+
+        virtual void SAL_CALL notifyEvent(const com::sun::star::document::EventObject& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->notifyEvent(rEvent);
+
+        }
+
+        // lang.XEventListener
+        virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
+            throw(com::sun::star::uno::RuntimeException)
+        {
+            com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner(mxOwner.get(),
+                com::sun::star::uno::UNO_QUERY);
+            if (xOwner.is())
+                xOwner->disposing(rEvent);
+
+        }
+};
+
+
 } // namespace framework
 
 #endif // __MISC_HELPER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index 55db4bf708dc..02af7f68de3a 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ class FWI_DLLPUBLIC NetworkDomain
 }
 
 #endif // __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index ec5161ef5335..3d0153d47c29 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -273,3 +274,5 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index e3fce4bcac35..b2deb60a78eb 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_
 #include <threadhelp/threadhelpbase.hxx>
-#endif
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
@@ -260,3 +259,5 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 725b6aeb9394..1c46f74bce20 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -353,3 +354,5 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/otasksaccess.hxx b/framework/inc/helper/otasksaccess.hxx
index d81e73d684f1..31eb022f4f3b 100644
--- a/framework/inc/helper/otasksaccess.hxx
+++ b/framework/inc/helper/otasksaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -252,3 +253,5 @@ class OTasksAccess  :   public css::lang::XTypeProvider             ,
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_HELPER_OTASKSACCESS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx
index acbcb5b3b050..65db97b5a880 100644
--- a/framework/inc/helper/otasksenumeration.hxx
+++ b/framework/inc/helper/otasksenumeration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_
 #include <threadhelp/threadhelpbase.hxx>
-#endif
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
@@ -270,3 +269,5 @@ class OTasksEnumeration :   public css::lang::XTypeProvider     ,
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_HELPER_OTASKSENUMERATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 3d700ee607df..f6a3219679d0 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -225,3 +226,5 @@ class PersistentWindowState :   // interfaces
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index d1c50d3d9a14..a1059a2ce6cd 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,5 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn
 }
 
 #endif // __FRAMEWORK_CLASSES_PROPERTYSETCONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index 1d323551b841..cd0874470ef5 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ class ShareGuard
 }
 
 #endif // #ifndef __FRAMEWORK_HELPER_SHAREABLEMUTEX_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index f43dc6d4f778..4ce29b42159b 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ class StatusIndicator : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_STATUSINDICATOR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index e36d79e0d1db..a01bf9570296 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,9 +59,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#ifndef _COM_SUN_STAR_URTIL_XUPDATABLE_HPP_
 #include <com/sun/star/util/XUpdatable.hpp>
-#endif
 
 //_______________________________________________
 // include others
@@ -147,14 +146,6 @@ struct IndicatorInfo
             return (m_xIndicator == xIndicator);
         }
 };
-/*
-    //---------------------------------------------------------------------------------------------------------
-    // norm nValue to fit range of 0..100%
-    sal_Int32 calcPercentage()
-    {
-    return ::std::min( (( m_nValue * 100 )/ ::std::max( m_nRange, (sal_Int32)1 ) ), (sal_Int32)100 );
-    }
-*/
 
 //===============================================
 /** @descr  Define a lits of child indicator objects and her data. */
@@ -339,3 +330,5 @@ class StatusIndicatorFactory : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_HELPER_STATUSINDICATORFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index 2aec417eb375..cafbaef63798 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -155,3 +156,5 @@ class TagWindowAsModified :   // interfaces
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx
index a37bd5b2ce05..9abfa775fb25 100644
--- a/framework/inc/helper/timerhelper.hxx
+++ b/framework/inc/helper/timerhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,7 @@
 #define __FRAMEWORK_HELPER_TIMERHELPER_HXX_
 
 #include <threadhelp/threadhelpbase.hxx>
-#include <vos/timer.hxx>
+#include <salhelper/timer.hxx>
 #include <osl/mutex.hxx>
 
 //........................................................................
@@ -51,3 +52,4 @@ namespace framework
 
 #endif // _FRAMEWORK_HELPER_TIMERHELPER_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index f74926f07131..86c52f23fc28 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,73 +33,43 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
 #include <threadhelp/threadhelpbase.hxx>
-#endif
 
-#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
 #include <macros/debug.hxx>
-#endif
 
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
 #include <macros/xinterface.hxx>
-#endif
 
-#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
 #include <macros/xtypeprovider.hxx>
-#endif
 
-#ifndef __FRAMEWORK_GENERAL_H_
 #include <general.h>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
 #include <com/sun/star/lang/XInitialization.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
 #include <com/sun/star/frame/XFrame.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_FRAME_XTITLE_HPP_
 #include <com/sun/star/frame/XTitle.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HPP_
 #include <com/sun/star/frame/XFrameActionListener.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGELISTENER_HPP_
 #include <com/sun/star/frame/XTitleChangeListener.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_
 #include <com/sun/star/lang/XEventListener.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
 #include <unotools/moduleoptions.hxx>
-#endif
 
-#ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
 
-#ifndef _RTL_USTRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  const
@@ -242,8 +213,14 @@ class TitleBarUpdate : // interfaces
          */
         void impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame);
 
+        //Hook to set GNOME3/Windows 7 applicationID for toplevel frames
+        //http://msdn.microsoft.com/en-us/library/dd378459(v=VS.85).aspx
+        //http://live.gnome.org/GnomeShell/ApplicationBased
+        void impl_updateApplicationID(const css::uno::Reference< css::frame::XFrame >& xFrame);
 }; // class TitleBarUpdate
 
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index d2df4bc541b3..ee395865dc5d 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,5 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index 667af7d7f97b..9f470282fbba 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,3 +132,5 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index ec2d5ce72bc5..933e1eba4f7a 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,3 +132,5 @@ class VCLStatusIndicator : public  css::task::XStatusIndicator
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_VCLSTATUSINDICATOR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 7d3ca0539ef8..0d526fcaea94 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,16 +36,12 @@
 #include <macros/debug.hxx>
 #include <macros/generic.hxx>
 
-#ifndef __FRAMEWORK_GENERAL_HXX_
 #include <general.h>
-#endif
 
 //_______________________________________________
 // include UNO interfaces
 
-#ifndef _COM_SUN_STAR_URTIL_XUPDATABLE_HPP_
 #include <com/sun/star/util/XUpdatable.hpp>
-#endif
 
 //_______________________________________________
 // include all others
@@ -98,3 +95,5 @@ class WakeUpThread : public ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_HELPER_WAKEUPTHREAD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index b5cd1f6a4ac1..db121324ed1c 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -29,9 +29,7 @@
 
 #define HID_BACKINGWINDOW                           "FWK_HID_BACKINGWINDOW"
 #define HID_LICENSEDIALOG                           "FWK_HID_LICENSEDIALOG"
-#define HID_STATUSBAR                               "FWK_HID_STATUSBAR"
-#define HID_SVX_COMMON_MACRO_ORGANIZER              "FWK_HID_SVX_COMMON_MACRO_ORGANIZER"
-#define HID_SVX_BASIC_MACRO_ORGANIZER               "FWK_HID_SVX_BASIC_MACRO_ORGANIZER"
+#define HID_STATUSBAR                   "FWK_HID_STATUSBAR"
 
 #endif // #ifndef _FRAMEWORK_HELPID_HRC
 
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 0d812774e583..caf3bdabe586 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,5 @@ class QuietInteraction : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_INTERACTION_STILLINTERACTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 31fb5d757656..7b8f82950da9 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_CONFIG_CONFIGACCESS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index b893403c79ce..0d9af57bc75c 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -229,3 +230,5 @@ class HelpOnStartup : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_HELPONSTARTUP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 9a4541896e4f..7b2f713d0faa 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,5 @@ class Job : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOB_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 3222479af82f..b8888347f3c6 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ class FWI_DLLPUBLIC JobConst
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOBCONST_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index e9cc79030770..9b46c099ec1b 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -293,3 +294,5 @@ class JobData : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOBDATA_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 49b6b31b8cac..78c1535192c0 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,3 +160,5 @@ class JobDispatch : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOBDISPATCH_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index 955b2978f791..114e70d86ea5 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,6 +96,9 @@ class JobExecutor : public  css::lang::XTypeProvider
         /** we listen at the configuration for changes at the event list. */
         ConfigAccess m_aConfig;
 
+        /** helper to allow us listen to the configuration without a cyclic dependency */
+        com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> m_xConfigListener;
+
     //___________________________________
     // native interface methods
 
@@ -131,3 +135,5 @@ class JobExecutor : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOBEXECUTOR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 9d2a7c1419cd..1838d947ac85 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -145,3 +146,5 @@ class JobResult : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOBRESULT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 15cc4f37da2e..8217a588eebc 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -175,3 +176,5 @@ class JobURL : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_JOBURL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 48096a9449e3..a860dc1df373 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -167,3 +168,5 @@ class ShellJob : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_JOBS_SHELLJOB_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h
index 5ed1e86e8e44..4d74ea088c2e 100644
--- a/framework/inc/loadstate.h
+++ b/framework/inc/loadstate.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ class LoadStateHelper
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_LOADSTATE_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index f48d816460d2..48248ddb961f 100644
--- a/framework/inc/macros/debug.hxx
+++ b/framework/inc/macros/debug.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index 080dd5805b30..5f4e3097e22e 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,15 +50,11 @@
 //      1)  LOGTYPE                                                         use it to define the output of all assertions, errors, exception infos
 //      2)  LOGFILE_ASSERTIONS                                              use it to define the file name to log assertions if LOGTYPE=LOGTYPE_FILE...
 //      3)  LOGFILE_WARNINGS                                                use it to define the file name to log warnings if LOGTYPE=LOGTYPE_FILE...
-//
 //      active for "non product":
-//
 //      4)  LOG_ASSERT( BCONDITION, STEXT )                                 assert some critical errors wich depend from given condition
 //      4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT )                       same like 4) + additional location of error
 //      5)  LOG_ERROR( SMETHOD, STEXT )                                     show errors without any condition
-//
 //      active for debug only!
-//
 //      6)  LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE )        show/log an exception for easier debug
 //      7)  LOG_WARNING( SMETHOD, STEXT )                                   should be used to detect leaks in algorithm, mechanism or operation handling
 //*****************************************************************************************************************
@@ -233,3 +230,5 @@
 #endif  // ENABLE_WARNINGS
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index 794057100766..5e52a29eac84 100644
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/event.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_EVENT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index ab408f1b50e5..c4b49a81d55b 100644
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -128,3 +129,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_FILTERDBG_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index a2f6e4ec6f48..1e1031039971 100644
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 0c5be0d237c9..6655146733db 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,9 +50,7 @@
     #include <rtl/strbuf.hxx>
     #endif
 
-    #ifndef __SGI_STL_VECTOR
     #include <vector>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_MEMORYMEASURE
@@ -221,3 +220,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_MEMORYMEASURE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index 85aec5acd9cd..829f64fa1ee9 100644
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/mutex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_MUTEX_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index 6ef4af316877..a67011b2248c 100644
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -200,3 +201,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_PLUGIN_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index afb359348349..f12c380011d8 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx
index 3f87b2fb7a30..fda6711d93fe 100644
--- a/framework/inc/macros/debug/targeting.hxx
+++ b/framework/inc/macros/debug/targeting.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -250,3 +251,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_TARGETING_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx
index 119c6f7b1eb1..c568fb85f177 100644
--- a/framework/inc/macros/debug/timemeasure.hxx
+++ b/framework/inc/macros/debug/timemeasure.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -138,3 +139,5 @@
 //*****************************************************************************************************************
 
 #endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_TIMEMEASURE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
index a18cf5cb9872..b74225603b41 100644
--- a/framework/inc/macros/generic.hxx
+++ b/framework/inc/macros/generic.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ ________________________________________________________________________________
 //*****************************************************************************************************************
 
 #endif  //  #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 11f7c297c645..74ab29d2c4bf 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ ________________________________________________________________________________
 //}     //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 48a8654486c3..8dd368353583 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -706,3 +707,5 @@ ________________________________________________________________________________
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 473ce69a74e6..f031a37ff8b4 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -156,7 +157,7 @@ ________________________________________________________________________________
         throw( css::uno::Exception )                                                                                                                                \
     {                                                                                                                                                               \
         /* retrieve component context from the given service manager */                                                                                             \
-        static const ::rtl::OUString PROP_DEFAULTCONTEXT = ::rtl::OUString::createFromAscii("DefaultContext");                                                      \
+        static const ::rtl::OUString PROP_DEFAULTCONTEXT(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"));                                                        \
         css::uno::Reference< css::beans::XPropertySet >    xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW);                                                  \
         css::uno::Reference< css::uno::XComponentContext > xComponentContext;                                                                                       \
         xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext;                                                                                  \
@@ -270,3 +271,5 @@ ________________________________________________________________________________
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 3e4decb3ac0f..5de8b904fa8f 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -712,3 +713,5 @@ ________________________________________________________________________________
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/mediadescriptor.h b/framework/inc/mediadescriptor.h
deleted file mode 100644
index 278f13463ae7..000000000000
--- a/framework/inc/mediadescriptor.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_MEDIADESCRIPTOR_H_
-#define __FRAMEWORK_MEDIADESCRIPTOR_H_
-
-//_______________________________________________
-// namespace
-
-namespace framework{
-
-//static const ::rtl::OUString MEDIADESCRIPTOR_ASTEMPLATE         = ::rtl::OUString::createFromAscii("AsTemplate"        );
-//static const ::rtl::OUString MEDIADESCRIPTOR_CHARACTERSET       = ::rtl::OUString::createFromAscii("CharacterSet"      );
-//static const ::rtl::OUString MEDIADESCRIPTOR_DEEPDETECTION      = ::rtl::OUString::createFromAscii("DeepDetection"     );
-//static const ::rtl::OUString MEDIADESCRIPTOR_DETECTSERVICE      = ::rtl::OUString::createFromAscii("DetectService"     );
-//static const ::rtl::OUString MEDIADESCRIPTOR_EXTENSION          = ::rtl::OUString::createFromAscii("Extension"         );
-//static const ::rtl::OUString MEDIADESCRIPTOR_FILENAME           = ::rtl::OUString::createFromAscii("FileName"          ); // deprecated!
-//static const ::rtl::OUString MEDIADESCRIPTOR_FILTERNAME         = ::rtl::OUString::createFromAscii("FilterName"        );
-//static const ::rtl::OUString MEDIADESCRIPTOR_FILTEROPTIONS      = ::rtl::OUString::createFromAscii("FilterOptions"     );
-//static const ::rtl::OUString MEDIADESCRIPTOR_FORMAT             = ::rtl::OUString::createFromAscii("Format"            );
-//static const ::rtl::OUString MEDIADESCRIPTOR_FRAMENAME          = ::rtl::OUString::createFromAscii("FrameName"         );
-//static const ::rtl::OUString MEDIADESCRIPTOR_HIDDEN             = ::rtl::OUString::createFromAscii("Hidden"            );
-//static const ::rtl::OUString MEDIADESCRIPTOR_INPUTSTREAM        = ::rtl::OUString::createFromAscii("InputStream"       );
-//static const ::rtl::OUString MEDIADESCRIPTOR_INTERACTIONHANDLER = ::rtl::OUString::createFromAscii("InteractionHandler");
-//static const ::rtl::OUString MEDIADESCRIPTOR_JUMPMARK           = ::rtl::OUString::createFromAscii("JumpMark"          );
-//static const ::rtl::OUString MEDIADESCRIPTOR_MACROEXECUTIONMODE = ::rtl::OUString::createFromAscii("MacroExecutionMode");
-//static const ::rtl::OUString MEDIADESCRIPTOR_MEDIATYPE          = ::rtl::OUString::createFromAscii("MediaType"         );
-//static const ::rtl::OUString MEDIADESCRIPTOR_MINIMIZED          = ::rtl::OUString::createFromAscii("Minimized"         );
-//static const ::rtl::OUString MEDIADESCRIPTOR_OPENNEWVIEW        = ::rtl::OUString::createFromAscii("OpenNewView"       );
-//static const ::rtl::OUString MEDIADESCRIPTOR_OUTPUTSTREAM       = ::rtl::OUString::createFromAscii("OutputStream"      );
-//static const ::rtl::OUString MEDIADESCRIPTOR_PATTERN            = ::rtl::OUString::createFromAscii("Pattern"           );
-//static const ::rtl::OUString MEDIADESCRIPTOR_POSSIZE            = ::rtl::OUString::createFromAscii("PosSize"           );
-//static const ::rtl::OUString MEDIADESCRIPTOR_POSTDATA           = ::rtl::OUString::createFromAscii("PostData"          );
-//static const ::rtl::OUString MEDIADESCRIPTOR_POSTSTRING         = ::rtl::OUString::createFromAscii("PostString"        );
-//static const ::rtl::OUString MEDIADESCRIPTOR_PREVIEW            = ::rtl::OUString::createFromAscii("Preview"           );
-//static const ::rtl::OUString MEDIADESCRIPTOR_READONLY           = ::rtl::OUString::createFromAscii("ReadOnly"          );
-//static const ::rtl::OUString MEDIADESCRIPTOR_REFERRER           = ::rtl::OUString::createFromAscii("Referer"           );
-//static const ::rtl::OUString MEDIADESCRIPTOR_SILENT             = ::rtl::OUString::createFromAscii("Silent"            );
-//static const ::rtl::OUString MEDIADESCRIPTOR_STATUSINDICATOR    = ::rtl::OUString::createFromAscii("StatusIndicator"   );
-//static const ::rtl::OUString MEDIADESCRIPTOR_TEMPLATENAME       = ::rtl::OUString::createFromAscii("TemplateName"      );
-//static const ::rtl::OUString MEDIADESCRIPTOR_TEMPLATEREGIONNAME = ::rtl::OUString::createFromAscii("TemplateRegionName");
-//static const ::rtl::OUString MEDIADESCRIPTOR_TYPENAME           = ::rtl::OUString::createFromAscii("TypeName"          );
-//static const ::rtl::OUString MEDIADESCRIPTOR_UPDATEDOCMODE      = ::rtl::OUString::createFromAscii("UpdateDocMode"     );
-//static const ::rtl::OUString MEDIADESCRIPTOR_URL                = ::rtl::OUString::createFromAscii("URL"               );
-//static const ::rtl::OUString MEDIADESCRIPTOR_VERSION            = ::rtl::OUString::createFromAscii("Version"           );
-//static const ::rtl::OUString MEDIADESCRIPTOR_VIEWID             = ::rtl::OUString::createFromAscii("ViewId"            );
-//static const ::rtl::OUString MEDIADESCRIPTOR_REPAIRPACKAGE      = ::rtl::OUString::createFromAscii("RepairPackage"     );
-//static const ::rtl::OUString MEDIADESCRIPTOR_DOCUMENTTITLE      = ::rtl::OUString::createFromAscii("DocumentTitle"     );
-//static const ::rtl::OUString MEDIADESCRIPTOR_MODEL              = ::rtl::OUString::createFromAscii("Model"             );
-
-} // namespace framework
-
-#endif // #ifndef __FRAMEWORK_MEDIADESCRIPTOR_H_
diff --git a/framework/inc/pch/precompiled_framework.cxx b/framework/inc/pch/precompiled_framework.cxx
index 0ce4985778a8..226aebcf5af5 100644
--- a/framework/inc/pch/precompiled_framework.cxx
+++ b/framework/inc/pch/precompiled_framework.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_framework.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index b4afb017ebab..9dc3898bb3d3 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -359,6 +360,7 @@
 #include "rtl/instance.hxx"
 #include "rtl/logfile.hxx"
 #include "rtl/random.h"
+#include "rtl/ref.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.h"
 #include "rtl/string.hxx"
@@ -368,9 +370,10 @@
 #include "rtl/ustring.hxx"
 
 #include "sal/alloca.h"
-#include "sal/main.h"
 
+#include "salhelper/simplereferenceobject.hxx"
 #include "salhelper/singletonref.hxx"
+#include "salhelper/timer.hxx"
 
 #include "sot/exchange.hxx"
 #include "sot/filelist.hxx"
@@ -484,12 +487,9 @@
 #include "vcl/window.hxx"
 #include "tools/wintypes.hxx"
 
-#include "vos/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/ref.hxx"
-#include "vos/thread.hxx"
-#include "vos/timer.hxx"
+
 
 //---MARKER---
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index df4489c4cd0a..c04984cf5aaa 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,30 +133,30 @@ namespace framework{
 #define PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY      "UserDictionary"
 #define PATHSETTINGS_PROPNAME_ASCII_WORK                "Work"
 
-#define PATHSETTINGS_PROPNAME_ADDIN                     ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_ADDIN         )
-#define PATHSETTINGS_PROPNAME_AUTOCORRECT               ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_AUTOCORRECT   )
-#define PATHSETTINGS_PROPNAME_AUTOTEXT                  ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_AUTOTEXT      )
-#define PATHSETTINGS_PROPNAME_BACKUP                    ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_BACKUP        )
-#define PATHSETTINGS_PROPNAME_BASIC                     ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_BASIC         )
-#define PATHSETTINGS_PROPNAME_BITMAP                    ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_BITMAP        )
-#define PATHSETTINGS_PROPNAME_CONFIG                    ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_CONFIG        )
-#define PATHSETTINGS_PROPNAME_DICTIONARY                ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_DICTIONARY    )
-#define PATHSETTINGS_PROPNAME_FAVORITE                  ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_FAVORITE      )
-#define PATHSETTINGS_PROPNAME_FILTER                    ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_FILTER        )
-#define PATHSETTINGS_PROPNAME_GALLERY                   ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_GALLERY       )
-#define PATHSETTINGS_PROPNAME_GRAPHIC                   ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_GRAPHIC       )
-#define PATHSETTINGS_PROPNAME_HELP                      ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_HELP          )
-#define PATHSETTINGS_PROPNAME_LINGUISTIC                ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_LINGUISTIC    )
-#define PATHSETTINGS_PROPNAME_MODULE                    ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_MODULE        )
-#define PATHSETTINGS_PROPNAME_PALETTE                   ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_PALETTE       )
-#define PATHSETTINGS_PROPNAME_PLUGIN                    ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_PLUGIN        )
-#define PATHSETTINGS_PROPNAME_STORAGE                   ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_STORAGE       )
-#define PATHSETTINGS_PROPNAME_TEMP                      ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_TEMP          )
-#define PATHSETTINGS_PROPNAME_TEMPLATE                  ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_TEMPLATE      )
-#define PATHSETTINGS_PROPNAME_UICONFIG                  ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_UICONFIG      )
-#define PATHSETTINGS_PROPNAME_USERCONFIG                ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_USERCONFIG    )
-#define PATHSETTINGS_PROPNAME_USERDICTIONARY            ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY)
-#define PATHSETTINGS_PROPNAME_WORK                      ::rtl::OUString::createFromAscii(PATHSETTINGS_PROPNAME_ASCII_WORK          )
+#define PATHSETTINGS_PROPNAME_ADDIN                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_ADDIN))
+#define PATHSETTINGS_PROPNAME_AUTOCORRECT               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_AUTOCORRECT))
+#define PATHSETTINGS_PROPNAME_AUTOTEXT                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_AUTOTEXT))
+#define PATHSETTINGS_PROPNAME_BACKUP                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_BACKUP))
+#define PATHSETTINGS_PROPNAME_BASIC                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_BASIC))
+#define PATHSETTINGS_PROPNAME_BITMAP                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_BITMAP))
+#define PATHSETTINGS_PROPNAME_CONFIG                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_CONFIG))
+#define PATHSETTINGS_PROPNAME_DICTIONARY                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_DICTIONARY))
+#define PATHSETTINGS_PROPNAME_FAVORITE                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_FAVORITE))
+#define PATHSETTINGS_PROPNAME_FILTER                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_FILTER))
+#define PATHSETTINGS_PROPNAME_GALLERY                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_GALLERY))
+#define PATHSETTINGS_PROPNAME_GRAPHIC                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_GRAPHIC))
+#define PATHSETTINGS_PROPNAME_HELP                      ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_HELP))
+#define PATHSETTINGS_PROPNAME_LINGUISTIC                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_LINGUISTIC))
+#define PATHSETTINGS_PROPNAME_MODULE                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_MODULE))
+#define PATHSETTINGS_PROPNAME_PALETTE                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_PALETTE))
+#define PATHSETTINGS_PROPNAME_PLUGIN                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_PLUGIN))
+#define PATHSETTINGS_PROPNAME_STORAGE                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_STORAGE))
+#define PATHSETTINGS_PROPNAME_TEMP                      ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_TEMP))
+#define PATHSETTINGS_PROPNAME_TEMPLATE                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_TEMPLATE))
+#define PATHSETTINGS_PROPNAME_UICONFIG                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_UICONFIG))
+#define PATHSETTINGS_PROPNAME_USERCONFIG                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_USERCONFIG))
+#define PATHSETTINGS_PROPNAME_USERDICTIONARY            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_USERDICTIONARY))
+#define PATHSETTINGS_PROPNAME_WORK                      ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATHSETTINGS_PROPNAME_ASCII_WORK))
 
 // Please add new entries alphabetical sorted and correct all other handles!
 // Start counting with 0, so it can be used as direct index into an array too.
@@ -197,12 +198,12 @@ namespace framework{
 #define LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT              "LockCount"
 #define LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE  "PreserveContentSize"
 
-#define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER            ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER )
-#define LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS        ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS )
-#define LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY        ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY )
-#define LAYOUTMANAGER_PROPNAME_HIDECURRENTUI            ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI )
-#define LAYOUTMANAGER_PROPNAME_LOCKCOUNT                ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT )
-#define LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE    ::rtl::OUString::createFromAscii( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE )
+#define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER ))
+#define LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS ))
+#define LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY ))
+#define LAYOUTMANAGER_PROPNAME_HIDECURRENTUI            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI ))
+#define LAYOUTMANAGER_PROPNAME_LOCKCOUNT                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT ))
+#define LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE ))
 
 #define LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER          0
 #define LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS      1
@@ -232,9 +233,9 @@ namespace framework{
 #define AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA  "ExistsSessionData"
 #define AUTORECOVERY_PROPNAME_ASCII_CRASHED             "Crashed"
 
-#define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA       ::rtl::OUString::createFromAscii( AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA )
-#define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA        ::rtl::OUString::createFromAscii( AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA )
-#define AUTORECOVERY_PROPNAME_CRASHED                   ::rtl::OUString::createFromAscii( AUTORECOVERY_PROPNAME_ASCII_CRASHED )
+#define AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA ))
+#define AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AUTORECOVERY_PROPNAME_ASCII_EXISTS_SESSIONDATA ))
+#define AUTORECOVERY_PROPNAME_CRASHED                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AUTORECOVERY_PROPNAME_ASCII_CRASHED ))
 
 #define AUTORECOVERY_PROPHANDLE_EXISTS_RECOVERYDATA     0
 #define AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA      1
@@ -247,7 +248,7 @@ namespace framework{
 
 #define FILTER_PROPNAME_ASCII_DOCUMENTSERVICE           "DocumentService"
 
-#define FILTER_PROPNAME_DOCUMENTSERVICE                 ::rtl::OUString::createFromAscii( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE )
+#define FILTER_PROPNAME_DOCUMENTSERVICE                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE ))
 
 //_______________________________________________
 /** properties for office module config (Setup.xcu) */
@@ -256,42 +257,25 @@ namespace framework{
 #define OFFICEFACTORY_PROPNAME_ASCII_UINAME             "ooSetupFactoryUIName"
 #define OFFICEFACTORY_PROPNAME_ASCII_ICON               "ooSetupFactoryIcon"
 
-#define OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES         ::rtl::OUString::createFromAscii( OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES )
-#define OFFICEFACTORY_PROPNAME_UINAME                   ::rtl::OUString::createFromAscii( OFFICEFACTORY_PROPNAME_ASCII_UINAME )
-#define OFFICEFACTORY_PROPNAME_ICON                     ::rtl::OUString::createFromAscii( OFFICEFACTORY_PROPNAME_ASCII_ICON )
+#define OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES ))
+#define OFFICEFACTORY_PROPNAME_UINAME                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OFFICEFACTORY_PROPNAME_ASCII_UINAME ))
+#define OFFICEFACTORY_PROPNAME_ICON                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OFFICEFACTORY_PROPNAME_ASCII_ICON ))
 
 //_______________________________________________
 /** properties for tab window (old) */
 #define TABWINDOW_PROPNAME_ASCII_PARENTWINDOW           "ParentWindow"
 #define TABWINDOW_PROPNAME_ASCII_TOPWINDOW              "TopWindow"
-#define TABWINDOW_PROPNAME_PARENTWINDOW                 ::rtl::OUString::createFromAscii( TABWINDOW_PROPNAME_ASCII_PARENTWINDOW )
-#define TABWINDOW_PROPNAME_TOPWINDOW                    ::rtl::OUString::createFromAscii( TABWINDOW_PROPNAME_ASCII_TOPWINDOW )
+#define TABWINDOW_PROPNAME_PARENTWINDOW                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TABWINDOW_PROPNAME_ASCII_PARENTWINDOW ))
+#define TABWINDOW_PROPNAME_TOPWINDOW                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TABWINDOW_PROPNAME_ASCII_TOPWINDOW ))
 
 #define TABWINDOW_PROPHANDLE_PARENTWINDOW               0
 #define TABWINDOW_PROPHANDLE_TOPWINDOW                  1
 #define TABWINDOW_PROPCOUNT                             2
 
-//_______________________________________________
-/** properties for tab window service (new) */
-#define TABWINDOWSERVICE_PROPNAME_ASCII_WINDOW          "Window"
-#define TABWINDOWSERVICE_PROPNAME_WINDOW                ::rtl::OUString::createFromAscii( TABWINDOWSERVICE_PROPNAME_ASCII_WINDOW )
-
 #define TABWINDOWSERVICE_PROPHANDLE_WINDOW              0
 #define TABWINDOWSERVICE_PROPCOUNT                      1
 
 //_______________________________________________
-/** properties of tabreg service */
-static const char* TABREG_PROPNAME_ASCII_TITLE          = "title";
-
-static const ::rtl::OUString TABREG_PROPNAME_TITLE      = ::rtl::OUString::createFromAscii(TABREG_PROPNAME_ASCII_TITLE);
-
-//_______________________________________________
-/** properties of controller service */
-static const char* CONTROLLER_PROPNAME_ASCII_ICONID         = "IconId";
-
-static const ::rtl::OUString CONTROLLER_PROPNAME_ICONID     = ::rtl::OUString::createFromAscii(CONTROLLER_PROPNAME_ASCII_ICONID);
-
-//_______________________________________________
 /** provides some helper methods to implement property sets. */
 
 class PropHelper
@@ -352,3 +336,5 @@ class PropHelper
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_PROPERTIES_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index 20273e9a4325..88ec160e50ec 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -155,3 +156,5 @@ class ProtocolCheck
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_PROTOCOLS_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index b8d122118abf..02b376b9fa2a 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -400,3 +401,5 @@ class QueryAnalyzer
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_QUERIES_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index c24e29c8312a..bdbeaa645932 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 #ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDER_HXX_
 #define __FRAMEWORK_RECORDING_DISPATCHRECORDER_HXX_
@@ -86,3 +87,5 @@ class DispatchRecorder
 } // namespace framework
 
 #endif // define __FRAMEWORK...
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index b1fa77114b98..9c2578359adc 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ class DispatchRecorderSupplier  :   // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services.h b/framework/inc/services.h
index bdd6221eff9c..232d9240810c 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,7 +53,6 @@ namespace framework{
 #define SERVICENAME_URLTRANSFORMER                              DECLARE_ASCII("com.sun.star.util.URLTransformer"                    )
 #define SERVICENAME_PLUGINFRAME                                 DECLARE_ASCII("com.sun.star.mozilla.Plugin"                         )
 #define SERVICENAME_BRIDGEFACTORY                               DECLARE_ASCII("com.sun.star.bridge.BridgeFactory"                   )
-#define SERVICENAME_INIMANAGER                                  DECLARE_ASCII("com.sun.star.config.INIManager"                      )
 #define SERVICENAME_MEDIATYPEDETECTIONHELPER                    DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper"         )
 #define SERVICENAME_LOGINDIALOG                                 DECLARE_ASCII("com.sun.star.framework.LoginDialog"                  )
 #define SERVICENAME_CONFIGURATION                               DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry"    )
@@ -220,3 +220,4 @@ namespace framework{
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_H_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index ef35522333a9..0e65f314b13e 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -334,6 +335,12 @@ class AutoRecovery  : public  css::lang::XTypeProvider
         css::uno::Reference< css::container::XNameAccess > m_xRecoveryCFG;
 
         //---------------------------------------
+        /** @short  proxy weak binding to forward Events to ourself without
+                    an ownership cycle
+          */
+        css::uno::Reference< css::util::XChangesListener > m_xRecoveryCFGListener;
+
+        //---------------------------------------
         /** @short  points to the used configuration package or.openoffice.Setup
             @descr  This instance does not cache - it calls directly the
                     configuration API!
@@ -347,6 +354,12 @@ class AutoRecovery  : public  css::lang::XTypeProvider
         css::uno::Reference< css::document::XEventBroadcaster > m_xNewDocBroadcaster;
 
         //---------------------------------------
+        /** @short  proxy weak binding to forward Events to ourself without
+                    an ownership cycle
+          */
+        css::uno::Reference< css::document::XEventListener > m_xNewDocBroadcasterListener;
+
+        //---------------------------------------
         /** @short  because we stop/restart listening sometimes, it's a good idea to know
                     if we already registered as listener .-)
         */
@@ -848,6 +861,26 @@ class AutoRecovery  : public  css::lang::XTypeProvider
                                                                             const ::rtl::OUString&             sEventType,
                                                                                   AutoRecovery::TDocumentInfo* pInfo     );
 
+
+        class ListenerInformer
+        {
+        private:
+            AutoRecovery &m_rRecovery;
+            sal_Int32 m_eJob;
+            bool m_bStopped;
+        public:
+            ListenerInformer(AutoRecovery &rRecovery, sal_Int32 eJob)
+                : m_rRecovery(rRecovery), m_eJob(eJob), m_bStopped(false)
+            {
+            }
+            void start();
+            void stop();
+            ~ListenerInformer()
+            {
+                stop();
+            }
+        };
+
         //---------------------------------------
 
         // TODO document me
@@ -1020,3 +1053,5 @@ class AutoRecovery  : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_AUTORECOVERY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index 17a902f7d24d..a2614f92ea72 100644
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,13 +46,9 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XKeyListener.hpp>
 
-#ifndef _COM_SUN_STAR_FAME_XFRAME_HPP_
 #include <com/sun/star/frame/XFrame.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
@@ -164,3 +161,5 @@ class BackingComp : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_BACKINGCOMP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index 68960e101157..80c0d7395465 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
 #include <macros/xserviceinfo.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <general.h>
 
 //_________________________________________________________________________________________________________________
@@ -233,10 +232,11 @@ class ContentHandlerFactory :   // interfaces
 
         css::uno::Reference< css::lang::XMultiServiceFactory >      m_xFactory              ;
         FilterCache                                                 m_aCache                ;
-//      ::cppu::OMultiTypeInterfaceContainerHelper                  m_aListenerContainer    ;
 
 };      //  class ContentHandlerFactory
 
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 47bb501aeef8..8dcc87227780 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -511,3 +512,5 @@ class Desktop   :   // interfaces
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_DESKTOP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx
index d24261ce290d..0ada11946c3b 100644
--- a/framework/inc/services/detectorfactory.hxx
+++ b/framework/inc/services/detectorfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -459,3 +460,5 @@ class DetectorFactory : // interfaces
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_SERVICES_DETECTORFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 0d5c2f097d9d..7975333ac001 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,5 @@ class DispatchHelper : public ThreadHelpBase                      // must be the
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 6c8a6ed4dd58..7edb072493b9 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <macros/generic.hxx>
 #include <macros/debug.hxx>
 #include <macros/xinterface.hxx>
@@ -106,6 +105,8 @@ enum EActiveState
     E_FOCUS             // I have the focus now. I must a member of an active path!
 };
 
+class WindowCommandDispatch;
+
 //_________________________________________________________________________________________________________________
 //  exported definitions
 //_________________________________________________________________________________________________________________
@@ -439,6 +440,8 @@ class Frame :   // interfaces
         css::uno::Reference< css::frame::XDispatchInformationProvider >         m_xDispatchInfoHelper               ;
         css::uno::Reference< css::frame::XTitle >                               m_xTitleHelper                      ;
 
+        WindowCommandDispatch*                                                  m_pWindowCommandDispatch            ;
+
     protected:
 
         FrameContainer                                                          m_aChildFrameContainer              ;   /// array of child frames
@@ -478,3 +481,5 @@ class Frame :   // interfaces
 }       // namespace framework
 
 #endif  // #ifndef __FRAMEWORK_SERVICES_FRAME_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx
index 01749f841072..462a8d1b87a0 100644
--- a/framework/inc/services/frameloaderfactory.hxx
+++ b/framework/inc/services/frameloaderfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -386,3 +387,5 @@ class FrameLoaderFactory    :   public ThreadHelpBase
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_FRAMELOADERFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index e6a638c654e9..7afd3ebc5254 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,6 +97,10 @@ namespace framework
     class ToolbarLayoutManager;
     class PanelManager;
     class GlobalSettings;
+    namespace detail
+    {
+        class InfoHelperBuilder;
+    }
     typedef ::cppu::WeakImplHelper8 <   ::com::sun::star::lang::XServiceInfo
                                     ,   ::com::sun::star::frame::XLayoutManager
                                     ,   ::com::sun::star::awt::XWindowListener
@@ -369,8 +374,12 @@ namespace framework
             PanelManager*                                                               m_pPanelManager;
             ToolbarLayoutManager*                                                       m_pToolbarManager;
             css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >       m_xToolbarManager;
+
+        friend class detail::InfoHelperBuilder;
     };
 
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index 59e7f036961e..25df65685257 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,31 +89,11 @@ namespace framework
         FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
-#if 0
-        DECL_STATIC_LINK( License, Terminate, void* );
-#endif
-
-        /*
-        XJob...
-        any execute([in] sequence< ::com::sun::star::beans::NamedValue > Arguments )
-            raises(
-                ::com::sun::star::lang::IllegalArgumentException,
-                ::com::sun::star::uno::Exception );
-        */
         virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence<css::beans::NamedValue>& args)
             throw( css::lang::IllegalArgumentException, css::uno::Exception);
 
-        /*
-        XCLoseable
-        void close( [in] boolean DeliverOwnership ) raises(CloseVetoException );
-        */
         virtual void SAL_CALL close(sal_Bool bDeliverOwnership) throw (css::util::CloseVetoException);
 
-        /*
-        XCloseVroadcaster
-        [oneway] void addCloseListener([in] XCloseListenerListener );
-        [oneway] void removeCloseListener([in] XCloseListenerListener );
-        */
         virtual void SAL_CALL addCloseListener(const css::uno::Reference< css::util::XCloseListener >& aListener) throw (css::uno::RuntimeException);
         virtual void SAL_CALL removeCloseListener(const css::uno::Reference< css::util::XCloseListener >& aListener) throw (css::uno::RuntimeException);
 
@@ -121,3 +102,5 @@ namespace framework
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 683a147adfd6..9e6018ad1f86 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ class LicenseDialog : public ModalDialog
 };
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc
index 0d845d273fd8..0d845d273fd8 100644..100755
--- a/framework/inc/services/logindialog.hrc
+++ b/framework/inc/services/logindialog.hrc
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 14e4f39462ed..50ac0c7d7879 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_THREADHELPER_THREADHELPBASE_HXX_
 #include <threadhelp/threadhelpbase.hxx>
-#endif
 #include <macros/generic.hxx>
 #include <macros/debug.hxx>
 #include <macros/xinterface.hxx>
@@ -65,13 +64,9 @@
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
 
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/morebtn.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -126,11 +121,9 @@ namespace framework{
 //  UseProxy=[browser|custom|none]
 //  SecurityProxy=so-webcache:3128
 //  dialog=[big|small]
-//
 //  [DefaultPorts]
 //  https=8445
 //  http=8090
-//
 //  [ServerHistory]
 //  Server_1=localhost
 //  Server_2=munch:7202
@@ -809,7 +802,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @short      helper methods to read/write  properties from/to ini file
             @descr      Using of Config-Class isn't easy everytime :-(
                         Thats the reason for these helper. State of operation isn't realy important ..
-                        but we assert impossible cases or occured errors!
+                        but we assert impossible cases or occurred errors!
 
             @seealso    -
 
@@ -888,3 +881,5 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 0451f0f1e52c..146fcbdaf71e 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,5 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::
 }       // namespace framework
 
 #endif  // #ifndef __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/modelwinservice.hxx b/framework/inc/services/modelwinservice.hxx
index 7e07fcb0cd37..af35b75d8b51 100755..100644
--- a/framework/inc/services/modelwinservice.hxx
+++ b/framework/inc/services/modelwinservice.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -120,3 +121,5 @@ class ModelWinService : public css::lang::XTypeProvider
 }
 
 #endif // __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index f1f6de71567f..6a94237b9234 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -199,3 +200,5 @@ class ModuleManager : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_MODULEMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 52c81c4fedeb..8e7d1de958d3 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -158,6 +159,9 @@ class PathSettings : public  css::lang::XTypeProvider             ,
         /** provides access to the new configuration schema. */
         css::uno::Reference< css::container::XNameAccess > m_xCfgNew;
 
+        /** helper to listen for configuration changes without ownership cycle problems */
+        css::uno::Reference< css::util::XChangesListener > m_xCfgNewListener;
+
         ::cppu::OPropertyArrayHelper* m_pPropHelp;
 
         ::sal_Bool m_bIgnoreEvents;
@@ -293,3 +297,5 @@ class PathSettings : public  css::lang::XTypeProvider             ,
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 13f374f353c7..b8f62394b946 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,9 +52,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_ATOM_HXX
 #include <vcl/threadex.hxx>
-#endif
 #include <unotools/cmdoptions.hxx>
 
 
@@ -373,3 +372,5 @@ class cIMPL_MainThreadExecutor
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_PLUGINFRAME_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index 8795d578ea15..8650cc8623f4 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -186,3 +187,5 @@ class SessionListener :   // interfaces
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 8825386d1b57..009c4210ce32 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //      my own includes
@@ -110,7 +111,7 @@ struct SubstitutePathNotify
     const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames;
 };
 
-class SubstituteVariables : public ::std::hash_map< ::rtl::OUString,
+class SubstituteVariables : public ::boost::unordered_map< ::rtl::OUString,
                                                     SubstituteRule,
                                                     OUStringHashCode,
                                                     ::std::equal_to< ::rtl::OUString > >
@@ -192,10 +193,9 @@ enum PreDefVariable
     PREDEFVAR_PROGURL,
     PREDEFVAR_USERURL,
     PREDEFVAR_WORKDIRURL,
-    // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     PREDEFVAR_BASEINSTURL,
     PREDEFVAR_USERDATAURL,
-    // <--
     PREDEFVAR_BRANDBASEURL,
     PREDEFVAR_COUNT
 };
@@ -278,7 +278,7 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
                 throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
         private:
-            class VarNameToIndexMap : public std::hash_map< ::rtl::OUString,
+            class VarNameToIndexMap : public boost::unordered_map< ::rtl::OUString,
                                                             PreDefVariable,
                                                             OUStringHashCode,
                                                             ::std::equal_to< ::rtl::OUString > >
@@ -305,3 +305,5 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
 }
 
 #endif // __FRAMEWORK_SERVICES_SUBSTPATHVARS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index ee3c6903b896..d0cdfe60c317 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,7 +104,7 @@ struct TTabPageInfo
         css::uno::Sequence< css::beans::NamedValue >  m_lProperties;
 };
 
-typedef ::std::hash_map< ::sal_Int32                    ,
+typedef ::boost::unordered_map< ::sal_Int32                    ,
                          TTabPageInfo                   ,
                          Int32HashCode                  ,
                          ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
@@ -187,12 +188,6 @@ class TabWindowService :  public css::lang::XTypeProvider
         void impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
         TTabPageInfoHash::iterator impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
         FwkTabWindow* mem_TabWin ();
-/*
-        ::cppu::IPropertyArrayHelper& SAL_CALL              getInfoHelper();
-        const css::uno::Sequence< css::beans::Property >    impl_getStaticPropertyDescriptor();
-        static css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL
-                                                            createPropertySetInfo( ::cppu::IPropertyArrayHelper& rProperties ) SAL_THROW( () );
-*/
     //-------------------------------------------------------------------------------------------------------------
     //  variables
     //  (should be private everyway!)
@@ -230,3 +225,4 @@ class TabWindowService :  public css::lang::XTypeProvider
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_TABWINDOWSERVICE_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx
index 651d8caac826..c2b411b2042a 100644
--- a/framework/inc/services/task.hxx
+++ b/framework/inc/services/task.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -423,109 +424,7 @@ class Task  :   public css::frame::XTask    ,   // => XFrame => XComponent
 
     protected:
 
-        //---------------------------------------------------------------------------
-        //  OPropertySetHelper
-        //---------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
-            @short      try to convert a property value
-            @descr      This method is calling from helperclass "OPropertySetHelper".
-                        Don't use this directly!
-                        You must try to convert the value of given propertyhandle and
-                        return results of this operation. This will be use to ask vetoable
-                        listener. If no listener have a veto, we will change value realy!
-                        ( in method setFastPropertyValue_NoBroadcast(...) )
-
-            @seealso    OPropertySetHelper
-            @seealso    setFastPropertyValue_NoBroadcast()
-
-            @param      "aConvertedValue"   new converted value of property
-            @param      "aOldValue"         old value of property
-            @param      "nHandle"           handle of property
-            @param      "aValue"            new value of property
-
-            @return     sal_True if value will be changed, sal_FALSE otherway
-
-            @onerror    IllegalArgumentException, if you call this with an invalid argument
-        *//*-*****************************************************************************************************/
-/*
-        virtual sal_Bool SAL_CALL convertFastPropertyValue(         css::uno::Any&      aConvertedValue ,
-                                                                      css::uno::Any&        aOldValue       ,
-                                                                    sal_Int32           nHandle         ,
-                                                            const   css::uno::Any&      aValue          ) throw( css::lang::IllegalArgumentException );
-*/
-        /*-****************************************************************************************************//**
-            @short      set value of a transient property
-            @descr      This method is calling from helperclass "OPropertySetHelper".
-                        Don't use this directly!
-                        Handle and value are valid everyway! You must set the new value only.
-                        After this, baseclass send messages to all listener automaticly.
-
-            @seealso    OPropertySetHelper
-
-            @param      "nHandle"   handle of property to change
-            @param      "aValue"    new value of property
-
-            @return     -
-
-            @onerror    An exception is thrown.
-        *//*-*****************************************************************************************************/
-/*
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(         sal_Int32       nHandle ,
-                                                                  const css::uno::Any&  aValue  ) throw( css::uno::Exception );
-*/
-        /*-****************************************************************************************************//**
-            @short      get value of a transient property
-            @descr      This method is calling from helperclass "OPropertySetHelper".
-                        Don't use this directly!
-
-            @seealso    OPropertySetHelper
-
-            @param      "nHandle"   handle of property to change
-            @param      "aValue"    current value of property
-
-            @return     -
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-/*
-        virtual void SAL_CALL getFastPropertyValue( css::uno::Any&  aValue  ,
-                                                      sal_Int32     nHandle ) const;
-*/
-        /*-****************************************************************************************************//**
-            @short      return structure and information about transient properties
-            @descr      This method is calling from helperclass "OPropertySetHelper".
-                        Don't use this directly!
-
-            @seealso    OPropertySetHelper
-
-            @param      -
-
-            @return     structure with property-informations
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-/*
-        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-*/
-        /*-****************************************************************************************************//**
-            @short      return propertysetinfo
-            @descr      You can call this method to get information about transient properties
-                        of this object.
-
-            @seealso    OPropertySetHelper
-            @seealso    XPropertySet
-            @seealso    XMultiPropertySet
-
-            @param      -
-
-            @return     reference to object with information [XPropertySetInfo]
-
-            @onerror    -
-        *//*-*****************************************************************************************************/
-/*
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo();
-*/
     //-------------------------------------------------------------------------------------------------------------
     //  private methods
     //-------------------------------------------------------------------------------------------------------------
@@ -534,27 +433,7 @@ class Task  :   public css::frame::XTask    ,   // => XFrame => XComponent
 
         DECL_LINK( Close_Impl, void* );
 
-//        void    impl_SaveWindowAttributes();
-
-/*      sal_Bool impl_tryToChangeProperty(          sal_Bool            bProperty       ,
-                                            const   css::uno::Any&      aValue          ,
-                                                    css::uno::Any&      aOldValue       ,
-                                                    css::uno::Any&      aConvertedValue ) throw( css::lang::IllegalArgumentException );
-        sal_Bool impl_tryToChangeProperty(  const   ::rtl::OUString&    sProperty       ,
-                                            const   css::uno::Any&      aValue          ,
-                                                    css::uno::Any&      aOldValue       ,
-                                                    css::uno::Any&      aConvertedValue ) throw( css::lang::IllegalArgumentException );
-        sal_Bool impl_tryToChangeProperty(  const   css::awt::Point&    aProperty       ,
-                                            const   css::uno::Any&      aValue          ,
-                                                    css::uno::Any&      aOldValue       ,
-                                                    css::uno::Any&      aConvertedValue ) throw( css::lang::IllegalArgumentException );
-        sal_Bool impl_tryToChangeProperty(  const   css::awt::Size&     aProperty       ,
-                                            const   css::uno::Any&      aValue          ,
-                                                    css::uno::Any&      aOldValue       ,
-                                                    css::uno::Any&      aConvertedValue ) throw( css::lang::IllegalArgumentException );
-
-        static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
-*/
+
 
     //-------------------------------------------------------------------------------------------------------------
     //  debug methods
@@ -608,3 +487,5 @@ class Task  :   public css::frame::XTask    ,   // => XFrame => XComponent
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_TASKS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index 17ffd540ba55..ebabdd1eb31f 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -165,3 +166,5 @@ class TaskCreatorService : public  css::lang::XTypeProvider
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_TASKCREATORSRV_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 42d5fa444d6e..b38084df5fa5 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ private:
 } //    namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_URIABBREVIATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index 069227446aa8..9150b6188eae 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_
 #include <threadhelp/threadhelpbase.hxx>
-#endif
 #include <macros/generic.hxx>
 #include <macros/debug.hxx>
 #include <macros/xinterface.hxx>
@@ -221,3 +220,5 @@ class URLTransformer    :   public ::cppu::WeakImplHelper2< ::com::sun::star::ut
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 08e0f700a241..83754a884c28 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include <vector>
 #include <queue>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 // own includes
@@ -161,12 +162,12 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue;
 //_________________________________________________________________________________________________________________
 
 /**
-    Basic hash based on a std::hash_map() which provides key=[OUString] and value=[template type] pairs
+    Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs
     It implements some additional funtionality which can be usefull but
     is missing at the normal hash implementation.
 */
 template< class TType >
-class BaseHash : public ::std::hash_map< ::rtl::OUString                    ,
+class BaseHash : public ::boost::unordered_map< ::rtl::OUString                    ,
                                          TType                              ,
                                          OUStringHashCode                   ,
                                          ::std::equal_to< ::rtl::OUString > >
@@ -211,3 +212,5 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  ::rtl::OUString
 }       // namespace framework
 
 #endif  // #ifndef __FRAMEWORK_STDTYPES_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 3f0072be212f..bbad1e22a51a 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,12 +49,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#ifndef _COM_SUN_STAR_LANG_XWINDOW_HPP_
 #include <com/sun/star/awt/XWindow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XTOPWINDOW_HPP_
 #include <com/sun/star/awt/XTopWindow.hpp>
-#endif
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/awt/XSimpleTabController.hpp>
 #include <com/sun/star/awt/XTabListener.hpp>
@@ -198,3 +195,5 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
 }
 
 #endif // __FRAMEWORK_TABWIN_TABWINDOW_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index c2c33d014819..ab3bf7a41dc2 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ class TabWinFactory :  protected ThreadHelpBase
 }
 
 #endif // __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index df96d0db7f03..cb5d84b52db1 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ namespace framework{
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_TARGETS_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index 0f984c8d03f9..a47d4510c153 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -284,3 +285,5 @@ class FairRWLock : public  IRWLock
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index c3d4712d4fc9..98a2b6190ec2 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -246,3 +247,5 @@ class Gate : public  IGate
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_GATE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h
index b599dcd4ac25..78399a0f8789 100644..100755
--- a/framework/inc/threadhelp/igate.h
+++ b/framework/inc/threadhelp/igate.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ class IGate
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_IGATE_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h
index a0652ff2ea39..e19b103d0c30 100644..100755
--- a/framework/inc/threadhelp/inoncopyable.h
+++ b/framework/inc/threadhelp/inoncopyable.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ class INonCopyable
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_INONCOPYABLE_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h
index e34b310a8fe8..3d513fc07b0c 100644..100755
--- a/framework/inc/threadhelp/irwlock.h
+++ b/framework/inc/threadhelp/irwlock.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ class IRWLock
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_IRWLOCK_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index f0db5a24a113..20f93305223e 100644..100755
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,5 @@ class ITransactionManager
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 0210ad975c29..eaaf73f4f69f 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,9 +46,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
 #include <fwidllapi.h>
-
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
@@ -117,7 +116,7 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
         //-------------------------------------------------------------------------------------------------------------
         //  ctor/dtor
         //-------------------------------------------------------------------------------------------------------------
-                 LockHelper( ::vos::IMutex* pSolarMutex = NULL );
+                 LockHelper( ::osl::SolarMutex* pSolarMutex = NULL );
         virtual ~LockHelper(                                   );
 
         //-------------------------------------------------------------------------------------------------------------
@@ -138,7 +137,7 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
         //-------------------------------------------------------------------------------------------------------------
         //  something else
         //-------------------------------------------------------------------------------------------------------------
-        static LockHelper&  getGlobalLock       ( ::vos::IMutex* pSolarMutex = NULL );
+        static LockHelper&  getGlobalLock       ( ::osl::SolarMutex* pSolarMutex = NULL );
         ::osl::Mutex&       getShareableOslMutex(                                   );
 
     //-------------------------------------------------------------------------------------------------------------
@@ -170,7 +169,7 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
 
         mutable FairRWLock*     m_pFairRWLock           ;
         mutable ::osl::Mutex*   m_pOwnMutex             ;
-        mutable ::vos::IMutex*  m_pSolarMutex           ;
+        mutable ::osl::SolarMutex*  m_pSolarMutex       ;
         mutable ::osl::Mutex*   m_pShareableOslMutex    ;
         mutable sal_Bool        m_bDummySolarMutex      ;
 };
@@ -178,3 +177,5 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index 997042c9e601..7104b4d6bab8 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,40 +29,14 @@
 #ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
 #define __FRAMEWORK_THREADHELP_READGUARD_HXX_
 
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/irwlock.h>
 
-//#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-//#include <threadhelp/threadhelpbase.hxx>
-//#endif
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
 #include <sal/types.h>
 
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
-//  const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
 /*-************************************************************************************************************//**
     @short          implement a guard to set read locks
     @descr          This guard should be used to set a lock for reading object internal member.
@@ -202,3 +177,5 @@ class ReadGuard : private INonCopyable
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index 3b88294a80e3..d30a65907cba 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,40 +29,14 @@
 #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 #define __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
 #include <threadhelp/inoncopyable.h>
 #include <framework/imutex.hxx>
 
-//#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-//#include <threadhelp/threadhelpbase.hxx>
-//#endif
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
 #include <sal/types.h>
 
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
-//  const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
 /*-************************************************************************************************************//**
     @short          implement a guard for implementing save thread access
     @descr          These guard has an additional feature to well known one ::osl::Guard.
@@ -198,3 +173,5 @@ class ResetableGuard : private INonCopyable
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index 499d6324d6ca..c1063a04ffcc 100644
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,7 +78,7 @@ struct ThreadHelpBase
     //  public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        ThreadHelpBase( ::vos::IMutex* pSolarMutex = NULL )
+        ThreadHelpBase( ::osl::SolarMutex* pSolarMutex = NULL )
                 :   m_aLock( pSolarMutex )
         {
         }
@@ -94,3 +95,5 @@ struct ThreadHelpBase
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index 7cb0eba2eb61..be1f155471bd 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ struct TransactionBase
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index e116cf8a2185..7a7f72937eff 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -186,3 +187,5 @@ class TransactionGuard : private INonCopyable
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index a9608de0164d..869bd42ca238 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index 07dbdf6fe466..3f9a5dbef381 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,39 +29,12 @@
 #ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
 #define __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
 
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/irwlock.h>
 
-//#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-//#include <threadhelp/threadhelpbase.hxx>
-//#endif
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
-//  const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
 /*-************************************************************************************************************//**
     @short          implement a guard to set write locks
     @descr          This guard should be used to set a lock for reading AND writing object internal member.
@@ -262,3 +236,5 @@ class WriteGuard : private INonCopyable
 }       //  namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index b1b83de369a0..77489515b822 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -95,3 +96,5 @@ class GlobalSettings
 } // namespace framework
 
 #endif // __FRAMEWORK_UIELEMENT_WINDOWSTATECONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 1526f57fc4c5..56475bd2fd00 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/container/XNameContainer.hpp>
-#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HXX_
 #include <com/sun/star/graphic/XGraphic.hpp>
-#endif
 #include <cppuhelper/implbase1.hxx>
 
 namespace framework
@@ -72,3 +71,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_GRAPHICNAMEACCESS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index f30cb70e8387..1719070aa038 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <memory>
 
 //_________________________________________________________________________________________________________________
@@ -126,3 +127,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_IMAGEMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index d96ec77c374e..7d0a31cb2e44 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
 #ifndef __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
 #define __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <rtl/ustring.hxx>
 
 namespace framework
@@ -38,16 +39,14 @@ enum ImageType
 {
     ImageType_Color = 0,
     ImageType_Color_Large,
-    ImageType_HC,
-    ImageType_HC_Large,
     ImageType_COUNT
 };
 
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
                        rtl::OUString,
                        OUStringHashCode,
                        ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap;
-typedef std::hash_map< rtl::OUString,
+typedef boost::unordered_map< rtl::OUString,
                        bool,
                        OUStringHashCode,
                        ::std::equal_to< ::rtl::OUString > > CommandMap;
@@ -55,3 +54,5 @@ typedef std::hash_map< rtl::OUString,
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index f9d18670ddce..97d8446875e6 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <memory>
 
 //_________________________________________________________________________________________________________________
@@ -121,3 +122,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 33c4a2737cc6..26c3347f9a80 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -97,7 +98,7 @@ namespace framework
                 throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
         private:
-            typedef ::std::hash_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
+            typedef ::boost::unordered_map< rtl::OUString, com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >, OUStringHashCode, ::std::equal_to< rtl::OUString > > ModuleToModuleCfgMgr;
 
 //TODO_AS            void impl_initStorages();
 
@@ -117,3 +118,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 856746139b68..86be656196d1 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -168,7 +169,7 @@ namespace framework
 
             struct UIElementType;
             friend struct UIElementType;
-            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+            typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
 
             struct UIElementType
             {
@@ -188,7 +189,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+            typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();
@@ -224,3 +225,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index b29df7c643e3..822b0c8a6ae4 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -72,3 +73,5 @@ class UICategoryDescription :  public UICommandDescription
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_UICOMMANDCATEGORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 875ee7fb10b6..ccb2eaeaeb0d 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -56,9 +57,7 @@
 #include <com/sun/star/ui/XUIConfiguration.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONSTORGAE_HPP_
 #include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-#endif
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/ConfigurationEvent.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
@@ -156,7 +155,7 @@ namespace framework
 
             struct UIElementType;
             friend struct UIElementType;
-            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+            typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
 
             struct UIElementType
             {
@@ -176,7 +175,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+            typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();
@@ -208,3 +207,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 861237c0bf6f..6ddee64905e4 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -108,12 +109,12 @@ class WindowStateConfiguration :  private ThreadHelpBase
         virtual sal_Bool SAL_CALL hasElements()
             throw (::com::sun::star::uno::RuntimeException);
 
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  ::rtl::OUString,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap;
 
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateConfigHashMap;
@@ -129,3 +130,5 @@ class WindowStateConfiguration :  private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_UIELEMENT_WINDOWSTATECONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index bf1525cf5f63..5b71fe167e54 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_UILEMENT_TOOLBARMANAGER_HXX_
 #include <uielement/toolbarmanager.hxx>
-#endif
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -98,3 +97,5 @@ class AddonsToolBarManager : public ToolBarManager
 }
 
 #endif // __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index e1a04acef2eb..3be9b579d899 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@ class AddonsToolBarWrapper : public UIElementWrapperBase
 }
 
 #endif // __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index eba7914e9430..e0bd8b77db6b 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,5 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener,
 }
 
 #endif // __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 7cdcb5d268a9..747c0f94167f 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,12 +33,6 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/ControlCommand.hpp>
 
-//_________________________________________________________________________________________________________________
-//  includes of other projects
-//_________________________________________________________________________________________________________________
-
-//#include <vcl/toolbox.hxx>
-//#include <vcl/combobox.hxx>
 #include <uielement/complextoolbarcontroller.hxx>
 
 namespace framework
@@ -94,3 +89,5 @@ class ComboboxToolbarController : public IComboBoxListener,
 }
 
 #endif // __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index 016cee039796..aaf3ce238c8b 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,4 @@ typedef BaseHash< CommandInfo > CommandToInfoMap;
 
 #endif // __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 557523aa5359..5600262a86fc 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ class ComplexToolbarController : public svt::ToolboxController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 04db0513fd86..36e29d5ba8e0 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -136,3 +137,5 @@ class FWI_DLLPUBLIC ConstItemContainer :    public ::com::sun::star::lang::XType
 }
 
 #endif // #ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 6e0c9deb03c0..3f877f3bafc6 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,7 +91,7 @@ namespace framework
             virtual void impl_setPopupMenu();
             virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
 
-            class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString,
+            class UrlToDispatchMap : public ::boost::unordered_map< ::rtl::OUString,
                                                              com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
                                                              OUStringHashCode,
                                                              ::std::equal_to< ::rtl::OUString > >
@@ -105,11 +106,12 @@ namespace framework
             void updateImagesPopupMenu( PopupMenu* pPopupMenu );
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
 
-            sal_Bool            m_bWasHiContrast : 1,
-                                m_bShowMenuImages : 1;
+            sal_Bool            m_bShowMenuImages : 1;
             PopupMenu*          m_pResPopupMenu;
             UrlToDispatchMap    m_aURLToDispatchMap;
     };
 }
 
 #endif // __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index eb146bcacdd1..c3da8b8fe074 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ class DropdownToolbarController : public IListBoxListener,
 }
 
 #endif // __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index d8b48630da50..b86b8865981a 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ class EditToolbarController : public IEditListener,
 }
 
 #endif // __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 79905658839b..47bb56f19b3a 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 4e5623084908..8ca1d3e74e80 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index cc154e41a6c3..d91b53cc3893 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 1db3bfcc593f..fe535332ab6e 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,5 @@ class MenuToolbarController : public GenericToolbarController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 0deeb878156d..3d48608ce931 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index f99138cd6939..c759c1d7fd84 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ class ImageButtonToolbarController : public ComplexToolbarController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 91e5429f4e82..56780f44890b 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@ class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun
 }
 
 #endif // #ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 257638ecd77f..86b75f957338 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index 4d46538eb6d6..5b7134684315 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -105,3 +106,5 @@ class LangSelectionStatusbarController : public svt::StatusbarController
 } // framework namespace
 
 #endif // __FRAMEWORK_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
index 6f4a3ffb6563..cb469098183b 100644
--- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx
+++ b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ class LogoImageStatusbarController : public svt::StatusbarController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx
index 5adba49186eb..a850d83f4f22 100644
--- a/framework/inc/uielement/logotextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ class LogoTextStatusbarController : public svt::StatusbarController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index a9d323365dce..627e93d6b7d3 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 64f8667924d7..34b8ae093f07 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,7 +83,7 @@ struct PopupControllerEntry
     ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
 };
 
-typedef std::hash_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache;
+typedef boost::unordered_map< rtl::OUString, PopupControllerEntry, OUStringHashCode, ::std::equal_to< rtl::OUString > > PopupControllerCache;
 
 class BmkMenu;
 class AddonMenu;
@@ -96,7 +97,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                        public ::cppu::OWeakObject
 {
     protected:
-        // #110897#
         MenuBarManager(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
@@ -105,7 +105,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
             sal_Bool            bDelete,
             sal_Bool            bDeleteChildren );
 
-        // #110897#
         MenuBarManager(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
@@ -115,7 +114,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
             sal_Bool            bDeleteChildren );
 
     public:
-        // #110897#
         MenuBarManager(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
@@ -126,7 +124,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
             sal_Bool bDelete,
             sal_Bool bDeleteChildren );
 
-        // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
         virtual ~MenuBarManager();
@@ -247,7 +244,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                                                                                                m_bDeleteChildren : 1,
                                                                                                m_bActive : 1,
                                                                                                m_bIsBookmarkMenu : 1,
-                                                                                               m_bWasHiContrast : 1,
                                                                                                m_bShowMenuImages : 1;
         sal_Bool                                                                               m_bRetrieveImages : 1,
                                                                                                m_bAcceleratorCfg : 1;
@@ -276,3 +272,5 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
 } // namespace
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index e4e930faafe2..869e031a663c 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ class MenuBarMerger
 } // namespace framework
 
 #endif // __FRAMEWORK_UIELEMENT_MENUBARMERGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index e5ccacd28c8f..7aa5c0a4182c 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,15 +43,13 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 namespace framework
 {
@@ -60,7 +59,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
 
 {
     public:
-        // #110897#
         MenuBarWrapper(
             const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
         virtual ~MenuBarWrapper();
@@ -107,3 +105,5 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
 } // namespace framework
 
 #endif // __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 5e14b70f0044..f3c7b1b926ea 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,10 +59,8 @@
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/accel.hxx>
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 namespace framework
 {
@@ -106,7 +105,7 @@ namespace framework
                 rtl::OUString aImageId;
             };
 
-            typedef ::std::hash_map< int, AddInfo > AddInfoForId;
+            typedef ::boost::unordered_map< int, AddInfo > AddInfoForId;
 
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
@@ -114,12 +113,11 @@ namespace framework
                                                      std::vector< KeyCode >& aMenuShortCuts );
             void setAccelerators( PopupMenu* pPopupMenu );
             void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode );
-            void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast );
+            void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages );
 
         private:
             // members
             sal_Bool            m_bShowImages : 1,
-                                m_bHiContrast : 1,
                                 m_bNewMenu    : 1,
                                 m_bModuleIdentified : 1,
                                 m_bAcceleratorCfg : 1;
@@ -134,3 +132,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 7a03dfd1458e..b802c603a5da 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/panelwindow.hxx b/framework/inc/uielement/panelwindow.hxx
index e1b8ae2abcc7..324d1a38c5b0 100755..100644
--- a/framework/inc/uielement/panelwindow.hxx
+++ b/framework/inc/uielement/panelwindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ class PanelWindow : public DockingWindow
 }
 
 #endif // __FRAMEWORK_UIELEMENT_PANELWINDOW_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/panelwrapper.hxx b/framework/inc/uielement/panelwrapper.hxx
index 348fd679db9f..6d5226e19052 100755..100644
--- a/framework/inc/uielement/panelwrapper.hxx
+++ b/framework/inc/uielement/panelwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 
 #ifndef __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
@@ -66,3 +67,5 @@ class PanelWrapper : public UIElementWrapperBase
 }
 
 #endif // __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx
index ef44a4703ca2..13a6186e4513 100644
--- a/framework/inc/uielement/popupmenucontroller.hxx
+++ b/framework/inc/uielement/popupmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ public:
 } // namespace framework
 
 #endif // __FRAMEWORK_POPUPMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index e16d050e7d42..f4acc8c80d0f 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ class ProgressBarWrapper : public UIElementWrapperBase
 }       //  namespace framework
 
 #endif // _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 26a8e38dd49c..133a4eedb121 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -119,3 +120,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index df2920983c3d..92677b956f3a 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider
 }
 
 #endif // #ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index 6c13b2f6ced9..1b538390aa15 100644
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <svtools/statusbarcontroller.hxx>
 #include <vcl/image.hxx>
 
@@ -88,3 +89,5 @@ class SimpleTextStatusbarController : public svt::StatusbarController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index cd86f5951b74..3e98ff056e00 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ class SpinfieldToolbarController : public ISpinfieldListener,
 }
 
 #endif // __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 70ea373917eb..fc301e4eb3e1 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ class FrameworkStatusBar : public StatusBar
 }
 
 #endif // __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index cfcb71960304..bcd952f1b690 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
 }
 
 #endif // __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 7bb1a0bee352..b853aa1130ec 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ class StatusBarWrapper : public UIConfigElementWrapperBase
 } // namespace framework
 
 #endif // __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 085d2d58ffa9..5c434d128591 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper1< ::com:
 }
 
 #endif // __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index d8748648af58..5ae84c2549fd 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ class ToggleButtonToolbarController : public ComplexToolbarController
 }
 
 #endif // __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx
index a5329bab3f75..f70a63ea638e 100644
--- a/framework/inc/uielement/toolbar.hxx
+++ b/framework/inc/uielement/toolbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ class ToolBar : public ToolBox
 }
 
 #endif // __FRAMEWORK_UIELEMENT_TOOLBAR_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 5e780edb366b..e34913d0ddbb 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,7 +163,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
     protected:
         //added for 33668 by shizhoubo : 2008:04
         DECL_LINK( Command, CommandEvent * );
-        PopupMenu * GetToolBarCustomMeun(ToolBox* pToolBar);
+        PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
         //end
         DECL_LINK( Click, ToolBox * );
         DECL_LINK( DropdownClick, ToolBox * );
@@ -199,7 +200,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const;
         sal_Bool IsPluginMode() const;
-        Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast );
+        Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages );
         long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )(  ));
         void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
         void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event );
@@ -208,13 +209,12 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         bool RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OUString& rShortCut );
 
     protected:
-        typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
+        typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
         typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
         typedef BaseHash< SubToolBarControllerVector >                                                              SubToolBarToSubToolBarControllerMap;
 
-        typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
+        typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
         sal_Bool                                                                               m_bDisposed : 1,
-                                                                                               m_bIsHiContrast : 1,
                                                                                                m_bSmallSymbols : 1,
                                                                                                m_bModuleIdentified : 1,
                                                                                                m_bAddedToTaskPaneList : 1,
@@ -255,3 +255,5 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
 }
 
 #endif // __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 12301f170f26..1765971b48dd 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,3 +160,5 @@ class ToolBarMerger
 } // namespace framework
 
 #endif // __FRAMEWORK_UIELEMENT_TOOLBARMERGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 169923b00e47..87b555fd8687 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 06e99d2017b4..79259601fe9a 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,5 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
 }
 
 #endif // __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index dd95981bba90..65eb2b724bfd 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -89,12 +90,12 @@ private:
             throw (::com::sun::star::uno::RuntimeException);
 
 public:
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  ::rtl::OUString,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap;
 
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > UICommandsHashMap;
@@ -115,3 +116,5 @@ public:
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_UICOMMANDDESCRPTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
index b4ad9e2cbb6d..ab8ba13fc970 100755..100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -144,3 +145,5 @@ typedef std::vector< UIElement > UIElementVector;
 } // namespace framework
 
 #endif // __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/uielementtypenames.hxx b/framework/inc/uielement/uielementtypenames.hxx
index ca7815f90af7..e69049befeea 100644
--- a/framework/inc/uielement/uielementtypenames.hxx
+++ b/framework/inc/uielement/uielementtypenames.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #ifndef __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
 #define __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
 
@@ -10,3 +11,5 @@
 #define UIELEMENTTYPE_TOOLPANEL_NAME        "toolpanel"
 
 #endif // __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 4a77e85e73a5..6694dfc24494 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ class AddonsToolBoxFactory :  protected ThreadHelpBase
 }
 
 #endif // __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 14a62daca285..b2e00e586b83 100755..100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,6 @@
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -94,7 +94,7 @@ private:
         ControllerInfo(const ::rtl::OUString& _aImplementationName,const ::rtl::OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
         ControllerInfo(){}
     };
-    class MenuControllerMap : public std::hash_map< rtl::OUString,
+    class MenuControllerMap : public boost::unordered_map< rtl::OUString,
                                                          ControllerInfo,
                                                          OUStringHashCode,
                                                          ::std::equal_to< ::rtl::OUString > >
@@ -116,9 +116,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xConfigProvider;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >        m_xConfigAccess;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigAccessListener;
     sal_Bool                          m_bConfigAccessInitialized;
     bool                              m_bAskValue;
 };
 
 } // namespace framework
 #endif // __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index 85f6e84d08ad..c601376093d3 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
index 9e10cc4d2ef5..338f6c84cefe 100644
--- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx
+++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ class PopupMenuControllerFactory :  public ToolbarControllerFactory
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_POPUPMENUCONTROLLERFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
index 6dd8fa3b5040..096ac3fe1e2a 100644
--- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,5 @@ class StatusbarControllerFactory :  public ToolbarControllerFactory
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_STATUSBARCONTROLLERFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index 6f275ed9a21e..42f368c5ed97 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,6 @@
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-//_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 #include <rtl/ustring.hxx>
@@ -65,3 +65,5 @@ class StatusBarFactory :  public MenuBarFactory
 }
 
 #endif // __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
index 7b093d6cb681..d42aca5cd90d 100644
--- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ class ToolbarControllerFactory :  protected ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_SERVICES_TOOLBARCONTROLLERFACTORY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index 0197f3ec298d..e006e18d6dbb 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,6 @@
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-//_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 #include <cppuhelper/weak.hxx>
@@ -64,3 +64,5 @@ class ToolBoxFactory :  public MenuBarFactory
 }
 
 #endif // SFX_TOOLBOXFACTORY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index 4cf2cb769a27..8c7d1a02f436 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,7 +91,7 @@ namespace framework
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
-        class FactoryManagerMap : public std::hash_map< rtl::OUString,
+        class FactoryManagerMap : public boost::unordered_map< rtl::OUString,
                                                      rtl::OUString,
                                                      OUStringHashCode,
                                                      ::std::equal_to< ::rtl::OUString > >
@@ -112,6 +113,7 @@ namespace framework
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >     m_xConfigAccess;
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xConfigListener;
         sal_Bool                          m_bConfigAccessInitialized;
         bool                              m_bConfigDirty;
 };
@@ -149,3 +151,5 @@ class UIElementFactoryManager :  private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index 5e299204e485..f06016dc38c9 100644
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ class WindowContentFactoryManager : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 745dea7ecee9..57992e994f90 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,13 +41,9 @@
 //_______________________________________________
 // interface includes
 
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_XML_SAX_XLOCATOR_HPP_
 #include <com/sun/star/xml/sax/XLocator.hpp>
-#endif
 
 //_______________________________________________
 // other includes
@@ -218,3 +215,5 @@ class AcceleratorConfigurationReader : public  css::xml::sax::XDocumentHandler
 } // namespace framework
 
 #endif // _FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index caba9b8fa02f..b876f9b85352 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
 //_______________________________________________
 // interface includes
 
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 
 //_______________________________________________
 // other includes
@@ -117,3 +116,5 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase
 } // namespace framework
 
 #endif // _FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index ffce5c1a348b..fc678b88ac00 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 #ifndef __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
 
-#ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 #include <framework/eventsconfiguration.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -47,7 +44,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <stdtypes.h>
 
 #include <framework/fwedllapi.h>
@@ -130,7 +127,7 @@ class FWE_DLLPUBLIC OReadEventsDocumentHandler :    private ThreadHelpBase, // S
     private:
         ::rtl::OUString getErrorLineString();
 
-        class EventsHashMap : public ::std::hash_map<   ::rtl::OUString                 ,
+        class EventsHashMap : public ::boost::unordered_map<    ::rtl::OUString                 ,
                                                         Events_XML_Entry                ,
                                                         OUStringHashCode                ,
                                                         ::std::equal_to< ::rtl::OUString >  >
@@ -186,3 +183,5 @@ class FWE_DLLPUBLIC OWriteEventsDocumentHandler : private ThreadHelpBase // Stru
 } // namespace framework
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 3174e6d51b22..169116c7a911 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,6 @@
 #include <tools/stream.hxx>
 #include <tools/color.hxx>
 
-// #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -102,12 +102,10 @@ struct ImageListsDescriptor
 class ImagesConfiguration
 {
     public:
-        // #110897#
         static sal_Bool LoadImages(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rInStream, ImageListsDescriptor& aItems );
 
-        // #110897#
         static sal_Bool StoreImages(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rOutStream, const ImageListsDescriptor& aItems );
@@ -126,3 +124,5 @@ class ImagesConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_CLASSES_IMAGES
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index dd6201b5b9e3..fc9ebbc7e861 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <stdtypes.h>
 
 
@@ -129,7 +130,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase,  // Struct for right
     private:
         ::rtl::OUString getErrorLineString();
 
-        class ImageHashMap : public ::std::hash_map< ::rtl::OUString        ,
+        class ImageHashMap : public ::boost::unordered_map< ::rtl::OUString     ,
                                                      Image_XML_Entry        ,
                                                      OUStringHashCode       ,
                                                      ::std::equal_to< ::rtl::OUString > >
@@ -200,3 +201,5 @@ class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right i
 } // namespace framework
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 5c6064cdd4f1..3c899ed07cd3 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -122,13 +121,11 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase,    // S
 class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 {
     public:
-        // #110897#
         OReadMenuDocumentHandler(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer );
         virtual ~OReadMenuDocumentHandler();
 
-        // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
         // XDocumentHandler
@@ -166,14 +163,12 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
 class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
 {
     public:
-        // #110897#
         OReadMenuBarHandler(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer,
             const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory );
         virtual ~OReadMenuBarHandler();
 
-        // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
         // XDocumentHandler
@@ -205,7 +200,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
         com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
         com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
 
-        // #110897#
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
 };  // OReadMenuBarHandler
 
@@ -317,3 +311,5 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler
 } // namespace framework
 
 #endif  // #ifndef __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index f4bdfcf677e9..11f8a5b4d333 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for ri
 }
 
 #endif // __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 82c2d0c55111..487c07748c07 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 #ifndef __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
 
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
 #include <framework/statusbarconfiguration.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -47,7 +44,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <stdtypes.h>
 #include <framework/fwedllapi.h>
 
@@ -129,7 +126,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // S
     private:
         ::rtl::OUString getErrorLineString();
 
-        class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString                ,
+        class StatusBarHashMap : public ::boost::unordered_map< ::rtl::OUString             ,
                                                          StatusBar_XML_Entry            ,
                                                          OUStringHashCode               ,
                                                          ::std::equal_to< ::rtl::OUString > >
@@ -183,3 +180,5 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // S
 } // namespace framework
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index 0b514b927bc1..b55d48642e20 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@
 #define ATTRIBUTE_ITEMSTYLE_IMAGE    "image"
 
 #endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index d90d91cee036..1b83e7481111 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,7 +130,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase,   // S
     private:
         ::rtl::OUString getErrorLineString();
 
-        class ToolBoxHashMap : public ::std::hash_map<  ::rtl::OUString                 ,
+        class ToolBoxHashMap : public ::boost::unordered_map<   ::rtl::OUString                 ,
                                                         ToolBox_XML_Entry               ,
                                                         OUStringHashCode                ,
                                                         ::std::equal_to< ::rtl::OUString >  >
@@ -212,3 +213,5 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase   // S
 } // namespace framework
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index bcb9ec4cb5e3..f21a77744d7d 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ class FWE_DLLPUBLIC XMLNamespaces
 }
 
 #endif // __FRAMEWORK_XML_XMLNAMESPACES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index 8fe5b3b2f0ef..a97c7e29161f 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,2 +1,2 @@
-fr framework : LIBXSLT:libxslt L10N:l10n svtools NULL
+fr framework : LIBXSLT:libxslt TRANSLATIONS:translations svtools ucb NULL
 fr framework\prj nmake - all fr_all NULL
diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk
index e312a7ccab65..e312a7ccab65 100644..100755
--- a/framework/prj/makefile.mk
+++ b/framework/prj/makefile.mk
diff --git a/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
index 22e3003d86e3..22e3003d86e3 100644..100755
--- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java
+++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 6f7b8952a0b1..6f7b8952a0b1 100644..100755
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index b0d89ad81858..b0d89ad81858 100644..100755
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
diff --git a/framework/qa/complex/accelerators/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java
index d09a51162e7c..d09a51162e7c 100644..100755
--- a/framework/qa/complex/accelerators/KeyMapping.java
+++ b/framework/qa/complex/accelerators/KeyMapping.java
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index be979e9234ac..4539e7a95ce4 100755
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -90,12 +90,6 @@ public class CheckAPI  {
         System.out.println("Start with test");
         // if test is idle for 5 minutes, assume that it hangs and kill it.
         // param.put("TimeOut", new Integer("300000"));
-/*        AppProvider office = (AppProvider)dcl.getInstance("helper.OfficeProvider");
-        Object msf = office.getManager(param);
-        if (msf == null) {
-            failed("Could not connect an Office.");
-        }
-        param.put("ServiceFactory",msf); */
         XMultiServiceFactory xMSF = getMSF();
         Object oObj = null;
         try {
@@ -180,7 +174,6 @@ public class CheckAPI  {
                 }
                 catch(java.lang.InterruptedException e) {}
                 OfficeProvider op = new OfficeProvider();
-                //                op.closeExistingOffice(param, true);
                 xMSF = (XMultiServiceFactory)op.getManager(param);
                 param.put("ServiceFactory",xMSF);
                 try {
diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst
index bf4656231560..bf4656231560 100755..100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index f5d41c1e02b1..6825c5f6e1f2 100755
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.java
@@ -62,7 +62,7 @@ public class LoadDocument {
 //    }
 
     /**
-     * Start Office with "-headless" parameter, then
+     * Start Office with "--headless" parameter, then
      * load the broken document "dbf.dbf.emf", that brings a message box up in
      * the ui, see if the headless mode of SOffice changes.
      */
diff --git a/framework/qa/complex/broken_document/TestDocument.java b/framework/qa/complex/broken_document/TestDocument.java
index 47a5176734d5..47a5176734d5 100644..100755
--- a/framework/qa/complex/broken_document/TestDocument.java
+++ b/framework/qa/complex/broken_document/TestDocument.java
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 471f5246b787..b017c7b8c470 100644..100755
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -180,8 +180,6 @@ public class CheckContextMenuInterceptor
                 }
             }
 
-            //  utils.shortWait(10000);
-
             openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc));
 
             checkHelpEntry();
@@ -231,9 +229,6 @@ public class CheckContextMenuInterceptor
             xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0));
 
             xRoot = at.getAccessibleObject(xWindow);
-
-//            at.printAccessibleTree((PrintWriter)log, xRoot, param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
-            // at.printAccessibleTree(System.out, xRoot, true);
         }
         catch (com.sun.star.lang.IndexOutOfBoundsException e)
         {
diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
index 6455807f5630..6455807f5630 100644..100755
--- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 0f385edf0cb0..ae668cbe9209 100755
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -31,7 +31,6 @@ import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.uno.UnoRuntime;
 import helper.OfficeProvider;
-//import complex.persistent_window_states.helper.DocumentHandle;
 
 // ---------- junit imports -----------------
 import org.junit.After;
diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index fc5b57b1215e..366fe3528134 100644..100755
--- a/framework/qa/complex/dispatches/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -45,9 +45,6 @@ import com.sun.star.frame.XStatusListener;
 // helper
 import com.sun.star.util.URL;
 
-// others
-//import java.lang.*;
-
 // __________ Implementation __________
 
 /**
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index b0ba4b55da75..b0ba4b55da75 100644..100755
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 178f9c0af987..7854ee5988a6 100644..100755
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -316,16 +316,6 @@ public class AutoSave
 
             m_aLog.log(Protocol.TYPE_OK, "saveDoc('"+sURL+"') = OK.");
         }
-/*
-        catch(com.sun.star.io.IOException exIO)
-        {
-            m_aLog.log(Protocol.TYPE_WARNING     , "got IOException on calling doc.store()."                                                            );
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail."                                                   );
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesnt show an error!");
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, "Message of the original exception:"                                                                 );
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, exIO.getMessage());
-        }
-*/
         catch(Throwable ex)
         {
             m_aLog.log(ex);
diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java b/framework/qa/complex/framework/autosave/ConfigHelper.java
index a7f5df8cc72d..a7f5df8cc72d 100644..100755
--- a/framework/qa/complex/framework/autosave/ConfigHelper.java
+++ b/framework/qa/complex/framework/autosave/ConfigHelper.java
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 11f6c4eeeff3..11f6c4eeeff3 100644..100755
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java
index 616d4baa200e..616d4baa200e 100644..100755
--- a/framework/qa/complex/framework/recovery/CrashThread.java
+++ b/framework/qa/complex/framework/recovery/CrashThread.java
diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index 426a2e3d2a79..426a2e3d2a79 100644..100755
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 10fc433e7cd1..d2e3f046848f 100644..100755
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -160,10 +160,7 @@ public class RecoveryTest extends ComplexTestCase {
         restoreBackupRecoveryData();
         startOffice();
         int expectedDocumentCount = 3;
-//        handleRecoveryDialog_QuickExit(expectedDocumentCount);
         handleRecoveryDialog_QuickExitAndSave(expectedDocumentCount);
-        //handleCrashReporterDialog(true, true);
-        //checkDocumentCount(expectedDocumentCount);
     }
 
     public void before() throws Exception {
@@ -194,7 +191,6 @@ public class RecoveryTest extends ComplexTestCase {
         // make window ranges
         makeWindowPositionRage();
 
-        //makeRecoveryData();
     }
 
     private void makeRecoveryData(){
@@ -482,10 +478,8 @@ public class RecoveryTest extends ComplexTestCase {
 
                 rt.pause();
 
-                //XAccessibleContext oButton = oUITools.getButton("Start Recovery >");
                 int counter = 0;
                 int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / param.getInt(PropertyName.SHORT_WAIT);
-                //boolean enabeld = oButton.getAccessibleStateSet().contains(com.sun.star.accessibility.AccessibleStateType.ENABLED);
 
                 XAccessibleContext oButton = null;
                 while ((oButton == null) && (counter < maximum)){
@@ -632,23 +626,9 @@ public class RecoveryTest extends ComplexTestCase {
 
         // create some documents with content
         makeWriterDoc("WriterDoc1", true);
-//        makeCalcDoc("CalcDoc1", true);
-//        makeDrawDoc("DrawDoc1", true);
-//        makeImpressDoc("ImpressDoc1", true);
-//        makeMathDoc("MathDoc1", true);
-
-        // create some documents without content
-//        makeMathDoc("_blank_math", false);
-//        makeDrawDoc("_blank_draw", false);
-//        makeCalcDoc("_blank_calc", false);
-//        makeWriterDoc("_blank_writer", false);
-//        makeImpressDoc("_blank_impress", false);
-
-//        makeMathDoc("MathDocEmpty", false);
-//        makeDrawDoc("DrawDocEmpty", false);
-//        makeCalcDoc("CalcDocEmpty", false);
+
+
         makeWriterDoc("WriterDocEmpty", false);
-//        makeImpressDoc("ImpressDocEmpty", false);
 
         log.println("Test object successfully created.");
 
@@ -729,7 +709,7 @@ public class RecoveryTest extends ComplexTestCase {
         try{
             xMathDoc = SOF.createMathDoc(frameName);
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while creating math document '"+frameName+"':");
+            log.println("Exception occurred while creating math document '"+frameName+"':");
             failed("Couldn't create test environment");
         }
         return xMathDoc;
@@ -743,16 +723,16 @@ public class RecoveryTest extends ComplexTestCase {
         try {
             xPS.setPropertyValue("Formula", expFormula);
         } catch(com.sun.star.lang.WrappedTargetException e) {
-            log.println("Exception occured while filling math document with content.");
+            log.println("Exception occurred while filling math document with content.");
             failed("Couldn't create test environment");
         } catch(com.sun.star.lang.IllegalArgumentException e) {
-            log.println("Exception occured while filling math document with content.");
+            log.println("Exception occurred while filling math document with content.");
             failed("Couldn't create test environment");
         } catch(com.sun.star.beans.PropertyVetoException e) {
-            log.println("Exception occured while filling math document with content.");
+            log.println("Exception occurred while filling math document with content.");
             failed("Couldn't create test environment");
         } catch(com.sun.star.beans.UnknownPropertyException e) {
-            log.println("Exception occured while filling math document with content.");
+            log.println("Exception occurred while filling math document with content.");
             failed("Couldn't create test environment");
         }
     }
@@ -762,7 +742,7 @@ public class RecoveryTest extends ComplexTestCase {
         try{
             xImpressDoc = SOF.createImpressDoc(frameName);
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while creating impress document '"+frameName+"':");
+            log.println("Exception occurred while creating impress document '"+frameName+"':");
             failed("Couldn't create test environment");
         }
         return xImpressDoc;
@@ -813,7 +793,7 @@ public class RecoveryTest extends ComplexTestCase {
         try{
             xDrawDoc = SOF.createDrawDoc(frameName);
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while creating draw document '"+frameName+"':");
+            log.println("Exception occurred while creating draw document '"+frameName+"':");
             failed("Couldn't create test environment");
         }
         return xDrawDoc;
@@ -865,16 +845,16 @@ public class RecoveryTest extends ComplexTestCase {
                 new Type(XStyle.class),oShapeProps.getPropertyValue("Style"));
             oShapeProps.setPropertyValue("ZOrder", new Integer(1));
         } catch (com.sun.star.lang.WrappedTargetException e) {
-            log.println("Exception occured while setting or getting property value while filling draw document with content.");
+            log.println("Exception occurred while setting or getting property value while filling draw document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.beans.UnknownPropertyException e) {
-            log.println("Exception occured while setting or getting property value while filling draw document with content.");
+            log.println("Exception occurred while setting or getting property value while filling draw document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.lang.IllegalArgumentException e) {
-            log.println("Exception occured while setting or getting property value while filling draw document with content.");
+            log.println("Exception occurred while setting or getting property value while filling draw document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.beans.PropertyVetoException e) {
-            log.println("Exception occured while setting or getting property value while filling draw document with content.");
+            log.println("Exception occurred while setting or getting property value while filling draw document with content.");
             failed("Couldn't create test environment");
         }
     }
@@ -892,7 +872,7 @@ public class RecoveryTest extends ComplexTestCase {
         try {
             xTextDoc = SOF.createTextDoc(frameName);
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while creating text document '"+frameName+"':");
+            log.println("Exception occurred while creating text document '"+frameName+"':");
             failed("Couldn't create test environment");
         }
         return xTextDoc;
@@ -919,10 +899,10 @@ public class RecoveryTest extends ComplexTestCase {
                 oCursor, ControlCharacter.LINE_BREAK, false );
             }
         } catch ( com.sun.star.lang.IllegalArgumentException e ){
-            log.println("Exception occured while filling text document with content.");
+            log.println("Exception occurred while filling text document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while filling text document with content.");
+            log.println("Exception occurred while filling text document with content.");
             failed("Couldn't create test environment");
         }
     }
@@ -934,7 +914,7 @@ public class RecoveryTest extends ComplexTestCase {
         try {
             xSheetDoc = SOF.createCalcDoc(frameName);
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while creating calc document '"+frameName+"':");
+            log.println("Exception occurred while creating calc document '"+frameName+"':");
             failed("Couldn't create test environment");
         }
         return xSheetDoc;
@@ -960,19 +940,19 @@ public class RecoveryTest extends ComplexTestCase {
             oSheet.getCellByPosition(3, 2).setFormula("xTextDoc");
             oSheet.getCellByPosition(3, 3).setFormula("xTextDoc");
         } catch (com.sun.star.lang.WrappedTargetException e) {
-            log.println("Exception occured while filling calc document with content.");
+            log.println("Exception occurred while filling calc document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.container.NoSuchElementException e) {
-            log.println("Exception occured while filling calc document with content.");
+            log.println("Exception occurred while filling calc document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
-            log.println("Exception occured while filling calc document with content.");
+            log.println("Exception occurred while filling calc document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.lang.IllegalArgumentException e) {
-            log.println("Exception occured while filling calc document with content.");
+            log.println("Exception occurred while filling calc document with content.");
             failed("Couldn't create test environment");
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occured while filling calc document with content.");
+            log.println("Exception occurred while filling calc document with content.");
             failed("Couldn't create test environment");
         }
     }
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 28936949d8ef..28936949d8ef 100644..100755
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
diff --git a/framework/qa/complex/framework/recovery/TimeoutThread.java b/framework/qa/complex/framework/recovery/TimeoutThread.java
index 088f4b3d36f6..088f4b3d36f6 100644..100755
--- a/framework/qa/complex/framework/recovery/TimeoutThread.java
+++ b/framework/qa/complex/framework/recovery/TimeoutThread.java
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 7db880958ab5..9aff703ee96f 100755
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -42,9 +42,6 @@ public class CheckImageManager  {
         param.put("ServiceFactory", xMSF); // some qadevOOo functions need the ServiceFactory
     }
 
-//    public String[] getTestMethodNames() {
-//        return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"};
-//    }
 
     @Test public void checkImageManagerFromModule()
     {
@@ -163,31 +160,6 @@ public class CheckImageManager  {
         public void fireEvent() {
             // remove for real action:
             triggered = !triggered;
-/*            try {
-                XIndexAccess xMenuBarSettings = xUIManager.getSettings(
-                                        "private:resource/menubar/menubar", true);
-
-            }
-            catch(com.sun.star.container.NoSuchElementException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.IllegalArgumentException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.IllegalAccessException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.WrappedTargetException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            } */
         }
 
         public void reset() {
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 9affbb9499b5..4188ac53bcd3 100755
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -179,7 +179,6 @@ public class _XComponent {
     * Forces object recreation.
     */
     protected void after() {
-//        disposeEnvironment();
     }
 
 } // finished class _XComponent
diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index fcfaf5f981d3..3bd73a91219f 100755
--- a/framework/qa/complex/imageManager/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -75,7 +75,7 @@ public class _XInitialization {
             }
 
         } catch (com.sun.star.uno.Exception e) {
-            System.out.println("Exception occured while method calling.") ;
+            System.out.println("Exception occurred while method calling.") ;
             result = false ;
         }
 
@@ -86,7 +86,6 @@ public class _XInitialization {
     * Disposes object environment.
     */
     public void after() {
-//        disposeEnvironment() ;
     }
 
 } // finished class _XInitialization
diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java
index 08b810198d9b..b9da0cb1dda8 100755
--- a/framework/qa/complex/imageManager/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/_XTypeProvider.java
@@ -58,7 +58,7 @@ public class _XTypeProvider {
 
     /**
     * Just calls the method.<p>
-    * Has <b>OK</b> status if no runtime exceptions occured.
+    * Has <b>OK</b> status if no runtime exceptions occurred.
     */
     public boolean _getImplementationId() {
         boolean result = true;
diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java
index ec9d5f3fc634..3e4d5b4b3b5c 100755
--- a/framework/qa/complex/imageManager/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/_XUIConfiguration.java
@@ -77,6 +77,5 @@ public class _XUIConfiguration {
      * Dispose because the UIConfigurationManager has to be recreated
      */
     public void after() {
-//        disposeEnvironment();
     }
 }
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index 1c67271fd6bb..1c67271fd6bb 100644..100755
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
index 84bdb5aba92a..84bdb5aba92a 100644..100755
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index 92d8f3c34543..f882ac73b53e 100644..100755
--- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -38,8 +38,6 @@ import com.sun.star.task.XInteractionRetry;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.AnyConverter;
 
-//import java.lang.*;
-
 
 /**
  * Implemets a simple interaction handler,
@@ -78,7 +76,6 @@ public class InteractionHandler implements XInteractionHandler
     public InteractionHandler()
     {
         m_aRequest  = null     ;
-        //m_aProtocol = aProtocol;
         m_nTry      = 0        ;
         m_bWasUsed = false;
     }
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index c28993010ed8..aaf1e8e040dd 100644..100755
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -41,9 +41,6 @@ import com.sun.star.task.XStatusIndicator;
 // helper
 import com.sun.star.uno.UnoRuntime;
 
-// others
-//import java.lang.*;
-
 // __________ Implementation __________
 
 /**
@@ -79,7 +76,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     private int             m_nRange    ;
     private int             m_nValue    ;
     private int             m_nOut      ;
-//    private Protocol        m_aProtocol ;
     private boolean         m_bWasUsed  ;
 
     // ____________________
@@ -94,9 +90,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         m_nRange    = 100           ;
         m_nValue    = 0             ;
         m_nOut      = nOut          ;
-        //m_aProtocol = aProtocol     ;
         m_bWasUsed  = false;
-//        aProtocol.resetUsingState();
     }
 
     // ____________________
@@ -114,10 +108,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("start("+sText+","+nRange+")\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText  = sText ;
             m_nRange = nRange;
             m_nValue = 0     ;
@@ -134,10 +125,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("end()\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText  = new String();
             m_nRange = 100;
             m_nValue = 0;
@@ -157,10 +145,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("setText("+sText+")\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText = sText;
         }
         impl_show();
@@ -179,9 +164,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("setValue("+nValue+")\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
 
             if (nValue<=m_nRange)
                 m_nValue = nValue;
@@ -198,10 +181,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("reset()\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText  = new String();
             m_nValue = 0;
         }
diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
index 7b59c25d0a79..0afbb9a9279b 100644..100755
--- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
@@ -385,8 +385,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         else
         if (m_xOutStream != null)
             m_bOutWasUsed = true;
-//        else
-            //m_aProtocol.log("\tno stream open!\n");
 
         if (m_xSeek == null)
         {
@@ -416,8 +414,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         else
         if (m_xOutStream != null)
             m_bOutWasUsed = true;
-//        else
-            //m_aProtocol.log("\tno stream open!\n");
 
         if (m_xSeek == null)
         {
@@ -449,8 +445,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         else
         if (m_xOutStream != null)
             m_bOutWasUsed = true;
-//        else
-            //m_aProtocol.log("\tno stream open!\n");
 
         if (m_xSeek == null)
         {
diff --git a/framework/qa/complex/loadAllDocuments/TestDocument.java b/framework/qa/complex/loadAllDocuments/TestDocument.java
index fe41a6161c4a..fe41a6161c4a 100644..100755
--- a/framework/qa/complex/loadAllDocuments/TestDocument.java
+++ b/framework/qa/complex/loadAllDocuments/TestDocument.java
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif b/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif
index abbbc65f6340..abbbc65f6340 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 36abfd55bbde..e5df2c5a0e03 100755
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -126,7 +126,6 @@ public class PathSettingsTest
         try
         {
             xMSF = getMSF();
-//            aPathSettings = xMSF.createInstance("com.sun.star.util.PathSettings");
             aPathSettings = xMSF.createInstance("com.sun.star.comp.framework.PathSettings");
             assertNotNull("Can't instantiate com.sun.star.util.PathSettings.", aPathSettings);
 //            System.out.println("Implementation: " + util.utils.getImplName(aPathSettings));
diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java
deleted file mode 100644
index 71774b4a62bb..000000000000
--- a/framework/qa/unoapi/Test.java
+++ /dev/null
@@ -1,52 +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.
-************************************************************************/
-
-package org.openoffice.framework.qa.unoapi;
-
-import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import org.openoffice.test.Argument;
-import static org.junit.Assert.*;
-
-public final class Test {
-    @org.junit.Before public void setUp() throws Exception {
-        connection.setUp();
-    }
-
-    @org.junit.After public void tearDown()
-        throws InterruptedException, com.sun.star.uno.Exception
-    {
-        connection.tearDown();
-    }
-
-    @org.junit.Test public void test() {
-        assertTrue(
-            Runner.run(
-                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
-                Argument.get("tdoc"), "-cs", connection.getDescription()));
-    }
-
-    private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index 96a266818d31..4214e6e15092 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,22 +33,16 @@
 //_______________________________________________
 // own includes
 
-#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_
 #include <xml/acceleratorconfigurationreader.hxx>
-#endif
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 
 //_______________________________________________
 // interface includes
 
-#ifndef __COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HPP_
 #include <com/sun/star/container/ElementExistException.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_
 #include <com/sun/star/container/NoSuchElementException.hpp>
-#endif
 
 //_______________________________________________
 // other includes
@@ -248,3 +243,5 @@ void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index fc9f5308825a..d2f958be8838 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,45 +58,16 @@
 //_______________________________________________
 // other includes
 #include <vcl/svapp.hxx>
-
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_
 #include <com/sun/star/container/XNamed.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
 #include <com/sun/star/container/XNameContainer.hpp>
-#endif
-
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
 #include <com/sun/star/awt/KeyEvent.hpp>
-#endif
-
-#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_
 #include <com/sun/star/awt/KeyModifier.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_
 #include <com/sun/star/util/XChangesNotifier.hpp>
-#endif
-
-#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
 #include <comphelper/configurationhelper.hxx>
-#endif
-
-#ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
 #include <unotools/configpathes.hxx>
-#endif
-
-#ifndef _RTL_LOGFILE_HXX_
 #include <rtl/logfile.hxx>
-#endif
-
 #include <svtools/acceleratorexecute.hxx>
-
 #include <stdio.h>
 
 //_______________________________________________
@@ -103,6 +75,12 @@
 
 namespace framework
 {
+    const ::rtl::OUString CFG_ENTRY_PRIMARY(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeys"));
+    const ::rtl::OUString CFG_ENTRY_SECONDARY(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeys"));
+    const ::rtl::OUString CFG_ENTRY_GLOBAL(RTL_CONSTASCII_USTRINGPARAM("Global"));
+    const ::rtl::OUString CFG_ENTRY_MODULES(RTL_CONSTASCII_USTRINGPARAM("Modules"));
+    const ::rtl::OUString CFG_PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
+
 
 #ifdef fpc
     #error "Who exports this define? I use it as namespace alias ..."
@@ -206,13 +184,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
         (aKeyEvent.Modifiers == 0)
         )
         throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
         static_cast< ::cppu::OWeakObject* >(this),
         0);
 
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
         static_cast< ::cppu::OWeakObject* >(this),
         1);
 
@@ -252,7 +230,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -289,7 +267,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
         const ::rtl::OUString& rCommand = lCommandList[i];
         if (!rCommand.getLength())
             throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                     static_cast< ::cppu::OWeakObject* >(this),
                     (sal_Int16)i);
 
@@ -318,7 +296,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
@@ -328,7 +306,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
     if (!rCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
                 static_cast< ::cppu::OWeakObject* >(this));
     rCache.removeCommand(sCommand);
 
@@ -359,7 +337,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
         xIn = xStream->getInputStream();
     if (!xIn.is())
         throw css::io::IOException(
-        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for reading.")),
         static_cast< ::cppu::OWeakObject* >(this));
 
     // impl_ts_load() does not clear the cache
@@ -398,7 +376,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
 
     if (!xOut.is())
         throw css::io::IOException(
-        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
         static_cast< ::cppu::OWeakObject* >(this));
 
     impl_ts_save(xOut);
@@ -425,7 +403,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 
     if (!xOut.is())
         throw css::io::IOException(
-                ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     impl_ts_save(xOut);
@@ -517,7 +495,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u
 
 //-----------------------------------------------
 // IStorageListener
-void XMLBasedAcceleratorConfiguration::changesOccured(const ::rtl::OUString& /*sPath*/)
+void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/)
 {
     reload();
 }
@@ -652,9 +630,9 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
 //-----------------------------------------------
 ::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup");
-    static ::rtl::OUString LOCALE_PATH    = ::rtl::OUString::createFromAscii("L10N"                 );
-    static ::rtl::OUString LOCALE_KEY     = ::rtl::OUString::createFromAscii("ooLocale"             );
+    static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+    static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+    static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -706,7 +684,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
                                 , m_pPrimaryWriteCache(0                        )
                                 , m_pSecondaryWriteCache(0                      )
 {
-    static const ::rtl::OUString CFG_ENTRY_ACCELERATORS(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Accelerators"));
+    const ::rtl::OUString CFG_ENTRY_ACCELERATORS(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Accelerators"));
     m_xCfg = css::uno::Reference< css::container::XNameAccess > (
              ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
              css::uno::UNO_QUERY );
@@ -777,13 +755,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
         (aKeyEvent.Modifiers == 0)
         )
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
     if (!sCommand.getLength())
                 throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -900,7 +878,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -964,7 +942,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
         const ::rtl::OUString& rCommand = lCommandList[i];
         if (!rCommand.getLength())
             throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                     static_cast< ::cppu::OWeakObject* >(this),
                     (sal_Int16)i);
 
@@ -997,7 +975,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
@@ -1009,7 +987,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 
     if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (rPrimaryCache.hasCommand(sCommand))
@@ -1101,17 +1079,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
         return;
 
     long nOpenModes = css::embed::ElementModes::READWRITE;
-    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString::createFromAscii("accelerator"), nOpenModes);
+    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("accelerator")), nOpenModes);
     if (!xAcceleratorTypeStorage.is())
         return;
 
-    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString::createFromAscii("current"), nOpenModes);
+    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("current")), nOpenModes);
     css::uno::Reference< css::io::XOutputStream > xOut;
     if (xStream.is())
         xOut = xStream->getOutputStream();
     if (!xOut.is())
         throw css::io::IOException(
-        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
         static_cast< ::cppu::OWeakObject* >(this));
 
     // the original m_aCache has been split into primay cache and secondary cache...
@@ -1207,14 +1185,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
 {
     css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
     ::rtl::OUString sConfig = xNamed->getName();
-    if ( sConfig.equalsAscii("Global") )
+    if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")) )
     {
         m_xCfg = css::uno::Reference< css::container::XNameAccess > (
             ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
             css::uno::UNO_QUERY );
         XCUBasedAcceleratorConfiguration::reload();
     }
-    else if ( sConfig.equalsAscii("Modules") )
+    else if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")) )
     {
         m_xCfg = css::uno::Reference< css::container::XNameAccess > (
             ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
@@ -1300,9 +1278,9 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
 {
     AcceleratorCache aReadCache = AcceleratorCache();
     css::uno::Reference< css::container::XNameAccess > xAccess;
-    if (m_sGlobalOrModules.equalsAscii("Global"))
+    if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global")))
         xCfg->getByName(CFG_ENTRY_GLOBAL) >>= xAccess;
-    else if (m_sGlobalOrModules.equalsAscii("Modules"))
+    else if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")))
     {
         css::uno::Reference< css::container::XNameAccess > xModules;
         xCfg->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1310,7 +1288,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
     }
 
     const ::rtl::OUString sIsoLang       = impl_ts_getLocale().toISO();
-    const ::rtl::OUString sDefaultLocale = ::rtl::OUString::createFromAscii("en-US");
+    const ::rtl::OUString sDefaultLocale(RTL_CONSTASCII_USTRINGPARAM("en-US"));
 
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameAccess > xCommand;
@@ -1359,7 +1337,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
 
             sal_Int32 nIndex = 0;
             ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
-            ::rtl::OUString sPrefix = ::rtl::OUString::createFromAscii("KEY_");
+            ::rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("KEY_"));
             aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
 
             css::uno::Sequence< ::rtl::OUString > sToken(4);
@@ -1379,13 +1357,13 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
                     break;
                 }
 
-                if (sToken[k].equalsAscii("SHIFT"))
+                if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
-                else if (sToken[k].equalsAscii("MOD1"))
+                else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
-                else if (sToken[k].equalsAscii("MOD2"))
+                else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
-                else if (sToken[k].equalsAscii("MOD3"))
+                else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
                 else
                 {
@@ -1594,7 +1572,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
 
     sal_Int32 nIndex = 0;
     sKeyIdentifier = sKey.getToken(0, '_', nIndex);
-    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier);
+    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_"))+sKeyIdentifier);
 
     css::uno::Sequence< ::rtl::OUString > sToken(3);
     const sal_Int32 nToken = 3;
@@ -1604,13 +1582,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
             break;
 
         sToken[i] = sKey.getToken(0, '_', nIndex);
-        if (sToken[i].equalsAscii("SHIFT"))
+        if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT")))
             aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT;
-        else if (sToken[i].equalsAscii("MOD1"))
+        else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1")))
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
-        else if (sToken[i].equalsAscii("MOD2"))
+        else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2")))
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
-                else if (sToken[i].equalsAscii("MOD3"))
+                else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3")))
                         aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
     }
 
@@ -1694,9 +1672,9 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 //-----------------------------------------------
 ::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup");
-    static ::rtl::OUString LOCALE_PATH    = ::rtl::OUString::createFromAscii("L10N"                 );
-    static ::rtl::OUString LOCALE_KEY     = ::rtl::OUString::createFromAscii("ooLocale"             );
+    static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+    static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+    static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -1715,3 +1693,5 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index 23ba136eaf64..1b5b37f439c8 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,33 +33,19 @@
 //===============================================
 // includes
 
-#ifndef __COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_
 #include <com/sun/star/frame/XModuleManager.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_
 #include <com/sun/star/awt/KeyModifier.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_UNO_SEQUENCE_HXX_
 #include <com/sun/star/uno/Sequence.hxx>
-#endif
 
-#ifndef __COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 
 //===============================================
 // namespace
@@ -371,7 +358,7 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid)
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
         {
             Sequence<css::beans::PropertyValue> source;
-            ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString::createFromAscii("AcceleratorExecute"));
+            ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString(RTL_CONSTASCII_USTRINGPARAM("AcceleratorExecute")));
             ::comphelper::UiEventsLogger::logDispatch(aURL, source);
         }
         xDispatch->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >());
@@ -380,3 +367,5 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid)
 }
 
 } // namespace svt
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx
index 07f6348184e2..a733e55a550c 100644
--- a/framework/source/accelerators/acceleratorexecute.hxx
+++ b/framework/source/accelerators/acceleratorexecute.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,29 +34,17 @@
 
 #include <vector>
 
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_
 #include <com/sun/star/frame/XFrame.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
 #include <com/sun/star/util/XURLTransformer.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
 #include <com/sun/star/awt/KeyEvent.hpp>
-#endif
 #include <vcl/keycod.hxx>
 #include <vcl/evntpost.hxx>
 #include <osl/mutex.h>
@@ -253,3 +242,5 @@ class AcceleratorExecute : private TMutexInit
 } // namespace svt
 
 #endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 81edb165653c..ba09a7a15e20 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,61 +30,39 @@
 #include "precompiled_framework.hxx"
 #include <accelerators/documentacceleratorconfiguration.hxx>
 
-#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_
 #include <xml/acceleratorconfigurationreader.hxx>
-#endif
 
-#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_
 #include <xml/acceleratorconfigurationwriter.hxx>
-#endif
 
-#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_
 #include <xml/saxnamespacefilter.hxx>
-#endif
 
 //_______________________________________________
 // own includes
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 
-#ifndef __FRAMEWORK_ACCELERATORCONST_H_
 #include <acceleratorconst.h>
-#endif
 #include <services.h>
 
 //_______________________________________________
 // interface includes
 
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
 #include <com/sun/star/io/XSeekable.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_IO_XTRUNCATE_HPP_
 #include <com/sun/star/io/XTruncate.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_
 #include <com/sun/star/embed/ElementModes.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_
 #include <com/sun/star/xml/sax/InputSource.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_
 #include <com/sun/star/xml/sax/XParser.hpp>
-#endif
 
 //_______________________________________________
 // other includes
 
-#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX
 #include <comphelper/sequenceashashmap.hxx>
-#endif
 
 //_______________________________________________
 // const
@@ -142,7 +121,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque
 
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
     m_xDocumentRoot = lArgs.getUnpackedValueOrDefault(
-                        ::rtl::OUString::createFromAscii("DocumentRoot"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")),
                         css::uno::Reference< css::embed::XStorage >());
 
     aWriteLock.unlock();
@@ -218,15 +197,6 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
         DocumentAcceleratorConfiguration::reload();
         m_aPresetHandler.addStorageListener(this);
     }
-    /*
-
-    Sometimes the configuration seams to be corrupted ..
-    So it would be nice if we dont crash the office then .-)
-    #121559#
-
-    catch(const css::uno::RuntimeException& exRun)
-    { throw exRun; }
-    */
     catch(const css::uno::Exception&)
     {}
 }
@@ -238,3 +208,5 @@ void DocumentAcceleratorConfiguration::impl_ts_clearCache()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index dc040479d854..173d19cd7d7e 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,6 +34,7 @@
 // own includes
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
+#include "helper/mischelper.hxx"
 
 #include <acceleratorconst.h>
 #include <services.h>
@@ -116,7 +118,8 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
         XCUBasedAcceleratorConfiguration::reload();
 
         css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfg, css::uno::UNO_QUERY_THROW);
-        xBroadcaster->addChangesListener(static_cast< css::util::XChangesListener* >(this));
+        m_xCfgListener = new WeakChangesListener(this);
+        xBroadcaster->addChangesListener(m_xCfgListener);
     }
     catch(const css::uno::RuntimeException& exRun)
         { throw exRun; }
@@ -125,3 +128,5 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index 7d4054014524..e10b062d9af3 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -154,6 +155,9 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
     {css::awt::Key::DECIMAL       , "KEY_DECIMAL"    },
     {css::awt::Key::TILDE         , "KEY_TILDE"      },
     {css::awt::Key::QUOTELEFT     , "KEY_QUOTELEFT"  },
+    {css::awt::Key::BRACKETLEFT   , "KEY_BRACKETLEFT" },
+    {css::awt::Key::BRACKETRIGHT  , "KEY_BRACKETRIGHT" },
+    {css::awt::Key::SEMICOLON     , "KEY_SEMICOLON" },
     {0                            , ""               } // mark the end of this array!
 };
 
@@ -223,7 +227,9 @@ sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUStr
     // 0 is normaly an error of the called method toInt32() ...
     // But we must be aware, that the identifier is "0"!
     rCode = 0;
-    return sIdentifier.equalsAscii("0");
+    return sIdentifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0"));
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 566311d6f5be..dca4a04c01ad 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,10 +34,9 @@
 // own includes
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
+#include "helper/mischelper.hxx"
 
-#ifndef __FRAMEWORK_ACCELERATORCONST_H_
 #include <acceleratorconst.h>
-#endif
 #include <services.h>
 
 //_______________________________________________
@@ -48,26 +48,16 @@
 //_______________________________________________
 // other includes
 
-#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX
 #include <comphelper/sequenceashashmap.hxx>
-#endif
 #include <vcl/svapp.hxx>
 
-#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
 #include <comphelper/configurationhelper.hxx>
-#endif
 
-#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_
 #include <com/sun/star/util/XChangesNotifier.hpp>
-#endif
 
-#ifndef _RTL_LOGFILE_HXX_
 #include <rtl/logfile.hxx>
-#endif
 
-#ifndef _RTL_LOGFILE_HXX_
 #include <rtl/logfile.h>
-#endif
 
 //_______________________________________________
 // const
@@ -112,7 +102,6 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::R
 //-----------------------------------------------
 ModuleAcceleratorConfiguration::~ModuleAcceleratorConfiguration()
 {
-   // m_aPresetHandler.removeStorageListener(this);
 }
 
 //-----------------------------------------------
@@ -125,12 +114,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
     WriteGuard aWriteLock(m_aLock);
 
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
-    m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-    m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Locale")          , ::rtl::OUString::createFromAscii("x-default"));
+    m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+    m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))          , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x-default")));
 
     if (!m_sModule.getLength())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The module dependend accelerator configuration service was initialized with an empty module identifier!")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     aWriteLock.unlock();
@@ -163,7 +152,8 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache()
         XCUBasedAcceleratorConfiguration::reload();
 
         css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfg, css::uno::UNO_QUERY_THROW);
-        xBroadcaster->addChangesListener(static_cast< css::util::XChangesListener* >(this));
+        m_xCfgListener = new WeakChangesListener(this);
+        xBroadcaster->addChangesListener(m_xCfgListener);
     }
     catch(const css::uno::RuntimeException& exRun)
         { throw exRun; }
@@ -173,3 +163,4 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache()
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index ecfe6d2a0a5f..bcd4788790d0 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,41 +42,25 @@
 //_______________________________________________
 // interface includes
 
-#ifndef __COM_SUN_STAR_CONFIGURATION_CORRUPTEDUICONFIGURATIONEXCEPTION_HPP_
 #include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_
 #include <com/sun/star/container/NoSuchElementException.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_
 #include <com/sun/star/embed/ElementModes.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
 
 //_______________________________________________
 // other includes
 #include <vcl/svapp.hxx>
 
-#ifndef _RTL_USTRBUF_HXX
 #include <rtl/ustrbuf.hxx>
-#endif
 
 //_______________________________________________
 // const
@@ -227,7 +212,7 @@ void PresetHandler::forgetCachedStorages()
 //-----------------------------------------------
 ::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
 {
-    ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error.");
+    ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error."));
 
     switch(nID)
     {
@@ -275,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     // Note: May be an user uses URLs without a final slash! Check it ...
     nPos = sShareLayer.lastIndexOf('/');
     if (nPos != sShareLayer.getLength()-1)
-        sShareLayer += ::rtl::OUString::createFromAscii("/");
+        sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sShareLayer += RELPATH_SHARE_LAYER; // folder
     /*
@@ -331,7 +316,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     // Note: May be an user uses URLs without a final slash! Check it ...
     sal_Int32 nPos = sUserLayer.lastIndexOf('/');
     if (nPos != sUserLayer.getLength()-1)
-        sUserLayer += ::rtl::OUString::createFromAscii("/");
+        sUserLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sUserLayer  += RELPATH_USER_LAYER; // storage file
 
@@ -431,7 +416,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     {
         if (!xDocumentRoot.is())
             throw css::uno::RuntimeException(
-                    ::rtl::OUString::createFromAscii("There is valid root storage, where the UI configuration can work on."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is valid root storage, where the UI configuration can work on.")),
                     css::uno::Reference< css::uno::XInterface >());
         m_lDocumentStorages.setRootStorage(xDocumentRoot);
         xShare = xDocumentRoot;
@@ -935,3 +920,5 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
 
 //-----------------------------------------------
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 33776d8c7fc1..858cc392de9f 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,37 +39,21 @@
 //===============================================
 // interface includes
 
-#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_
 #include <com/sun/star/container/NoSuchElementException.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_
 #include <com/sun/star/embed/ElementModes.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_
 #include <com/sun/star/embed/XTransactedObject.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_EMBED_XPACKAGESTRUCTURECREATOR_HPP_
 #include <com/sun/star/embed/XPackageStructureCreator.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_IO_XSEEKABLE_HPP_
 #include <com/sun/star/io/XSeekable.hpp>
-#endif
 
 //===============================================
 // other includes
@@ -79,7 +64,7 @@
 
 #define PATH_SEPERATOR_ASCII        "/"
 #define PATH_SEPERATOR_UNICODE      ((sal_Unicode)'/')
-#define PATH_SEPERATOR              ::rtl::OUString::createFromAscii(PATH_SEPERATOR_ASCII)
+#define PATH_SEPERATOR              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII))
 
 //===============================================
 // namespace
@@ -376,7 +361,7 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath)
     {
         IStorageListener* pListener = *pIt2;
         if (pListener)
-            pListener->changesOccured(sNormedPath);
+            pListener->changesOccurred(sNormedPath);
     }
 
     aReadLock.unlock();
@@ -635,3 +620,5 @@ OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath)
 
 //===============================================
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
deleted file mode 100644
index 76044ae6bb51..000000000000
--- a/framework/source/application/framework.cxx
+++ /dev/null
@@ -1,286 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __FRAMEWORK_HELPER_OINSTANCEPROVIDER_HXX_
-#include <helper/oinstanceprovider.hxx>
-#endif
-#include <classes/servicemanager.hxx>
-#include <macros/debug.hxx>
-
-#ifndef __FRAMEWORK_DEFINES_HXX_
-#include <defines.hxx>
-#endif
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/frame/XFrameLoader.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XLoadEventListener.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XFrames.hpp>
-
-#ifndef _COM_SUN_STAR_CONNECTION_XConnection_HPP_
-#include <com/sun/star/connection/XConnection.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_BRIDGE_XBridgeFactory_HPP_
-#include <com/sun/star/bridge/XBridgeFactory.hpp>
-#endif
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/unoiface.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vos/process.hxx>
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::rtl                           ;
-using namespace ::vos                           ;
-using namespace ::comphelper                    ;
-using namespace ::framework                     ;
-using namespace ::com::sun::star::uno           ;
-using namespace ::com::sun::star::lang          ;
-using namespace ::com::sun::star::frame         ;
-using namespace ::com::sun::star::awt           ;
-using namespace ::com::sun::star::beans         ;
-using namespace ::com::sun::star::util          ;
-using namespace ::com::sun::star::connection    ;
-using namespace ::com::sun::star::bridge        ;
-
-//_________________________________________________________________________________________________________________
-//  const
-//_________________________________________________________________________________________________________________
-
-#define APPLICATIONNAME                         "FrameWork"
-#define COMMANDARGUMENT_PLUGIN                  DECLARE_ASCII("-plugin"                 )
-#define NAME_PLUGINBRIDGE                       DECLARE_ASCII("mozilla plugin bridge"   )
-#define PROTOCOL_PLUGINBRIDGE                   DECLARE_ASCII("urp"                     )
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short      normal application
-    @descr      An instance of these class can be a normal node in frame tree only. The highest level to be allowed is 3!
-                On 1 stand the desktop himself as the only one, on 2 are all tasks present ... and then comes frames only.
-                A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as
-                set/get of a frame window, component or controller.
-
-    @implements XInterface
-                XTypeProvider
-                XServiceInfo
-                XFramesSupplier
-                XFrame
-                XComponent
-                XStatusIndicatorSupplier
-                XDispatchProvider
-                XDispatchProviderInterception
-                XBrowseHistoryRegistry
-                XLoadEventListener
-                XEventListener
-                XWindowListener
-                XTopWindowListener
-                [ XDebugging, if TEST_TREE is defined! ]
-    @base       OMutexMember
-                OWeakObject
-
-    @devstatus  deprecated
-*//*-*************************************************************************************************************/
-class FrameWork : public Application
-{
-    //-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    public:
-        void Main();
-
-    private:
-        void impl_analyzeCommandArguments();
-
-    private:
-        sal_Bool    m_bUsePlugIn    ;
-
-};  //  class FrameWork
-
-//_________________________________________________________________________________________________________________
-//  definitions
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  global variables
-//_________________________________________________________________________________________________________________
-
-FrameWork   aFrameWork  ;
-
-//_________________________________________________________________________________________________________________
-//  definitions
-//_________________________________________________________________________________________________________________
-
-//*****************************************************************************************************************
-//  private methods
-//*****************************************************************************************************************
-void FrameWork::impl_analyzeCommandArguments()
-{
-    // First reset all member variables which present states of incoming arguments!
-    m_bUsePlugIn = sal_False;   // depends from "/plugin"
-
-    // Then step over all given arguments and search for supported one.
-    OStartupInfo    aInfo       ;
-    OUString        sArgument   ;
-    sal_uInt32      nCount      = aInfo.getCommandArgCount();
-    for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument )
-    {
-        // If extraction of current argument successfull ...
-        if ( aInfo.getCommandArg( nArgument, sArgument ) == osl_Process_E_None )
-        {
-            // ... search for matching with supported values.
-            if ( sArgument == COMMANDARGUMENT_PLUGIN )
-            {
-                // We found "/plugin" => set internal equivalent.
-                m_bUsePlugIn = sal_True;
-            }
-        }
-    }
-}
-
-//_________________________________________________________________________________________________________________
-//  main
-//_________________________________________________________________________________________________________________
-
-void FrameWork::Main()
-{
-    //-------------------------------------------------------------------------------------------------------------
-    // a) Initialize ouer application
-
-    // Analyze command arguments.
-    impl_analyzeCommandArguments();
-
-    // Create new global servicemanager.
-    ServiceManager aManager;
-    Reference< XMultiServiceFactory > xGlobalServiceManager = aManager.getGlobalUNOServiceManager();
-
-    if ( xGlobalServiceManager.is() == sal_True )
-    {
-        // If it was successful - set in as static value in UNOTOOLS!
-        setProcessServiceFactory( xGlobalServiceManager );
-
-        //---------------------------------------------------------------------------------------------------------
-        // b) Create root of ouer frame tree
-
-        // Create top of frame hierarchy - the desktop.
-        Reference< XDesktop > xDesktop( xGlobalServiceManager->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
-        // Safe impossible cases
-        // We need the desktop for working.
-        LOG_ASSERT( !(xDesktop.is()==sal_False), "FrameWork::Main()\nCan't instanciate desktop!Servicename unknown?\n" )
-
-        //---------------------------------------------------------------------------------------------------------
-        // c) Initialize connection to possible PlugIn dll.
-
-// OPipeConnection removed, connection to plugin now uses acceptor service
-#if 0
-        if ( m_bUsePlugIn == sal_True )
-        {
-            Reference< XConnection >    xConnection         = new OPipeConnection( xGlobalServiceManager );
-            Reference< XBridgeFactory > xBridgeFactory      ( xGlobalServiceManager->createInstance( SERVICENAME_BRIDGEFACTORY  ), UNO_QUERY );
-            if  (
-                    ( xConnection.is()          == sal_True )   &&
-                    ( xBridgeFactory.is()       == sal_True )
-                )
-            {
-                Reference< XBridge > xBridge = xBridgeFactory->createBridge(    NAME_PLUGINBRIDGE                               ,
-                                                                                PROTOCOL_PLUGINBRIDGE                           ,
-                                                                                xConnection                                     ,
-                                                                                new OInstanceProvider( xGlobalServiceManager )  );
-            }
-            else
-            {
-                // Error handling ... !?
-                LOG_ASSERT( sal_False, "FrameWork::Main()\nNo connection to plugin. Initialization of bridge failed.\n" )
-            }
-        }
-#endif
-        //---------------------------------------------------------------------------------------------------------
-        // d) Initialize new task with a HTML-URL in it.
-
-        // Cast desktop to right interface to do this.
-        Reference< XDispatchProvider > xDispatchProvider( xDesktop, UNO_QUERY );
-        // Safe impossible cases.
-        // Desktop MUST support these interface!
-        LOG_ASSERT( !(xDispatchProvider.is()==sal_False), "FrameWork::Main()\nDesktop don't support XDispatchProvider interface.\n" )
-        if ( xDispatchProvider.is() == sal_True )
-        {
-            // Build URL ...
-            OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "file://e|/dokumentation/Documentation/projekte/services/inimanager/inimanager/index.html" ));
-            URL aURL;
-            aURL.Complete = sURL;
-            // ... and dispatch it.
-            Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, FRAMETYPE_BLANK, 0 );
-            xDispatch->dispatch( aURL, Sequence< PropertyValue >() );
-
-            // Use special feature of desktop service and log current tree state in file.
-//          LOG_TREE( xDesktop )
-
-            // Build URL ...
-            sURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "file://d|/menu.htm" ));
-            aURL.Complete = sURL;
-            // ... and dispatch it.
-            xDispatch = xDispatchProvider->queryDispatch( aURL, FRAMETYPE_BLANK, 0 );
-            xDispatch->dispatch( aURL, Sequence< PropertyValue >() );
-
-            // Use special feature of desktop service and log current tree state in file.
-//          LOG_TREE( xDesktop )
-        }
-
-        // Set running-mode for application.
-        Execute();
-    }
-}
diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx
deleted file mode 100644
index b3cad049ba95..000000000000
--- a/framework/source/application/login.cxx
+++ /dev/null
@@ -1,298 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
-#ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_
-#include <services/logindialog.hxx>
-#endif
-#include <classes/servicemanager.hxx>
-#include <macros/generic.hxx>
-#include <macros/debug.hxx>
-#include <services.h>
-
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/awt/XDialog.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <vos/process.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
-
-#include <stdio.h>
-
-//_________________________________________________________________________________________________________________
-//  const
-//_________________________________________________________________________________________________________________
-
-#define TEMPFILE_ENCODING           RTL_TEXTENCODING_UTF8           // encoding of written temp. ascii file
-#define LOGIN_RDB                   DECLARE_ASCII("login.rdb")      // name of our own registry file - neccessary to create own servicemanager
-#define SEPERATOR                   "\n"                            // used to seperate parts in temp. file
-
-#define MINARGUMENTCOUNT            1                               // count of min. required arguments
-#define ARGUMENTFOUND               0                               // OUString::compareTo returns 0 if searched string match given one
-#define ARGUMENTLENGTH              3                               // length of fixed part of any argument to detect it easier!
-
-#define ARGUMENT_TEMPFILE           DECLARE_ASCII("-f=")            // we support "-f=c:\temp\test.txt" to write dialog data in temp. file
-#define ARGUMENT_DIALOGPARENT       DECLARE_ASCII("-p=")            // we support "-p=36748322" as window handle of parent for vcl dialog
-
-//_________________________________________________________________________________________________________________
-//  namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::rtl                       ;
-using namespace ::vos                       ;
-using namespace ::comphelper                ;
-using namespace ::framework                 ;
-using namespace ::com::sun::star::uno       ;
-using namespace ::com::sun::star::lang      ;
-using namespace ::com::sun::star::awt       ;
-using namespace ::com::sun::star::beans     ;
-
-//_________________________________________________________________________________________________________________
-//  defines
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//  declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short      implement command application to show login dialog and save his information in temp. file!
-    @descr      We need this temp. file to share informations between our dialog and different processes, which
-                can't use vcl directly. Caller of this executable give us the file name as an argument - we save
-                all informations in it - caller can read it and MUST delete temp. file.
-                This is neccessary for example; to hide the password!
-
-    @implements -
-
-    @base       Application
-*//*-*************************************************************************************************************/
-class LoginApplication : public Application
-{
-    //*************************************************************************************************************
-    //  public methods
-    //*************************************************************************************************************
-    public:
-        void Main();
-
-    //*************************************************************************************************************
-    //  private methods
-    //*************************************************************************************************************
-    private:
-        void impl_parseCommandline();       // search supported arguments on command line
-
-    //*************************************************************************************************************
-    //  private variables
-    //*************************************************************************************************************
-    private:
-        OString     m_sTempFile     ;   // name of temp. file in system notation
-        sal_Int32   m_nParentHandle ;   // a parent window handle for used vcl dialog
-
-};  //  class LoginApplication
-
-//_________________________________________________________________________________________________________________
-//  global variables
-//_________________________________________________________________________________________________________________
-
-LoginApplication    gLoginApplication;
-
-//_________________________________________________________________________________________________________________
-//  main
-//_________________________________________________________________________________________________________________
-
-void LoginApplication::Main()
-{
-    // Init global uno servicemanager.
-    ServiceManager aManager;
-    Reference< XMultiServiceFactory > xServiceManager = aManager.getSharedUNOServiceManager( DECLARE_ASCII("login.rdb") );
-    LOG_ASSERT( !(xServiceManager.is()==sal_False), "LoginApplication::Main()\nCould not create uno service manager!\n" )
-
-    // Parse command line and set found arguments on application member.
-    impl_parseCommandline();
-    LOG_ASSERT( !(m_sTempFile.getLength()<1), "LoginApplication::Main()\nWrong or missing argument for temp. file detected!\n" )
-
-    // Try to get neccessary dialog service.
-    // By the way - cast it to interface XPropertySet too - we need it later.
-    // (define SERVICENAME... comes from defines.hxx!)
-    Reference< XDialog >        xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY );
-    Reference< XPropertySet >   xPropertySet( xLoginDialog                                              , UNO_QUERY );
-
-    // Work with valid ressources only!
-    // Otherwise do nothing ...
-    if  (
-            ( xLoginDialog.is()         ==  sal_True    )   &&
-            ( xPropertySet.is()         ==  sal_True    )   &&
-            ( m_sTempFile.getLength()   >   0           )
-        )
-    {
-        // Exist a parent window? YES => set right property.
-        if( m_nParentHandle != 0 )
-        {
-            Any aParentWindow;
-            aParentWindow <<= m_nParentHandle;
-            xPropertySet->setPropertyValue( PROPERTYNAME_PARENTWINDOW, aParentWindow );
-        }
-
-        Any aConnectionType;
-        aConnectionType <<= PROPERTYNAME_HTTPS;
-        xPropertySet->setPropertyValue( PROPERTYNAME_CONNECTIONTYPE, aConnectionType );
-
-        // Show login dialog and get decision of user.
-        sal_Bool bDecision = (sal_Bool)(xLoginDialog->execute());
-
-        OUString    sUserName       ;
-        OUString    sPassword       ;
-        OUString    sServer         ;
-        OUString    sConnectionType ;
-        sal_Int32   nPort=0         ;   // We need this default if follow "if"-statement "failed"!
-
-        // If user say "OK" ... get values from dialog.
-        // If user say "NO" ... leave it. Then we save empty informations later ...
-        if( bDecision == sal_True )
-        {
-            // defines PROPERTYNAME... comes from logindialog.hxx!
-            xPropertySet->getPropertyValue( PROPERTYNAME_USERNAME       ) >>= sUserName         ;
-            xPropertySet->getPropertyValue( PROPERTYNAME_PASSWORD       ) >>= sPassword         ;
-            xPropertySet->getPropertyValue( PROPERTYNAME_SERVER         ) >>= sServer           ;
-            xPropertySet->getPropertyValue( PROPERTYNAME_CONNECTIONTYPE ) >>= sConnectionType   ;
-            if( sConnectionType.getLength() > 0 )
-            {
-                xPropertySet->getPropertyValue( sConnectionType ) >>= nPort;
-            }
-        }
-
-        // Build string for output.
-        // At this point it doesnt matter if information exist or not!
-        // Format of output: "<decision>    [0|1]       SEPERATOR
-        //                    <username>    [string]    SEPERATOR
-        //                    <password>    [string]    SEPERATOR
-        //                    <servername>  [string]    SEPERATOR
-        //                    <port>        [int]       SEPERATOR"
-        OUStringBuffer sBuffer( 1000 );
-
-        if( bDecision == sal_True )
-        {
-            sBuffer.appendAscii( "1" );
-        }
-        else
-        {
-            sBuffer.appendAscii( "0" );
-        }
-        sBuffer.appendAscii ( SEPERATOR         );
-        sBuffer.append      ( sUserName         );
-        sBuffer.appendAscii ( SEPERATOR         );
-        sBuffer.append      ( sPassword         );
-        sBuffer.appendAscii ( SEPERATOR         );
-        sBuffer.append      ( sServer           );
-        sBuffer.appendAscii ( SEPERATOR         );
-        sBuffer.append      ( sConnectionType   );
-        sBuffer.appendAscii ( SEPERATOR         );
-        sBuffer.append      ( nPort             );
-        sBuffer.appendAscii ( SEPERATOR         );
-
-        // Write informations in temp. file.
-        // If given file name isnt valid ... caller will have a problem!!!
-        // If fil already exist (That's out of specification!!!) we overwrite it everytime.
-        FILE* pFile = fopen( m_sTempFile.getStr(), "w" );
-        LOG_ASSERT( !(pFile==NULL), "LoginApplication::Main()\nCould not open file!\n" );
-        if( pFile != NULL )
-        {
-            OString sEncodedOut = U2B_ENC( sBuffer.makeStringAndClear(), TEMPFILE_ENCODING );
-            fprintf( pFile, sEncodedOut.getStr()    );
-            fclose ( pFile                          );
-        }
-    }
-}
-
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-void LoginApplication::impl_parseCommandline()
-{
-    // Use vos::OStartupInfo for access to command line.
-    // Step over all arguments, search for supported ones and try to get his values.
-    // Set it on our member. Caller of this method must control setted values.
-    OStartupInfo aInfo;
-
-    sal_uInt32  nCount      =   aInfo.getCommandArgCount()  ;
-    sal_uInt32  nArgument   =   0                           ;
-    OUString    sArgument                                   ;
-    OUString    sValue                                      ;
-
-    // Warn programmer if argument count isnt ok!
-    LOG_ASSERT( !(nCount!=MINARGUMENTCOUNT), "LoginApplication::impl_parseCommandline()\nWrong argument count detected!\n" )
-
-    // Reset all possible argument variables to defaults if someone is missing.
-    m_sTempFile     = OString();
-    m_nParentHandle = 0        ;
-
-    // Step over all arguments ...
-    for( nArgument=0; nArgument<nCount; ++nArgument )
-    {
-        // .. but work with valid ones only!
-        // Don't check values here. Caller of this method must decide between wrong and allowed values!
-        aInfo.getCommandArg( nArgument, sArgument );
-
-        //_____________________________________________________________________________________________________
-        // Look for "-f=<temp. file name>"
-        if( sArgument.compareTo( ARGUMENT_TEMPFILE, ARGUMENTLENGTH ) == ARGUMENTFOUND )
-        {
-            sValue      = sArgument.copy( ARGUMENTLENGTH );
-            m_sTempFile = U2B(sValue);
-        }
-        else
-        //_____________________________________________________________________________________________________
-        // Look for "-p=<parent window handle>"
-        if( sArgument.compareTo( ARGUMENT_DIALOGPARENT, ARGUMENTLENGTH ) == ARGUMENTFOUND )
-        {
-            sValue          = sArgument.copy( ARGUMENTLENGTH );
-            m_nParentHandle = sValue.toInt32();
-        }
-    }
-
-    // Parent window handle is an optional argument ... but should be used mostly!
-    // Warn programmer.
-    LOG_ASSERT( !(m_nParentHandle==0), "Login.exe\nYou should give me a parent window handle!\n" )
-}
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index d3aad90c5c0d..2f02cc09b39b 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -224,7 +225,7 @@ void DropTargetListener::implts_OpenFile( const String& rFilePath )
     if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) )
         aFileURL = rFilePath;
 
-    ::osl::FileStatus aStatus( FileStatusMask_FileURL );
+    ::osl::FileStatus aStatus( osl_FileStatus_Mask_FileURL );
     ::osl::DirectoryItem aItem;
     if( ::osl::FileBase::E_None == ::osl::DirectoryItem::get( aFileURL, aItem ) &&
         ::osl::FileBase::E_None == aItem.getFileStatus( aStatus ) )
@@ -252,3 +253,4 @@ void DropTargetListener::implts_OpenFile( const String& rFilePath )
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index af25e786dbf1..f692029371b2 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,23 +33,15 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_FRAMECONTAINER_HXX_
 #include <classes/framecontainer.hxx>
-#endif
 #include <threadhelp/writeguard.hxx>
 #include <threadhelp/readguard.hxx>
 
-#ifndef __FRAMEWORK_COMMANDS_HXX_
-#include <commands.h>
-#endif
-
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -158,12 +151,6 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF
         // We don't need the write lock any longer ...
         // downgrade to read access.
         aWriteLock.downgrade();
-/*DEPRECATEME
-        // If last frame was removed and special quit mode is enabled by the desktop
-        // we must terminate the application by using this asynchronous callback!
-        if (m_aContainer.size()<1 && m_bAsyncQuit)
-            m_aAsyncCall.Post(0);
-*/
     }
 
     aWriteLock.unlock();
@@ -209,12 +196,6 @@ void FrameContainer::clear()
     // Its an reference to a valid container-item.
     // But no container item => no active frame!
     m_xActiveFrame = css::uno::Reference< css::frame::XFrame >();
-/*DEPRECATEME
-    // If special quit mode is used - we must terminate the desktop.
-    // He is the owner of this container and can't work without any visible tasks/frames!
-    if (m_bAsyncQuit)
-        m_aAsyncCall.Post(0);
-*/
 
     aWriteLock.unlock();
     // } SAFE
@@ -416,3 +397,5 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildren
 }
 
 } //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index b41797e63595..3c3cd7d21bff 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,12 +51,11 @@
 #include <vcl/image.hxx>
 #include <vcl/msgbox.hxx>
 
-const ::rtl::OUString SERVICENAME_WINPROVIDER
-                                        = ::rtl::OUString::createFromAscii("com.sun.star.awt.ContainerWindowProvider");
-const ::rtl::OUString EXTERNAL_EVENT    = ::rtl::OUString::createFromAscii("external_event");
-const ::rtl::OUString BACK_METHOD       = ::rtl::OUString::createFromAscii("back");
-const ::rtl::OUString INITIALIZE_METHOD = ::rtl::OUString::createFromAscii("initialize");
-const ::rtl::OUString OK_METHOD         = ::rtl::OUString::createFromAscii("ok");
+const ::rtl::OUString SERVICENAME_WINPROVIDER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.ContainerWindowProvider"));
+const ::rtl::OUString EXTERNAL_EVENT(RTL_CONSTASCII_USTRINGPARAM("external_event"));
+const ::rtl::OUString BACK_METHOD(RTL_CONSTASCII_USTRINGPARAM("back"));
+const ::rtl::OUString INITIALIZE_METHOD(RTL_CONSTASCII_USTRINGPARAM("initialize"));
+const ::rtl::OUString OK_METHOD(RTL_CONSTASCII_USTRINGPARAM("ok"));
 
 using namespace ::com::sun::star;
 
@@ -195,8 +195,7 @@ void FwkTabPage::Resize()
 {
     if ( m_xPage.is () )
     {
-        Size  aSize = GetSizePixel ();
-        Point aPos  = GetPosPixel  ();
+        Size aSize = GetSizePixel();
 
         m_xPage->setPosSize( 0, 0, aSize.Width()-1 , aSize.Height()-1, awt::PosSize::POSSIZE );
     }
@@ -322,7 +321,6 @@ IMPL_LINK( FwkTabWindow, DeactivatePageHdl, TabControl *, EMPTYARG )
 
 IMPL_LINK( FwkTabWindow, CloseHdl, PushButton *, EMPTYARG )
 {
-//    Close();
     return 0;
 }
 
@@ -353,17 +351,17 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
         beans::NamedValue aValue = rProperties[i];
         ::rtl::OUString sName = aValue.Name;
 
-        if ( sName.equalsAscii("Title") )
+        if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
             aValue.Value >>= sTitle;
-        else if ( sName.equalsAscii("ToolTip") )
+        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ToolTip")) )
             aValue.Value >>= sToolTip;
-        else if ( sName.equalsAscii("PageURL") )
+        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PageURL")) )
             aValue.Value >>= sPageURL;
-        else if ( sName.equalsAscii("EventHdl") )
+        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EventHdl")) )
             aValue.Value >>= xEventHdl;
-        else if ( sName.equalsAscii("Image") )
+        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Image")) )
             aValue.Value >>= xImage;
-        else if ( sName.equalsAscii("Disabled") )
+        else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Disabled")) )
             aValue.Value >>= bDisabled;
     }
 
@@ -411,3 +409,4 @@ void FwkTabWindow::Resize()
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index 8a555d52f820..99836e48f256 100755..100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "classes/fwlresid.hxx"
 #include <tools/string.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <rtl/strbuf.hxx>
@@ -44,11 +45,8 @@ ResMgr* FwlResId::GetResManager()
 
     if ( !pResMgr )
     {
-        rtl::OStringBuffer aBuf( 32 );
-        aBuf.append( "fwe" );
-
-        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-        pResMgr = ResMgr::CreateResMgr( aBuf.getStr() );
+        SolarMutexGuard aSolarGuard;
+        pResMgr = ResMgr::CreateResMgr("fwe");
     }
 
     return pResMgr;
@@ -63,3 +61,4 @@ FwlResId::FwlResId( sal_uInt16 nId ) :
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index cf4d772f6044..80519d57987a 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,14 +68,12 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <tools/urlobj.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/file.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -84,7 +83,6 @@
 //_________________________________________________________________________________________________________________
 
 using namespace ::cppu;
-using namespace ::vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
@@ -121,26 +119,25 @@ namespace framework
 
 #define SFX_REFERER_USER        "private:user"
 
-const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" ));
-const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ));
+#define aSlotNewDocDirect "slot:5537"
+#define aSlotAutoPilot "slot:6381"
 
-const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" ));
-const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" ));
-const ::rtl::OUString aSlotSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5510" ));
-const ::rtl::OUString aSlotSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5610" ));
-const ::rtl::OUString aSlotSpecialToolsMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:6677" ));
+#define aSpecialFileMenu "file"
+#define aSpecialWindowMenu "window"
+#define aSlotSpecialFileMenu "slot:5510"
+#define aSlotSpecialWindowMenu "slot:5610"
+#define aSlotSpecialToolsMenu "slot:6677"
 
 // special uno commands for picklist and window list
-const ::rtl::OUString aSpecialFileCommand( RTL_CONSTASCII_USTRINGPARAM( "PickList" ));
-const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( "WindowList" ));
+#define aSpecialFileCommand "PickList"
+#define aSpecialWindowCommand "WindowList"
 
 const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
 
-// #110897#
 MenuManager::MenuManager(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
-:   // #110897#
+:
     ThreadHelpBase( &Application::GetSolarMutex() ),
     mxServiceFactory(xServiceFactory)
 {
@@ -154,13 +151,10 @@ MenuManager::MenuManager(
     SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
 
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
-#if 0
-    ::std::vector< sal_uInt16 > aQueryLabelItemIdVector;
-#endif
+
 
     sal_uInt16 nItemCount = pMenu->GetItemCount();
     m_aMenuItemHandlerVector.reserve(nItemCount);
@@ -169,11 +163,13 @@ MenuManager::MenuManager(
     {
         sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
         bool bShowMenuImages( m_bShowMenuImages );
-        MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
-        // overwrite the default?
-        if ( nBits )
-            bShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
 
+        // overwrite the show icons on menu option?
+        if (!bShowMenuImages)
+        {
+            MenuItemBits nBits = pMenu->GetItemBits( nItemId );
+            bShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
+        }
 
         PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
@@ -182,16 +178,10 @@ MenuManager::MenuManager(
             if (! (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
                 ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
             {
-                // #110897#
-                // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-#if 0
-                if ( pMenu->GetItemText( nItemId ).Len() == 0 )
-                    aQueryLabelItemIdVector.push_back( nItemId );
-#endif
 
                 // Create addon popup menu if there exist elements and this is the tools popup menu
                 if (( nItemId == SID_ADDONLIST ||
-                    aItemCommand == aSlotSpecialToolsMenu ) &&
+                    aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) ) &&
                     AddonMenuManager::HasAddonMenuElements() )
                 {
                     sal_uInt16      nCount   = 0;
@@ -212,17 +202,11 @@ MenuManager::MenuManager(
                         aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
                         pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand );
 
-                        // #110897#
-                        // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
                         AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-#if 0
-                        if ( pMenu->GetItemText( nItemId ).Len() == 0 )
-                            aQueryLabelItemIdVector.push_back( nItemId );
-#endif
                         // Set image for the addon popup menu item
                         if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
                         {
-                            Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
+                            Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                             if ( !!aImage )
                                    pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -235,51 +219,33 @@ MenuManager::MenuManager(
         else
         {
             if ( nItemId == SID_NEWDOCDIRECT ||
-                 aItemCommand == aSlotNewDocDirect )
+                 aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotNewDocDirect)) )
             {
-                // #110897#
-                // Reference< ::com::sun::star::lang::XMultiServiceFactory > aMultiServiceFactory(::comphelper::getProcessServiceFactory());
-                // MenuConfiguration aMenuCfg( aMultiServiceFactory );
                 MenuConfiguration aMenuCfg( getServiceFactory() );
                 BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_NEWMENU );
                 pMenu->SetPopupMenu( nItemId, pSubMenu );
 
-                // #110897#
-                // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
                 AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-#if 0
-                if ( pMenu->GetItemText( nItemId ).Len() == 0 )
-                    aQueryLabelItemIdVector.push_back( nItemId );
-#endif
-
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
             }
             else if ( nItemId == SID_AUTOPILOTMENU ||
-                      aItemCommand == aSlotAutoPilot )
+                      aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotAutoPilot)) )
             {
-                // #110897#
-                // Reference< ::com::sun::star::lang::XMultiServiceFactory > aMultiServiceFactory(::comphelper::getProcessServiceFactory());
-                // MenuConfiguration aMenuCfg( aMultiServiceFactory );
                 MenuConfiguration aMenuCfg( getServiceFactory() );
                 BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_WIZARDMENU );
                 pMenu->SetPopupMenu( nItemId, pSubMenu );
 
-                // #110897#
-                // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
                 AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-#if 0
-                if ( pMenu->GetItemText( nItemId ).Len() == 0 )
-                    aQueryLabelItemIdVector.push_back( nItemId );
-#endif
+
 
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -300,14 +266,14 @@ MenuManager::MenuManager(
                         if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                         {
                             // Retrieve image id from menu attributes
-                            aImage = GetImageFromURL( rFrame, aImageId, sal_False, m_bWasHiContrast );
+                            aImage = GetImageFromURL( rFrame, aImageId, false );
                         }
 
                         if ( !aImage )
                         {
-                            aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
+                            aImage = GetImageFromURL( rFrame, aItemCommand, false );
                             if ( !aImage )
-                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, sal_False, m_bWasHiContrast );
+                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, false );
                         }
 
                         if ( !!aImage )
@@ -315,7 +281,7 @@ MenuManager::MenuManager(
                     }
                     else if ( !pMenu->GetItemImage( nItemId ))
                     {
-                        Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
+                        Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                         if ( !!aImage )
                                pMenu->SetItemImage( nItemId, aImage );
                     }
@@ -323,98 +289,16 @@ MenuManager::MenuManager(
 
                 REFERENCE< XDISPATCH > aXDispatchRef;
                 m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef ));
-#if 0
-                if ( pMenu->GetItemText( nItemId ).Len() == 0 )
-                    aQueryLabelItemIdVector.push_back( nItemId );
-#endif
+
             }
         }
     }
 
-
     // retrieve label information for all menu items without item text
-#if 0
-    if ( aQueryLabelItemIdVector.size() > 0 )
-    {
-        Sequence< ::rtl::OUString > aURLSequence( aQueryLabelItemIdVector.size() );
-        Sequence< ::rtl::OUString > aLabelSequence( aQueryLabelItemIdVector.size() );
 
-        sal_uInt32 nPos = 0;
-        ::std::vector< sal_uInt16 >::iterator p;
-        for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ )
-            aURLSequence[nPos++] = pMenu->GetItemCommand( *p );
-
-        Reference< XDispatchInformationProvider > xDIP( xFrame, UNO_QUERY );
-        if ( xDIP.is() )
-        {
-            nPos = 0;
-            xDIP->queryDispatchInformations( aURLSequence, aLabelSequence );
-            for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ )
-                pMenu->SetItemText( *p, aLabelSequence( nPos++ ));
-        }
-    }
-#endif
     SetHdl();
 }
 
-#if 0
-// #110897#
-MenuManager::MenuManager(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
-:   // #110897#
-    ThreadHelpBase( &Application::GetSolarMutex() ),
-    mxServiceFactory(xServiceFactory)
-{
-    m_bActive           = sal_False;
-    m_bDeleteMenu       = bDelete;
-    m_bDeleteChildren   = bDeleteChildren;
-    m_pVCLMenu          = pAddonMenu;
-    m_xFrame            = rFrame;
-    m_bInitialized      = sal_False;
-    m_bIsBookmarkMenu   = sal_True;
-
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
-
-    SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
-
-    sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
-    m_aMenuItemHandlerVector.reserve(nItemCount);
-    ::rtl::OUString aItemCommand;
-    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
-    {
-        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
-
-        PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
-        if ( pPopupMenu )
-        {
-            // #110897#
-            // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-            AddMenu(pPopupMenu,aItemCommand,nItemId,bDeleteChildren,bDeleteChildren);
-        }
-        else
-        {
-            if ( pAddonMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
-            {
-                MenuConfiguration::Attributes* pAddonAttributes = (MenuConfiguration::Attributes *)(pAddonMenu->GetUserValue( nItemId ));
-                REFERENCE< XDISPATCH > aXDispatchRef;
-                MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, NULL, aXDispatchRef );
-
-                if ( pAddonAttributes )
-                {
-                    // read additional attributes from attributes struct and AddonMenu implementation will delete all attributes itself!!
-                    pMenuItemHandler->aTargetFrame = pAddonAttributes->aTargetFrame;
-                }
-
-                m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
-            }
-        }
-    }
-
-    SetHdl();
-}
-#endif
 
 void MenuManager::SetHdl()
 {
@@ -430,7 +314,7 @@ void MenuManager::SetHdl()
 MenuManager::~MenuManager()
 {
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         pItemHandler->xMenuItemDispatch.clear();
@@ -449,7 +333,7 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI
     ResetableGuard aGuard( m_aLock );
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         if ( pItemHandler->nItemId == nItemId )
@@ -470,7 +354,7 @@ throw ( RuntimeException )
         ResetableGuard aGuard( m_aLock );
 
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pMenuItemHandler = *p;
             if ( pMenuItemHandler->aMenuItemURL == aFeatureURL )
@@ -483,7 +367,7 @@ throw ( RuntimeException )
 
     if ( pStatusChangedMenu )
     {
-        OGuard  aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         {
             ResetableGuard aGuard( m_aLock );
 
@@ -506,7 +390,6 @@ throw ( RuntimeException )
             URL aTargetURL;
             aTargetURL.Complete = pStatusChangedMenu->aMenuItemURL;
 
-            // #110897#
             m_xURLTransformer->parseStrict( aTargetURL );
 
             REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
@@ -535,9 +418,8 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly)
     // disposing called from parent dispatcher
     // remove all listener to prepare shutdown
 
-    // #110897#
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         if ( pItemHandler->xMenuItemDispatch.is() )
@@ -578,7 +460,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM
             ResetableGuard aGuard( m_aLock );
 
             std::vector< MenuItemHandler* >::iterator p;
-            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
             {
                 MenuItemHandler* pMenuItemHandler = *p;
                 if ( pMenuItemHandler->xMenuItemDispatch == Source.Source )
@@ -593,7 +475,6 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM
                 URL aTargetURL;
                 aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL;
 
-                // #110897#
                 m_xURLTransformer->parseStrict( aTargetURL );
 
                 pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL );
@@ -647,13 +528,12 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
         URL aTargetURL;
         REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
 
-        // #110897#
         REFERENCE< XDISPATCH > xMenuItemDispatch;
 
         static const ::rtl::OUString s_sDefault(RTL_CONSTASCII_USTRINGPARAM("_default"));
         // query for dispatcher
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); p++ )
+        for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); ++p )
         {
             MenuItemHandler* pMenuItemHandler = *p;
 
@@ -776,7 +656,6 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe
     // update window list
     ::std::vector< ::rtl::OUString > aNewWindowListVector;
 
-    // #110897#
     Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
     sal_uInt16  nActiveItemId = 0;
@@ -914,24 +793,21 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
             aCommand = aCommand.copy( UNO_COMMAND.getLength() );
         }
 
-        if ( m_aMenuItemCommand == aSpecialFileMenu ||
-             m_aMenuItemCommand == aSlotSpecialFileMenu ||
-             aCommand == aSpecialFileCommand )
+        if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialFileMenu)) ||
+             m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialFileMenu)) ||
+             aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialFileCommand)) )
             UpdateSpecialFileMenu( pMenu );
-        else if ( m_aMenuItemCommand == aSpecialWindowMenu ||
-                  m_aMenuItemCommand == aSlotSpecialWindowMenu ||
-                  aCommand == aSpecialWindowCommand )
+        else if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) ||
+                  m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialWindowMenu)) ||
+                  aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) )
                   UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
 
         // Check if some modes have changed so we have to update our menu images
-        sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
-
-        if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages )
+        if ( bShowMenuImages != m_bShowMenuImages )
         {
             // The mode changed so we have to replace all images
-            m_bWasHiContrast    = bIsHiContrast;
             m_bShowMenuImages   = bShowMenuImages;
-            FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
+            FillMenuImages( m_xFrame, pMenu, bShowMenuImages );
         }
 
         if ( m_bInitialized )
@@ -940,14 +816,13 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         {
             URL aTargetURL;
 
-            // #110897#
             ResetableGuard aGuard( m_aLock );
 
             REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
             if ( xDispatchProvider.is() )
             {
                 std::vector< MenuItemHandler* >::iterator p;
-                for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+                for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
                 {
                     MenuItemHandler* pMenuItemHandler = *p;
                     if ( pMenuItemHandler &&
@@ -1024,9 +899,6 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
             {
                 // window list menu item selected
 
-                // #110897#
-                // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
-                //  DESKTOP_SERVICE ), UNO_QUERY );
                 Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
                 if ( xDesktop.is() )
@@ -1091,10 +963,8 @@ IMPL_LINK( MenuManager, Highlight, Menu *, EMPTYARG )
     return 0;
 }
 
-// #110897#
 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& MenuManager::getServiceFactory()
 {
-    // #110897#
     return mxServiceFactory;
 }
 
@@ -1127,7 +997,7 @@ sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pM
     }
     return nItemId;
 }
-void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages)
+void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bShowMenuImages)
 {
     AddonsOptions       aAddonOptions;
 
@@ -1137,10 +1007,12 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
         if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
         {
             bool bTmpShowMenuImages( bShowMenuImages );
-            MenuItemBits nBits =  _pMenu->GetItemBits( nId );
-            // overwrite the default?
-            if ( nBits )
+            // overwrite the show icons on menu option?
+            if (!bTmpShowMenuImages)
+            {
+                MenuItemBits nBits =  _pMenu->GetItemBits( nId );
                 bTmpShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
+            }
 
             if ( bTmpShowMenuImages )
             {
@@ -1155,7 +1027,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( _xFrame, aImageId, sal_False, bIsHiContrast );
+                    Image aImage = GetImageFromURL( _xFrame, aImageId, false );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -1166,9 +1038,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
                 if ( !bImageSet )
                 {
                     rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
-                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, sal_False, bIsHiContrast );
+                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, false );
                     if ( !aImage )
-                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, sal_False, bIsHiContrast );
+                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, false );
 
                     _pMenu->SetItemImage( nId, aImage );
                 }
@@ -1179,3 +1051,5 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
     }
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index e14c57fb555a..c1af6eb2c3c9 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -53,8 +53,6 @@ String STR_UPDATEDOC
 
 String STR_CLOSEDOC_ANDRETURN
 {
-    /* ### ACHTUNG: Neuer Text in Resource? S~chlieen & zur ck zu  : S~chlieen & zurck zu  */
-    /* ### ACHTUNG: Neuer Text in Resource? S~chlie en & zur ck zu  : S~chlieen & zurck zu  */
     Text [ en-US ] = "~Close & Return to " ;
 };
 
@@ -124,15 +122,13 @@ String STR_TOOLBAR_TITLE_ADDON
 
 String STR_STATUSBAR_LOGOTEXT
 {
-    Text [ en-US ] = "A %PRODUCTNAME product by Oracle";
+    Text [ en-US ] = "A %PRODUCTNAME product by %OOOVENDOR";
 };
 
 // ***********************************************************************
 //       License Dialog
 // ***********************************************************************
 #define LICENSE_DIALOG_WIDTH  260
-//#define LICENSE_DIALOG_HEIGTH 185
-//#define LICENSE_DIALOG_HEIGTH 190
 #define LICENSE_RIGHT_BORDER  7
 #define LICENSE_BOTTOM_BORDER  0
 #define LICENSE_ROW_1 (7)
@@ -326,31 +322,37 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES
     Text [ en-US ] = "Multiple Languages" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_NONE
 {
     Text [ en-US ] = "None (Do not check spelling)" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_RESET_TO_DEFAULT_LANGUAGE
 {
     Text [ en-US ] = "Reset to Default Language" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_MORE
 {
     Text [ en-US ] = "More..." ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_SELECTION
 {
     Text [ en-US ] = "Set Language for Selection" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_PARAGRAPH
 {
     Text [ en-US ] = "Set Language for Paragraph" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_ALL_TEXT
 {
     Text [ en-US ] = "Set Language for all Text" ;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 162c10e5cfa0..6edfc8d192ac 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -104,9 +105,9 @@ TaskCreator::~TaskCreator()
 css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName    ,
                                                                          sal_Bool         bVisible )
 {
-    static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.Office.TabBrowse");
-    static ::rtl::OUString RELPATH = ::rtl::OUString::createFromAscii("TaskCreatorService"             );
-    static ::rtl::OUString KEY     = ::rtl::OUString::createFromAscii("ImplementationName"             );
+    static ::rtl::OUString PACKAGE(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.TabBrowse"));
+    static ::rtl::OUString RELPATH(RTL_CONSTASCII_USTRINGPARAM("TaskCreatorService"));
+    static ::rtl::OUString KEY(RTL_CONSTASCII_USTRINGPARAM("ImplementationName"));
 
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
@@ -169,3 +170,5 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx
index 5468e2fe721b..a0082aabe394 100644
--- a/framework/source/constant/containerquery.cxx
+++ b/framework/source/constant/containerquery.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_
 #include <constant/containerquery.hxx>
-#endif
 
 namespace framework{
     namespace constant{
@@ -40,3 +39,5 @@ const sal_Unicode ContainerQuery::SEPERATOR_VALUE = (sal_Unicode)'=';
 
     } // namespace constant
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx
index 239b365f565b..0db196ed1eb7 100644
--- a/framework/source/constant/contenthandler.cxx
+++ b/framework/source/constant/contenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_
 #include <constant/contenthandler.hxx>
-#endif
 
 namespace framework{
     namespace constant{
@@ -40,3 +39,5 @@ const ::rtl::OUString ContentHandler::PROP_TYPES    = ::rtl::OUString(RTL_CONSTA
 
     } // namespace constant
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx
index bfa125aa04cb..3f4addd34ca1 100644
--- a/framework/source/constant/frameloader.cxx
+++ b/framework/source/constant/frameloader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_
 #include <constant/frameloader.hxx>
-#endif
 
 namespace framework{
     namespace constant{
@@ -40,3 +39,5 @@ const ::rtl::OUString FrameLoader::PROP_TYPES  = ::rtl::OUString(RTL_CONSTASCII_
 
     } // namespace constant
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 57355eaa6398..ab9664f01bd3 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,7 +55,7 @@
 
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <unotools/moduleoptions.hxx>
 
 //_______________________________________________
@@ -237,7 +238,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
     sal_Bool bIsSynchron = sal_False;
     for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ )
     {
-        if ( lArguments[nArgs].Name.equalsAscii("SynchronMode") )
+        if ( lArguments[nArgs].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SynchronMode")) )
         {
             lArguments[nArgs].Value >>= bIsSynchron;
             break;
@@ -451,7 +452,6 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG )
     }
     catch(const css::lang::DisposedException&)
     {
-        LOG_ERROR("CloseDispatcher::impl_asyncCallback", "Congratulation! You found the reason for bug #120310#. Please contact the right developer and show him a scenario, which trigger this bug. THX.")
     }
 
     return 0;
@@ -629,7 +629,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig
             //     Attention ! Checking Window->GetParent() isnt the right approach here.
             //     Because sometimes VCL create "implicit border windows" as parents even we created
             //     a simple XWindow using the toolkit only .-(
-            ::vos::OGuard aSolarLock(&Application::GetSolarMutex());
+            SolarMutexGuard aSolarLock;
             Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
             if (
                 (pWindow                  ) &&
@@ -651,3 +651,5 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index e8447c04c3c7..bef585ed6ab5 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -172,7 +173,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide
     if (!xFrame.is())
         return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >();
 
-    CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString::createFromAscii("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
+    CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self"))); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
     css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY);
 
     css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser                                                      , css::uno::UNO_QUERY);
@@ -188,3 +189,5 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 23f03b9ff8f0..4a7c1d1ec799 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -225,7 +226,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp
 
 ::sal_Bool lcl_isStartModuleDispatch (const css::util::URL& aURL)
 {
-    return (aURL.Complete.equals(CMD_UNO_SHOWSTARTMODULE));
+    return (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE)));
 }
 
 //_________________________________________________________________________________________________________________
@@ -476,8 +477,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     {
         // There exist a hard coded interception for special URLs.
         if (
-            (aURL.Complete.equalsAscii(".uno:CloseDoc"  )) ||
-            (aURL.Complete.equalsAscii(".uno:CloseWin"  ))
+            (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseDoc"))) ||
+            (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseWin")))
            )
         {
             css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
@@ -493,7 +494,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
             else
                 xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
         }
-        else if (aURL.Complete.equalsAscii(".uno:CloseFrame"))
+        else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseFrame")))
             xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame );
 
         if ( ! xDispatcher.is())
@@ -793,3 +794,5 @@ sal_Bool DispatchProvider::implts_isLoadableContent( const css::util::URL& aURL
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx
index efc373338cf8..4ae8ac15ee6f 100644
--- a/framework/source/dispatch/helpagentdispatcher.cxx
+++ b/framework/source/dispatch/helpagentdispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,7 +229,7 @@ void HelpAgentDispatcher::implts_acceptCurrentURL()
     // show the right help content
     // SOLAR SAFE ->
     {
-        ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarLock;
         Help* pHelp = Application::GetHelp();
         if (pHelp)
             pHelp->Start(sAcceptedURL, NULL);
@@ -265,7 +266,7 @@ void HelpAgentDispatcher::implts_stopTimer()
     // Timer access needs no "own lock" ! It lives if we live ...
     // But it requires locking of the solar mutex ... because it's a vcl based timer.
     {
-        ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarLock;
         if (! m_aTimer.IsActive())
             return;
         m_aTimer.Stop();
@@ -280,7 +281,7 @@ void HelpAgentDispatcher::implts_startTimer()
     // Timer access needs no "own lock" ! It lives if we live ...
     // But it requires locking of the solar mutex ... because it's a vcl based timer.
     {
-        ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarLock;
         if (m_aTimer.IsActive())
             return;
     }
@@ -301,7 +302,7 @@ void HelpAgentDispatcher::implts_startTimer()
     // Timer access needs no "own lock" ! It lives if we live ...
     // But it requires locking of the solar mutex ... because it's a vcl based timer.
     {
-        ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarLock;
         m_aTimer.SetTimeout(nTime*1000); // sec => ms !
         m_aTimer.Start();
     }
@@ -410,7 +411,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent
     ::svt::HelpAgentWindow* pAgentWindow = 0;
     // SOLAR SAFE ->
     {
-        ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarLock;
         // create the agent window
         Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow);
                 pAgentWindow     = new ::svt::HelpAgentWindow(pContainerWindow);
@@ -430,7 +431,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent
 
     // SOLAR SAFE ->
     {
-        ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarLock;
         // establish callback for our internal used timer.
         // Note: Its only active, if the timer will be started ...
         m_aTimer.SetTimeoutHdl(LINK(this, HelpAgentDispatcher, implts_timerExpired));
@@ -442,3 +443,4 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 17a29902466f..c9db19b8ac5e 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 //_______________________________________________
 //  my own includes
 
-#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_
 #include <dispatch/interceptionhelper.hxx>
-#endif
 
 //_______________________________________________
 //  interface includes
@@ -173,7 +172,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
     else
     {
         aInfo.lURLPattern.realloc(1);
-        aInfo.lURLPattern[0] = ::rtl::OUString::createFromAscii("*");
+        aInfo.lURLPattern[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
     }
 
     // SAFE {
@@ -331,7 +330,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
     // SAFE ->
     aReadLock.lock();
     if (!m_lInterceptionRegs.empty() )
-        OSL_ENSURE(sal_False, "There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
+        OSL_FAIL("There are some pending interceptor objects, which seams to be registered during (!) the destruction of a frame.");
     aReadLock.unlock();
     // <- SAFE
     #endif // ODL_DEBUG_LEVEL>0
@@ -340,3 +339,5 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 2791ee9402a9..31accd649aa7 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,5 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL,
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index d8aa310d6351..3c505540ae33 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -309,7 +310,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
     @param      xListener
                     reference to a valid listener for state events
     @param      aURL
-                    URL about listener will be informed, if something occured
+                    URL about listener will be informed, if something occurred
 
     @modified   30.04.2002 14:49, as96863
 */
@@ -328,3 +329,5 @@ void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference<
 }
 
 } //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 5c71eade3814..ce8f9c374a21 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,7 +59,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/rcid.h>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <rtl/logfile.hxx>
 
@@ -83,10 +84,7 @@ using namespace ::com::sun::star::lang          ;
 using namespace ::com::sun::star::uno           ;
 using namespace ::com::sun::star::util          ;
 using namespace ::cppu                          ;
-using namespace ::osl                           ;
-using namespace ::rtl                           ;
-using namespace ::vos                           ;
-
+    using ::rtl::OUString;
 //_________________________________________________________________________________________________________________
 //  non exported const
 //_________________________________________________________________________________________________________________
@@ -210,7 +208,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro
         {
             uno::Reference< ::com::sun::star::awt::XWindow >xContainerWindow = xFrame->getContainerWindow();
 
-            OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             {
                 Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
                 while ( pWindow && !pWindow->IsSystemWindow() )
@@ -272,8 +270,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
 
 //*****************************************************************************************************************
 //  private method
-//
-//
 //*****************************************************************************************************************
 void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
 {
@@ -294,8 +290,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
 
 //*****************************************************************************************************************
 //  private method
-//
-//
 //*****************************************************************************************************************
 sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource )
 {
@@ -306,7 +300,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
         Window* pWindow = NULL;
 
         // Use SolarMutex for threadsafe code too!
-        OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         {
             pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
             while ( pWindow && !pWindow->IsSystemWindow() )
@@ -357,14 +351,10 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
                 // set new menu on our system window and create new menu manager
                 if ( bMenuFromResource )
                 {
-                    // #110897#
-                    // m_pMenuManager = new MenuManager( xFrame, pMenuBar, sal_True, sal_False );
                     m_pMenuManager = new MenuManager( m_xFactory, xFrame, pMenuBar, sal_True, sal_False );
                 }
                 else
                 {
-                    // #110897#
-                    // m_pMenuManager = new MenuManager( xFrame, pMenuBar, sal_True, sal_True );
                     m_pMenuManager = new MenuManager( m_xFactory, xFrame, pMenuBar, sal_True, sal_True );
                 }
 
@@ -385,7 +375,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG )
         return 0;
 
     css::util::URL aURL;
-    aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseWin");
+    aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
     css::uno::Reference< css::util::XURLTransformer >  xTrans ( m_xFactory->createInstance(
                         SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY );
     if( xTrans.is() )
@@ -486,3 +476,5 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_removeStatusListener(  const   u
 #endif  //  #ifdef ENABLE_ASSERTIONS
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 54228db4b670..f1b5edd86691 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,33 +32,19 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_DISPATCH_OXT_HANDLER_HXX_
 #include <dispatch/oxt_handler.hxx>
-#endif
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_
 #include <threadhelp/transactionguard.hxx>
-#endif
 
-#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
 #include <threadhelp/writeguard.hxx>
-#endif
 
-#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
 #include <threadhelp/readguard.hxx>
-#endif
 
-#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
 #include <macros/debug.hxx>
-#endif
 
-#ifndef __FRAMEWORK_SERVICES_H_
 #include <services.h>
-#endif
 
-#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_
 #include <comphelper/mediadescriptor.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -71,13 +58,9 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
 #include <comphelper/sequenceashashmap.hxx>
-#endif
 
-#ifndef _RTL_USTRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -222,17 +205,6 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
         xListener->dispatchFinished( aEvent );
     }
 
-/*
-    // Try to initialize player.
-    m_xListener = xListener;
-    if (m_aPlayer.SetSoundName(aURL.Complete))
-    {
-        // OK- we can start async playing ...
-        // Count this request and initialize self-holder against dieing by uno ref count ...
-        m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
-        m_aPlayer.Play();
-    }
-*/
     // } SAFE
     aLock.unlock();
 }
@@ -286,7 +258,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
         // I think we can the following ones:
         //  a) look for given extension of url to map our type decision HARD CODED!!!
         //  b) return preferred type every time... it's easy :-)
-        sTypeName = ::rtl::OUString::createFromAscii("oxt_OpenOffice_Extension");
+        sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxt_OpenOffice_Extension"));
         aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
         aDescriptor >> lDescriptor;
     }
@@ -296,3 +268,5 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 8437b82961ea..babc0dbb76ec 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,6 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-//#include "precompiled_framework.hxx"
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -58,7 +58,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <ucbhelper/content.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 
@@ -79,7 +79,6 @@ using namespace ::com::sun::star::util          ;
 using namespace ::cppu                          ;
 using namespace ::osl                           ;
 using namespace ::rtl                           ;
-using namespace ::vos                           ;
 
 //_________________________________________________________________________________________________________________
 //  non exported const
@@ -419,3 +418,5 @@ void PopupMenuDispatcher::impl_CreateUriRefFactory()
 }
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 0316decd2b89..6f019f247775 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -330,7 +331,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
     @param      xListener
                     reference to a valid listener for state events
     @param      aURL
-                    URL about listener will be informed, if something occured
+                    URL about listener will be informed, if something occurred
 
     @modified   30.04.2002 14:49, as96863
 */
@@ -349,3 +350,5 @@ void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< c
 }
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 0e49b2818e56..d84e8fe3cb5c 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <unotools/moduleoptions.hxx>
 
 //_______________________________________________
@@ -119,7 +120,7 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
     throw(css::uno::RuntimeException)
 {
     ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
-    if (aURL.Complete.equals (CMD_UNO_SHOWSTARTMODULE))
+    if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE)))
     {
         nResult = css::frame::DispatchResultState::FAILURE;
         if (implts_isBackingModePossible ())
@@ -239,3 +240,5 @@ void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Referenc
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 2cdf28380480..8f20919ecdb0 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -232,3 +233,5 @@ void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame
 }
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 789e07b58c52..32361382b0a4 100755..100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,7 @@
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/cmdevt.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <rtl/logfile.hxx>
 
@@ -64,8 +65,8 @@ namespace css = ::com::sun::star;
 //_______________________________________________
 // declarations
 
-const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES = ::rtl::OUString::createFromAscii(".uno:OptionsTreeDialog");
-const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX    = ::rtl::OUString::createFromAscii(".uno:About");
+const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES(RTL_CONSTASCII_USTRINGPARAM(".uno:OptionsTreeDialog"));
+const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX(RTL_CONSTASCII_USTRINGPARAM(".uno:About"));
 
 //-----------------------------------------------
 WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
@@ -81,42 +82,54 @@ WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lan
 //-----------------------------------------------
 WindowCommandDispatch::~WindowCommandDispatch()
 {
+    impl_stopListening();
     m_xSMGR.clear();
 }
 
 //-----------------------------------------------
-void SAL_CALL WindowCommandDispatch::disposing(const css::lang::EventObject& /*aSource*/)
-    throw (css::uno::RuntimeException)
-{
-    // We hold our window weak ... so there is no need to clear it's reference here.
-    // The window and we will die by ref count automatically.
-}
-
-//-----------------------------------------------
 void WindowCommandDispatch::impl_startListening()
 {
-    // SYNCHRONIZED ->
     ReadGuard aReadLock(m_aLock);
     css::uno::Reference< css::awt::XWindow > xWindow( m_xWindow.get(), css::uno::UNO_QUERY );
     aReadLock.unlock();
-    // <- SYNCHRONIZED
 
     if ( ! xWindow.is())
         return;
 
-    // SYNCHRONIZED ->
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
+    {
+        SolarMutexGuard aSolarLock;
+
+        Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+        if ( ! pWindow)
+            return;
 
-    Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
-    if ( ! pWindow)
+        pWindow->AddEventListener( LINK(this, WindowCommandDispatch, impl_notifyCommand) );
+    }
+}
+
+void WindowCommandDispatch::impl_stopListening()
+{
+    ReadGuard aReadLock(m_aLock);
+    css::uno::Reference< css::awt::XWindow > xWindow( m_xWindow.get(), css::uno::UNO_QUERY );
+    aReadLock.unlock();
+
+    if (!xWindow.is())
         return;
 
-    pWindow->AddEventListener( LINK(this, WindowCommandDispatch, impl_notifyCommand) );
+    {
+        SolarMutexGuard aSolarLock;
+
+        Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+        if (!pWindow)
+            return;
+
+        pWindow->RemoveEventListener( LINK(this, WindowCommandDispatch, impl_notifyCommand) );
 
-    aSolarLock.clear();
-    // <- SYNCHRONIZED
+        m_xWindow.clear();
+    }
 }
 
+
 //-----------------------------------------------
 IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
 {
@@ -124,6 +137,11 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
         return 0L;
 
     const VclWindowEvent* pEvent = (VclWindowEvent*)pParam;
+    if (pEvent->GetId() == VCLEVENT_OBJECT_DYING)
+    {
+        impl_stopListening();
+        return 0L;
+    }
     if (pEvent->GetId() != VCLEVENT_WINDOW_COMMAND)
         return 0L;
 
@@ -189,3 +207,5 @@ void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index ea549fd3fda8..00bd461e2f8b 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -201,3 +202,4 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() thro
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 9b881448202f..91fbca5049f7 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -350,7 +351,7 @@ throw ( RuntimeException )
 
 const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescriptor()
 {
-    static const Property pActionTriggerPropertys[] =
+    const Property pActionTriggerPropertys[] =
     {
         Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL"    )), HANDLE_COMMANDURL   , ::getCppuType((::rtl::OUString*)0)                , PropertyAttribute::TRANSIENT  ),
         Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL"       )), HANDLE_HELPURL      , ::getCppuType((::rtl::OUString*)0)                , PropertyAttribute::TRANSIENT  ),
@@ -360,9 +361,9 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr
     };
 
     // Use it to initialize sequence!
-    static const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
+    const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
 
-    // Return static "PropertyDescriptor"
+    // Return "PropertyDescriptor"
     return seqActionTriggerPropertyDescriptor ;
 }
 
@@ -478,3 +479,4 @@ throw( IllegalArgumentException )
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index ce6aaef12dac..9ae41cef8971 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -294,15 +295,15 @@ throw ( RuntimeException )
 
 const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticPropertyDescriptor()
 {
-    static const Property pActionTriggerPropertys[] =
+    const Property pActionTriggerPropertys[] =
     {
         Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SeparatorType" )), HANDLE_TYPE, ::getCppuType((sal_Int16*)0), PropertyAttribute::TRANSIENT )
     };
 
     // Use it to initialize sequence!
-    static const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
+    const Sequence< Property > seqActionTriggerPropertyDescriptor( pActionTriggerPropertys, PROPERTYCOUNT );
 
-    // Return static "PropertyDescriptor"
+    // Return "PropertyDescriptor"
     return seqActionTriggerPropertyDescriptor ;
 }
 
@@ -347,3 +348,4 @@ throw( IllegalArgumentException )
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 811a4bdfc383..baaf086e4702 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -454,3 +455,4 @@ sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel,
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 1d947c651a67..11627487cd2c 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@
 #include <vcl/graph.hxx>
 #include <svtools/filter.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <algorithm>
 #include <vector>
 
@@ -268,7 +269,7 @@ class AddonsOptions_Impl : public ConfigItem
         const Sequence< Sequence< PropertyValue > >&    GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
         const ::rtl::OUString                           GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
         const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const ;
-        Image                                           GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
+        Image                                           GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
         const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const;
         bool                                            GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
 
@@ -291,19 +292,15 @@ class AddonsOptions_Impl : public ConfigItem
         {
             Image   aImageSmall;
             Image   aImageBig;
-            Image   aImageSmallHC;
-            Image   aImageBigHC;
 
             Image   aImageSmallNoScale;
             Image   aImageBigNoScale;
-            Image   aImageSmallHCNoScale;
-            Image   aImageBigHCNoScale;
         };
 
-        typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
-        typedef std::hash_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap;
+        typedef boost::unordered_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
+        typedef boost::unordered_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap;
         typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
-        typedef ::std::hash_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
+        typedef ::boost::unordered_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
 
         enum ImageSize
         {
@@ -365,15 +362,15 @@ class AddonsOptions_Impl : public ConfigItem
         ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName );
 
         sal_Int32                                         m_nRootAddonPopupMenuId;
-        ::rtl::OUString                                          m_aPropNames[PROPERTYCOUNT_INDEX];
-        ::rtl::OUString                                          m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
-        ::rtl::OUString                                          m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
-        ::rtl::OUString                                          m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
-        ::rtl::OUString                                          m_aEmpty;
-        ::rtl::OUString                                          m_aPathDelimiter;
-        ::rtl::OUString                                          m_aSeparator;
-        ::rtl::OUString                                          m_aRootAddonPopupMenuURLPrexfix;
-        ::rtl::OUString                                          m_aPrivateImageURL;
+        ::rtl::OUString                                   m_aPropNames[PROPERTYCOUNT_INDEX];
+        ::rtl::OUString                                   m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
+        ::rtl::OUString                                   m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
+        ::rtl::OUString                                   m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
+        ::rtl::OUString                                   m_aEmpty;
+        ::rtl::OUString                                   m_aPathDelimiter;
+        ::rtl::OUString                                   m_aSeparator;
+        ::rtl::OUString                                   m_aRootAddonPopupMenuURLPrexfix;
+        ::rtl::OUString                                   m_aPrivateImageURL;
         Sequence< Sequence< PropertyValue > >             m_aCachedMenuProperties;
         Sequence< Sequence< PropertyValue > >             m_aCachedMenuBarPartProperties;
         AddonToolBars                                     m_aCachedToolBarPartProperties;
@@ -505,7 +502,7 @@ void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyN
 //*****************************************************************************************************************
 void AddonsOptions_Impl::Commit()
 {
-    DBG_ERROR( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" );
+    OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" );
 }
 
 //*****************************************************************************************************************
@@ -606,27 +603,17 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions(
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const
+Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
 {
     Image aImage;
 
     ImageManager::const_iterator pIter = m_aImageManager.find( aURL );
     if ( pIter != m_aImageManager.end() )
     {
-        if ( !bHiContrast  )
-        {
-            if ( bNoScale )
-                aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale );
-            if ( !aImage )
-                aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall );
-        }
-        else
-        {
-            if ( bNoScale )
-                aImage = ( bBig ? pIter->second.aImageBigHCNoScale : pIter->second.aImageSmallHCNoScale );
-            if ( !aImage )
-                aImage = ( bBig ? pIter->second.aImageBigHC : pIter->second.aImageSmallHC );
-        }
+        if ( bNoScale )
+            aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale );
+        if ( !aImage )
+            aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall );
     }
 
     return aImage;
@@ -1366,8 +1353,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU
         // Use graphic class to also support more graphic formats (bmp,png,...)
         Graphic aGraphic;
 
-        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-        pGF->ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW );
+        GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
+        rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW );
 
         BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
 
@@ -1405,8 +1392,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU
 //*****************************************************************************************************************
 void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId )
 {
-    const int   MAX_NUM_IMAGES = 4;
-    const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26", "_16h", "_26h" };
+    const int   MAX_NUM_IMAGES = 2;
+    const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26" };
     const char* pBmpExt = ".bmp";
 
     if ( aImageId.getLength() == 0 )
@@ -1441,14 +1428,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co
                     aImageEntry.aImageBig            = aImage;
                     aImageEntry.aImageBigNoScale     = aImageNoScale;
                     break;
-                case 2:
-                    aImageEntry.aImageSmallHC        = aImage;
-                    aImageEntry.aImageSmallHCNoScale = aImageNoScale;
-                    break;
-                case 3:
-                    aImageEntry.aImageBigHC          = aImage;
-                    aImageEntry.aImageBigHCNoScale   = aImageNoScale;
-                    break;
             }
         }
     }
@@ -1481,8 +1460,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
             if (( aPropertyData[i] >>= aImageDataSeq ) &&
                 aImageDataSeq.getLength() > 0 &&
                 ( CreateImageFromSequence( aImage,
-                                        (( i == OFFSET_IMAGES_BIG ) ||
-                                        ( i == OFFSET_IMAGES_BIGHC )),
+                                        ( i == OFFSET_IMAGES_BIG ),
                                         aImageDataSeq )) )
             {
                 if ( !pEntry )
@@ -1492,10 +1470,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
                     pEntry->aImageSmall = aImage;
                 else if ( i == OFFSET_IMAGES_BIG )
                     pEntry->aImageBig = aImage;
-                else if ( i == OFFSET_IMAGES_SMALLHC )
-                    pEntry->aImageSmallHC = aImage;
-                else
-                    pEntry->aImageBigHC = aImage;
             }
         }
         else
@@ -1522,21 +1496,11 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
                         pEntry->aImageSmall = aImage;
                         pEntry->aImageSmallNoScale = aImageNoScale;
                     }
-                    else if ( i == OFFSET_IMAGES_BIG_URL && !pEntry->aImageBig )
+                    else if ( !pEntry->aImageBig )
                     {
                         pEntry->aImageBig = aImage;
                         pEntry->aImageBigNoScale = aImageNoScale;
                     }
-                    else if ( i == OFFSET_IMAGES_SMALLHC_URL && !pEntry->aImageSmallHC )
-                    {
-                        pEntry->aImageSmallHC = aImage;
-                        pEntry->aImageSmallHCNoScale = aImageNoScale;
-                    }
-                    else if ( !pEntry->aImageBigHC )
-                    {
-                        pEntry->aImageBigHC = aImage;
-                        pEntry->aImageBigHCNoScale = aImageNoScale;
-                    }
                 }
             }
         }
@@ -1805,18 +1769,18 @@ bool AddonsOptions::GetMergeToolbarInstructions(
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->GetImageFromURL( aURL, bBig, bHiContrast, bNoScale );
+    return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale );
 }
 
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const
 {
-    return GetImageFromURL( aURL, bBig, bHiContrast, sal_False );
+    return GetImageFromURL( aURL, bBig, sal_False );
 }
 
 //*****************************************************************************************************************
@@ -1856,3 +1820,4 @@ IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG )
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index ac588be9a881..66108f645a90 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,9 +47,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -172,8 +171,6 @@ void BmkMenu::Initialize()
     ::rtl::OUString aTargetFrame;
     ::rtl::OUString aImageId;
 
-    sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
-
     sal_uInt32 i, nCount = aDynamicMenuEntries.getLength();
     for ( i = 0; i < nCount; ++i )
     {
@@ -193,7 +190,7 @@ void BmkMenu::Initialize()
             {
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aImageId, sal_False, bIsHiContrastMode );
+                    Image aImage = GetImageFromURL( m_xFrame, aImageId, false );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -203,7 +200,7 @@ void BmkMenu::Initialize()
 
                 if ( !bImageSet )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aURL, sal_False, bIsHiContrastMode );
+                    Image aImage = GetImageFromURL( m_xFrame, aURL, false );
                     if ( !aImage )
                         InsertItem( nId, aTitle );
                     else
@@ -213,8 +210,6 @@ void BmkMenu::Initialize()
             else
                 InsertItem( nId, aTitle );
 
-            // Store values from configuration to the New and Wizard menu entries to enable
-            // sfx2 based code to support high contrast mode correctly!
             MenuConfiguration::Attributes* pUserAttributes = new MenuConfiguration::Attributes( aTargetFrame, aImageId );
             SetUserValue( nId, (sal_uIntPtr)pUserAttributes );
 
@@ -252,3 +247,4 @@ void GetMenuEntry
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 1a33ebf91d7e..fadd3cae0545 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -300,3 +301,5 @@ void FrameListAnalyzer::impl_analyze()
 }
 
 } //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 47e6ddb49fea..ff8a7e3d8431 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "classes/fwkresid.hxx"
 #include <tools/string.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <rtl/strbuf.hxx>
@@ -44,11 +45,8 @@ ResMgr* FwkResId::GetResManager()
 
     if ( !pResMgr )
     {
-        rtl::OStringBuffer aBuf( 32 );
-        aBuf.append( "fwe" );
-
-        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-        pResMgr = ResMgr::CreateResMgr( aBuf.getStr() );
+        SolarMutexGuard aSolarGuard;
+        pResMgr = ResMgr::CreateResMgr("fwe");
     }
 
     return pResMgr;
@@ -63,3 +61,4 @@ FwkResId::FwkResId( sal_uInt16 nId ) :
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 82a7f684413c..405930a5e32b 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,7 +70,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId()
 // XBitmap
 com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException )
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     BitmapEx    aBitmapEx( m_aImage.GetBitmapEx() );
     Size        aBitmapSize( aBitmapEx.GetSizePixel() );
@@ -79,7 +80,7 @@ com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeExcept
 
 Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException )
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     SvMemoryStream aMem;
     aMem << m_aImage.GetBitmapEx().GetBitmap();
@@ -88,7 +89,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException )
 
 Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException )
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     BitmapEx    aBmpEx( m_aImage.GetBitmapEx() );
 
     if ( aBmpEx.IsAlpha() )
@@ -118,3 +119,4 @@ sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIden
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index 3849a34d5425..20256a756c0d 100644
--- a/framework/source/fwe/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ MenuExtensionItem SAL_CALL GetMenuExtension()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index cdcc9aea5e1f..45598b6b47c1 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -211,7 +212,7 @@ throw ( RuntimeException )
     {
         if ( m_pMenu )
         {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarMutexGuard;
             return m_pMenu->GetItemCount();
         }
         else
@@ -247,7 +248,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     if ( m_pMenu )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         return ( m_pMenu->GetItemCount() > 0 );
     }
 
@@ -377,3 +378,4 @@ void RootActionTriggerContainer::setName( const ::rtl::OUString& ) throw ( Runti
 }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index ba3db729817d..cce8982e1278 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -150,8 +151,8 @@ bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::
         pCall = pIsDockingWindowVisible;
     }
 
-    if ( pIsDockingWindowVisible )
-        return (*pIsDockingWindowVisible)( rFrame, rResourceURL );
+    if ( pCall )
+        return (*pCall)( rFrame, rResourceURL );
     else
         return false;
 }
@@ -177,3 +178,5 @@ void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 9b3d4f4c69d8..248f7a5c6117 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -364,3 +365,5 @@ uno::Reference < task::XInteractionRequest > InteractionRequest::CreateRequest(
 }
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx
index 5774bc35a253..74ca316f7b5d 100644
--- a/framework/source/fwe/helper/acceleratorinfo.cxx
+++ b/framework/source/fwe/helper/acceleratorinfo.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ KeyCode SAL_CALL GetKeyCodeFromCommandURL( ::com::sun::star::uno::Reference< ::c
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 7c008687ec7d..44518a3458b9 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,7 +37,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <tools/stream.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
@@ -44,14 +45,14 @@
 
 const sal_uInt16 START_ITEMID = 1000;
 
-using namespace rtl;
-using namespace vos;
 using namespace com::sun::star::awt;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
+using ::rtl::OUString;
+
 namespace framework
 {
 
@@ -115,9 +116,6 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
     if ( xIndexAccess.is() )
     {
         AddonsOptions aAddonOptions;
-        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        sal_Bool bHiContrast = rSettings.GetHighContrastMode();
-
         OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
 
         for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ )
@@ -130,7 +128,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
                     if ( IsSeparator( xPropSet ))
                     {
                         // Separator
-                        OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         pSubMenu->InsertSeparator();
                     }
                     else
@@ -141,12 +139,11 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
                         OUString aHelpURL;
                         Reference< XBitmap > xBitmap;
                         Reference< XIndexContainer > xSubContainer;
-                        sal_Bool bSpecialItemId = sal_False;
 
                         sal_uInt16 nNewItemId = nItemId++;
                         GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer );
 
-                        OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         {
                             // insert new menu item
                             sal_Int32 nIndex = aCommandURL.indexOf( aSlotURL );
@@ -156,7 +153,6 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
                                 // command url but uses the item id as a unqiue identifier. These entries
                                 // got a special url during conversion from menu=>actiontriggercontainer.
                                 // Now we have to extract this special url and set the correct item id!!!
-                                bSpecialItemId = sal_True;
                                 nNewItemId = (sal_uInt16)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
                                 pSubMenu->InsertItem( nNewItemId, aLabel );
                             }
@@ -221,7 +217,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
                             else
                             {
                                 // Support add-on images for context menu interceptors
-                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, bHiContrast, sal_True );
+                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, sal_True );
                                 if ( !!aImage )
                                     pSubMenu->SetItemImage( nNewItemId, aImage );
                             }
@@ -335,7 +331,7 @@ Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XInd
 
 void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexContainer >& rActionTriggerContainer )
 {
-    OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
     {
@@ -397,7 +393,6 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu(
 }
 
 Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const Menu* pMenu,
     const ::rtl::OUString* pMenuIdentifier )
@@ -406,3 +401,5 @@ Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFr
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 0b7571416c9d..53752ba15109 100644
--- a/framework/source/fwe/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 91265cf45170..abff1f2afa24 100755..100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -269,3 +270,5 @@ namespace framework
 //......................................................................................................................
 } // namespace framework
 //......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index ab13b2caef6c..de4aa0f33811 100644
--- a/framework/source/fwe/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,13 +45,18 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 }
 
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast )
+Image SAL_CALL GetImageFromURL(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    bool bBig
+)
 {
     if ( _pGetImageFunc )
-        return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
+        return _pGetImageFunc( rFrame, aURL, bBig );
     else
         return Image();
 }
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 0fe750f92fd9..7e05bbf03d38 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,7 @@
 
 #define WRONG_TYPE_EXCEPTION    "Only XPropertSet allowed!"
 
-using namespace rtl;
-using namespace vos;
+using ::rtl::OUString;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::container;
@@ -194,3 +194,5 @@ sal_Bool SAL_CALL PropertySetContainer::hasElements()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index d9191da2be2e..a1db0de3ec5d 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,12 +57,6 @@ namespace framework{
 
 namespace css = ::com::sun::star;
 
-//_______________________________________________
-// definitions
-
-static const ::rtl::OUString ERRMSG_INVALID_COMPONENT_PARAM = ::rtl::OUString::createFromAscii("NULL as component reference not allowed.");
-static const ::rtl::OUString ERRMSG_INVALID_NUMBER_PARAM    = ::rtl::OUString::createFromAscii("Special valkud INVALID_NUMBER not allowed as input parameter.");
-
 //-----------------------------------------------
 TitleHelper::TitleHelper(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
     : ::cppu::BaseMutex ()
@@ -517,7 +512,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
     impl_appendProductName      (sTitle);
     impl_appendModuleName       (sTitle);
     impl_appendProductExtension (sTitle);
-    //impl_appendEvalVersion      (sTitle);
     impl_appendDebugVersion     (sTitle);
 
     // SYNCHRONIZED ->
@@ -628,32 +622,6 @@ void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer&)
 }
 #endif
 
-//*****************************************************************************************************************
-void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& /*sTitle*/)
-{
-    // SYNCHRONIZED ->
- //   ::osl::ResettableMutexGuard aLock(m_aMutex);
- //   css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR ;
-    //aLock.clear ();
-    //// <- SYNCHRONIZED
-
-    //css::uno::Reference< css::beans::XMaterialHolder > xHolder(
- //       xSMGR->createInstance(SERVICENAME_TABREG),
-    //  css::uno::UNO_QUERY);
-
- //   if ( ! xHolder.is())
-    //  return;
-
-    //    ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial());
-    //const ::rtl::OUString               sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString());
-
-    //if (sEvalTitle.getLength())
-    //{
-    //  sTitle.appendAscii (" "       );
-    //  sTitle.append      (sEvalTitle);
-    //}
-}
-
 //-----------------------------------------------
 void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel)
 {
@@ -758,3 +726,5 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 891504adbe71..692b6b294771 100755..100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -651,7 +652,7 @@ namespace framework
                                 ?   rUndoManager.GetUndoActionCount( IUndoManager::TopLevel )
                                 :   rUndoManager.GetRedoActionCount( IUndoManager::TopLevel );
         if ( nElements == 0 )
-            throw EmptyUndoStackException( ::rtl::OUString::createFromAscii( "stack is empty" ), getXUndoManager() );
+            throw EmptyUndoStackException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stack is empty" )), getXUndoManager() );
 
         aGuard.clear();
         // <--- SYNCHRONIZED
@@ -1116,7 +1117,7 @@ namespace framework
 
         IUndoManager& rUndoManager = m_pImpl->getUndoManager();
         if ( rUndoManager.IsUndoEnabled() )
-            throw NotLockedException( ::rtl::OUString::createFromAscii( "Undo manager is not locked" ), m_pImpl->getXUndoManager() );
+            throw NotLockedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Undo manager is not locked" )), m_pImpl->getXUndoManager() );
         rUndoManager.EnableUndo( true );
         // <--- SYNCHRONIZED
     }
@@ -1163,3 +1164,5 @@ namespace framework
 //......................................................................................................................
 } // namespace framework
 //......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 7bc2201a3a27..c708502f19eb 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@ namespace css = ::com::sun::star;
 //  exported const
 //_________________________________________________________________________________________________________________
 
-#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER                 ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")
+#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))
 
 //_________________________________________________________________________________________________________________
 //  exported definitions
@@ -292,3 +293,5 @@ sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx
index 873682f60345..fd68b3a0ca0a 100644
--- a/framework/source/fwe/xml/eventsconfiguration.cxx
+++ b/framework/source/fwe/xml/eventsconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <xml/eventsdocumenthandler.hxx>
 #include <services.h>
 
-#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_
 #include <xml/saxnamespacefilter.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -47,9 +46,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/streamwrap.hxx>
 #include <tools/debug.hxx>
 
@@ -67,26 +64,20 @@ namespace framework
 {
 
 static Reference< XParser > GetSaxParser(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
     return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
     return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
-// #110897#
+
 sal_Bool EventsConfiguration::LoadEventsConfig(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     SvStream& rInStream, EventsConfig& aItems )
@@ -127,7 +118,7 @@ sal_Bool EventsConfiguration::LoadEventsConfig(
     }
 }
 
-// #110897#
+
 sal_Bool EventsConfiguration::StoreEventsConfig(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     SvStream& rOutStream, const EventsConfig& aItems )
@@ -163,3 +154,4 @@ sal_Bool EventsConfiguration::StoreEventsConfig(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx
index ad21937fcc5d..31a4ff7e11dd 100644
--- a/framework/source/fwe/xml/eventsdocumenthandler.cxx
+++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,9 +44,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -551,3 +550,4 @@ void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName,
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 8a6d2cd1bafd..c0feda7ec766 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,17 +34,13 @@
 //_________________________________________________________________________________________________________________
 #include <framework/menuconfiguration.hxx>
 
-#ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX_
 #include <framework/bmkmenu.hxx>
-#endif
 #include <framework/addonmenu.hxx>
 #include <xml/menudocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
 
-#ifndef _FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_
 #include <uielement/rootitemcontainer.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -106,7 +103,6 @@ throw ( WrappedTargetException )
 
     // create namespace filter and set menudocument handler inside to support xml namespaces
 
-    // #110897# Reference< XDocumentHandler > xDocHandler( new OReadMenuDocumentHandler( xItemContainer ));
     Reference< XDocumentHandler > xDocHandler( new OReadMenuDocumentHandler( m_rxServiceManager, xItemContainer ));
 
     Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler ));
@@ -185,3 +181,4 @@ throw ( WrappedTargetException )
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 26ec3bf09372..bb36e403cc9d 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,18 +30,12 @@
 #include "precompiled_framework.hxx"
 
 #include <stdio.h>
+#include <sal/macros.h>
 
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
 #include <xml/menudocumenthandler.hxx>
 #include <framework/menuconfiguration.hxx>
 #include <framework/addonmenu.hxx>
 
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
-
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
@@ -48,16 +43,10 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #include <rtl/logfile.hxx>
 #include <comphelper/attributelist.hxx>
 
-//_________________________________________________________________________________________________________________
-//  defines
-//_________________________________________________________________________________________________________________
 
 #define XMLNS_MENU                  "http://openoffice.org/2001/menu"
 #define XMLNS_PREFIX                "menu:"
@@ -139,7 +128,7 @@ MenuStyleItem MenuItemStyles[ ] = {
 };
 
 
-sal_Int32 nMenuStyleItemEntries = sizeof( MenuItemStyles ) / sizeof( MenuItemStyles[ 0 ] );
+sal_Int32 nMenuStyleItemEntries = SAL_N_ELEMENTS( MenuItemStyles );
 
 static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
                                    ::rtl::OUString&                       rCommandURL,
@@ -151,28 +140,28 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
 {
     for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
     {
-        if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+        if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
         {
             rProp[i].Value >>= rCommandURL;
             rCommandURL = rCommandURL.intern();
         }
-        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
         {
             rProp[i].Value >>= rHelpURL;
         }
-        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
+        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
         {
             rProp[i].Value >>= rSubMenu;
         }
-        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
+        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
         {
             rProp[i].Value >>= rLabel;
         }
-        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
+        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
         {
             rProp[i].Value >>= rType;
         }
-        else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+        else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
         {
             rProp[i].Value >>= rStyle;
         }
@@ -264,10 +253,8 @@ OReadMenuDocumentHandler::OReadMenuDocumentHandler(
 {
 }
 
-// #110897#
 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory()
 {
-    // #110897#
     return mxServiceFactory;
 }
 
@@ -307,8 +294,6 @@ throw( SAXException, RuntimeException )
     {
         ++m_nElementDepth;
         m_bMenuBarMode = sal_True;
-
-        // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_xMenuBarContainer, m_xContainerFactory ));
         m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_xMenuBarContainer, m_xContainerFactory ));
 
         m_xReader->startDocument();
@@ -347,8 +332,6 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const ::rtl::OUString& aName
 
 // -----------------------------------------------------------------------------
 
-
-// #110897#
 OReadMenuBarHandler::OReadMenuBarHandler(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const Reference< XIndexContainer >& rMenuBarContainer,
@@ -361,10 +344,9 @@ OReadMenuBarHandler::OReadMenuBarHandler(
 {
 }
 
-// #110897#
+
 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory()
 {
-    // #110897#
     return mxServiceFactory;
 }
 
@@ -904,8 +886,8 @@ throw ( SAXException, RuntimeException )
             ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL, xSubMenu, nType, nItemBits );
             if ( xSubMenu.is() )
             {
-                if ( aCommandURL.equalsAscii( ADDDIRECT_CMD ) ||
-                    aCommandURL.equalsAscii( AUTOPILOTMENU_CMD ))
+                if ( aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ADDDIRECT_CMD)) ||
+                    aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AUTOPILOTMENU_CMD)) )
                 {
                     WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
                     bSeparator = sal_False;
@@ -919,7 +901,7 @@ throw ( SAXException, RuntimeException )
                                             m_aAttributeType,
                                             aCommandURL );
 
-                    if ( !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+                    if ( !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL))) )
                         pListMenu->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
                                                  m_aAttributeType,
                                                  aLabel );
@@ -978,13 +960,13 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandUR
                              aHelpURL );
     }
 
-    if (( aLabel.getLength() > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+    if (( aLabel.getLength() > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)) ))
     {
         pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
                                 m_aAttributeType,
                                 aLabel );
     }
-    if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+    if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)) ))
     {
         rtl::OUString aValue;
         MenuStyleItem* pStyle = MenuItemStyles;
@@ -1020,3 +1002,4 @@ void OWriteMenuDocumentHandler::WriteMenuSeparator()
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index a92c58547e06..18adde4faaf5 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,4 @@ void SAL_CALL SaxNamespaceFilter::setDocumentLocator(
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index 0d79ef8fd461..52643d238172 100644
--- a/framework/source/fwe/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,9 +46,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/streamwrap.hxx>
 #include <tools/debug.hxx>
 
@@ -164,3 +163,4 @@ sal_Bool StatusBarConfiguration::StoreStatusBar(
 }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 3d8d4bfc7c9a..02c0c00aec9e 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -696,3 +695,4 @@ throw ( SAXException, RuntimeException )
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 994354a7e1a8..165694a962a5 100644
--- a/framework/source/fwe/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,9 +46,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/streamwrap.hxx>
 #include <tools/debug.hxx>
 
@@ -66,7 +65,6 @@ namespace framework
 {
 
 static Reference< XParser > GetSaxParser(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
@@ -74,14 +72,12 @@ static Reference< XParser > GetSaxParser(
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
     return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
-// #110897#
 sal_Bool ToolBoxConfiguration::LoadToolBox(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
@@ -121,7 +117,6 @@ sal_Bool ToolBoxConfiguration::LoadToolBox(
 }
 
 
-// #110897#
 sal_Bool ToolBoxConfiguration::StoreToolBox(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
@@ -154,3 +149,4 @@ sal_Bool ToolBoxConfiguration::StoreToolBox(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index b41f50339343..71cf378d65bf 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,28 +31,18 @@
 
 #include <stdio.h>
 
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
-
 #include <threadhelp/resetableguard.hxx>
 #include <xml/toolboxdocumenthandler.hxx>
 #include <macros/debug.hxx>
 #include <xml/toolboxconfigurationdefines.hxx>
 
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
-
 #include <sal/config.h>
+#include <sal/macros.h>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -134,7 +125,7 @@ ToolboxStyleItem Styles[ ] = {
     { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
 };
 
-sal_Int32 nStyleItemEntries = sizeof( Styles ) / sizeof( Styles[ 0 ] );
+sal_Int32 nStyleItemEntries = SAL_N_ELEMENTS( Styles );
 
 struct ToolBarEntryProperty
 {
@@ -197,15 +188,15 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
     }
 
     // pre-calculate a hash code for all style strings to speed up xml read process
-    m_nHashCode_Style_Radio         = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode();
-    m_nHashCode_Style_Auto          = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode();
-    m_nHashCode_Style_Left          = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode();
-    m_nHashCode_Style_AutoSize      = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode();
-    m_nHashCode_Style_DropDown      = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode();
-    m_nHashCode_Style_Repeat        = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode();
-    m_nHashCode_Style_DropDownOnly  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode();
-    m_nHashCode_Style_Text  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode();
-    m_nHashCode_Style_Image  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode();
+    m_nHashCode_Style_Radio         = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO )).hashCode();
+    m_nHashCode_Style_Auto          = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTO )).hashCode();
+    m_nHashCode_Style_Left          = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_LEFT )).hashCode();
+    m_nHashCode_Style_AutoSize      = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTOSIZE )).hashCode();
+    m_nHashCode_Style_DropDown      = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWN )).hashCode();
+    m_nHashCode_Style_Repeat        = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_REPEAT )).hashCode();
+    m_nHashCode_Style_DropDownOnly  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY )).hashCode();
+    m_nHashCode_Style_Text  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT )).hashCode();
+    m_nHashCode_Style_Image  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE )).hashCode();
 
     m_bToolBarStartFound            = sal_False;
     m_bToolBarEndFound              = sal_False;
@@ -328,8 +319,6 @@ throw(  SAXException, RuntimeException )
                 ::rtl::OUString        aTooltip;
                 ::rtl::OUString        aBitmapName;
                 sal_uInt16      nItemBits( 0 );
-                sal_uInt16      nWidth( 0 );
-                sal_uInt16      nUserDef( 0 );
                 sal_Bool        bVisible( sal_True );
 
                 for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
@@ -379,18 +368,6 @@ throw(  SAXException, RuntimeException )
                             }
                             break;
 
-                            case TB_ATTRIBUTE_WIDTH:
-                            {
-                                nWidth = (sal_uInt16)(xAttribs->getValueByIndex( n ).toInt32());
-                            }
-                            break;
-
-                            case TB_ATTRIBUTE_USER:
-                            {
-                                nUserDef = (sal_uInt16)(xAttribs->getValueByIndex( n ).toInt32());
-                            }
-                            break;
-
                             case TB_ATTRIBUTE_HELPID:
                             {
                                 aHelpURL = xAttribs->getValueByIndex( n );
@@ -438,9 +415,10 @@ throw(  SAXException, RuntimeException )
                                 while ( nIndex >= 0 );
                             }
                             break;
-
-                                          default:
-                                              break;
+                            case TB_ATTRIBUTE_USER:
+                            case TB_ATTRIBUTE_WIDTH:
+                            default:
+                            break;
                         }
                     }
                 } // for
@@ -899,3 +877,4 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
index 645750dc3f51..94637c06dd97 100644
--- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index fbaf51613d15..2352192138b2 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,7 +116,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS
         if ( aName.getLength() > index+1 )
         {
             ::rtl::OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) );
-            aAttributeName += ::rtl::OUString::createFromAscii( "^" );
+            aAttributeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^"));
             aAttributeName += aName.copy( index+1 );
             return aAttributeName;
         }
@@ -146,7 +147,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS
     if ( aNamespace.getLength() > 0 )
     {
         aElementName = aNamespace;
-        aElementName += ::rtl::OUString::createFromAscii( "^" );
+        aElementName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^"));
     }
     else
         return aName;
@@ -189,3 +190,4 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index d70b099c9e03..e824d5471ff4 100644
--- a/framework/source/fwi/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -314,3 +315,5 @@ DateTime Converter::convert_String2DateTime( /*IN*/ const ::rtl::OUString& sSour
 }
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 2e41106a9ceb..68f190a95f44 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -290,13 +291,8 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const ::rtl::OUString
 
     css::beans::Property aPropInfo = pIt->second;
 
-    sal_Bool bLocked = sal_True;
     if (m_bReleaseLockOnCall)
-    {
         aReadLock.unlock();
-        bLocked = sal_False;
-        // <- SAFE
-    }
 
     return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
 }
@@ -448,3 +444,5 @@ sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const ::rtl::OUString& sN
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 89412e9c6c65..1a7ddf2e2be6 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -359,3 +360,5 @@ void HandlerCFGAccess::Commit()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 641200069dfc..5d1b0631b219 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,7 +65,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
         {
             m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
                     m_xServiceManager->createInstance(
-                        rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.LanguageGuessing")) ),
                         uno::UNO_QUERY );
         }
         catch (uno::Exception &r)
@@ -76,7 +77,6 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     return m_xLanguageGuesser;
 }
 
-////////////////////////////////////////////////////////////
 
 ::rtl::OUString RetrieveLabelFromCommand(
     const ::rtl::OUString& aCmdURL,
@@ -152,7 +152,6 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     return aLabel;
 }
 
-////////////////////////////////////////////////////////////
 
 void FillLangItems( std::set< OUString > &rLangItems,
         const SvtLanguageTable &    rLanguageTable,
@@ -240,3 +239,4 @@ void FillLangItems( std::set< OUString > &rLangItems,
 } // namespace framework
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index fcc966402944..fb4bc20f5077 100644
--- a/framework/source/fwi/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -293,3 +294,5 @@ rtl::OUString NetworkDomain::GetNTDomainName()
 #endif
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx
index b173c6c34a4f..1cc9a0acd8b9 100644
--- a/framework/source/fwi/helper/shareablemutex.cxx
+++ b/framework/source/fwi/helper/shareablemutex.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ void ShareableMutex::release()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 95226268ce2b..5a66f81b832e 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -240,3 +241,5 @@ const css::uno::Reference< css::uno::XInterface >& ConfigAccess::cfg()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index b71a68342a69..9d3403db5cfb 100644
--- a/framework/source/fwi/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,20 +56,22 @@ namespace framework{
 
 const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB()
 {
-    static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("Deactivate");
+    static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
     return PROP;
 }
 
 const ::rtl::OUString JobConst::ANSWER_SAVE_ARGUMENTS()
 {
-    static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SaveArguments");
+    static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments"));
     return PROP;
 }
 
 const ::rtl::OUString JobConst::ANSWER_SEND_DISPATCHRESULT()
 {
-    static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SendDispatchResult");
+    static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult"));
     return PROP;
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx
index 4c5ebb7a5d91..b3956cd5544f 100644
--- a/framework/source/fwi/threadhelp/lockhelper.cxx
+++ b/framework/source/fwi/threadhelp/lockhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,6 +37,7 @@
 #include <macros/debug.hxx>
 
 #include <macros/generic.hxx>
+#include "vcl/solarmutex.hxx"
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -44,7 +46,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <vos/process.hxx>
+#include <osl/process.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -76,7 +78,7 @@ namespace framework{
 
     @onerror    -
 *//*-*************************************************************************************************************/
-LockHelper::LockHelper( ::vos::IMutex* pSolarMutex )
+LockHelper::LockHelper( ::osl::SolarMutex* pSolarMutex )
     :   m_pFairRWLock       ( NULL )
     ,   m_pOwnMutex         ( NULL )
     ,   m_pSolarMutex       ( NULL )
@@ -92,17 +94,17 @@ LockHelper::LockHelper( ::vos::IMutex* pSolarMutex )
                                 }
                                 break;
         case E_SOLARMUTEX   :   {
-                                    if( pSolarMutex == NULL )
-                                    {
-                                        m_pSolarMutex      = new ::vos::OMutex;
-                                        m_bDummySolarMutex = sal_True;
-                                    }
-                                    else
-                                    {
-                                        m_pSolarMutex = pSolarMutex;
-                                    }
-                                }
-                                break;
+            if( pSolarMutex == NULL )
+            {
+                m_pSolarMutex      = new ::vcl::SolarMutexObject;
+                m_bDummySolarMutex = sal_True;
+            }
+            else
+            {
+                m_pSolarMutex = pSolarMutex;
+            }
+        }
+            break;
         case E_FAIRRWLOCK   :   {
                                     m_pFairRWLock = new FairRWLock;
                                 }
@@ -147,7 +149,7 @@ LockHelper::~LockHelper()
     {
         if (m_bDummySolarMutex)
         {
-            delete static_cast<vos::OMutex*>(m_pSolarMutex);
+            delete static_cast<vcl::SolarMutexObject*>(m_pSolarMutex);
             m_bDummySolarMutex = sal_False;
         }
         m_pSolarMutex = NULL;
@@ -432,7 +434,7 @@ void LockHelper::downgradeWriteAccess()
 
     @onerror    No error should occure.
 *//*-*************************************************************************************************************/
-LockHelper& LockHelper::getGlobalLock( ::vos::IMutex* pSolarMutex )
+LockHelper& LockHelper::getGlobalLock( ::osl::SolarMutex* pSolarMutex )
 {
     // Initialize static "member" only for one time!
     // Algorithm:
@@ -531,9 +533,9 @@ ELockType& LockHelper::implts_getLockType()
         {
             static ELockType eType = FALLBACK_LOCKTYPE;
 
-            ::vos::OStartupInfo aEnvironment;
+            ::rtl::OUString     aEnvVar( ENVVAR_LOCKTYPE );
             ::rtl::OUString     sValue      ;
-            if( aEnvironment.getEnvironment( ENVVAR_LOCKTYPE, sValue ) == ::vos::OStartupInfo::E_None )
+            if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None )
             {
                 eType = (ELockType)(sValue.toInt32());
             }
@@ -547,3 +549,5 @@ ELockType& LockHelper::implts_getLockType()
 }
 
 } //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 3523ddbbd128..557620d91a32 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -372,3 +373,5 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas
 }
 
 }   //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 9ef9a72e5093..285a7fe8f3f8 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,23 +28,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/itemcontainer.hxx>
 #include <threadhelp/resetableguard.hxx>
 
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-//_________________________________________________________________________________________________________________
-//  other includes
-//_________________________________________________________________________________________________________________
 #include <cppuhelper/implbase1.hxx>
+#include <comphelper/servicehelper.hxx>
 
 using namespace cppu;
 using namespace com::sun::star::uno;
@@ -219,7 +212,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource
                         Reference< XIndexAccess > xIndexAccess;
                         for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
                         {
-                            if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+                            if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
                             {
                                 aPropSeq[j].Value >>= xIndexAccess;
                                 nContainerIndex = j;
@@ -256,7 +249,7 @@ void ConstItemContainer::copyItemContainer( const std::vector< Sequence< Propert
         Reference< XIndexAccess > xIndexAccess;
         for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
         {
-            if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+            if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
             {
                 aPropSeq[j].Value >>= xIndexAccess;
                 nContainerIndex = j;
@@ -298,20 +291,14 @@ sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequenc
     return 0;
 }
 
+namespace
+{
+    class theConstItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theConstItemContainerUnoTunnelId > {};
+}
+
 const Sequence< sal_Int8 >& ConstItemContainer::GetUnoTunnelId() throw()
 {
-    static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = NULL;
-    if( !pSeq )
-    {
-        ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
-        if( !pSeq )
-        {
-            static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
-            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-            pSeq = &aSeq;
-        }
-    }
-    return *pSeq;
+    return theConstItemContainerUnoTunnelId::get().getSeq();
 }
 
 ConstItemContainer* ConstItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw()
@@ -450,22 +437,22 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang
 
 const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItemContainer::impl_getStaticPropertyDescriptor()
 {
-    // Create a new static property array to initialize sequence!
+    // Create a property array to initialize sequence!
     // Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
     // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!!
     // It's necessary for methods of OPropertySetHelper.
     // ATTENTION:
     //      YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
 
-    static const com::sun::star::beans::Property pProperties[] =
+    const com::sun::star::beans::Property pProperties[] =
     {
         com::sun::star::beans::Property( PROPNAME_UINAME, PROPHANDLE_UINAME ,
                                          ::getCppuType((const rtl::OUString*)NULL),
                                          com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY  )
     };
     // Use it to initialize sequence!
-    static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
-    // Return static "PropertyDescriptor"
+    const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
+    // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
 
@@ -477,3 +464,4 @@ Reference < XPropertySetInfo > ConstItemContainer::createPropertySetInfo(
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 943a5abe2f03..42dc8c2ea507 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,6 +34,7 @@
 #include <uielement/itemcontainer.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <threadhelp/resetableguard.hxx>
+#include <comphelper/servicehelper.hxx>
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -81,7 +83,7 @@ ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer,
                     Reference< XIndexAccess > xIndexAccess;
                     for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
                     {
-                        if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+                        if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
                         {
                             aPropSeq[j].Value >>= xIndexAccess;
                             nContainerIndex = j;
@@ -117,7 +119,7 @@ void ItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValu
         Reference< XIndexAccess > xIndexAccess;
         for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
         {
-            if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+            if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
             {
                 aPropSeq[j].Value >>= xIndexAccess;
                 nContainerIndex = j;
@@ -158,20 +160,14 @@ sal_Int64 ItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sa
     return 0;
 }
 
+namespace
+{
+    class theItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theItemContainerUnoTunnelId > {};
+}
+
 const Sequence< sal_Int8 >& ItemContainer::GetUnoTunnelId() throw()
 {
-    static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = NULL;
-    if( !pSeq )
-    {
-        ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
-        if( !pSeq )
-        {
-            static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
-            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-            pSeq = &aSeq;
-        }
-    }
-    return *pSeq;
+    return theItemContainerUnoTunnelId::get().getSeq();
 }
 
 ItemContainer* ItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw()
@@ -264,3 +260,4 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 02a040a05bc1..b00a61805799 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,25 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-//_________________________________________________________________________________________________________________
-//  my own includes
-//_________________________________________________________________________________________________________________
+#include <comphelper/servicehelper.hxx>
 #include <uielement/rootitemcontainer.hxx>
-
-#ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HHX_
 #include <uielement/itemcontainer.hxx>
-#endif
-
-#ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HHX_
 #include <uielement/constitemcontainer.hxx>
-#endif
 #include <threadhelp/resetableguard.hxx>
 #include <general.h>
 #include <properties.h>
 
-//_________________________________________________________________________________________________________________
-//  interface includes
-//_________________________________________________________________________________________________________________
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -148,7 +138,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo
                     Reference< XIndexAccess > xIndexAccess;
                     for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
                     {
-                        if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+                        if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
                         {
                             aPropSeq[j].Value >>= xIndexAccess;
                             nContainerIndex = j;
@@ -185,7 +175,7 @@ void RootItemContainer::copyItemContainer( const std::vector< Sequence< Property
         Reference< XIndexAccess > xIndexAccess;
         for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ )
         {
-            if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" ))
+            if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) ))
             {
                 aPropSeq[j].Value >>= xIndexAccess;
                 nContainerIndex = j;
@@ -225,20 +215,14 @@ sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence
     return 0;
 }
 
+namespace
+{
+    class theRootItemContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theRootItemContainerUnoTunnelId > {};
+}
+
 const Sequence< sal_Int8 >& RootItemContainer::GetUnoTunnelId() throw()
 {
-    static ::com::sun::star::uno::Sequence< sal_Int8 > * pSeq = NULL;
-    if( !pSeq )
-    {
-        ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
-        if( !pSeq )
-        {
-            static ::com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
-            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-            pSeq = &aSeq;
-        }
-    }
-    return *pSeq;
+    return theRootItemContainerUnoTunnelId::get().getSeq();
 }
 
 RootItemContainer* RootItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw()
@@ -443,24 +427,25 @@ throw (::com::sun::star::uno::RuntimeException)
 
 const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemContainer::impl_getStaticPropertyDescriptor()
 {
-    // Create a new static property array to initialize sequence!
+    // Create a property array to initialize sequence!
     // Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
     // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!!
     // It's necessary for methods of OPropertySetHelper.
     // ATTENTION:
     //      YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
 
-    static const com::sun::star::beans::Property pProperties[] =
+    const com::sun::star::beans::Property pProperties[] =
     {
         com::sun::star::beans::Property( PROPNAME_UINAME, PROPHANDLE_UINAME ,
                                          ::getCppuType((const rtl::OUString*)NULL),
                                          com::sun::star::beans::PropertyAttribute::TRANSIENT )
     };
     // Use it to initialize sequence!
-    static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
-    // Return static "PropertyDescriptor"
+    const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
+    // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 2b199c03ba83..f10851081624 100755..100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,7 +60,6 @@ using namespace ::com::sun::star::lang          ;
 using namespace ::com::sun::star::uno           ;
 using namespace ::cppu                          ;
 using namespace ::osl                           ;
-using namespace ::rtl                           ;
 
 //_________________________________________________________________________________________________________________
 //  non exported const
@@ -130,8 +130,6 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
             css::awt::Size       aSize       (  aRectangle.Width  - aInfo.LeftInset - aInfo.RightInset  ,
                                                 aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
 
-            // client size of container window
-//            css::uno::Reference< css::awt::XLayoutConstrains > xLayoutContrains( xComponentWindow, css::uno::UNO_QUERY );
             css::awt::Size aMinSize( 0, 0 ); // = xLayoutContrains->getMinimumSize();
 
             // Check if request border space would decrease component window size below minimum size
@@ -167,8 +165,6 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R
             css::awt::DeviceInfo aInfo       = xDevice->getInfo();
             css::awt::Size       aSize       (  aRectangle.Width  - aInfo.LeftInset - aInfo.RightInset  ,
                                                 aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
-            // client size of container window
-//            css::uno::Reference< css::awt::XLayoutConstrains > xLayoutContrains( xComponentWindow, css::uno::UNO_QUERY );
             css::awt::Size aMinSize( 0, 0 );// = xLayoutContrains->getMinimumSize();
 
             // Check if request border space would decrease component window size below minimum size
@@ -185,3 +181,5 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 4e64a38d6ca3..f070e85a6c35 100755..100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 #include <helper/ocomponentaccess.hxx>
 #include <helper/ocomponentenumeration.hxx>
 
-#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 #include <threadhelp/resetableguard.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -260,3 +259,5 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const
 #endif  //  #ifdef ENABLE_ASSERTIONS
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 9df43625a5a8..914981fbe980 100755..100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 //_________________________________________________________________________________________________________________
 #include <helper/ocomponentenumeration.hxx>
 
-#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 #include <threadhelp/resetableguard.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -235,3 +234,5 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj
 #endif  //  #ifdef ENABLE_ASSERTIONS
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 3034f7438cf6..119e050c409e 100755..100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 //_________________________________________________________________________________________________________________
 #include <helper/oframes.hxx>
 
-#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 #include <threadhelp/resetableguard.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -60,9 +59,9 @@ using namespace ::com::sun::star::lang          ;
 using namespace ::com::sun::star::uno           ;
 using namespace ::cppu                          ;
 using namespace ::osl                           ;
-using namespace ::rtl                           ;
 using namespace ::std                           ;
-using namespace ::vos                           ;
+
+using rtl::OUString;
 
 //_________________________________________________________________________________________________________________
 //  non exported const
@@ -303,7 +302,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
 
       sal_uInt32 nCount = m_pFrameContainer->getCount();
       if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount ))
-          throw IndexOutOfBoundsException( OUString::createFromAscii( "OFrames::getByIndex - Index out of bounds" ),
+          throw IndexOutOfBoundsException( OUString(RTL_CONSTASCII_USTRINGPARAM("OFrames::getByIndex - Index out of bounds")),
                                            (OWeakObject *)this );
 
     // Set default return value.
@@ -522,3 +521,5 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags )
 #endif  //  #ifdef ENABLE_ASSERTIONS
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index c25036c5c346..7deeaa09168f 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,9 +44,7 @@
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/awt/XWindow.hpp>
 
-#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 
@@ -56,9 +55,7 @@
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <rtl/string.hxx>
@@ -232,9 +229,9 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
     sRelPathBuf.append     (sModuleName            );
     sRelPathBuf.appendAscii("\"]"                  );
 
-    ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/");
+    ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
     ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
-    ::rtl::OUString sKey     = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes");
+    ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
 
     try
     {
@@ -262,9 +259,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
     sRelPathBuf.append     (sModuleName            );
     sRelPathBuf.appendAscii("\"]"                  );
 
-    ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/");
+    ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
     ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
-    ::rtl::OUString sKey     = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes");
+    ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
 
     try
     {
@@ -289,7 +286,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
     if (xWindow.is())
     {
         // SOLAR SAFE -> ------------------------
-        ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
 
         Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
         // check for system window is neccessary to guarantee correct pointer cast!
@@ -304,8 +301,6 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
                             ((SystemWindow*)pWindow)->GetWindowState(nMask),
                             RTL_TEXTENCODING_UTF8);
         }
-
-        aSolarLock.clear();
         // <- SOLAR SAFE ------------------------
     }
 
@@ -324,7 +319,7 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
         return;
 
     // SOLAR SAFE -> ------------------------
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
 
     Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if (!pWindow)
@@ -347,9 +342,9 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
     ::rtl::OUString sOldWindowState = ::rtl::OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US );
     if ( sOldWindowState != sWindowState )
         pSystemWindow->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8));
-
-    aSolarLock.clear();
     // <- SOLAR SAFE ------------------------
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index f38a84fdb75f..a73d63fa14e0 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -150,3 +151,5 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 4c0738b9fe85..ccb990e0228f 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,9 +45,7 @@
 // interface includes
 #include <com/sun/star/awt/Rectangle.hpp>
 
-#ifndef _COM_SUN_STAR_AWT_XCONTROLS_HPP_
 #include <com/sun/star/awt/XControl.hpp>
-#endif
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/DeviceInfo.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
@@ -56,9 +55,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 
 //-----------------------------------------------
 // includes of other projects
@@ -66,7 +63,7 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/configurationhelper.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //-----------------------------------------------
 // namespace
@@ -77,7 +74,7 @@ namespace framework{
 // definitions
 
 sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0;  /// static counter for rescheduling
-static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar");
+static ::rtl::OUString PROGRESS_RESOURCE(RTL_CONSTASCII_USTRINGPARAM("private:resource/progressbar/progressbar"));
 
 //-----------------------------------------------
 DEFINE_XINTERFACE_5(StatusIndicatorFactory                              ,
@@ -431,27 +428,21 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
     // is visible too.
     impl_showProgress();
 
-    ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
     if ( pWindow )
     {
         bool bForceFrontAndFocus(false);
         ::comphelper::ConfigurationHelper::readDirectKey(
             xSMGR,
-            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
-            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
-            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
             ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
 
         pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
     }
 
-    /*
-    #i75167# dont disturb window manager handling .-)
-    css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY);
-    if (xParentWindowTop.is())
-        xParentWindowTop->toFront();
-    */
 }
 
 //-----------------------------------------------
@@ -652,3 +643,5 @@ void StatusIndicatorFactory::impl_stopWakeUpThread()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 67c047dfefd4..a98fb72c2ef6 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,9 +44,7 @@
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/awt/XWindow.hpp>
 
-#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/frame/FrameAction.hpp>
@@ -54,9 +53,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/svapp.hxx>
@@ -144,7 +141,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
     ::sal_Bool bModified = xModel->isModified ();
 
     // SYNCHRONIZED ->
-    ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
 
     Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if ( ! pWindow)
@@ -159,8 +156,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
         pWindow->SetExtendedStyle(WB_EXT_DOCMODIFIED);
     else
         pWindow->SetExtendedStyle( ! WB_EXT_DOCMODIFIED);
-
-    aSolarGuard.clear();
     // <- SYNCHRONIZED
 }
 
@@ -254,3 +249,5 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 9b6501af4c20..832c56b0d1e1 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,114 +28,42 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-
-#ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_
 #include <helper/titlebarupdate.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
-
-#ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_
 #include <pattern/window.hxx>
-#endif
-
-#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
 #include <threadhelp/writeguard.hxx>
-#endif
-
-#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
 #include <threadhelp/readguard.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
 #include <macros/generic.hxx>
-#endif
-
-#ifndef __FRAMEWORK_SERVICES_H_
 #include <services.h>
-#endif
-
-#ifndef __FRAMEWORK_PROPETIES_H_
 #include <properties.h>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-
-#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
 #include <com/sun/star/awt/XWindow.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_
 #include <com/sun/star/frame/XModuleManager.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_XMATERIALHOLDER_HPP_
 #include <com/sun/star/beans/XMaterialHolder.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_
 #include <com/sun/star/beans/NamedValue.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-
-#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX
 #include <comphelper/sequenceashashmap.hxx>
-#endif
-
-#ifndef _UTL_CONFIGMGR_HXX
 #include <unotools/configmgr.hxx>
-#endif
-
-#ifndef _UTL_BOOTSTRAP_HXX
 #include <unotools/bootstrap.hxx>
-#endif
-
-#ifndef _SV_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
-
-#ifndef _SV_SYSWIN_HXX
 #include <vcl/syswin.hxx>
-#endif
-
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
-
-#ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
-#endif
-
-#ifndef _SV_WRKWIN_HXX
 #include <vcl/wrkwin.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -246,6 +175,86 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&)
     // nothing todo here - because we hold the frame as weak reference only
 }
 
+//http://live.gnome.org/GnomeShell/ApplicationBased
+//See http://msdn.microsoft.com/en-us/library/dd378459(v=VS.85).aspx for future
+//Windows 7 equivalent support
+void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::frame::XFrame >& xFrame)
+{
+    css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow ();
+    if ( ! xWindow.is() )
+        return;
+
+    ::rtl::OUString sApplicationID;
+    try
+    {
+        ::rtl::OUString aProductName;
+        ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= aProductName;
+
+        // SYNCHRONIZED ->
+        ReadGuard aReadLock(m_aLock);
+        css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR;
+        aReadLock.unlock();
+        // <- SYNCHRONIZED
+
+        css::uno::Reference< css::frame::XModuleManager > xModuleManager(
+            xSMGR->createInstance(SERVICENAME_MODULEMANAGER),
+            css::uno::UNO_QUERY_THROW);
+
+        css::uno::Reference< css::container::XNameAccess > xConfig(
+            xModuleManager,
+            css::uno::UNO_QUERY_THROW);
+
+        rtl::OUString aModuleId = xModuleManager->identify(xFrame);
+        rtl::OUString sDesktopName;
+
+        if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) ||
+             aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) ||
+             aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
+             aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
+        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
+        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
+        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
+        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.formula.FormulaProperties")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
+        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
+                  aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
+                  aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) ||
+                  aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) ||
+                  aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) ||
+                  aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base"));
+        else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.StartModule")) )
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
+        else
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
+        sApplicationID = aProductName.toAsciiLowerCase();
+        sApplicationID += ::rtl::OUString(sal_Unicode('-'));
+        sApplicationID += sDesktopName;
+    }
+    catch(const css::uno::Exception&)
+    {
+    }
+
+    // VCL SYNCHRONIZED ->
+    SolarMutexGuard aSolarGuard;
+
+    Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+    if (
+        ( pWindow                                 ) &&
+        ( pWindow->GetType() == WINDOW_WORKWINDOW )
+       )
+    {
+        WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
+        pWorkWindow->SetApplicationID( sApplicationID );
+    }
+    // <- VCL SYNCHRONIZED
+}
+
+
 //*****************************************************************************************************************
 ::sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame,
                                                       TModuleInfo&                               rInfo )
@@ -307,6 +316,9 @@ void TitleBarUpdate::impl_forceUpdate()
 
     impl_updateIcon  (xFrame);
     impl_updateTitle (xFrame);
+#if defined(UNX) && !defined(MACOSX)
+    impl_updateApplicationID (xFrame);
+#endif
 }
 
 //*****************************************************************************************************************
@@ -332,7 +344,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
     {
         try
         {
-            xSet->getPropertyValue( CONTROLLER_PROPNAME_ICONID ) >>= nIcon;
+            xSet->getPropertyValue( DECLARE_ASCII("IconId") ) >>= nIcon;
         }
         catch(const css::uno::Exception&)
         {}
@@ -357,7 +369,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
     //    Check window pointer for right WorkWindow class too!!!
 
     // VCL SYNCHRONIZED ->
-    ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
 
     Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
     if (
@@ -374,8 +386,6 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
             aURL = xModel->getURL();
         pWorkWindow->SetRepresentedURL( aURL );
     }
-
-    aSolarLock.clear();
     // <- VCL SYNCHRONIZED
 }
 
@@ -394,7 +404,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
     const ::rtl::OUString sTitle = xTitle->getTitle ();
 
     // VCL SYNCHRONIZED ->
-    ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
 
     Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
     if (
@@ -405,9 +415,9 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
         WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
         pWorkWindow->SetText( sTitle );
     }
-
-    aSolarLock.clear();
     // <- VCL SYNCHRONIZED
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 362764054326..ab95ea744f5d 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,8 +70,7 @@ const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM(
 const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
 const rtl::OUString UIELEMENT_PROPNAME_XMENUBAR( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ));
 const rtl::OUString UIELEMENT_PROPNAME_NOCLOSE( RTL_CONSTASCII_USTRINGPARAM( "NoClose" ));
-
-//using namespace rtl;
+using ::rtl::OUString;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
@@ -472,14 +472,14 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA
 
 const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigElementWrapperBase::impl_getStaticPropertyDescriptor()
 {
-    // Create a new static property array to initialize sequence!
+    // Create property array to initialize sequence!
     // Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
     // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!!
     // It's necessary for methods of OPropertySetHelper.
     // ATTENTION:
     //      YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
 
-    static const com::sun::star::beans::Property pProperties[] =
+    const com::sun::star::beans::Property pProperties[] =
     {
         com::sun::star::beans::Property( UIELEMENT_PROPNAME_CONFIGLISTENER, UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
         com::sun::star::beans::Property( UIELEMENT_PROPNAME_CONFIGSOURCE  , UIELEMENT_PROPHANDLE_CONFIGSOURCE   , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
@@ -491,16 +491,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE
         com::sun::star::beans::Property( UIELEMENT_PROPNAME_XMENUBAR      , UIELEMENT_PROPHANDLE_XMENUBAR       , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
     };
     // Use it to initialize sequence!
-    static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
-    // Return static "PropertyDescriptor"
+    const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
+    // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
 void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException )
 {
     ResetableGuard aLock( m_aLock );
 
-    //if ( m_bDisposed )
-    //    throw DisposedException();
 
     if ( xSettings.is() )
     {
@@ -540,8 +538,6 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
 {
     ResetableGuard aLock( m_aLock );
 
-    //if ( m_bDisposed )
-    //    throw DisposedException();
 
     if ( bWriteable )
         return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY );
@@ -569,3 +565,5 @@ Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (Runti
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 589c6fdd8aad..f86d0039900a 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,10 +58,10 @@ const rtl::OUString UIELEMENT_PROPNAME_RESOURCEURL( RTL_CONSTASCII_USTRINGPARAM(
 const rtl::OUString UIELEMENT_PROPNAME_TYPE( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
 const rtl::OUString UIELEMENT_PROPNAME_FRAME( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
 
-//using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
+using ::rtl::OUString;
 
 namespace framework
 {
@@ -136,9 +137,9 @@ throw ( Exception, RuntimeException )
             PropertyValue aPropValue;
             if ( aArguments[n] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAscii( "ResourceURL" ))
+                if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) ))
                     aPropValue.Value >>= m_aResourceURL;
-                else if ( aPropValue.Name.equalsAscii( "Frame" ))
+                else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
                 {
                     Reference< XFrame > xFrame;
                     aPropValue.Value >>= xFrame;
@@ -260,23 +261,25 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA
 
 const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElementWrapperBase::impl_getStaticPropertyDescriptor()
 {
-    // Create a new static property array to initialize sequence!
+    // Create a property array to initialize sequence!
     // Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
     // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!!
     // It's necessary for methods of OPropertySetHelper.
     // ATTENTION:
     //      YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
 
-    static const com::sun::star::beans::Property pProperties[] =
+    const com::sun::star::beans::Property pProperties[] =
     {
         com::sun::star::beans::Property( UIELEMENT_PROPNAME_FRAME         , UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
         com::sun::star::beans::Property( UIELEMENT_PROPNAME_RESOURCEURL   , UIELEMENT_PROPHANDLE_RESOURCEURL    , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
         com::sun::star::beans::Property( UIELEMENT_PROPNAME_TYPE          , UIELEMENT_PROPHANDLE_TYPE           , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
     };
     // Use it to initialize sequence!
-    static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
-    // Return static "PropertyDescriptor"
+    const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
+    // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 5b9a3996db1d..66f61a8a77e8 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
 //-----------------------------------------------
 // includes of external modules
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/svapp.hxx>
 
 //-----------------------------------------------
@@ -71,7 +70,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu
 {
     if (!m_xParentWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Cant work without a parent window!"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant work without a parent window!")),
                 static_cast< css::task::XStatusIndicator* >(this));
 }
 
@@ -92,24 +91,24 @@ void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText ,
     // <- SAFE ----------------------------------
 
     // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
-
-    Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
-    if (!m_pStatusBar)
-        m_pStatusBar = new StatusBar(pParentWindow, WB_3DLOOK|WB_BORDER);
+    {
+        SolarMutexGuard aSolarGuard;
 
-    VCLStatusIndicator::impl_recalcLayout(m_pStatusBar, pParentWindow);
+        Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+        if (!m_pStatusBar)
+            m_pStatusBar = new StatusBar(pParentWindow, WB_3DLOOK|WB_BORDER);
 
-    m_pStatusBar->Show();
-    m_pStatusBar->StartProgressMode(sText);
-    m_pStatusBar->SetProgressValue(0);
+        VCLStatusIndicator::impl_recalcLayout(m_pStatusBar, pParentWindow);
 
-    // force repaint!
-    pParentWindow->Show();
-    pParentWindow->Invalidate(INVALIDATE_CHILDREN);
-    pParentWindow->Flush();
+        m_pStatusBar->Show();
+        m_pStatusBar->StartProgressMode(sText);
+        m_pStatusBar->SetProgressValue(0);
 
-    aSolarLock.clear();
+        // force repaint!
+        pParentWindow->Show();
+        pParentWindow->Invalidate(INVALIDATE_CHILDREN);
+        pParentWindow->Flush();
+    }
     // <- SOLAR SAFE ----------------------------
 
     // SAFE -> ----------------------------------
@@ -126,13 +125,12 @@ void SAL_CALL VCLStatusIndicator::reset()
     throw(css::uno::RuntimeException)
 {
     // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     if (m_pStatusBar)
     {
         m_pStatusBar->SetProgressValue(0);
         m_pStatusBar->SetText(String());
     }
-    aSolarLock.clear();
     // <- SOLAR SAFE ----------------------------
 }
 
@@ -149,16 +147,17 @@ void SAL_CALL VCLStatusIndicator::end()
     // <- SAFE ----------------------------------
 
     // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
-    if (m_pStatusBar)
     {
-        m_pStatusBar->EndProgressMode();
-        m_pStatusBar->Show(sal_False);
-
-        delete m_pStatusBar;
-        m_pStatusBar = 0;
+        SolarMutexGuard aSolarGuard;
+        if (m_pStatusBar)
+        {
+            m_pStatusBar->EndProgressMode();
+            m_pStatusBar->Show(sal_False);
+
+            delete m_pStatusBar;
+            m_pStatusBar = 0;
+        }
     }
-    aSolarLock.clear();
     // <- SOLAR SAFE ----------------------------
 }
 
@@ -173,10 +172,11 @@ void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText)
     // <- SAFE ----------------------------------
 
     // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
-    if (m_pStatusBar)
-        m_pStatusBar->SetText(sText);
-    aSolarLock.clear();
+    {
+        SolarMutexGuard aSolarGuard;
+        if (m_pStatusBar)
+            m_pStatusBar->SetText(sText);
+    }
     // <- SOLAR SAFE ----------------------------
 }
 
@@ -204,10 +204,11 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
             ((nValue*100) / ::std::max(nRange,(sal_Int32)1)), (sal_Int32)100));
 
     // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex());
-    if (m_pStatusBar)
-        m_pStatusBar->SetProgressValue(nPercent);
-    aSolarLock.clear();
+    {
+        SolarMutexGuard aSolarGuard;
+        if (m_pStatusBar)
+            m_pStatusBar->SetProgressValue(nPercent);
+    }
     // <- SOLAR SAFE ----------------------------
 }
 
@@ -229,3 +230,5 @@ void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar   ,
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 0899611b4c03..11828da7aee1 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ void SAL_CALL WakeUpThread::onTerminated()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index b2fc8c078fac..dc19da763d6c 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,9 +39,7 @@
 //__________________________________________
 // interface includes
 
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
 #include <com/sun/star/awt/KeyEvent.hpp>
-#endif
 
 //__________________________________________
 // other includes
@@ -80,7 +79,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
         /** TODO document me
             keys -> commands
         */
-        typedef ::std::hash_map< css::awt::KeyEvent ,
+        typedef ::boost::unordered_map< css::awt::KeyEvent ,
                                  ::rtl::OUString    ,
                                  KeyEventHashCode   ,
                                  KeyEventEqualsFunc > TKey2Commands;
@@ -129,7 +128,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
 
         //---------------------------------------
         /** TODO document me */
-        virtual AcceleratorCache& operator=(const AcceleratorCache& rCopy);
+        AcceleratorCache& operator=(const AcceleratorCache& rCopy);
 
         //---------------------------------------
         /** @short  checks if the specified key exists.
@@ -185,3 +184,5 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index fb4a269cdb8f..1b34cb13c3e1 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,13 +76,13 @@ namespace framework
 //-----------------------------------------------
 // Accelerators.xcu
 
-static const ::rtl::OUString CFG_ENTRY_PRIMARY      = ::rtl::OUString::createFromAscii("PrimaryKeys");
-static const ::rtl::OUString CFG_ENTRY_SECONDARY    = ::rtl::OUString::createFromAscii("SecondaryKeys");
+extern const ::rtl::OUString CFG_ENTRY_PRIMARY;
+extern const ::rtl::OUString CFG_ENTRY_SECONDARY;
 
-static const ::rtl::OUString CFG_ENTRY_GLOBAL       = ::rtl::OUString::createFromAscii("Global");
-static const ::rtl::OUString CFG_ENTRY_MODULES      = ::rtl::OUString::createFromAscii("Modules");
+extern const ::rtl::OUString CFG_ENTRY_GLOBAL;
+extern const ::rtl::OUString CFG_ENTRY_MODULES;
 
-static const ::rtl::OUString CFG_PROP_COMMAND       = ::rtl::OUString::createFromAscii("Command");
+extern const ::rtl::OUString CFG_PROP_COMMAND;
 
 /** "global" type to make accelerator presets unique, so they can be used
     in combination with the salhelper::SingletonRef mechanism! */
@@ -219,7 +220,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
             throw(css::uno::RuntimeException);
 
         // IStorageListener
-        virtual void changesOccured(const ::rtl::OUString& sPath);
+        virtual void changesOccurred(const ::rtl::OUString& sPath);
 
         //______________________________________
         // helper for derived classes
@@ -474,3 +475,5 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index 43714abeee60..cdd90d21af45 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index f2b0b1d6afb6..28c7ba4eb12b 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,18 +35,14 @@
 #include <accelerators/acceleratorconfiguration.hxx>
 #include <accelerators/presethandler.hxx>
 
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
-#include <macros/interface.hxx>
-#endif
+#include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
 
 //__________________________________________
 // interface includes
 
-#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
 #include <com/sun/star/lang/XInitialization.hpp>
-#endif
 
 //__________________________________________
 // other includes
@@ -99,6 +96,9 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
 
         ::rtl::OUString m_sLocale;
 
+        /** helper to listen for configuration changes without ownership cycle problems */
+        css::uno::Reference< css::util::XChangesListener > m_xCfgListener;
+
         //----------------------------------
         /** read all data into the cache. */
         void impl_ts_fillCache();
@@ -107,3 +107,5 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index 44f0cc3cd5c5..555d517d3a54 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,9 +57,11 @@ class IStorageListener
 
         //--------------------------------------
         /** @short  TODO */
-        virtual void changesOccured(const ::rtl::OUString& sPath) = 0;
+        virtual void changesOccurred(const ::rtl::OUString& sPath) = 0;
 };
 
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 0a8ebb6f5a35..d64964d5cf4d 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,7 +77,7 @@ class KeyMapping
 
         //---------------------------------------
         /** @short  hash structure to map key codes to identifier. */
-        typedef ::std::hash_map< sal_Int16                    ,
+        typedef ::boost::unordered_map< sal_Int16                    ,
                                  ::rtl::OUString              ,
                                  ShortHashCode                ,
                                  ::std::equal_to< sal_Int16 > > Code2IdentifierHash;
@@ -160,3 +161,5 @@ class KeyMapping
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index 8d83dcd459b3..05588598ebf8 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 #include <accelerators/acceleratorconfiguration.hxx>
 #include <accelerators/presethandler.hxx>
 
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
-#include <macros/interface.hxx>
-#endif
+#include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
 
@@ -104,6 +103,8 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
     // helper
 
     private:
+        /** helper to listen for configuration changes without ownership cycle problems */
+        css::uno::Reference< css::util::XChangesListener > m_xCfgListener;
 
         //----------------------------------
         /** read all data into the cache. */
@@ -113,3 +114,5 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 2d8f3ea57920..cb136f122a46 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,13 +40,9 @@
 //__________________________________________
 // interface includes
 
-#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_
 #include <com/sun/star/embed/XStorage.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 //__________________________________________
 // other includes
@@ -533,3 +530,5 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index ae3439b79653..741e9718e2d6 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,13 +40,9 @@
 //===============================================
 // interface includes
 
-#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_
 #include <com/sun/star/embed/XStorage.hpp>
-#endif
 
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 //===============================================
 // other includes
@@ -94,7 +91,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         };
 
         /** @short  TODO */
-        typedef ::std::hash_map< ::rtl::OUString                    ,
+        typedef ::boost::unordered_map< ::rtl::OUString                    ,
                                  TStorageInfo                       ,
                                  ::rtl::OUStringHash                ,
                                  ::std::equal_to< ::rtl::OUString > > TPath2StorageInfo;
@@ -203,7 +200,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         //---------------------------------------
         /** @short  TODO
          */
-        virtual void operator=(const StorageHolder& rCopy);
+        void operator=(const StorageHolder& rCopy);
 
         //---------------------------------------
         /** @short  opens a sub element of the specified base storage.
@@ -259,3 +256,5 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx
index 4d51b2586efe..050fde2e128f 100644
--- a/framework/source/inc/constant/containerquery.hxx
+++ b/framework/source/inc/constant/containerquery.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ struct ContainerQuery
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx
index db10575ce8e7..19eabc22719e 100644
--- a/framework/source/inc/constant/contenthandler.hxx
+++ b/framework/source/inc/constant/contenthandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ struct ContentHandler
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx
index 58e03638d3b2..1db45dddc5ba 100644
--- a/framework/source/inc/constant/frameloader.hxx
+++ b/framework/source/inc/constant/frameloader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ class FrameLoader
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_H_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 63ec4c4f28f0..bc4b95fcd3d4 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,3 +160,5 @@ class LoadDispatcher : private ThreadHelpBase
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx
index f2f0f6c95025..90df4943d9f6 100644
--- a/framework/source/inc/dispatch/uieventloghelper.hxx
+++ b/framework/source/inc/dispatch/uieventloghelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 0844dd74bf02..549c6d9e69ae 100755..100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,13 +67,12 @@ namespace css = ::com::sun::star;
             e.g. "Pereferences" or "About". These menu entries trigger hard coded commands.
             Here we map these commands to the right URLs and dispatch them.
 
-            This helper knows a frame and it's container window (where VCL provide the hard coded
-            commands). We hold those objects weak ... so there is no need to react for complex dispose/ing()
+            This helper knows a frame and its container window (where VCL provide the hard coded
+            commands). We hold those objects weak so there is no need to react for complex UNO dispose/ing()
             scenarios. On the other side VCL does not hold us alive (because it doesn't know our UNO reference).
-            So we register us at the XWindow as event listener also to be sure to live as long the XWindow/VCLWindow lives.
+            So we register at the VCL level as an event listener and
  */
 class WindowCommandDispatch : private ThreadHelpBase
-                  , public  ::cppu::WeakImplHelper1< css::lang::XEventListener >
 {
     //___________________________________________
     // const
@@ -96,7 +96,7 @@ class WindowCommandDispatch : private ThreadHelpBase
         /// knows the frame, where we dispatch our commands as weak reference
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
 
-        /// knows the VCL window (where the hard coded commands occured) as weak XWindow reference
+        /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference
         css::uno::WeakReference< css::awt::XWindow > m_xWindow;
 
     //___________________________________________
@@ -128,15 +128,6 @@ class WindowCommandDispatch : private ThreadHelpBase
         virtual ~WindowCommandDispatch();
 
     //___________________________________________
-    // uno interface
-
-    public:
-
-        // XEventListener
-         virtual void SAL_CALL disposing(const css::lang::EventObject& aSource)
-            throw (css::uno::RuntimeException);
-
-    //___________________________________________
     // implementation
 
     private:
@@ -147,11 +138,15 @@ class WindowCommandDispatch : private ThreadHelpBase
 
             @descr  Those listener connections will be created one times only (see ctor).
                     Afterwards we listen for incoming events till our referred frame/window pair
-                    will be closed. All objects die by refcount automatically. Because we hold
-                    it weak ...
+                    will be closed.
          */
         void impl_startListening();
 
+        /** @short  drop all listener connections we need.
+
+         */
+        void impl_stopListening();
+
         //_______________________________________
 
         /** @short  callback from VCL to notify new commands
@@ -172,3 +167,5 @@ class WindowCommandDispatch : private ThreadHelpBase
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_DISPATCH_MACDISPATCH_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 2059c976ecae..da72daebdaec 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -207,3 +208,5 @@ class ActionLockGuard : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 6330f2598605..f2f3b3f08dcc 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,13 +45,9 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-#ifndef _COM_SUN_STAR_LANG_IllegalArgumentException_HPP_
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#endif
 
-#ifndef _COM_SUN_STAR_IO_IOException_HPP_
 #include <com/sun/star/io/IOException.hpp>
-#endif
 
 //_______________________________________________
 // includes of an other project
@@ -702,3 +699,5 @@ class LoadEnv : private ThreadHelpBase
 } // namespace framework
 
 #endif // __FRAMEWORK_LOADENV_LOADENV_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index bb26e98f4695..e06eef42b9db 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,7 @@ namespace css = ::com::sun::star;
             load environment only.
 
     @descr  Of course outside code must wrapp it, to transport
-            the occured information to its caller.
+            the occurred information to its caller.
 
     @author as96863
  */
@@ -132,7 +133,7 @@ class LoadEnvException
         /** @short  An ID, which make this exception unique among others. */
         sal_Int32 m_nID;
 
-        /** @short  Contains the original exception, if any occured. */
+        /** @short  Contains the original exception, if any occurred. */
         css::uno::Any m_exOriginal;
 
         /** TODO
@@ -195,3 +196,5 @@ class LoadEnvException
 } // namespace framework
 
 #endif // __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index 179ec117ab19..17096f8087e9 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ class TargetHelper
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_TARGETHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 7cb9280ef0e2..5c46c1cbc0fc 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
@@ -120,8 +119,6 @@ class ConfigurationHelper
                                                                       const ::rtl::OUString&                                        sRelPath  ,
                                                                             sal_Int32                                               nOpenFlags)
         {
-            static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/");
-
             css::uno::Reference< css::uno::XInterface > xCFG;
 
             try
@@ -131,7 +128,7 @@ class ConfigurationHelper
 
                 ::rtl::OUStringBuffer sPath(1024);
                 sPath.append(sPackage      );
-                sPath.append(PATH_SEPERATOR);
+                sPath.append(static_cast<sal_Unicode>('/'));
                 sPath.append(sRelPath      );
 
                 sal_Bool bReadOnly   = ((nOpenFlags & ConfigurationHelper::E_READONLY   ) == ConfigurationHelper::E_READONLY   );
@@ -144,13 +141,13 @@ class ConfigurationHelper
                 css::uno::Sequence< css::uno::Any > lParams(c);
                 css::beans::PropertyValue           aParam;
 
-                aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
+                aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
                 aParam.Value <<= sPath.makeStringAndClear();
                 lParams[0]   <<= aParam;
 
                 if (bAllLocales)
                 {
-                    aParam.Name    = ::rtl::OUString::createFromAscii("*");
+                    aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
                     aParam.Value <<= sal_True;
                     lParams[1]   <<= aParam;
                 }
@@ -174,3 +171,5 @@ class ConfigurationHelper
 } // namespace framework
 
 #endif // __FRAMEWORK_PATTERN_CONFIGURATION_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index ce625938bd64..d112d8a2f1c4 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -128,3 +129,5 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso
 } // namespace framework
 
 #endif // __FRAMEWORK_PATTERN_FRAME_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx
index a785e307995d..78e5bb463415 100644
--- a/framework/source/inc/pattern/storages.hxx
+++ b/framework/source/inc/pattern/storages.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const
 } // namespace framework
 
 #endif // __FRAMEWORK_PATTERN_STORAGES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 11fa0be9a767..faecdaea9105 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,14 +42,12 @@
 //_______________________________________________
 // other includes
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/window.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
 //_______________________________________________
@@ -73,20 +72,20 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind
     if (!xWindow.is())
         return ::rtl::OUString();
 
-    // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
-
     ByteString sWindowState;
-    Window*    pWindow     = VCLUnoHelper::GetWindow(xWindow);
-    // check for system window is neccessary to guarantee correct pointer cast!
-    if (pWindow!=NULL && pWindow->IsSystemWindow())
+    // SOLAR SAFE -> ----------------------------
     {
-        sal_uLong nMask  = WINDOWSTATE_MASK_ALL;
-              nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
-        sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask);
+        SolarMutexGuard aSolarGuard;
+
+        Window*    pWindow     = VCLUnoHelper::GetWindow(xWindow);
+        // check for system window is neccessary to guarantee correct pointer cast!
+        if (pWindow!=NULL && pWindow->IsSystemWindow())
+        {
+            sal_uLong nMask  = WINDOWSTATE_MASK_ALL;
+            nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
+            sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask);
+        }
     }
-
-    aSolarGuard.clear();
     // <- SOLAR SAFE ----------------------------
 
     return B2U_ENC(sWindowState,RTL_TEXTENCODING_UTF8);
@@ -103,7 +102,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind
         return;
 
     // SOLAR SAFE -> ----------------------------
-    ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
 
     Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     // check for system window is neccessary to guarantee correct pointer cast!
@@ -120,7 +119,6 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind
         ((SystemWindow*)pWindow)->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8));
     }
 
-    aSolarGuard.clear();
     // <- SOLAR SAFE ----------------------------
 }
 
@@ -136,7 +134,7 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW
         // Attention ! Checking Window->GetParent() isnt the right approach here.
         // Because sometimes VCL create "implicit border windows" as parents even we created
         // a simple XWindow using the toolkit only .-(
-        ::vos::OGuard aSolarLock(&Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if (
             (pWindow                  ) &&
@@ -153,3 +151,5 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW
 } // namespace framework
 
 #endif // __FRAMEWORK_PATTERN_WINDOW_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index d5d11ebc2097..305ec97fb272 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,9 +50,7 @@
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/task/ErrorCodeRequest.hpp>
 
-#ifndef _COM_SUN_STAR_DOCUMENT_LOCKEDDOCUMENTREQUEST_HPP_
 #include <com/sun/star/document/LockedDocumentRequest.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -204,3 +203,5 @@ sal_Bool QuietInteraction::wasUsed() const
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 93ea64e94cb4..ec84096eda94 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,26 +60,26 @@ namespace framework{
 // definitions
 
 // path to module config
-static ::rtl::OUString CFG_PACKAGE_MODULES      = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static ::rtl::OUString CFG_PACKAGE_SETUP        = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"             );
-static ::rtl::OUString CFG_PACKAGE_COMMON       = ::rtl::OUString::createFromAscii("/org.openoffice.Office.Common"     );
-static ::rtl::OUString CFG_PATH_L10N            = ::rtl::OUString::createFromAscii("L10N"                              );
-static ::rtl::OUString CFG_PATH_HELP            = ::rtl::OUString::createFromAscii("Help"                              );
-static ::rtl::OUString CFG_KEY_LOCALE           = ::rtl::OUString::createFromAscii("ooLocale"                          );
-static ::rtl::OUString CFG_KEY_HELPSYSTEM       = ::rtl::OUString::createFromAscii("System"                            );
+static ::rtl::OUString CFG_PACKAGE_MODULES     (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static ::rtl::OUString CFG_PACKAGE_SETUP       (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+static ::rtl::OUString CFG_PACKAGE_COMMON      (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common"));
+static ::rtl::OUString CFG_PATH_L10N           (RTL_CONSTASCII_USTRINGPARAM("L10N"));
+static ::rtl::OUString CFG_PATH_HELP           (RTL_CONSTASCII_USTRINGPARAM("Help"));
+static ::rtl::OUString CFG_KEY_LOCALE          (RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
+static ::rtl::OUString CFG_KEY_HELPSYSTEM      (RTL_CONSTASCII_USTRINGPARAM("System"));
 
 // props of job environment
-static ::rtl::OUString PROP_ENVIRONMENT         = ::rtl::OUString::createFromAscii("Environment"                       );
-static ::rtl::OUString PROP_JOBCONFIG           = ::rtl::OUString::createFromAscii("JobConfig"                         );
-static ::rtl::OUString PROP_ENVTYPE             = ::rtl::OUString::createFromAscii("EnvType"                           );
-static ::rtl::OUString PROP_MODEL               = ::rtl::OUString::createFromAscii("Model"                             );
+static ::rtl::OUString PROP_ENVIRONMENT        (RTL_CONSTASCII_USTRINGPARAM("Environment"));
+static ::rtl::OUString PROP_JOBCONFIG          (RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
+static ::rtl::OUString PROP_ENVTYPE            (RTL_CONSTASCII_USTRINGPARAM("EnvType"));
+static ::rtl::OUString PROP_MODEL              (RTL_CONSTASCII_USTRINGPARAM("Model"));
 
 // props of module config
-static ::rtl::OUString PROP_HELP_BASEURL        = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpBaseURL"         );
-static ::rtl::OUString PROP_AUTOMATIC_HELP      = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpOnOpen"          );
+static ::rtl::OUString PROP_HELP_BASEURL       (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpBaseURL"));
+static ::rtl::OUString PROP_AUTOMATIC_HELP     (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpOnOpen"));
 
 // special value of job environment
-static ::rtl::OUString ENVTYPE_DOCUMENTEVENT    = ::rtl::OUString::createFromAscii("DOCUMENTEVENT"                     );
+static ::rtl::OUString ENVTYPE_DOCUMENTEVENT   (RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
 
 //-----------------------------------------------
 
@@ -421,3 +422,5 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index e0f2fd063f5e..635fb4b6aa46 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -755,9 +756,6 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro
     /* SAFE { */
     ReadGuard aReadLock(m_aLock);
 
-    // don't disagree with this request if job was already stopped or finished it's work
-    // if (m_eRunState != E_RUNNING)
-    //    return;
 
     // Otherwhise try to close() it
     css::uno::Reference< css::util::XCloseable > xClose(m_xJob, css::uno::UNO_QUERY);
@@ -942,3 +940,5 @@ void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css::
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 0a6f27393330..cef28eb08b0c 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -183,8 +184,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
 
     // try to open the configuration set of this job directly and get a property access to it
     // We open it readonly here
-    ::rtl::OUString sKey;
-    sKey  = ::rtl::OUString::createFromAscii(JOBCFG_ROOT);
+    ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
     sKey += ::utl::wrapConfigurationElementName(m_sAlias);
 
     ConfigAccess aConfig(m_xSMGR, sKey);
@@ -318,8 +318,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
         // It doesn't matter if this config object was already opened before.
         // It doesn nothing here then ... or it change the mode automaticly, if
         // it was opened using another one before.
-        ::rtl::OUString sKey;
-        sKey  = ::rtl::OUString::createFromAscii(JOBCFG_ROOT);
+        ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
         sKey += ::utl::wrapConfigurationElementName(m_sAlias);
 
         ConfigAccess aConfig(m_xSMGR, sKey);
@@ -428,15 +427,15 @@ JobData::EEnvironment JobData::getEnvironment() const
     switch(m_eEnvironment)
     {
         case E_EXECUTION :
-            sDescriptor = ::rtl::OUString::createFromAscii("EXECUTOR");
+            sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTOR"));
             break;
 
         case E_DISPATCH :
-            sDescriptor = ::rtl::OUString::createFromAscii("DISPATCH");
+            sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISPATCH"));
             break;
 
         case E_DOCUMENTEVENT :
-            sDescriptor = ::rtl::OUString::createFromAscii("DOCUMENTEVENT");
+            sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
             break;
         default:
             break;
@@ -586,7 +585,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
         we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated
         to "~" ...
      */
-    static ::rtl::OUString PATTERN_ISO8601 = ::rtl::OUString::createFromAscii("\?\?\?\?-\?\?-\?\?*\0");
+    static ::rtl::OUString PATTERN_ISO8601(RTL_CONSTASCII_USTRINGPARAM("\?\?\?\?-\?\?-\?\?*\0"));
     WildCard aISOPattern(PATTERN_ISO8601);
 
     sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
@@ -748,3 +747,5 @@ void JobData::impl_reset()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index afc0abada7c1..e3bd10fb3d83 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -492,3 +493,5 @@ void SAL_CALL JobDispatch::removeStatusListener( /*IN*/ const css::uno::Referenc
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index f33d88216566..8d773f208ceb 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,15 +35,15 @@
 #include <jobs/job.hxx>
 #include <jobs/joburl.hxx>
 
-#ifndef __FRAMEWORK_CLASS_CONVERTER_HXX_
 #include <classes/converter.hxx>
-#endif
 #include <threadhelp/transactionguard.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 #include <general.h>
 #include <services.h>
 
+#include "helper/mischelper.hxx"
+
 //________________________________
 //  interface includes
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -124,8 +125,8 @@ DEFINE_INIT_SERVICE( JobExecutor,
                             css::uno::Reference< css::container::XContainer > xNotifier(m_aConfig.cfg(), css::uno::UNO_QUERY);
                             if (xNotifier.is())
                             {
-                                css::uno::Reference< css::container::XContainerListener > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
-                                xNotifier->addContainerListener(xThis);
+                                m_xConfigListener = new WeakContainerListener(this);
+                                xNotifier->addContainerListener(m_xConfigListener);
                             }
 
                             // don't close cfg here!
@@ -156,6 +157,9 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::lang::XMultiSer
 
 JobExecutor::~JobExecutor()
 {
+    css::uno::Reference< css::container::XContainer > xNotifier(m_aConfig.cfg(), css::uno::UNO_QUERY);
+    if (xNotifier.is())
+        xNotifier->removeContainerListener(m_xConfigListener);
     LOG_ASSERT(m_aConfig.getMode() == ConfigAccess::E_CLOSED, "JobExecutor::~JobExecutor()\nConfiguration don't send dispoing() message!\n")
 }
 
@@ -380,3 +384,5 @@ void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent ) thr
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index 375a3e5fc4d6..c801ef469bc3 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
     /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -259,3 +260,5 @@ css::frame::DispatchResultEvent JobResult::getDispatchResult() const
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index a3cc98474104..717fc8a2f2f5 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -325,7 +326,7 @@ void JobURL::impldbg_checkIt()
     JobURL::impldbg_checkURL("vnd.sun.star.job:service=;"          , E_UNKNOWN, ""         , ""       , ""           , NULL, NULL, NULL);
 
     // check combinations
-    // Note: No additional spaces or tabs are allowed after a seperator occured.
+    // Note: No additional spaces or tabs are allowed after a seperator occurred.
     // Tab and spaces before a seperator will be used as value!
     JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service"  , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL);
     JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias"                  , E_ALIAS | E_SERVICE           , ""         , "myAlias", "css.Service" , NULL, NULL, NULL);
@@ -655,3 +656,5 @@ sal_Bool JobURL::getAliasArgs( /*OUT*/ ::rtl::OUString& sAliasArgs ) const
 #endif // ENABLE_COMPONENT_SELF_CHECK
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index b7b6d370bb40..7cc29e1b686e 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,19 +62,19 @@ namespace framework{
 // definitions
 
 /** adress job configuration inside argument set provided on method execute(). */
-static const ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig");
+static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
 
 /** adress job configuration property "Command". */
-static const ::rtl::OUString PROP_COMMAND = ::rtl::OUString::createFromAscii("Command");
+static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
 
 /** adress job configuration property "Arguments". */
-static const ::rtl::OUString PROP_ARGUMENTS = ::rtl::OUString::createFromAscii("Arguments");
+static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments"));
 
 /** adress job configuration property "DeactivateJobIfDone". */
-static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE = ::rtl::OUString::createFromAscii("DeactivateJobIfDone");
+static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone"));
 
 /** adress job configuration property "CheckExitCode". */
-static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAscii("CheckExitCode");
+static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode"));
 
 //-----------------------------------------------
 
@@ -212,3 +213,5 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 0e6dff554daa..1f00f77d2e55 100755..100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +49,6 @@
 // other includes
 #include <comphelper/mediadescriptor.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
 #include <toolkit/unohlp.hxx>
 
 // namespace
@@ -132,7 +132,7 @@ ToolBox* getToolboxPtr( Window* pWindow )
 
 Window* getWindowFromXUIElement( const uno::Reference< ui::XUIElement >& xUIElement )
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     uno::Reference< awt::XWindow > xWindow;
     if ( xUIElement.is() )
         xWindow = uno::Reference< awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY );
@@ -169,7 +169,7 @@ bool lcl_checkUIElement(const uno::Reference< ui::XUIElement >& xUIElement, awt:
     bool bRet = xUIElement.is();
     if ( bRet )
     {
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         _xWindow.set( xUIElement->getRealInterface(), uno::UNO_QUERY );
         _rPosSize = _xWindow->getPosSize();
 
@@ -340,12 +340,11 @@ sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFram
     uno::Reference< awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), uno::UNO_QUERY); // dont use _THROW here ... its a check only
     if (xWindowCheck.is())
     {
-        // --> PB 2007-06-18 #i76867# top and system window is required.
-        ::vos::OGuard aSolarLock(&Application::GetSolarMutex());
+        // #i76867# top and system window is required.
+        SolarMutexGuard aGuard;
         uno::Reference< awt::XWindow > xWindow( xWindowCheck, uno::UNO_QUERY );
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         return ( pWindow && pWindow->IsSystemWindow() );
-        // <--
     }
 
     return sal_False;
@@ -382,7 +381,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::lang::XMul
         xDispatcher->executeDispatch(
             xProvider,
             aDockWinCommand,
-            ::rtl::OUString::createFromAscii("_self"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
             0,
             aArgs);
     }
@@ -413,3 +412,5 @@ void impl_addWindowListeners(
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index d4e9ce313d0e..704fb7ac4d8d 100755..100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun
 }
 
 #endif // __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 43176fe82b72..a7bc56cbd954 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,6 +90,7 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/uno3.hxx>
 #include <rtl/logfile.hxx>
+#include <rtl/instance.hxx>
 #include <unotools/cmdoptions.hxx>
 
 #include <algorithm>
@@ -189,6 +191,7 @@ LayoutManager::~LayoutManager()
 {
     Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     m_aAsyncLayoutTimer.Stop();
+    delete m_pGlobalSettings;
 }
 
 // Internal helper function
@@ -199,7 +202,7 @@ void LayoutManager::impl_clearUpMenuBar()
     // Clear up VCL menu bar to prepare shutdown
     if ( m_xContainerWindow.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
         if ( pSysWindow )
@@ -257,7 +260,7 @@ void LayoutManager::implts_lock()
 sal_Bool LayoutManager::implts_unlock()
 {
     WriteGuard aWriteLock( m_aLock );
-    m_nLockCount = std::max( --m_nLockCount, static_cast<sal_Int32>(0) );
+    m_nLockCount = std::max( m_nLockCount-1, static_cast<sal_Int32>(0) );
     return ( m_nLockCount == 0 );
 }
 
@@ -583,22 +586,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_aDockedData.m_bLocked = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXT ))
+                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXT)))
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bContextSensitive = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_NOCLOSE ))
+                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_NOCLOSE)))
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bNoClose = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXTACTIVE ))
+                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXTACTIVE)))
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bContextActive = bValue;
                     }
-                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_SOFTCLOSE ))
+                    else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_SOFTCLOSE)))
                     {
                         if ( aWindowState[n].Value >>= bValue )
                             rElementData.m_bSoftClose = bValue;
@@ -726,7 +729,7 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
     Window* pContainerWindow( 0 );
 
     // Retrieve output size from container Window
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     pContainerWindow  = VCLUnoHelper::GetWindow( m_xContainerWindow );
     if ( pContainerWindow )
         aContainerWinSize = pContainerWindow->GetOutputSizePixel();
@@ -784,7 +787,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible )
     bool bMustDoLayout(false);
     if (( xMenuBar.is() || xInplaceMenuBar.is() ) && xContainerWindow.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         MenuBar* pMenuBar( 0 );
         if ( xInplaceMenuBar.is() )
@@ -913,7 +916,7 @@ void LayoutManager::implts_createProgressBar()
     {
         Reference< awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar();
 
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow );
         if ( !pStatusBarWnd )
         {
@@ -1003,7 +1006,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz
 
     if ( xWindow.is() )
     {
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         Window* pParentWindow = VCLUnoHelper::GetWindow( xContainerWindow );
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pParentWindow && ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ))
@@ -1045,7 +1048,7 @@ sal_Bool LayoutManager::implts_showProgressBar()
     aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
     if ( pWindow )
     {
@@ -1089,7 +1092,7 @@ sal_Bool LayoutManager::implts_hideProgressBar()
     aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
     if ( pWindow && pWindow->IsVisible() && ( bHideStatusBar || bInternalStatusBar ))
     {
@@ -1114,7 +1117,7 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState )
     {
         Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
 
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && !pWindow->IsVisible() )
         {
@@ -1140,7 +1143,7 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState )
     {
         Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
 
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->IsVisible() )
         {
@@ -1174,7 +1177,7 @@ throw (uno::RuntimeException)
 
     if ( !m_bInplaceMenuSet )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         // Reset old inplace menubar!
         m_pInplaceMenuBar = 0;
@@ -1214,10 +1217,9 @@ throw (uno::RuntimeException)
     WriteGuard aWriteLock( m_aLock );
     m_bInplaceMenuSet = sal_False;
 
-    // if ( m_xMenuBar.is() &&
     if ( m_xContainerWindow.is() )
     {
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() );
         SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
         if ( pSysWindow )
@@ -1247,25 +1249,19 @@ throw (uno::RuntimeException)
 void SAL_CALL LayoutManager::reset()
 throw (RuntimeException)
 {
-    sal_Bool bComponentAttached( sal_False );
-
-    ReadGuard aReadLock( m_aLock );
-    bComponentAttached = m_bComponentAttached;
-    aReadLock.unlock();
-
     implts_reset( sal_True );
 }
 
 void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
 throw (uno::RuntimeException)
 {
-    OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
+    OSL_FAIL( "This method is obsolete and should not be used!\n" );
 }
 
 void SAL_CALL LayoutManager::resetInplaceMenuBar()
 throw (uno::RuntimeException)
 {
-    OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
+    OSL_FAIL( "This method is obsolete and should not be used!\n" );
 }
 
 //---------------------------------------------------------------------------------------------------------
@@ -1356,7 +1352,7 @@ throw ( RuntimeException )
         // #i37884# set initial visibility state - in the plugin case the container window is already shown
         // and we get no notification anymore
         {
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
             if( pContainerWindow )
                 m_bParentWindowVisible = pContainerWindow->IsVisible();
@@ -1370,7 +1366,7 @@ throw ( RuntimeException )
 
     if ( xDockingAreaAcceptor.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         // Add layout manager as listener to get notifications about toolbar button activties
         Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
@@ -1422,7 +1418,7 @@ void LayoutManager::implts_reparentChildWindows()
 
     if ( xStatusBarWindow.is() )
     {
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
         Window* pWindow          = VCLUnoHelper::GetWindow( xStatusBarWindow );
         if ( pWindow && pContainerWindow )
@@ -1509,7 +1505,7 @@ throw (RuntimeException)
                 m_xMenuBar = implts_createElement( aName );
                 if ( m_xMenuBar.is() )
                 {
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
 
                     SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
                     if ( pSysWindow )
@@ -1664,7 +1660,6 @@ throw (uno::RuntimeException)
 {
     bool            bResult( false );
     bool            bNotify( false );
-    bool            bDoLayout( false );
     ::rtl::OUString aElementType;
     ::rtl::OUString aElementName;
 
@@ -1690,7 +1685,7 @@ throw (uno::RuntimeException)
             if ( xUIElement.is() )
             {
                 // we need VCL here to pass special flags to Show()
-                vos::OGuard     aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                 if ( pWindow )
@@ -1698,7 +1693,6 @@ throw (uno::RuntimeException)
                     pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                     bResult   = true;
                     bNotify   = true;
-                    bDoLayout = true;
                 }
             }
         }
@@ -1709,7 +1703,6 @@ throw (uno::RuntimeException)
         implts_showProgressBar();
         bResult   = true;
         bNotify   = true;
-        bDoLayout = true;
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_bVisible )
     {
@@ -1721,7 +1714,6 @@ throw (uno::RuntimeException)
         if ( pToolbarManager && bComponentAttached )
         {
                 bNotify   = pToolbarManager->requestToolbar( rResourceURL );
-            bDoLayout = true;
             }
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
@@ -1880,7 +1872,6 @@ throw (RuntimeException)
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" );
 
-    bool            bResult( false );
     bool            bNotify( false );
     bool            bMustLayout( false );
     ::rtl::OUString aElementType;
@@ -1898,7 +1889,7 @@ throw (RuntimeException)
         {
             m_bMenuVisible = sal_False;
 
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
             if ( pSysWindow )
             {
@@ -1906,7 +1897,6 @@ throw (RuntimeException)
                 if ( pMenuBar )
                 {
                     pMenuBar->SetDisplayable( sal_False );
-                    bResult = true;
                     bNotify = true;
                 }
             }
@@ -1921,12 +1911,11 @@ throw (RuntimeException)
             implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
             bMustLayout = sal_True;
             bNotify     = sal_True;
-            bResult     = sal_True;
         }
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
     {
-        bResult = bNotify = implts_hideProgressBar();
+        bNotify = implts_hideProgressBar();
     }
     else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2132,7 +2121,7 @@ throw (RuntimeException)
         {
             aReadLock.unlock();
 
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
             if ( pSysWindow )
             {
@@ -2289,7 +2278,7 @@ throw (RuntimeException)
     aStr += ByteString::CreateFromInt32((long)this);
     aStr += " - ";
     aStr += ByteString::CreateFromInt32(nLockCount);
-    DBG_TRACE( aStr.GetBuffer() );
+    OSL_TRACE( aStr.GetBuffer() );
 #endif
 
     Any a( nLockCount );
@@ -2311,7 +2300,7 @@ throw (RuntimeException)
     aStr += ByteString::CreateFromInt32((long)this);
     aStr += " - ";
     aStr += ByteString::CreateFromInt32(nLockCount);
-    DBG_TRACE( aStr.GetBuffer() );
+    OSL_TRACE( aStr.GetBuffer() );
 #endif
     // conform to documentation: unlock with lock count == 0 means force a layout
 
@@ -2604,7 +2593,7 @@ void LayoutManager::implts_updateMenuBarClose()
 
     if ( xContainerWindow.is() )
     {
-        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
         if ( pSysWindow )
@@ -2639,7 +2628,7 @@ sal_Bool LayoutManager::implts_resetMenuBar()
     aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
     if ( pSysWindow && bMenuVisible && pSetMenuBar )
     {
@@ -2675,8 +2664,8 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
 
     xDispatcher->executeDispatch(
         xProvider,
-        ::rtl::OUString::createFromAscii(".uno:CloseWin"),
-        ::rtl::OUString::createFromAscii("_self"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
         0,
         uno::Sequence< beans::PropertyValue >());
 
@@ -2947,7 +2936,7 @@ throw( RuntimeException )
         m_xFrame.clear();
         delete m_pGlobalSettings;
         m_pGlobalSettings = 0;
-                m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >();
+        m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >();
 
         bDisposeAndClear = sal_True;
     }
@@ -3224,24 +3213,39 @@ void SAL_CALL LayoutManager::getFastPropertyValue( uno::Any& aValue, sal_Int32 n
     LayoutManager_PBase::getFastPropertyValue( aValue, nHandle );
 }
 
-::cppu::IPropertyArrayHelper& SAL_CALL LayoutManager::getInfoHelper()
+namespace detail
 {
-    static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL;
-
-    if( pInfoHelper == NULL )
+    class InfoHelperBuilder : private ::boost::noncopyable
     {
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-
-        if( pInfoHelper == NULL )
+    private:
+        ::cppu::OPropertyArrayHelper *m_pInfoHelper;
+    public:
+        InfoHelperBuilder(const LayoutManager &rManager)
         {
             uno::Sequence< beans::Property > aProperties;
-            describeProperties( aProperties );
-            static ::cppu::OPropertyArrayHelper aInfoHelper( aProperties, sal_True );
-            pInfoHelper = &aInfoHelper;
+            rManager.describeProperties(aProperties);
+            m_pInfoHelper = new ::cppu::OPropertyArrayHelper(aProperties, sal_True);
         }
-    }
+        ~InfoHelperBuilder()
+        {
+            delete m_pInfoHelper;
+        }
+
+        ::cppu::OPropertyArrayHelper& getHelper() { return *m_pInfoHelper; }
+    };
+}
+namespace
+{
+    struct theInfoHelper :
+        public rtl::StaticWithArg< detail::InfoHelperBuilder, LayoutManager,
+        theInfoHelper >
+    {
+    };
+}
 
-    return(*pInfoHelper);
+::cppu::IPropertyArrayHelper& SAL_CALL LayoutManager::getInfoHelper()
+{
+    return theInfoHelper::get(*this).getHelper();
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException)
@@ -3263,3 +3267,5 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySet
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panel.cxx b/framework/source/layoutmanager/panel.cxx
index 69f6ad0f51d9..ca103a1a261b 100755..100644
--- a/framework/source/layoutmanager/panel.cxx
+++ b/framework/source/layoutmanager/panel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,6 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/unohlp.hxx>
 
@@ -64,7 +64,7 @@ Panel::Panel(
     uno::Reference< awt::XWindowPeer > xWindowPeer( rParent, uno::UNO_QUERY );
     m_xPanelWindow = uno::Reference< awt::XWindow >( createToolkitWindow( rSMGR, xWindowPeer, "splitwindow" ), uno::UNO_QUERY );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     SplitWindow* pSplitWindow = dynamic_cast< SplitWindow* >( VCLUnoHelper::GetWindow( m_xPanelWindow ));
 
     if ( pSplitWindow )
@@ -86,3 +86,5 @@ Panel::~Panel()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panel.hxx b/framework/source/layoutmanager/panel.hxx
index e183c97ed5da..1401374f123d 100755..100644
--- a/framework/source/layoutmanager/panel.hxx
+++ b/framework/source/layoutmanager/panel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ class Panel
 }
 
 #endif // __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panelmanager.cxx b/framework/source/layoutmanager/panelmanager.cxx
index 4fd0a733b5a7..0aa9dce6934c 100755..100644
--- a/framework/source/layoutmanager/panelmanager.cxx
+++ b/framework/source/layoutmanager/panelmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,7 +93,7 @@ bool PanelManager::createPanels()
 {
     if ( m_xFrame.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         uno::Reference< awt::XWindow > xWindow( m_xFrame->getContainerWindow(), uno::UNO_QUERY );
         if ( xWindow.is() )
         {
@@ -181,3 +182,5 @@ throw (uno::RuntimeException)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panelmanager.hxx b/framework/source/layoutmanager/panelmanager.hxx
index fd3e892414fa..280925f4eb6c 100755..100644
--- a/framework/source/layoutmanager/panelmanager.hxx
+++ b/framework/source/layoutmanager/panelmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ class PanelManager : private ThreadHelpBase // Struct for right initalization of
 } // namespace framework
 
 #endif // __FRAMEWORK_LAYOUTMANAGER_PANELMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 2f66699de459..dafaa415ed37 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,6 +97,8 @@ ToolbarLayoutManager::ToolbarLayoutManager(
 
 ToolbarLayoutManager::~ToolbarLayoutManager()
 {
+    delete m_pGlobalSettings;
+    delete m_pAddonOptions;
 }
 
 //---------------------------------------------------------------------------------------------------------
@@ -293,7 +296,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
     aRowColumnSizes[nCurrDockingArea].clear();
     aRowColumnSizes[nCurrDockingArea].push_back( 0 );
 
-    for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ )
+    for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); ++pConstIter )
     {
         uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY );
         if ( xUIElement.is() )
@@ -302,7 +305,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
             uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
             if ( xWindow.is() && xDockWindow.is() )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
 
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                 if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible )
@@ -475,7 +478,7 @@ bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL )
     bool bMustBeDestroyed( rResourceURL.indexOf( aAddonTbResourceName ) != 0 );
 
     WriteGuard aWriteLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == rResourceURL )
         {
@@ -552,7 +555,7 @@ void ToolbarLayoutManager::destroyToolbars()
     aWriteLock.unlock();
 
     UIElementVector::iterator pIter;
-    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
     {
         uno::Reference< lang::XComponent > xComponent( pIter->m_xUIElement, uno::UNO_QUERY );
         if ( xComponent.is() )
@@ -564,7 +567,7 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
     if ( pWindow )
     {
@@ -576,6 +579,7 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL )
         aUIElement.m_bVisible = true;
         implts_writeWindowStateData( aUIElement );
         implts_setToolbar( aUIElement );
+        implts_sortUIElements();
         return true;
     }
 
@@ -586,7 +590,7 @@ bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
     if ( pWindow )
     {
@@ -617,9 +621,9 @@ void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars )
     implts_getUIElementVectorCopy( aUIElementVector );
 
     UIElement aUIElement;
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     UIElementVector::iterator pIter;
-    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
     {
         if ( implts_readWindowStateData( pIter->m_aName, aUIElement ) &&
              ( pIter->m_bVisible != aUIElement.m_bVisible ) && !pIter->m_bMasterHide )
@@ -640,9 +644,9 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible )
     UIElementVector aUIElementVector;
     implts_getUIElementVectorCopy( aUIElementVector );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     UIElementVector::iterator pIter;
-    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
     {
         Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
         if ( pWindow && pIter->m_bFloating )
@@ -663,9 +667,9 @@ void ToolbarLayoutManager::setVisible( bool bVisible )
     UIElementVector aUIElementVector;
     implts_getUIElementVectorCopy( aUIElementVector );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     UIElementVector::iterator pIter;
-    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
     {
         pIter->m_bMasterHide = !bVisible;
         Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
@@ -712,7 +716,7 @@ bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui:
                     ToolBox* pToolBox( 0 );
 
                     {
-                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         pWindow = VCLUnoHelper::GetWindow( xWindow );
                         if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
                         {
@@ -730,7 +734,7 @@ bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui:
                         // we have to find a good place for it.
                         ::Size aSize;
 
-                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         {
                             if ( pToolBox )
                                 aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) );
@@ -779,7 +783,7 @@ bool ToolbarLayoutManager::dockAllToolbars()
 
     ReadGuard aReadLock( m_aLock );
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() &&
              pIter->m_bFloating && pIter->m_bVisible )
@@ -826,7 +830,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
                 ::std::vector< uno::Reference< ui::XUIFunctionListener > > aListenerArray;
                 UIElementVector::iterator pIter;
 
-                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
                 {
                     if ( pIter->m_xUIElement.is() )
                     {
@@ -914,7 +918,7 @@ void ToolbarLayoutManager::setParentWindow(
 
     if ( xParentWindow.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         ::DockingAreaWindow* pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) );
         if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP );
         pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ) );
@@ -1044,7 +1048,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
                 if ( xWindow.is() )
                 {
                     // Set generic title for add-on toolbar
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if ( pWindow->GetText().Len() == 0 )
                         pWindow->SetText( aGenericAddonTitle );
@@ -1193,7 +1197,7 @@ void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbx
 
         if ( aTitle && xUIElement.is() )
         {
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
 
             Window* pWindow = getWindowFromXUIElement( xUIElement );
             if ( pWindow  )
@@ -1213,11 +1217,11 @@ void ToolbarLayoutManager::implts_reparentToolbars()
     Window* pRightDockWindow  = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
     aWriteLock.unlock();
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( pContainerWindow )
     {
         UIElementVector::iterator pIter;
-        for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+        for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
         {
             uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement );
             if ( xUIElement.is() )
@@ -1334,7 +1338,7 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b
             // set toolbar menu style according to customize command state
             SvtCommandOptions aCmdOptions;
 
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
             if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
             {
@@ -1396,7 +1400,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
     if ( xDockWindow.is() && xWindow.is() )
     {
         {
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             pWindow = VCLUnoHelper::GetWindow( xWindow );
             if ( pWindow )
             {
@@ -1422,7 +1426,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
         {
             if ( pWindow )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 String aText = pWindow->GetText();
                 if ( aText.Len() == 0 )
                     pWindow->SetText( rElement.m_aUIName );
@@ -1449,7 +1453,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
                 if( pToolBox )
                 {
                     // set an optimal initial floating size
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     ::Size aSize( pToolBox->CalcFloatingWindowSizePixel() );
                     pToolBox->SetOutputSizePixel( aSize );
                 }
@@ -1469,7 +1473,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
                 implts_writeWindowStateData( rElement );
             if ( bShowElement && pWindow )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             }
         }
@@ -1482,7 +1486,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
 
             if ( pToolBox )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea )  );
                 pToolBox->SetLineCount( 1 );
                 xDockWindow->setFloatingMode( sal_False );
@@ -1504,7 +1508,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
 
             if ( pWindow )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 if ( !bShowElement )
                     pWindow->Hide();
             }
@@ -1802,7 +1806,7 @@ UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName )
     UIElementVector::iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == aName )
             return *pIter;
@@ -1826,7 +1830,7 @@ UIElement ToolbarLayoutManager::implts_findToolbar( const uno::Reference< uno::X
     UIElementVector::const_iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
         {
@@ -1848,7 +1852,7 @@ uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const ::
     uno::Reference< awt::XWindow > xWindow;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
         {
@@ -1922,7 +1926,7 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement )
     Window* pContainerWindow( 0 );
     if ( xContainerWindow.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
         if ( pContainerWindow )
             aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos );
@@ -1938,7 +1942,7 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement )
 
     // Try to find a cascaded position for the new floating window
     UIElementVector::const_iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
         {
@@ -1946,7 +1950,7 @@ void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement )
             uno::Reference< awt::XWindow > xWindow( xDockWindow, uno::UNO_QUERY );
             if ( xDockWindow.is() && xDockWindow->isFloating() )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                 if ( pWindow && pWindow->IsVisible() )
                 {
@@ -1977,7 +1981,7 @@ void ToolbarLayoutManager::implts_sortUIElements()
 
     // We have to reset our temporary flags.
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
         pIter->m_bUserActive = sal_False;
     aWriteLock.unlock();
 }
@@ -2021,7 +2025,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD
     aWindowVector.reserve(m_aUIElements.size());
     xDockAreaWindow = m_xDockAreaWindows[eDockingArea];
     UIElementVector::iterator   pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating )
         {
@@ -2205,7 +2209,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
     ReadGuard aReadLock( m_aLock );
     UIElementVector::iterator   pIter;
     UIElementVector::iterator   pEnd = m_aUIElements.end();
-    for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != pEnd; ++pIter )
     {
         if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea )
         {
@@ -2217,7 +2221,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
                 uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
                 if ( xWindow.is() )
                 {
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
                     if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating )
@@ -2321,7 +2325,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
         aReadLock.unlock();
 
         // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
 
         // Retrieve output size from container Window
         if ( pDockingAreaWindow && pContainerWindow )
@@ -2422,7 +2426,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre
 
     {
         // Retrieve output size from container Window
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         pDockingWindow  = VCLUnoHelper::GetWindow( xDockingWindow );
         if ( pDockingWindow )
             aDockingWinSize = pDockingWindow->GetOutputSizePixel();
@@ -2637,7 +2641,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
             awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i];
             ::Size          aMinSize;
 
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             {
                 uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
                 Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
@@ -2698,7 +2702,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
 
     sal_Int32 nCurrPos( 0 );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     for ( sal_uInt32 i = 0; i < nCount; i++ )
     {
         uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
@@ -2773,7 +2777,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
 
     {
         // Retrieve output size from container Window
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         pContainerWindow  = VCLUnoHelper::GetWindow( xContainerWindow );
         aContainerWinSize = pContainerWindow->GetOutputSizePixel();
     }
@@ -2801,7 +2805,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
     aReadLock.unlock();
 
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
         pDockWindow        = VCLUnoHelper::GetWindow( xWindow );
         if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX )
@@ -2853,7 +2857,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
 
             {
                 // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
             }
 
@@ -2952,7 +2956,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
                             // Set virtual position
                             sal_Int32 nPosY( 0 );
                             {
-                                vos::OGuard aGuard( Application::GetSolarMutex() );
+                                SolarMutexGuard aGuard;
                                 nPosY = pDockingAreaWindow->ScreenToOutputPixel(
                                                     pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y();
                             }
@@ -3076,7 +3080,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
             rTrackingRect.setWidth( nSize );
 
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 nPosX = pDockingAreaWindow->ScreenToOutputPixel(
                                     pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X();
             }
@@ -3122,7 +3126,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
             rTrackingRect.setHeight( nSize );
 
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 nPosY = pDockingAreaWindow->ScreenToOutputPixel(
                                     pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y();
             }
@@ -3237,7 +3241,7 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d
         Window* pDockingAreaWindow( 0 );
         Window* pContainerWindow( 0 );
         {
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
             pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
             nDockPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( ::Point( 0, nPosY ))).Y();
@@ -3276,7 +3280,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData(
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) && ( pIter->m_aName != rUIElement.m_aName ))
         {
@@ -3431,7 +3435,7 @@ throw (uno::RuntimeException)
     Window* pWindow( 0 );
     ::Point aMousePos;
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
         aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y ));
     }
@@ -3452,7 +3456,8 @@ throw (uno::RuntimeException)
             aUIElement.m_aFloatingData.m_aPos  = ::Point( aPos.X, aPos.Y );
             aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height );
 
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
+
             pWindow = VCLUnoHelper::GetWindow( xWindow );
             if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
             {
@@ -3498,7 +3503,7 @@ throw (uno::RuntimeException)
     {
         try
         {
-            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
 
             sal_Int16 eDockingArea( -1 ); // none
             sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK );
@@ -3524,7 +3529,6 @@ throw (uno::RuntimeException)
             ::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone ));
 
             Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
-            Window* pDockingAreaWindow( 0 );
             ::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )));
 
             if ( aHotZoneTopDockRect.IsInside( aMousePos ))
@@ -3558,25 +3562,21 @@ throw (uno::RuntimeException)
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_TOP;
                     aUIDockingElement.m_bFloating = false;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xTopDockingWindow );
                 }
                 else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_BOTTOM;
                     aUIDockingElement.m_bFloating = false;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xBottomDockingWindow );
                 }
                 else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_LEFT;
                     aUIDockingElement.m_bFloating = false;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xLeftDockingWindow );
                 }
                 else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_RIGHT )
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_RIGHT;
                     aUIDockingElement.m_bFloating = false;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xRightDockingWindow );
                 }
 
                 ::Point aOutputPos = pContainerWindow->ScreenToOutputPixel( aTrackingRect.TopLeft() );
@@ -3701,7 +3701,7 @@ throw (uno::RuntimeException)
 
     if ( bDockingInProgress )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         Window*  pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY ));
         ToolBox* pToolBox = 0;
         if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
@@ -3763,7 +3763,7 @@ throw (uno::RuntimeException)
             if ( xDockWindow->isFloating() )
             {
                 {
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
                     {
@@ -3801,7 +3801,7 @@ throw (uno::RuntimeException)
     uno::Reference< awt::XWindow2 > xWindow;
 
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         xWindow = uno::Reference< awt::XWindow2 >( e.Source, uno::UNO_QUERY );
         pWindow = VCLUnoHelper::GetWindow( xWindow );
 
@@ -3822,7 +3822,7 @@ throw (uno::RuntimeException)
             implts_setLayoutInProgress( true );
             if ( aUIDockingElement.m_bFloating )
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 if ( pToolBox )
                 {
                     pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines );
@@ -3862,7 +3862,7 @@ throw (uno::RuntimeException)
                     ::Size  aSize;
 
                     {
-                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         if ( pToolBox )
                             aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) );
                         else
@@ -3873,7 +3873,7 @@ throw (uno::RuntimeException)
                     aUIDockingElement.m_aDockedData.m_aPos = aDockPos;
                 }
 
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 if ( pToolBox )
                 {
                     pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
@@ -3900,7 +3900,7 @@ throw (uno::RuntimeException)
     }
     else
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if ( pToolBox )
         {
             if ( aUIDockingElement.m_bFloating )
@@ -3924,7 +3924,7 @@ throw (uno::RuntimeException)
     UIElementVector::iterator pIter;
 
     WriteGuard aWriteLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement );
         if ( xUIElement.is() )
@@ -4009,7 +4009,7 @@ throw (uno::RuntimeException)
                 catch ( lang::WrappedTargetException& ) {}
 
                 {
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     Window* pWindow = getWindowFromXUIElement( xUIElement );
                     if ( pWindow  )
                         pWindow->SetText( aUIName );
@@ -4118,7 +4118,7 @@ uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolb
     {
         sal_uInt32 nCount(0);
         UIElementVector::iterator pIter;
-        for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+        for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
         {
             if ( pIter->m_xUIElement.is() )
             {
@@ -4234,7 +4234,7 @@ awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResource
 {
     Window* pWindow = implts_getWindow( rResourceURL );
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( pWindow )
     {
         ::Size    aSize = pWindow->GetSizePixel();
@@ -4311,3 +4311,5 @@ void ToolbarLayoutManager::setToolbarPosSize( const ::rtl::OUString& rResourceUR
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index df6b36020f93..440b333f4f34 100755..100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -342,3 +343,5 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
 } // namespace framework
 
 #endif // __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx
index 722ca164f2b5..ac3dd6bf1ac0 100644
--- a/framework/source/layoutmanager/uielement.cxx
+++ b/framework/source/layoutmanager/uielement.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -157,3 +158,5 @@ UIElement& UIElement::operator= ( const UIElement& rUIElement )
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 768edf4dd2f4..e4f73e58c16f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,22 +32,14 @@
 // includes of own project
 #include <loadenv/loadenv.hxx>
 
-#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_
 #include <loadenv/targethelper.hxx>
-#endif
 #include <framework/framelistanalyzer.hxx>
 
-#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_
 #include <constant/frameloader.hxx>
-#endif
 
-#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_
 #include <constant/contenthandler.hxx>
-#endif
 
-#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_
 #include <constant/containerquery.hxx>
-#endif
 #include <interaction/quietinteraction.hxx>
 #include <threadhelp/writeguard.hxx>
 #include <threadhelp/readguard.hxx>
@@ -96,9 +89,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/syswin.hxx>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <unotools/moduleoptions.hxx>
 #include <svtools/sfxecode.hxx>
 #include <unotools/processfactory.hxx>
@@ -158,9 +149,7 @@ class LoadEnvListener : private ThreadHelpBase
             throw(css::uno::RuntimeException);
 };
 
-/*-----------------------------------------------
-    14.10.2003 13:43
------------------------------------------------*/
+
 LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
     throw(LoadEnvException, css::uno::RuntimeException)
     : ThreadHelpBase(     )
@@ -170,17 +159,13 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& x
 {
 }
 
-/*-----------------------------------------------
-    14.10.2003 13:43
------------------------------------------------*/
+
 LoadEnv::~LoadEnv()
 {
     m_pCheck = 0;
 }
 
-/*-----------------------------------------------
-    10.09.2003 14:05
------------------------------------------------*/
+
 css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >&    xLoader,
                                                                            const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR  ,
                                                                            const ::rtl::OUString&                                        sURL   ,
@@ -214,13 +199,13 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
         {
             case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
                     throw css::lang::IllegalArgumentException(
-                            ::rtl::OUString::createFromAscii("Optional list of arguments seem to be corrupted."),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Optional list of arguments seem to be corrupted.")),
                             xLoader,
                             4);
 
             case LoadEnvException::ID_UNSUPPORTED_CONTENT:
                     throw css::lang::IllegalArgumentException(
-                            ::rtl::OUString::createFromAscii("URL seems to be an unsupported one."),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL seems to be an unsupported one.")),
                             xLoader,
                             1);
 
@@ -250,9 +235,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
     return lDescriptor;
 }
 
-/*-----------------------------------------------
-    20.08.2003 09:49
------------------------------------------------*/
+
 void LoadEnv::initializeLoading(const ::rtl::OUString&                                           sURL            ,
                                 const css::uno::Sequence< css::beans::PropertyValue >&           lMediaDescriptor,
                                 const css::uno::Reference< css::frame::XFrame >&                 xBaseFrame      ,
@@ -335,9 +318,7 @@ void LoadEnv::initializeLoading(const ::rtl::OUString&
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    22.01.2010
------------------------------------------------*/
+
 void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rSMGR,
                                     ::comphelper::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode,
                                     QuietInteraction** o_ppQuietInteraction )
@@ -386,9 +367,7 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMulti
         io_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode;
 }
 
-/*-----------------------------------------------
-    15.08.2003 08:16
------------------------------------------------*/
+
 void LoadEnv::startLoading()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
@@ -439,7 +418,6 @@ void LoadEnv::startLoading()
 }
 
 /*-----------------------------------------------
-    15.08.2003 09:50
     TODO
         First draft does not implement timeout using [ms].
         Current implementation counts yield calls only ...
@@ -480,9 +458,7 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    20.08.2003 10:00
------------------------------------------------*/
+
 void LoadEnv::cancelLoading()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
@@ -524,9 +500,7 @@ void LoadEnv::cancelLoading()
     // <- PARTIAL(!) SAFE ------------------------------
 }
 
-/*-----------------------------------------------
-    14.08.2003 13:33
------------------------------------------------*/
+
 css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const
 {
     // SAFE ->
@@ -535,9 +509,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const
     // <- SAFE
 }
 
-/*-----------------------------------------------
-    14.08.2003 13:35
------------------------------------------------*/
+
 css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
 {
     // SAFE ->
@@ -558,9 +530,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
     // <- SAFE
 }
 
-/*-----------------------------------------------
-    15.08.2003 11:15
------------------------------------------------*/
+
 void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&)
     throw(css::uno::RuntimeException)
 {
@@ -575,9 +545,7 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    14.10.2003 12:23
------------------------------------------------*/
+
 void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&)
     throw(css::uno::RuntimeException)
 {
@@ -592,9 +560,7 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    14.10.2003 12:23
------------------------------------------------*/
+
 void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -624,9 +590,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    14.10.2003 12:24
------------------------------------------------*/
+
 void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
     throw(css::uno::RuntimeException)
 {
@@ -641,9 +605,7 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    14.10.2003 12:20
------------------------------------------------*/
+
 void LoadEnv::impl_setResult(sal_Bool bResult)
 {
     // SAFE -> ----------------------------------
@@ -663,7 +625,6 @@ void LoadEnv::impl_setResult(sal_Bool bResult)
 }
 
 /*-----------------------------------------------
-    06.02.2004 14:03
     TODO: Is it a good idea to change Sequence<>
           parameter to stl-adapter?
 -----------------------------------------------*/
@@ -752,17 +713,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
     css::uno::Reference< css::container::XEnumeration >    xSet        ;
     css::uno::Sequence< ::rtl::OUString >                  lTypesReg(1);
 
-    /*
-    //-------------------------------------------
-    lQuery[0].Name    = ::framework::constant::Filter::PROP_TYPE;
-    lQuery[0].Value <<= sType;
-
-    xContainer = css::uno::Reference< css::container::XContainerQuery >(xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY);
-    xSet       = xContainer->createSubSetEnumerationByProperties(lQuery);
-    // at least one registered frame loader is enough!
-    if (xSet->hasMoreElements())
-        return E_CAN_BE_LOADED;
-    */
 
     //-------------------------------------------
     // (iii) If a FrameLoader service (or at least
@@ -820,14 +770,12 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
     return E_UNSUPPORTED_CONTENT;
 }
 
-/*-----------------------------------------------
-    03.11.2003 09:31
------------------------------------------------*/
+
 void LoadEnv::impl_detectTypeAndFilter()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
-    static ::rtl::OUString TYPEPROP_PREFERREDFILTER = ::rtl::OUString::createFromAscii("PreferredFilter");
-    static ::rtl::OUString FILTERPROP_FLAGS         = ::rtl::OUString::createFromAscii("Flags"          );
+    static ::rtl::OUString TYPEPROP_PREFERREDFILTER(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"));
+    static ::rtl::OUString FILTERPROP_FLAGS        (RTL_CONSTASCII_USTRINGPARAM("Flags"));
     static sal_Int32       FILTERFLAG_TEMPLATEPATH  = 16;
 
     // SAFE ->
@@ -927,9 +875,7 @@ void LoadEnv::impl_detectTypeAndFilter()
     }
 }
 
-/*-----------------------------------------------
-    15.08.2003 09:38
------------------------------------------------*/
+
 sal_Bool LoadEnv::impl_handleContent()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
@@ -1011,9 +957,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
     {
         css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
                                 xSMGR,
-                                ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"),
-                                ::rtl::OUString::createFromAscii("Misc"),
-                                ::rtl::OUString::createFromAscii("MaxOpenDocuments"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
                                 ::comphelper::ConfigurationHelper::E_READONLY);
 
         // NIL means: count of allowed documents = infinite !
@@ -1218,9 +1164,7 @@ sal_Bool LoadEnv::impl_loadContent()
     return sal_False;
 }
 
-/*-----------------------------------------------
-    06.02.2004 14:40
------------------------------------------------*/
+
 css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
 {
     // SAFE -> -----------------------------------
@@ -1286,9 +1230,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
     return css::uno::Reference< css::uno::XInterface >();
 }
 
-/*-----------------------------------------------
-    24.01.2006 15:11
------------------------------------------------*/
+
 void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& xFrame,
                               const css::util::URL&                            aURL  )
 {
@@ -1306,7 +1248,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
     // <- SAFE
 
     css::util::URL aCmd;
-    aCmd.Complete = ::rtl::OUString::createFromAscii(".uno:JumpToMark");
+    aCmd.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:JumpToMark"));
 
     css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW);
     xParser->parseStrict(aCmd);
@@ -1316,13 +1258,11 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
         return;
 
     ::comphelper::SequenceAsHashMap lArgs;
-    lArgs[::rtl::OUString::createFromAscii("Bookmark")] <<= aURL.Mark;
+    lArgs[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"))] <<= aURL.Mark;
     xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList());
 }
 
-/*-----------------------------------------------
-    31.07.2003 09:02
------------------------------------------------*/
+
 css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
@@ -1468,9 +1408,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
     return xResult;
 }
 
-/*-----------------------------------------------
-    30.03.2004 09:12
------------------------------------------------*/
+
 sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const
 {
     css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY);
@@ -1485,9 +1423,7 @@ sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< c
     return xLock->isActionLocked();
 }
 
-/*-----------------------------------------------
-    30.03.2004 09:12
------------------------------------------------*/
+
 css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
@@ -1619,9 +1555,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
     return xTask;
 }
 
-/*-----------------------------------------------
-    15.08.2003 12:39
------------------------------------------------*/
+
 void LoadEnv::impl_reactForLoadingState()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
@@ -1641,7 +1575,7 @@ void LoadEnv::impl_reactForLoadingState()
 
         if (bMinimized)
         {
-            ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
             // check for system window is neccessary to guarantee correct pointer cast!
             if (pWindow && pWindow->IsSystemWindow())
@@ -1740,9 +1674,7 @@ void LoadEnv::impl_reactForLoadingState()
     // <- SAFE ----------------------------------
 }
 
-/*-----------------------------------------------
-    16.01.2005 13:04
------------------------------------------------*/
+
 void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow      ,
                                                 sal_Bool bForceToFront)
 {
@@ -1752,16 +1684,16 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
-    ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if ( pWindow )
     {
         bool bForceFrontAndFocus(false);
         css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey(
             xSMGR,
-            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
-            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
-            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
             ::comphelper::ConfigurationHelper::E_READONLY);
         a >>= bForceFrontAndFocus;
 
@@ -1770,41 +1702,12 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
         else
             pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
     }
-
-/* #i19976#
-    We tried to prevent a toFront() call in case the user putted the
-    loading document into the background ..
-    But we had several errors trying that. So we decided to
-    rollback these changes and bring the new loaded document to front hardly !
-
-    css::uno::Reference< css::awt::XWindow2 > xWindow2(xWindow, css::uno::UNO_QUERY);
-
-    sal_Bool bIsVisible = sal_False;
-    if (xWindow2.is())
-        bIsVisible = xWindow2->isVisible(); // TODO is parent visible too ? .-)
-
-    if (!bIsVisible)
-    {
-        xWindow->setVisible(sal_True);
-        bForceToFront = sal_True;
-    }
-
-    if (
-        (bForceToFront  ) &&
-        (xTopWindow.is())
-       )
-    {
-        xTopWindow->toFront();
-    }
-*/
 }
 
-/*-----------------------------------------------
-    15.03.2005 11:12
------------------------------------------------*/
+
 void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
-    static ::rtl::OUString PACKAGE_SETUP_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
+    static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
 
     // no window -> action not possible
     if (!xWindow.is())
@@ -1820,9 +1723,12 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
        return;
 
     // SOLAR SAFE ->
-    ::vos::OClearableGuard aSolarLock1(Application::GetSolarMutex());
+    SolarMutexClearableGuard aSolarGuard1;
 
     Window*  pWindow       = VCLUnoHelper::GetWindow(xWindow);
+    if (!pWindow)
+        return;
+
     sal_Bool bSystemWindow = pWindow->IsSystemWindow();
     sal_Bool bWorkWindow   = (pWindow->GetType() == WINDOW_WORKWINDOW);
 
@@ -1834,7 +1740,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
     if (pWorkWindow->IsMinimized())
         return;
 
-    aSolarLock1.clear();
+    aSolarGuard1.clear();
     // <- SOLAR SAFE
 
     // SAFE ->
@@ -1876,7 +1782,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
         if (sWindowState.getLength())
         {
             // SOLAR SAFE ->
-            ::vos::OClearableGuard aSolarLock2(Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
 
             // We have to retrieve the window pointer again. Because nobody can guarantee
             // that the XWindow was not disposed inbetween .-)
@@ -1889,8 +1795,6 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
 
             SystemWindow* pSystemWindow = (SystemWindow*)pWindowCheck;
             pSystemWindow->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8));
-
-            aSolarLock2.clear();
             // <- SOLAR SAFE
         }
     }
@@ -1902,3 +1806,4 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx
index 6abd17aa0efa..d761556e744e 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 //_______________________________________________
 // own includes
 
-#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_
 #include <loadenv/targethelper.hxx>
-#endif
 
 //_______________________________________________
 // namespace
@@ -107,3 +106,5 @@ sal_Bool TargetHelper::isValidNameForFrame(const ::rtl::OUString& sName)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx b/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx
new file mode 100644
index 000000000000..e03073db53a1
--- /dev/null
+++ b/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#define XK_MISCELLANY
+#define XK_LATIN1
+#define XK_PUBLISHING
+
+#include <X11/Xlib.h>
+#include <X11/keysymdef.h>
+
+#include <glib.h>
+
+#include <com/sun/star/awt/Key.hpp>
+
+using namespace ::com::sun::star;
+
+KeySym MapAwtToXKey (guint16 aKeyCode);
+
+gchar*
+AwtKeyToDbusmenuString (guint16 aKeyCode)
+{
+    KeySym code = (KeySym)0;
+
+    if (!aKeyCode)
+        return NULL;
+
+    //We try the consecutive ranges first, if the code is not there
+    //we use MapAwtToXKey(), se below
+    if (aKeyCode >= awt::Key::A && aKeyCode <= awt::Key::Z)
+        code = (KeySym)aKeyCode - (KeySym)awt::Key::A + XK_A;
+    else if (aKeyCode >= awt::Key::F1 && aKeyCode <= awt::Key::F26)
+        code = (KeySym)aKeyCode - (KeySym)awt::Key::F1 + XK_F1;
+    else if (aKeyCode >= awt::Key::NUM0 && aKeyCode <= awt::Key::NUM9)
+        code = (KeySym)aKeyCode - (KeySym)awt::Key::NUM0 + XK_0;
+    else
+        code = MapAwtToXKey (aKeyCode);
+
+    if (code == 0)
+        return NULL;
+
+    return XKeysymToString (code);;
+}
+
+
+//This is a 1-1 mapper between com::sun::star::awt:Key values and X11 KeySyms
+//note that some symbols are missing
+KeySym
+MapAwtToXKey (guint16 aKeyCode)
+{
+    switch (aKeyCode)
+    {
+        case awt::Key::UP:
+            return XK_Up;
+        case awt::Key::DOWN:
+            return XK_Down;
+        case awt::Key::LEFT:
+            return XK_Left;
+        case awt::Key::RIGHT:
+            return XK_Right;
+        case awt::Key::HOME:
+            return XK_Home;
+        case awt::Key::END:
+            return XK_End;
+        case awt::Key::PAGEUP:
+            return XK_Page_Up;
+        case awt::Key::PAGEDOWN:
+            return XK_Page_Down;
+        case awt::Key::RETURN:
+            return XK_Return;
+        case awt::Key::ESCAPE:
+            return XK_Escape;
+        case awt::Key::TAB:
+            return XK_Tab;
+        case awt::Key::BACKSPACE:
+            return XK_BackSpace;
+        case awt::Key::SPACE:
+            return XK_space;
+        case awt::Key::INSERT:
+            return XK_Insert;
+        case awt::Key::DELETE:
+            return XK_Delete;
+        case awt::Key::ADD:
+            return XK_plus;
+        case awt::Key::SUBTRACT:
+            return XK_minus;
+        case awt::Key::MULTIPLY:
+            return XK_asterisk;
+        case awt::Key::DIVIDE:
+            return XK_slash;
+        case awt::Key::POINT:
+            return XK_period;
+        case awt::Key::COMMA:
+            return XK_comma;
+        case awt::Key::LESS:
+            return XK_less;
+        case awt::Key::GREATER:
+            return XK_greater;
+        case awt::Key::EQUAL:
+            return XK_equal;
+        case awt::Key::UNDO:
+            return XK_Undo;
+        case awt::Key::REPEAT:
+            return XK_Redo;
+        case awt::Key::FIND:
+            return XK_Find;
+        case awt::Key::DECIMAL:
+            return XK_decimalpoint;
+        case awt::Key::TILDE:
+            return XK_asciitilde;
+        case awt::Key::QUOTELEFT:
+            return XK_leftsinglequotemark;
+        //Sun keys and other unsupported symbols
+        case awt::Key::OPEN:
+        case awt::Key::CUT:
+        case awt::Key::COPY:
+        case awt::Key::PASTE:
+        case awt::Key::PROPERTIES:
+        case awt::Key::FRONT:
+        case awt::Key::CONTEXTMENU:
+        case awt::Key::HELP:
+        case awt::Key::MENU:
+        default:
+            return 0;
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx b/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx
new file mode 100644
index 000000000000..80f2f7f71c5f
--- /dev/null
+++ b/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef __AWT_KEY_TO_DBUSMENU_STRING_HXX__
+#define __AWT_KEY_TO_DBUSMENU_STRING_HXX__
+#include <X11/X.h>
+#include <glib.h>
+
+gchar*
+AwtKeyToDbusmenuString (guint16 aKeyCode);
+
+
+#endif //__AWT_KEY_TO_DBUSMENU_STRING_HXX__
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/DesktopJob.cxx b/framework/source/lomenubar/DesktopJob.cxx
new file mode 100644
index 000000000000..da49d2abbf11
--- /dev/null
+++ b/framework/source/lomenubar/DesktopJob.cxx
@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "DesktopJob.hxx"
+#include "FrameJob.hxx"
+
+#include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#include <libdbusmenu-glib/server.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
+
+#include <rtl/process.h>
+#include <osl/diagnose.h>
+#include <cppuhelper/implbase1.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/document/EventObject.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/XFramesSupplier.hpp>
+#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
+
+using rtl::OUString;
+using com::sun::star::beans::XPropertySet;
+using com::sun::star::beans::NamedValue;
+using com::sun::star::document::XEventListener;
+using com::sun::star::document::XEventBroadcaster;
+using com::sun::star::frame::XFrame;
+using com::sun::star::frame::XFramesSupplier;
+using com::sun::star::frame::XFrameActionListener;
+using com::sun::star::frame::XModel;
+using com::sun::star::frame::XLayoutManager;
+using com::sun::star::frame::FrameActionEvent;
+using com::sun::star::frame::XFrameActionListener;
+using com::sun::star::lang::IllegalArgumentException;
+using com::sun::star::lang::XMultiServiceFactory;
+using com::sun::star::lang::EventObject;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::Exception;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::RuntimeException;
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::uno::UNO_QUERY_THROW;
+using com::sun::star::uno::XInterface;
+
+//-------------------------- D-Bus Callbacks ----------------------------------
+static void
+on_bus (GDBusConnection * /*connection*/,
+        const gchar * /*name*/,
+        gpointer /*user_data*/)
+{
+    //TODO: Should we actually do something here?
+    return;
+}
+
+static void
+name_lost (GDBusConnection * /*connection*/, const gchar * name, gpointer /*user_data*/)
+{
+    g_error ("Unable to get name '%s' on DBus", name);
+    return;
+}
+
+// --------------------------- DesktopJob ----------------------------------
+Any SAL_CALL DesktopJob::execute( const Sequence< NamedValue >& /*aArguments*/ )
+    throw ( IllegalArgumentException, Exception, RuntimeException )
+{
+    g_type_init ();
+
+    g_bus_own_name(G_BUS_TYPE_SESSION,
+               LIBREOFFICE_BUSNAME,
+               G_BUS_NAME_OWNER_FLAGS_NONE,
+               on_bus,
+               NULL,
+               name_lost,
+               NULL,
+               NULL);
+
+    return Any ();
+}
+
+OUString
+DesktopJob_getImplementationName ()
+    throw (RuntimeException)
+{
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( DESKTOPJOB_IMPLEMENTATION_NAME ) );
+}
+
+sal_Bool SAL_CALL
+DesktopJob_supportsService( const OUString& ServiceName )
+    throw (RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( DESKTOPJOB_SERVICE_NAME ) );
+}
+
+Sequence< OUString > SAL_CALL
+DesktopJob_getSupportedServiceNames(  )
+    throw (RuntimeException)
+{
+    Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( DESKTOPJOB_SERVICE_NAME ) );
+    return aRet;
+}
+
+Reference< XInterface > SAL_CALL
+DesktopJob_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+    throw( Exception )
+{
+    return (cppu::OWeakObject*) new DesktopJob(rSMgr);
+}
+
+// XServiceInfo
+OUString SAL_CALL
+DesktopJob::getImplementationName()
+    throw (RuntimeException)
+{
+    return DesktopJob_getImplementationName();
+}
+
+sal_Bool SAL_CALL
+DesktopJob::supportsService( const OUString& rServiceName )
+    throw (RuntimeException)
+{
+    return DesktopJob_supportsService( rServiceName );
+}
+
+Sequence< OUString > SAL_CALL
+DesktopJob::getSupportedServiceNames()
+    throw (RuntimeException)
+{
+    return DesktopJob_getSupportedServiceNames();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/DesktopJob.hxx b/framework/source/lomenubar/DesktopJob.hxx
new file mode 100644
index 000000000000..3df7819b930b
--- /dev/null
+++ b/framework/source/lomenubar/DesktopJob.hxx
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef __DESKTOP_JOB_HXX__
+#define __DESKTOP_JOB_HXX__
+
+#include <glib.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase2.hxx>
+
+#define LIBREOFFICE_BUSNAME            "org.libreoffice.dbusmenu"
+#define DESKTOPJOB_IMPLEMENTATION_NAME "org.libreoffice.comp.framework.lomenubar.DesktopJob"
+#define DESKTOPJOB_SERVICE_NAME        "com.sun.star.task.Job"
+
+namespace css = ::com::sun::star;
+using css::uno::Reference;
+using css::uno::Sequence;
+using css::uno::Any;
+using css::uno::Exception;
+using css::uno::RuntimeException;
+using css::lang::IllegalArgumentException;
+
+class DesktopJob : public cppu::WeakImplHelper2 < css::task::XJob, css::lang::XServiceInfo >
+{
+ private:
+    Reference< css::lang::XMultiServiceFactory >  mxMSF;
+
+ public:
+    DesktopJob( const Reference< css::lang::XMultiServiceFactory > &rxMSF)
+          : mxMSF( rxMSF ) {}
+
+    virtual ~DesktopJob() {}
+
+    // XJob
+    virtual Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& Arguments)
+        throw (IllegalArgumentException, Exception, RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (RuntimeException);
+
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        throw (RuntimeException);
+
+    virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+        throw (RuntimeException);
+};
+
+
+::rtl::OUString
+DesktopJob_getImplementationName()
+    throw ( RuntimeException );
+
+sal_Bool SAL_CALL
+DesktopJob_supportsService( const ::rtl::OUString& ServiceName )
+    throw ( RuntimeException );
+
+Sequence< ::rtl::OUString > SAL_CALL
+DesktopJob_getSupportedServiceNames()
+    throw ( RuntimeException );
+
+Reference< css::uno::XInterface >
+SAL_CALL DesktopJob_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
+    throw ( Exception );
+
+#endif //__DESKTOP_JOB_HXX__
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx
new file mode 100644
index 000000000000..8153ad6fa9df
--- /dev/null
+++ b/framework/source/lomenubar/FrameHelper.cxx
@@ -0,0 +1,865 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "FrameHelper.hxx"
+#include "AwtKeyToDbusmenuString.hxx"
+#include "MenuItemInfo.hxx"
+#include "MenuItemStatusListener.hxx"
+
+#include <boost/foreach.hpp>
+
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/SystemDependentXWindow.hpp>
+#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/awt/Key.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MenuEvent.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/awt/XPopupMenu.hpp>
+#include <com/sun/star/awt/XMenuExtended.hpp>
+#include <com/sun/star/awt/XMenuListener.hpp>
+#include <com/sun/star/awt/XPopupMenuExtended.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchHelper.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XPopupMenuController.hpp>
+#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/frame/FrameActionEvent.hpp>
+#include <com/sun/star/lang/SystemDependent.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <rtl/process.h>
+
+#include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#include <libdbusmenu-glib/client.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
+#include <libdbusmenu-gtk/menuitem.h>
+
+using rtl::OUString;
+using rtl::OString;
+using rtl::OUStringToOString;
+
+using namespace ::com::sun::star;
+
+using com::sun::star::awt::KeyEvent;
+using com::sun::star::awt::MenuEvent;
+using com::sun::star::awt::SystemDependentXWindow;
+using com::sun::star::awt::XMenuListener;
+using com::sun::star::awt::XMenuExtended;
+using com::sun::star::awt::XMenuListener;
+using com::sun::star::awt::MenuEvent;
+using com::sun::star::awt::XPopupMenu;
+using com::sun::star::awt::XPopupMenuExtended;
+using com::sun::star::awt::XSystemDependentWindowPeer;
+using com::sun::star::awt::XWindow2;
+using com::sun::star::beans::XPropertySet;
+using com::sun::star::beans::PropertyValue;
+using com::sun::star::container::XNameAccess;
+using com::sun::star::container::NoSuchElementException;
+using com::sun::star::frame::XController;
+using com::sun::star::frame::XComponentLoader;
+using com::sun::star::frame::XDispatch;
+using com::sun::star::frame::XDispatchProvider;
+using com::sun::star::frame::XDispatchHelper;
+using com::sun::star::frame::XModel;
+using com::sun::star::frame::XModuleManager;
+using com::sun::star::frame::XLayoutManager;
+using com::sun::star::frame::XPopupMenuController;
+using com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW;
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::uno::UNO_QUERY_THROW;
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::XComponentContext;
+using com::sun::star::uno::XInterface;
+using com::sun::star::ui::XUIElement;
+using com::sun::star::ui::XUIConfigurationManager;
+using com::sun::star::ui::XUIConfigurationManagerSupplier;
+using com::sun::star::ui::XAcceleratorConfiguration;
+using com::sun::star::ui::XModuleUIConfigurationManagerSupplier;
+using com::sun::star::util::URL;
+using com::sun::star::util::XURLTransformer;
+
+
+namespace
+{
+    static Sequence<Any> lcl_initArgs(const OUString& sModuleName, const Reference<XFrame> xFrame)
+    {
+        // These are the arguments needed for the XPopupMenuController
+        Sequence<Any> aResult(2);
+        PropertyValue item;
+
+        item.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleName"));
+        item.Value <<= sModuleName;
+        aResult[0] <<= item;
+
+        item.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Frame"));
+        item.Value <<= xFrame;
+        aResult[1] <<= item;
+        return aResult;
+    };
+
+    struct DispatchConnection
+    {
+        Reference<XDispatch> m_xDispatch;
+        URL m_aUrl;
+        DispatchConnection(Reference<XDispatch> xDispatch, URL aUrl)
+            : m_xDispatch(xDispatch), m_aUrl(aUrl)
+        {}
+    };
+}
+
+namespace framework { namespace lomenubar
+{
+    class DispatchRegistry
+    {
+        private:
+            ::std::vector<DispatchConnection> m_vDispatchConnections;
+            const Reference<XStatusListener> m_xStatusListener;
+        public:
+            DispatchRegistry(const Reference<XStatusListener> xStatusListener)
+                : m_xStatusListener(xStatusListener)
+            {}
+            ~DispatchRegistry()
+            {
+                BOOST_FOREACH(const DispatchConnection& rConnection, m_vDispatchConnections)
+                {
+                    rConnection.m_xDispatch->removeStatusListener(m_xStatusListener, rConnection.m_aUrl);
+                }
+            }
+            void Connect(Reference<XDispatch> xDispatch, URL aURL)
+            {
+                const DispatchConnection connection(xDispatch, aURL);
+                m_vDispatchConnections.push_back(connection);
+                xDispatch->addStatusListener(m_xStatusListener, aURL);
+            }
+    };
+}}
+
+// ------------------------ Item callbacks ---------------------------
+// Item activated. It distpatches the command associated to a given menu item.
+void
+item_activated (DbusmenuMenuitem *item, guint /*timestamp*/, gpointer user_data)
+{
+    FrameHelper *helper =  (FrameHelper*)user_data;
+    OUString command = OUString::createFromAscii(dbusmenu_menuitem_property_get (item, "CommandURL"));
+    helper->dispatchCommand (command);
+}
+
+// Rebuilds the submenu
+gboolean
+item_about_to_show (DbusmenuMenuitem *item, gpointer user_data)
+{
+    //Get the XMenu interface for the MenuBar UIElement
+    FrameHelper *helper = (FrameHelper*)user_data;
+    Reference < XFrame > xFrame  = helper->getFrame ();
+    Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
+    Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+                                                UNO_QUERY);
+    Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
+                                     UNO_QUERY);
+    Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
+
+    if (!menuPropSet.is ())
+    {
+        return FALSE;
+    }
+
+    Reference < XMenu > xMenu(menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
+                              UNO_QUERY);
+    if (!xMenu.is())
+    {
+        return FALSE;
+    }
+
+    //Find xMenu for the first level item
+    Reference < XMenu > xSubMenu;
+    Reference < XMenuExtended > xMenuEx (xMenu, UNO_QUERY);
+    guint16 root_count = xMenu->getItemCount();
+    for (guint16 i = 0; i<root_count ;i++)
+    {
+
+        guint16 id = xMenu->getItemId (i);
+        if (id == 0)
+            continue;
+
+        OUString command = xMenuEx->getCommand (id);
+
+        //We must find the element with the same command URL
+        if (! OUString::createFromAscii (dbusmenu_menuitem_property_get (item, "CommandURL")).equals (command))
+            continue;
+
+        Reference <XPopupMenu> subPopup (xMenu->getPopupMenu (id), UNO_QUERY);
+        xSubMenu = Reference <XMenu> (subPopup, UNO_QUERY);
+        break;
+    }
+
+    //We only do this for toplevel items
+    if (xSubMenu.is ())
+    {
+        helper->rebuildMenu (xSubMenu, item);
+        return FALSE;
+    }
+
+    //If it is not a toplevel item we stop trying to rebuild
+    return TRUE;
+}
+
+void
+destroy_menuitem (gpointer data)
+{
+    g_object_unref (G_OBJECT (data));
+}
+
+void
+destroy_menu_item_info (gpointer data)
+{
+    delete (MenuItemInfo*)data;
+}
+
+// ------------------------ FrameHelper Class -------------------------------
+FrameHelper::FrameHelper(const Reference< XMultiServiceFactory >&  rServiceManager,
+                         const Reference< XFrame >&        xFrame,
+                         DbusmenuServer*                   server)
+    : m_xStatusListener(new MenuItemStatusListener(this))
+    , m_pDispatchRegistry(new framework::lomenubar::DispatchRegistry(m_xStatusListener))
+    , m_xMSF(rServiceManager)
+    , m_xTrans(m_xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer" ))), UNO_QUERY)
+    , m_xMM(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"))),UNO_QUERY)
+    , m_xPCF(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.PopupMenuControllerFactory"))), UNO_QUERY)
+    , m_xFrame(xFrame)
+    , m_xdp(xFrame, UNO_QUERY)
+    , m_args(lcl_initArgs(m_xMM->identify(xFrame), xFrame))
+    , m_server(server)
+    , m_root(NULL)
+    , m_watcher_set(FALSE)
+    , m_blockDetach(FALSE)
+{
+
+    //Get xUICommands database (to retrieve labels, see FrameJob::getLabelFromCommandURL ())
+    Reference < XNameAccess > xNameAccess (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription"))),
+                                           UNO_QUERY);
+    xNameAccess->getByName(m_xMM->identify(xFrame)) >>= m_xUICommands;
+
+
+    // This initializes the shortcut database
+    getAcceleratorConfigurations (xFrame->getController()->getModel (), m_xMM);
+
+    // This is a hash table that maps Command URLs to MenuItemInfo classes
+    //   to cache command information
+    m_commandsInfo = g_hash_table_new_full (g_str_hash,
+                                          g_str_equal,
+                                          g_free,
+                                          destroy_menu_item_info);
+
+}
+
+void SAL_CALL
+FrameHelper::disposing (const EventObject& /*aEvent*/ ) throw (RuntimeException)
+{}
+
+FrameHelper::~FrameHelper()
+{
+    ::boost::scoped_ptr< ::framework::lomenubar::DispatchRegistry>().swap(m_pDispatchRegistry);
+    if (m_server)
+        g_object_unref (m_server);
+
+    if (m_watcher_set)
+        g_bus_unwatch_name (m_watcher);
+
+    g_hash_table_destroy (m_commandsInfo);
+}
+
+void
+FrameHelper::setRootItem (DbusmenuMenuitem *root)
+{
+    this->m_root = root;
+}
+
+void
+FrameHelper::setRegistrarWatcher (guint watcher)
+{
+    m_watcher_set = TRUE;
+    this->m_watcher = watcher;
+}
+
+void
+FrameHelper::setServer (DbusmenuServer *server)
+{
+    this->m_server = server;
+}
+
+//Getters
+Reference < XFrame >
+FrameHelper::getFrame ()
+{
+    return m_xFrame;
+}
+
+GHashTable*
+FrameHelper::getCommandsInfo ()
+{
+    return m_commandsInfo;
+}
+
+unsigned long
+FrameHelper::getXID ()
+{
+    Reference< XSystemDependentWindowPeer > xWin( m_xFrame->getContainerWindow(), UNO_QUERY );
+
+    if (!xWin.is())
+        return 0;
+
+    sal_Int8 processID[16];
+    rtl_getGlobalProcessId( (sal_uInt8*)processID );
+    Sequence <signed char> pidSeq (processID, 16);
+
+    SystemDependentXWindow xWindow;
+    xWin->getWindowHandle (pidSeq, SYSTEM_XWINDOW) >>= xWindow;
+
+    return xWindow.WindowHandle;
+}
+
+void SAL_CALL
+FrameHelper::frameAction(const FrameActionEvent& action) throw (RuntimeException)
+{
+    //If theh component is detached from the frame, remove this action listener,
+    //it is then disposed and destroyed by the frame. We deregister the window
+    //from the AppMenu Registrar
+
+    //This is a special case, .uno:printPreview detaches the component but we are
+    //not actually switching to another document.
+    if (m_blockDetach)
+    {
+        m_blockDetach = TRUE;
+        return;
+    }
+
+    if (action.Action == frame::FrameAction_COMPONENT_DETACHING)
+    {
+        GError *error = NULL;
+
+
+        m_xFrame->removeFrameActionListener (this);
+        Reference< XPropertySet > frameProps (m_xFrame, UNO_QUERY);
+        Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+                                                    UNO_QUERY);
+        xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
+
+        unsigned long xid = getXID();
+
+        GDBusProxy *proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                           G_DBUS_PROXY_FLAGS_NONE,
+                                                           NULL,
+                                                           "com.canonical.AppMenu.Registrar",
+                                                           "/com/canonical/AppMenu/Registrar",
+                                                           "com.canonical.AppMenu.Registrar",
+                                                           NULL,
+                                                           &error);
+        if (error)
+        {
+            g_warning ("Couldn't get /com/canonical/AppMenu/Registrar proxy");
+            g_error_free (error);
+            return;
+        }
+
+        //TODO: Check if window is registered already
+        g_dbus_proxy_call_sync (proxy,
+                                "UnregisterWindow",
+                                g_variant_new ("(u)", (guint32)xid),
+                                G_DBUS_CALL_FLAGS_NONE,
+                                -1,
+                                NULL,
+                                &error);
+
+        if (error)
+        {
+            g_warning ("Couldn't call /com/canonical/AppMenu/Registrar.UnregisterWindow");
+            g_error_free (error);
+        }
+
+        if (m_server)
+        {
+            g_object_unref (m_server);
+            m_server = NULL;
+            m_root = NULL;
+        }
+
+        if (m_watcher_set)
+        {
+            g_bus_unwatch_name (m_watcher);
+            m_watcher_set = FALSE;
+        }
+
+        return;
+    }
+}
+
+//This function rebuilds (or builds from scratch) a DbusmenuMenuitem structure
+//from a given pair of XMenu/Dbusmenuitem.
+void
+FrameHelper::rebuildMenu (Reference < XMenu >  xMenu,
+                          DbusmenuMenuitem    *parent)
+{
+    g_return_if_fail (parent != NULL);
+    GList *items = dbusmenu_menuitem_get_children (parent);
+    guint nitems = g_list_length (items);   //number of available Dbusmenuitems
+    guint16 count = xMenu->getItemCount (); //number of real menu items
+
+    // One item does not represent always the same command.
+    // We do this for performance reasons, as it's really hard to match a command with
+    // a single dbusmenuitem given the lack of information provided by the status listener
+    if (count > nitems)
+    {
+        // Add enough Dbusmenuitems to replicate all
+        for (guint16 i = 0; i < (count - nitems); i++)
+        {
+            DbusmenuMenuitem *item = dbusmenu_menuitem_new ();
+            dbusmenu_menuitem_child_append (parent, item);
+            g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(item_activated), this);
+        }
+        items = dbusmenu_menuitem_get_children (parent);
+    }
+    if (count < nitems)
+    {
+        // If there is an excess of Dbusmenuitems we make them invisible
+        for (guint16 i = nitems - 1; i >= count; i--)
+        {
+            DbusmenuMenuitem *item = DBUSMENU_MENUITEM (g_list_nth_data(items, i));
+            dbusmenu_menuitem_property_set_bool (item, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+        }
+    }
+
+    for (guint16 i = 0; i<count; i++)
+    {
+        Reference < XMenuExtended > xMenuEx (xMenu, UNO_QUERY);
+        guint16 id = xMenu->getItemId (i);
+        OUString oUCommand = xMenuEx->getCommand (id);
+        OString command = OUStringToOString (oUCommand, RTL_TEXTENCODING_ASCII_US);
+
+        DbusmenuMenuitem *item = DBUSMENU_MENUITEM(g_list_nth_data(items, i));
+
+        if (!item)
+            continue;
+
+        if (!DBUSMENU_IS_MENUITEM (item))
+            continue;
+
+        // We drop the WindowList, doesn't work properly and it's useless anyhow
+        if (oUCommand.equals (OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:WindowList"))))
+            continue;
+
+        //We set the default properties (in case it was not visible or a separator)
+        dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_DEFAULT);
+        dbusmenu_menuitem_property_set_bool (item, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+
+        if (id == 0)
+        {
+            dbusmenu_menuitem_property_set (item, "CommandURL", "slot:0");
+            dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+            //Getting rid of any possible children
+            g_list_free_full (dbusmenu_menuitem_take_children (item), destroy_menuitem);
+            continue;
+        }
+
+        //Setting the command
+        dbusmenu_menuitem_property_set (item, "CommandURL", command.getStr());
+
+        //Getting a shortcut
+        KeyEvent kev = findShortcutForCommand (oUCommand);
+
+        if (kev.KeyCode != 0)  //KeyCode must have a value
+        {
+            GVariantBuilder builder;
+            const gchar* keystring = AwtKeyToDbusmenuString(kev.KeyCode);
+
+            g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
+            //We map KeyEvent.Modifiers with Dbusmenu modifiers strings
+            if (awt::KeyModifier::SHIFT & kev.Modifiers)
+                g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_SHIFT);
+            if (awt::KeyModifier::MOD2 & kev.Modifiers)
+                g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_ALT);
+            if (awt::KeyModifier::MOD1 & kev.Modifiers || awt::KeyModifier::MOD3 & kev.Modifiers)
+                g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_CONTROL);
+
+            g_variant_builder_add(&builder, "s", keystring);
+
+            GVariant * inside = g_variant_builder_end(&builder);
+            g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+            g_variant_builder_add_value(&builder, inside);
+
+            GVariant * outsidevariant = g_variant_builder_end(&builder);
+            dbusmenu_menuitem_property_set_variant(item, DBUSMENU_MENUITEM_PROP_SHORTCUT, outsidevariant);
+        }
+
+        // Lookup for a MenuItemInfo object for this menuitem, create one if it doesn't exist
+        // this object caches the values that change on status updates.
+        MenuItemInfo* commInfo = (MenuItemInfo*)g_hash_table_lookup (m_commandsInfo, (gconstpointer)command.getStr());
+        if (!commInfo)
+        {
+            commInfo = new MenuItemInfo ();
+            g_hash_table_insert (m_commandsInfo, g_strdup (command.getStr()), commInfo);
+
+            OUString oULabel = getLabelFromCommandURL(oUCommand);
+            if (oULabel.getLength() == 0)
+            {
+                oULabel = xMenu->getItemText (id);
+            }
+
+            //Replace tilde with underscore for Dbusmenu Alt accelerators
+            oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
+            // GLib behaves better than OUStringToOString wrt encoding transformation
+            gchar* label = g_utf16_to_utf8 (oULabel.getStr(),
+                                            oULabel.getLength(),
+                                            NULL, NULL, NULL);
+            commInfo->setLabel (label);
+            g_free (label);
+        }
+
+        //Update the check state directly from the data, this is more reliable
+        Reference < XPopupMenu > popUp (xMenu, UNO_QUERY);
+        if (popUp.is() && popUp->isItemChecked (id))
+        {
+            commInfo->setCheckState (DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED);
+        }
+
+        dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_LABEL, commInfo->getLabel ());
+        dbusmenu_menuitem_property_set_bool (item, DBUSMENU_MENUITEM_PROP_ENABLED, commInfo->getEnabled ());
+
+        //TODO: Find a selection of which commands are radio toggle type
+        if (commInfo->getCheckState () != DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN)
+        {
+            dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,  commInfo->getCheckType ());
+            dbusmenu_menuitem_property_set_int (item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, commInfo->getCheckState ());
+        }
+
+        // Adding status listener
+        URL commandURL;
+        commandURL.Complete = oUCommand;
+        m_xTrans->parseStrict (commandURL);
+
+        Reference < XDispatch > xDispatch = m_xdp->queryDispatch (commandURL, OUString(), 0);
+        if(xDispatch.is())
+            m_pDispatchRegistry->Connect(xDispatch, commandURL);
+
+        Reference < XPopupMenu > subPopMenu (xMenu->getPopupMenu (id), UNO_QUERY);
+
+        //Some menus do not provide the information available through the normal XMenu interface,
+        //we need to access that info through a special XPopupMenuController
+        if (isSpecialSubmenu (oUCommand))
+        {
+            Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY);
+            Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))),
+                                                    UNO_QUERY);
+
+            Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(oUCommand,
+                                                                                                 m_args,
+                                                                                                 xContext),
+                                                     UNO_QUERY);
+
+            Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXPopupMenu"))),
+                                          UNO_QUERY);
+
+            if (xRFC.is () && xPO.is ())
+            {
+                xRFC->setPopupMenu (xPO);
+                xRFC->updatePopupMenu ();
+                Reference < XMenu > subMenu (xPO, UNO_QUERY);
+                rebuildMenu (subMenu, item);
+            }
+            else if (subPopMenu.is ())
+            {
+                Reference <XMenu> subMenu (subPopMenu, UNO_QUERY);
+                rebuildMenu (subMenu, item);
+            }
+        }
+
+        // Introspect submenus
+        else if (subPopMenu.is ())
+        {
+            Reference <XMenu> subMenu (subPopMenu, UNO_QUERY);
+            g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW, G_CALLBACK(item_about_to_show), this);
+            rebuildMenu (subMenu, item);
+        }
+        else
+        {
+            //Getting rid of any possible children
+            g_list_free_full (dbusmenu_menuitem_take_children (item), destroy_menuitem);
+        }
+    }
+
+    return;
+}
+
+//Gets the menu item Label given a CommandURL
+//This is a work around for bug: https://bugs.freedesktop.org/show_bug.cgi?id=34127
+OUString
+FrameHelper::getLabelFromCommandURL (OUString commandURL)
+{
+    OUString label;
+
+    Sequence < PropertyValue > commandProps;
+
+    if (commandURL.getLength () < 1)
+        return label;
+
+    if (!m_xUICommands.is())
+        return label;
+
+    try
+    {
+        m_xUICommands->getByName (commandURL) >>= commandProps;
+    }
+    catch (com::sun::star::container::NoSuchElementException e)
+    {
+        return label;
+    }
+
+    for (sal_Int32 i = 0; i < commandProps.getLength(); i++)
+    {
+        if ( commandProps[i].Name.equalsAsciiL (RTL_CONSTASCII_STRINGPARAM ("Label")))
+        {
+            commandProps[i].Value >>= label;
+            label = label.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
+            //break;
+        }
+    }
+
+    return label;
+}
+
+//This method is a facility to bootstrap the Dbusmenuitem strcuture from the menubar
+void
+FrameHelper::rebuildMenuFromRoot ()
+{
+    Reference < XFrame >         xFrame = getFrame ();
+    Reference < XPropertySet >   frameProps     (xFrame, UNO_QUERY);
+    Reference < XLayoutManager > xLayoutManager (frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+                                                 UNO_QUERY);
+    Reference < XUIElement >   menuBar     (xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
+                                            UNO_QUERY);
+    Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
+
+    if (!menuPropSet.is ())
+        return;
+
+    Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
+                               UNO_QUERY);
+    if (!xMenu.is ())
+        return;
+
+    rebuildMenu (xMenu, m_root);
+}
+
+//Some menus are special, this is the list of them
+gboolean
+FrameHelper::isSpecialSubmenu (OUString command)
+{
+    const gchar * specialSubmenus[11] = {".uno:CharFontName",
+                                         ".uno:FontHeight",
+                                         ".uno:ObjectMenue",
+                                         ".uno:InsertPageHeader",
+                                         ".uno:InsertPageFooter",
+                                         ".uno:ChangeControlType",
+                                         ".uno:AvailableToolbars",
+                                         ".uno:ScriptOrganizer",
+                                         ".uno:RecentFileList",
+                                         ".uno:AddDirect",
+                                         ".uno:AutoPilotMenu"};
+
+    for (gint i = 0; i < 11; i++)
+    {
+        if (command.equals (OUString::createFromAscii (specialSubmenus[i])))
+            return TRUE;
+    }
+    return FALSE;
+}
+
+void
+FrameHelper::dispatchCommand (OUString command)
+{
+    OUString target = OUString(RTL_CONSTASCII_USTRINGPARAM(""));
+    Reference < XDispatchHelper > xdh (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))),
+                                       UNO_QUERY);
+
+    // This is a special case, we don't want the helper to be disconnected from the frame
+    // when PrintPreview dettaches. See the frameAction method.
+    if (command.equals (OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintPreview"))))
+    {
+        m_blockDetach = TRUE;
+    }
+
+    // This is a special case for the recentfilelist
+    if (command.matchAsciiL ("vnd.sun.star.popup:RecentFileList", 33, 0))
+    {
+        target = OUString(RTL_CONSTASCII_USTRINGPARAM("_default"));
+
+        Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY);
+        Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))),
+                                                UNO_QUERY);
+        Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:RecentFileList")),
+                                                                                             m_args,
+                                                                                             xContext),
+                                                 UNO_QUERY);
+        Reference < XMenuListener > xML (xRFC, UNO_QUERY);
+
+        Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXPopupMenu"))),
+                                      UNO_QUERY);
+
+        if (xRFC.is () && xPO.is ())
+        {
+            xRFC->setPopupMenu (xPO);
+            xRFC->updatePopupMenu ();
+            Reference < XMenu > subMenu (xPO, UNO_QUERY);
+            Reference < XMenuExtended > subMenuEx (xPO, UNO_QUERY);
+
+            //We need to find the item idd
+            for (int i = 0; i < subMenu->getItemCount (); i++)
+            {
+                int id = subMenu->getItemId (i);
+
+                if (subMenuEx->getCommand (id).equals (command))
+                {
+                    MenuEvent mev;
+                    mev.MenuId = id;
+
+                    xML->select (mev);
+                }
+            }
+        }
+
+        return;
+    }
+
+    if (command.matchAsciiL ("private:factory/", 16, 0))
+        target = OUString(RTL_CONSTASCII_USTRINGPARAM("_blank"));
+
+    xdh->executeDispatch (Reference < XDispatchProvider > (m_xFrame, UNO_QUERY),
+                          command,
+                          target,
+                          0,
+                          Sequence < PropertyValue > ());
+}
+
+//Set all the accelerator configuration sources
+void
+FrameHelper::getAcceleratorConfigurations (Reference < XModel >        xModel,
+                                           Reference < XModuleManager> xModuleManager)
+{
+    //Get document shortcut database
+    Reference< XUIConfigurationManagerSupplier > docUISupplier(xModel, UNO_QUERY);
+    Reference< XUIConfigurationManager >         docUIManager = docUISupplier->getUIConfigurationManager();
+    Reference< XAcceleratorConfiguration >       docAccelConf(docUIManager->getShortCutManager(), UNO_QUERY);
+    this->m_docAccelConf = docAccelConf;
+
+    //Get module shurtcut database
+    Reference< XModuleUIConfigurationManagerSupplier > modUISupplier(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),
+                                                                     UNO_QUERY);
+    Reference< XUIConfigurationManager >   modUIManager = modUISupplier->getUIConfigurationManager(xModuleManager->identify(m_xFrame));
+    Reference< XAcceleratorConfiguration > modAccelConf(modUIManager->getShortCutManager(), UNO_QUERY);
+    this->m_modAccelConf = modAccelConf;
+
+    //Get global shortcut database
+    Reference< XAcceleratorConfiguration > globAccelConf(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.GlobalAcceleratorConfiguration"))),
+                                                         UNO_QUERY);
+    this->m_globAccelConf = globAccelConf;
+}
+
+
+//This function finds a KeyEvent with the shortcut information for each command
+KeyEvent
+FrameHelper::findShortcutForCommand (OUString command)
+
+{
+    KeyEvent kev;
+
+    Sequence < OUString > commands (1);
+    commands[0] = command;
+
+    try
+    {
+        Sequence < Any > evs = m_docAccelConf->getPreferredKeyEventsForCommandList (commands);
+
+        for (int j = 0; j < evs.getLength (); j++)
+        {
+            KeyEvent ev;
+            if (evs[j] >>= ev)
+                return ev;
+        }
+    }
+    catch (...)
+    {}
+    try
+    {
+        Sequence < Any > evs = m_modAccelConf->getPreferredKeyEventsForCommandList (commands);
+
+        for (int j = 0; j < evs.getLength (); j++)
+        {
+            KeyEvent ev;
+            if (evs[j] >>= ev)
+                return ev;
+        }
+    }
+    catch (...)
+    {}
+    try
+    {
+        Sequence < Any > evs = m_globAccelConf->getPreferredKeyEventsForCommandList (commands);
+
+        for (int j = 0; j < evs.getLength (); j++)
+        {
+            KeyEvent ev;
+            if (evs[j] >>= ev)
+                return ev;
+        }
+    }
+    catch (...)
+    {}
+
+    //NOTE: For some reason this item does not return its shortcut. Setting manually:
+    if (command.equals (OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:HelpIndex"))))
+    {
+        kev.KeyCode = awt::Key::F1;
+    }
+
+    return kev;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx
new file mode 100644
index 000000000000..056dc1ec0169
--- /dev/null
+++ b/framework/source/lomenubar/FrameHelper.hxx
@@ -0,0 +1,157 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef __FRAME_HELPER_HXX__
+#define __FRAME_HELPER_HXX__
+
+#include <vector>
+
+#include <boost/scoped_ptr.hpp>
+
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/XMenu.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/frame/XFramesSupplier.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <cppuhelper/implbase1.hxx>
+
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#include <libdbusmenu-glib/server.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
+#include <libdbusmenu-glib/menuitem.h>
+
+using com::sun::star::awt::KeyEvent;
+using com::sun::star::awt::XMenu;
+using com::sun::star::beans::PropertyValue;
+using com::sun::star::container::XNameAccess;
+using com::sun::star::frame::FrameActionEvent;
+using com::sun::star::frame::XFrame;
+using com::sun::star::frame::XFramesSupplier;
+using com::sun::star::frame::XFrameActionListener;
+using com::sun::star::frame::XStatusListener;
+using com::sun::star::frame::XDispatchProvider;
+using com::sun::star::frame::XModuleManager;
+using com::sun::star::frame::XModel;
+using com::sun::star::lang::EventObject;
+using com::sun::star::lang::XMultiServiceFactory;
+using com::sun::star::lang::XMultiComponentFactory;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::RuntimeException;
+using com::sun::star::util::XURLTransformer;
+using com::sun::star::ui::XAcceleratorConfiguration;
+using rtl::OUString;
+
+
+namespace framework { namespace lomenubar
+{
+    class DispatchRegistry;
+}}
+
+/* This class is a helper in charge of closing the dbusmenu server when a frame is closed,
+ * and also allows the menuitem callbacks to dispatch commands.
+ */
+
+class FrameHelper : public cppu::WeakImplHelper1 < XFrameActionListener >
+{
+  private:
+    const Reference < XStatusListener > m_xStatusListener;
+    ::boost::scoped_ptr< ::framework::lomenubar::DispatchRegistry> m_pDispatchRegistry;
+    const Reference < XMultiServiceFactory > m_xMSF;
+    const Reference < XURLTransformer > m_xTrans;
+    const Reference < XModuleManager> m_xMM;
+    const Reference < XMultiComponentFactory > m_xPCF;
+    const Reference < XFrame > m_xFrame;
+    const Reference < XDispatchProvider > m_xdp;
+    const Sequence < Any > m_args;
+    Reference < XNameAccess >           m_xUICommands;
+    DbusmenuServer                     *m_server;
+    DbusmenuMenuitem                   *m_root;
+    gboolean                            m_watcher_set;
+    guint                               m_watcher;
+    GHashTable                         *m_commandsInfo;
+    //This variable prevents the helper from being disconnected from the frame
+    //for special cases of component dettaching like print preview
+    gboolean                            m_blockDetach;
+
+
+    gboolean                             isSpecialSubmenu (OUString command);
+
+    //This is to build the shortcut database
+    Reference< XAcceleratorConfiguration > m_docAccelConf;
+    Reference< XAcceleratorConfiguration > m_modAccelConf;
+    Reference< XAcceleratorConfiguration > m_globAccelConf;
+
+    void getAcceleratorConfigurations (Reference < XModel >,
+                                       Reference < XModuleManager>);
+
+    KeyEvent findShortcutForCommand  (OUString);
+
+  public:
+    FrameHelper(const Reference< XMultiServiceFactory >&,
+                const Reference< XFrame >&,
+                DbusmenuServer*);
+
+    virtual ~FrameHelper();
+    virtual void SAL_CALL frameAction(const FrameActionEvent& action)
+      throw (RuntimeException);
+
+    virtual void SAL_CALL disposing(const EventObject& aEvent)
+      throw (RuntimeException);
+
+    //Setters
+    void setRootItem         (DbusmenuMenuitem *);
+    void setRegistrarWatcher (guint watcher);
+    void setServer           (DbusmenuServer *);
+
+    //Getters
+    Reference < XFrame > getFrame               ();
+    unsigned long        getXID                 ();
+    GHashTable*          getCommandsInfo        ();
+    ::rtl::OUString      getLabelFromCommandURL (::rtl::OUString);
+
+    //Menu Related actions
+    void dispatchCommand     (OUString);
+    void rebuildMenu         (Reference < XMenu >, DbusmenuMenuitem*);
+    void rebuildMenuFromRoot ();
+    void populateWindowList  (DbusmenuMenuitem *);
+};
+#endif // __FRAME_HELPER_HXX__
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
new file mode 100644
index 000000000000..06af9394222f
--- /dev/null
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -0,0 +1,399 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "FrameJob.hxx"
+#include "DesktopJob.hxx"
+#include "FrameHelper.hxx"
+
+#define OBJ_PATH_PREFIX "/com/canonical/menu/"
+
+#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
+#include <com/sun/star/awt/SystemDependentXWindow.hpp>
+#include <com/sun/star/awt/XMenu.hpp>
+#include <com/sun/star/awt/XMenuExtended.hpp>
+#include <com/sun/star/awt/XMenuBar.hpp>
+#include <com/sun/star/awt/XPopupMenu.hpp>
+#include <com/sun/star/awt/XPopupMenuExtended.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XDispatchHelper.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/SystemDependent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIElementSettings.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+
+#include <iostream>
+#include <fstream>
+
+#include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-glib/client.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
+
+#include <rtl/process.h>
+#include <osl/diagnose.h>
+
+using rtl::OUString;
+using rtl::OString;
+using rtl::OUStringToOString;
+
+using com::sun::star::awt::KeyEvent;
+using com::sun::star::awt::SystemDependentXWindow;
+using com::sun::star::awt::XMenu;
+using com::sun::star::awt::XMenuExtended;
+using com::sun::star::awt::XPopupMenu;
+using com::sun::star::awt::XPopupMenuExtended;
+using com::sun::star::awt::XMenuBar;
+using com::sun::star::awt::XSystemDependentWindowPeer;
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::WeakReference;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::UNO_QUERY;
+using com::sun::star::uno::XInterface;
+using com::sun::star::uno::Exception;
+using com::sun::star::uno::RuntimeException;
+using com::sun::star::uno::XInterface;
+using com::sun::star::lang::IllegalArgumentException;
+using com::sun::star::lang::XMultiServiceFactory;
+using com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW;
+using com::sun::star::lang::EventObject;
+using com::sun::star::beans::NamedValue;
+using com::sun::star::beans::PropertyValue;
+using com::sun::star::beans::XPropertySet;
+using com::sun::star::document::XEventBroadcaster;
+using com::sun::star::frame::XFrame;
+using com::sun::star::frame::XFrameActionListener;
+using com::sun::star::frame::FrameActionEvent;
+using com::sun::star::frame::XController;
+using com::sun::star::frame::XLayoutManager;
+using com::sun::star::frame::XModel;
+using com::sun::star::frame::XModuleManager;
+using com::sun::star::frame::XDispatch;
+using com::sun::star::frame::XDispatchProvider;
+using com::sun::star::frame::XDispatchHelper;
+using com::sun::star::frame::XStatusListener;
+using com::sun::star::frame::FeatureStateEvent;
+using com::sun::star::ui::XUIElement;
+using com::sun::star::ui::XUIElementSettings;
+using com::sun::star::ui::XUIConfigurationManagerSupplier;
+using com::sun::star::ui::XUIConfigurationManager;
+using com::sun::star::ui::XModuleUIConfigurationManagerSupplier;
+using com::sun::star::ui::XAcceleratorConfiguration;
+using com::sun::star::util::URL;
+using com::sun::star::util::XURLTransformer;
+using com::sun::star::container::XIndexContainer;
+using com::sun::star::container::XIndexAccess;
+using com::sun::star::container::XNameAccess;
+using com::sun::star::container::NoSuchElementException;
+
+
+// This is a helper utility to transform an xid to a /com/canonical/menu/<XID>
+// DBUS object path
+OString
+xid_to_object_path (unsigned long xid)
+{
+
+    GString *xid_str = g_string_new ("");
+    g_string_printf (xid_str, "%d", (guint32)xid);
+    OString object_path = OUStringToOString (OUString::createFromAscii (OBJ_PATH_PREFIX).concat (OUString::createFromAscii(xid_str->str)),
+                                             RTL_TEXTENCODING_ASCII_US);
+    g_string_free (xid_str, TRUE);
+    return object_path;
+}
+
+//-------------------------- GObject callbacks -------------------------------//
+//This is called when a registrar becomes available. It registers the hides the menubar.
+static void
+on_registrar_available (GDBusConnection * /*connection*/,
+                        const gchar     * /*name*/,
+                        const gchar     * /*name_owner*/,
+                        gpointer         user_data)
+{
+    GError     *error = NULL;
+    GDBusProxy *proxy;
+
+    FrameHelper *helper = (FrameHelper*)user_data;
+    unsigned long xid = helper->getXID();
+
+    proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                           G_DBUS_PROXY_FLAGS_NONE,
+                                           NULL,
+                                           "com.canonical.AppMenu.Registrar",
+                                           "/com/canonical/AppMenu/Registrar",
+                                           "com.canonical.AppMenu.Registrar",
+                                           NULL,
+                                           &error);
+    if (error)
+    {
+        g_warning ("Couldn't get /com/canonical/AppMenu/Registrar proxy");
+        return;
+    }
+
+
+    //TODO: Check if window is registered already
+    g_dbus_proxy_call_sync (proxy,
+                            "RegisterWindow",
+                            g_variant_new ("(uo)",
+                                           (guint32)xid,
+                                           xid_to_object_path (xid).getStr()),
+                            G_DBUS_CALL_FLAGS_NONE,
+                            -1,
+                            NULL,
+                            &error);
+
+    if (error)
+    {
+        g_warning ("Couldn't call /com/canonical/AppMenu/Registrar.RegisterWindow");
+        return;
+    }
+
+    //Hide menubar
+    Reference < XFrame > xFrame  = helper->getFrame ();
+    Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
+    Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+                                                UNO_QUERY);
+    xLayoutManager->hideElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
+
+    return;
+}
+
+//This is called when the registrar becomes unavailable. It shows the menubar.
+static void
+on_registrar_unavailable (GDBusConnection * /*connection*/,
+                          const gchar     * /*name*/,
+                          gpointer         user_data)
+{
+    //TODO: Unregister window?
+
+    // Show menubar
+    FrameHelper *helper = (FrameHelper*)user_data;
+    Reference < XFrame > xFrame  = helper->getFrame ();
+    Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
+    Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+                                                UNO_QUERY);
+    xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
+    return;
+}
+// ------------------------------- FrameJob --------------------------------------------
+Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
+    throw ( IllegalArgumentException, Exception, RuntimeException )
+{
+    Sequence< NamedValue > lEnv;
+    Reference< XModel >    xModel;
+    sal_Int32              len    = aArguments.getLength();
+
+    for (int i = 0; i<len; i++)
+    {
+        if (aArguments[i].Name.equalsAscii("Environment"))
+        {
+            aArguments[i].Value >>= lEnv;
+            break;
+        }
+    }
+
+    len = lEnv.getLength ();
+    for (int i = 0; i<len; i++)
+    {
+        if (lEnv[i].Name.equalsAscii("Model"))
+        {
+            lEnv[i].Value >>= xModel;
+        }
+    }
+
+    //If we didn't get the model we have to quit
+    if (!xModel.is())
+        return Any();
+
+
+    Reference< XController > xController( xModel->getCurrentController(), UNO_QUERY);
+    if (!xController.is())
+        return Any();
+
+    m_xFrame = Reference< XFrame > ( xController->getFrame(), UNO_QUERY);
+    if (!m_xFrame.is ())
+        return Any();
+
+    exportMenus (m_xFrame);
+    return Any();
+}
+
+// This function crates a DbusmenuServer and starts the watcher for the AppMenu Registrar bus name
+void
+FrameJob::exportMenus (Reference < XFrame > xFrame)
+{
+    //Set the xFrame for this object
+
+    this->m_xFrame = xFrame;
+
+    //Create dbusmenu server object path string
+    DbusmenuServer *server = dbusmenu_server_new (xid_to_object_path(getXID (xFrame)).getStr());
+
+
+    Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
+    Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+                                                UNO_QUERY);
+    if (!xLayoutManager.is())
+    {
+        g_object_unref (server);
+        return;
+    }
+
+    Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
+                                     UNO_QUERY);
+    Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
+
+    if (!menuPropSet.is())
+    {
+        g_object_unref (server);
+        return;
+    }
+
+    Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
+                               UNO_QUERY);
+
+    if (!xMenu.is ())
+    {
+        g_object_unref (server);
+        return;
+    }
+
+    //Create a new frame helper to close the server when needed
+    FrameHelper *helper = new FrameHelper (m_xMSF, xFrame, server);
+    xFrame->addFrameActionListener (Reference < XFrameActionListener > (helper));
+
+    //Populate dbusmenu items and start the server
+    DbusmenuMenuitem *root = getRootMenuitem (xMenu, (gpointer)helper);
+    dbusmenu_server_set_root (server, root);
+
+    //Listen to the availability of the registrar
+    guint watcher = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                      "com.canonical.AppMenu.Registrar",
+                                      G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                      on_registrar_available,
+                                      on_registrar_unavailable,
+                                      helper,
+                                      NULL);
+    helper->setRegistrarWatcher (watcher);
+}
+
+
+//Gets the XID for a given XFrame
+unsigned long
+FrameJob::getXID (css::uno::Reference < css::frame::XFrame > xFrame)
+{
+    Reference< XSystemDependentWindowPeer > xWin( xFrame->getContainerWindow(), UNO_QUERY);
+
+    if (!xWin.is())
+        return 0;
+
+    sal_Int8 processID[16];
+    rtl_getGlobalProcessId( (sal_uInt8*)processID );
+    Sequence <signed char> pidSeq (processID, 16);
+
+    SystemDependentXWindow xWindow;
+    xWin->getWindowHandle (pidSeq, SYSTEM_XWINDOW) >>= xWindow;
+
+    return xWindow.WindowHandle;
+}
+
+// Builds a Dbusmenuitem structure from an XMenu object
+DbusmenuMenuitem*
+FrameJob::getRootMenuitem (Reference < XMenu > xMenu, gpointer helper)
+{
+
+    DbusmenuMenuitem *root = dbusmenu_menuitem_new_with_id (0);
+    ((FrameHelper*)helper)->setRootItem(root);
+    ((FrameHelper*)helper)->rebuildMenu (xMenu, root);
+
+    return root;
+}
+
+// XJob
+OUString FrameJob_getImplementationName ()
+    throw (RuntimeException)
+{
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( FRAMEJOB_IMPLEMENTATION_NAME ) );
+}
+
+sal_Bool SAL_CALL FrameJob_supportsService( const OUString& ServiceName )
+    throw (RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( FRAMEJOB_SERVICE_NAME ) );
+}
+
+Sequence< OUString > SAL_CALL FrameJob_getSupportedServiceNames(  )
+    throw (RuntimeException)
+{
+    Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( FRAMEJOB_SERVICE_NAME ) );
+    return aRet;
+}
+
+Reference< XInterface > SAL_CALL FrameJob_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
+    throw( Exception )
+{
+    return (cppu::OWeakObject*) new FrameJob(rSMgr);
+}
+
+// XServiceInfo
+OUString SAL_CALL FrameJob::getImplementationName()
+    throw (RuntimeException)
+{
+    return FrameJob_getImplementationName();
+}
+
+sal_Bool SAL_CALL FrameJob::supportsService( const OUString& rServiceName )
+    throw (RuntimeException)
+{
+    return FrameJob_supportsService( rServiceName );
+}
+
+Sequence< OUString > SAL_CALL FrameJob::getSupportedServiceNames()
+    throw (RuntimeException)
+{
+    return FrameJob_getSupportedServiceNames();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameJob.hxx b/framework/source/lomenubar/FrameJob.hxx
new file mode 100644
index 000000000000..06bbc06a5b55
--- /dev/null
+++ b/framework/source/lomenubar/FrameJob.hxx
@@ -0,0 +1,103 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef __FRAME_JOB_HXX__
+#define __MRAME_JOB_HXX__
+
+#include <com/sun/star/task/XJob.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
+#include <com/sun/star/awt/XMenu.hpp>
+#include <com/sun/star/awt/KeyEvent.hpp>
+
+#include <glib.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#define FRAMEJOB_IMPLEMENTATION_NAME "org.libreoffice.comp.framework.lomenubar.FrameJob"
+#define FRAMEJOB_SERVICE_NAME "com.sun.star.task.Job"
+
+namespace css = ::com::sun::star;
+using css::uno::Reference;
+
+class FrameJob : public cppu::WeakImplHelper2 < css::task::XJob, css::lang::XServiceInfo >
+{
+ private:
+    Reference < css::lang::XMultiServiceFactory > m_xMSF;
+    Reference < css::container::XNameAccess >     m_xUICommands;
+    Reference < css::frame::XFrame >              m_xFrame;
+
+    unsigned long xid;
+
+    //Private methods
+    unsigned long     getXID                       (Reference < css::frame::XFrame >);
+    DbusmenuMenuitem* getRootMenuitem              (Reference < css::awt::XMenu >,
+                                                    gpointer);
+
+ public:
+    FrameJob( const css::uno::Reference< css::lang::XMultiServiceFactory > &rxMSF)
+          : m_xMSF( rxMSF ) {};
+
+    void exportMenus (Reference < css::frame::XFrame > xFrame);
+
+    virtual ~FrameJob() {}
+
+    // XJob
+    virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& Arguments)
+        throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        throw (css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException);
+};
+
+
+::rtl::OUString FrameJob_getImplementationName()
+    throw ( css::uno::RuntimeException );
+
+sal_Bool SAL_CALL FrameJob_supportsService( const ::rtl::OUString& ServiceName )
+    throw ( css::uno::RuntimeException );
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameJob_getSupportedServiceNames()
+    throw ( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface >
+SAL_CALL FrameJob_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
+    throw ( css::uno::Exception );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/HACKING b/framework/source/lomenubar/HACKING
new file mode 100644
index 000000000000..49d016f32c41
--- /dev/null
+++ b/framework/source/lomenubar/HACKING
@@ -0,0 +1,99 @@
+LibreOffice DbusMenu Integration Source Code
+============================================
+There are three main classes, DesktopJob, FrameJob and FrameHelper implemented
+in their respective .cxx/.h files:
+
+- src/DesktopJob.cxx
+- src/DesktopJob.h
+
+- src/FrameJob.cxx
+- src/FrameJob.h
+
+- src/FrameHelper.cxx
+- src/FrameHelper.h
+
+The first two classes are Jobs executed synchronously on two events, the events
+that trigger these jobs are defined in data/Jobs.xcu. Further explanation on
+each class can be found below.
+
+The FrameHelper class performs most of the tasks regarding communication between
+
+The src/export.cxx code is the entry point for the resulting shared object
+that conforms this extension. It exports the information needed to register and
+access all the interfaces implemented by the two jobs exported.
+
+GLib Integration 
+----------------
+This extension assumes the presence of the GLib mainloop in the application,
+it is not recommended its installation on LibreOffice deployments that do not
+provide integration with the glib mainloop.
+
+g_type_init() is called in DesktopJob for safety.
+
+DesktopJob
+----------
+This class is a XJob that is instantiated and executed on LibreOffice startup
+just once during the lifetime of the process.
+
+This class does nothing but trying to acquire the "org.libreoffice.dbusmenu"
+busname. Once the executed method returns the object instance is destroyed.
+
+FrameJob & FrameHelper
+----------------------
+This class is a XJob that is instantiated and executed every time a document is
+created or loaded. It watches for the presence of the
+com.canonical.AppMenu.Registrar well-known D-Bus name.
+
+Afterwards it creates an instance of the FrameHelper class. FrameHelper is an
+XFrameActionListener that subscribes to the XFrame that represents the current
+Window. The lifetime of this FrameHelper is bound to the life of the current
+document being viewed/edited.
+
+FrameHelper creates the initial structure of Dbusmenu menuitems, and the
+dbusmenu server. If FrameHelper is destroyed, the frame is unregistered and
+the server shutdown. It also stops watching com.canonical.AppMenu.Registrar
+presence.
+
+Listening for menu changes - MenuItemInfo & MenuItemStatusListener
+------------------------------------------------------------------
+FrameHelper subscribes creates a cache in the commandsInfo GHashTable property.
+This cache maps each command URL with a MenuItemInfo object that stores the
+current information for a given menu item.
+
+To listen for menu changes and update the cache, FrameHelper creates an instance
+of MenuItemStatusListener per each command url. This listeners update the data
+for the respective MenuItemInfo associated to the command URL it is listening
+for. The source code for these two classes can be found in the following
+respective files:
+
+- src/MenuItemInfo.h
+- src/MenuItemInfo.cxx
+
+- src/MenuItemStatusListener.h
+- src/MenuItemStatusListener.cxx
+
+Special Popup Menus
+-------------------
+This is the set of special popup menus:
+- .uno:CharFontName
+- .uno:FontHeight
+- .uno:ObjectMenue
+- .uno:InsertPageHeader
+- .uno:InsertPageFooter
+- .uno:ChangeControlType
+- .uno:AvailableToolbars
+- .uno:ScriptOrganizer
+- .uno:RecentFileList
+- .uno:AddDirect
+- .uno:AutoPilotMenu
+
+These menus cannot be introspected as they are created dinamically when the user
+clicks on the menu. Therefor they are treated differently, see the usage of
+isSpecialSubmenu in the rebuildMenu method from the FrameHelper class.
+
+In the case of the recent file list, the command URLs provided by this
+workaround are not enough to open the document. A workaround for this is present
+in the FrameHelper::dispatchCommand method.
+
+For further reference on this type of submenus follow this link:
+http://wiki.services.openoffice.org/wiki/Framework/Tutorial/Popup_Menu_Controller
diff --git a/framework/source/lomenubar/Jobs.xcu b/framework/source/lomenubar/Jobs.xcu
new file mode 100644
index 000000000000..de2bb6087691
--- /dev/null
+++ b/framework/source/lomenubar/Jobs.xcu
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <node oor:name="Jobs">
+        <node oor:name="AppMenuDesktopJob" oor:op="replace">
+            <prop oor:name="Service">
+                <value>org.libreoffice.comp.framework.lomenubar.DesktopJob</value>
+            </prop>
+        </node>
+        <node oor:name="AppMenuFrameJob" oor:op="replace">
+            <prop oor:name="Service">
+                <value>org.libreoffice.comp.framework.lomenubar.FrameJob</value>
+            </prop>
+        </node>
+    </node>
+    <node oor:name="Events">
+        <node oor:name="OnStartApp" oor:op="replace">
+            <node oor:name="JobList">
+                <node oor:name="AppMenuDesktopJob" oor:op="replace"/>
+            </node>
+        </node>
+        <node oor:name="onDocumentOpened" oor:op="replace">
+            <node oor:name="JobList">
+                <node oor:name="AppMenuFrameJob" oor:op="replace"/>
+            </node>
+        </node>
+        <!--node oor:name="OnNew" oor:op="replace">
+            <node oor:name="JobList">
+                <node oor:name="AppMenuFrameJob" oor:op="replace"/>
+            </node>
+        </node-->
+
+    </node>
+</oor:component-data>
diff --git a/framework/source/lomenubar/MenuItemInfo.cxx b/framework/source/lomenubar/MenuItemInfo.cxx
new file mode 100644
index 000000000000..02a8e7c19fa2
--- /dev/null
+++ b/framework/source/lomenubar/MenuItemInfo.cxx
@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "MenuItemInfo.hxx"
+#include <libdbusmenu-gtk/menuitem.h>
+
+MenuItemInfo::MenuItemInfo ()
+{
+    m_label = NULL;
+    m_check_state = DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN;
+    m_check_type  = (gchar*)DBUSMENU_MENUITEM_TOGGLE_CHECK;
+
+    m_is_visible = TRUE;
+    m_is_enabled = TRUE;
+}
+
+MenuItemInfo::~MenuItemInfo ()
+{
+    if (m_label)
+        g_free(m_label);
+}
+
+//Setters
+void
+MenuItemInfo::setLabel (gchar* label)
+{
+    this->m_label = g_strdup (label);
+}
+
+void
+MenuItemInfo::setEnabled (gboolean is_enabled)
+{
+    this->m_is_enabled = is_enabled;
+}
+
+void
+MenuItemInfo::setCheckState (gint check_state)
+{
+    this->m_check_state = check_state;
+}
+
+void
+MenuItemInfo::setCheckType (const gchar* check_type)
+{
+    this->m_check_type = (gchar*)check_type;
+}
+
+void
+MenuItemInfo::setVisible (gboolean is_visible)
+{
+    this->m_is_visible = is_visible;
+}
+
+//Getters
+gchar*
+MenuItemInfo::getLabel const()
+{
+    return m_label;
+}
+
+gboolean
+MenuItemInfo::getEnabled const()
+{
+    return m_is_enabled;
+}
+
+gint
+MenuItemInfo::getCheckState const()
+{
+    return m_check_state;
+}
+
+const gchar*
+MenuItemInfo::getCheckType const()
+{
+    return m_check_type;
+}
+
+gboolean
+MenuItemInfo::getVisible const()
+{
+    return m_is_visible;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemInfo.hxx b/framework/source/lomenubar/MenuItemInfo.hxx
new file mode 100644
index 000000000000..24299761c2f7
--- /dev/null
+++ b/framework/source/lomenubar/MenuItemInfo.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef __MENU_ITEM_INFO_HXX__
+#define __MENU_ITEM_INFO_HXX__
+#include <glib.h>
+
+// This is used in a hash table with commandurls as keys
+class MenuItemInfo {
+    gchar*            m_label;         //Label text in UTF-8 with tildes subst by underscores
+    gint              m_check_state;
+    gchar*            m_check_type;
+    gboolean          m_is_enabled;
+    gboolean          m_is_visible;
+
+  public:
+    MenuItemInfo ();
+    ~MenuItemInfo ();
+
+    //Setters
+    void setLabel (gchar* label);
+    void setEnabled (gboolean is_enabled);
+    void setCheckState (gint check_state);
+    void setCheckType (const gchar* check_type);
+    void setVisible (gboolean is_visible);
+
+    //Getters
+    gchar*       getLabel const();
+    gboolean     getEnabled const();
+    gint         getCheckState const();
+    const gchar* getCheckType const();
+    gboolean     getVisible const();
+};
+#endif // __MENU_ITEM_INFO_HXX__
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemStatusListener.cxx b/framework/source/lomenubar/MenuItemStatusListener.cxx
new file mode 100644
index 000000000000..e57c53acc958
--- /dev/null
+++ b/framework/source/lomenubar/MenuItemStatusListener.cxx
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#include "MenuItemStatusListener.hxx"
+#include "MenuItemInfo.hxx"
+
+#include <com/sun/star/frame/status/Visibility.hpp>
+
+using com::sun::star::frame::status::Visibility;
+
+MenuItemStatusListener::MenuItemStatusListener (FrameHelper *helper)
+    : m_helper(helper)
+{
+    OSL_ENSURE(m_helper, "FrameHelper cannot be NULL");
+}
+
+void SAL_CALL
+MenuItemStatusListener::statusChanged(const FeatureStateEvent& Event)
+  throw (RuntimeException)
+{
+    sal_Bool            isChecked;
+    Visibility          visible;
+    OUString url = Event.FeatureURL.Complete;
+    OUString oULabel;
+
+    gchar* c_url = g_utf16_to_utf8 (url.getStr(),
+                                    url.getLength(),
+                                    NULL, NULL, NULL);
+
+    GHashTable *commandsInfo = m_helper->getCommandsInfo ();
+    MenuItemInfo *info = (MenuItemInfo*)g_hash_table_lookup (commandsInfo, (gpointer)c_url);
+    if (!info)
+    {
+        info = new MenuItemInfo ();
+        g_hash_table_insert (commandsInfo, c_url, info);
+
+        //Set the default label
+        oULabel = m_helper->getLabelFromCommandURL(url);
+        // Replace tilde with underscore for Dbusmenu Alt accelerators
+        oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
+
+        // GLib behaves better than OUStringToOString wrt encoding transformation
+        gchar* label = g_utf16_to_utf8 (oULabel.getStr(),
+                                        oULabel.getLength(),
+                                        NULL, NULL, NULL);
+        info->setLabel (label);
+        g_free (label);
+    }
+    else
+    {
+        //Since we're not introducing it in the hash table, we get rid of this string
+        g_free (c_url);
+    }
+
+    //We set the enabled/disabled state
+    info->setEnabled ((gboolean)Event.IsEnabled);
+
+    //We find out what the new state is by casting
+
+    //For some reason, URLs can slip through as labels, we make sure
+    //this doesn't happen.
+    if ((Event.State >>= oULabel) &&
+        !oULabel.matchAsciiL ("private:", 8, 0) &&
+        !oULabel.matchAsciiL (".uno:", 5, 0)    &&
+        !oULabel.matchAsciiL ("slot:", 5, 0)    &&
+        !oULabel.matchAsciiL ("service:", 8, 0) &&
+        !oULabel.matchAsciiL (".cmd:", 5, 0)    &&
+        !oULabel.matchAsciiL ("macro:///", 5, 0))
+    {
+        oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
+        gchar* label = g_utf16_to_utf8 (oULabel.getStr(),
+                                 oULabel.getLength(),
+                                 NULL, NULL, NULL);
+        info->setLabel (label);
+        g_free (label);
+    }
+    else if (Event.State >>= isChecked)
+    {
+        info->setCheckState (isChecked);
+    }
+    else if (Event.State >>= visible)
+    {
+        info->setVisible (visible.bVisible);
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemStatusListener.hxx b/framework/source/lomenubar/MenuItemStatusListener.hxx
new file mode 100644
index 000000000000..89419c4df33c
--- /dev/null
+++ b/framework/source/lomenubar/MenuItemStatusListener.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef __MENU_ITEM_STATUS_LISTENER_HXX__
+#define __MENU_ITEM_STATUS_LISTENER_HXX__
+
+#include "FrameHelper.hxx"
+
+#include <glib.h>
+
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <cppuhelper/implbase1.hxx>
+
+#include <rtl/process.h>
+
+using com::sun::star::frame::FeatureStateEvent;
+using com::sun::star::frame::XStatusListener;
+using com::sun::star::lang::EventObject;
+
+// This class listens for changes in each menuitem and notifies FrameHelper about it
+class MenuItemStatusListener : public cppu::WeakImplHelper1 < XStatusListener >
+{
+  private:
+    guint16 m_id;
+    FrameHelper* const m_helper;
+
+  public:
+    MenuItemStatusListener (FrameHelper *helper);
+    ~MenuItemStatusListener () {}
+
+    virtual void SAL_CALL
+    statusChanged(const FeatureStateEvent& Event)
+      throw (RuntimeException);
+
+    virtual void SAL_CALL disposing(const EventObject& /*aEvent*/)
+      throw (RuntimeException) {}
+};
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/README b/framework/source/lomenubar/README
new file mode 100644
index 000000000000..45176349b094
--- /dev/null
+++ b/framework/source/lomenubar/README
@@ -0,0 +1,15 @@
+LibreOffice Global Menubar Extension for DBusMenu
+=================================================
+
+This library is an extension for LibreOffice that exports the Menubar structure,
+actions and shortcuts through the DBusMenu D-Bus interface. If there is a 
+present DbusMenu client (The Unity panel or the Appmenu applet for GNOME Panel
+for instance), LibreOffice will had its menu structure.
+
+For more information, visit the official website:
+http://launchpad.net/lo-menubar
+
+Known Issues
+------------
+- The menubar is shown briefly before it is hidden.
+- The LibreOffice Start Center does not hide/export its menu structure.
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
new file mode 100644
index 000000000000..bb4804e68fe5
--- /dev/null
+++ b/framework/source/lomenubar/exports.cxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * A LibreOffice extension to send the menubar structure through DBusMenu
+ *
+ * Copyright 2011 Canonical, Ltd.
+ * Authors:
+ *     Alberto Ruiz <alberto.ruiz@codethink.co.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the the GNU Lesser General Public License version 3, as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE.  See the applicable
+ * version of the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include <stdio.h>
+
+#include <osl/mutex.hxx>
+#include <osl/thread.h>
+#include <cppuhelper/factory.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <sal/types.h>
+
+#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#endif
+
+#include "DesktopJob.hxx"
+#include "FrameJob.hxx"
+
+namespace css = ::com::sun::star;
+
+static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& xRegistryKey       ,
+                      const char*                                               pImplementationName,
+                      const char*                                               pServiceName       )
+{
+    ::rtl::OUStringBuffer sKey(256);
+    sKey.append     (::rtl::OUString::createFromAscii(pImplementationName));
+    sKey.appendAscii("/UNO/SERVICES/");
+    sKey.append     (::rtl::OUString::createFromAscii(pServiceName));
+
+    xRegistryKey->createKey(sKey.makeStringAndClear());
+}
+
+extern "C"
+{
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char**        ppEnvTypeName,
+                                                                                 uno_Environment** /*ppEnv*/        )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName      ,
+                                                                void*     pServiceManager,
+                                                                void*     /*pRegistryKey*/  )
+{
+    if ( !pServiceManager || !pImplName )
+        return 0;
+
+    css::uno::Reference< css::lang::XSingleServiceFactory > xFactory  ;
+    css::uno::Reference< css::lang::XMultiServiceFactory >  xSMGR     (reinterpret_cast< css::lang::XMultiServiceFactory* >(pServiceManager), css::uno::UNO_QUERY);
+    ::rtl::OUString                                         sImplName = ::rtl::OUString::createFromAscii(pImplName);
+
+    if (sImplName.equalsAscii(DESKTOPJOB_IMPLEMENTATION_NAME))
+    {
+        css::uno::Sequence< ::rtl::OUString > lNames(1);
+        lNames[0] = ::rtl::OUString::createFromAscii(DESKTOPJOB_IMPLEMENTATION_NAME);
+        xFactory = ::cppu::createSingleFactory(xSMGR, sImplName,  DesktopJob_createInstance, lNames);
+    }
+    if (sImplName.equalsAscii(FRAMEJOB_IMPLEMENTATION_NAME))
+    {
+        css::uno::Sequence< ::rtl::OUString > lNames(1);
+        lNames[0] = ::rtl::OUString::createFromAscii(FRAMEJOB_IMPLEMENTATION_NAME);
+        xFactory = ::cppu::createSingleFactory(xSMGR, sImplName,  FrameJob_createInstance, lNames);
+    }
+
+
+    if (!xFactory.is())
+        return 0;
+
+    xFactory->acquire();
+    return xFactory.get();
+}
+
+} // extern C
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 7716fb45e791..f7cce11699bb 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,7 +132,7 @@ DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::lang::XMulti
         : ThreadHelpBase     ( &Application::GetSolarMutex() )
         , ::cppu::OWeakObject(                               )
         , m_xSMGR            ( xSMGR                         )
-        , m_xConverter( m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), css::uno::UNO_QUERY )
+        , m_xConverter( m_xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), css::uno::UNO_QUERY )
 {
 }
 
@@ -201,7 +202,7 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException
     aScriptBuffer.appendAscii("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n");
 
     std::vector< com::sun::star::frame::DispatchStatement>::iterator p;
-    for ( p = m_aStatements.begin(); p != m_aStatements.end(); p++ )
+    for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p )
         implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer );
     ::rtl::OUString sScript = aScriptBuffer.makeStringAndClear();
     return sScript;
@@ -344,7 +345,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL,
     ::rtl::OUStringBuffer aArgumentBuffer(1000);
     ::rtl::OUString       sArrayName;
     // this value is used to name the arrays of aArgumentBuffer
-    sArrayName = ::rtl::OUString::createFromAscii("args");
+    sArrayName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("args"));
     sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID);
 
     aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n");
@@ -491,3 +492,5 @@ void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::st
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 5632e950262a..f711ee5d9a91 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -219,3 +220,5 @@ void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL&
 }
 
 }   // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index 86ef8c16d1ea..c4fa80798507 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::HelpOnStartup       ) else
                         IFFACTORY( ::framework::SystemExec          ) else
                         IFFACTORY( ::framework::ShellJob            )
                     )
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index 0a7e08c8c93a..c0f54947e8e3 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,11 +55,11 @@
                              )
 =================================================================================================================*/
 
-#ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_
 #include <services/logindialog.hxx>
-#endif
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::LoginDialog     )
                     )
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index fe9dfe2ee573..a69f44a03f2d 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-//_________________________________________________________________________________________________________________
-//  includes of my own project
-//_________________________________________________________________________________________________________________
+
 #include <macros/registration.hxx>
 
 /*=================================================================================================================
@@ -57,26 +56,14 @@
 #include <services/tabwindowservice.hxx>
 #include <services/frame.hxx>
 #include <services/modulemanager.hxx>
-//#include <dispatch/oxt_handler.hxx>
 #include <jobs/jobexecutor.hxx>
-//#include <recording/dispatchrecordersupplier.hxx>
-//#include <recording/dispatchrecorder.hxx>
-//#include <dispatch/mailtodispatcher.hxx>
-//#include <dispatch/servicehandler.hxx>
 #include <jobs/jobdispatch.hxx>
 #include <services/backingcomp.hxx>
-//#include <services/dispatchhelper.hxx>
 #include <services/layoutmanager.hxx>
-//#include <services/license.hxx>
 #include <uifactory/uielementfactorymanager.hxx>
 #include <uifactory/popupmenucontrollerfactory.hxx>
-//#include <uielement/fontmenucontroller.hxx>
-//#include <uielement/fontsizemenucontroller.hxx>
 #include <uielement/objectmenucontroller.hxx>
-//#include <uielement/headermenucontroller.hxx>
-//#include <uielement/footermenucontroller.hxx>
 #include <uielement/controlmenucontroller.hxx>
-//#include <uielement/macrosmenucontroller.hxx>
 #include <uielement/uicommanddescription.hxx>
 #include <uiconfiguration/uiconfigurationmanager.hxx>
 #include <uiconfiguration/moduleuicfgsupplier.hxx>
@@ -88,7 +75,6 @@
 #include <uifactory/toolboxfactory.hxx>
 #include <uifactory/addonstoolboxfactory.hxx>
 #include "uiconfiguration/windowstateconfiguration.hxx"
-//#include <uielement/toolbarsmenucontroller.hxx>
 #include "uifactory/toolbarcontrollerfactory.hxx"
 #include "uifactory/statusbarcontrollerfactory.hxx"
 #include <services/autorecovery.hxx>
@@ -97,15 +83,9 @@
 #include <uifactory/statusbarfactory.hxx>
 #include <uiconfiguration/uicategorydescription.hxx>
 #include <services/sessionlistener.hxx>
-//#include <uielement/logoimagestatusbarcontroller.hxx>
-//#include <uielement/logotextstatusbarcontroller.hxx>
-//#include <uielement/newmenucontroller.hxx>
 #include <services/taskcreatorsrv.hxx>
-//#include <uielement/simpletextstatusbarcontroller.hxx>
-//#include <services/uriabbreviation.hxx>
 
 #include <uielement/langselectionstatusbarcontroller.hxx>
-//#include <uielement/langselectionmenucontroller.hxx>
 #include <uiconfiguration/imagemanager.hxx>
 #include <uifactory/windowcontentfactorymanager.hxx>
 #include <services/substitutepathvars.hxx>
@@ -116,26 +96,14 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT
 COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer                          )   else
                         IFFACTORY( ::framework::Desktop                                 )   else
                         IFFACTORY( ::framework::Frame                                   )   else
-                        //IFFACTORY( ::framework::Oxt_Handler                             )   else
                         IFFACTORY( ::framework::JobExecutor                             )   else
-                        //IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
-                        //IFFACTORY( ::framework::DispatchRecorder                        )   else
-                        //IFFACTORY( ::framework::MailToDispatcher                        )   else
-                        //IFFACTORY( ::framework::ServiceHandler                          )   else
                         IFFACTORY( ::framework::JobDispatch                             )   else
                         IFFACTORY( ::framework::BackingComp                             )   else
-                        //IFFACTORY( ::framework::DispatchHelper                          )   else
                         IFFACTORY( ::framework::LayoutManager                           )   else
-                        //IFFACTORY( ::framework::License                                 )   else
                         IFFACTORY( ::framework::UIElementFactoryManager                 )   else
                         IFFACTORY( ::framework::PopupMenuControllerFactory              )   else
-                        //IFFACTORY( ::framework::FontMenuController                      )   else
-                        //IFFACTORY( ::framework::FontSizeMenuController                  )   else
                         IFFACTORY( ::framework::ObjectMenuController                    )   else
-                        //IFFACTORY( ::framework::HeaderMenuController                    )   else
-                        //IFFACTORY( ::framework::FooterMenuController                    )   else
                         IFFACTORY( ::framework::ControlMenuController                   )   else
-                        //IFFACTORY( ::framework::MacrosMenuController                    )   else
                         IFFACTORY( ::framework::UICommandDescription                    )   else
                         IFFACTORY( ::framework::ModuleManager                           )   else
                         IFFACTORY( ::framework::UIConfigurationManager                  )   else
@@ -149,7 +117,6 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer
                         IFFACTORY( ::framework::AddonsToolBoxFactory                    )   else
                         IFFACTORY( ::framework::WindowStateConfiguration                )   else
                         IFFACTORY( ::framework::ToolbarControllerFactory                )   else
-                        //IFFACTORY( ::framework::ToolbarsMenuController                  ) else
                         IFFACTORY( ::framework::AutoRecovery                            )   else
                         IFFACTORY( ::framework::StatusIndicatorFactory                  )   else
                         IFFACTORY( ::framework::RecentFilesMenuController               )   else
@@ -158,19 +125,13 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::URLTransformer
                         IFFACTORY( ::framework::SessionListener                         )   else
                         IFFACTORY( ::framework::StatusbarControllerFactory              )   else
                         IFFACTORY( ::framework::SessionListener                         )   else
-                        //IFFACTORY( ::framework::LogoImageStatusbarController            )   else
-                        //IFFACTORY( ::framework::LogoTextStatusbarController             ) else
                         IFFACTORY( ::framework::TaskCreatorService                      )   else
-                        //IFFACTORY( ::framework::NewMenuController                       )   else
-                        //IFFACTORY( ::framework::SimpleTextStatusbarController           )   else
-                        //IFFACTORY( ::framework::UriAbbreviation                         )   else
-                        //IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
                         IFFACTORY( ::framework::ImageManager                            )   else
                         IFFACTORY( ::framework::LangSelectionStatusbarController        )   else
-                        //IFFACTORY( ::framework::LanguageSelectionMenuController         )   else
                         IFFACTORY( ::framework::WindowContentFactoryManager             )   else
                         IFFACTORY( ::framework::TabWindowService                        )   else
                         IFFACTORY( ::framework::SubstitutePathVariables                 )   else
                         IFFACTORY( ::framework::PathSettings                            )
             )
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 59444093d53e..9680c2c288ff 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ COMPONENTGETFACTORY (   IFFACTORY( ::framework::MediaTypeDetectionHelper
                         IFFACTORY( ::framework::Oxt_Handler                             )   else
                         IFFACTORY( ::framework::PopupMenuController                     )
                     )
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 564e26f2651b..2f8819c7685c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,6 +45,8 @@
 #include <properties.h>
 #include <services.h>
 
+#include "helper/mischelper.hxx"
+
 //_______________________________________________
 // interface includes
 #include <com/sun/star/ucb/NameClash.hpp>
@@ -132,86 +135,85 @@ namespace framework
 
 //-----------------------------------------------
 // recovery.xcu
-static const ::rtl::OUString CFG_PACKAGE_RECOVERY             = ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery/");
-static const ::rtl::OUString CFG_ENTRY_RECOVERYLIST           = ::rtl::OUString::createFromAscii("RecoveryList"                   );
-static const ::rtl::OUString CFG_PATH_RECOVERYINFO            = ::rtl::OUString::createFromAscii("RecoveryInfo"                   );
-static const ::rtl::OUString CFG_ENTRY_ENABLED                = ::rtl::OUString::createFromAscii("Enabled"                        );
-static const ::rtl::OUString CFG_ENTRY_CRASHED                = ::rtl::OUString::createFromAscii("Crashed"                        );
-static const ::rtl::OUString CFG_ENTRY_SESSIONDATA            = ::rtl::OUString::createFromAscii("SessionData"                    );
-
-static const ::rtl::OUString CFG_ENTRY_AUTOSAVE_ENABLED       = ::rtl::OUString::createFromAscii("AutoSave/Enabled"               );
-static const ::rtl::OUString CFG_ENTRY_AUTOSAVE_TIMEINTERVALL = ::rtl::OUString::createFromAscii("AutoSave/TimeIntervall"         );
-
-static const ::rtl::OUString CFG_PATH_AUTOSAVE                = ::rtl::OUString::createFromAscii("AutoSave"                       );
-static const ::rtl::OUString CFG_ENTRY_MINSPACE_DOCSAVE       = ::rtl::OUString::createFromAscii("MinSpaceDocSave"                );
-static const ::rtl::OUString CFG_ENTRY_MINSPACE_CONFIGSAVE    = ::rtl::OUString::createFromAscii("MinSpaceConfigSave"             );
-
-static const ::rtl::OUString CFG_PACKAGE_MODULES              = ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office/Factories");
-static const ::rtl::OUString CFG_ENTRY_REALDEFAULTFILTER      = ::rtl::OUString::createFromAscii("ooSetupFactoryActualFilter"           );
-
-static const ::rtl::OUString CFG_ENTRY_PROP_TEMPURL           = ::rtl::OUString::createFromAscii("TempURL"      );
-static const ::rtl::OUString CFG_ENTRY_PROP_ORIGINALURL       = ::rtl::OUString::createFromAscii("OriginalURL"  );
-static const ::rtl::OUString CFG_ENTRY_PROP_TEMPLATEURL       = ::rtl::OUString::createFromAscii("TemplateURL"  );
-static const ::rtl::OUString CFG_ENTRY_PROP_FACTORYURL        = ::rtl::OUString::createFromAscii("FactoryURL"   );
-static const ::rtl::OUString CFG_ENTRY_PROP_MODULE            = ::rtl::OUString::createFromAscii("Module"       );
-static const ::rtl::OUString CFG_ENTRY_PROP_DOCUMENTSTATE     = ::rtl::OUString::createFromAscii("DocumentState");
-static const ::rtl::OUString CFG_ENTRY_PROP_FILTER            = ::rtl::OUString::createFromAscii("Filter"       );
-static const ::rtl::OUString CFG_ENTRY_PROP_TITLE             = ::rtl::OUString::createFromAscii("Title"        );
-static const ::rtl::OUString CFG_ENTRY_PROP_ID                = ::rtl::OUString::createFromAscii("ID"           );
-static const ::rtl::OUString CFG_ENTRY_PROP_VIEWNAMES         = ::rtl::OUString::createFromAscii("ViewNames"    );
-
-static const ::rtl::OUString FILTER_PROP_TYPE                = ::rtl::OUString::createFromAscii("Type"            );
-static const ::rtl::OUString FILTER_PROP_NAME                = ::rtl::OUString::createFromAscii("Name"            );
-static const ::rtl::OUString TYPE_PROP_EXTENSIONS            = ::rtl::OUString::createFromAscii("Extensions"      );
-static const ::rtl::OUString DOCINFO_PROP_TEMPLATE           = ::rtl::OUString::createFromAscii("TemplateFileName");
+static const ::rtl::OUString CFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery/"));
+static const ::rtl::OUString CFG_ENTRY_RECOVERYLIST(RTL_CONSTASCII_USTRINGPARAM("RecoveryList"));
+static const ::rtl::OUString CFG_PATH_RECOVERYINFO(RTL_CONSTASCII_USTRINGPARAM("RecoveryInfo"));
+static const ::rtl::OUString CFG_ENTRY_ENABLED(RTL_CONSTASCII_USTRINGPARAM("Enabled"));
+static const ::rtl::OUString CFG_ENTRY_CRASHED(RTL_CONSTASCII_USTRINGPARAM("Crashed"));
+static const ::rtl::OUString CFG_ENTRY_SESSIONDATA(RTL_CONSTASCII_USTRINGPARAM("SessionData"));
+
+static const ::rtl::OUString CFG_ENTRY_AUTOSAVE_ENABLED(RTL_CONSTASCII_USTRINGPARAM("AutoSave/Enabled"));
+static const ::rtl::OUString CFG_ENTRY_AUTOSAVE_TIMEINTERVALL(RTL_CONSTASCII_USTRINGPARAM("AutoSave/TimeIntervall"));
+
+static const ::rtl::OUString CFG_PATH_AUTOSAVE(RTL_CONSTASCII_USTRINGPARAM("AutoSave"));
+static const ::rtl::OUString CFG_ENTRY_MINSPACE_DOCSAVE(RTL_CONSTASCII_USTRINGPARAM("MinSpaceDocSave"));
+static const ::rtl::OUString CFG_ENTRY_MINSPACE_CONFIGSAVE(RTL_CONSTASCII_USTRINGPARAM("MinSpaceConfigSave"));
+
+static const ::rtl::OUString CFG_PACKAGE_MODULES(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office/Factories"));
+static const ::rtl::OUString CFG_ENTRY_REALDEFAULTFILTER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryActualFilter"));
+
+static const ::rtl::OUString CFG_ENTRY_PROP_TEMPURL(RTL_CONSTASCII_USTRINGPARAM("TempURL"));
+static const ::rtl::OUString CFG_ENTRY_PROP_ORIGINALURL(RTL_CONSTASCII_USTRINGPARAM("OriginalURL"));
+static const ::rtl::OUString CFG_ENTRY_PROP_TEMPLATEURL(RTL_CONSTASCII_USTRINGPARAM("TemplateURL"));
+static const ::rtl::OUString CFG_ENTRY_PROP_FACTORYURL(RTL_CONSTASCII_USTRINGPARAM("FactoryURL"));
+static const ::rtl::OUString CFG_ENTRY_PROP_MODULE(RTL_CONSTASCII_USTRINGPARAM("Module"));
+static const ::rtl::OUString CFG_ENTRY_PROP_DOCUMENTSTATE(RTL_CONSTASCII_USTRINGPARAM("DocumentState"));
+static const ::rtl::OUString CFG_ENTRY_PROP_FILTER(RTL_CONSTASCII_USTRINGPARAM("Filter"));
+static const ::rtl::OUString CFG_ENTRY_PROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("Title"));
+static const ::rtl::OUString CFG_ENTRY_PROP_ID(RTL_CONSTASCII_USTRINGPARAM("ID"));
+static const ::rtl::OUString CFG_ENTRY_PROP_VIEWNAMES(RTL_CONSTASCII_USTRINGPARAM("ViewNames"));
+
+static const ::rtl::OUString FILTER_PROP_TYPE(RTL_CONSTASCII_USTRINGPARAM("Type"));
+static const ::rtl::OUString FILTER_PROP_NAME(RTL_CONSTASCII_USTRINGPARAM("Name"));
+static const ::rtl::OUString TYPE_PROP_EXTENSIONS(RTL_CONSTASCII_USTRINGPARAM("Extensions"));
+static const ::rtl::OUString DOCINFO_PROP_TEMPLATE(RTL_CONSTASCII_USTRINGPARAM("TemplateFileName"));
 
 // setup.xcu
-static const ::rtl::OUString CFG_ENTRY_PROP_EMPTYDOCUMENTURL = ::rtl::OUString::createFromAscii("ooSetupFactoryEmptyDocumentURL");
-static const ::rtl::OUString CFG_ENTRY_PROP_DEFAULTFILTER    = ::rtl::OUString::createFromAscii("ooSetupFactoryDefaultFilter"   );
-static const ::rtl::OUString CFG_ENTRY_PROP_FACTORYSERVICE   = ::rtl::OUString::createFromAscii("ooSetupFactoryDocumentService"   );
-
-static const ::rtl::OUString EVENT_ON_NEW                    = ::rtl::OUString::createFromAscii("OnNew"          );
-static const ::rtl::OUString EVENT_ON_LOAD                   = ::rtl::OUString::createFromAscii("OnLoad"         );
-static const ::rtl::OUString EVENT_ON_UNLOAD                 = ::rtl::OUString::createFromAscii("OnUnload"       );
-static const ::rtl::OUString EVENT_ON_MODIFYCHANGED          = ::rtl::OUString::createFromAscii("OnModifyChanged");
-static const ::rtl::OUString EVENT_ON_SAVE                   = ::rtl::OUString::createFromAscii("OnSave"         );
-static const ::rtl::OUString EVENT_ON_SAVEAS                 = ::rtl::OUString::createFromAscii("OnSaveAs"       );
-static const ::rtl::OUString EVENT_ON_SAVETO                 = ::rtl::OUString::createFromAscii("OnCopyTo"       );
-static const ::rtl::OUString EVENT_ON_SAVEDONE               = ::rtl::OUString::createFromAscii("OnSaveDone"     );
-static const ::rtl::OUString EVENT_ON_SAVEASDONE             = ::rtl::OUString::createFromAscii("OnSaveAsDone"   );
-static const ::rtl::OUString EVENT_ON_SAVETODONE             = ::rtl::OUString::createFromAscii("OnCopyToDone"   );
-static const ::rtl::OUString EVENT_ON_SAVEFAILED             = ::rtl::OUString::createFromAscii("OnSaveFailed"   );
-static const ::rtl::OUString EVENT_ON_SAVEASFAILED           = ::rtl::OUString::createFromAscii("OnSaveAsFailed" );
-static const ::rtl::OUString EVENT_ON_SAVETOFAILED           = ::rtl::OUString::createFromAscii("OnCopyToFailed" );
-
-static const ::rtl::OUString RECOVERY_ITEM_BASE_IDENTIFIER   = ::rtl::OUString::createFromAscii("recovery_item_" );
-
-static const ::rtl::OUString CMD_PROTOCOL                    = ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:");
-
-static const ::rtl::OUString CMD_DO_AUTO_SAVE                = ::rtl::OUString::createFromAscii("/doAutoSave"             );    // force AutoSave ignoring the AutoSave timer
-static const ::rtl::OUString CMD_DO_PREPARE_EMERGENCY_SAVE   = ::rtl::OUString::createFromAscii("/doPrepareEmergencySave" );    // prepare the office for the following EmergencySave step (hide windows etcpp.)
-static const ::rtl::OUString CMD_DO_EMERGENCY_SAVE           = ::rtl::OUString::createFromAscii("/doEmergencySave"        );    // do EmergencySave on crash
-static const ::rtl::OUString CMD_DO_RECOVERY                 = ::rtl::OUString::createFromAscii("/doAutoRecovery"         );    // recover all crashed documents
-static const ::rtl::OUString CMD_DO_ENTRY_BACKUP             = ::rtl::OUString::createFromAscii("/doEntryBackup"          );    // try to store a temp or original file to a user defined location
-static const ::rtl::OUString CMD_DO_ENTRY_CLEANUP            = ::rtl::OUString::createFromAscii("/doEntryCleanUp"         );    // remove the specified entry from the recovery cache
-static const ::rtl::OUString CMD_DO_SESSION_SAVE             = ::rtl::OUString::createFromAscii("/doSessionSave"          );    // save all open documents if e.g. a window manager closes an user session
-static const ::rtl::OUString CMD_DO_SESSION_QUIET_QUIT       = ::rtl::OUString::createFromAscii("/doSessionQuietQuit"     );    // let the current session be quietly closed ( the saving should be done using doSessionSave previously ) if e.g. a window manager closes an user session
-static const ::rtl::OUString CMD_DO_SESSION_RESTORE          = ::rtl::OUString::createFromAscii("/doSessionRestore"       );    // restore a saved user session from disc
-static const ::rtl::OUString CMD_DO_DISABLE_RECOVERY         = ::rtl::OUString::createFromAscii("/disableRecovery"        );    // disable recovery and auto save (!) temp. for this office session
-static const ::rtl::OUString CMD_DO_SET_AUTOSAVE_STATE       = ::rtl::OUString::createFromAscii("/setAutoSaveState"       );    // disable/enable auto save (not crash save) for this office session
-
-static const ::rtl::OUString REFERRER_USER                   = ::rtl::OUString::createFromAscii("private:user");
-
-static const ::rtl::OUString PROP_DISPATCH_ASYNCHRON         = ::rtl::OUString::createFromAscii("DispatchAsynchron");
-static const ::rtl::OUString PROP_PROGRESS                   = ::rtl::OUString::createFromAscii("StatusIndicator"  );
-static const ::rtl::OUString PROP_SAVEPATH                   = ::rtl::OUString::createFromAscii("SavePath"         );
-static const ::rtl::OUString PROP_ENTRY_ID                   = ::rtl::OUString::createFromAscii("EntryID"          );
-static const ::rtl::OUString PROP_DBG_MAKE_IT_FASTER         = ::rtl::OUString::createFromAscii("DBGMakeItFaster"  );
-static const ::rtl::OUString PROP_AUTOSAVE_STATE             = ::rtl::OUString::createFromAscii("AutoSaveState"    );
-
-static const ::rtl::OUString OPERATION_START                 = ::rtl::OUString::createFromAscii("start" );
-static const ::rtl::OUString OPERATION_STOP                  = ::rtl::OUString::createFromAscii("stop"  );
-static const ::rtl::OUString OPERATION_UPDATE                = ::rtl::OUString::createFromAscii("update");
+static const ::rtl::OUString CFG_ENTRY_PROP_EMPTYDOCUMENTURL(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryEmptyDocumentURL"));
+static const ::rtl::OUString CFG_ENTRY_PROP_DEFAULTFILTER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDefaultFilter"));
+static const ::rtl::OUString CFG_ENTRY_PROP_FACTORYSERVICE(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDocumentService"));
+
+static const ::rtl::OUString EVENT_ON_NEW(RTL_CONSTASCII_USTRINGPARAM("OnNew"));
+static const ::rtl::OUString EVENT_ON_LOAD(RTL_CONSTASCII_USTRINGPARAM("OnLoad"));
+static const ::rtl::OUString EVENT_ON_UNLOAD(RTL_CONSTASCII_USTRINGPARAM("OnUnload"));
+static const ::rtl::OUString EVENT_ON_MODIFYCHANGED(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged"));
+static const ::rtl::OUString EVENT_ON_SAVE(RTL_CONSTASCII_USTRINGPARAM("OnSave"));
+static const ::rtl::OUString EVENT_ON_SAVEAS(RTL_CONSTASCII_USTRINGPARAM("OnSaveAs"));
+static const ::rtl::OUString EVENT_ON_SAVETO(RTL_CONSTASCII_USTRINGPARAM("OnCopyTo"));
+static const ::rtl::OUString EVENT_ON_SAVEDONE(RTL_CONSTASCII_USTRINGPARAM("OnSaveDone"));
+static const ::rtl::OUString EVENT_ON_SAVEASDONE(RTL_CONSTASCII_USTRINGPARAM("OnSaveAsDone"));
+static const ::rtl::OUString EVENT_ON_SAVETODONE(RTL_CONSTASCII_USTRINGPARAM("OnCopyToDone"));
+static const ::rtl::OUString EVENT_ON_SAVEFAILED(RTL_CONSTASCII_USTRINGPARAM("OnSaveFailed"));
+static const ::rtl::OUString EVENT_ON_SAVEASFAILED(RTL_CONSTASCII_USTRINGPARAM("OnSaveAsFailed"));
+static const ::rtl::OUString EVENT_ON_SAVETOFAILED(RTL_CONSTASCII_USTRINGPARAM("OnCopyToFailed"));
+
+static const ::rtl::OUString RECOVERY_ITEM_BASE_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("recovery_item_"));
+
+static const ::rtl::OUString CMD_PROTOCOL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:"));
+
+static const ::rtl::OUString CMD_DO_AUTO_SAVE(RTL_CONSTASCII_USTRINGPARAM("/doAutoSave"));    // force AutoSave ignoring the AutoSave timer
+static const ::rtl::OUString CMD_DO_PREPARE_EMERGENCY_SAVE(RTL_CONSTASCII_USTRINGPARAM("/doPrepareEmergencySave"));    // prepare the office for the following EmergencySave step (hide windows etcpp.)
+static const ::rtl::OUString CMD_DO_EMERGENCY_SAVE(RTL_CONSTASCII_USTRINGPARAM("/doEmergencySave"));    // do EmergencySave on crash
+static const ::rtl::OUString CMD_DO_RECOVERY(RTL_CONSTASCII_USTRINGPARAM("/doAutoRecovery"));    // recover all crashed documents
+static const ::rtl::OUString CMD_DO_ENTRY_BACKUP(RTL_CONSTASCII_USTRINGPARAM("/doEntryBackup"));    // try to store a temp or original file to a user defined location
+static const ::rtl::OUString CMD_DO_ENTRY_CLEANUP(RTL_CONSTASCII_USTRINGPARAM("/doEntryCleanUp"));    // remove the specified entry from the recovery cache
+static const ::rtl::OUString CMD_DO_SESSION_SAVE(RTL_CONSTASCII_USTRINGPARAM("/doSessionSave"));    // save all open documents if e.g. a window manager closes an user session
+static const ::rtl::OUString CMD_DO_SESSION_QUIET_QUIT(RTL_CONSTASCII_USTRINGPARAM("/doSessionQuietQuit"));    // let the current session be quietly closed ( the saving should be done using doSessionSave previously ) if e.g. a window manager closes an user session
+static const ::rtl::OUString CMD_DO_SESSION_RESTORE(RTL_CONSTASCII_USTRINGPARAM("/doSessionRestore"));    // restore a saved user session from disc
+static const ::rtl::OUString CMD_DO_DISABLE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM("/disableRecovery"));    // disable recovery and auto save (!) temp. for this office session
+static const ::rtl::OUString CMD_DO_SET_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("/setAutoSaveState"));    // disable/enable auto save (not crash save) for this office session
+
+static const ::rtl::OUString REFERRER_USER(RTL_CONSTASCII_USTRINGPARAM("private:user"));
+
+static const ::rtl::OUString PROP_DISPATCH_ASYNCHRON(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron"));
+static const ::rtl::OUString PROP_PROGRESS(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator"));
+static const ::rtl::OUString PROP_SAVEPATH(RTL_CONSTASCII_USTRINGPARAM("SavePath"));
+static const ::rtl::OUString PROP_ENTRY_ID(RTL_CONSTASCII_USTRINGPARAM("EntryID"));
+static const ::rtl::OUString PROP_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState"));
+
+static const ::rtl::OUString OPERATION_START(RTL_CONSTASCII_USTRINGPARAM("start"));
+static const ::rtl::OUString OPERATION_STOP(RTL_CONSTASCII_USTRINGPARAM("stop"));
+static const ::rtl::OUString OPERATION_UPDATE(RTL_CONSTASCII_USTRINGPARAM("update"));
 
 static const sal_Int32       MIN_DISCSPACE_DOCSAVE                  =   5; // [MB]
 static const sal_Int32       MIN_DISCSPACE_CONFIGSAVE               =   1; // [MB]
@@ -253,103 +255,6 @@ static const sal_Int32       GIVE_UP_RETRY                          =   1; // in
 #endif
 
 //-----------------------------------------------
-// TODO debug - remove it!
-class DbgListener : private ThreadHelpBase
-                  , public  ::cppu::OWeakObject
-                  , public  css::frame::XStatusListener
-{
-    public:
-
-        FWK_DECLARE_XINTERFACE
-
-        DbgListener()
-        {
-            WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::ctor()\n\n")
-        }
-
-        virtual ~DbgListener()
-        {
-            WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::dtor()\n\n")
-        }
-
-        void startListening(const css::uno::Reference< css::frame::XDispatch >& xBroadcaster)
-        {
-            ::rtl::OUStringBuffer sMsg1(256);
-            sMsg1.appendAscii("//**********************************************************************************\n");
-            sMsg1.appendAscii("start listening\n{\n");
-            WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg1.makeStringAndClear()))
-
-            ++m_refCount;
-
-            css::util::URL aURL;
-            aURL.Complete = ::rtl::OUString();
-            xBroadcaster->addStatusListener(static_cast< css::frame::XStatusListener* >(this), aURL);
-
-            --m_refCount;
-
-            ::rtl::OUStringBuffer sMsg2(256);
-            sMsg2.appendAscii("}\nstart listening\n");
-            sMsg2.appendAscii("//**********************************************************************************\n");
-            WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg2.makeStringAndClear()))
-        }
-
-        virtual void SAL_CALL disposing(const css::lang::EventObject&)
-            throw(css::uno::RuntimeException)
-        {
-            WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::dtor()\n\n")
-        }
-
-        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent)
-            throw(css::uno::RuntimeException)
-        {
-            ::rtl::OUStringBuffer sMsg(256);
-
-            sMsg.appendAscii("//**********************************************************************************\n");
-
-            sMsg.appendAscii("FeatureURL = \"");
-            sMsg.append     (aEvent.FeatureURL.Complete);
-            sMsg.appendAscii("\"\n");
-
-            sMsg.appendAscii("State = [");
-            sal_Int32 nState = -1;
-            aEvent.State >>= nState;
-            if (nState==-1)
-            {
-                sMsg.appendAscii("?-");
-                sMsg.append     (::rtl::OUString::valueOf(nState));
-                sMsg.appendAscii("-? ");
-            }
-            if (nState==0)
-                sMsg.appendAscii("UNKNOWN ");
-            if ((nState & 1)==1)
-                sMsg.appendAscii("MODIFIED ");
-            if ((nState & 2)==2)
-                sMsg.appendAscii("TRYIT ");
-            if ((nState & 4)==4)
-                sMsg.appendAscii("HANDLED ");
-            if ((nState & 8)==8)
-                sMsg.appendAscii("POSTPONED ");
-            if ((nState & 16)==16)
-                sMsg.appendAscii("INCOMPLETE ");
-            if ((nState & 32)==32)
-                sMsg.appendAscii("DAMAGED ");
-            sMsg.appendAscii("]\n");
-/*
-            sMsg.appendAscii("IsEnabled = \"");
-            sMsg.append     (::rtl::OUString::valueOf(aEvent.IsEnabled));
-            sMsg.appendAscii("\"\n");
-
-            sMsg.appendAscii("Requery = \"");
-            sMsg.append     (::rtl::OUString::valueOf(aEvent.Requery));
-            sMsg.appendAscii("\"\n");
-*/
-            sMsg.appendAscii("\n");
-
-            WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg.makeStringAndClear()))
-        }
-};
-
-//-----------------------------------------------
 class CacheLockGuard
 {
     private:
@@ -424,9 +329,9 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
         (bLockForAddRemoveVectorItems)
        )
     {
-        OSL_ENSURE(sal_False, "Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
+        OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.")),
                 m_xOwner);
     }
 
@@ -451,9 +356,9 @@ void CacheLockGuard::unlock()
 
     if (m_rCacheLock < 0)
     {
-        OSL_ENSURE(sal_False, "Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
+        OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
                 m_xOwner);
     }
     aWriteLock.unlock();
@@ -509,11 +414,6 @@ void DispatchParams::forget()
 };
 
 //-----------------------------------------------
-DEFINE_XINTERFACE_1(DbgListener                                 ,
-                    OWeakObject                                 ,
-                    DIRECT_INTERFACE(css::frame::XStatusListener))
-
-//-----------------------------------------------
 DEFINE_XINTERFACE_10(AutoRecovery                                                               ,
                      OWeakObject                                                                ,
                      DIRECT_INTERFACE (css::lang::XTypeProvider                                ),
@@ -560,10 +460,6 @@ DEFINE_INIT_SERVICE(
                         // establish callback for our internal used timer.
                         // Note: Its only active, if the timer will be started ...
                         m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired));
-/*
-                        DbgListener* pListener = new DbgListener();
-                        pListener->startListening(this);
-*/
                     }
                    )
 
@@ -680,6 +576,21 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
         implts_dispatch(aParams);
 }
 
+void AutoRecovery::ListenerInformer::start()
+{
+    m_rRecovery.implts_informListener(m_eJob,
+        AutoRecovery::implst_createFeatureStateEvent(m_eJob, OPERATION_START, NULL));
+}
+
+void AutoRecovery::ListenerInformer::stop()
+{
+    if (m_bStopped)
+        return;
+    m_rRecovery.implts_informListener(m_eJob,
+        AutoRecovery::implst_createFeatureStateEvent(m_eJob, OPERATION_STOP, NULL));
+    m_bStopped = true;
+}
+
 //-----------------------------------------------
 void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
 {
@@ -703,12 +614,11 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
     implts_stopTimer();
     implts_stopListening();
 
-    implts_informListener(eJob,
-        AutoRecovery::implst_createFeatureStateEvent(eJob, OPERATION_START, NULL));
+    ListenerInformer aListenerInformer(*this, eJob);
+    aListenerInformer.start();
 
     try
     {
-        // if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
         //  Auto save is called from our internal timer ... not via dispatch() API !
         // else
         if (
@@ -781,13 +691,14 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
             )
             implts_cleanUpWorkingEntry(aParams);
     }
-    catch(const css::uno::RuntimeException& exRun)
-        { throw exRun; }
+    catch(const css::uno::RuntimeException&)
+    {
+        throw;
+    }
     catch(const css::uno::Exception&)
         {} // TODO better error handling
 
-    implts_informListener(eJob,
-        AutoRecovery::implst_createFeatureStateEvent(eJob, OPERATION_STOP, NULL));
+    aListenerInformer.stop();
 
     // SAFE -> ----------------------------------
     aWriteLock.lock();
@@ -816,7 +727,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
     throw(css::uno::RuntimeException)
 {
     if (!xListener.is())
-        throw css::uno::RuntimeException(::rtl::OUString::createFromAscii("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
+        throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this));
     // container is threadsafe by using a shared mutex!
     m_lListener.addInterface(aURL.Complete, xListener);
 
@@ -851,7 +762,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
     throw(css::uno::RuntimeException)
 {
     if (!xListener.is())
-        throw css::uno::RuntimeException(::rtl::OUString::createFromAscii("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
+        throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this));
     // container is threadsafe by using a shared mutex!
     m_lListener.removeInterface(aURL.Complete, xListener);
 }
@@ -945,7 +856,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
     WriteGuard aWriteLock(m_aLock);
 
     // Changes of the configuration must be ignored if AutoSave/Recovery was disabled for this
-    // office session. That can happen if e.g. the command line arguments "-norestore" or "-headless"
+    // office session. That can happen if e.g. the command line arguments "--norestore" or "--headless"
     // was set.
     if ((m_eJob & AutoRecovery::E_DISABLE_AUTORECOVERY) == AutoRecovery::E_DISABLE_AUTORECOVERY)
        return;
@@ -1215,7 +1126,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
     if (!rInfo.AppModule.getLength())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Cant find out the default filter and its extension, if no application module is known!"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find out the default filter and its extension, if no application module is known!")),
                 static_cast< css::frame::XDispatch* >(this));
     }
 
@@ -1257,11 +1168,11 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
         css::uno::Sequence< ::rtl::OUString > lExtensions         = lTypeProps.getUnpackedValueOrDefault(TYPE_PROP_EXTENSIONS, css::uno::Sequence< ::rtl::OUString >());
         if (lExtensions.getLength())
         {
-            rInfo.Extension  = ::rtl::OUString::createFromAscii(".");
+            rInfo.Extension  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
             rInfo.Extension += lExtensions[0];
         }
         else
-            rInfo.Extension = ::rtl::OUString::createFromAscii(".unknown");
+            rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".unknown"));
     }
     catch(const css::uno::Exception&)
     {
@@ -1409,8 +1320,8 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
                 xModify->insertByName(sID, css::uno::makeAny(xSet));
         }
     }
-    catch(const css::uno::RuntimeException& exRun)
-        { throw exRun; }
+    catch(const css::uno::RuntimeException&)
+        { throw; }
     catch(const css::uno::Exception&)
         {} // ??? can it happen that a full disc let these set of operations fail too ???
 
@@ -1472,7 +1383,8 @@ void AutoRecovery::implts_startListening()
         (! m_bListenForConfigChanges)
        )
     {
-        xCFG->addChangesListener(static_cast< css::util::XChangesListener* >(this));
+        m_xRecoveryCFGListener = new WeakChangesListener(this);
+        xCFG->addChangesListener(m_xRecoveryCFGListener);
         m_bListenForConfigChanges = sal_True;
     }
 
@@ -1491,7 +1403,8 @@ void AutoRecovery::implts_startListening()
         (! bListenForDocEvents)
        )
     {
-        xBroadcaster->addEventListener(static_cast< css::document::XEventListener* >(this));
+        m_xNewDocBroadcasterListener = new WeakDocumentEventListener(this);
+        xBroadcaster->addEventListener(m_xNewDocBroadcasterListener);
         // SAFE ->
         WriteGuard aWriteLock(m_aLock);
         m_bListenForDocEvents = sal_True;
@@ -1518,7 +1431,7 @@ void AutoRecovery::implts_stopListening()
         (m_bListenForDocEvents       )
        )
     {
-        xGlobalEventBroadcaster->removeEventListener(static_cast< css::document::XEventListener* >(this));
+        xGlobalEventBroadcaster->removeEventListener(m_xNewDocBroadcasterListener);
         m_bListenForDocEvents = sal_False;
     }
 
@@ -1527,7 +1440,7 @@ void AutoRecovery::implts_stopListening()
         (m_bListenForConfigChanges)
        )
     {
-        xCFG->removeChangesListener(static_cast< css::util::XChangesListener* >(this));
+        xCFG->removeChangesListener(m_xRecoveryCFGListener);
         m_bListenForConfigChanges = sal_False;
     }
 }
@@ -1633,7 +1546,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
         implts_stopTimer();
 
         // The timer must be ignored if AutoSave/Recovery was disabled for this
-        // office session. That can happen if e.g. the command line arguments "-norestore" or "-headless"
+        // office session. That can happen if e.g. the command line arguments "--norestore" or "--headless"
         // was set. But normaly the timer was disabled if recovery was disabled ...
         // But so we are more "safe" .-)
         // SAFE -> ----------------------------------
@@ -1714,7 +1627,6 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
     }
     catch(const css::uno::Exception&)
     {
-        LOG_ASSERT(sal_False, "May be you found the reason for bug #125528#. Please report a test scenario to the right developer. THX.");
     }
 
     return 0;
@@ -1731,7 +1643,13 @@ IMPL_LINK(AutoRecovery, implts_asyncDispatch, void*, EMPTYARG)
     aWriteLock.unlock();
     // <- SAFE
 
-    implts_dispatch(aParams);
+    try
+    {
+        implts_dispatch(aParams);
+    }
+    catch (...)
+    {
+    }
     return 0;
 }
 
@@ -1814,7 +1732,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
         (!aNew.FactoryURL.getLength())
        )
     {
-        OSL_ENSURE( false, "AutoRecovery::implts_registerDocument: this should not happen anymore!" );
+        OSL_FAIL( "AutoRecovery::implts_registerDocument: this should not happen anymore!" );
         // nowadays, the Basic IDE should already die on the "supports XDocumentRecovery" check. And no other known
         // document type fits in here ...
         return;
@@ -3329,9 +3247,7 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUSt
         { return AutoRecovery::E_WRONG_TARGET_PATH; }
 
     sal_Int32 nNameClash;
-//  nNameClash = css::ucb::NameClash::ERROR;
     nNameClash = css::ucb::NameClash::RENAME;
-//  nNameClash = css::ucb::NameClash::OVERWRITE;
 
     try
     {
@@ -3413,13 +3329,13 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
 //-----------------------------------------------
 const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor()
 {
-    static const css::beans::Property pPropertys[] =
+    const css::beans::Property pPropertys[] =
     {
         css::beans::Property( AUTORECOVERY_PROPNAME_CRASHED            , AUTORECOVERY_PROPHANDLE_CRASHED            , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
         css::beans::Property( AUTORECOVERY_PROPNAME_EXISTS_RECOVERYDATA, AUTORECOVERY_PROPHANDLE_EXISTS_RECOVERYDATA, ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
         css::beans::Property( AUTORECOVERY_PROPNAME_EXISTS_SESSIONDATA , AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA , ::getBooleanCppuType() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
     };
-    static const css::uno::Sequence< css::beans::Property > lPropertyDescriptor(pPropertys, AUTORECOVERY_PROPCOUNT);
+    const css::uno::Sequence< css::beans::Property > lPropertyDescriptor(pPropertys, AUTORECOVERY_PROPCOUNT);
     return lPropertyDescriptor;
 }
 
@@ -3549,11 +3465,11 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
     sal_uInt64 nFreeSpace = SAL_MAX_UINT64;
 
     ::rtl::OUString     sBackupPath(SvtPathOptions().GetBackupPath());
-    ::osl::VolumeInfo   aInfo      (VolumeInfoMask_FreeSpace);
+    ::osl::VolumeInfo   aInfo      (osl_VolumeInfo_Mask_FreeSpace);
     ::osl::FileBase::RC aRC         = ::osl::Directory::getVolumeInfo(sBackupPath, aInfo);
 
     if (
-        (aInfo.isValid(VolumeInfoMask_FreeSpace)) &&
+        (aInfo.isValid(osl_VolumeInfo_Mask_FreeSpace)) &&
         (aRC == ::osl::FileBase::E_None         )
        )
     {
@@ -3701,10 +3617,9 @@ void AutoRecovery::impl_flushALLConfigChanges()
             ::comphelper::ConfigurationHelper::flush(xRecoveryCfg);
 
         // SOLAR SAFE ->
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
-        ::utl::ConfigManager* pCfgMgr = ::utl::ConfigManager::GetConfigManager();
-        if (pCfgMgr)
-            pCfgMgr->StoreConfigItems();
+        SolarMutexGuard aGuard;
+        ::utl::ConfigManager& rCfgMgr = ::utl::ConfigManager::GetConfigManager();
+        rCfgMgr.StoreConfigItems();
     }
     catch(const css::uno::Exception&)
         {}
@@ -3719,7 +3634,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL)
     try
     {
         ::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >());
-        aContent.executeCommand(::rtl::OUString::createFromAscii("delete"), css::uno::makeAny(sal_True));
+        aContent.executeCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), css::uno::makeAny(sal_True));
     }
     catch(const css::uno::Exception&)
         {}
@@ -3745,3 +3660,5 @@ void AutoRecovery::st_impl_removeLockFile()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index b8db175886d2..05eb6852c1ba 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,7 @@
 #include <properties.h>
 #include <services.h>
 
-#ifndef _FRAMEWORK_HELPID_HRC
 #include <helpid.hrc>
-#endif
 
 //_______________________________________________
 // interface includes
@@ -70,16 +69,12 @@
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 #include <svl/urihelper.hxx>
 #include <osl/file.hxx>
 #include <unotools/configmgr.hxx>
 
-#ifndef _UTL_BOOTSTRAP_HXX_
 #include <unotools/bootstrap.hxx>
-#endif
 
 namespace framework
 {
@@ -467,17 +462,17 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     // check some required states
     if (m_xFrame.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("already attached"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already attached")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (!xFrame.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("invalid frame reference"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid frame reference")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (!m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("instance seams to be not or wrong initialized"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("instance seams to be not or wrong initialized")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     // safe the frame reference
@@ -504,7 +499,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     Window*     pWindow = VCLUnoHelper::GetWindow(m_xWindow);
 
     // disable full screen mode of the frame!
-    if (pParent->IsFullScreenMode())
+    if (pParent && pParent->IsFullScreenMode())
     {
         pParent->ShowFullScreenMode(sal_False);
         pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL);
@@ -518,17 +513,14 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     {
         xLayoutManager->lock();
         xLayoutManager->createElement( DECLARE_ASCII( "private:resource/menubar/menubar"     ));
-        /* #i85963# new backing window comes withoud standard bar and statusbar
-        xLayoutManager->createElement( DECLARE_ASCII( "private:resource/toolbar/standardbar" ));
-        xLayoutManager->createElement( DECLARE_ASCII( "private:resource/statusbar/statusbar" ));
-        xLayoutManager->showElement  ( DECLARE_ASCII( "private:resource/toolbar/standardbar" ));
-        xLayoutManager->showElement  ( DECLARE_ASCII( "private:resource/statusbar/statusbar" ));
-        */
         xLayoutManager->unlock();
     }
 
-    // set help ID for our canvas
-    pWindow->SetHelpId(HID_BACKINGWINDOW);
+    if (pWindow)
+    {
+        // set help ID for our canvas
+        pWindow->SetHelpId(HID_BACKINGWINDOW);
+    }
 
     // inform BackingWindow about frame
     BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow );
@@ -666,7 +658,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
 
     if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("unexpected source or called twice"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected source or called twice")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     m_xWindow = css::uno::Reference< css::awt::XWindow >();
@@ -760,7 +752,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
     throw(css::uno::RuntimeException)
 {
     throw css::uno::RuntimeException(
-            ::rtl::OUString::createFromAscii("not supported"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not supported")),
             static_cast< ::cppu::OWeakObject* >(this));
 }
 
@@ -807,7 +799,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
 
     if (m_xWindow.is())
         throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii("already initialized"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already initialized")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     css::uno::Reference< css::awt::XWindow > xParentWindow;
@@ -818,7 +810,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
        )
     {
         throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii("wrong or corrupt argument list"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong or corrupt argument list")),
                 static_cast< ::cppu::OWeakObject* >(this));
     }
 
@@ -829,7 +821,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
 
     if (!m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("couldn't create component window"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create component window")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     // start listening for window disposing
@@ -872,3 +864,5 @@ void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& )
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 780efb1f3c6d..14f6dc954588 100755..100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,6 +35,8 @@
 #include "classes/fwkresid.hxx"
 #include <services.h>
 
+#include <sal/macros.h>
+
 #include "vcl/metric.hxx"
 #include "vcl/mnemonic.hxx"
 #include "vcl/menu.hxx"
@@ -45,6 +48,7 @@
 #include "unotools/historyoptions.hxx"
 #include "svtools/imagemgr.hxx"
 #include "svtools/svtools.hrc"
+#include "svtools/langhelp.hxx"
 
 #include "comphelper/processfactory.hxx"
 #include "comphelper/sequenceashashmap.hxx"
@@ -186,7 +190,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     }
 
     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-    String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
     String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
 
@@ -215,12 +218,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
     maToolbox.ShowItem( nItemId_Extensions );
 
-    maToolbox.InsertItem( nItemId_Reg, Image() );
-    maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
-    maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
-    maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
-    maToolbox.ShowItem( nItemId_Reg );
-
     maToolbox.InsertItem( nItemId_Info, Image() );
     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
     maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
@@ -413,14 +410,16 @@ void BackingWindow::initBackground()
     Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
 
     // select image set
-    ImageContainerRes aRes( FwkResId( bDark ? RES_BACKING_IMAGES_HC : RES_BACKING_IMAGES ) );
+    ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) );
 
     // scale middle segment
     Size aMiddleSize;
     if( !! maBackgroundMiddle )
         aMiddleSize = maBackgroundMiddle.GetSizePixel();
     // load middle segment
-    maBackgroundMiddle = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_MIDDLE ) );
+
+    Application::LoadBrandBitmap ("shell/backing_space", maBackgroundMiddle);
+
     // and scale it to previous size
     if( aMiddleSize.Width() && aMiddleSize.Height() )
         maBackgroundMiddle.Scale( aMiddleSize );
@@ -428,16 +427,15 @@ void BackingWindow::initBackground()
     if( GetSettings().GetLayoutRTL() )
     {
         // replace images by RTL versions
-        maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_RIGHT ) );
-        maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_LEFT) );
+        Application::LoadBrandBitmap ("shell/backing_rtl_right", maBackgroundLeft);
+        Application::LoadBrandBitmap ("shell/backing_rtl_left", maBackgroundRight);
     }
     else
     {
-        maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_LEFT ) );
-        maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
+        Application::LoadBrandBitmap ("shell/backing_left", maBackgroundLeft);
+        Application::LoadBrandBitmap ("shell/backing_right", maBackgroundRight);
     }
     maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
-    maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) );
     maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
     maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) );
 
@@ -675,7 +673,7 @@ void BackingWindow::layoutButton(
                           const String& i_rStr
                           )
 {
-    rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) );
+    rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() );
     // setup button
     i_rBtn.SetPaintTransparent( sal_True );
     i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
@@ -694,7 +692,7 @@ void BackingWindow::layoutButton(
     long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
     nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side
-    if( nColumn >= 0 && nColumn < static_cast<int>(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) )
+    if( nColumn >= 0 && nColumn < static_cast<int>(SAL_N_ELEMENTS(mnColumnWidth)) )
     {
         if( nTextWidth > mnColumnWidth[nColumn] )
             mnColumnWidth[nColumn] = nTextWidth;
@@ -958,41 +956,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
                     //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
                     Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) );
                     sURL = value.get<rtl::OUString> ();
-
-                    // extend the URLs with Office locale argument
-                    INetURLObject aURLObj( sURL );
-
-                    rtl::OUString sParam = aURLObj.GetParam();
-                    rtl::OUStringBuffer aURLBuf( sParam );
-                    if ( sParam.getLength() > 0 )
-                        aURLBuf.appendAscii( "&" );
-                    aURLBuf.appendAscii( "lang=" );
-
-                    // read locale from configuration
-                    ::rtl::OUString sLocale;
-                    ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup");
-                    ::rtl::OUString sRelPath = ::rtl::OUString::createFromAscii("L10N");
-                    ::rtl::OUString sKey     = ::rtl::OUString::createFromAscii("ooLocale");
-
-                    try
-                    {
-                        ::comphelper::ConfigurationHelper::readDirectKey(comphelper::getProcessServiceFactory(),
-                                                                         sPackage,
-                                                                         sRelPath,
-                                                                         sKey,
-                                                                         ::comphelper::ConfigurationHelper::E_READONLY) >>= sLocale;
-                    }
-                    catch(const com::sun::star::uno::RuntimeException& exRun)
-                        { throw exRun; }
-                    catch(const com::sun::star::uno::Exception&)
-                    { sLocale = ::rtl::OUString::createFromAscii("en-US"); }
-
-                    aURLBuf.append(sLocale);
-
-                    sParam = aURLBuf.makeStringAndClear();
-
-                    aURLObj.SetParam( sParam );
-                    sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
+                    localizeWebserviceURI(sURL);
 
                     Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
                         comphelper::getProcessServiceFactory()->createInstance(
@@ -1032,8 +996,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
         Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
         PropertyValue* pArg = aArgs.getArray();
-        pArg[0].Name = rtl::OUString::createFromAscii("Referer");
-        pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+        pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+        pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
 
         dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(OPEN_URL) ), rtl::OUString(), xFrame, aArgs );
     }
@@ -1043,8 +1007,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
         Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
         PropertyValue* pArg = aArgs.getArray();
-        pArg[0].Name = rtl::OUString::createFromAscii("Referer");
-        pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+        pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+        pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
 
         dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(TEMPLATE_URL) ), rtl::OUString(), xFrame, aArgs );
     }
@@ -1123,7 +1087,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
     aDispatchURL.Complete = i_rURL;
 
     Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
-        comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+        comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
         com::sun::star::uno::UNO_QUERY );
     if ( xURLTransformer.is() )
     {
@@ -1154,3 +1118,4 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
     }
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 958ebfbb243e..5eebccb80c5f 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -182,3 +183,4 @@ namespace framework
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 3c89661af599..d7c478bc983d 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,19 +34,13 @@
 //_________________________________________________________________________________________________________________
 #include <loadenv/loadenv.hxx>
 
-#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_
 #include <loadenv/targethelper.hxx>
-#endif
 
-#ifndef __FRAMEWORK_DESKTOP_HXX_
 #include <services/desktop.hxx>
-#endif
 #include <helper/ocomponentaccess.hxx>
 #include <dispatch/dispatchprovider.hxx>
 
-#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_
 #include <dispatch/interceptionhelper.hxx>
-#endif
 #include <classes/taskcreator.hxx>
 #include <threadhelp/transactionguard.hxx>
 #include <threadhelp/writeguard.hxx>
@@ -96,9 +91,7 @@
 #include <rtl/logfile.hxx>
 #include <vcl/svapp.hxx>
 
-#ifndef __RSC
 #include <tools/errinf.hxx>
-#endif
 #include <comphelper/extract.hxx>
 
 #include <fwkdllapi.h>
@@ -290,7 +283,14 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >&
 *//*-*************************************************************************************************************/
 Desktop::~Desktop()
 {
-    LOG_ASSERT2( m_bIsTerminated                       ==sal_False, "Desktop::~Desktop()", "Who forgot to terminate the desktop service?" )
+#ifdef ENABLE_ASSERTIONS
+    // Perhaps we should here do use a real assertion, but make the
+    // condition more specific? We don't want it to fire in unit tests
+    // in sc/qa/unit for instance, that don't even have any GUI.
+    if( !m_bIsTerminated )
+        fprintf( stderr, "This used to be an assertion failure: Desktop not terminated before being destructed,\n"
+                 "but it is probably not a real problem.\n" );
+#endif
     LOG_ASSERT2( m_aTransactionManager.getWorkingMode()!=E_CLOSE  , "Desktop::~Desktop()", "Who forgot to dispose this service?"          )
 }
 
@@ -684,13 +684,6 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
 {
     LOG_WARNING("Desktop::getTasks()", "Use of obsolete interface XTaskSupplier")
     return NULL;
-    /*
-    TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
-
-    OTasksAccess* pTasksAccess = new OTasksAccess( this, &m_aChildTaskContainer );
-    css::uno::Reference< css::container::XEnumerationAccess > xAccess( static_cast< ::cppu::OWeakObject* >(pTasksAccess), css::uno::UNO_QUERY );
-    return xAccess;
-    */
 }
 
 /*-************************************************************************************************************//**
@@ -713,11 +706,6 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
 *//*-*************************************************************************************************************/
 css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException )
 {
-    /*
-    TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
-
-    return css::uno::Reference< css::frame::XTask >( m_aChildTaskContainer.getActive(), css::uno::UNO_QUERY );
-    */
     LOG_WARNING("Desktop::getActiveTask()", "Use of obsolete interface XTaskSupplier")
     return NULL;
 }
@@ -757,7 +745,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
     if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 ))
         aCommand = aURL.Path;
 
-    // Make hash_map lookup if the current URL is in the disabled list
+    // Make boost::unordered_map lookup if the current URL is in the disabled list
     if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) )
         return css::uno::Reference< css::frame::XDispatch >();
     else
@@ -1185,8 +1173,14 @@ void SAL_CALL Desktop::dispose()
 {
     // Safe impossible cases
     // It's an programming error if dispose is called before terminate!
-    LOG_ASSERT2( m_bIsTerminated==sal_False, "Desktop::dispose()", "It's not allowed to dispose the desktop before terminate() is called!" )
 
+    // But if you just ignore the assertion (which happens in unit
+    // tests for instance in sc/qa/unit) nothing bad happens.
+#ifdef ENABLE_ASSERTIONS
+    if( !m_bIsTerminated )
+        fprintf( stderr, "This used to be an assertion failure: Desktop disposed before terminating it,\n"
+                 "but nothing bad seems to happen anyway?\n" );
+#endif
     SYNCHRONIZED_START
         WriteGuard aWriteLock( m_aLock );
 
@@ -1787,14 +1781,14 @@ css::uno::Reference< css::lang::XComponent > Desktop::impl_getFrameComponent( co
 *//*-*************************************************************************************************************/
 const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticPropertyDescriptor()
 {
-    // Create a new static property array to initialize sequence!
+    // Create a property array to initialize sequence!
     // Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
     // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!!
     // It's necessary for methods of OPropertySetHelper.
     // ATTENTION:
     //      YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
 
-    static const css::beans::Property pProperties[] =
+    const css::beans::Property pProperties[] =
     {
         css::beans::Property( DESKTOP_PROPNAME_ACTIVEFRAME              , DESKTOP_PROPHANDLE_ACTIVEFRAME             , ::getCppuType((const css::uno::Reference< css::lang::XComponent >*)NULL)                , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
         css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL), css::beans::PropertyAttribute::TRANSIENT ),
@@ -1803,8 +1797,8 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty
         css::beans::Property( DESKTOP_PROPNAME_TITLE                    , DESKTOP_PROPHANDLE_TITLE                   , ::getCppuType((const ::rtl::OUString*)NULL)                                             , css::beans::PropertyAttribute::TRANSIENT ),
     };
     // Use it to initialize sequence!
-    static const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT );
-    // Return static "PropertyDescriptor"
+    const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT );
+    // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
 
@@ -2036,3 +2030,5 @@ sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::la
 #endif  // #ifdef ENABLE_ASSERTIONS
 
 }   // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index be8e666ee9db..4bd3260defcb 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,7 +148,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
     css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
     sal_Int32 nLength = lArguments.getLength();
     aArguments.realloc( nLength + 1 );
-    aArguments[ nLength ].Name = ::rtl::OUString::createFromAscii("SynchronMode");
+    aArguments[ nLength ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode"));
     aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
 
     css::uno::Any aResult;
@@ -167,7 +168,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
         // dispatch it and wait for a notification
         // TODO/MBA: waiting in main thread?!
         xNotifyDispatch->dispatchWithNotification(aURL, aArguments, xListener);
-        //m_aBlock.wait();
         aResult = m_aResult;
     }
     else
@@ -225,3 +225,5 @@ void SAL_CALL DispatchHelper::disposing( const css::lang::EventObject& )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index b9dd626cf06d..6c5a72fd4341 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 #include <services/frame.hxx>
 #include <dispatch/dispatchprovider.hxx>
 
-#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_
 #include <dispatch/interceptionhelper.hxx>
-#endif
 #include <dispatch/closedispatcher.hxx>
 #include <dispatch/windowcommanddispatch.hxx>
 #include <loadenv/loadenv.hxx>
@@ -80,9 +79,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 
-#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -97,9 +94,7 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -297,6 +292,7 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac
         ,   m_bSelfClose                ( sal_False                                         ) // Important!
         ,   m_bIsHidden                 ( sal_True                                          )
         ,   m_xTitleHelper              (                                                   )
+        ,   m_pWindowCommandDispatch    ( 0                                                 )
         ,   m_aChildFrameContainer      (                                                   )
 {
     // Check incoming parameter to avoid against wrong initialization.
@@ -562,7 +558,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     if (!xWindow.is())
         throw css::uno::RuntimeException(
-                    ::rtl::OUString::createFromAscii("Frame::initialize() called without a valid container window reference."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialize() called without a valid container window reference.")),
                     static_cast< css::frame::XFrame* >(this));
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -570,7 +566,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
 
     if ( m_xContainerWindow.is() )
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialized() is called more then once, which isnt usefull nor allowed.")),
                 static_cast< css::frame::XFrame* >(this));
 
     // Look for rejected calls first!
@@ -627,8 +623,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
 
     impl_enablePropertySet();
 
-    // create WindowCommandDispatch; it is supposed to release itself at frame destruction
-    (void)new WindowCommandDispatch(xSMGR, this);
+    m_pWindowCommandDispatch = new WindowCommandDispatch(xSMGR, this);
 
     // Initialize title functionality
     TitleHelper* pTitleHelper = new TitleHelper(xSMGR);
@@ -964,7 +959,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
             //  Search on all our direct siblings - means all childrens of our parent.
             //  Use this flag in combination with TASK. We must supress such upper search if
             //  user has not set it and if we are a top frame.
-            //
             //  Attention: Don't forward this request to our parent as a findFrame() call.
             //  In such case we must protect us against recursive calls.
             //  Use snapshot of our parent. But don't use queryFrames() of XFrames interface.
@@ -1551,9 +1545,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th
 css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
-    // It seems to be unavoidable that disposed frames allow to ask for a Controller (#111452)
-    // Register transaction and reject wrong calls.
-    // TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
@@ -1868,6 +1859,11 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException )
     // We will die, die and die ...
     implts_stopWindowListening();
 
+    if (m_xLayoutManager.is())
+        lcl_disableLayoutManager(m_xLayoutManager, this);
+
+    delete m_pWindowCommandDispatch;
+
     // Send message to all listener and forget her references.
     css::lang::EventObject aEvent( xThis );
     m_aListenerContainer.disposeAndClear( aEvent );
@@ -2092,7 +2088,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
     if ( aURL.Protocol.equalsIgnoreAsciiCaseAsciiL( UNO_PROTOCOL, sizeof( UNO_PROTOCOL )-1 ))
         aCommand = aURL.Path;
 
-    // Make hash_map lookup if the current URL is in the disabled list
+    // Make boost::unordered_map lookup if the current URL is in the disabled list
     if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) )
         return css::uno::Reference< css::frame::XDispatch >();
     else
@@ -2275,7 +2271,6 @@ aEvent
     // Activate the new active path from here to top.
     if( eState == E_INACTIVE )
     {
-//       CheckMenuCloser_Impl();
         setActiveFrame( css::uno::Reference< css::frame::XFrame >() );
         activate();
     }
@@ -2309,8 +2304,7 @@ aEvent
         // Deactivation is always done implicitely by activation of another frame.
         // Only if no activation is done, deactivations have to be processed if the activated window
         // is a parent window of the last active Window!
-        ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() );
-//       CheckMenuCloser_Impl();
+        SolarMutexClearableGuard aSolarGuard;
         Window* pFocusWindow = Application::GetFocusWindow();
         if  (
                 ( xContainerWindow.is()                                                              ==  sal_True    )   &&
@@ -2619,7 +2613,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
                                            const css::uno::Any&   aValue   )
 
 {
-    static ::rtl::OUString MATERIALPROP_TITLE = ::rtl::OUString::createFromAscii("title");
+    static ::rtl::OUString MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"));
 
     /* There is no need to lock any mutex here. Because we share the
        solar mutex with our base class. And we said to our base class: "dont release it on calling us" .-)
@@ -2915,17 +2909,18 @@ void Frame::implts_setIconOnWindow()
         //    Don't forget SolarMutex! We use vcl directly :-(
         //    Check window pointer for right WorkWindow class too!!!
         /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-        ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() );
-        Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow ));
-        if(
-            ( pWindow            != NULL              ) &&
-            ( pWindow->GetType() == WINDOW_WORKWINDOW )
-        )
         {
-            WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
-            pWorkWindow->SetIcon( (sal_uInt16)nIcon );
+            SolarMutexGuard aSolarGuard;
+            Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow ));
+            if(
+                ( pWindow            != NULL              ) &&
+                ( pWindow->GetType() == WINDOW_WORKWINDOW )
+                )
+            {
+                WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
+                pWorkWindow->SetIcon( (sal_uInt16)nIcon );
+            }
         }
-        aSolarGuard.clear();
         /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     }
 }
@@ -3309,3 +3304,5 @@ sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent )
 #endif  // #ifdef ENABLE_ASSERTIONS
 
 }   // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index ef037c75778a..d2368f9eacdc 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -73,26 +73,6 @@ Window DLG_BACKING
 
 Resource RES_BACKING_IMAGES
 {
-    Bitmap BMP_BACKING_BACKGROUND_LEFT
-    {
-        File = "backing.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_MIDDLE
-    {
-        File = "backing_space.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RIGHT
-    {
-        File = "backing_right.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
-    {
-        File = "backing_rtl_left.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
-    {
-        File = "backing_rtl_right.png";
-    };
     Bitmap BMP_BACKING_EXT
     {
         File = "extension.png";
@@ -143,78 +123,6 @@ Resource RES_BACKING_IMAGES
     };
 };
 
-Resource RES_BACKING_IMAGES_HC
-{
-    Bitmap BMP_BACKING_BACKGROUND_LEFT
-    {
-        File = "backing_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_MIDDLE
-    {
-        File = "backing_space_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RIGHT
-    {
-        File = "backing_right_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
-    {
-        File = "backing_rtl_left_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
-    {
-        File = "backing_rtl_right_hc.png";
-    };
-    Bitmap BMP_BACKING_EXT
-    {
-        File = "extension_hc.png";
-    };
-    Bitmap BMP_BACKING_REG
-    {
-        File = "register_hc.png";
-    };
-    Bitmap BMP_BACKING_INFO
-    {
-        File = "info_hc.png";
-    };
-    Bitmap BMP_BACKING_TPLREP
-    {
-        File = "template_hc.png";
-    };
-    Bitmap BMP_BACKING_WRITER
-    {
-        File = "odt_32_hc.png";
-    };
-    Bitmap BMP_BACKING_CALC
-    {
-        File = "ods_32_hc.png";
-    };
-    Bitmap BMP_BACKING_IMPRESS
-    {
-        File = "odp_32_hc.png";
-    };
-    Bitmap BMP_BACKING_DRAW
-    {
-        File = "odg_32_hc.png";
-    };
-    Bitmap BMP_BACKING_DATABASE
-    {
-        File = "odb_32_hc.png";
-    };
-    Bitmap BMP_BACKING_FORMULA
-    {
-        File = "odf_32_hc.png";
-    };
-    Bitmap BMP_BACKING_OPENFILE
-    {
-        File = "folder_32_hc.png";
-    };
-    Bitmap BMP_BACKING_OPENTEMPLATE
-    {
-        File = "templates_32_hc.png";
-    };
-};
-
 Window WIN_TABWINDOW
 {
     OutputSize = TRUE ;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index f140b8e22886..3144df16befa 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,7 +96,7 @@ static const char *szLicensePath = "/share/readme";
 #ifdef UNX
 static const char *szUNXLicenseName = "/LICENSE";
 static const char *szUNXLicenseExt = "";
-#elif defined(WNT) || defined(OS2)
+#elif defined(WNT)
 static const char *szWNTLicenseName = "/license";
 static const char *szWNTLicenseExt = ".txt";
 #endif
@@ -164,22 +165,6 @@ DEFINE_INIT_SERVICE                 (   License,
                                     )
 
 
-#if 0
-IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG )
-{
-    /*
-    Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
-    Reference< XDesktop > xDesktop(xFactory->createInstance(
-        ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY);
-    if (xDesktop.is())
-        xDesktop->terminate();
-    */
-    /*
-    _exit(0);
-    */
-    return 0;
-}
-#endif
 
 static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime)
 {
@@ -226,10 +211,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T");
-    ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-");
-    ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":");
-    ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z");
+    ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+    ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+    ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+    ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
 
     ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
     ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
@@ -273,51 +258,46 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
             Bootstrap::locateBaseInstallation(aBaseInstallPath);
         if (aBaseLocateResult != Bootstrap::PATH_EXISTS)
         {
-            // base install noit found
-            // prepare termination
-            // m_bTerminate = sal_True;
-            // Application::PostUserEvent( STATIC_LINK( 0, License, Terminate ) );
             aRet <<= sal_False;
             return aRet;
         }
         // determine the filename of the license to show
         ::rtl::OUString  aLangString;
         ::com::sun::star::lang::Locale aLocale;
-        ::rtl::OString aMgrName = ::rtl::OString("fwe");
         AllSettings aSettings(Application::GetSettings());
         aLocale = aSettings.GetUILocale();
-        ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+        ResMgr* pResMgr = ResMgr::SearchCreateResMgr("fwe", aLocale);
 
         aLangString = aLocale.Language;
         if ( aLocale.Country.getLength() != 0 )
         {
-            aLangString += ::rtl::OUString::createFromAscii("-");
+            aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
             aLangString += aLocale.Country;
             if ( aLocale.Variant.getLength() != 0 )
             {
-                aLangString += ::rtl::OUString::createFromAscii("-");
+                aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
                 aLangString += aLocale.Variant;
             }
         }
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
         ::rtl::OUString aLicensePath =
             aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
             + ::rtl::OUString::createFromAscii(szWNTLicenseName)
-            + ::rtl::OUString::createFromAscii("_")
+            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
             + aLangString
             + ::rtl::OUString::createFromAscii(szWNTLicenseExt);
 #else
         ::rtl::OUString aLicensePath =
             aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
             + ::rtl::OUString::createFromAscii(szUNXLicenseName)
-            + ::rtl::OUString::createFromAscii("_")
+            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
             + aLangString
             + ::rtl::OUString::createFromAscii(szUNXLicenseExt);
 #endif
         // check if we need to show the license at all
         // open org.openoffice.Setup/Office/ooLicenseAcceptDate
         ::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER;
-        ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+        ::rtl::OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
         ::rtl::OUString sReadSrvc   = SERVICENAME_CFGREADACCESS;
 
         // get configuration provider
@@ -325,26 +305,22 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         m_xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
         Sequence< Any > theArgs(1);
         NamedValue v;
-        v.Name = ::rtl::OUString::createFromAscii("NodePath");
-        v.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office");
+        v.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+        v.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office"));
         theArgs[0] <<= v;
         Reference< XPropertySet > pset = Reference< XPropertySet >(
             theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
 
         // if we find a date there, compare it to baseinstall license date
         ::rtl::OUString aAcceptDate;
-        if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate)
+        if (pset->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate"))) >>= aAcceptDate)
         {
             // get LicenseFileDate from base install
             ::rtl::OUString aLicenseURL = aLicensePath;
-            /*
-            if (FileBase::getFileURLFromSystemPath(aLicensePath, aLicenseURL) != FileBase::E_None)
-                return makeAny(sal_False);
-                */
             DirectoryItem aDirItem;
             if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None)
                 return makeAny(sal_False);
-            FileStatus aStatus(FileStatusMask_All);
+            FileStatus aStatus(osl_FileStatus_Mask_All);
             if (aDirItem.getFileStatus(aStatus) != FileBase::E_None)
                 return makeAny(sal_False);
             TimeValue aTimeVal = aStatus.getModifyTime();
@@ -371,7 +347,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
 
             // write org.openoffice.Setup/ooLicenseAcceptDate
             aAcceptDate = _getCurrentDateString();
-            pset->setPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"), makeAny(aAcceptDate));
+            pset->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate")), makeAny(aAcceptDate));
             Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
 
             // enable quickstarter
@@ -382,7 +358,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
             aSeq[1] <<= bAutostart;
 
             Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY );
             if ( xQuickstart.is() )
                 xQuickstart->initialize( aSeq );
 
@@ -390,10 +366,6 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         }
         else
         {
-            // license was not accepted
-            // prepare termination
-            // m_bTerminate = sal_True;
-            // Application::PostUserEvent( STATIC_LINK( 0, License, Terminate ) );
             aRet <<= sal_False;
         }
     }
@@ -466,17 +438,16 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
 
     // load license text
     File aLicenseFile(aLicensePath);
-    if ( aLicenseFile.open(OpenFlag_Read) == FileBase::E_None)
+    if ( aLicenseFile.open(osl_File_OpenFlag_Read) == FileBase::E_None)
     {
         DirectoryItem d;
         DirectoryItem::get(aLicensePath, d);
-        FileStatus fs(FileStatusMask_FileSize);
+        FileStatus fs(osl_FileStatus_Mask_FileSize);
         d.getFileStatus(fs);
         sal_uInt64 nBytesRead = 0;
         sal_uInt64 nPosition = 0;
         sal_uInt32 nBytes = (sal_uInt32)fs.getFileSize();
         sal_Char *pBuffer = new sal_Char[nBytes];
-        // FileBase RC r = FileBase::E_None;
         while (aLicenseFile.read(pBuffer+nPosition, nBytes-nPosition, nBytesRead) == FileBase::E_None
             && nPosition + nBytesRead < nBytes)
         {
@@ -629,3 +600,4 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 }       //  namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 1033cbda7913..8e62ee50f1b4 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,7 +86,6 @@ DEFINE_INIT_SERVICE                 (   MediaTypeDetectionHelper,
 //   XStringMapping
 //*****************************************************************************************************************
 
-//virtual
 sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(
         uno::Sequence< OUString >& rSeq )
         throw(uno::RuntimeException)
@@ -109,3 +109,4 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(
 
 }   // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/modelwinservice.cxx b/framework/source/services/modelwinservice.cxx
index d50fe7dcc653..52c5d9c864f0 100755..100644
--- a/framework/source/services/modelwinservice.cxx
+++ b/framework/source/services/modelwinservice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -277,3 +278,5 @@ throw( uno::RuntimeException )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 396a9650e3f7..f1ab43668bd6 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,8 +56,8 @@
 namespace framework
 {
 
-static const ::rtl::OUString CFGPATH_FACTORIES     = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static const ::rtl::OUString MODULEPROP_IDENTIFIER = ::rtl::OUString::createFromAscii("ooSetupFactoryModuleIdentifier" );
+static const ::rtl::OUString CFGPATH_FACTORIES    (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier"));
 
 /*-----------------------------------------------
     04.12.2003 09:32
@@ -145,7 +146,7 @@ ModuleManager::~ModuleManager()
        )
     {
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Given module is not a frame nor a window, controller or model."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Given module is not a frame nor a window, controller or model.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
     }
@@ -175,7 +176,7 @@ ModuleManager::~ModuleManager()
 
     if (sModule.getLength() < 1)
         throw css::frame::UnknownModuleException(
-                ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find suitable module for the given component.")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     return sModule;
@@ -195,7 +196,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     if (lProps.empty() )
     {
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("No properties given to replace part of module."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No properties given to replace part of module.")),
                 static_cast< css::container::XNameAccess* >(this),
                 2);
     }
@@ -209,7 +210,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     // get access to the element
     // Note: Dont use impl_getConfig() method here. Because it creates a readonly access only, further
     // it cache it as a member of this module manager instance. If we change some props there ... but dont
-    // flush changes (because an error occured) we will read them later. If we use a different config access
+    // flush changes (because an error occurred) we will read them later. If we use a different config access
     // we can close it without a flush ... and our read data wont be affected .-)
     css::uno::Reference< css::uno::XInterface >         xCfg      = ::comphelper::ConfigurationHelper::openConfig(
                                                                         xSMGR,
@@ -222,7 +223,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
                 static_cast< css::container::XNameAccess* >(this));
     }
 
@@ -257,7 +258,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
                 static_cast< css::container::XNameAccess* >(this));
     }
 
@@ -423,3 +424,5 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index baf3a785c5e6..88163253fc2c 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,6 +40,8 @@
 #include <threadhelp/writeguard.hxx>
 #include <services.h>
 
+#include "helper/mischelper.hxx"
+
 // ______________________________________________
 // interface includes
 #include <com/sun/star/beans/Property.hpp>
@@ -64,10 +67,8 @@
 
 #define CFG_READONLY_DEFAULT    sal_False
 
-const ::rtl::OUString CFGPROP_INTERNALPATHES = ::rtl::OUString::createFromAscii("InternalPaths");
-const ::rtl::OUString CFGPROP_USERPATHES     = ::rtl::OUString::createFromAscii("UserPaths"    );
-const ::rtl::OUString CFGPROP_WRITEPATH      = ::rtl::OUString::createFromAscii("WritePath"    );
-const ::rtl::OUString CFGPROP_ISSINGLEPATH   = ::rtl::OUString::createFromAscii("IsSinglePath" );
+const ::rtl::OUString CFGPROP_USERPATHES(RTL_CONSTASCII_USTRINGPARAM("UserPaths"));
+const ::rtl::OUString CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM("WritePath"));
 
 /*
     0 : old style              "Template"              string using ";" as seperator
@@ -76,9 +77,9 @@ const ::rtl::OUString CFGPROP_ISSINGLEPATH   = ::rtl::OUString::createFromAscii(
     3 : write path             "Template_write"        string
  */
 
-const ::rtl::OUString POSTFIX_INTERNAL_PATHES = ::rtl::OUString::createFromAscii("_internal");
-const ::rtl::OUString POSTFIX_USER_PATHES     = ::rtl::OUString::createFromAscii("_user"    );
-const ::rtl::OUString POSTFIX_WRITE_PATH      = ::rtl::OUString::createFromAscii("_writable");
+const ::rtl::OUString POSTFIX_INTERNAL_PATHES(RTL_CONSTASCII_USTRINGPARAM("_internal"));
+const ::rtl::OUString POSTFIX_USER_PATHES(RTL_CONSTASCII_USTRINGPARAM("_user"));
+const ::rtl::OUString POSTFIX_WRITE_PATH(RTL_CONSTASCII_USTRINGPARAM("_writable"));
 
 const sal_Int32 IDGROUP_OLDSTYLE        = 0;
 const sal_Int32 IDGROUP_INTERNAL_PATHES = 1;
@@ -162,6 +163,9 @@ PathSettings::PathSettings( const css::uno::Reference< css::lang::XMultiServiceF
 //-----------------------------------------------------------------------------
 PathSettings::~PathSettings()
 {
+    css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfgNew, css::uno::UNO_QUERY);
+    if (xBroadcaster.is())
+        xBroadcaster->removeChangesListener(m_xCfgNewListener);
     if (m_pPropHelp)
        delete m_pPropHelp;
 }
@@ -171,10 +175,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
     throw (css::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::changesOccurred" );
-    /*
-    if (m_bIgnoreEvents)
-        return;
-    */
 
     sal_Int32 c                 = aEvent.Changes.getLength();
     sal_Int32 i                 = 0;
@@ -208,14 +208,12 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
     throw(css::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::disposing" );
-    // SAFE ->
     WriteGuard aWriteLock(m_aLock);
 
     if (aSource.Source == m_xCfgNew)
         m_xCfgNew.clear();
 
     aWriteLock.unlock();
-    // <- SAFE
 }
 
 //-----------------------------------------------------------------------------
@@ -224,17 +222,21 @@ void PathSettings::impl_readAll()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readAll" );
     RTL_LOGFILE_CONTEXT(aLog, "framework (as96863) ::PathSettings::load config (all)");
 
-    // TODO think about me
-    css::uno::Reference< css::container::XNameAccess > xCfg    = fa_getCfgNew();
-    css::uno::Sequence< ::rtl::OUString >              lPaths = xCfg->getElementNames();
-
-    sal_Int32 c = lPaths.getLength();
-    sal_Int32 i = 0;
+    try
+    {
+        // TODO think about me
+        css::uno::Reference< css::container::XNameAccess > xCfg    = fa_getCfgNew();
+        css::uno::Sequence< ::rtl::OUString >              lPaths = xCfg->getElementNames();
 
-    for (i=0; i<c; ++i)
+        sal_Int32 c = lPaths.getLength();
+        for (sal_Int32 i = 0; i < c; ++i)
+        {
+            const ::rtl::OUString& sPath = lPaths[i];
+            impl_updatePath(sPath, sal_False);
+        }
+    }
+    catch(const css::uno::RuntimeException& )
     {
-        const ::rtl::OUString& sPath = lPaths[i];
-        impl_updatePath(sPath, sal_False);
     }
 
     impl_rebuildPropertyDescriptor();
@@ -272,6 +274,9 @@ OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath)
 // NO substitution here ! It's done outside ...
 PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& sPath)
 {
+    const static ::rtl::OUString CFGPROP_INTERNALPATHES(RTL_CONSTASCII_USTRINGPARAM("InternalPaths"));
+    const static ::rtl::OUString CFGPROP_ISSINGLEPATH(RTL_CONSTASCII_USTRINGPARAM("IsSinglePath"));
+
     css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew();
 
     // get access to the "queried" path
@@ -301,7 +306,6 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s
     {
         css::beans::Property aInfo = xInfo->getAsProperty();
         sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY  ) == css::beans::PropertyAttribute::READONLY  );
-        //sal_Bool bMandatory = ((aInfo.Attributes & css::beans::PropertyAttribute::REMOVEABLE) != css::beans::PropertyAttribute::REMOVEABLE);
 
         // Note: Till we support finalized / mandatory on our API more in detail we handle
         // all states simple as READONLY ! But because all realy needed pathes are "mandatory" by default
@@ -939,17 +943,6 @@ void PathSettings::impl_setPathValue(      sal_Int32      nID ,
 
     // TODO check if path has at least one path value set
     // At least it depends from the feature using this path, if an empty path list is allowed.
-    /*
-    if (impl_isPathEmpty(aChangePath))
-    {
-        ::rtl::OUStringBuffer sMsg(256);
-        sMsg.appendAscii("The path '"    );
-        sMsg.append     (aChangePath.sPathName);
-        sMsg.appendAscii("' is empty now ... Not a real good idea.");
-        throw css::uno::Exception(sMsg.makeStringAndClear(),
-                                  static_cast< ::cppu::OWeakObject* >(this));
-    }
-    */
 
     // first we should try to store the changed (copied!) path ...
     // In case an error occure on saving time an exception is thrown ...
@@ -1124,7 +1117,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti
 //-----------------------------------------------------------------------------
 css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld()
 {
-    const static ::rtl::OUString CFG_NODE_OLD = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Path/Current");
+    const static ::rtl::OUString CFG_NODE_OLD(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Path/Current"));
 
     // SAFE ->
     ReadGuard aReadLock(m_aLock);
@@ -1154,7 +1147,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld()
 //-----------------------------------------------------------------------------
 css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew()
 {
-    const static ::rtl::OUString CFG_NODE_NEW = ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths/Paths");
+    const static ::rtl::OUString CFG_NODE_NEW(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths/Paths"));
 
     // SAFE ->
     ReadGuard aReadLock(m_aLock);
@@ -1175,13 +1168,16 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew()
         // SAFE ->
         WriteGuard aWriteLock(m_aLock);
         m_xCfgNew = xCfg;
+        m_xCfgNewListener = new WeakChangesListener(this);
         aWriteLock.unlock();
 
         css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(xCfg, css::uno::UNO_QUERY_THROW);
-        xBroadcaster->addChangesListener(static_cast< css::util::XChangesListener* >(this));
+        xBroadcaster->addChangesListener(m_xCfgNewListener);
     }
 
     return xCfg;
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 42a2637f823e..1adfea3af683 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 //_______________________________________________
 // my own includes
 
-#ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_
 #include <services/sessionlistener.hxx>
-#endif
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <protocols.h>
@@ -85,8 +84,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
 namespace framework{
 
 //_______________________________________________
@@ -165,7 +164,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
         css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
         css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
         URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave"));
         xURLTransformer->parseStrict(aURL);
 
         // in case of asynchronous call the notification will trigger saveDone()
@@ -173,11 +172,11 @@ void SessionListener::StoreSession( sal_Bool bAsync )
             xDispatch->addStatusListener(this, aURL);
 
         Sequence< PropertyValue > args(1);
-        args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
+        args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
         xDispatch->dispatch(aURL, args);
     } catch (com::sun::star::uno::Exception& e) {
         OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
-        OSL_ENSURE(sal_False, aMsg.getStr());
+        OSL_FAIL(aMsg.getStr());
         // save failed, but tell manager to go on if we havent yet dispatched the request
         // in case of synchronous saving the notification is done by the caller
         if ( bAsync && m_rSessionManager.is() )
@@ -197,15 +196,15 @@ void SessionListener::QuitSessionQuietly()
         css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
         css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
         URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionQuietQuit");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionQuietQuit"));
         xURLTransformer->parseStrict(aURL);
 
         Sequence< PropertyValue > args(1);
-        args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
+        args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
         xDispatch->dispatch(aURL, args);
     } catch (com::sun::star::uno::Exception& e) {
         OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
-        OSL_ENSURE(sal_False, aMsg.getStr());
+        OSL_FAIL(aMsg.getStr());
     }
 }
 
@@ -217,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
     throw (RuntimeException)
 {
 
-    OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient");
+    OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient"));
     if (args.getLength() > 0)
     {
         NamedValue v;
@@ -225,11 +224,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
         {
             if (args[i] >>= v)
             {
-                if (v.Name.equalsAscii("SessionManagerName"))
+                if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName")))
                     v.Value >>= aSMgr;
-                else if (v.Name.equalsAscii("SessionManager"))
+                else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager")))
                     v.Value >>= m_rSessionManager;
-                else if (v.Name.equalsAscii("AllowUserInteractionOnQuit"))
+                else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AllowUserInteractionOnQuit")))
                     v.Value >>= m_bAllowUserInteractionOnQuit;
             }
         }
@@ -247,14 +246,13 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
 void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
     throw (css::uno::RuntimeException)
 {
-   if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionRestore"))
+   if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")))
     {
         if (event.FeatureDescriptor.compareToAscii("update")==0)
             m_bRestored = sal_True; // a document was restored
-        // if (event.FeatureDescriptor.compareToAscii("stop")==0)
 
     }
-    else if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionSave"))
+    else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")))
     {
         if (event.FeatureDescriptor.compareToAscii("stop")==0)
         {
@@ -274,7 +272,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
         css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
 
         URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore"));
         css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
         xURLTransformer->parseStrict(aURL);
         Sequence< PropertyValue > args;
@@ -284,7 +282,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
 
     } catch (com::sun::star::uno::Exception& e) {
         OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
-        OSL_ENSURE(sal_False, aMsg.getStr());
+        OSL_FAIL(aMsg.getStr());
     }
 
     return m_bRestored;
@@ -366,3 +364,5 @@ void SessionListener::doQuit()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index b66d21cfe81c..bded3d54af72 100755..100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,14 +49,12 @@
 #include <unotools/localfilehelper.hxx>
 #include <unotools/configmgr.hxx>
 
-#ifndef _UTL_BOOTSTRAP_HXX_
 #include <unotools/bootstrap.hxx>
-#endif
 #include <osl/mutex.hxx>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <osl/socket.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <i18npool/mslangid.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/resmgr.hxx>
@@ -71,7 +70,6 @@
 //_________________________________________________________________________________________________________________
 //      Defines
 //_________________________________________________________________________________________________________________
-//
 
 #define STRPOS_NOTFOUND                  (sal_Int32)-1
 
@@ -102,10 +100,9 @@
 #define REPLACELENGTH_LANGID             9
 #define REPLACELENGTH_VLANG              8
 #define REPLACELENGTH_WORKDIRURL        13
-// --> PB 2004-10-27 #i32656# - new variable of hierachy service
+// New variable of hierachy service (#i32656#)
 #define REPLACELENGTH_BASEINSTURL       14
 #define REPLACELENGTH_USERDATAURL       14
-// <--
 
 // Name of the pre defined path variables
 #define VARIABLE_INST                                   "$(inst)"
@@ -125,10 +122,9 @@
 #define VARIABLE_PROGURL                                "$(progurl)"
 #define VARIABLE_USERURL                                "$(userurl)"
 #define VARIABLE_WORKDIRURL                             "$(workdirurl)"
-// --> PB 2004-10-27 #i32656# - new variable of hierachy service
+// New variable of hierachy service (#i32656#)
 #define VARIABLE_BASEINSTURL                            "$(baseinsturl)"
 #define VARIABLE_USERDATAURL                            "$(userdataurl)"
-// <--
 #define VARIABLE_BRANDBASEURL                           "$(brandbaseurl)"
 
 using namespace com::sun::star::uno;
@@ -140,7 +136,6 @@ using namespace com::sun::star::container;
 //_________________________________________________________________________________________________________________
 //      Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -217,17 +212,15 @@ static FixedVariable aFixedVarTable[] =
     { VARIABLE_PROGURL,     PREDEFVAR_PROGURL,      REPLACELENGTH_PROGURL,  true                       },
     { VARIABLE_USERURL,     PREDEFVAR_USERURL,      REPLACELENGTH_USERURL,  true                       },
     { VARIABLE_WORKDIRURL,  PREDEFVAR_WORKDIRURL,   REPLACELENGTH_WORKDIRURL,true                      },  // Special variable (transient) and don't use for resubstitution!
-    // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL,  REPLACELENGTH_BASEINSTURL,true                     },
     { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL,  REPLACELENGTH_USERDATAURL,true                     },
-    // <--
     { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true }
 };
 
 //_________________________________________________________________________________________________________________
 //      Implementation helper classes
 //_________________________________________________________________________________________________________________
-//
 
 OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const rtl::OUString& aOSString )
 {
@@ -288,7 +281,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu
         while ( nSharePoints < aSharePointNames.getLength() )
         {
             rtl::OUString aSharePointNodeName( m_aSharePointsNodeName );
-            aSharePointNodeName += rtl::OUString::createFromAscii( "/" );
+            aSharePointNodeName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
             aSharePointNodeName += aSharePointNames[ nSharePoints ];
 
             SubstituteRuleVector aRuleSet;
@@ -324,7 +317,6 @@ void SubstitutePathVariables_Impl::Commit()
 //_________________________________________________________________________________________________________________
 //      private methods
 //_________________________________________________________________________________________________________________
-//
 
 OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
 {
@@ -642,7 +634,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService
 
     // Sort user variables to path length
     SubstituteVariables::const_iterator pIter;
-    for ( pIter = m_aSubstVarMap.begin(); pIter != m_aSubstVarMap.end(); pIter++ )
+    for ( pIter = m_aSubstVarMap.begin(); pIter != m_aSubstVarMap.end(); ++pIter )
     {
         ReSubstUserVarOrder aUserOrderVar;
         rtl::OUStringBuffer aStrBuffer( pIter->second.aSubstVariable.getLength() );
@@ -688,7 +680,6 @@ throw ( NoSuchElementException, RuntimeException )
 //_________________________________________________________________________________________________________________
 //      protected methods
 //_________________________________________________________________________________________________________________
-//
 
 IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNotify*, EMPTYARG )
 {
@@ -718,12 +709,24 @@ rtl::OUString SubstitutePathVariables::GetWorkPath() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkPath" );
         rtl::OUString aWorkPath;
-    ::comphelper::ConfigurationHelper::readDirectKey(
+
+    try
+    {
+        ::comphelper::ConfigurationHelper::readDirectKey(
                             m_xServiceManager,
-                            ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths"),
-                            ::rtl::OUString::createFromAscii("Paths/Work"),
-                            ::rtl::OUString::createFromAscii("WritePath"),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Paths/Work")),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")),
                             ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath;
+    }
+    catch(RuntimeException &)
+    {
+    }
+
+    // fallback in case config layer does not return an useable work dir value.
+    if (aWorkPath.getLength() < 1)
+        aWorkPath = GetWorkVariableValue();
+
     return aWorkPath;
 }
 
@@ -731,12 +734,19 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkVariableValue" );
     ::rtl::OUString aWorkPath;
-    ::comphelper::ConfigurationHelper::readDirectKey(
+
+    try
+    {
+        ::comphelper::ConfigurationHelper::readDirectKey(
                             m_xServiceManager,
-                            ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths"),
-                            ::rtl::OUString::createFromAscii("Variables"),
-                            ::rtl::OUString::createFromAscii("Work"),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Variables")),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Work")),
                             ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath;
+    }
+    catch(RuntimeException &)
+    {
+    }
 
     // fallback to $HOME in case platform dependend config layer does not return
     // an usuable work dir value.
@@ -1032,7 +1042,7 @@ throw ( RuntimeException )
     while ( !bResubstitutionCompleted )
     {
         ReSubstFixedVarOrderVector::const_iterator pIterFixed;
-        for ( pIterFixed = m_aReSubstFixedVarOrder.begin(); pIterFixed != m_aReSubstFixedVarOrder.end(); pIterFixed++ )
+        for ( pIterFixed = m_aReSubstFixedVarOrder.begin(); pIterFixed != m_aReSubstFixedVarOrder.end(); ++pIterFixed )
         {
             rtl::OUString aValue = m_aPreDefVars.m_FixedVar[ (sal_Int32)pIterFixed->eVariable ];
             sal_Int32 nPos = aURL.indexOf( aValue );
@@ -1072,7 +1082,7 @@ throw ( RuntimeException )
 
         // This part can be iteratered more than one time as variables can contain variables again!
         ReSubstUserVarOrderVector::const_iterator pIterUser;
-        for ( pIterUser = m_aReSubstUserVarOrder.begin(); pIterUser != m_aReSubstUserVarOrder.end(); pIterUser++ )
+        for ( pIterUser = m_aReSubstUserVarOrder.begin(); pIterUser != m_aReSubstUserVarOrder.end(); ++pIterUser )
         {
             rtl::OUString aVarValue = pIterUser->aVarName;
             sal_Int32 nPos = aURL.indexOf( aVarValue );
@@ -1186,16 +1196,14 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
     // Set $(inst), $(instpath), $(insturl)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ]    = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ]       = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
-    // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
-    // <--
 
     // Set $(user), $(userpath), $(userurl)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ]    = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ]       = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
-    // --> PB 2004-11-11 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
-    // <--
 
     // Detect the program directory
     // Set $(prog), $(progpath), $(progurl)
@@ -1211,12 +1219,13 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
     // Detect the language type of the current office
     aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US;
     rtl::OUString aLocaleStr;
-    if ( utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr )
+    if ( utl::ConfigManager::GetConfigManager().GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr )
         aPreDefPathVariables.m_eLanguageType = MsLangId::convertIsoStringToLanguage( aLocaleStr );
-    else
-    {
-        LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Wrong Any type for language!" );
-    }
+    // We used to have an else branch here with a LOG_ERROR, but that
+    // always fired in some unit tests when this code was built with
+    // debug=t, so it seems fairly pointless, especially as
+    // aPreDefPathVariables.m_eLanguageType has been initialized to a
+    // default value above anyway.
 
     // Set $(lang)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANG ] = ConvertOSLtoUCBURL(
@@ -1252,3 +1261,5 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index ef29214bc229..2677ca60fbfd 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -322,7 +323,7 @@ void TabWindowService::impl_initializePropInfo()
 
     impl_addPropertyInfo(
         css::beans::Property(
-            TABWINDOWSERVICE_PROPNAME_WINDOW,
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window")),
             TABWINDOWSERVICE_PROPHANDLE_WINDOW,
             ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL),
             css::beans::PropertyAttribute::TRANSIENT));
@@ -440,7 +441,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
        )
     {
         throw css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
                 css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
     }
 }
@@ -454,7 +455,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
     TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID);
     if (pIt == m_lTabPageInfos.end ())
         throw css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
                 css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
     return pIt;
 }
@@ -483,3 +484,5 @@ FwkTabWindow* TabWindowService::mem_TabWin ()
 }
 
 } //    namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 90bcdb93efbf..bacbd8e74ee3 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,9 +56,7 @@
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx>
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/window.hxx>
 
 //_______________________________________________
@@ -67,14 +66,14 @@ namespace framework
 {
 
 //-----------------------------------------------
-const ::rtl::OUString TaskCreatorService::ARGUMENT_PARENTFRAME                   = ::rtl::OUString::createFromAscii("ParentFrame"                   ); // XFrame
-const ::rtl::OUString TaskCreatorService::ARGUMENT_FRAMENAME                     = ::rtl::OUString::createFromAscii("FrameName"                     ); // OUString
-const ::rtl::OUString TaskCreatorService::ARGUMENT_MAKEVISIBLE                   = ::rtl::OUString::createFromAscii("MakeVisible"                   ); // sal_Bool
-const ::rtl::OUString TaskCreatorService::ARGUMENT_CREATETOPWINDOW               = ::rtl::OUString::createFromAscii("CreateTopWindow"               ); // sal_Bool
-const ::rtl::OUString TaskCreatorService::ARGUMENT_POSSIZE                       = ::rtl::OUString::createFromAscii("PosSize"                       ); // Rectangle
-const ::rtl::OUString TaskCreatorService::ARGUMENT_CONTAINERWINDOW               = ::rtl::OUString::createFromAscii("ContainerWindow"               ); // XWindow
-const ::rtl::OUString TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE  = ::rtl::OUString::createFromAscii("SupportPersistentWindowState"  ); // sal_Bool
-const ::rtl::OUString TaskCreatorService::ARGUMENT_ENABLE_TITLEBARUPDATE         = ::rtl::OUString::createFromAscii("EnableTitleBarUpdate"          ); // sal_Bool
+const ::rtl::OUString TaskCreatorService::ARGUMENT_PARENTFRAME(RTL_CONSTASCII_USTRINGPARAM("ParentFrame")); // XFrame
+const ::rtl::OUString TaskCreatorService::ARGUMENT_FRAMENAME(RTL_CONSTASCII_USTRINGPARAM("FrameName")); // OUString
+const ::rtl::OUString TaskCreatorService::ARGUMENT_MAKEVISIBLE(RTL_CONSTASCII_USTRINGPARAM("MakeVisible")); // sal_Bool
+const ::rtl::OUString TaskCreatorService::ARGUMENT_CREATETOPWINDOW(RTL_CONSTASCII_USTRINGPARAM("CreateTopWindow")); // sal_Bool
+const ::rtl::OUString TaskCreatorService::ARGUMENT_POSSIZE(RTL_CONSTASCII_USTRINGPARAM("PosSize")); // Rectangle
+const ::rtl::OUString TaskCreatorService::ARGUMENT_CONTAINERWINDOW(RTL_CONSTASCII_USTRINGPARAM("ContainerWindow")); // XWindow
+const ::rtl::OUString TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE(RTL_CONSTASCII_USTRINGPARAM("SupportPersistentWindowState")); // sal_Bool
+const ::rtl::OUString TaskCreatorService::ARGUMENT_ENABLE_TITLEBARUPDATE(RTL_CONSTASCII_USTRINGPARAM("EnableTitleBarUpdate")); // sal_Bool
 
 //-----------------------------------------------
 DEFINE_XINTERFACE_3(TaskCreatorService                                ,
@@ -176,8 +175,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
         xContainerWindow = implts_createContainerWindow(xParentWindow, aPosSize, bCreateTopWindow);
     }
 
-    //------------------->
-    // HACK  #125187# + #i53630#
+    // #i53630#
     // Mark all document windows as "special ones", so VCL can bind
     // special features to it. Because VCL doesnt know anything about documents ...
     // Note: Doing so it's no longer supported, that e.g. our wizards can use findFrame(_blank)
@@ -228,11 +226,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
 void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const
 {
     // SYNCHRONIZED ->
-    ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     Window* pVCLWindow = VCLUnoHelper::GetWindow(xWindow);
     if (pVCLWindow)
         pVCLWindow->SetExtendedStyle(WB_EXT_DOCUMENT);
-    aSolarGuard.clear();
     // <- SYNCHRONIZED
 }
 
@@ -265,7 +262,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
     if (bTopWindow)
     {
         aDescriptor.Type                =   css::awt::WindowClass_TOP                       ;
-        aDescriptor.WindowServiceName   =   DECLARE_ASCII("window")                         ;
+        aDescriptor.WindowServiceName   =   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window"));
         aDescriptor.ParentIndex         =   -1                                              ;
         aDescriptor.Parent              =   css::uno::Reference< css::awt::XWindowPeer >()  ;
         aDescriptor.Bounds              =   aPosSize                                        ;
@@ -278,7 +275,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
     else
     {
         aDescriptor.Type                =   css::awt::WindowClass_TOP                       ;
-        aDescriptor.WindowServiceName   =   DECLARE_ASCII("dockingwindow")                  ;
+        aDescriptor.WindowServiceName   =   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dockingwindow"));
         aDescriptor.ParentIndex         =   1                                               ;
         aDescriptor.Parent              =   xParentWindowPeer                               ;
         aDescriptor.Bounds              =   aPosSize                                        ;
@@ -289,7 +286,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
     css::uno::Reference< css::awt::XWindowPeer > xPeer      = xToolkit->createWindow( aDescriptor );
     css::uno::Reference< css::awt::XWindow >     xWindow    ( xPeer, css::uno::UNO_QUERY );
     if ( ! xWindow.is())
-        throw css::uno::Exception(::rtl::OUString::createFromAscii("TaskCreator service was not able to create suitable frame window."),
+        throw css::uno::Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TaskCreator service was not able to create suitable frame window.")),
                                   static_cast< ::cppu::OWeakObject* >(this));
     if (bTopWindow)
         xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor);
@@ -402,3 +399,5 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 1c89870c429d..31bf228b0c8e 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,4 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index cac8e7e359ca..01e52f0f30cd 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -349,7 +350,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
         if ( !bWithPassword && aTestURL.Password.getLength() > 0 )
         {
             // Exchange password text with other placeholder string
-            aTestURL.Password = ::rtl::OUString::createFromAscii( "<******>" );
+            aTestURL.Password = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<******>"));
             assemble( aTestURL );
         }
 
@@ -370,3 +371,4 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
 
 }       //  namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index d304de99122f..9f22997dc4d9 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,17 +52,14 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <comphelper/sequenceashashmap.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
-using namespace rtl;
+using ::rtl::OUString;
 using namespace com::sun::star;
 
 namespace framework
@@ -421,7 +419,7 @@ throw (css::uno::Exception, css::uno::RuntimeException)
 
                     xWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, css::awt::PosSize::POSSIZE );
 
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if( pWindow )
                         pWindow->Show( sal_True );
@@ -949,14 +947,14 @@ throw ( css::uno::RuntimeException )
 
 const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticPropertyDescriptor()
 {
-    // Create a new static property array to initialize sequence!
+    // Create property array to initialize sequence!
     // Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
     // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!!
     // It's necessary for methods of OPropertySetHelper.
     // ATTENTION:
     //      YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
 
-    static const com::sun::star::beans::Property pProperties[] =
+    const com::sun::star::beans::Property pProperties[] =
     {
         com::sun::star::beans::Property( TABWINDOW_PROPNAME_PARENTWINDOW,
                                          TABWINDOW_PROPHANDLE_PARENTWINDOW,
@@ -967,10 +965,12 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper
                                          ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL),
                                          com::sun::star::beans::PropertyAttribute::READONLY  )
     };  // Use it to initialize sequence!
-    static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT );
+    const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT );
 
-    // Return static "PropertyDescriptor"
+    // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 87d48ddac7aa..2c4710209f7c 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,9 +54,8 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
-using namespace rtl;
+using ::rtl::OUString;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -174,3 +174,5 @@ throw ( css::uno::Exception, css::uno::RuntimeException )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 6e3b8d85e662..f246cb9365a0 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,15 +58,14 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
-using namespace rtl;
 using namespace ::com::sun::star;
 
+using ::rtl::OUString;
+
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 static const char GLOBALSETTINGS_ROOT_ACCESS[]              = "/org.openoffice.Office.UI.GlobalSettings/Toolbars";
 
@@ -354,3 +354,5 @@ sal_Bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eSt
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 3ba90227b2f5..802a6507a1fa 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,5 @@ throw( uno::RuntimeException )
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 776af9982de4..ba0b7fea77da 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,7 +109,7 @@ DEFINE_INIT_SERVICE                     (   ImageManager, {} )
 
 ImageManager::ImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) :
     ThreadHelpBase( &Application::GetSolarMutex() )
-    , m_pImpl( new ImageManagerImpl(xServiceManager,static_cast< OWeakObject* >(this),false) )
+    , m_pImpl( new ImageManagerImpl(xServiceManager,this,false) )
 {
 }
 
@@ -253,3 +254,5 @@ sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::Runti
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index d0caee82297e..9ab06fe0875e 100755..100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,11 +62,8 @@
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
 #include <rtl/logfile.hxx>
-#include "svtools/miscopt.hxx"
-
-//_________________________________________________________________________________________________________________
-//  namespaces
-//_________________________________________________________________________________________________________________
+#include <rtl/instance.hxx>
+#include <svtools/miscopt.hxx>
 
 using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
@@ -88,54 +86,46 @@ using namespace ::cppu;
 // Image sizes for our toolbars/menus
 const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
 const sal_Int32 IMAGE_SIZE_LARGE          = 26;
-const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
-                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
+const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::SIZE_LARGE;
 
 static const char   IMAGE_FOLDER[]        = "images";
 static const char   BITMAPS_FOLDER[]      = "Bitmaps";
 static const char   IMAGE_EXTENSION[]     = ".png";
 
+static const char   ModuleImageList[]     = "private:resource/images/moduleimages";
+
 static const char*  IMAGELIST_XML_FILE[]  =
 {
     "sc_imagelist.xml",
-    "lc_imagelist.xml",
-    "sch_imagelist.xml",
-    "lch_imagelist.xml"
+    "lc_imagelist.xml"
 };
 
 static const char*  BITMAP_FILE_NAMES[]   =
 {
     "sc_userimages.png",
-    "lc_userimages.png",
-    "sch_userimages.png",
-    "lch_userimages.png"
+    "lc_userimages.png"
 };
 
 namespace framework
 {
-    static char ModuleImageList[] = "private:resource/images/moduleimages";
-    static osl::Mutex*          pImageListWrapperMutex = 0;
     static GlobalImageList*     pGlobalImageList = 0;
     static const char* ImageType_Prefixes[ImageType_COUNT] =
     {
-        "res/commandimagelist/sc_",
-        "res/commandimagelist/lc_",
-        "res/commandimagelist/sch_",
-        "res/commandimagelist/lch_"
+        "cmd/sc_",
+        "cmd/lc_"
     };
 
 typedef GraphicNameAccess CmdToXGraphicNameAccess;
 
-static osl::Mutex& getGlobalImageListMutex()
+namespace
 {
-    if ( pImageListWrapperMutex == 0 )
-    {
-        osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-        if ( pImageListWrapperMutex == 0 )
-            pImageListWrapperMutex = new osl::Mutex;
-    }
+    class theGlobalImageListMutex
+        : public rtl::Static<osl::Mutex, theGlobalImageListMutex> {};
+}
 
-    return *pImageListWrapperMutex;
+static osl::Mutex& getGlobalImageListMutex()
+{
+    return theGlobalImageListMutex::get();
 }
 
 static GlobalImageList* getGlobalImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager )
@@ -217,7 +207,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
                 if ( xCmdDesc.is() )
                     xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
             }
-            catch ( NoSuchElementException& )
+            catch ( const NoSuchElementException& )
             {
                 // Module unknown we will work with an empty command image list!
                 return;
@@ -230,10 +220,10 @@ void CmdImageList::impl_fillCommandToImageNameMap()
             {
                 xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
             }
-            catch ( NoSuchElementException& )
+            catch ( const NoSuchElementException& )
             {
             }
-            catch ( WrappedTargetException& )
+            catch ( const WrappedTargetException& )
             {
             }
         }
@@ -427,8 +417,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra
     Size   aSize = aImage.GetSizePixel();
     bool   bMustScale( false );
 
-    if (( nImageType == ImageType_Color_Large ) ||
-        ( nImageType == ImageType_HC_Large ))
+    if ( nImageType == ImageType_Color_Large )
         bMustScale = ( aSize != aLargeSize );
     else
         bMustScale = ( aSize != aNormSize );
@@ -450,8 +439,6 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
     sal_Int16 nIndex( 0 );
     if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE )
         nIndex += 1;
-    if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST )
-        nIndex += 2;
     return nIndex;
 }
 
@@ -473,27 +460,27 @@ void ImageManagerImpl::implts_initialize()
 
         try
         {
-            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
                                                                             nModes );
             if ( m_xUserImageStorage.is() )
             {
-                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
                                                                                  nModes );
             }
         }
-        catch ( com::sun::star::container::NoSuchElementException& )
+        catch ( const ::com::sun::star::container::NoSuchElementException& )
         {
         }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        catch ( const ::com::sun::star::embed::InvalidStorageException& )
         {
         }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        catch ( const ::com::sun::star::lang::IllegalArgumentException& )
         {
         }
-        catch ( ::com::sun::star::io::IOException& )
+        catch ( const ::com::sun::star::io::IOException& )
         {
         }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
         {
         }
     }
@@ -555,19 +542,19 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
                 }
             }
         }
-        catch ( com::sun::star::container::NoSuchElementException& )
+        catch ( const ::com::sun::star::container::NoSuchElementException& )
         {
         }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        catch ( const ::com::sun::star::embed::InvalidStorageException& )
         {
         }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        catch ( const ::com::sun::star::lang::IllegalArgumentException& )
         {
         }
-        catch ( ::com::sun::star::io::IOException& )
+        catch ( const ::com::sun::star::io::IOException& )
         {
         }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
         {
         }
     }
@@ -654,7 +641,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
             {
                 xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
             }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
+            catch ( const ::com::sun::star::container::NoSuchElementException& )
             {
             }
 
@@ -662,7 +649,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
             {
                 xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
             }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
+            catch ( const ::com::sun::star::container::NoSuchElementException& )
             {
             }
 
@@ -703,10 +690,10 @@ CmdImageList* ImageManagerImpl::implts_getDefaultImageList()
     return m_pDefaultImageList;
 }
 
-ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory >& xServiceManager,const uno::Reference< XInterface >& _xOwner,bool _bUseGlobal ) :
+ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory >& xServiceManager,::cppu::OWeakObject* pOwner,bool _bUseGlobal ) :
     ThreadHelpBase( &Application::GetSolarMutex() )
     , m_xServiceManager( xServiceManager )
-    , m_xOwner(_xOwner)
+    , m_pOwner(pOwner)
     , m_pDefaultImageList( 0 )
     , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" ))
     , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList ))
@@ -732,7 +719,8 @@ ImageManagerImpl::~ImageManagerImpl()
 
 void ImageManagerImpl::dispose()
 {
-    css::lang::EventObject aEvent( m_xOwner );
+    uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner));
+    css::lang::EventObject aEvent( xOwner );
     m_aListenerContainer.disposeAndClear( aEvent );
 
     {
@@ -786,15 +774,15 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
             PropertyValue aPropValue;
             if ( aArguments[n] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAscii( "UserConfigStorage" ))
+                if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserConfigStorage")) )
                 {
                     aPropValue.Value >>= m_xUserConfigStorage;
                 }
-                else if ( aPropValue.Name.equalsAscii( "ModuleIdentifier" ))
+                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ModuleIdentifier")) )
                 {
                     aPropValue.Value >>= m_aModuleIdentifier;
                 }
-                else if ( aPropValue.Name.equalsAscii( "UserRootCommit" ))
+                else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserRootCommit")) )
                 {
                     aPropValue.Value >>= m_xUserRootCommit;
                 }
@@ -888,7 +876,7 @@ throw (::com::sun::star::uno::RuntimeException)
     Sequence< OUString > aImageNameSeq( aImageCmdNameMap.size() );
     ImageNameMap::const_iterator pIter;
     i = 0;
-    for ( pIter = aImageCmdNameMap.begin(); pIter != aImageCmdNameMap.end(); pIter++ )
+    for ( pIter = aImageCmdNameMap.begin(); pIter != aImageCmdNameMap.end(); ++pIter )
         aImageNameSeq[i++] = pIter->first;
 
     return aImageNameSeq;
@@ -1032,13 +1020,14 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
         }
     }
 
+    uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner));
     // Notify listeners
     if ( pInsertedImages != 0 )
     {
         ConfigurationEvent aInsertEvent;
         aInsertEvent.aInfo           <<= nImageType;
-        aInsertEvent.Accessor        <<= m_xOwner;
-        aInsertEvent.Source          = m_xOwner;
+        aInsertEvent.Accessor        <<= xOwner;
+        aInsertEvent.Source          = xOwner;
         aInsertEvent.ResourceURL     = m_aResourceString;
         aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
                                         static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
@@ -1048,8 +1037,8 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
     {
         ConfigurationEvent aReplaceEvent;
         aReplaceEvent.aInfo           <<= nImageType;
-        aReplaceEvent.Accessor        <<= m_xOwner;
-        aReplaceEvent.Source          = m_xOwner;
+        aReplaceEvent.Accessor        <<= xOwner;
+        aReplaceEvent.Source          = xOwner;
         aReplaceEvent.ResourceURL     = m_aResourceString;
         aReplaceEvent.ReplacedElement = Any();
         aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
@@ -1136,12 +1125,13 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
     }
 
     // Notify listeners
+    uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner));
     if ( pRemovedImages != 0 )
     {
         ConfigurationEvent aRemoveEvent;
         aRemoveEvent.aInfo           = uno::makeAny( nImageType );
-        aRemoveEvent.Accessor        = uno::makeAny( m_xOwner );
-        aRemoveEvent.Source          = m_xOwner;
+        aRemoveEvent.Accessor        = uno::makeAny( xOwner );
+        aRemoveEvent.Source          = xOwner;
         aRemoveEvent.ResourceURL     = m_aResourceString;
         aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
                                             static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
@@ -1151,8 +1141,8 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
     {
         ConfigurationEvent aReplaceEvent;
         aReplaceEvent.aInfo           = uno::makeAny( nImageType );
-        aReplaceEvent.Accessor        = uno::makeAny( m_xOwner );
-        aReplaceEvent.Source          = m_xOwner;
+        aReplaceEvent.Accessor        = uno::makeAny( xOwner );
+        aReplaceEvent.Source          = xOwner;
         aReplaceEvent.ResourceURL     = m_aResourceString;
         aReplaceEvent.ReplacedElement = Any();
         aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
@@ -1281,12 +1271,13 @@ throw ( ::com::sun::star::uno::Exception,
                 aGuard.unlock();
 
                 // Now notify our listeners. Unlock mutex to prevent deadlocks
+                uno::Reference< uno::XInterface > xOwner(static_cast< OWeakObject* >(m_pOwner));
                 if ( pInsertedImages != 0 )
                 {
                     ConfigurationEvent aInsertEvent;
                     aInsertEvent.aInfo           = uno::makeAny( i );
-                    aInsertEvent.Accessor        = uno::makeAny( m_xOwner );
-                    aInsertEvent.Source          = m_xOwner;
+                    aInsertEvent.Accessor        = uno::makeAny( xOwner );
+                    aInsertEvent.Source          = xOwner;
                     aInsertEvent.ResourceURL     = m_aResourceString;
                     aInsertEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
                                                     static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
@@ -1296,8 +1287,8 @@ throw ( ::com::sun::star::uno::Exception,
                 {
                     ConfigurationEvent aReplaceEvent;
                     aReplaceEvent.aInfo           = uno::makeAny( i );
-                    aReplaceEvent.Accessor        = uno::makeAny( m_xOwner );
-                    aReplaceEvent.Source          = m_xOwner;
+                    aReplaceEvent.Accessor        = uno::makeAny( xOwner );
+                    aReplaceEvent.Source          = xOwner;
                     aReplaceEvent.ResourceURL     = m_aResourceString;
                     aReplaceEvent.ReplacedElement = Any();
                     aReplaceEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
@@ -1308,8 +1299,8 @@ throw ( ::com::sun::star::uno::Exception,
                 {
                     ConfigurationEvent aRemoveEvent;
                     aRemoveEvent.aInfo           = uno::makeAny( i );
-                    aRemoveEvent.Accessor        = uno::makeAny( m_xOwner );
-                    aRemoveEvent.Source          = m_xOwner;
+                    aRemoveEvent.Accessor        = uno::makeAny( xOwner );
+                    aRemoveEvent.Source          = xOwner;
                     aRemoveEvent.ResourceURL     = m_aResourceString;
                     aRemoveEvent.Element         = uno::makeAny( uno::Reference< XNameAccess >(
                                                         static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
@@ -1367,11 +1358,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
     {
         long nModes = ElementModes::READWRITE;
 
-        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
                                                                                     nModes );
         if ( xUserImageStorage.is() )
         {
-            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
                                                                                                     nModes );
             for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
             {
@@ -1445,7 +1436,7 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent&
                         break;
                 }
             }
-            catch( css::uno::RuntimeException& )
+            catch( const css::uno::RuntimeException& )
             {
                 pIterator.remove();
             }
@@ -1455,6 +1446,10 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent&
 void ImageManagerImpl::clear()
 {
     ResetableGuard aGuard( m_aLock );
+
+    if (!m_pUserImageList)
+        return;
+
     for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ )
     {
         delete m_pUserImageList[n];
@@ -1462,3 +1457,5 @@ void ImageManagerImpl::clear()
     }
 }
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 2a3a643731ab..4e6d123c3211 100755..100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -130,7 +131,7 @@ namespace framework
         public:
 
             ImageManagerImpl(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
-                ,const  com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& _xOwner
+                ,::cppu::OWeakObject *pOwner
                 ,bool _bUseGlobal);
             ~ImageManagerImpl();
 
@@ -161,7 +162,7 @@ namespace framework
 
             void clear();
 
-            typedef std::hash_map< rtl::OUString,
+            typedef boost::unordered_map< rtl::OUString,
                                    sal_Bool,
                                    OUStringHashCode,
                                    ::std::equal_to< ::rtl::OUString > > ImageNameMap;
@@ -201,7 +202,7 @@ namespace framework
             com::sun::star::uno::Reference< com::sun::star::embed::XStorage >               m_xUserBitmapsStorage;
             com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >      m_xUserRootCommit;
             com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
-            com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               m_xOwner;
+            ::cppu::OWeakObject*                                                            m_pOwner;
             rtl::Reference< GlobalImageList >                                               m_pGlobalImageList;
             CmdImageList*                                                                   m_pDefaultImageList;
             rtl::OUString                                                                   m_aXMLPostfix;
@@ -220,3 +221,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 0e0f828a253f..4273e86850c8 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -225,3 +226,5 @@ sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno:
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index e4a815faafea..59cb3b531e2b 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,100 +112,6 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   ModuleUIConfigurationManagerSupplier
 DEFINE_INIT_SERVICE                     (   ModuleUIConfigurationManagerSupplier, {} )
 
 
-/*TODO_AS
-void ModuleUIConfigurationManagerSupplier::impl_initStorages()
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::impl_initStorages" );
-    if ( !m_bInit )
-    {
-        RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ModuleUIConfigurationManagerSupplier::impl_initStorages" );
-
-        rtl::OUString aFinalSlash( RTL_CONSTASCII_USTRINGPARAM( "/" ));
-        rtl::OUString aConfigRootFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/modules" ));
-        rtl::OUString aConfigSubFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/modules/soffice.cfg" ));
-        rtl::OUString aConfigRootFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg" ));
-        rtl::OUString aConfigSubFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/soffice.cfg" ));
-        rtl::OUString aConfigFileName( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/uiconfig.zip" ));
-
-        Reference< XPropertySet > xPathSettings( m_xServiceManager->createInstance(
-                                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" ))),
-                                                  UNO_QUERY_THROW );
-
-        Any a = xPathSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIConfig" )));
-        a >>= m_aDefaultConfigURL;
-        a = xPathSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfig" )));
-        a >>= m_aUserConfigURL;
-
-        // Use only the first entry from "UIConfig"
-        sal_Int32 nIndex = m_aDefaultConfigURL.indexOf( ';' );
-        if ( nIndex > 0 )
-            m_aDefaultConfigURL = m_aDefaultConfigURL.copy( 0, nIndex );
-
-        rtl::OUString aDefaultConfigFolderURL( m_aDefaultConfigURL );
-
-        nIndex = m_aDefaultConfigURL.lastIndexOf( '/' );
-        if (( nIndex > 0 ) &&  ( nIndex != ( m_aDefaultConfigURL.getLength()-1 )))
-        {
-            m_aDefaultConfigURL += aFinalSlash;
-            aDefaultConfigFolderURL += aFinalSlash;
-        }
-
-        nIndex = m_aUserConfigURL.lastIndexOf( '/' );
-        if (( nIndex > 0 ) &&  ( nIndex != ( m_aUserConfigURL.getLength()-1 )))
-            m_aUserConfigURL += aFinalSlash;
-
-//        aDefaultConfigFolderURL += aConfigRootFolder;
-
-        // Create root storages for user interface configuration data (default and customizable)
-        Reference< XSingleServiceFactory > xStorageFactory( m_xServiceManager->createInstance(
-                                                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" ))),
-                                                            UNO_QUERY_THROW );
-
-        Sequence< Any > aArgs( 2 );
-
-        // Default root storage (READ-ACCESS)
-        aArgs[0] <<= m_aDefaultConfigURL + aConfigFileName; //aConfigSubFolder;
-        aArgs[1] <<= ElementModes::READ;
-        m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW );
-
-        Reference < XOutputStream > xTempOut( m_xServiceManager->createInstance (
-                                                ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
-                                              UNO_QUERY );
-
-        Reference< XPackageStructureCreator > xPackageStructCreator( m_xServiceManager->createInstance(
-                                                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.PackageStructureCreator" ))),
-                                                                     UNO_QUERY_THROW );
-
-        RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ convertToPackage" );
-        xPackageStructCreator->convertToPackage( aDefaultConfigFolderURL, xTempOut );
-        RTL_LOGFILE_CONTEXT_TRACE( aLog, "} convertToPackage" );
-
-        xTempOut->closeOutput();
-        Reference< XInputStream > xTempIn( xTempOut, UNO_QUERY );
-        Reference< XSeekable > xTempSeek( xTempOut, UNO_QUERY );
-
-        // Default root storage (READ-ACCESS)
-        xTempSeek->seek( 0 );
-
-        aArgs[0] <<= xTempIn;
-        aArgs[1] <<= ElementModes::READ;
-        m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW );
-
-        // Customizable root storage (READWRITE-ACCESS)
-        aArgs[0] <<= m_aUserConfigURL + aConfigSubFolder;
-        aArgs[1] <<= ElementModes::READWRITE;
-        m_xUserCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY );
-
-        // Create wrapper object for module user interface configuration managers, so they are able to call commit/revert on
-        // root storage and nothing more (saftey)!
-        RootStorageWrapper* pUserRootStorageWrapper = new RootStorageWrapper( Reference< XTransactedObject >( m_xUserCfgRootStorage, UNO_QUERY ));
-        m_xUserRootCommit = Reference< XTransactedObject>( static_cast< OWeakObject *>( pUserRootStorageWrapper ), UNO_QUERY );
-    }
-
-    m_bInit = true;
-}
-*/
-
 
 ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( const Reference< XMultiServiceFactory >& xServiceManager ) :
     ThreadHelpBase( &Application::GetSolarMutex() )
@@ -215,7 +122,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
     , m_aListenerContainer( m_aLock.getShareableOslMutex() )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier" );
-    // Retrieve known modules and insert them into our hash_map to speed-up access time.
+    // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time.
     Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY );
     const Sequence< ::rtl::OUString >     aNameSeq   = xNameAccess->getElementNames();
     const ::rtl::OUString*                pNameSeq   = aNameSeq.getConstArray();
@@ -236,20 +143,6 @@ ModuleUIConfigurationManagerSupplier::~ModuleUIConfigurationManagerSupplier()
             xComponent->dispose();
         ++pIter;
     }
-/*TODO_AS
-    // Dispose our root configuration storages
-    if ( m_xDefaultCfgRootStorage.is() )
-    {
-        Reference< XComponent > xComponent( m_xDefaultCfgRootStorage, UNO_QUERY );
-        xComponent->dispose();
-    }
-
-    if ( m_xUserCfgRootStorage.is() )
-    {
-        Reference< XComponent > xComponent( m_xUserCfgRootStorage, UNO_QUERY );
-        xComponent->dispose();
-    }
-*/
 }
 
 // XComponent
@@ -310,53 +203,6 @@ throw ( NoSuchElementException, RuntimeException)
     // Create instance on demand
     if ( !pIter->second.is() )
     {
-        /*TODO_AS
-        Reference< XStorage > xDefaultConfigModuleStorage;
-        Reference< XStorage > xUserConfigModuleStorage;
-
-        try
-        {
-            xDefaultConfigModuleStorage = Reference< XStorage >( m_xDefaultCfgRootStorage->openStorageElement(
-                                                                    sShort, ElementModes::READ ), UNO_QUERY_THROW );
-
-            if ( m_xUserCfgRootStorage.is() )
-            {
-                try
-                {
-                    xUserConfigModuleStorage = Reference< XStorage >( m_xUserCfgRootStorage->openStorageElement(
-                                                                        sShort, ElementModes::READWRITE ), UNO_QUERY );
-                }
-                catch( ::com::sun::star::io::IOException& )
-                {
-                    try
-                    {
-                        xUserConfigModuleStorage = Reference< XStorage >( m_xUserCfgRootStorage->openStorageElement(
-                                                                            sShort, ElementModes::READ ), UNO_QUERY );
-                    }
-                    catch( com::sun::star::uno::Exception& )
-                    {
-                    }
-                }
-            }
-        }
-        catch ( com::sun::star::uno::Exception& )
-        {
-        }
-        PropertyValue   aArg;
-        Sequence< Any > aArgs( 5 );
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
-        aArg.Value <<= ModuleIdentifier;
-        aArgs[0] <<= aArg;
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultConfigStorage" ));
-        aArg.Value <<= xDefaultConfigModuleStorage;
-        aArgs[1] <<= aArg;
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" ));
-        aArg.Value <<= xUserConfigModuleStorage;
-        aArgs[2] <<= aArg;
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" ));
-        aArg.Value <<= m_xUserRootCommit;
-        aArgs[3] <<= aArg;
-        */
         ::rtl::OUString sShort;
         try
         {
@@ -365,7 +211,7 @@ throw ( NoSuchElementException, RuntimeException)
             xCont->getByName(ModuleIdentifier) >>= lProps;
             for (sal_Int32 i=0; i<lProps.getLength(); ++i)
             {
-                if (lProps[i].Name.equalsAscii("ooSetupFactoryShortName"))
+                if (lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")))
                 {
                     lProps[i].Value >>= sShort;
                     break;
@@ -396,3 +242,4 @@ throw ( NoSuchElementException, RuntimeException)
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index c2d8d2fe8308..61086f56db68 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
 #include <framework/menuconfiguration.hxx>
 #include <framework/toolboxconfiguration.hxx>
 
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
 #include <framework/statusbarconfiguration.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -288,7 +287,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
                             aUIElementData.bDefaultNode = false;
                         }
 
-                        // Create hash_map entries for all user interface elements inside the storage. We don't load the
+                        // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
                         // settings to speed up the process.
                         rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
                     }
@@ -298,7 +297,6 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
         }
     }
 
-    //rElementTypeData.bLoaded = true;
 }
 
 void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
@@ -409,7 +407,7 @@ ModuleUIConfigurationManager::UIElementData*  ModuleUIConfigurationManager::impl
     impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
     impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
 
-    // first try to look into our user-defined vector/hash_map combination
+    // first try to look into our user-defined vector/boost::unordered_map combination
     UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
     UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
     if ( pIter != rUserHashMap.end() )
@@ -423,7 +421,7 @@ ModuleUIConfigurationManager::UIElementData*  ModuleUIConfigurationManager::impl
         }
     }
 
-    // Not successfull, we have to look into our default vector/hash_map combination
+    // Not successfull, we have to look into our default vector/boost::unordered_map combination
     UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
     pIter = rDefaultHashMap.find( aResourceURL );
     if ( pIter != rDefaultHashMap.end() )
@@ -830,8 +828,8 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a
     if ( !m_bInitialized )
     {
         ::comphelper::SequenceAsHashMap lArgs(aArguments);
-        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
 
         for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
         {
@@ -909,8 +907,6 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno
     if ( m_bDisposed )
         throw DisposedException();
 
-    bool bResetStorage( false );
-
     if ( !isReadOnly() )
     {
         // Remove all elements from our user-defined storage!
@@ -942,8 +938,6 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno
                 }
             }
 
-            bResetStorage = true;
-
             // remove settings from user defined layer and notify listener about removed settings data!
             ConfigEventNotifyContainer aRemoveEventNotifyContainer;
             ConfigEventNotifyContainer aReplaceEventNotifyContainer;
@@ -1392,7 +1386,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage
         Reference< XInitialization > xInit    (xManager, UNO_QUERY_THROW);
 
         PropertyValue aProp;
-        aProp.Name    = ::rtl::OUString::createFromAscii("ModuleIdentifier");
+        aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier"));
         aProp.Value <<= aModule;
 
         Sequence< Any > lArgs(1);
@@ -1452,7 +1446,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
         // preload list of element types on demand
         impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
 
-        // Look into our default vector/hash_map combination
+        // Look into our default vector/boost::unordered_map combination
         UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
         UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
         if ( pIter != rDefaultHashMap.end() )
@@ -1621,3 +1615,5 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const Configu
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 9ff03d3c6b39..1a04cf285ab1 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,14 +33,14 @@
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_UICONFIGURATION_UICATEGORYDESCRPTION_HXX_
 #include "uiconfiguration/uicategorydescription.hxx"
-#endif
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
 #include "properties.h"
 
+#include "helper/mischelper.hxx"
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -57,16 +58,13 @@
 #include <unotools/configmgr.hxx>
 #include <tools/string.hxx>
 
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <comphelper/sequence.hxx>
 #include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -77,7 +75,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 struct ModuleToCategory
 {
@@ -138,7 +135,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali
         sal_Bool                  fillCache();
 
     private:
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  ::rtl::OUString,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > IdToInfoCache;
@@ -151,6 +148,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali
         Reference< XMultiServiceFactory > m_xServiceManager;
         Reference< XMultiServiceFactory > m_xConfigProvider;
         Reference< XNameAccess >          m_xConfigAccess;
+        Reference< XContainerListener >   m_xConfigListener;
         sal_Bool                          m_bConfigAccessInitialized;
         sal_Bool                          m_bCacheFilled;
         IdToInfoCache                     m_aIdCache;
@@ -183,7 +181,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
     ResetableGuard aLock( m_aLock );
     Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
     if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
+        xContainer->removeContainerListener(m_xConfigListener);
 }
 
 // XNameAccess
@@ -390,7 +388,10 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
             // Add as container listener
             Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
             if ( xContainer.is() )
-                xContainer->addContainerListener( this );
+            {
+                m_xConfigListener = new WeakContainerListener(this);
+                xContainer->addContainerListener(m_xConfigListener);
+            }
         }
 
         return sal_True;
@@ -455,7 +456,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact
 
     // insert generic categories mappings
     m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type(
-        rtl::OUString::createFromAscii( GENERIC_MODULE_NAME ), aGenericCategories ));
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories ));
 
     UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories );
     if ( pCatIter != m_aUICommandsHashMap.end() )
@@ -474,3 +475,4 @@ Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const ::
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 366e58c0adb2..d52bcffcb8ed 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
 #include <framework/menuconfiguration.hxx>
 #include <framework/toolboxconfiguration.hxx>
 
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
 #include <framework/statusbarconfiguration.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -226,7 +225,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
                         aUIElementData.bModified    = false;
                         aUIElementData.bDefault     = false;
 
-                        // Create hash_map entries for all user interface elements inside the storage. We don't load the
+                        // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
                         // settings to speed up the process.
                         rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
                     }
@@ -345,7 +344,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen
     // preload list of element types on demand
     impl_preloadUIElementTypeList( nElementType );
 
-    // try to look into our document vector/hash_map combination
+    // try to look into our document vector/boost::unordered_map combination
     UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap;
     UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
     if ( pIter != rUserHashMap.end() )
@@ -698,7 +697,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt
     if ( isReadOnly() )
         return;
 
-    bool bResetStorage( false );
     if ( m_xDocConfigStorage.is() )
     {
         try
@@ -738,7 +736,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt
                 if ( xTransactedObject.is() )
                     xTransactedObject->commit();
             }
-            bResetStorage = true;
 
             // remove settings from user defined layer and notify listener about removed settings data!
             // Try to access our module sub folder
@@ -1108,7 +1105,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th
     Reference< XInitialization > xInit      (xAccConfig, UNO_QUERY_THROW);
 
     PropertyValue aProp;
-    aProp.Name    = ::rtl::OUString::createFromAscii("DocumentRoot");
+    aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot"));
     aProp.Value <<= xDocumentRoot;
 
     Sequence< Any > lArgs(1);
@@ -1353,3 +1350,5 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index eee01dad72c7..46f919d37678 100755..100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
 #include <framework/toolboxconfiguration.hxx>
 #include <uiconfiguration/imagemanager.hxx>
 
-#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_
 #include <framework/statusbarconfiguration.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -258,7 +257,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa
                             aUIElementData.bDefaultNode = false;
                         }
 
-                        // Create hash_map entries for all user interface elements inside the storage. We don't load the
+                        // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
                         // settings to speed up the process.
                         rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
                     }
@@ -379,7 +378,7 @@ UIConfigurationManagerImpl::UIElementData*  UIConfigurationManagerImpl::impl_fin
     if ( m_bUseDefault )
         impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
 
-    // first try to look into our user-defined vector/hash_map combination
+    // first try to look into our user-defined vector/boost::unordered_map combination
     UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
     UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
     if ( pIter != rUserHashMap.end() )
@@ -395,7 +394,7 @@ UIConfigurationManagerImpl::UIElementData*  UIConfigurationManagerImpl::impl_fin
 
     if ( m_bUseDefault )
     {
-        // Not successfull, we have to look into our default vector/hash_map combination
+        // Not successfull, we have to look into our default vector/boost::unordered_map combination
         UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
         pIter = rDefaultHashMap.find( aResourceURL );
         if ( pIter != rDefaultHashMap.end() )
@@ -804,8 +803,8 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments )
     if ( !m_bInitialized )
     {
         ::comphelper::SequenceAsHashMap lArgs(aArguments);
-        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
 
         for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
         {
@@ -882,8 +881,6 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx
     if ( m_bDisposed )
         throw DisposedException();
 
-    bool bResetStorage( false );
-
     if ( !isReadOnly() )
     {
         // Remove all elements from our user-defined storage!
@@ -915,8 +912,6 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx
                 }
             }
 
-            bResetStorage = true;
-
             // remove settings from user defined layer and notify listener about removed settings data!
             ConfigEventNotifyContainer aRemoveEventNotifyContainer;
             ConfigEventNotifyContainer aReplaceEventNotifyContainer;
@@ -1362,7 +1357,6 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c
 
     return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
 
-//    return Reference< XInterface >();
 }
 
 Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
@@ -1387,7 +1381,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (
     } // if ( m_bUseDefault )
     else
     {
-        aProp.Name    = ::rtl::OUString::createFromAscii("DocumentRoot");
+        aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot"));
         aProp.Value <<= xDocumentRoot;
     }
     lArgs[0] <<= aProp;
@@ -1459,14 +1453,12 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag
             else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
                 aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
 
-            //if ( aResourceType.getLength() > 0 )
-            {
-                m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
-                m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
-                                                         rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... seee next lines!
-                                                         sEmpty,
-                                                         m_xUserConfigStorage);
-            }
+
+            m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
+            m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
+                                                     rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... see next lines!
+                                                     sEmpty,
+                                                     m_xUserConfigStorage);
         }
         Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
         if ( xPropSet.is() )
@@ -1541,7 +1533,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
         // preload list of element types on demand
         impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
 
-        // Look into our default vector/hash_map combination
+        // Look into our default vector/boost::unordered_map combination
         UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
         UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
         if ( pIter != rDefaultHashMap.end() )
@@ -1708,3 +1700,5 @@ void UIConfigurationManagerImpl::implts_notifyContainerListener( const Configura
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
index bc35def8036c..a2be907122d0 100755..100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
 */
 #include <vector>
 #include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -158,7 +159,7 @@ namespace framework
 
             struct UIElementType;
             friend struct UIElementType;
-            typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+            typedef ::boost::unordered_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
 
             struct UIElementType
             {
@@ -178,7 +179,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+            typedef ::boost::unordered_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();
@@ -216,3 +217,5 @@ namespace framework
 }
 
 #endif // __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGERIMPL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 83cdc1015a32..4366700eb890 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,6 +36,8 @@
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
+#include "helper/mischelper.hxx"
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -58,7 +61,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -71,7 +73,6 @@ using namespace ::com::sun::star::ui;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 static const char CONFIGURATION_ROOT_ACCESS[]               = "/org.openoffice.Office.UI.";
 static const char CONFIGURATION_WINDOWSTATE_ACCESS[]        = "/UIElements/States";
@@ -254,7 +255,7 @@ class ConfigurationAccess_WindowState : // interfaces
         sal_Bool                  impl_initializeConfigAccess();
 
     private:
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  WindowStateInfo,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache;
@@ -263,6 +264,7 @@ class ConfigurationAccess_WindowState : // interfaces
         Reference< XMultiServiceFactory > m_xServiceManager;
         Reference< XMultiServiceFactory > m_xConfigProvider;
         Reference< XNameAccess >          m_xConfigAccess;
+        Reference< XContainerListener >   m_xConfigListener;
         ResourceURLToInfoCache            m_aResourceURLToInfoCache;
         sal_Bool                          m_bConfigAccessInitialized : 1,
                                           m_bModified : 1;
@@ -320,7 +322,7 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState()
     ResetableGuard aLock( m_aLock );
     Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
     if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
+        xContainer->removeContainerListener(m_xConfigListener);
 }
 
 // XNameAccess
@@ -585,12 +587,10 @@ void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerE
 
 void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException)
 {
-    //
 }
 
 void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException)
 {
-    //
 }
 
 // lang.XEventListener
@@ -1226,7 +1226,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
     sal_Int32                 i( 0 );
     sal_Int32                 nCount( m_aPropArray.size() );
     Sequence< PropertyValue > aPropSeq;
-    ::rtl::OUString                  aDelim( ::rtl::OUString::createFromAscii( "," ));
+    ::rtl::OUString                  aDelim( RTL_CONSTASCII_USTRINGPARAM(",") );
 
     for ( i = 0; i < nCount; i++ )
     {
@@ -1326,7 +1326,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
             // Add as container listener
             Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
             if ( xContainer.is() )
-                xContainer->addContainerListener( this );
+            {
+                m_xConfigListener = new WeakContainerListener(this);
+                xContainer->addContainerListener(m_xConfigListener);
+            }
         }
 
         return sal_True;
@@ -1376,7 +1379,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
                                                     UNO_QUERY );
     Reference< XNameAccess > xEmptyNameAccess;
     Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW );
-    Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
+    Sequence< rtl::OUString > aElementNames;
+    try
+    {
+        aElementNames = xNameAccess->getElementNames();
+    }
+    catch (::com::sun::star::uno::RuntimeException &)
+    {
+    }
     Sequence< PropertyValue > aSeq;
     ::rtl::OUString                  aModuleIdentifier;
 
@@ -1388,7 +1398,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
             ::rtl::OUString aWindowStateFileStr;
             for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
             {
-                if ( aSeq[y].Name.equalsAscii("ooSetupFactoryWindowStateConfigRef") )
+                if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryWindowStateConfigRef")) )
                 {
                     aSeq[y].Value >>= aWindowStateFileStr;
                     break;
@@ -1491,3 +1501,4 @@ throw (::com::sun::star::uno::RuntimeException)
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 0512faf3bbf7..a8c98847d7d1 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,30 +36,18 @@
 //_________________________________________________________________________________________________________________
 
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX
 #include <uielement/toolbar.hxx>
-#endif
-#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
 #include <uielement/generictoolbarcontroller.hxx>
-#endif
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 #include <framework/imageproducer.hxx>
 #include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
-#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <framework/addonsoptions.hxx>
-#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 #include <uielement/comboboxtoolbarcontroller.hxx>
-#endif
-#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX
 #include <uielement/imagebuttontoolbarcontroller.hxx>
-#endif
-#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX
 #include <uielement/togglebuttontoolbarcontroller.hxx>
-#endif
 #include <uielement/buttontoolbarcontroller.hxx>
 #include <uielement/spinfieldtoolbarcontroller.hxx>
 #include <uielement/edittoolbarcontroller.hxx>
@@ -71,14 +60,10 @@
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#ifndef _COM_SUN_STAR_BEANS_XLAYOUTMANAGER_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_
 #include <com/sun/star/ui/DockingArea.hpp>
-#endif
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
 //_________________________________________________________________________________________________________________
@@ -86,9 +71,7 @@
 //_________________________________________________________________________________________________________________
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 
 #include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>
@@ -159,25 +142,25 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons
 static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                             const rtl::OUString& aImageId,
                             const rtl::OUString& aURL,
-                            sal_Bool bBigImage,
-                            sal_Bool bHiContrast )
+                            sal_Bool bBigImage
+)
 {
     Image aImage;
 
     if ( aImageId.getLength() > 0 )
     {
-        aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage, bHiContrast );
+        aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage );
         if ( !!aImage )
             return aImage;
         else
-            aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast );
+            aImage = GetImageFromURL( rFrame, aImageId, bBigImage );
         if ( !!aImage )
             return aImage;
     }
 
-    aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast );
+    aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage );
     if ( !aImage )
-        aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast );
+        aImage = GetImageFromURL( rFrame, aImageId, bBigImage );
 
     return aImage;
 }
@@ -232,11 +215,10 @@ void AddonsToolBarManager::RefreshImages()
             if ( pRuntimeItemData )
                 aImageId  = pRuntimeItemData->aImageId;
 
-            m_pToolBar->SetItemImage( nId, RetrieveImage( m_xFrame,
-                                                          aImageId,
-                                                          aCommandURL,
-                                                          bBigImages,
-                                                          m_bIsHiContrast ));
+            m_pToolBar->SetItemImage(
+                nId,
+                RetrieveImage( m_xFrame, aImageId, aCommandURL, bBigImages )
+            );
         }
     }
 }
@@ -315,7 +297,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
 
                 m_pToolBar->InsertItem( nId, aTitle );
 
-                Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols, m_bIsHiContrast );
+                Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols );
                 if ( !!aImage )
                     m_pToolBar->SetItemImage( nId, aImage );
 
@@ -525,7 +507,6 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT
 {
     if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
     return 1;
@@ -537,7 +518,6 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
         (  pDataChangedEvent->GetType() == DATACHANGED_DISPLAY  ))  &&
         ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE        ))
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
 
@@ -557,3 +537,4 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index b0384b18d3d1..49e74d12ca1a 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/addonstoolbarmanager.hxx>
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_
 #include <uielement/toolbar.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -60,9 +59,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -127,7 +124,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
             PropertyValue aPropValue;
             if ( aArguments[n] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAscii( "ConfigurationData" ))
+                if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) ))
                     aPropValue.Value >>= m_aConfigData;
             }
         }
@@ -139,7 +136,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
             ToolBar* pToolBar = 0;
             AddonsToolBarManager* pToolBarManager = 0;
             {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aSolarMutexGuard;
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
@@ -194,3 +191,4 @@ Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 4f55448d65d1..c4d4f7b6c8fc 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX
 #include "uielement/buttontoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -56,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <rtl/uri.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/urlobj.hxx>
@@ -137,7 +134,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
     bool bInitialized( true );
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -147,7 +144,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
 
     if ( !bInitialized )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         m_bInitialized = sal_True;
 
         PropertyValue aPropValue;
@@ -155,11 +152,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
         {
             if ( aArguments[i] >>= aPropValue )
             {
-                if ( aPropValue.Name.equalsAscii( "Frame" ))
+                if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
                     m_xFrame.set(aPropValue.Value,UNO_QUERY);
-                else if ( aPropValue.Name.equalsAscii( "CommandURL" ))
+                else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) ))
                     aPropValue.Value >>= m_aCommandURL;
-                else if ( aPropValue.Name.equalsAscii( "ServiceManager" ))
+                else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ServiceManager" ) ))
                     m_xServiceManager.set(aPropValue.Value,UNO_QUERY);
             }
         }
@@ -172,7 +169,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         if ( m_bDisposed )
             throw DisposedException();
 
@@ -202,7 +199,7 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL ButtonToolbarController::update()
 throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     if ( m_bDisposed )
         throw DisposedException();
 }
@@ -214,7 +211,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
 {
     uno::Reference< uno::XInterface > xSource( Source.Source );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -243,7 +240,7 @@ throw (::com::sun::star::uno::RuntimeException)
     ::com::sun::star::util::URL             aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -285,7 +282,7 @@ throw (::com::sun::star::uno::RuntimeException)
             aArgs[0].Value  <<= KeyModifier;
 
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+                UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
             xDispatch->dispatch( aTargetURL, aArgs );
         }
         catch ( DisposedException& )
@@ -297,7 +294,7 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL ButtonToolbarController::click()
 throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         throw DisposedException();
@@ -335,3 +332,4 @@ throw (::com::sun::star::uno::RuntimeException)
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 0185c68726dd..45520e63b000 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 #include "uielement/comboboxtoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -56,11 +53,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <vcl/toolbox.hxx>
 #include <vcl/combobox.hxx>
 #include <tools/urlobj.hxx>
@@ -199,7 +194,7 @@ ComboboxToolbarController::~ComboboxToolbarController()
 void SAL_CALL ComboboxToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
     delete m_pComboBox;
@@ -447,3 +442,4 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 8fbd34801206..b52e4cd66f1c 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX
 #include "uielement/complextoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -56,11 +53,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <tools/urlobj.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
@@ -105,7 +100,7 @@ ComplexToolbarController::~ComplexToolbarController()
 void SAL_CALL ComplexToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
     svt::ToolboxController::dispose();
@@ -136,7 +131,7 @@ throw ( RuntimeException )
     Sequence<PropertyValue> aArgs;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -162,7 +157,7 @@ throw ( RuntimeException )
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("ComplexToolbarController")).log(
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))).log(
                 m_xServiceManager,
                 m_xFrame,
                 aTargetURL,
@@ -176,7 +171,7 @@ throw ( RuntimeException )
 void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -388,3 +383,4 @@ void ComplexToolbarController::notifyTextChanged( const ::rtl::OUString& aText )
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 1443d4374d55..e0ec7dd7d703 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+#include <sal/macros.h>
 #include <uielement/controlmenucontroller.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -61,13 +63,12 @@
 #include <vcl/image.hxx>
 #include <svtools/menuoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 // Copied from svx
 // Function-Id's
 #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4)
 #define RID_SVXIMGLIST_FMEXPL      (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_FMEXPL_HC   (RID_FORMS_START + 2)
 
 // Forms - Ids, used to address images from image list
 #define SID_FMSLOTS_START                   (SID_SVX_START + 592)
@@ -192,7 +193,6 @@ const char* aCommands[] =
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -218,7 +218,6 @@ ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Refer
     m_pResPopupMenu( 0 )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
 
 }
@@ -230,16 +229,14 @@ ControlMenuController::~ControlMenuController()
 // private function
 void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
 {
-    rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" ));
-
-    ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ));
-    ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr );
+    ResMgr* pResMgr = ResMgr::CreateResMgr("svx");
+    ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr );
     aResId.SetRT( RSC_IMAGELIST );
 
     if ( pResMgr->IsAvailable( aResId ))
     {
         ImageList aImageList( aResId );
-      for ( sal_uInt32 i=0; i < sizeof(nConvertSlots)/sizeof(nConvertSlots[0]); ++i )
+      for ( sal_uInt32 i=0; i < SAL_N_ELEMENTS(nConvertSlots); ++i )
         {
             // das entsprechende Image dran
             if ( m_bShowMenuImages )
@@ -258,7 +255,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP
     VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*                                         pVCLPopupMenu     = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
@@ -290,7 +287,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
     osl::ResettableMutexGuard aLock( m_aMutex );
 
     sal_uInt16 nMenuId = 0;
-    for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i)
+    for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
     {
         if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] ))
         {
@@ -303,7 +300,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
     {
         VCLXPopupMenu*  pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
 
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
 
@@ -344,7 +341,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
         Sequence<PropertyValue>      aArgs;
         Reference< XDispatch > xDispatch = pIter->second;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))).log(m_xServiceManager, m_xFrame, aURL, aArgs);
         if ( xDispatch.is() )
             xDispatch->dispatch( aURL, aArgs );
     }
@@ -356,18 +353,15 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro
 
     if ( m_xPopupMenu.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         // Check if some modes have changed so we have to update our menu images
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        sal_Bool bIsHiContrast      = rSettings.GetHighContrastMode();
         sal_Bool bShowMenuImages    = rSettings.GetUseImagesInMenus();
-        sal_Bool bUpdateImages      = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages ));
+        sal_Bool bUpdateImages      = (bShowMenuImages != m_bShowMenuImages);
 
         if ( bUpdateImages )
         {
-            // The mode has changed or the complete menu so we have to retrieve all images again
-            m_bWasHiContrast    = bIsHiContrast;
             m_bShowMenuImages   = bShowMenuImages;
 
             VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu );
@@ -386,10 +380,7 @@ void ControlMenuController::impl_setPopupMenu()
 {
     if ( m_pResPopupMenu == 0 )
     {
-        rtl::OStringBuffer aBuf( 32 );
-        aBuf.append( "svx" );
-
-        ResMgr* pResMgr = ResMgr::CreateResMgr( aBuf.getStr() );
+        ResMgr* pResMgr = ResMgr::CreateResMgr("svx");
         if ( pResMgr )
         {
             ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
@@ -416,7 +407,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::
         fillPopupMenu( m_xPopupMenu );
         m_aURLToDispatchMap.free();
 
-        for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i)
+        for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
         {
             aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] );
             m_xURLTransformer->parseStrict( aTargetURL );
@@ -441,3 +432,5 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index dadcf46a00bf..30b5f4c3489c 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX
 #include "uielement/dropdownboxtoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -55,11 +52,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
@@ -182,7 +177,7 @@ DropdownToolbarController::~DropdownToolbarController()
 void SAL_CALL DropdownToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
     delete m_pListBoxControl;
@@ -196,7 +191,7 @@ throw ( RuntimeException )
 Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 2 );
-    ::rtl::OUString aSelectedText = m_pListBoxControl->GetText();
+    ::rtl::OUString aSelectedText = m_pListBoxControl->GetSelectEntry();
 
     // Add key modifier to argument list
     aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" ));
@@ -351,3 +346,4 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 60ea9e7c0ce1..79039f8a3ce6 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX
 #include "uielement/edittoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -55,11 +52,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
@@ -179,7 +174,7 @@ EditToolbarController::~EditToolbarController()
 void SAL_CALL EditToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
     delete m_pEditControl;
@@ -266,3 +261,4 @@ void EditToolbarController::executeControlCommand( const ::com::sun::star::frame
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index deaf39660792..8360f60381de 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,23 +49,18 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -107,7 +103,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
     VCLXPopupMenu*          pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*              pVCLPopupMenu = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
@@ -181,7 +177,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co
 {
     Sequence<PropertyValue>      aArgs;
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log(
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))).log(
             m_xServiceManager,
             m_xFrame,
             aTargetURL,
@@ -260,3 +256,4 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index c14957be7b7d..d8b0b14eeb89 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,28 +49,19 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <tools/mapunit.hxx>
-#ifndef _VCL_SVAPP_HXX_
 #include <vcl/svapp.hxx>
-#endif
 #include <vcl/i18nhelp.hxx>
-#ifndef _VCL_OUTPUTDEVICE_HXX_
 #include <vcl/outdev.hxx>
-#endif
 #include <vcl/print.hxx>
-#ifndef _SVTOOLS_CTRLTOOL_HXX_
 #include <svtools/ctrltool.hxx>
-#endif
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -118,7 +110,7 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::
                 Sequence< PropertyValue > aPrinterSeq = xPrintable->getPrinter();
                 for ( int i = 0; i < aPrinterSeq.getLength(); i++ )
                 {
-                    if ( aPrinterSeq[i].Name.equalsAscii( "Name" ))
+                    if ( aPrinterSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ))
                     {
                         aPrinterSeq[i].Value >>= aPrinterName;
                         break;
@@ -173,7 +165,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         Printer*        pInfoPrinter = 0;
         rtl::OUString   aPrinterName;
 
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         // try to retrieve printer name of document
         aPrinterName = retrievePrinterName( m_xFrame );
@@ -312,7 +304,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev
 
         if ( m_xPopupMenu.is() )
         {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarMutexGuard;
             setCurHeight( long( m_aFontHeight.Height * 10), m_xPopupMenu );
         }
     }
@@ -323,7 +315,7 @@ void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatc
 {
     Sequence<PropertyValue>      aArgs;
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontSizeMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
     OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch");
     if ( _xDispatch.is() )
         _xDispatch->dispatch( aTargetURL, aArgs );
@@ -361,3 +353,5 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
     svt::PopupMenuControllerBase::updatePopupMenu();
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 16f26404697c..98deb29cbc11 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <classes/fwlresid.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -55,9 +54,7 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
@@ -67,7 +64,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -95,3 +91,5 @@ FooterMenuController::~FooterMenuController()
 {
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 6f89eb39f89f..6270dd0c82c5 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
 #include "uielement/generictoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -55,11 +52,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <tools/urlobj.hxx>
 #include <classes/resource.hrc>
 #include <classes/fwkresid.hxx>
@@ -150,7 +145,7 @@ GenericToolbarController::~GenericToolbarController()
 void SAL_CALL GenericToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     svt::ToolboxController::dispose();
 
@@ -166,7 +161,7 @@ throw ( RuntimeException )
     ::rtl::OUString                     aCommandURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -205,7 +200,7 @@ throw ( RuntimeException )
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("GenericToolbarController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
         Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
@@ -213,7 +208,7 @@ throw ( RuntimeException )
 void GenericToolbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -391,3 +386,4 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime
 }
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 7b3299a344fb..2ab480d17247 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,7 @@
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <classes/fwlresid.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -55,21 +54,17 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-//#include <tools/solar.hrc>
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -112,7 +107,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
     VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*                                         pVCLPopupMenu     = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
@@ -274,3 +269,5 @@ void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::u
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 1119ae2a3e39..a176b3989c63 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX
 #include "uielement/imagebuttontoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <framework/addonsoptions.hxx>
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -56,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <rtl/uri.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/urlobj.hxx>
@@ -93,7 +90,7 @@ uno::Reference< util::XMacroExpander > GetMacroExpander()
     uno::Reference< util::XMacroExpander > xMacroExpander( m_xMacroExpander );
     if ( !xMacroExpander.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !xMacroExpander.is() )
         {
@@ -139,9 +136,8 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
 {
     sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    sal_Bool bHiContrast( pToolbar->GetSettings().GetStyleSettings().GetHighContrastMode() );
 
-    Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, bHiContrast, sal_True );
+    Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, sal_True );
 
     // Height will be controlled by scaling according to button height
     m_pToolbar->SetItemImage( m_nID, aImage );
@@ -158,7 +154,7 @@ ImageButtonToolbarController::~ImageButtonToolbarController()
 void SAL_CALL ImageButtonToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ComplexToolbarController::dispose();
 }
 
@@ -166,7 +162,7 @@ throw ( RuntimeException )
 
 void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     // i73486 to be downward compatible use old and "wrong" also!
     if (( rControlCommand.Command.equalsAsciiL( "SetImag", 7 )) ||
         ( rControlCommand.Command.equalsAsciiL( "SetImage", 8 )) )
@@ -209,8 +205,8 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con
         // Use graphic class to also support more graphic formats (bmp,png,...)
         Graphic aGraphic;
 
-        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-        pGF->ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW );
+        GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
+        rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW );
 
         BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
 
@@ -233,3 +229,4 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index fc7d92323fad..d81aec95030e 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,16 +49,12 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <com/sun/star/awt/XMenuExtended.hpp>
 #include <comphelper/processfactory.hxx>
 
@@ -71,13 +68,11 @@
 #include <svtools/langtab.hxx>
 #include <classes/fwlresid.hxx>
 
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <dispatch/uieventloghelper.hxx>
 
 #include "helper/mischelper.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include <map>
 #include <set>
@@ -85,7 +80,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 using namespace ::com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -136,7 +130,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t
 // XStatusListener
 void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         return;
@@ -194,7 +188,7 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >&
     {
         Sequence<PropertyValue>      aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
+            UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("LanguageSelectionMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
         xDispatch->dispatch( aTargetURL, aArgs );
     }
 }
@@ -232,7 +226,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*     pPopupMenu    = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if (!m_bShowMenu)
@@ -267,11 +261,9 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
             m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
 
-    //
     // now add menu entries
     // the different menues purpose will be handled by the different string
     // for aCmd_Dialog and aCmd_Language
-    //
 
     sal_Int16 nItemId = 1;  // in this control the item id is not important for executing the command
     const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));  // multiple languages in current selection
@@ -340,15 +332,15 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
 
     // TODO: Fill menu with the information retrieved by the status update
 
-    if( m_aCommandURL.equalsAscii( ".uno:SetLanguageSelectionMenu" ))
+    if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageSelectionMenu" ) ))
     {
         fillPopupMenu(m_xPopupMenu, MODE_SetLanguageSelectionMenu );
     }
-    else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageParagraphMenu" ))
+    else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageParagraphMenu" ) ))
     {
         fillPopupMenu(m_xPopupMenu, MODE_SetLanguageParagraphMenu );
     }
-    else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageAllTextMenu" ))
+    else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageAllTextMenu" ) ))
     {
         fillPopupMenu(m_xPopupMenu, MODE_SetLanguageAllTextMenu );
     }
@@ -376,3 +368,4 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 0b9d061dacc9..88096ca36ed8 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,13 +33,11 @@
 #include <classes/fwkresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/helper/convert.hxx>
 
 #include <com/sun/star/frame/XPopupMenuController.hpp>
@@ -55,9 +54,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <classes/fwkresid.hxx>
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -90,7 +87,6 @@ using ::rtl::OUString;
 namespace framework
 {
 
-////////////////////////////////////////////////////////////
 
 DEFINE_XSERVICEINFO_MULTISERVICE        (   LangSelectionStatusbarController            ,
                                             OWeakObject                             ,
@@ -129,7 +125,7 @@ void SAL_CALL LangSelectionStatusbarController::initialize( const ::com::sun::st
 throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::initialize" );
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     svt::StatusbarController::initialize( aArguments );
 
@@ -205,9 +201,7 @@ throw (::com::sun::star::uno::RuntimeException)
     FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
             m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
 
-    //
     // add first few entries to main menu
-    //
     sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
     const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));  // multiple languages in current selection
     const OUString sEmpty;  // 'no language found' from language guessing
@@ -236,9 +230,7 @@ throw (::com::sun::star::uno::RuntimeException)
     xPopupMenu->insertItem( MID_LANG_SEL_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_RESET );
     xPopupMenu->insertItem( MID_LANG_SEL_MORE,  String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_MORE );
 
-    //
     // add entries to submenu ('set language for paragraph')
-    //
     nItemId = static_cast< sal_Int16 >(MID_LANG_PARA_1);
     for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
@@ -258,17 +250,13 @@ throw (::com::sun::star::uno::RuntimeException)
     subPopupMenu->insertItem( MID_LANG_PARA_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_RESET );
     subPopupMenu->insertItem( MID_LANG_PARA_MORE,  String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_MORE );
 
-    //
     // add last two entries to main menu
-    //
     xPopupMenu->insertSeparator( MID_LANG_PARA_SEPERATOR );
     xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_STRING );
     xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu );
 
 
-    //
     // now display the popup menu and execute every command ...
-    //
 
     Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
 
@@ -288,55 +276,55 @@ throw (::com::sun::star::uno::RuntimeException)
         {
             //set selected language as current language for selection
             String aSelectedLang = aLangMap[nId];
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_"));
             aURL.Complete += aSelectedLang;
         }
         else if (nId == MID_LANG_SEL_NONE)
         {
             //set None as current language for selection
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE"));
         }
         else if (nId == MID_LANG_SEL_RESET)
         {
             // reset language attributes for selection
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES"));
         }
         else if (nId == MID_LANG_SEL_MORE)
         {
             //open the dialog "format/character" for current selection
-            aURL.Complete += OUString::createFromAscii(".uno:FontDialog?Language:string=*");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialog?Language:string=*"));
         }
         else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
         {
             //set selected language for current paragraph
             String aSelectedLang = aLangMap[nId];
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_"));
             aURL.Complete += aSelectedLang;
         }
         else if (nId == MID_LANG_PARA_NONE)
         {
             //set None as language for current paragraph
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE"));
         }
         else if (nId == MID_LANG_PARA_RESET)
         {
             // reset language attributes for paragraph
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES"));
         }
         else if (nId == MID_LANG_PARA_MORE)
         {
             //open the dialog "format/character" for current paragraph
-            aURL.Complete += OUString::createFromAscii(".uno:FontDialogForParagraph");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialogForParagraph"));
         }
 
-        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
         xURLTransformer->parseStrict( aURL );
         uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0);
         if( xDispatch.is() )
         {
             uno::Sequence< beans::PropertyValue > aPV;
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper( OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
+                UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aURL, aPV);
             xDispatch->dispatch( aURL, aPV);
         }
     }
@@ -393,7 +381,7 @@ throw ( RuntimeException )
     //      m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedText
 
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::statusChanged" );
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -438,3 +426,4 @@ throw ( RuntimeException )
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index 10dc8489e592..6b20e717c457 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,11 @@
 #include <classes/fwlresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/helper/convert.hxx>
 
 using namespace ::rtl;
@@ -89,7 +88,7 @@ void SAL_CALL LogoImageStatusbarController::release() throw ()
 void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
 throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     svt::StatusbarController::initialize( aArguments );
 }
@@ -153,7 +152,7 @@ void SAL_CALL LogoImageStatusbarController::paint(
     ::sal_Int32 /*nStyle*/ )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( xGraphics );;
     if ( pOutDev )
@@ -175,3 +174,5 @@ void SAL_CALL LogoImageStatusbarController::doubleClick() throw (::com::sun::sta
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index 606c644eeba9..f332c458a6e7 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,11 @@
 #include <classes/fwlresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/helper/convert.hxx>
 
 using namespace ::rtl;
@@ -89,7 +88,7 @@ void SAL_CALL LogoTextStatusbarController::release() throw ()
 void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
 throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     svt::StatusbarController::initialize( aArguments );
 
@@ -178,3 +177,5 @@ void SAL_CALL LogoTextStatusbarController::doubleClick() throw (::com::sun::star
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 5065881385fb..b51070830d12 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@
 #include <dispatch/uieventloghelper.hxx>
 #include "helper/mischelper.hxx"
 #include "helpid.hrc"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -88,7 +89,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
     VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*     pPopupMenu    = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pVCLPopupMenu )
@@ -148,15 +149,10 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc
         ExecuteInfo* pExecuteInfo = new ExecuteInfo;
         pExecuteInfo->xDispatch     = xDispatch;
         pExecuteInfo->aTargetURL    = aTargetURL;
-        //pExecuteInfo->aArgs         = aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
-//                xDispatch->dispatch( aTargetURL, aArgs );
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
         Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo );
     }
-    else
-    {
-    }
 }
 
 
@@ -186,10 +182,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
 {
     const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" );
     const String ellipsis = String::CreateFromAscii( "..." );
-    const ::rtl::OUString providerKey =
-    ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" );
-    const ::rtl::OUString languageProviderName =
-        ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" );
+    const ::rtl::OUString providerKey(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.ScriptProviderFor"));
+    const ::rtl::OUString languageProviderName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.LanguageScriptProvider"));
     sal_uInt16 itemId = startItemId;
     Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
@@ -230,3 +224,5 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 9df04fa17ab4..3284067a5804 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,9 +63,7 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSYSTEMDEPENDENT_HPP_
 #include <com/sun/star/lang/SystemDependent.hpp>
-#endif
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -84,13 +83,11 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/file.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -116,7 +113,6 @@ struct SystemMenuData
 //_________________________________________________________________________________________________________________
 
 using namespace ::cppu;
-using namespace ::vos;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
@@ -179,34 +175,26 @@ namespace framework
 
 #define SFX_REFERER_USER        "private:user"
 
-const ::rtl::OUString aCmdHelpIndex( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpIndex" ));
-const ::rtl::OUString aCmdToolsMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolsMenu" ));
-const ::rtl::OUString aCmdHelpMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpMenu" ));
-const ::rtl::OUString aSlotHelpMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5410" ));
-
-const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" ));
-const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" ));
-const ::rtl::OUString aSlotSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5510" ));
-const ::rtl::OUString aSlotSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5610" ));
-const ::rtl::OUString aSlotSpecialToolsMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:6677" ));
+#define aCmdHelpIndex ".uno:HelpIndex"
+#define aCmdToolsMenu ".uno:ToolsMenu"
+#define aCmdHelpMenu ".uno:HelpMenu"
+#define aSlotHelpMenu "slot:5410"
 
-// special uno commands for picklist and window list
-const ::rtl::OUString aSpecialFileCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:PickList" ));
-const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:WindowList" ));
+#define aSpecialWindowMenu "window"
+#define aSlotSpecialWindowMenu "slot:5610"
+#define aSlotSpecialToolsMenu "slot:6677"
 
-const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
+// special uno commands for window list
+#define aSpecialWindowCommand ".uno:WindowList"
 
-static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
+static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
 {
     sal_Int16 n( 0 );
     if ( bBig )
         n |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
-    if ( bHighContrast )
-        n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
     return n;
 }
 
-// #110897#
 MenuBarManager::MenuBarManager(
     const Reference< XMultiServiceFactory >& xServiceFactory,
     const Reference< XFrame >& rFrame,
@@ -231,7 +219,6 @@ MenuBarManager::MenuBarManager(
     FillMenuManager( pMenu, rFrame, rDispatchProvider, rModuleIdentifier, bDelete, bDeleteChildren );
 }
 
-// #110897#
 MenuBarManager::MenuBarManager(
     const Reference< XMultiServiceFactory >& xServiceFactory,
     const Reference< XFrame >& rFrame,
@@ -254,7 +241,6 @@ MenuBarManager::MenuBarManager(
     Init(rFrame,pAddonMenu,bDelete,bDeleteChildren);
 }
 
-// #110897#
 MenuBarManager::MenuBarManager(
     const Reference< XMultiServiceFactory >& xServiceFactory,
     const Reference< XFrame >& rFrame,
@@ -319,7 +305,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces
 
     if ( m_pVCLMenu )
     {
-        OGuard  aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
 
         SystemMenuData aSystemMenuData;
         aSystemMenuData.nSize = sizeof( SystemMenuData );
@@ -356,7 +342,7 @@ MenuBarManager::~MenuBarManager()
 void MenuBarManager::Destroy()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Destroy" );
-    OGuard  aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     if ( !m_bDisposed )
     {
@@ -367,7 +353,7 @@ void MenuBarManager::Destroy()
         RemoveListener();
 
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pItemHandler = *p;
             pItemHandler->xMenuItemDispatch.clear();
@@ -396,7 +382,6 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
 
     {
         ResetableGuard aGuard( m_aLock );
-//        RemoveListener();
         Destroy();
         m_bDisposed = sal_True;
 
@@ -466,7 +451,7 @@ throw (RuntimeException)
         return;
 
     sal_Int16 nImageType = sal_Int16();
-    sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast );
+    sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False );
     if (( Event.aInfo >>= nImageType ) &&
         ( nImageType == nCurrentImageType ))
         RequestImages();
@@ -499,7 +484,7 @@ throw ( RuntimeException )
     if ( Action.Action == FrameAction_CONTEXT_CHANGED )
     {
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             // Clear dispatch reference as we will requery it later o
             MenuItemHandler* pItemHandler = *p;
@@ -515,7 +500,7 @@ throw ( RuntimeException )
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" );
     ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete;
 
-    OGuard  aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     {
         ResetableGuard aGuard( m_aLock );
 
@@ -524,7 +509,7 @@ throw ( RuntimeException )
 
         // We have to check all menu entries as there can be identical entries in a popup menu.
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pMenuItemHandler = *p;
             if ( pMenuItemHandler->aMenuItemURL == aFeatureURL )
@@ -536,12 +521,12 @@ throw ( RuntimeException )
                 status::Visibility  aVisibilityStatus;
 
                 #ifdef UNIX
-                // #b6673979# enable some slots hardly, because UNIX clipboard does not notify all changes
+                //enable some slots hardly, because UNIX clipboard does not notify all changes
                 // Can be removed if follow up task will be fixed directly within applications.
                 if (
-                    ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:Paste"         ) ) ||
-                    ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:PasteSpecial"  ) ) ||
-                    ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:PasteClipboard") )      // special for draw/impress
+                    ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Paste"))) ||
+                    ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteSpecial"))) ||
+                    ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteClipboard")))      // special for draw/impress
                    )
                     bEnabledItem = sal_True;
                 #endif
@@ -615,7 +600,7 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16
     ResetableGuard aGuard( m_aLock );
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         if ( pItemHandler->nItemId == nItemId )
@@ -629,8 +614,6 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16
 void MenuBarManager::RequestImages()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::RequestImages" );
-    // must be locked from callee
-    // ResetableGuard aGuard( m_aLock );
 
     m_bRetrieveImages = sal_True;
     const sal_uInt32 nCount = m_aMenuItemHandlerVector.size();
@@ -658,7 +641,7 @@ void MenuBarManager::RemoveListener()
     if ( xServiceManager.is() )
     {
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pItemHandler = *p;
             if ( pItemHandler->xMenuItemDispatch.is() )
@@ -676,7 +659,7 @@ void MenuBarManager::RemoveListener()
             {
                 {
                     // Remove popup menu from menu structure
-                    OGuard  aGuard2( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard2;
                     m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 );
                 }
 
@@ -737,7 +720,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
     ResetableGuard aGuard( m_aLock );
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pMenuItemHandler = *p;
         if ( pMenuItemHandler->xMenuItemDispatch.is() &&
@@ -774,7 +757,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
                 {
                     // Remove popup menu from menu structure as we release our reference to
                     // the controller.
-                    OGuard  aGuard2( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard2;
                     m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 );
                 }
 
@@ -863,7 +846,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
             nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
         else
             nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES;
-        pMenu->SetMenuFlags( nFlag );
+        pMenu->SetMenuFlags( nFlag | MENU_FLAG_SHOWCHECKIMAGES );
 
         if ( m_bActive )
             return 0;
@@ -871,26 +854,22 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         m_bActive = sal_True;
 
         ::rtl::OUString aMenuCommand( m_aMenuItemCommand );
-        if ( m_aMenuItemCommand == aSpecialWindowMenu ||
-             m_aMenuItemCommand == aSlotSpecialWindowMenu ||
-             aMenuCommand == aSpecialWindowCommand )
+        if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) ||
+             m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialWindowMenu)) ||
+             aMenuCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) )
              MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
 
         // Check if some modes have changed so we have to update our menu images
-        sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
         sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
 
         if ( m_bRetrieveImages ||
-             m_bWasHiContrast != bIsHiContrast ||
              bShowMenuImages != m_bShowMenuImages ||
              nSymbolsStyle != m_nSymbolsStyle )
         {
-            // The mode changed so we have to replace all images
-            m_bWasHiContrast    = bIsHiContrast;
             m_bShowMenuImages   = bShowMenuImages;
             m_bRetrieveImages   = sal_False;
             m_nSymbolsStyle     = nSymbolsStyle;
-            MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
+            MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages );
         }
 
         // Try to map commands to labels
@@ -910,13 +889,13 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         {
             RetrieveShortcuts( m_aMenuItemHandlerVector );
             std::vector< MenuItemHandler* >::iterator p;
-            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
             {
                 MenuItemHandler* pMenuItemHandler = *p;
 
                 // Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
                 // Only non-popup menu items can have a short-cut
-                if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
+                if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
                 {
                     KeyCode aKeyCode( KEY_F1 );
                     pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
@@ -940,7 +919,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
             KeyCode             aEmptyKeyCode;
             SvtCommandOptions   aCmdOptions;
             std::vector< MenuItemHandler* >::iterator p;
-            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
             {
                 MenuItemHandler* pMenuItemHandler = *p;
                 if ( pMenuItemHandler )
@@ -1068,7 +1047,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu )
 
 IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
 {
-    OGuard  aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     Reference< XInterface > xSelfHold(
         static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY_THROW );
 
@@ -1102,8 +1081,6 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
             {
                 // window list menu item selected
 
-                // #110897#
-                // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( DESKTOP_SERVICE ), UNO_QUERY );
                 Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
                 if ( xDesktop.is() )
@@ -1153,7 +1130,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
     {
         const sal_uInt32 nRef = Application::ReleaseSolarMutex();
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("MenuBarManager")).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuBarManager"))).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs);
         xDispatch->dispatch( aTargetURL, aArgs );
         Application::AcquireSolarMutex( nRef );
     }
@@ -1274,7 +1251,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     m_xDispatchProvider = rDispatchProvider;
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
     m_bRetrieveImages   = sal_False;
 
@@ -1292,7 +1268,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
             sal_uInt16          nItemId  = pMenu->GetItemId( nPos );
             ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId );
             if ( nItemId == SID_MDIWINDOWLIST ||
-                 aCommand == aSpecialWindowCommand )
+                 aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) )
             {
                 // Retrieve addon popup menus and add them to our menu bar
                 Reference< com::sun::star::frame::XModel >      xModel;
@@ -1335,10 +1311,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
         Reference< XStatusListener > xStatusListener;
         PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId );
         bool bItemShowMenuImages = m_bShowMenuImages;
-        MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
         // overwrite the show icons on menu option?
-        if ( nBits )
+        if (!bItemShowMenuImages)
+        {
+            MenuItemBits nBits =  pMenu->GetItemBits( nItemId );
             bItemShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
+        }
         if ( pPopup )
         {
             // Retrieve module identifier from Help Command entry
@@ -1377,7 +1355,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                      ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
             {
                 // A special addon popup menu, must be created with a different ctor
-                // #110897#
                 MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), m_xFrame, m_xURLTransformer,(AddonPopupMenu *)pPopup, bDeleteChildren, bDeleteChildren );
                 AddMenu(pSubMenuManager,aItemCommand,nItemId);
             }
@@ -1391,12 +1368,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     xPopupMenuDispatchProvider = pAttributes->xDispatchProvider;
 
                 // Check if this is the help menu. Add menu item if needed
-                if ( nItemId == SID_HELPMENU || aItemCommand == aSlotHelpMenu || aItemCommand == aCmdHelpMenu )
+                if ( nItemId == SID_HELPMENU || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotHelpMenu)) || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpMenu)) )
                 {
                     // Check if this is the help menu. Add menu item if needed
                     CheckAndAddMenuExtension( pPopup );
                 }
-                else if (( nItemId == SID_ADDONLIST || aItemCommand == aSlotSpecialToolsMenu || aItemCommand == aCmdToolsMenu ) &&
+                else if (( nItemId == SID_ADDONLIST || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdToolsMenu)) ) &&
                          AddonMenuManager::HasAddonMenuElements() )
                 {
                     // Create addon popup menu if there exist elements and this is the tools popup menu
@@ -1424,8 +1401,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
 
                 if ( nItemId == ITEMID_ADDONLIST )
                 {
-                    // Create control structure within the "Tools" sub menu for the Add-Ons popup menu
-                    // #110897# MenuBarManager* pSubMenuManager = new MenuBarManager( rFrame, pSubMenu, sal_True, sal_False );
                     AddonMenu* pSubMenu = dynamic_cast< AddonMenu* >( pPopup );
                     if ( pSubMenu )
                     {
@@ -1437,7 +1412,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Reference< XFrame > xTemp( rFrame );
-                            Image aImage = GetImageFromURL( xTemp, aItemCommand, sal_False, m_bWasHiContrast );
+                            Image aImage = GetImageFromURL( xTemp, aItemCommand, false );
                             if ( !!aImage )
                                    pPopup->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -1445,7 +1420,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                 }
                 else
                 {
-                    // #110897# MenuBarManager* pSubMenuManager = new MenuBarManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
                     MenuBarManager* pSubMenuMgr = new MenuBarManager( getServiceFactory(), rFrame, m_xURLTransformer,rDispatchProvider, aModuleIdentifier, pPopup, bDeleteChildren, bDeleteChildren );
                     AddMenu(pSubMenuMgr,aItemCommand,nItemId);
                 }
@@ -1467,14 +1441,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                     {
                         // Retrieve image id from menu attributes
-                        aImage = GetImageFromURL( m_xFrame, aImageId, sal_False, m_bWasHiContrast );
+                        aImage = GetImageFromURL( m_xFrame, aImageId, false );
                     }
 
                     if ( !aImage )
                     {
-                        aImage = GetImageFromURL( m_xFrame, aItemCommand, sal_False, m_bWasHiContrast );
+                        aImage = GetImageFromURL( m_xFrame, aItemCommand, false );
                         if ( !aImage )
-                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, sal_False, m_bWasHiContrast );
+                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, false );
                     }
 
                     if ( !!aImage )
@@ -1515,13 +1489,13 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     {
         RetrieveShortcuts( m_aMenuItemHandlerVector );
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pMenuItemHandler = *p;
 
             // Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
             // Only non-popup menu items can have a short-cut
-            if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
+            if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
             {
                 KeyCode aKeyCode( KEY_F1 );
                 pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
@@ -1655,7 +1629,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
         if ( m_xModuleAcceleratorManager.is() )
             impl_RetrieveShortcutsFromConfiguration( xModuleAccelCfg, aSeq, aMenuShortCuts );
         if ( m_xDocAcceleratorManager.is() )
-            impl_RetrieveShortcutsFromConfiguration( xGlobalAccelCfg, aSeq, aMenuShortCuts );
+            impl_RetrieveShortcutsFromConfiguration( xDocAccelCfg, aSeq, aMenuShortCuts );
     }
 }
 
@@ -1936,7 +1910,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
 
     // Clear MenuBarManager structures
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         // Check active state as we cannot change our VCL menu during activation by the user
         if ( m_bActive )
@@ -1947,7 +1921,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
 
         RemoveListener();
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pItemHandler = *p;
             pItemHandler->xMenuItemDispatch.clear();
@@ -1978,10 +1952,10 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetPopupController" );
     String aPopupScheme = String::CreateFromAscii( "vnd.sun.star.popup:" );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         if ( pItemHandler->xPopupMenuController.is() )
@@ -2020,10 +1994,8 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
     }
 }
 
-// #110897#
 const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory()
 {
-    // #110897#
     return mxServiceFactory;
 }
 
@@ -2075,9 +2047,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
         getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
         UNO_QUERY );
 
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
-
     Reference< XStatusListener > xStatusListener;
     Reference< XDispatch > xDispatch;
     sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
@@ -2090,7 +2059,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
         PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
         {
-            // #110897#
             Reference< XDispatchProvider > xDispatchProvider;
             MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, _bHandlePopUp ? sal_False : bDeleteChildren, _bHandlePopUp ? sal_False : bDeleteChildren );
 
@@ -2156,3 +2124,5 @@ void MenuBarManager::SetHdl()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index d1d3b9b427e0..5aba33de6877 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,6 +102,14 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
 {
     sal_uInt32       i( 0 );
     const sal_uInt32 nCount( rReferencePath.size() );
+
+    ReferencePathInfo aResult;
+    if ( !nCount )
+    {
+        aResult.eResult = RP_MENUITEM_NOT_FOUND;
+        return aResult;
+    }
+
     Menu*            pCurrMenu( pMenu );
     RPResultInfo     eResult( RP_OK );
 
@@ -142,7 +151,6 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
     }
     while (( pCurrMenu != 0 ) && ( i < nCount ) && ( eResult == RP_OK ));
 
-    ReferencePathInfo aResult;
     aResult.pPopupMenu = pCurrMenu;
     aResult.nPos       = nPos;
     aResult.nLevel     = nLevel;
@@ -439,3 +447,5 @@ void MenuBarMerger::GetSubMenu(
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 8a1ca4a36cac..cde049579711 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,7 +102,6 @@ DEFINE_XTYPEPROVIDER_11 (   MenuBarWrapper                                  ,
                             ::com::sun::star::container::XNameAccess
                         )
 
-// #110897#
 MenuBarWrapper::MenuBarWrapper(
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
     )
@@ -154,7 +154,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
             MenuBar*        pVCLMenuBar = 0;
             VCLXMenuBar*    pAwtMenuBar = 0;
             {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aSolarMutexGuard;
                 pVCLMenuBar = new MenuBar();
             }
 
@@ -195,7 +195,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 PropertyValue aPropValue;
                 if ( aArguments[n] >>= aPropValue )
                 {
-                    if ( aPropValue.Name.equalsAscii( "MenuOnly" ))
+                    if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) )
                         aPropValue.Value >>= bMenuOnly;
                 }
             }
@@ -208,7 +208,6 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 // support. This feature is currently used for "Inplace editing"!
                 Reference< XDispatchProvider > xDispatchProvider;
 
-                // #110897#
                 MenuBarManager* pMenuBarManager = new MenuBarManager( m_xServiceFactory,
                                                                       xFrame,
                                                                       xTrans,
@@ -377,3 +376,4 @@ Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( Runt
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index d3c9a1913843..ea8eaa3afd44 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <classes/fwkresid.hxx>
 #include <framework/bmkmenu.hxx>
 #include <framework/imageproducer.hxx>
@@ -67,12 +66,11 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -95,7 +93,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   NewMenuController
 
 DEFINE_INIT_SERVICE                     (   NewMenuController, {} )
 
-void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast )
+void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages )
 {
     sal_uInt16 nItemCount = pPopupMenu->GetItemCount();
     Image               aImage;
@@ -117,7 +115,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    aImage = GetImageFromURL( xFrame, aImageId, sal_False, bHiContrast );
+                    aImage = GetImageFromURL( xFrame, aImageId, false );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -129,7 +127,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
                 {
                     String aCmd( pPopupMenu->GetItemCommand( nItemId ) );
                     if ( aCmd.Len() )
-                        aImage = GetImageFromURL( xFrame, aCmd, sal_False, bHiContrast );
+                        aImage = GetImageFromURL( xFrame, aCmd, false );
 
                     if ( !!aImage )
                         pPopupMenu->SetItemImage( nItemId, aImage );
@@ -329,7 +327,6 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
 NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
     svt::PopupMenuControllerBase( xServiceManager ),
     m_bShowImages( sal_True ),
-    m_bHiContrast( sal_False ),
     m_bNewMenu( sal_False ),
     m_bModuleIdentified( sal_False ),
     m_bAcceleratorCfg( sal_False ),
@@ -347,7 +344,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
     VCLXPopupMenu* pPopupMenu    = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*     pVCLPopupMenu = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
@@ -370,7 +367,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
         AddInfo         aAddInfo;
 
         // retrieve additional parameters from bookmark menu and
-        // store it in a hash_map.
+        // store it in a boost::unordered_map.
         for ( sal_uInt16 i = 0; i < pSubMenu->GetItemCount(); i++ )
         {
             sal_uInt16 nItemId = pSubMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ) );
@@ -389,7 +386,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
         }
 
         if ( m_bShowImages )
-            setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast );
+            setMenuImages( pVCLPopupMenu, m_bShowImages );
 
         delete pSubMenu;
     }
@@ -440,7 +437,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
         if ( pPopupMenu )
         {
             {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aSolarMutexGuard;
                 PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
                 aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId );
             }
@@ -448,7 +445,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
             xURLTransformer->parseStrict( aTargetURL );
 
             aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-            aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+            aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
 
             rtl::OUString aTargetFrame( m_aTargetFrame );
             AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId );
@@ -469,14 +466,14 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
         pNewDocument->aTargetURL = aTargetURL;
         pNewDocument->aArgSeq    = aArgsList;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("NewMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
         Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument );
     }
 }
 
 void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     if ( m_xFrame.is() && m_xPopupMenu.is() )
     {
         VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu );
@@ -484,17 +481,13 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R
         {
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
             sal_Bool bShowImages( rSettings.GetUseImagesInMenus() );
-            sal_Bool bHiContrast( rSettings.GetHighContrastMode() );
 
             PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
 
-            if (( m_bShowImages != bShowImages ) ||
-                ( m_bHiContrast != bHiContrast ))
+            if ( m_bShowImages != bShowImages )
             {
                 m_bShowImages = bShowImages;
-                m_bHiContrast = bHiContrast;
-
-                setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast );
+                setMenuImages( pVCLPopupMenu, m_bShowImages );
             }
 
             setAccelerators( pVCLPopupMenu );
@@ -527,7 +520,7 @@ void NewMenuController::impl_setPopupMenu()
                 {
                     for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
                     {
-                        if ( aSeq[y].Name.equalsAscii("ooSetupFactoryEmptyDocumentURL") )
+                        if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) )
                         {
                             aSeq[y].Value >>= m_aEmptyDocURL;
                             break;
@@ -561,9 +554,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
             m_bShowImages   = rSettings.GetUseImagesInMenus();
-            m_bHiContrast   = rSettings.GetHighContrastMode();
-
-            m_bNewMenu      = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
+            m_bNewMenu      = m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:AddDirect" ) );
         }
     }
 }
@@ -579,18 +570,10 @@ IMPL_STATIC_LINK_NOINSTANCE( NewMenuController, ExecuteHdl_Impl, NewDocument*, p
         // Framework can recycle our current frame and the layout manager disposes all user interface
         // elements if a component gets detached from its frame!
         pNewDocument->xDispatch->dispatch( pNewDocument->aTargetURL, pNewDocument->aArgSeq );
-/*
-    }
-    catch (const ::com::sun::star::document::CorruptedFilterConfigurationException& exFilters)
-    {
-        throw exFilters;
-    }
-    catch (const Exception& )
-    {
-    }
-*/
     delete pNewDocument;
     return 0;
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 7a0675ec84b2..1728fe17dc06 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,28 +44,23 @@
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
-#ifndef _COM_SUN_STAR_EMBED_VERBDATTRIBUTES_HPP_
 #include <com/sun/star/embed/VerbAttributes.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -99,7 +95,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed:
     VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*                                         pVCLPopupMenu     = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
@@ -157,10 +153,12 @@ void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,
 {
     Sequence<PropertyValue>      aArgs;
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
     OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch");
     if ( _xDispatch.is() )
         _xDispatch->dispatch( aTargetURL, aArgs );
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/panelwindow.cxx b/framework/source/uielement/panelwindow.cxx
index c8729dbb028d..61e1d3095eb0 100755..100644
--- a/framework/source/uielement/panelwindow.cxx
+++ b/framework/source/uielement/panelwindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
@@ -75,3 +76,5 @@ void PanelWindow::Resize()
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx
index 02d05d2653a2..c52e65765dfe 100644
--- a/framework/source/uielement/panelwrapper.cxx
+++ b/framework/source/uielement/panelwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
@@ -100,7 +101,7 @@ void SAL_CALL PanelWrapper::dispose() throw ( RuntimeException )
         ModelWinService* pService = dynamic_cast< ModelWinService* >( xNameAccess.get() );
         if ( pService != 0 )
         {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             PanelWindow* pPanelWindow = dynamic_cast< PanelWindow* >( m_xPanelWindow.get() );
             if ( pPanelWindow != NULL )
             {
@@ -147,7 +148,7 @@ void SAL_CALL PanelWrapper::initialize( const Sequence< Any >& aArguments ) thro
             PanelWindow* pPanelWindow(0);
             Window*      pContentWindow(0);
             {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 pContentWindow  = VCLUnoHelper::GetWindow( xContentWindow );
                 if ( pWindow )
@@ -224,3 +225,5 @@ void SAL_CALL PanelWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 8ed1586f0170..ab455cc5296a 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,14 +33,13 @@
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
-//#include <toolkit/unohlp.hxx>
 
 #include <rtl/ref.hxx>
 
 #include <vcl/toolbox.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include "uielement/popupmenucontroller.hxx"
 #include "services.h"
@@ -193,7 +193,7 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception)
 
 Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() throw (RuntimeException)
 {
-    ::vos::OGuard aSolarLock(Application::GetSolarMutex());
+    SolarMutexGuard aSolarLock;
 
     Reference< awt::XWindow > xRet;
 
@@ -246,3 +246,4 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createItemWindow( const
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index a411188f5f94..55c2a6a12293 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_
 #include <uielement/progressbarwrapper.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
@@ -140,7 +139,7 @@ throw (uno::RuntimeException)
 
     if ( xWindow.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
@@ -178,7 +177,7 @@ throw (uno::RuntimeException)
 
     if ( xWindow.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
@@ -208,7 +207,7 @@ throw (uno::RuntimeException)
 
     if ( xWindow.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
@@ -261,7 +260,7 @@ throw (uno::RuntimeException)
 
     if ( xWindow.is() && bSetValue )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
@@ -363,3 +362,5 @@ throw (uno::RuntimeException)
 }
 
 }       //  namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 227cab9e4f2b..ae976e75fe35 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,7 @@
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <classes/fwkresid.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -51,9 +50,7 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
@@ -61,14 +58,18 @@
 #include <unotools/historyoptions.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
-//#include <tools/solar.hrc>
+#ifdef WNT
+#define GradientStyle_RECT BLA_GradientStyle_RECT
+#include <windows.h>
+#undef GradientStyle_RECT
+#include <odma_lib.hxx>
+#endif
 #include <dispatch/uieventloghelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -120,7 +121,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
     VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
     PopupMenu*                                         pVCLPopupMenu     = 0;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     resetPopupMenu( rPopupMenu );
     if ( pPopupMenu )
@@ -210,6 +211,44 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
                     else
                         aMenuTitle = aSystemPath;
                 }
+#if 0 // Please don't remove this commented-out code just yet,
+      // we can try to resurrect it later in case somebody complains
+#ifdef WNT
+                else if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_ODMA && ::odma::DMSsAvailable ())
+                {
+                    String aShortTitle = m_aRecentFilesItems.at( i ).aTitle;
+
+                    // This is against all rules for using
+                    // proper abstraction layers and whatnot.
+                    // But figuring out how to do it "right"
+                    // would have taken the whole week.
+                    // So just call the odma_lib functions...
+                    // (odma_lib is a thin layer on
+                    // top of the ODMA32 DLL)
+
+                    static ODMHANDLE handle = NULL;
+                    static sal_Bool beenhere = sal_False;
+                    ODMSTATUS status;
+
+                    if ( ! beenhere )
+                    {
+                        status = NODMRegisterApp( &handle, ODM_API_VERSION, "sodma", NULL, NULL );
+                        beenhere = sal_True;
+                    }
+
+                    if ( handle != NULL )
+                    {
+                        rtl::OUString s = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_MS_1252 );
+                        s = s.copy( strlen ( "vnd.sun.star.odma:/" ) );
+                        char title[47];
+                        status = NODMGetDocInfo( handle, rtl::OUStringToOString( s, RTL_TEXTENCODING_MS_1252 ).pData->buffer, ODM_NAME, title, sizeof ( title ) );
+                        aShortTitle = String::CreateFromAscii( title );
+                    }
+                    aMenuTitle += aShortTitle;
+                    aTipHelpText = aURLString;
+                }
+#endif
+#endif
                 else
                 {
                     // Use INetURLObject to abbreviate all other URLs
@@ -264,7 +303,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
 
         aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
         aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-        aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+        aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
 
         // documents in the picklist will never be opened as templates
         aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
@@ -289,7 +328,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter;
 
-        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 );
+        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0 );
     }
 
     if ( xDispatch.is() )
@@ -302,7 +341,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq    = aArgsList;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("RecentFilesMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
         Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
     }
 }
@@ -478,3 +517,5 @@ IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRec
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index 4e7855fb4900..df968765a6e6 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,11 @@
 #include <classes/fwkresid.hxx>
 #include <services.h>
 #include <classes/resource.hrc>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/status.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/helper/convert.hxx>
 
 using namespace ::rtl;
@@ -90,7 +89,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
 {
     const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     svt::StatusbarController::initialize( aArguments );
 
@@ -194,3 +193,5 @@ void SAL_CALL SimpleTextStatusbarController::doubleClick() throw (::com::sun::st
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 51a3cf3ae6ad..02f9ab5ab644 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,17 +32,13 @@
 #include <stdio.h>
 #include <wchar.h>
 
-#ifndef __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX
 #include "uielement/spinfieldtoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -58,11 +55,9 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <svtools/toolboxcontroller.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <tools/urlobj.hxx>
 #ifdef WINNT
 #include <systools/win32/snprintf.h>
@@ -240,7 +235,7 @@ SpinfieldToolbarController::~SpinfieldToolbarController()
 void SAL_CALL SpinfieldToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
     delete m_pSpinfieldControl;
@@ -575,3 +570,4 @@ rtl::OUString SpinfieldToolbarController::impl_formatOutputString( double fValue
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index 132a42456d1e..ea1734802417 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,7 +61,7 @@ FrameworkStatusBar::~FrameworkStatusBar()
 
 void FrameworkStatusBar::SetStatusBarManager( StatusBarManager* pStatusBarManager )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     m_pMgr = pStatusBarManager;
 }
 
@@ -111,3 +112,5 @@ void FrameworkStatusBar::MouseButtonUp( const MouseEvent& rMEvt )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 0328f0b6e4e4..70bcc6fae0b0 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,9 +63,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <svtools/statusbarcontroller.hxx>
 
 #include <vcl/status.hxx>
@@ -80,7 +79,7 @@ using namespace ::com::sun::star;
 #endif
 
 const sal_Int32  HELPID_PREFIX_LENGTH    = 7;
-static const char*      HELPID_PREFIX           = "helpid:";
+static const char HELPID_PREFIX[] = "helpid:";
 
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
@@ -497,27 +496,27 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
             {
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
-                    if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+                    if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
                     {
                         aProp[i].Value >>= aCommandURL;
                     }
-                    else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
                     {
                         aProp[i].Value >>= aHelpURL;
                     }
-                    else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
                     {
                         aProp[i].Value >>= nStyle;
                     }
-                    else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
                     {
                         aProp[i].Value >>= nType;
                     }
-                    else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
                     {
                         aProp[i].Value >>= nWidth;
                     }
-                    else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_OFFSET ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_OFFSET)) )
                     {
                         aProp[i].Value >>= nOffset;
                     }
@@ -710,3 +709,5 @@ IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index b355a6542f59..0281e1be4d88 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,9 +56,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 
 #include <tools/solar.h>
 #include <vcl/svapp.hxx>
@@ -127,7 +126,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
             StatusBar*        pStatusBar( 0 );
             StatusBarManager* pStatusBarManager( 0 );
             {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aSolarMutexGuard;
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
@@ -203,3 +202,4 @@ Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( Ru
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 7be64c053b4e..28bc86fb49b5 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 using namespace cppu;
 using namespace com::sun::star::uno;
@@ -128,3 +129,4 @@ throw( ::com::sun::star::uno::RuntimeException )
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 4f23713370e2..0e310669b0fd 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,17 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX
 #include "uielement/togglebuttontoolbarcontroller.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  my own includes
 //_________________________________________________________________________________________________________________
 #include <framework/addonsoptions.hxx>
-#ifndef __FRAMEWORK_TOOLBAR_HXX_
 #include "uielement/toolbar.hxx"
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -56,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <rtl/uri.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/urlobj.hxx>
@@ -108,7 +105,7 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController()
 void SAL_CALL ToggleButtonToolbarController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ComplexToolbarController::dispose();
 }
 
@@ -132,7 +129,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     uno::Reference< awt::XWindow > xWindow;
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     if (( m_eStyle == STYLE_DROPDOWNBUTTON ) ||
         ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON ))
     {
@@ -162,7 +159,7 @@ throw (::com::sun::star::uno::RuntimeException)
 
 void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if (( m_eStyle == STYLE_DROPDOWNBUTTON ) ||
         ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON ))
@@ -306,7 +303,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta
 
 IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     sal_uInt16 nItemId = pMenu->GetCurItemId();
     if ( nItemId > 0 && nItemId <= m_aDropdownMenuList.size() )
@@ -320,3 +317,4 @@ IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
 
 } // namespace
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx
index 48716b89f0cd..b0ea29a997de 100644
--- a/framework/source/uielement/toolbar.cxx
+++ b/framework/source/uielement/toolbar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ void ToolBar::DataChanged( const DataChangedEvent& rDCEvt )
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 8162307f87ad..62f6a06d98b7 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,12 +35,8 @@
 //_________________________________________________________________________________________________________________
 
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX
 #include <uielement/toolbar.hxx>
-#endif
-#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
 #include <uielement/generictoolbarcontroller.hxx>
-#endif
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 #include "general.h"
@@ -47,9 +44,7 @@
 #include <framework/imageproducer.hxx>
 #include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
-#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <framework/addonsoptions.hxx>
 #include <uielement/toolbarmerger.hxx>
 #include <framework/acceleratorinfo.hxx>
@@ -62,9 +57,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XDockableWindow.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_
 #include <com/sun/star/ui/DockingArea.hpp>
-#endif
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -84,9 +77,7 @@
 #include <svtools/imgdef.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <unotools/cmdoptions.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <comphelper/mediadescriptor.hxx>
 #include <svtools/miscopt.hxx>
 #include <svl/imageitm.hxx>
@@ -132,19 +123,18 @@ static const char   ITEM_DESCRIPTOR_VISIBLE[]       = "IsVisible";
 static const char   ITEM_DESCRIPTOR_WIDTH[]         = "Width";
 static const char   ITEM_DESCRIPTOR_STYLE[]         = "Style";
 
-static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN  = 10;
-static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN     = 7;
-static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN     = 7;
-static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN   = 23;
-static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN       = 5;
-static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN        = 4;
-static const sal_Int32 ITEM_DESCRIPTOR_VISIBLE_LEN     = 9;
-static const sal_Int32 ITEM_DESCRIPTOR_WIDTH_LEN       = 5;
-static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = 5;
+static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN  = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_COMMANDURL);
+static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN     = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_HELPURL);
+static const sal_Int32 ITEM_DESCRIPTOR_TOOLTIP_LEN     = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_TOOLTIP);
+static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN   = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_CONTAINER);
+static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN       = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_LABEL);
+static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN        = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_TYPE);
+static const sal_Int32 ITEM_DESCRIPTOR_VISIBLE_LEN     = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_VISIBLE);
+static const sal_Int32 ITEM_DESCRIPTOR_WIDTH_LEN       = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_WIDTH);
+static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = RTL_CONSTASCII_LENGTH(ITEM_DESCRIPTOR_STYLE);
 
 static const char   HELPID_PREFIX[]                 = "helpid:";
 static const char   HELPID_PREFIX_TESTTOOL[]        = ".HelpId:";
-//static sal_Int32    HELPID_PREFIX_LENGTH            = 7;
 static const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU     = 1000;
 
 #define MENUPREFIX "private:resource/menubar/"
@@ -185,13 +175,11 @@ throw ( RuntimeException )
 
 //*****************************************************************************************************************
 
-static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
+static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
 {
     sal_Int16 n( 0 );
     if ( bBig )
         n |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
-    if ( bHighContrast )
-        n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
     return n;
 }
 
@@ -248,7 +236,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     ThreadHelpBase( &Application::GetSolarMutex() ),
     OWeakObject(),
     m_bDisposed( sal_False ),
-    m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ),
     m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ),
     m_bModuleIdentified( sal_False ),
     m_bAddedToTaskPaneList( sal_True ),
@@ -256,7 +243,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     m_bUpdateControllers( sal_False ),
     m_bImageOrientationRegistered( sal_False ),
     m_bImageMirrored( sal_False ),
-    m_bCanBeCustomized( sal_True ),
+    m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
     m_lImageRotation( 0 ),
     m_pToolBar( pToolBar ),
     m_aResourceName( rResourceName ),
@@ -297,7 +284,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     // enables a menu for clipped items and customization
     SvtCommandOptions aCmdOptions;
     sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
-    if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString::createFromAscii( "CreateDialog" )))
+    if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog"))))
          nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
     //added for issue33668 by shizhoubo
     m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) );
@@ -327,6 +314,7 @@ ToolBarManager::~ToolBarManager()
 
 void ToolBarManager::Destroy()
 {
+    OSL_ASSERT( m_pToolBar != 0 );
     ResetableGuard aGuard( m_aLock );
     if ( m_bAddedToTaskPaneList )
     {
@@ -362,8 +350,8 @@ void ToolBarManager::Destroy()
     m_pToolBar->SetDoubleClickHdl( aEmpty );
     m_pToolBar->SetStateChangedHdl( aEmpty );
     m_pToolBar->SetDataChangedHdl( aEmpty );
+    m_pToolBar->SetCommandHdl( aEmpty );
 
-//    delete m_pToolBar;
     m_pToolBar = 0;
 }
 
@@ -378,21 +366,6 @@ void ToolBarManager::CheckAndUpdateImages()
     ResetableGuard aGuard( m_aLock );
     sal_Bool bRefreshImages = sal_False;
 
-    // Check if high contrast/normal mode have changed
-    if ( m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        if ( !m_bIsHiContrast )
-        {
-            bRefreshImages = sal_True;
-            m_bIsHiContrast = sal_True;
-        }
-    }
-    else if ( m_bIsHiContrast )
-    {
-        bRefreshImages = sal_True;
-        m_bIsHiContrast = sal_False;
-    }
-
     SvtMiscOptions aMiscOptions;
     bool bCurrentSymbolsSmall = !aMiscOptions.AreCurrentSymbolsLarge();
     if ( m_bSmallSymbols != bCurrentSymbolsSmall )
@@ -425,11 +398,11 @@ void ToolBarManager::RefreshImages()
         if ( nId > 0 )
         {
             ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-            Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast );
+            Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages );
             // Try also to query for add-on images before giving up and use an
             // empty image.
             if ( !aImage )
-                aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast );
+                aImage = QueryAddonsImage( aCommandURL, bBigImages );
             m_pToolBar->SetItemImage( nId, aImage );
         }
     }
@@ -496,6 +469,24 @@ void ToolBarManager::UpdateControllers()
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
 
+    if( !m_bCanBeCustomized )
+    {
+        Any a;
+        Reference< XLayoutManager > xLayoutManager;
+        Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY );
+        if ( xFramePropSet.is() )
+            a = xFramePropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+        a >>= xLayoutManager;
+        Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
+        if ( xLayoutManager.is() && xDockable.is() )
+        {
+            ::com::sun::star::awt::Point aPoint;
+            aPoint.X = aPoint.Y = SAL_MAX_INT32;
+            xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint );
+            xLayoutManager->lockWindow( m_aResourceName );
+        }
+    }
+
     if ( !m_bUpdateControllers )
     {
         m_bUpdateControllers = sal_True;
@@ -537,22 +528,6 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com::
          {
          }
 
-       /* m_bUpdateControllers = sal_True;
-        ToolBarControllerMap::iterator pIter = m_aControllerMap.begin();
-
-        while ( pIter != m_aControllerMap.end() )
-        {
-            try
-            {
-                Reference< XUpdatable > xUpdatable( pIter->second, UNO_QUERY );
-                if ( xUpdatable.is() )
-                    xUpdatable->update();
-            }
-            catch ( Exception& )
-            {
-            }
-            ++pIter;
-        }*/
 
     }
     m_bUpdateControllers = sal_False;
@@ -573,7 +548,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
     if ( m_bDisposed )
         return;
 
-    if ( Event.FeatureURL.Complete.equalsAscii( ".uno:ImageOrientation" ))
+    if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) )
     {
         SfxImageItem aItem( 1, 0 );
         aItem.PutValue( Event.State );
@@ -755,8 +730,8 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
     Reference< XNameAccess > xNameAccess;
     sal_Int16                nImageType = sal_Int16();
     sal_Int16                nCurrentImageType = getImageTypeFromBools(
-                                                    SvtMiscOptions().AreCurrentSymbolsLarge(),
-                                                    m_bIsHiContrast );
+                                                    SvtMiscOptions().AreCurrentSymbolsLarge()
+                                                    );
 
     if (( Event.aInfo >>= nImageType ) &&
         ( nImageType == nCurrentImageType ) &&
@@ -898,7 +873,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
     aPropSeq = GetPropsForCommand( aCmdURL );
     for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
     {
-        if ( aPropSeq[i].Name.equalsAscii( "Name" ))
+        if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
         {
             aPropSeq[i].Value >>= aLabel;
             break;
@@ -916,7 +891,7 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString&
     aPropSeq = GetPropsForCommand( aCmdURL );
     for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
     {
-        if ( aPropSeq[i].Name.equalsAscii( "Properties" ))
+        if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Properties")) )
         {
             aPropSeq[i].Value >>= nProperties;
             break;
@@ -1115,7 +1090,6 @@ void ToolBarManager::CreateControllers()
                 //for Support Visiblitly by shizhoubo
                 if (pController)
                 {
-                //  rtl::OUString aCommandURL = pController->m_aCommandURL;
                     if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) ||
                        aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) ||
                        aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) ||
@@ -1309,7 +1283,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
             {
                 for ( int i = 0; i < aProp.getLength(); i++ )
                 {
-                    if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_COMMANDURL, ITEM_DESCRIPTOR_COMMANDURL_LEN ))
+                    if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
                     {
                         aProp[i].Value >>= aCommandURL;
                         if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0  )
@@ -1330,7 +1304,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                                     xMenuContainer->getByIndex(0) >>= aProps;
                                     for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
                                     {
-                                        if ( aProps[ index ].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN ))
+                                        if ( aProps[ index ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
 
                                         {
                                             aProps[ index ].Value >>= aMenuDesc;
@@ -1344,19 +1318,19 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                             }
                         }
                     }
-                    else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_HELPURL, ITEM_DESCRIPTOR_HELPURL_LEN ))
+                    else if (  aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
                         aProp[i].Value >>= aHelpURL;
-                    else if (  aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TOOLTIP, ITEM_DESCRIPTOR_TOOLTIP_LEN ))
+                    else if (  aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TOOLTIP)) )
                         aProp[i].Value >>= aTooltip;
-                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
                         aProp[i].Value >>= aLabel;
-                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
                         aProp[i].Value >>= nType;
-                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_VISIBLE, ITEM_DESCRIPTOR_VISIBLE_LEN ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
                         aProp[i].Value >>= bIsVisible;
-                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_WIDTH, ITEM_DESCRIPTOR_WIDTH_LEN ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
                         aProp[i].Value >>= nWidth;
-                    else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN ))
+                    else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
                         aProp[i].Value >>= nStyle;
                 }
 
@@ -1548,8 +1522,7 @@ void ToolBarManager::RequestImages()
     }
 
     sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode();
-    sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast );
+    sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() );
 
     if ( m_xDocImageManager.is() )
         aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq );
@@ -1570,7 +1543,7 @@ void ToolBarManager::RequestImages()
             // Try also to query for add-on images before giving up and use an
             // empty image.
             if ( !aImage )
-                aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast );
+                aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages );
 
             pIter->second.nImageInfo = 1; // mark image as module based
         }
@@ -1752,8 +1725,11 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 }
 
 //added for i33668 by shizhoubo : 200804
-PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
+PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar)
 {
+    // update the list of hidden tool items first
+    pToolBar->UpdateCustomMenu();
+
     PopupMenu *pMenu = pToolBar->GetMenu();
     // remove all entries before inserting new ones
     ImplClearPopupMenu( pToolBar );
@@ -1803,6 +1779,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
             // Non-configurable toolbars should disable configuration menu items
             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False );
             aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False );
+            aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
         }
 
         // Disable menu item CLOSE if the toolbar has no closer
@@ -1824,10 +1801,8 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
                 pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
                 pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
                 pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
-                                         GetImageFromURL( m_xFrame,
-                                                          aCommandURL,
-                                                          sal_False,
-                                                          m_bIsHiContrast ));
+                                         GetImageFromURL( m_xFrame, aCommandURL, sal_False )
+                                       );
             }
             else
             {
@@ -1885,7 +1860,7 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
     if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU )
         return 0;
 
-    PopupMenu * pMenu = GetToolBarCustomMeun(m_pToolBar);
+    PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
     if (pMenu)
     {
         // make sure all disabled entries will be shown
@@ -1905,7 +1880,7 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar )
     if ( m_bDisposed )
         return 1;
     //modify for i33668 by shizhoubo:2008:04
-    GetToolBarCustomMeun(pToolBar);
+    GetToolBarCustomMenu(pToolBar);
     //end
      return 0;
  }
@@ -2030,11 +2005,11 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
                                 {
                                     for ( sal_Int32 j = 0; j < aProp.getLength(); j++ )
                                     {
-                                        if ( aProp[j].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+                                        if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
                                         {
                                             aProp[j].Value >>= aCommandURL;
                                         }
-                                        else if ( aProp[j].Name.equalsAscii( ITEM_DESCRIPTOR_VISIBLE ))
+                                        else if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
                                         {
                                             aProp[j].Value >>= bVisible;
                                             nVisibleIndex = j;
@@ -2123,7 +2098,6 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
 
     if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
     else if ( *pStateChangedType == STATE_CHANGE_VISIBLE )
@@ -2144,7 +2118,6 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
         (  pDataChangedEvent->GetType() == DATACHANGED_DISPLAY  ))  &&
         ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE        ))
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
 
@@ -2229,9 +2202,9 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
     return 0;
 }
 
-Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast )
+Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages )
 {
-    Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast );
+    Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages );
     return aImage;
 }
 
@@ -2354,3 +2327,4 @@ bool ToolBarManager::RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OU
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 1b5a1dccb667..c5745e33c586 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -714,3 +715,5 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCom
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 02440f048dd5..ed5eee6a3e7e 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <classes/fwkresid.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
 #include <framework/imageproducer.hxx>
@@ -63,27 +62,23 @@
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/image.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <vcl/window.hxx>
 #include <svtools/menuoptions.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <dispatch/uieventloghelper.hxx>
 #include <rtl/logfile.hxx>
+#include <svtools/miscopt.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -98,7 +93,6 @@ using namespace ::com::sun::star::ui;
 static const char CONFIGURE_TOOLBARS_CMD[]      = "ConfigureDialog";
 static const char CONFIGURE_TOOLBARS[]          = ".uno:ConfigureDialog";
 static const char CMD_COLORBAR[]                = ".uno:ColorControl";
-static const char CMD_HYPERLINKBAR[]            = ".uno:InsertHyperlink";
 static const char CMD_FORMULABAR[]              = ".uno:InsertFormula";
 static const char CMD_INPUTLINEBAR[]            = ".uno:InputLineVisible";
 static const char CMD_RESTOREVISIBILITY[]       = ".cmd:RestoreVisibility";
@@ -112,7 +106,7 @@ static const char STATIC_INTERNAL_CMD_PART[]    = ".cmd:";
 namespace framework
 {
 
-typedef std::hash_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap;
+typedef boost::unordered_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap;
 
 struct ToolBarEntry
 {
@@ -201,13 +195,13 @@ void ToolbarsMenuController::addCommand(
             m_xPopupMenu->enableItem( nItemId, sal_False );
     }
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     Image                aImage;
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
     if ( rSettings.GetUseImagesInMenus() )
-        aImage = GetImageFromURL( m_xFrame, rCommandURL, sal_False, rSettings.GetHighContrastMode() );
+        aImage = GetImageFromURL( m_xFrame, rCommandURL, false );
 
     VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );
     if ( pPopupMenu )
@@ -228,7 +222,7 @@ Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const
     Reference< XFrame >          xFrame;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         xURLTransformer = m_xURLTransformer;
         xFrame = m_xFrame;
     }
@@ -273,7 +267,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString&
             {
                 for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
                 {
-                    if ( aPropSeq[i].Name.equalsAscii( "Label" ))
+                    if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) ))
                     {
                         aPropSeq[i].Value >>= aStr;
                         break;
@@ -337,7 +331,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl
 
                     aToolBarInfo.aToolBarResName = aResName;
 
-                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if ( pWindow )
@@ -375,7 +369,10 @@ sal_Bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible()
 
 void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    if( SvtMiscOptions().DisableUICustomization() )
+        return;
+
+    SolarMutexGuard aSolarMutexGuard;
     resetPopupMenu( rPopupMenu );
 
     m_aCommandVector.clear();
@@ -476,7 +473,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                 m_xPopupMenu->checkItem( nIndex, sal_True );
 
             {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
                 PopupMenu*     pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu();
 
@@ -499,18 +496,17 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         }
 
         // Create commands for non-toolbars
-        if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.text.TextDocument" ) ||
-             m_aModuleIdentifier.equalsAscii( "com.sun.star.text.WebDocument" ) ||
-             m_aModuleIdentifier.equalsAscii( "com.sun.star.text.GlobalDocument" ) ||
-             m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ||
-             m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) ||
-             m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ))
+        if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) ||
+             m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) ||
+             m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) ||
+             m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ||
+             m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ||
+             m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
         {
-            addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), aEmptyString );
-            if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ||
-                 m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ))
+            if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ||
+                 m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ))
                 addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), aEmptyString );
-            else if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ))
+            else if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
                 addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), aEmptyString );
             else
                 addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), aEmptyString );
@@ -588,7 +584,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
 
     if ( xPopupMenu.is() )
     {
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu );
         PopupMenu*     pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu();
 
@@ -644,7 +640,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
         VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
         if ( pPopupMenu )
         {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarMutexGuard;
             PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
 
             rtl::OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId ));
@@ -747,7 +743,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
                     pExecuteInfo->aTargetURL    = aTargetURL;
                     pExecuteInfo->aArgs         = aArgs;
                     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                        UiEventLogHelper(::rtl::OUString::createFromAscii("ToolbarsMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+                        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolbarsMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
                     Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo );
                 }
             }
@@ -834,7 +830,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
     if ( m_xFrame.is() && !m_xPopupMenu.is() )
     {
         // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         m_xPopupMenu = xPopupMenu;
         m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
@@ -916,3 +912,5 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInf
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 8e86f6b84639..d32ac97d186b 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/toolbarmanager.hxx>
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_
 #include <uielement/toolbar.hxx>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -59,9 +58,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -174,7 +171,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
             ToolBar* pToolBar = 0;
             ToolBarManager* pToolBarManager = 0;
             {
-                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aSolarMutexGuard;
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
@@ -351,3 +348,4 @@ void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandl
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 39b91a771228..273d46faf2d8 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,6 +38,8 @@
 
 #include "properties.h"
 
+#include "helper/mischelper.hxx"
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -54,16 +57,13 @@
 #include <unotools/configmgr.hxx>
 #include <tools/string.hxx>
 
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 #include <comphelper/sequence.hxx>
 #include <rtl/logfile.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -74,7 +74,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 struct ModuleToCommands
 {
@@ -173,7 +172,7 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ
                                                 std::vector< ::rtl::OUString >& aImageMirrorVector);
 
     private:
-        typedef ::std::hash_map< ::rtl::OUString,
+        typedef ::boost::unordered_map< ::rtl::OUString,
                                  CmdToInfoMap,
                                  OUStringHashCode,
                                  ::std::equal_to< ::rtl::OUString > > CommandToInfoCache;
@@ -196,9 +195,10 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ
         Reference< XNameAccess >          m_xGenericUICommands;
         Reference< XMultiServiceFactory > m_xServiceManager;
         Reference< XMultiServiceFactory > m_xConfigProvider;
-        //Reference< XMultiServiceFactory > m_xConfigProviderPopups;
         Reference< XNameAccess >          m_xConfigAccess;
+        Reference< XContainerListener >   m_xConfigListener;
         Reference< XNameAccess >          m_xConfigAccessPopups;
+        Reference< XContainerListener >   m_xConfigAccessListener;
         Sequence< rtl::OUString >         m_aCommandImageList;
         Sequence< rtl::OUString >         m_aCommandRotateImageList;
         Sequence< rtl::OUString >         m_aCommandMirrorImageList;
@@ -236,7 +236,6 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUStrin
 
     m_aConfigPopupAccess += aModuleName;
     m_aConfigPopupAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_POP_ELEMENT_ACCESS ));
-    //m_xConfigProviderPopups = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY );
 
     rtl::OUString aTmp;
     ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ) >>= aTmp;
@@ -249,10 +248,10 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
     ResetableGuard aLock( m_aLock );
     Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
     if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
+        xContainer->removeContainerListener(m_xConfigListener);
     xContainer = Reference< XContainer >( m_xConfigAccessPopups, UNO_QUERY );
     if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
+        xContainer->removeContainerListener(m_xConfigAccessListener);
 }
 
 
@@ -402,7 +401,7 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x
             {
             }
         }
-    } // if ( m_xConfigAccessPopups.is() )
+    }
 }
 sal_Bool ConfigurationAccess_UICommand::fillCache()
 {
@@ -566,7 +565,10 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
             // Add as container listener
             Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
             if ( xContainer.is() )
-                xContainer->addContainerListener( this );
+            {
+                m_xConfigListener = new WeakContainerListener(this);
+                xContainer->addContainerListener(m_xConfigListener);
+            }
         }
 
         aPropValue.Value <<= m_aConfigPopupAccess;
@@ -577,7 +579,10 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
             // Add as container listener
             Reference< XContainer > xContainer( m_xConfigAccessPopups, UNO_QUERY );
             if ( xContainer.is() )
-                xContainer->addContainerListener( this );
+            {
+                m_xConfigAccessListener = new WeakContainerListener(this);
+                xContainer->addContainerListener(m_xConfigAccessListener);
+            }
         }
 
         return sal_True;
@@ -651,7 +656,7 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" );
     Reference< XNameAccess > xEmpty;
-    rtl::OUString aGenericUICommand( ::rtl::OUString::createFromAscii( "GenericCommands" ));
+    rtl::OUString aGenericUICommand( RTL_CONSTASCII_USTRINGPARAM("GenericCommands") );
     m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, xServiceManager );
 
     impl_fillElements("ooSetupFactoryCommandConfigRef");
@@ -800,3 +805,4 @@ throw (::com::sun::star::uno::RuntimeException)
 
 } // namespace framework
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index 68331e1e0e97..5340cc6bd65b 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,9 +45,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -58,7 +57,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -178,11 +176,11 @@ throw ( ::com::sun::star::container::NoSuchElementException,
 
     for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
     {
-        if ( Args[n].Name.equalsAscii( "ConfigurationData" ))
+        if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) ))
             Args[n].Value >>= aConfigData;
-        else if ( Args[n].Name.equalsAscii( "Frame" ))
+        else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
             Args[n].Value >>= xFrame;
-        else if ( Args[n].Name.equalsAscii( "ResourceURL" ))
+        else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) ))
             Args[n].Value >>= aResourceURL;
     }
 
@@ -207,7 +205,7 @@ throw ( ::com::sun::star::container::NoSuchElementException,
         aPropValue.Value <<= aResourceURL;
         aPropSeq[2] <<= aPropValue;
 
-        vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xServiceManager );
         xToolBar = Reference< ::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY );
         Reference< XInitialization > xInit( xToolBar, UNO_QUERY );
@@ -219,3 +217,4 @@ throw ( ::com::sun::star::container::NoSuchElementException,
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 505f3418ed8c..b324d071ed20 100755..100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,6 +36,8 @@
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
+#include "helper/mischelper.hxx"
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -54,7 +57,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -65,7 +67,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -102,7 +103,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
 
     Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
     if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
+        xContainer->removeContainerListener(m_xConfigAccessListener);
 }
 
 rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
@@ -268,7 +269,10 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData()
         aLock.unlock();
 
         if ( xContainer.is() )
-            xContainer->addContainerListener( this );
+        {
+            m_xConfigAccessListener = new WeakContainerListener(this);
+            xContainer->addContainerListener(m_xConfigAccessListener);
+        }
     }
 }
 
@@ -339,3 +343,5 @@ sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any&
     return sal_True;
 }
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 3cc132d9cb48..2fef7db68f44 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,17 +46,13 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -64,7 +61,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -136,17 +132,17 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
 
     for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
     {
-        if ( Args[n].Name.equalsAscii( "ConfigurationSource" ))
+        if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ConfigurationSource")) )
             Args[n].Value >>= xConfigSource;
-        else if ( Args[n].Name.equalsAscii( "Frame" ))
+        else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) )
             Args[n].Value >>= xFrame;
-        else if ( Args[n].Name.equalsAscii( "ResourceURL" ))
+        else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) )
             Args[n].Value >>= aResourceURL;
-        else if ( Args[n].Name.equalsAscii( "Persistent" ))
+        else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Persistent")) )
             Args[n].Value >>= bPersistent;
         else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode ))
             Args[n].Value >>= bExtraMode;
-    } // for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
+    }
     if ( aResourceURL.indexOf( rtl::OUString::createFromAscii(_pAsciiName)) != 0 )
         throw IllegalArgumentException();
 
@@ -204,9 +200,11 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
         aPropSeq[4] <<= aPropValue;
     }
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     Reference< XInitialization > xInit( _xMenuBar, UNO_QUERY );
     xInit->initialize( aPropSeq );
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
index 8736aa5dcf80..fa8641bcaef0 100644
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,7 +56,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -66,7 +66,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -91,3 +90,5 @@ PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiS
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
index cfbfcd49e23f..b1f1d7463b0e 100644
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,7 +55,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -65,7 +65,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -89,3 +88,5 @@ StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiS
 
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index ddbe47912a0e..dc523dc3dfd5 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,9 +46,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -59,7 +58,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -107,3 +105,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
index 1905375f7022..7bea7c329172 100644
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,7 +55,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -65,7 +65,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -260,3 +259,5 @@ throw (RuntimeException)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index f2e9aa9bc0d2..f8af5372018b 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,9 +45,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 
-#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  includes of other projects
@@ -58,7 +57,6 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -103,3 +101,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 171acce9cb72..34ed345bb257 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,6 +37,8 @@
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
 
+#include "helper/mischelper.hxx"
+
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
@@ -54,10 +57,10 @@
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/logfile.hxx>
+
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -70,7 +73,6 @@ using namespace ::com::sun::star::frame;
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -114,7 +116,7 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager()
 
     Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY );
     if ( xContainer.is() )
-        xContainer->removeContainerListener( this );
+        xContainer->removeContainerListener(m_xConfigListener);
 }
 
 rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const
@@ -352,7 +354,10 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
         aLock.unlock();
         // UNSAFE
         if ( xContainer.is() )
-            xContainer->addContainerListener( this );
+        {
+            m_xConfigListener = new WeakContainerListener(this);
+            xContainer->addContainerListener(m_xConfigListener);
+        }
     }
 }
 
@@ -545,3 +550,5 @@ throw ( NoSuchElementException, RuntimeException )
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 352fc1ad21f7..df02b00e3bd7 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,14 +61,12 @@
 //_________________________________________________________________________________________________________________
 //  Defines
 //_________________________________________________________________________________________________________________
-//
 
 using namespace ::com::sun::star;
 
 //_________________________________________________________________________________________________________________
 //  Namespace
 //_________________________________________________________________________________________________________________
-//
 
 namespace framework
 {
@@ -135,31 +134,6 @@ uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createIn
     const uno::Reference< uno::XComponentContext >& /*xContext*/ )
 throw (uno::Exception, uno::RuntimeException)
 {
-/*
-    // Currently this method cannot be implemented for generic use. There is no way for external
-       code to get a handle to the dialog model.
-
-    uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY );
-
-    const ::rtl::OUString sToolkitService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit"));
-    uno::Reference< awt::XToolkit > xToolkit( xServiceManager->createInstance( sToolkitService ), uno::UNO_QUERY_THROW );
-
-    const ::rtl::OUString sDialogModelService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialogModel"));
-    uno::Reference< awt::XControlModel > xDialogModel( xServiceManager->createInstance( sDialogModelService ), uno::UNO_QUERY_THROW );
-
-    const ::rtl::OUString sDecoration(RTL_CONSTASCII_USTRINGPARAM("Decoration"));
-    uno::Reference< beans::XPropertySet > xPropSet( xDialogModel, uno::UNO_QUERY_THROW );
-    xPropSet->setPropertyValue( sDecoration, uno::makeAny(false));
-
-    const ::rtl::OUString sDialogService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialog"));
-    uno::Reference< awt::XControl > xDialogControl( xServiceManager->createInstance( sDialogService ), uno::UNO_QUERY_THROW );
-
-    xDialogControl->setModel( xDialogModel );
-
-    uno::Reference< awt::XWindowPeer > xWindowParentPeer( xToolkit->getDesktopWindow(), uno::UNO_QUERY );
-    xDialogControl->createPeer( xToolkit, xWindowParentPeer );
-    uno::Reference< uno::XInterface > xWindow( xDialogControl->getPeer(), uno::UNO_QUERY );
-*/
     uno::Reference< uno::XInterface > xWindow;
     return xWindow;
 }
@@ -177,9 +151,9 @@ throw (uno::Exception, uno::RuntimeException)
         beans::PropertyValue aPropValue;
         if ( Arguments[i] >>= aPropValue )
         {
-            if ( aPropValue.Name.equalsAscii( "Frame" ))
+            if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) ))
                 aPropValue.Value >>= xFrame;
-            else if ( aPropValue.Name.equalsAscii( "ResourceURL" ))
+            else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) ))
                 aPropValue.Value >>= aResourceURL;
         }
     }
@@ -264,3 +238,5 @@ throw (uno::Exception, uno::RuntimeException)
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml
index 1cd72a64fa87..069979e7c968 100644..100755
--- a/framework/source/unotypes/fwk.xml
+++ b/framework/source/unotypes/fwk.xml
@@ -106,7 +106,7 @@
         <name> com.sun.star.comp.framework.ServiceHandler </name>
         <description>
             It's a special dispatch object which is registered for "service:*" URL pattern
-            and will be automaticly used by the framework dispatch mechanism if such URL occured.
+            and will be automaticly used by the framework dispatch mechanism if such URL occurred.
             His job is to create any registered uno components which must be coded inside
             dispatched URL (may with some optional given parameters). After that such created
             service must be hold his self alive. Such mechanism can be usefull for UI components
@@ -123,7 +123,7 @@
         <name> com.sun.star.comp.framework.JobHandler </name>
         <description>
             It's a special dispatch object which is registered for "vnd.sun.star.job:*" URL pattern
-            and will be automaticly used by the framework dispatch mechanism if such URL occured.
+            and will be automaticly used by the framework dispatch mechanism if such URL occurred.
             It binds the dispatch mechanism to the generic job execution of this framework module.
             That can be used for e.g. addon purposes.
         </description>
@@ -430,7 +430,6 @@
 
     <project-build-dependency>  cppu        </project-build-dependency>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <project-build-dependency>  tools       </project-build-dependency>
     <project-build-dependency>  svtools     </project-build-dependency>
@@ -444,7 +443,6 @@
 
     <runtime-module-dependency> cppu2       </runtime-module-dependency>
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> vos2$(COM)  </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
     <runtime-module-dependency> tl          </runtime-module-dependency>
     <runtime-module-dependency> svt         </runtime-module-dependency>
diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml
index 4d652ef7b0ec..a9693de6854d 100644..100755
--- a/framework/source/unotypes/fwl.xml
+++ b/framework/source/unotypes/fwl.xml
@@ -82,7 +82,6 @@
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  comphelper  </project-build-dependency>
     <project-build-dependency>  tools       </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <project-build-dependency>  svl         </project-build-dependency>
 
@@ -90,7 +89,6 @@
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
     <runtime-module-dependency> comphelp2   </runtime-module-dependency>
     <runtime-module-dependency> tl          </runtime-module-dependency>
-    <runtime-module-dependency> vos2$(COM)  </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
     <runtime-module-dependency> svl         </runtime-module-dependency>
 
diff --git a/framework/source/unotypes/lgd.xml b/framework/source/unotypes/lgd.xml
index 278d8f97b3bc..3a7e69718cba 100644..100755
--- a/framework/source/unotypes/lgd.xml
+++ b/framework/source/unotypes/lgd.xml
@@ -19,14 +19,12 @@
 
     <project-build-dependency>  cppu        </project-build-dependency>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <project-build-dependency>  sv          </project-build-dependency>
     <project-build-dependency>  tools       </project-build-dependency>
 
     <runtime-module-dependency> cppu2       </runtime-module-dependency>
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> vos2$(COM)  </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
     <runtime-module-dependency> tl          </runtime-module-dependency>
     <runtime-module-dependency> sv          </runtime-module-dependency>
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 418280360bf0..acdb7fa66320 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 //_______________________________________________
 // own includes
 
-#ifndef __FRAMEWORK_ACCELERATORCONST_H_
 #include <acceleratorconst.h>
-#endif
 
 //_______________________________________________
 // interface includes
@@ -59,7 +58,7 @@ namespace framework{
    structure was detected.
 
    This macro combined the given comment with a generic
-   way to find out the XML line (where the error occured)
+   way to find out the XML line (where the error occurred)
    to format a suitable message.
 
    @param   COMMENT
@@ -336,3 +335,5 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index f372067fa13a..be48788fa3db 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,16 +136,16 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt:
     pAttribs->AddAttribute(AL_ATTRIBUTE_URL    , ATTRIBUTE_TYPE_CDATA, sCommand);
 
     if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     xConfig->ignorableWhitespace(::rtl::OUString());
     xConfig->startElement(AL_ELEMENT_ITEM, xAttribs);
@@ -154,3 +155,5 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt:
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index 946b5b9d0f11..5f4b5f98408c 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,9 +47,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/streamwrap.hxx>
 #include <tools/debug.hxx>
 
@@ -70,26 +69,19 @@ SV_IMPL_PTRARR( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr
 SV_IMPL_PTRARR( ImageListDescriptor, ImageListItemDescriptorPtr );
 
 static Reference< XParser > GetSaxParser(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
     return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
 }
 
 static Reference< XDocumentHandler > GetSaxWriter(
-    // #110897#
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
 {
-    //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
-    //return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
     return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
 }
 
-// #110897#
 sal_Bool ImagesConfiguration::LoadImages(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     SvStream& rInStream, ImageListsDescriptor& aItems )
@@ -130,8 +122,6 @@ sal_Bool ImagesConfiguration::LoadImages(
     }
 }
 
-
-// #110897#
 sal_Bool ImagesConfiguration::StoreImages(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     SvStream& rOutStream, const ImageListsDescriptor& aItems )
@@ -235,3 +225,4 @@ sal_Bool ImagesConfiguration::StoreImages(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index cdf20958332a..682fe67d8aaa 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,9 +43,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
@@ -516,6 +515,8 @@ throw(  SAXException, RuntimeException )
 
                 if ( m_pExternalImages )
                     m_pExternalImages->Insert( pItem, m_pExternalImages->Count() );
+                else
+                    delete pItem;
             }
             break;
 
@@ -849,3 +850,4 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/test/test.cxx b/framework/test/test.cxx
index 8b6051c9aadd..08ace331836a 100644
--- a/framework/test/test.cxx
+++ b/framework/test/test.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -179,7 +180,6 @@ TestApplication aTestApplication ;
 
 void TestApplication::Main()
 {
-//  RegistryCache aCache;
 
     /**-***********************************************************************************************************
         initialize program
@@ -238,9 +238,6 @@ void TestApplication::Main()
     bState = impl_testTreeSearch();
     #endif
 
-//  Execute();
-//    xFrame->dispose();
-//    delete pMainWindow;
     if( bState == sal_True )
     {
         LOG_ERROR( "TestApplication::Main()", "Test successful ..." )
@@ -368,52 +365,7 @@ void TestApplication::impl_testFilterCache()
     }
     else
     {
-/*
-        // Step over all types and log his values.
-        // These simulate a XNameAccess!
-        const Sequence< OUString > seqAllTypeNames = aCache.getAllTypeNames();
-        sal_uInt32 nCount = seqAllTypeNames.getLength();
-        for( sal_uInt32 nPosition=0; nPosition<nCount; ++nPosition )
-        {
-            sBuffer.appendAscii( "--------------------------------------------------------------------------------\n" );
-            const TType* pType = aCache.getTypeByName( seqAllTypeNames[nPosition] );
-            if( pType == NULL )
-            {
-                sBuffer.appendAscii ( "Type ["                  );
-                sBuffer.append      ( (sal_Int32)nPosition      );
-                sBuffer.appendAscii ( "] \""                    );
-                sBuffer.append      ( seqAllTypeNames[nPosition]);
-                sBuffer.appendAscii ( "\" isn't valid!"         );
-            }
-            else
-            {
-                sBuffer.appendAscii ( "Type ["                      );
-                sBuffer.append      ( (sal_Int32)nPosition          );
-                sBuffer.appendAscii ( "] \""                        );
-                sBuffer.append      ( seqAllTypeNames[nPosition]    );
-                sBuffer.appendAscii ( "\"\n\t\tUIName\t=\t"         );
-                sBuffer.append      ( pType->sUIName                );
-                sBuffer.appendAscii ( "\n\t\tMediaType\t=\t"        );
-                sBuffer.append      ( pType->sMediaType             );
-                sBuffer.appendAscii ( "\n\t\tClipboardFormat\t=\t"  );
-                sBuffer.append      ( pType->sClipboardFormat       );
-                sBuffer.appendAscii ( "\n\t\tURLPattern\t=\t{"      );
-                for( TConstStringIterator aIterator=pType->lURLPattern.begin(); aIterator!=pType->lURLPattern.end(); ++aIterator )
-                {
-                    sBuffer.append      ( *aIterator    );
-                    sBuffer.appendAscii ( ";\n\t\t"     );
-                }
-                sBuffer.appendAscii( "}\nExtensions\t=\t" );
-                for( aIterator=pType->lExtensions.begin(); aIterator!=pType->lExtensions.end(); ++aIterator )
-                {
-                    sBuffer.append      ( *aIterator    );
-                    sBuffer.appendAscii ( ";\n\t\t"     );
-                }
-                sBuffer.appendAscii ( "}\nDocumentIconID\t=\t"          );
-                sBuffer.append      ( (sal_Int32)pType->nDocumentIconID );
-            }
-        }
-*/
+
         // searchFirstType( URL, MediaType, ClipboardFormat, startEntry )
         TCheckedTypeIterator aIterator;
         sBuffer.appendAscii( "search type for \"file://c|/temp/test.sdw\"; no media type; no clipboard format\n" );
@@ -446,8 +398,6 @@ void TestApplication::impl_testLoginDialog()
     LOG_ASSERT( !(xDialog.is()==sal_False), "TestApplication::impl_testLoginDialog()\nCould not create login dialog.\n" )
     // Check set/getTitle()
     /* not implemented yet! */
-//  OUString sTitle = DECLARE_ASCII("Login Dialog Test");
-//  xDialog->setTitle( sTitle );
 //  LOG_ASSERT( !(xDialog->getTitle()!=sTitle), "TestApplication::impl_testLoginDialog()\nset/getTitle don't work correct.\n" )
 
     UniString sInternalURL = DECLARE_ASCII("private:factory/scalc");
@@ -912,45 +862,14 @@ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop )
     xFrames->append( xFrame_4112 );
     xFrames->append( xFrame_4113 );
 
-    // Create some active paths.
-    // desktop => task_1 => frame_11 => frame_112 => frame_1122
-//  xDesktopSupplier->setActiveFrame( xTaskFrame_1 );
-//  xTaskFramesSupplier_1->setActiveFrame( xFrame_11 );
-//  xFramesSupplier_11->setActiveFrame( xFrame_112 );
-//  xFramesSupplier_112->setActiveFrame( xFrame_1122 );
-    // frame_41 => frame_411 => frame_4111
-//  xFramesSupplier_41->setActiveFrame( xFrame_411 );
-//  xFramesSupplier_411->setActiveFrame( xFrame_4111 );
-    // task_3 => frame_31
-//  xTaskFramesSupplier_3->setActiveFrame( xFrame_31 );
-    // frame_1123 => frame_11231
-//  xFramesSupplier_1123->setActiveFrame( xFrame_11231 );
-
-//  xTask_1->activate();
-//  impl_logTree( xDesktop );
-//  xFrame_41->activate();
-//  impl_logTree( xDesktop );
-//  xFrame_52->activate();
-//  impl_logTree( xDesktop );
+
 //  WRITE_LOGFILE( LOGFILENAME_TREE, "initiale Hierarchy:" )
     impl_logTree( xDesktop );
 
-//  xFrame_121->activate();
-//  impl_logTree( xDesktop );
-//  xFrame_41->activate();
-//  impl_logTree( xDesktop );
-//  xFrame_52->activate();
-//  impl_logTree( xDesktop );
 //  WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_411->activate():" )
     xFrame_411->activate();
 //  WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_411->activate():" )
     impl_logTree( xDesktop );
-//  xFrame_41->deactivate();
-//  impl_logTree( xDesktop );
-//  xFrame_4113->activate();
-//  impl_logTree( xDesktop );
-//  xFrame_21->activate();
-//  impl_logTree( xDesktop );
 //  WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_11231->activate():" )
     xFrame_11231->activate();
 //  WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11231->activate():" )
@@ -961,8 +880,6 @@ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop )
 //  WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11221->activate():" )
     impl_logTree( xDesktop );
 
-//  WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_112->deactivate():" )
-//  xFrame_112->getCreator()->setActiveFrame( Reference< XFrame >() );
     xFrame_112->deactivate();
 //  WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_112->deactivate():" )
     impl_logTree( xDesktop );
@@ -997,9 +914,6 @@ void TestApplication::impl_logTree( const Reference< XDesktop >& xDesktop )
     OUString sTreeNamesStream = xDebug->dumpVariable( DUMPVARIABLE_TREEINFO, 0 );
     // And write it to logfile.
     OString sOutPut = OUStringToOString( sTreeNamesStream, RTL_TEXTENCODING_UTF8 );
-//  WRITE_LOGFILE( LOGFILENAME_TREE, "\nNew tree log:\n\n"  );
-//  WRITE_LOGFILE( LOGFILENAME_TREE, sOutPut            );
-//  WRITE_LOGFILE( LOGFILENAME_TREE, "\n"                       );
 #endif
 }
 #endif // TEST_DESKTOP
@@ -1344,3 +1258,5 @@ sal_Bool TestApplication::impl_testTreeSearch()
     return sal_True;
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/test/test_filterregistration.bas b/framework/test/test_filterregistration.bas
index 47a19acfc36d..831cbbab8914 100644
--- a/framework/test/test_filterregistration.bas
+++ b/framework/test/test_filterregistration.bas
@@ -64,7 +64,7 @@ rem	Dim	lFilters()	as com.sun.star.beans.PropertyValue
 	for nCount=0 to ubound(lProperties()) step 1
 		sOut = sOut + lProperties(nCount).Name
 		sOut = sOut + " = "
-rem #85829# Disable follow if statement to produce bug!
+rem Disable follow if statement to produce bug!
 rem		if( lProperties(nCount).Name <> "UserData" ) then
 			sOut = sOut + lProperties(nCount).Value
 rem		endif
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index 1e70fb31b397..d7f15304d85f 100644
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,13 +37,9 @@
 #include <threadhelp/resetableguard.hxx>
 #include <threadhelp/transactionguard.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_RWLOCKBASE_HXX_
 #include <threadhelp/rwlockbase.hxx>
-#endif
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 
@@ -54,15 +51,12 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/random.h>
-#include <vos/process.hxx>
-#include <vos/thread.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/time.h>
 
-#ifndef _OSL_INTERLOCK_H_
 #include <osl/interlock.h>
-#endif
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -83,7 +77,6 @@
 
 using namespace ::rtl       ;
 using namespace ::osl       ;
-using namespace ::vos       ;
 using namespace ::framework ;
 
 //_________________________________________________________________________________________________________________
@@ -494,7 +487,7 @@ sal_Int32 ThreadSafeClass::workA(   sal_Int32   nA          ,
             Otherwise all threads are sychron after first 2,3...5 calls - I think!
 *//*-*****************************************************************************************************/
 
-class TestThread : public OThread
+class TestThread : public osl::Thread
 {
     public:
 
@@ -698,16 +691,15 @@ void TestApplication::Main()
     // Parse command line.
     // Attention: All parameter are required and must exist!
     // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>"
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
     sal_Int32       nArgument   ;
-    sal_Int32       nCount      = aInfo.getCommandArgCount();
+    sal_Int32       nCount      = osl_getCommandArgCount();
 
     LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!")
 
     for( nArgument=0; nArgument<nCount; ++nArgument )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
         if( nArgument== 0 ) nTestCount  =sArgument.toInt32();
         if( nArgument== 1 ) nThreadCount=sArgument.toInt32();
         if( nArgument== 2 ) nLoops      =sArgument.toInt32();
@@ -736,3 +728,5 @@ void TestApplication::Main()
     WRITE_LOGFILE( STATISTICS_FILE, sBuf.makeStringAndClear() );
     LOG_ERROR( "TApplication::Main()", "Test finish successful!" )
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/test/threadtest/test.btm b/framework/test/threadtest/test.btm
index 627c756893bf..627c756893bf 100644..100755
--- a/framework/test/threadtest/test.btm
+++ b/framework/test/threadtest/test.btm
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index cb86a7f08358..785ba77dcc29 100644
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_
 #include <threadhelp/transactionbase.hxx>
-#endif
 #include <threadhelp/resetableguard.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
@@ -51,15 +50,13 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/random.h>
-#include <vos/process.hxx>
-#include <vos/thread.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/time.h>
 
-#ifndef _OSL_INTERLOCK_H_
 #include <osl/interlock.h>
-#endif
+#include <osl/thread.hxx>
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -489,7 +486,7 @@ sal_Int32 ThreadSafeClass::workA(   sal_Int32   nA          ,
             Otherwise all threads are sychron after first 2,3...5 calls - I think!
 *//*-*****************************************************************************************************/
 
-class TestThread : public OThread
+class TestThread : public osl::Thread
 {
     public:
 
@@ -550,11 +547,6 @@ void SAL_CALL TestThread::run()
         // Work with class.
         // Use random to select called method.
         nA = (sal_Int32)getRandomValue();
-        if( nA % 5 == 0 )
-        {
-            //nA = m_pClass->workA( nA, m_nThreadID );
-        }
-        else
         if( nA % 3 == 0 )
         {
             m_pClass->setA( nA, m_nThreadID );
@@ -694,16 +686,15 @@ void TestApplication::Main()
     // Parse command line.
     // Attention: All parameter are required and must exist!
     // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>"
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
     sal_Int32       nArgument   ;
-    sal_Int32       nCount      = aInfo.getCommandArgCount();
+    sal_Int32       nCount      = osl_getCommandArgCount();
 
     LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!")
 
     for( nArgument=0; nArgument<nCount; ++nArgument )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
         if( nArgument== 0 ) nTestCount  =sArgument.toInt32();
         if( nArgument== 1 ) nThreadCount=sArgument.toInt32();
         if( nArgument== 2 ) nLoops      =sArgument.toInt32();
@@ -734,3 +725,5 @@ void TestApplication::Main()
     WRITE_LOGFILE( STATISTICS_FILE, sBuf.makeStringAndClear() );
     LOG_ERROR( "TApplication::Main()", "Test finish successful!" )
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/test/typecfg/build.btm b/framework/test/typecfg/build.btm
index f984a1146296..f984a1146296 100644..100755
--- a/framework/test/typecfg/build.btm
+++ b/framework/test/typecfg/build.btm
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index e11e33a8f4f4..ca60ea1b2f7e 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,13 +51,11 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#ifndef __SGI_STL_HASH_MAP
-#include <hash_map>
-#endif
+#include <boost/unordered_map.hpp>
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -116,7 +115,6 @@
 //_________________________________________________________________________________________________________________
 
 using namespace ::std                       ;
-using namespace ::vos                       ;
 using namespace ::rtl                       ;
 using namespace ::framework                 ;
 using namespace ::comphelper                ;
@@ -250,16 +248,14 @@ void CFGView::impl_printSyntax()
 *//*-*************************************************************************************************************/
 void CFGView::impl_parseCommandLine( AppMember& rMember )
 {
-    ::vos::OStartupInfo aInfo                                   ;
     ::rtl::OUString     sArgument                               ;
     sal_Int32           nArgument   = 0                         ;
-    sal_Int32           nCount      = aInfo.getCommandArgCount();
+    sal_Int32           nCount      =  osl_getCommandArgCount();
     sal_Int32           nMinCount   = 0                         ;
 
     while( nArgument<nCount )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
-
+        osl_getCommandArg( nArgument, &sArgument.pData );
         //_____________________________________________________________________________________________________
         // look for "-dir="
         if( sArgument.compareTo( ARGUMENT_DIRNAME, ARGUMENTLENGTH ) == ARGUMENTFOUND )
@@ -557,16 +553,6 @@ void CFGView::impl_generateFilterListHTML()
     sAllFiltersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td></tr>\n" );  // open table
 
     sFilterPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilterProperties\n\t\t</title>\n\t</head>\n\t<body>\n"                                   );  // open html
-/*
-    ::framework::StringList lFilterNames;
-    for( ConstFilterIterator pFilter=m_pData->aCFGView.begin(); pFilter!=m_pData->aCFGView.end(); ++pFilter )
-    {
-        lFilterNames.push_back( pFilter->first );
-    }
-    ::std::stable_sort( lFilterNames.begin(), lFilterNames.end() );
-    css::uno::Sequence< ::rtl::OUString > lNames;
-    ::framework::DataContainer::convertStringVectorToSequence( lFilterNames, lNames );
-*/
     css::uno::Sequence< ::rtl::OUString > lNames         = m_aData.pCache->getAllFilterNames()  ;
     sal_Int32                             nFilterCounter = 0                                    ;
     sal_Int32                             nCount         = lNames.getLength()                   ;
@@ -1510,3 +1496,5 @@ void CFGView::impl_writeFile( const ::rtl::OString& sFile, const ::rtl::OString&
 
     WRITE_LOGFILE( U2B(s), sContent )
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx
index e7fb7a23bab1..4072b92790a6 100644
--- a/framework/test/typecfg/typecfg.cxx
+++ b/framework/test/typecfg/typecfg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,7 +49,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
@@ -72,7 +73,6 @@
 //_________________________________________________________________________________________________________________
 
 using namespace ::std                       ;
-using namespace ::vos                       ;
 using namespace ::rtl                       ;
 using namespace ::framework                 ;
 using namespace ::comphelper                ;
@@ -157,14 +157,13 @@ void TypeApplication::Main()
 //*****************************************************************************************************************
 void TypeApplication::impl_parseCommandLine()
 {
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
     sal_Int32       nArgument   = 0                         ;
-    sal_Int32       nCount      = aInfo.getCommandArgCount();
+    sal_Int32       nCount =  osl_getCommandArgCount();
 
     while( nArgument<nCount )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
 
         if( sArgument == ARGUMENT_GENERATE_CFGVIEW )
         {
@@ -247,3 +246,5 @@ void TypeApplication::impl_generateTypeDetectionXCD()
     aCache.impldbg_generateXCD( "org.openoffice.Office.TypeDetection.xcd", bWriteable, cSeparator );
     #endif  //ENABLE_GENERATEFILTERCACHE
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index 9bdb35f4fec0..38b54ac19520 100644
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,7 @@
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #include <unotools/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
@@ -229,8 +230,6 @@ XCDGenerator gGenerator;
 //*****************************************************************************************************************
 void XCDGenerator::Main()
 {
-    // Must be :-)
-//    impl_printCopyright();
 
     // Init global servicemanager and set it.
     // It's neccessary for other services ... e.g. configuration.
@@ -334,33 +333,14 @@ void XCDGenerator::impl_printSyntax()
 *//*-*************************************************************************************************************/
 void XCDGenerator::impl_parseCommandLine( AppMember& rMember )
 {
-    ::vos::OStartupInfo aInfo                                   ;
     ::rtl::OUString     sArgument                               ;
     sal_Int32           nArgument   = 0                         ;
-    sal_Int32           nCount      = aInfo.getCommandArgCount();
+    sal_Int32           nCount      = osl_getCommandArgCount();
     sal_Int32           nMinCount   = 0                         ;
 
     while( nArgument<nCount )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
-/*OBSOLETE
-        //_____________________________________________________________________________________________________
-        // look for "-fis=..."
-        if( sArgument.compareTo( ARGUMENT_FILENAME_STANDARD, ARGUMENTLENGTH ) == ARGUMENTFOUND )
-        {
-            rMember.sFileNameStandard = sArgument.copy( ARGUMENTLENGTH, sArgument.getLength()-ARGUMENTLENGTH );
-            ++nMinCount;
-        }
-        else
-        //_____________________________________________________________________________________________________
-        // look for "-fia=..."
-        if( sArgument.compareTo( ARGUMENT_FILENAME_ADDITIONAL, ARGUMENTLENGTH ) == ARGUMENTFOUND )
-        {
-            rMember.sFileNameAdditional = sArgument.copy( ARGUMENTLENGTH, sArgument.getLength()-ARGUMENTLENGTH );
-            ++nMinCount;
-        }
-        else
-*/
+        osl_getCommandArg( nArgument, &sArgument.pData );
         //_____________________________________________________________________________________________________
         // look for "-pas=..."
         if( sArgument.compareTo( ARGUMENT_PACKAGE_STANDARD, ARGUMENTLENGTH ) == ARGUMENTFOUND )
@@ -2310,51 +2290,6 @@ sal_Bool XCDGenerator::impl_isUsAsciiAlphaDigit(sal_Unicode c, sal_Bool bDigitAl
 ::rtl::OUString XCDGenerator::impl_encodeSetName( const ::rtl::OUString& rSource )
 {
     return impl_encodeSpecialSigns( rSource );
-/*
-    rtl::OUStringBuffer aTarget;
-
-    sal_Unicode const * pBegin = rSource.getStr();
-    sal_Unicode const * pEnd = pBegin + rSource.getLength();
-    sal_Unicode const * pCopyEnd = pBegin;
-    sal_Unicode const * p = pBegin;
-    while (p != pEnd)
-    {
-        sal_Unicode c = *p;
-        if (!impl_isUsAsciiAlphaDigit(c,p != pBegin))
-            switch (c)
-            {
-                case '-':
-                case '.':
-                    if (p != pBegin)
-                        break;
-                default:
-                    aTarget.append(pCopyEnd, p - pCopyEnd);
-                    aTarget.append(sal_Unicode('_'));
-                    ModifiedUTF7Buffer aBuffer(&aTarget);
-                    for (;;)
-                    {
-                        aBuffer.write(c);
-                        ++p;
-                        if (p == pEnd)
-                            break;
-                        c = *p;
-                        if (impl_isUsAsciiAlphaDigit(c) || c == '-' || c == '.')
-                            break;
-                    }
-                    aBuffer.flush();
-                    aTarget.append(sal_Unicode('_'));
-                    pCopyEnd = p;
-                    continue;
-            }
-        ++p;
-    }
-
-    if (pCopyEnd == pBegin)
-        return rSource;
-    else
-    {
-        aTarget.append(pCopyEnd, pEnd - pCopyEnd);
-        return aTarget.makeStringAndClear();
-    }
-*/
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index b5e52e7afac2..5ac4c3eb4b7c 100644..100755
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -74,9 +74,9 @@
             <menu:menuitem menu:id=".uno:HelpIndex"/>
             <menu:menuitem menu:id=".uno:ExtendedHelp"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:HelpSupport"/>
-            <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+            <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/framework/uiconfig/startmodule/statusbar/statusbar.xml b/framework/uiconfig/startmodule/statusbar/statusbar.xml
index 7b15360f9775..7b15360f9775 100644..100755
--- a/framework/uiconfig/startmodule/statusbar/statusbar.xml
+++ b/framework/uiconfig/startmodule/statusbar/statusbar.xml
diff --git a/framework/uiconfig/startmodule/toolbar/standardbar.xml b/framework/uiconfig/startmodule/toolbar/standardbar.xml
index 4d50afc6576a..4d50afc6576a 100644..100755
--- a/framework/uiconfig/startmodule/toolbar/standardbar.xml
+++ b/framework/uiconfig/startmodule/toolbar/standardbar.xml
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index c460ecbccd70..c460ecbccd70 100644..100755
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
index 99c5ca7213e6..99c5ca7213e6 100644..100755
--- a/framework/util/fwl.component
+++ b/framework/util/fwl.component
diff --git a/framework/util/fwm.component b/framework/util/fwm.component
index 624249ff4382..624249ff4382 100644..100755
--- a/framework/util/fwm.component
+++ b/framework/util/fwm.component
diff --git a/framework/util/lgd.xml b/framework/util/lgd.xml
index 278d8f97b3bc..3a7e69718cba 100644..100755
--- a/framework/util/lgd.xml
+++ b/framework/util/lgd.xml
@@ -19,14 +19,12 @@
 
     <project-build-dependency>  cppu        </project-build-dependency>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  vos         </project-build-dependency>
     <project-build-dependency>  sal         </project-build-dependency>
     <project-build-dependency>  sv          </project-build-dependency>
     <project-build-dependency>  tools       </project-build-dependency>
 
     <runtime-module-dependency> cppu2       </runtime-module-dependency>
     <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> vos2$(COM)  </runtime-module-dependency>
     <runtime-module-dependency> sal2        </runtime-module-dependency>
     <runtime-module-dependency> tl          </runtime-module-dependency>
     <runtime-module-dependency> sv          </runtime-module-dependency>
diff --git a/framework/util/lomenubar.component b/framework/util/lomenubar.component
new file mode 100755
index 000000000000..628bcb7cc7a2
--- /dev/null
+++ b/framework/util/lomenubar.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--*
+ * 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
+ *       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.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.
+ *-->
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.libreoffice.comp.framework.lomenubar.FrameJob">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="org.libreoffice.comp.framework.lomenubar.DesktopJob">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+</component>
author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-06-19 12:24:29 +0200
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-06-19 12:24:29 +0200
commit	92667c8edbaee9a252b1d5d221eb62849f76697c (patch)
tree	8f1d329f2259b7d5bff054bc14d0965637df6961 /framework
parent	baecdfb578cb7bc992944857ad4d8882ef7e842c (diff)
parent	48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff)