Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-core

55 files changed, 200 insertions, 80 deletions

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ce5cc3cc0412..f7920a11d1a9 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2477,39 +2477,6 @@ RTLFUNC(IsMissing)
         rPar.Get( 0 )->PutBool( rPar.Get(1)->IsErr() );
 }
 
-// Dir( [Maske] [,Attrs] )
-// ToDo: Library-globaler Datenbereich fuer Dir-Objekt und Flags
-
-
-String getDirectoryPath( String aPathStr )
-{
-    String aRetStr;
-
-    DirectoryItem aItem;
-    FileBase::RC nRet = DirectoryItem::get( aPathStr, aItem );
-    if( nRet == FileBase::E_None )
-    {
-        FileStatus aFileStatus( osl_FileStatus_Mask_Type );
-        nRet = aItem.getFileStatus( aFileStatus );
-        if( nRet == FileBase::E_None )
-        {
-            FileStatus::Type aType = aFileStatus.getFileType();
-            if( isFolder( aType ) )
-            {
-                aRetStr = aPathStr;
-            }
-            else if( aType == FileStatus::Link )
-            {
-                FileStatus aFileStatus2( osl_FileStatus_Mask_LinkTargetURL );
-                nRet = aItem.getFileStatus( aFileStatus2 );
-                if( nRet == FileBase::E_None )
-                    aRetStr = getDirectoryPath( aFileStatus2.getLinkTargetURL() );
-            }
-        }
-    }
-    return aRetStr;
-}
-
 // Function looks for wildcards, removes them and always returns the pure path
 String implSetupWildcard( const String& rFileParam, SbiRTLData* pRTLData )
 {
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index ae20039bf218..367985ffd577 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -52,6 +52,7 @@
 #include "boost/scoped_array.hpp"
 #include "boost/shared_ptr.hpp"
 #include <comphelper/processfactory.hxx>
+#include <salhelper/linkhelper.hxx>
 
 #ifdef WNT
 #define UNICODE
@@ -145,18 +146,13 @@ bool existsOfficePipe()
 //get modification time
 static bool getModifyTimeTargetFile(const OUString &rFileURL, TimeValue &rTime)
 {
-    ::osl::DirectoryItem item;
-    if (::osl::DirectoryItem::get(rFileURL, item) != ::osl::File::E_None)
-        return false;
+    salhelper::LinkResolver aResolver(osl_FileStatus_Mask_ModifyTime);
 
-    ::osl::FileStatus stat(osl_FileStatus_Mask_ModifyTime|osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL);
-    if (item.getFileStatus(stat) != ::osl::File::E_None)
+    if (aResolver.fetchFileStatus(rFileURL) != osl::FileBase::E_None)
         return false;
 
-    if( stat.getFileType() == ::osl::FileStatus::Link )
-        return getModifyTimeTargetFile(stat.getLinkTargetURL(), rTime);
+    rTime = aResolver.m_aStatus.getModifyTime();
 
-    rTime = stat.getModifyTime();
     return true;
 }
 
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 4436ae7b2835..9ff95533e6b1 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -1003,12 +1003,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 
             switch (child_get_exit_code (info)) {
             case 79: // re-start with just -env: parameters
-                fprintf (stderr, "FIXME: re-start with just -env: params !\n");
+#if OSL_DEBUG_LEVEL > 0
+                fprintf (stderr, "oosplash: re-start with just -env: params !\n");
+#endif
                 bRestart = sal_True;
                 bAllArgs = sal_False;
                 break;
             case 81: // re-start with all arguments
-                fprintf (stderr, "FIXME: re-start with all params !\n");
+#if OSL_DEBUG_LEVEL > 0
+                fprintf (stderr, "oosplash: re-start with all params !\n");
+#endif
                 bRestart = sal_True;
                 bAllArgs = sal_True;
                 break;
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 3a200dd1e927..ca2b2099be63 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -77,6 +77,8 @@ void SAL_CALL UnxSplashScreen::end()
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::end()\n" );
 #endif
+    if( !m_pOutFd )
+        return;
 
     fprintf( m_pOutFd, "end\n" );
     fflush( m_pOutFd );
@@ -88,6 +90,8 @@ void SAL_CALL UnxSplashScreen::reset()
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::reset()\n" );
 #endif
+    if( !m_pOutFd )
+        return;
 
     fprintf( m_pOutFd, "restart\n" );
     fflush( m_pOutFd );
diff --git a/framework/inc/framework/documentundoguard.hxx b/framework/inc/framework/documentundoguard.hxx
index da2976e895e1..31b6b45d4bb5 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 97e142936f89..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.
@@ -61,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/fwedllapi.h b/framework/inc/framework/fwedllapi.h
index c3aa1bb81d1d..f47450bf149b 100755..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 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/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/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/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx
index 9cd7266b33c8..bfac08a086a5 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/helper/ilayoutnotifications.hxx b/framework/inc/helper/ilayoutnotifications.hxx
index db63ea15c7b4..5746bff53e9e 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/services/modelwinservice.hxx b/framework/inc/services/modelwinservice.hxx
index 7e07fcb0cd37..af35b75d8b51 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/uielement/panelwindow.hxx b/framework/inc/uielement/panelwindow.hxx
index e1b8ae2abcc7..324d1a38c5b0 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 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/uielement.hxx b/framework/inc/uielement/uielement.hxx
index b4ad9e2cbb6d..ab8ba13fc970 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/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/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 91265cf45170..abff1f2afa24 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/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 6ff5c28b3f66..692b6b294771 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.
  *
@@ -1163,3 +1164,5 @@ namespace framework
 //......................................................................................................................
 } // 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/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 04faeb2cf604..1f00f77d2e55 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.
@@ -411,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 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/panel.cxx b/framework/source/layoutmanager/panel.cxx
index f980df8164d8..ca103a1a261b 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.
@@ -85,3 +86,5 @@ Panel::~Panel()
 }
 
 } // namespace framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panelmanager.cxx b/framework/source/layoutmanager/panelmanager.cxx
index 7ec2fd0f9f9a..0aa9dce6934c 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.
@@ -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 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 defe4e6c7a1b..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.
@@ -4310,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 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/lomenubar/AwtKeyToDbusmenuString.cxx b/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx
index 4fd377db75ce..e03073db53a1 100644
--- a/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx
+++ b/framework/source/lomenubar/AwtKeyToDbusmenuString.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.
  *
@@ -143,3 +144,5 @@ MapAwtToXKey (guint16 aKeyCode)
             return 0;
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx b/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx
index faa61b6dbaa5..80f2f7f71c5f 100644
--- a/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx
+++ b/framework/source/lomenubar/AwtKeyToDbusmenuString.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,3 +32,5 @@ 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
index 6d94368a3ac3..da49d2abbf11 100644
--- a/framework/source/lomenubar/DesktopJob.cxx
+++ b/framework/source/lomenubar/DesktopJob.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.
  *
@@ -159,3 +160,5 @@ DesktopJob::getSupportedServiceNames()
 {
     return DesktopJob_getSupportedServiceNames();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/DesktopJob.hxx b/framework/source/lomenubar/DesktopJob.hxx
index 9d8cb3e3f031..3df7819b930b 100644
--- a/framework/source/lomenubar/DesktopJob.hxx
+++ b/framework/source/lomenubar/DesktopJob.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,4 @@ SAL_CALL DesktopJob_createInstance( const css::uno::Reference< css::lang::XMulti
 
 #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
index 7b749648d34c..8153ad6fa9df 100644
--- a/framework/source/lomenubar/FrameHelper.cxx
+++ b/framework/source/lomenubar/FrameHelper.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.
  *
@@ -860,3 +861,5 @@ FrameHelper::findShortcutForCommand (OUString command)
 
     return kev;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx
index 9264f26d2654..056dc1ec0169 100644
--- a/framework/source/lomenubar/FrameHelper.hxx
+++ b/framework/source/lomenubar/FrameHelper.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.
  *
@@ -152,3 +153,5 @@ class FrameHelper : public cppu::WeakImplHelper1 < XFrameActionListener >
     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
index 226d0fe8d4d9..06af9394222f 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.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.
  *
@@ -395,3 +396,4 @@ Sequence< OUString > SAL_CALL FrameJob::getSupportedServiceNames()
     return FrameJob_getSupportedServiceNames();
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameJob.hxx b/framework/source/lomenubar/FrameJob.hxx
index 407b602f1c9c..06bbc06a5b55 100644
--- a/framework/source/lomenubar/FrameJob.hxx
+++ b/framework/source/lomenubar/FrameJob.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,4 @@ SAL_CALL FrameJob_createInstance( const css::uno::Reference< css::lang::XMultiSe
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemInfo.cxx b/framework/source/lomenubar/MenuItemInfo.cxx
index cdffa6340b08..02a8e7c19fa2 100644
--- a/framework/source/lomenubar/MenuItemInfo.cxx
+++ b/framework/source/lomenubar/MenuItemInfo.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,3 +102,5 @@ 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
index 22c40a9db36b..24299761c2f7 100644
--- a/framework/source/lomenubar/MenuItemInfo.hxx
+++ b/framework/source/lomenubar/MenuItemInfo.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,3 +53,5 @@ class MenuItemInfo {
     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
index 6b7f7384f906..e57c53acc958 100644
--- a/framework/source/lomenubar/MenuItemStatusListener.cxx
+++ b/framework/source/lomenubar/MenuItemStatusListener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #include "MenuItemStatusListener.hxx"
 #include "MenuItemInfo.hxx"
 
@@ -80,3 +81,5 @@ MenuItemStatusListener::statusChanged(const FeatureStateEvent& Event)
         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
index 7fdab64ad23c..89419c4df33c 100644
--- a/framework/source/lomenubar/MenuItemStatusListener.hxx
+++ b/framework/source/lomenubar/MenuItemStatusListener.hxx
@@ -1,3 +1,4 @@
+/* -*- 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__
 
@@ -33,3 +34,5 @@ class MenuItemStatusListener : public cppu::WeakImplHelper1 < XStatusListener >
       throw (RuntimeException) {}
 };
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index 8ee63aa3e4c5..bb4804e68fe5 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.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,3 +93,5 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplNa
 }
 
 } // extern C
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/modelwinservice.cxx b/framework/source/services/modelwinservice.cxx
index d50fe7dcc653..52c5d9c864f0 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/uielement/panelwindow.cxx b/framework/source/uielement/panelwindow.cxx
index c8729dbb028d..61e1d3095eb0 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 2587f629b6e1..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"
@@ -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/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 581189858c80..2d11a10cb06f 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -500,22 +500,22 @@
     </node>
     <node oor:name="th" oor:op="replace">
      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>Angsana New;OONaksit;Tahoma;Lucidasans;Arial Unicode MS;clearlyU</value>
+        <value>Tahoma;Arial Unicode MS;Waree;Loma;Thonburi;Lucidasans;Lucida Sans;clearlyU</value>
      </prop>
      <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Angsana New;OONaksit;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Tahoma;Arial Unicode MS;Waree;Loma;Thonburi;Lucidasans;Lucida Sans;Angsana New</value>
      </prop>
      <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Angsana New;OONaksit;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Cordia New;CordiaUPC;Browallia New;BrowalliaUPC;Bromlila;Corada;Umpush;Thonburi;TH SarabunPSK;TH SarabunNew;Angsana New;AngsanaUPC;Tahoma;Arial Unicode MS;Lucidasans;Lucida Sans</value>
      </prop>
      <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Cordia New;CordiaUPC;Angsana New;OONaksit;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Cordia New;CordiaUPC;Browallia New;BrowalliaUPC;Bromlila;Corada;Umpush;Thonburi;TH SarabunPSK;TH SarabunNew;Angsana New;AngsanaUPC;Tahoma;Arial Unicode MS;Lucidasans;Lucida Sans</value>
      </prop>
      <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Tahoma;Angsana New;OONaksit;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Tahoma;Arial Unicode MS;Waree;Loma;Thonburi;TH SarabunPSK;TH SarabunNew;Angsana New;AngsanaUPC;Lucidasans;Lucida Sans</value>
      </prop>
      <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Angsana New;OONaksit;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
+        <value>Angsana New;AngsanaUPC;Angsima;Kinnari;Norasi;Thonburi;TH SarabunPSK;TH SarabunNew;Tahoma;Arial Unicode MS;Lucidasans;Lucida Sans</value>
      </prop>
     </node>
     <node oor:name="ja" oor:op="replace">
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index 34cc33b9e781..621e597c23bd 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -133,8 +133,13 @@ public:
     void            SetLinkSourceName( const String & rName );
     String          GetLinkSourceName() const;
 
-    virtual void    DataChanged( const String & rMimeType,
-                                const ::com::sun::star::uno::Any & rValue );
+    enum UpdateResult {
+        SUCCESS = 0,
+        ERROR_GENERAL = 1
+    };
+
+    virtual UpdateResult DataChanged(
+        const String & rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     void            SetUpdateMode( sal_uInt16 );
     sal_uInt16          GetUpdateMode() const;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 0f2488cfe3d5..cc7b31bd1b15 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -330,12 +330,13 @@ sal_Bool SvBaseLink::Update()
 
             if( xObj->GetData( aData, sMimeType ) )
             {
-                DataChanged( sMimeType, aData );
+                UpdateResult eRes = DataChanged(sMimeType, aData);
+                bool bSuccess = eRes == SUCCESS;
                 //for manual Updates there is no need to hold the ServerObject
                 if( OBJECT_CLIENT_DDE == nObjType &&
                     LINKUPDATE_ONCALL == GetUpdateMode() && xObj.Is() )
                     xObj->RemoveAllDataAdvise( this );
-                return sal_True;
+                return bSuccess;
             }
             if( xObj.Is() )
             {
@@ -439,7 +440,7 @@ void SvBaseLink::Disconnect()
     }
 }
 
-void SvBaseLink::DataChanged( const String &, const ::com::sun::star::uno::Any & )
+SvBaseLink::UpdateResult SvBaseLink::DataChanged( const String &, const ::com::sun::star::uno::Any & )
 {
     switch( nObjType )
     {
@@ -448,6 +449,7 @@ void SvBaseLink::DataChanged( const String &, const ::com::sun::star::uno::Any &
             pImplData->DDEType.pItem->Notify();
         break;
     }
+    return SUCCESS;
 }
 
 void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 3f837323a1fd..49359002de34 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -72,6 +72,7 @@
 #include <comphelper/uieventslogger.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
 
+#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1144,14 +1145,14 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem*
     rDispatcher.GetFrame();  // -Wall is this required???
 
     // get SlotServer (Slot+ShellLevel) and Shell from cache
-    sal_Bool bDeleteCache = sal_False;
+    ::boost::scoped_ptr<SfxStateCache> xCache;
     if ( !pCache )
     {
         // Execution of non cached slots (Accelerators don't use Controllers)
         // slot is uncached, use SlotCache to handle external dispatch providers
-        pCache = new SfxStateCache( nId );
+        xCache.reset(new SfxStateCache(nId));
+        pCache = xCache.get();
         pCache->GetSlotServer( rDispatcher, pImp->xProv );
-        bDeleteCache = sal_True;
     }
 
     if ( pCache && pCache->GetDispatch().is() )
@@ -1167,14 +1168,10 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem*
 
         // cache binds to an external dispatch provider
         pCache->Dispatch( aReq.GetArgs(), nCallMode == SFX_CALLMODE_SYNCHRON );
-        if ( bDeleteCache )
-            DELETEZ( pCache );
         SfxPoolItem *pVoid = new SfxVoidItem( nId );
         DeleteItemOnIdle( pVoid );
         return pVoid;
     }
-    else if ( pCache && bDeleteCache )  // just in case it was created, but GetDispatch() is 0
-        DELETEZ( pCache );
 
     // slot is handled internally by SfxDispatcher
     if ( pImp->bMsgDirty )
@@ -1224,9 +1221,6 @@ const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem*
         pRet = pVoid;
     }
 
-    if ( bDeleteCache )
-        delete pCache;
-
     return pRet;
 }
 
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index e746a257b3d2..22474e59b308 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -85,6 +85,8 @@ SdrObject* CloneList::GetClone(sal_uInt32 nIndex) const
 
 void CloneList::CopyConnections() const
 {
+    sal_uInt32 cloneCount = maCloneList.size();
+
     for(sal_uInt32 a = 0; a < maOriginalList.size(); a++)
     {
         const SdrEdgeObj* pOriginalEdge = PTR_CAST(SdrEdgeObj, GetOriginal(a));
@@ -101,10 +103,17 @@ void CloneList::CopyConnections() const
                                                                  maOriginalList.end(),
                                                                  pOriginalNode1);
 
+                sal_uInt32 nPos = it - maOriginalList.begin();
+
                 if(it != maOriginalList.end())
                 {
-                    if(pOriginalEdge->GetConnectedNode(sal_True) != *it)
-                        pCloneEdge->ConnectToNode(sal_True, const_cast<SdrObject*>(*it));
+                    SdrObject *cObj = NULL;
+
+                    if (nPos < cloneCount)
+                        cObj = GetClone(nPos);
+
+                    if(pOriginalEdge->GetConnectedNode(sal_True) != cObj)
+                        pCloneEdge->ConnectToNode(sal_True, cObj);
                 }
             }
 
@@ -114,10 +123,17 @@ void CloneList::CopyConnections() const
                                                                  maOriginalList.end(),
                                                                  pOriginalNode2);
 
+                sal_uInt32 nPos = it - maOriginalList.begin();
+
                 if(it != maOriginalList.end())
                 {
-                    if(pOriginalEdge->GetConnectedNode(sal_True) != *it)
-                        pCloneEdge->ConnectToNode(sal_True, const_cast<SdrObject*>(*it));
+                    SdrObject *cObj = NULL;
+
+                    if (nPos < cloneCount)
+                        cObj = GetClone(nPos);
+
+                    if(pOriginalEdge->GetConnectedNode(sal_False) != cObj)
+                        pCloneEdge->ConnectToNode(sal_False, cObj);
                 }
             }
         }
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 4a74cd80a5df..b8fc80a49404 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -131,8 +131,9 @@ public:
     virtual             ~SdrGraphicLink();
 
     virtual void        Closed();
-    virtual void        DataChanged( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue );
+
+    virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
+        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
     void                DataChanged( const Graphic& rGraphic );
 
     sal_Bool                Connect() { return 0 != GetRealObject(); }
@@ -242,8 +243,8 @@ void SdrGraphicLink::RemoveGraphicUpdater()
 
 // -----------------------------------------------------------------------------
 
-void SdrGraphicLink::DataChanged( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue )
+::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged(
+    const String& rMimeType, const ::com::sun::star::uno::Any & rValue )
 {
     SdrModel*       pModel      = pGrafObj ? pGrafObj->GetModel() : 0;
     sfx2::LinkManager* pLinkManager= pModel  ? pModel->GetLinkManager() : 0;
@@ -264,6 +265,7 @@ void SdrGraphicLink::DataChanged( const String& rMimeType,
             pGrafObj->BroadcastObjectChange();
         }
     }
+    return SUCCESS;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 648907f72201..c406da42f6ca 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -612,8 +612,8 @@ public:
     virtual             ~SdrEmbedObjectLink();
 
     virtual void        Closed();
-    virtual void        DataChanged( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue );
+    virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
+        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     sal_Bool            Connect() { return GetRealObject() != NULL; }
 };
@@ -635,8 +635,8 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink()
 
 // -----------------------------------------------------------------------------
 
-void SdrEmbedObjectLink::DataChanged( const String& /*rMimeType*/,
-                                const ::com::sun::star::uno::Any & /*rValue*/ )
+::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged(
+    const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ )
 {
     if ( !pObj->UpdateLinkURL_Impl() )
     {
@@ -666,6 +666,8 @@ void SdrEmbedObjectLink::DataChanged( const String& /*rMimeType*/,
 
     pObj->GetNewReplacement();
     pObj->SetChanged();
+
+    return SUCCESS;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index d287bf04d77f..2cb8038e1271 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -75,8 +75,8 @@ public:
     virtual ~ImpSdrObjTextLink();
 
     virtual void Closed();
-    virtual void DataChanged( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue );
+    virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
+        const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
     sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
@@ -98,8 +98,8 @@ void ImpSdrObjTextLink::Closed()
 }
 
 
-void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
-                                const ::com::sun::star::uno::Any & /*rValue */)
+::sfx2::SvBaseLink::UpdateResult ImpSdrObjTextLink::DataChanged(
+    const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue */)
 {
     bool bForceReload = false;
     SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
@@ -125,6 +125,8 @@ void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
     }
     if (pSdrObj )
         pSdrObj->ReloadLinkedText( bForceReload );
+
+    return SUCCESS;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////