calc55: merge with DEV300_m83

195 files changed, 6539 insertions, 2020 deletions

diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 34669d3e9f..4185f3cbfc 100644
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
@@ -50,6 +50,7 @@ SLOFILES= \
         $(SLO)$/soundhandler.obj  
 
 EXCEPTIONSFILES = \
+        $(SLO)$/mediatoolbox.obj \
         $(SLO)$/soundhandler.obj
 
 # --- Targets ----------------------------------
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index b26b03b76a..c7d2d4ed4b 100755
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -906,7 +906,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
     {
         // TEST, has to be vb here always
 #ifdef DBG_UTIL
-        SbError nTmp = StarBASIC::GetSfxFromVBError( nError );
+        SbError nTmp = StarBASIC::GetSfxFromVBError( USHORT( nError ) );
         DBG_ASSERT( nTmp, "No VB error!" );
 #endif
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c716a10d1a..1cbb890e0b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -359,6 +359,8 @@ namespace
         : public rtl::Static< String, Version > {};
     struct AboutBoxVersion
         : public rtl::Static< String, AboutBoxVersion > {};
+    struct OOOVendor
+        : public rtl::Static< String, OOOVendor > {};
     struct Extension
         : public rtl::Static< String, Extension > {};
     struct XMLFileFormatName
@@ -422,6 +424,21 @@ void ReplaceStringHookProc( UniString& rStr )
         rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName );
         rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion );
     }
+    if ( rStr.SearchAscii( "%OOOVENDOR" ) != STRING_NOTFOUND )
+    {
+        String &rOOOVendor = OOOVendor::get();
+
+        if ( !rOOOVendor.Len() )
+        {
+            rtl::OUString aTmp;
+            Any aRet = ::utl::ConfigManager::GetDirectConfigProperty(
+                    ::utl::ConfigManager::OOOVENDOR );
+            aRet >>= aTmp;
+            rOOOVendor = aTmp;
+
+        }
+        rStr.SearchAndReplaceAllAscii( "%OOOVENDOR" ,rOOOVendor );
+    }
 
     if ( rStr.SearchAscii( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != STRING_NOTFOUND )
     {
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index a935ca1113..a4d4de1873 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -44,6 +44,20 @@ namespace dp_misc
 
 //==============================================================================
 void xml_parse(
+    Reference<xml::input::XRoot> const & xRoot,
+    ::ucbhelper::Content & ucb_content,
+    Reference<XComponentContext> const & xContext )
+{
+    const Any arg(xRoot);
+    const Reference<xml::sax::XDocumentHandler> xDocHandler(
+        xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+            OUSTR("com.sun.star.xml.input.SaxDocumentHandler"),
+            Sequence<Any>( &arg, 1 ), xContext ), UNO_QUERY_THROW );
+    xml_parse( xDocHandler, ucb_content, xContext );
+ }
+
+//==============================================================================
+void xml_parse(
     Reference<xml::sax::XDocumentHandler> const & xDocHandler,
     ::ucbhelper::Content & ucb_content,
     Reference<XComponentContext> const & xContext )
@@ -61,199 +75,4 @@ void xml_parse(
     xParser->parseStream( source );
 }
 
-//==============================================================================
-void xml_parse(
-    Reference<xml::input::XRoot> const & xRoot,
-    ::ucbhelper::Content & ucb_content,
-    Reference<XComponentContext> const & xContext )
-{
-    const Any arg(xRoot);
-    const Reference<xml::sax::XDocumentHandler> xDocHandler(
-        xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
-            OUSTR("com.sun.star.xml.input.SaxDocumentHandler"),
-            Sequence<Any>( &arg, 1 ), xContext ), UNO_QUERY_THROW );
-    xml_parse( xDocHandler, ucb_content, xContext );
-}
-
-//##############################################################################
-
-//______________________________________________________________________________
-XmlRootElement::XmlRootElement(
-    OUString const & uri, OUString const & localname )
-    : m_uri( uri )
-{
-    m_localname = localname;
-}
-
-//______________________________________________________________________________
-XmlRootElement::~XmlRootElement()
-{
-}
-
-// XRoot
-//______________________________________________________________________________
-void XmlRootElement::startDocument(
-    Reference<xml::input::XNamespaceMapping> const & xMapping )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    m_xNamespaceMapping = xMapping;
-    
-    try {
-        m_uid = m_xNamespaceMapping->getUidByUri( m_uri );
-    }
-    catch (container::NoSuchElementException & exc) {
-        throw xml::sax::SAXException(
-            exc.Message, static_cast<OWeakObject *>(this), Any(exc) );
-    }
-}
-
-//______________________________________________________________________________
-void XmlRootElement::endDocument()
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlRootElement::processingInstruction(
-    OUString const &, OUString const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlRootElement::setDocumentLocator(
-    Reference<xml::sax::XLocator> const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-Reference<xml::input::XElement> XmlRootElement::startRootElement(
-    sal_Int32 uid, OUString const & localname,
-    Reference<xml::input::XAttributes> const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    check_xmlns( uid );
-    if (! localname.equals( m_localname )) {
-        throw xml::sax::SAXException(
-            OUSTR("unexpected root element ") + localname,
-            static_cast<OWeakObject *>(this), Any() );
-    }
-    m_xAttributes = xAttributes;
-    
-    return this;
-}
-
-//##############################################################################
-
-//______________________________________________________________________________
-XmlElement::~XmlElement()
-{
-}
-
-//______________________________________________________________________________
-void XmlElement::check_xmlns( sal_Int32 uid ) const
-    throw (xml::sax::SAXException)
-{
-    if (uid != m_uid)
-    {
-        ::rtl::OUStringBuffer buf;
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM("illegal xml namespace uri=\"") );
-        try {
-            buf.append( m_xNamespaceMapping->getUriByUid( uid ) );
-        }
-        catch (container::NoSuchElementException & exc) {
-            throw xml::sax::SAXException(
-                exc.Message, static_cast<OWeakObject *>(
-                    const_cast<XmlElement *>(this) ), Any(exc) );
-        }
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
-        throw xml::sax::SAXException(
-            buf.makeStringAndClear(),
-            static_cast<OWeakObject *>( const_cast<XmlElement *>(this) ),
-            Any() );
-    }
-}
-
-// XElement
-//______________________________________________________________________________
-Reference<xml::input::XElement> XmlElement::getParent()
-    throw (RuntimeException)
-{
-    return m_xParent;
-}
-
-//______________________________________________________________________________
-OUString XmlElement::getLocalName()
-    throw (RuntimeException)
-{
-    return m_localname;
-}
-
-//______________________________________________________________________________
-sal_Int32 XmlElement::getUid()
-    throw (RuntimeException)
-{
-    return m_uid;
-}
-
-//______________________________________________________________________________
-Reference<xml::input::XAttributes> XmlElement::getAttributes()
-    throw (RuntimeException)
-{
-    return m_xAttributes;
-}
-
-//______________________________________________________________________________
-void XmlElement::ignorableWhitespace(
-    OUString const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlElement::characters( OUString const & chars )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    m_characters += chars;
-}
-
-//______________________________________________________________________________
-void XmlElement::processingInstruction(
-    OUString const &, OUString const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-}
-
-//______________________________________________________________________________
-void XmlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    m_got_endElement = true;
-}
-
-//______________________________________________________________________________
-Reference<xml::input::XElement> XmlElement::startChildElement(
-    sal_Int32 uid, OUString const & localName,
-    Reference<xml::input::XAttributes> const & )
-    throw (xml::sax::SAXException, RuntimeException)
-{
-    ::rtl::OUStringBuffer buf;
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("unexpected element "
-                                                "{ tag=\"") );
-    buf.append( localName );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\", uri=\"") );
-    try {
-        buf.append( m_xNamespaceMapping->getUriByUid( uid ) );
-    }
-    catch (container::NoSuchElementException & exc) {
-        throw xml::sax::SAXException(
-            exc.Message, static_cast<OWeakObject *>(this), Any(exc) );
-    }
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" }!") );
-    throw xml::sax::SAXException(
-        buf.makeStringAndClear(), static_cast<OWeakObject *>(this), Any() );
-}
-
 }
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 428b1b4679..ed3bd6962e 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -138,6 +138,8 @@
 #define RID_IMG_LOCKED_HC                      (RID_DEPLOYMENT_GUI_START+59)
 #define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
 #define RID_IMG_EXTENSION_HC                   (RID_DEPLOYMENT_GUI_START+61)
+#define RID_IMG_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
+#define RID_IMG_SHARED_HC                      (RID_DEPLOYMENT_GUI_START+63)
 
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index cb754bc558..df105adb4d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -239,7 +239,10 @@ void ExtBoxWithBtns_Impl::RecalcAll()
     const sal_Int32 nActive = getSelIndex();
 
     if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
+    {
         SetButtonPos( GetEntryRect( nActive ) );
+        SetButtonStatus( GetEntryData( nActive) );
+    }
     else
     {
         m_pOptionsBtn->Hide();
@@ -257,21 +260,6 @@ void ExtBoxWithBtns_Impl::selectEntry( const long nPos )
         return;
 
     ExtensionBox_Impl::selectEntry( nPos );
-
-    if ( ( nPos >= 0 ) && ( nPos < GetEntryCount() ) )
-    {
-        if ( IsReallyVisible() )
-        {
-            SetButtonPos( GetEntryRect( nPos ) );
-        }
-        SetButtonStatus( GetEntryData( nPos) );
-    }
-    else
-    {
-        m_pOptionsBtn->Hide();
-        m_pEnableBtn->Hide();
-        m_pRemoveBtn->Hide();
-    }
 }
 
 // -----------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 11b06e5fb9..b74a802ceb 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -165,11 +165,21 @@ Image RID_IMG_WARNING_HC
 
 Image RID_IMG_LOCKED
 {
-    ImageBitmap = Bitmap { File = "shared_16.png"; };
+    ImageBitmap = Bitmap { File = "lock_16.png"; };
 };
 
 Image RID_IMG_LOCKED_HC
 {
+    ImageBitmap = Bitmap { File = "lock_16_h.png"; };
+};
+
+Image RID_IMG_SHARED
+{
+    ImageBitmap = Bitmap { File = "shared_16.png"; };
+};
+
+Image RID_IMG_SHARED_HC
+{
     ImageBitmap = Bitmap { File = "shared_16_h.png"; };
 };
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e974d7ab21..54a7bdd378 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -177,6 +177,8 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
     m_nTopIndex( 0 ),
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
+    m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
+    m_aSharedImageHC( DialogHelper::getResId( RID_IMG_SHARED_HC ) ),
     m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
     m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
     m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
@@ -469,13 +471,15 @@ void ExtensionBox_Impl::selectEntry( const long nPos )
 
         if ( IsReallyVisible() )
         {
-            m_bNeedsRecalc = true;
             m_bAdjustActive = true;
         }
     }
 
     if ( IsReallyVisible() )
+    {
+        m_bNeedsRecalc = true;
         Invalidate();
+    }
 
     guard.clear();
 }
@@ -618,7 +622,10 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     if ( pEntry->m_bShared )
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );
-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+        if ( pEntry->m_bLocked )
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+        else
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aSharedImageHC : m_aSharedImage );
     }
     if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps )
     {
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 18f9844349..bad80303b4 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -135,6 +135,8 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     long            m_nActiveHeight;
     long            m_nExtraHeight;
     Size            m_aOutputSize;
+    Image           m_aSharedImage;
+    Image           m_aSharedImageHC;
     Image           m_aLockedImage;
     Image           m_aLockedImageHC;
     Image           m_aWarningImage;
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 7482f71583..7f99cd08cf 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -92,6 +92,8 @@ namespace
         : public rtl::Static< String, Version > {};
     struct AboutBoxVersion
         : public rtl::Static< String, AboutBoxVersion > {};
+    struct OOOVendor
+        : public rtl::Static< String, OOOVendor > {};
     struct Extension
         : public rtl::Static< String, Extension > {};
 }
@@ -107,6 +109,7 @@ void ReplaceProductNameHookProc( String& rStr )
         String &rVersion = Version::get();
         String &rAboutBoxVersion = AboutBoxVersion::get();
         String &rExtension = Extension::get();
+        String &rOOOVendor = OOOVendor::get();
 
         if ( !rProductName.Len() )
         {
@@ -123,6 +126,10 @@ void ReplaceProductNameHookProc( String& rStr )
             aRet >>= aTmp;
             rAboutBoxVersion = aTmp;
 
+            aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::OOOVENDOR );
+            aRet >>= aTmp;
+            rOOOVendor = aTmp;
+
             if ( !rExtension.Len() )
             {
                 aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTEXTENSION );
@@ -135,6 +142,7 @@ void ReplaceProductNameHookProc( String& rStr )
         rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName );
         rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
         rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
+        rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor );
         rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
     }
 }
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 6a9c7b6bbb..52092a077a 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -77,6 +77,7 @@ SHL1STDLIBS = \
         $(SVTOOLLIB)	\
         $(SVLLIB)  \
         $(SVXLIB) \
+        $(SVXCORELIB) \
         $(SFXLIB) \
         $(DEPLOYMENTMISCLIB) \
         $(OLE32LIB)
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 80c46df937..5d8356e85c 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -216,16 +216,6 @@ public:
     */  
     ::rtl::OUString getIconURL( sal_Bool bHighContrast ) const;
 
-    /**
-       Allow direct access to the XPath functionality.
-
-       @return
-       direct access to the XPath functionality; null iff this instance was
-       constructed with a null <code>element</code>
-    */
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::xpath::XXPathAPI >
-    getXpath() const;
-
 private:
     SAL_DLLPRIVATE ::boost::optional< ::rtl::OUString > getOptionalValue(
         ::rtl::OUString const & expression) const;
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index cc2a847082..cad9e91bb5 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -52,110 +52,6 @@ void xml_parse(
     ::ucbhelper::Content & ucb_content,
     css::uno::Reference< css::uno::XComponentContext > const & xContext );
 
-//==============================================================================
-void xml_parse(
-    css::uno::Reference< css::xml::input::XRoot > const & xRoot,
-    ::ucbhelper::Content & ucb_content,
-    css::uno::Reference< css::uno::XComponentContext > const & xContext );
-
-//==============================================================================
-class XmlElement : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
-{
-protected:
-    css::uno::Reference<css::xml::input::XNamespaceMapping> m_xNamespaceMapping;
-    const css::uno::Reference<css::xml::input::XElement> m_xParent;
-    sal_Int32 m_uid;
-    ::rtl::OUString m_localname;
-    css::uno::Reference<css::xml::input::XAttributes> m_xAttributes;
-    ::rtl::OUString m_characters;
-    bool m_got_endElement;
-    
-    void check_xmlns( sal_Int32 uid ) const throw (css::xml::sax::SAXException);
-    
-    inline XmlElement()
-        : m_uid( -1 ),
-          m_got_endElement( false )
-        {}
-    virtual ~XmlElement();
-public:
-    inline bool isParsed() const { return m_got_endElement; }
-    
-    inline XmlElement(
-        css::uno::Reference<css::xml::input::XNamespaceMapping>
-        const & xMapping,
-        css::uno::Reference<css::xml::input::XElement> const & xParent,
-        sal_Int32 uid, ::rtl::OUString const & localname,
-        css::uno::Reference< css::xml::input::XAttributes >
-        const & xAttributes )
-        : m_xNamespaceMapping( xMapping ),
-          m_xParent( xParent ),
-          m_uid( uid ),
-          m_localname( localname ),
-          m_xAttributes( xAttributes ),
-          m_got_endElement( false )
-        {}
-    
-    // XElement
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL
-    getParent() throw (css::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getUid()
-        throw (css::uno::RuntimeException);
-    virtual css::uno::Reference<css::xml::input::XAttributes> SAL_CALL
-    getAttributes() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace(
-        ::rtl::OUString const & rWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL characters( ::rtl::OUString const & rChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction(
-        ::rtl::OUString const & Target, ::rtl::OUString const & Data )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL
-    startChildElement(
-        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-};
-
-//==============================================================================
-class XmlRootElement : public ::cppu::ImplInheritanceHelper1<
-                                        XmlElement, css::xml::input::XRoot >
-{
-    const ::rtl::OUString m_uri;
-    
-protected:
-    virtual ~XmlRootElement();
-public:
-    inline ::rtl::OUString const & getUri() const
-        { return m_uri; }
-    
-    XmlRootElement(
-        ::rtl::OUString const & uri, ::rtl::OUString const & localname );
-
-    // XRoot
-    virtual void SAL_CALL startDocument(
-        css::uno::Reference<css::xml::input::XNamespaceMapping>
-        const & xMapping )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction(
-        ::rtl::OUString const & target, ::rtl::OUString const & data )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual void SAL_CALL setDocumentLocator(
-        css::uno::Reference<css::xml::sax::XLocator> const & xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL
-    startRootElement(
-        sal_Int32 uid, ::rtl::OUString const & localname,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
-};
-
 }
 
 #endif
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 73df2b0168..58e17a017b 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -264,12 +264,6 @@ DescriptionInfoset::getUpdateDownloadUrls() const
             ::boost::optional< ::rtl::OUString >();
 }
 
-css::uno::Reference< css::xml::xpath::XXPathAPI > DescriptionInfoset::getXpath()
-    const
-{
-    return m_xpath;
-}
-
 ::boost::optional< ::rtl::OUString > DescriptionInfoset::getOptionalValue(
     ::rtl::OUString const & expression) const
 {
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 579cc8a051..3c002a9b47 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -39,6 +39,8 @@
 #define PLATFORM_WIN_X86            "windows_x86"
 #define PLATFORM_LINUX_X86          "linux_x86"
 #define PLATFORM_LINUX_X86_64       "linux_x86_64"
+#define PLATFORM_KFREEBSD_X86       "kfreebsd_x86"
+#define PLATFORM_KFREEBSD_X86_64    "kfreebsd_x86_64"
 #define PLATFORM_LINUX_SPARC        "linux_sparc"
 #define PLATFORM_LINUX_POWERPC      "linux_powerpc"
 #define PLATFORM_LINUX_POWERPC64    "linux_powerpc64"
@@ -129,6 +131,10 @@ namespace
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("x86"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_X86_64)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("X86_64"));  
+        else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86)))
+            ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("x86"));
+        else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86_64)))
+            ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("X86_64"));  
         else if (token.equals(OUSTR(PLATFORM_LINUX_SPARC)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("SPARC"));  
         else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC)))
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 32c6168ba6..54902e73a1 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -59,6 +59,11 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/ui/XUIConfiguration.hpp>
+#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 
 using namespace rtl;
 using namespace osl;
@@ -73,6 +78,120 @@ using namespace com::sun::star;
 
 namespace desktop {
 
+static const ::rtl::OUString ITEM_DESCRIPTOR_COMMANDURL = ::rtl::OUString::createFromAscii("CommandURL");
+static const ::rtl::OUString ITEM_DESCRIPTOR_CONTAINER = ::rtl::OUString::createFromAscii("ItemDescriptorContainer");
+static const ::rtl::OUString ITEM_DESCRIPTOR_LABEL = ::rtl::OUString::createFromAscii("Label");
+
+static const ::rtl::OUString MENU_SEPERATOR = ::rtl::OUString::createFromAscii(" | ");
+static const ::rtl::OUString MENU_SUBMENU = ::rtl::OUString::createFromAscii("...");
+
+::rtl::OUString retrieveLabelFromCommand(const ::rtl::OUString& sCommand, const ::rtl::OUString& sModuleIdentifier)
+{
+    ::rtl::OUString sLabel;
+
+    uno::Reference< container::XNameAccess > xUICommands;
+    uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
+    if ( xNameAccess.is() )
+    {
+        uno::Any a = xNameAccess->getByName( sModuleIdentifier );
+        a >>= xUICommands;
+    }
+    if (xUICommands.is())
+    {
+        if ( sCommand.getLength() > 0 )
+        {
+            rtl::OUString aStr;
+            ::uno::Sequence< beans::PropertyValue > aPropSeq;
+            try
+            {
+                uno::Any a( xUICommands->getByName( sCommand ));
+                if ( a >>= aPropSeq )
+                {
+                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+                    {
+                        if ( aPropSeq[i].Name.equalsAscii( "Label" ))
+                        {
+                            aPropSeq[i].Value >>= aStr;
+                            break;
+                        }
+                    }
+                }
+
+                sLabel = aStr;
+            }
+
+            catch(container::NoSuchElementException&)
+            {
+                sLabel = sCommand;
+                sal_Int32 nIndex = sLabel.indexOf(':');
+                if (nIndex>=0 && nIndex <= sLabel.getLength()-1)
+                    sLabel = sLabel.copy(nIndex+1);
+            }
+
+        }
+    }
+
+    return sLabel;
+}
+
+::rtl::OUString stripHotKey( const ::rtl::OUString& str )
+{
+    sal_Int32 index = str.indexOf( '~' );
+    if ( index == -1 )
+    {
+        return str;
+    }
+    else
+    {
+        return str.replaceAt( index, 1, ::rtl::OUString() );
+    }
+}
+
+::rtl::OUString mapModuleShortNameToIdentifier(const ::rtl::OUString& sShortName)
+{
+    ::rtl::OUString sIdentifier;
+
+    if (sShortName.equals(::rtl::OUString::createFromAscii("StartModule")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.frame.StartModule");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("swriter")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("scalc")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("sdraw")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.drawing.DrawingDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("simpress")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.presentation.PresentationDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("smath")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.formula.FormulaProperties");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("schart")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("BasicIDE")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.script.BasicIDE");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("dbapp")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.sdb.OfficeDatabaseDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("sglobal")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("sweb")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("swxform")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.xforms.XMLFormDocument");
+
+    else if (sShortName.equals(::rtl::OUString::createFromAscii("sbibliography")))
+        sIdentifier = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography");
+
+    return sIdentifier;
+}
 
 static MigrationImpl *pImpl = 0;
 static Mutex aMutex;
@@ -160,9 +279,72 @@ sal_Bool MigrationImpl::doMigration()
     m_vrFileList = compileFileList();
     
     sal_Bool result = sal_False;
-    try{
+    try
+    {
+        NewVersionUIInfo aNewVersionUIInfo;		
+        ::std::vector< MigrationModuleInfo > vModulesInfo = dectectUIChangesForAllModules();
+        aNewVersionUIInfo.init(vModulesInfo);
+
         copyFiles();
 
+        const ::rtl::OUString sMenubarResourceURL = ::rtl::OUString::createFromAscii("private:resource/menubar/menubar");
+        const ::rtl::OUString sToolbarResourcePre = ::rtl::OUString::createFromAscii("private:resource/toolbar/");
+        for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
+        {
+            ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
+            if (sModuleIdentifier.getLength()==0)
+                continue;
+
+            uno::Sequence< uno::Any > lArgs(2);
+            ::rtl::OUString aOldCfgDataPath = m_aInfo.userdata + ::rtl::OUString::createFromAscii("/user/config/soffice.cfg/modules/");
+            lArgs[0] <<= aOldCfgDataPath + vModulesInfo[i].sModuleShortName;
+            lArgs[1] <<= embed::ElementModes::READ;
+
+            uno::Reference< lang::XSingleServiceFactory > xStorageFactory(m_xFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.embed.FileSystemStorageFactory")), uno::UNO_QUERY);
+            uno::Reference< embed::XStorage >             xModules;
+
+            xModules = uno::Reference< embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY);
+            uno::Reference< ui::XUIConfigurationManager > xOldCfgManager( m_xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.ui.UIConfigurationManager")), uno::UNO_QUERY );
+            uno::Reference< ui::XUIConfigurationStorage > xOldCfgStorage( xOldCfgManager, uno::UNO_QUERY );
+            uno::Reference< ui::XUIConfigurationPersistence > xOldCfgPersistence( xOldCfgManager, uno::UNO_QUERY );
+
+            if ( xOldCfgStorage.is() && xOldCfgPersistence.is() && xModules.is() )
+            {
+                    xOldCfgStorage->setStorage( xModules );
+                    xOldCfgPersistence->reload();
+            }
+
+            uno::Reference< ui::XUIConfigurationManager > xCfgManager = aNewVersionUIInfo.getConfigManager(vModulesInfo[i].sModuleShortName);
+
+            if (vModulesInfo[i].bHasMenubar)
+            {
+                uno::Reference< container::XIndexContainer > xOldVersionMenuSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sMenubarResourceURL, sal_True), uno::UNO_QUERY);
+                uno::Reference< container::XIndexContainer > xNewVersionMenuSettings = aNewVersionUIInfo.getNewMenubarSettings(vModulesInfo[i].sModuleShortName);
+                ::rtl::OUString sParent;
+                compareOldAndNewConfig(sParent, xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL);
+                mergeOldToNewVersion(xCfgManager, xNewVersionMenuSettings, sModuleIdentifier, sMenubarResourceURL);
+            }
+
+            sal_Int32 nToolbars = vModulesInfo[i].m_vToolbars.size();
+            if (nToolbars >0)
+            {
+                for (sal_Int32 j=0; j<nToolbars; ++j)
+                {
+                    ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
+                    ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
+
+                    uno::Reference< container::XIndexContainer > xOldVersionToolbarSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sToolbarResourceURL, sal_True), uno::UNO_QUERY);
+                    uno::Reference< container::XIndexContainer > xNewVersionToolbarSettings = aNewVersionUIInfo.getNewToolbarSettings(vModulesInfo[i].sModuleShortName, sToolbarName);
+                    ::rtl::OUString sParent;
+                    compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL);
+                    mergeOldToNewVersion(xCfgManager, xNewVersionToolbarSettings, sModuleIdentifier, sToolbarResourceURL);
+                }                
+            }
+
+            m_aOldVersionItemsHashMap.clear();
+            m_aNewVersionItemsHashMap.clear();
+        }
+
         // execute the migration items from Setup.xcu
         copyConfig();
 
@@ -291,10 +473,14 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
         tmpStep.name = seqMigrations[i];
 
         // read included files from current step description
+        ::rtl::OUString aSeqEntry;
         if (tmpAccess->getByName(OUString::createFromAscii("IncludedFiles")) >>= tmpSeq)
         {
             for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
-                tmpStep.includeFiles.push_back(tmpSeq[j]);
+            {
+                aSeqEntry = tmpSeq[j];
+                tmpStep.includeFiles.push_back(aSeqEntry);
+            }
         }
 
         // exluded files...
@@ -329,7 +515,10 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
         if (tmpAccess->getByName(OUString::createFromAscii("ExcludedExtensions")) >>= tmpSeq)
         {
             for (sal_Int32 j=0; j<tmpSeq.getLength(); j++)
-                tmpStep.excludeExtensions.push_back(tmpSeq[j]);
+            {
+                aSeqEntry = tmpSeq[j];
+                tmpStep.excludeExtensions.push_back(aSeqEntry);
+            }
         }
 
         // generic service
@@ -781,4 +970,396 @@ void MigrationImpl::runServices()
     }
 }
 
+::std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const
+{
+    ::std::vector< MigrationModuleInfo > vModulesInfo;
+    const ::rtl::OUString MENUBAR = ::rtl::OUString::createFromAscii("menubar");
+    const ::rtl::OUString TOOLBAR = ::rtl::OUString::createFromAscii("toolbar");
+
+    uno::Sequence< uno::Any > lArgs(2);
+    lArgs[0] <<= m_aInfo.userdata + ::rtl::OUString::createFromAscii("/user/config/soffice.cfg/modules");
+    lArgs[1] <<= embed::ElementModes::READ;
+
+    uno::Reference< lang::XSingleServiceFactory > xStorageFactory(m_xFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.embed.FileSystemStorageFactory")), uno::UNO_QUERY);
+    uno::Reference< embed::XStorage >             xModules;
+
+    xModules = uno::Reference< embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY);
+    if (!xModules.is())
+        return vModulesInfo;
+
+    uno::Reference< container::XNameAccess > xAccess = uno::Reference< container::XNameAccess >(xModules, uno::UNO_QUERY);
+    uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames();
+    sal_Int32 nLength = lNames.getLength();
+    for (sal_Int32 i=0; i<nLength; ++i)
+    {
+        ::rtl::OUString sModuleShortName = lNames[i];
+        uno::Reference< embed::XStorage > xModule = xModules->openStorageElement(sModuleShortName, embed::ElementModes::READ);
+        if (xModule.is())
+        {
+            MigrationModuleInfo aModuleInfo;
+
+            uno::Reference< embed::XStorage > xMenubar = xModule->openStorageElement(MENUBAR, embed::ElementModes::READ);
+            if (xMenubar.is())
+            {
+                uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xMenubar, uno::UNO_QUERY);
+                if (xNameAccess->getElementNames().getLength() > 0)
+                {
+                    aModuleInfo.sModuleShortName = sModuleShortName;
+                    aModuleInfo.bHasMenubar = sal_True;
+                }
+            }
+
+            uno::Reference< embed::XStorage > xToolbar = xModule->openStorageElement(TOOLBAR, embed::ElementModes::READ);
+            if (xToolbar.is())
+            {
+                const ::rtl::OUString RESOURCEURL_CUSTOM_ELEMENT = ::rtl::OUString::createFromAscii("custom_");
+                sal_Int32 nCustomLen = 7;
+
+                uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xToolbar, uno::UNO_QUERY);
+                ::uno::Sequence< ::rtl::OUString > lToolbars = xNameAccess->getElementNames();
+                for (sal_Int32 j=0; j<lToolbars.getLength(); ++j)
+                {
+                    ::rtl::OUString sToolbarName = lToolbars[j];
+                    if (sToolbarName.getLength()>=nCustomLen && 
+                        sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT))
+                        continue;
+
+                    aModuleInfo.sModuleShortName = sModuleShortName;
+                    sal_Int32 nIndex = sToolbarName.lastIndexOf('.');
+                    if (nIndex > 0)
+                    {
+                        ::rtl::OUString sExtension(sToolbarName.copy(nIndex));
+                        ::rtl::OUString sToolbarResourceName(sToolbarName.copy(0, nIndex));
+                        if (sToolbarResourceName.getLength()>0 && sExtension.equalsAsciiL(".xml", 4))
+                            aModuleInfo.m_vToolbars.push_back(sToolbarResourceName);
+                    }
+                }
+            }
+
+            if (aModuleInfo.sModuleShortName.getLength()>0)
+                vModulesInfo.push_back(aModuleInfo);
+        }
+    }
+
+    return vModulesInfo;
+}
+
+void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent,
+                                           const uno::Reference< container::XIndexContainer >& xIndexOld,
+                                           const uno::Reference< container::XIndexContainer >& xIndexNew,
+                                           const ::rtl::OUString& sResourceURL)
+{
+    ::std::vector< MigrationItem > vOldItems;
+    ::std::vector< MigrationItem > vNewItems;
+    uno::Sequence< beans::PropertyValue > aProp;
+    sal_Int32 nOldCount = xIndexOld->getCount();
+    sal_Int32 nNewCount = xIndexNew->getCount();
+
+    for (int n=0; n<nOldCount; ++n)
+    {
+        MigrationItem aMigrationItem;
+        if (xIndexOld->getByIndex(n) >>= aProp)
+        {
+            for(int i=0; i<aProp.getLength(); ++i)
+            {
+                if (aProp[i].Name.equals(ITEM_DESCRIPTOR_COMMANDURL))
+                    aProp[i].Value >>= aMigrationItem.m_sCommandURL;
+                else if (aProp[i].Name.equals(ITEM_DESCRIPTOR_CONTAINER))
+                    aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
+            }
+
+            if (aMigrationItem.m_sCommandURL.getLength())
+                vOldItems.push_back(aMigrationItem);
+        }
+    }
+
+    for (int n=0; n<nNewCount; ++n)
+    {
+        MigrationItem aMigrationItem;
+        if (xIndexNew->getByIndex(n) >>= aProp)
+        {
+            for(int i=0; i<aProp.getLength(); ++i)
+            {
+                if (aProp[i].Name.equals(ITEM_DESCRIPTOR_COMMANDURL))
+                    aProp[i].Value >>= aMigrationItem.m_sCommandURL;
+                else if (aProp[i].Name.equals(ITEM_DESCRIPTOR_CONTAINER))
+                    aProp[i].Value >>= aMigrationItem.m_xPopupMenu;
+            }
+
+            if (aMigrationItem.m_sCommandURL.getLength())
+                vNewItems.push_back(aMigrationItem);
+        }
+    }
+
+    ::std::vector< MigrationItem >::iterator it;
+
+    ::rtl::OUString sSibling;
+    for (it = vOldItems.begin(); it!=vOldItems.end(); ++it)
+    {
+        ::std::vector< MigrationItem >::iterator pFound = ::std::find(vNewItems.begin(), vNewItems.end(), *it);
+        if (pFound != vNewItems.end() && it->m_xPopupMenu.is())
+        {
+            ::rtl::OUString sName;
+            if (sParent.getLength()>0)
+                sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
+            else
+                sName = it->m_sCommandURL;
+            compareOldAndNewConfig(sName, it->m_xPopupMenu, pFound->m_xPopupMenu, sResourceURL);
+        }
+        else if (pFound == vNewItems.end())
+        {
+            MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu);	
+            if (m_aOldVersionItemsHashMap.find(sResourceURL)==m_aOldVersionItemsHashMap.end())
+            {
+                ::std::vector< MigrationItem > vMigrationItems;
+                m_aOldVersionItemsHashMap.insert(MigrationHashMap::value_type(sResourceURL, vMigrationItems));
+                m_aOldVersionItemsHashMap[sResourceURL].push_back(aMigrationItem);
+            }
+            else
+            {
+                if (::std::find(m_aOldVersionItemsHashMap[sResourceURL].begin(), m_aOldVersionItemsHashMap[sResourceURL].end(), aMigrationItem)==m_aOldVersionItemsHashMap[sResourceURL].end())
+                    m_aOldVersionItemsHashMap[sResourceURL].push_back(aMigrationItem);
+            }
+        }
+
+        sSibling = it->m_sCommandURL;
+    }
+
+    ::rtl::OUString sNewSibling;
+    uno::Reference< container::XIndexContainer > xPopup;
+    for (it = vNewItems.begin(); it!=vNewItems.end(); ++it)
+    {
+        ::std::vector< MigrationItem >::iterator pFound = ::std::find(vOldItems.begin(), vOldItems.end(), *it);
+        if (pFound != vOldItems.end() && it->m_xPopupMenu.is())
+        {
+            ::rtl::OUString sName;
+            if (sParent.getLength()>0)
+                sName = sParent + MENU_SEPERATOR + it->m_sCommandURL;
+            else
+                sName = it->m_sCommandURL;
+            compareOldAndNewConfig(sName, pFound->m_xPopupMenu, it->m_xPopupMenu, sResourceURL);
+        }
+        else if (::std::find(vOldItems.begin(), vOldItems.end(), *it) == vOldItems.end())
+        {
+            MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu);	
+            if (m_aNewVersionItemsHashMap.find(sResourceURL)==m_aNewVersionItemsHashMap.end())
+            {
+                ::std::vector< MigrationItem > vMigrationItems;
+                m_aNewVersionItemsHashMap.insert(MigrationHashMap::value_type(sResourceURL, vMigrationItems));
+                m_aNewVersionItemsHashMap[sResourceURL].push_back(aMigrationItem);
+            }
+            else
+            {
+                if (::std::find(m_aNewVersionItemsHashMap[sResourceURL].begin(), m_aNewVersionItemsHashMap[sResourceURL].end(), aMigrationItem)==m_aNewVersionItemsHashMap[sResourceURL].end())
+                    m_aNewVersionItemsHashMap[sResourceURL].push_back(aMigrationItem);
+            }
+        }
+    }
+}
+
+void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, 
+                                         const uno::Reference< container::XIndexContainer>& xIndexContainer, 
+                                         const ::rtl::OUString& sModuleIdentifier, 
+                                         const ::rtl::OUString& sResourceURL)
+{
+    MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL);
+    if (pFound==m_aOldVersionItemsHashMap.end())
+        return;
+
+    ::std::vector< MigrationItem >::iterator it;
+    for (it=pFound->second.begin(); it!=pFound->second.end(); ++it)
+    {
+        uno::Reference< container::XIndexContainer > xTemp = xIndexContainer;
+
+        ::rtl::OUString sParentNodeName = it->m_sParentNodeName;
+        sal_Int32 nIndex = 0;
+        do 
+        {
+            ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim();
+            if (sToken.getLength()<=0)
+                break;
+
+            sal_Int32 nCount = xTemp->getCount();
+            for (sal_Int32 i=0; i<nCount; ++i)
+            {
+                ::rtl::OUString sCommandURL;
+                ::rtl::OUString sLabel;
+                uno::Reference< container::XIndexContainer > xChild;
+
+                uno::Sequence< beans::PropertyValue > aPropSeq;					
+                xTemp->getByIndex(i) >>= aPropSeq;
+                for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j)
+                {
+                    ::rtl::OUString sPropName = aPropSeq[j].Name;
+                    if (sPropName.equals(ITEM_DESCRIPTOR_COMMANDURL))
+                        aPropSeq[j].Value >>= sCommandURL;
+                    else if (sPropName.equals(ITEM_DESCRIPTOR_LABEL))
+                        aPropSeq[j].Value >>= sLabel;
+                    else if (sPropName.equals(ITEM_DESCRIPTOR_CONTAINER))
+                        aPropSeq[j].Value >>= xChild;
+                }
+
+                if (sCommandURL == sToken)
+                {
+                    xTemp = xChild;
+                    break;
+                }
+            }
+
+        } while (nIndex>=0);
+
+        if (nIndex == -1)
+        {
+            uno::Sequence< beans::PropertyValue > aPropSeq(3);
+
+            aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
+            aPropSeq[0].Value <<= it->m_sCommandURL;
+            aPropSeq[1].Name = ITEM_DESCRIPTOR_LABEL;
+            aPropSeq[1].Value <<= retrieveLabelFromCommand(it->m_sCommandURL, sModuleIdentifier);
+            aPropSeq[2].Name = ITEM_DESCRIPTOR_CONTAINER;
+            aPropSeq[2].Value <<= it->m_xPopupMenu;
+
+            if (it->m_sPrevSibling.getLength() == 0)
+                xTemp->insertByIndex(0, uno::makeAny(aPropSeq));
+            else if (it->m_sPrevSibling.getLength() > 0)
+            {
+                sal_Int32 nCount = xTemp->getCount();
+                sal_Int32 i = 0;
+                for (; i<nCount; ++i)
+                {
+                    ::rtl::OUString sCmd;
+                    uno::Sequence< beans::PropertyValue > aTempPropSeq;			
+                    xTemp->getByIndex(i) >>= aTempPropSeq;
+                    for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j)
+                    {
+                        if (aTempPropSeq[j].Name.equals(ITEM_DESCRIPTOR_COMMANDURL))
+                        {
+                            aTempPropSeq[j].Value >>= sCmd;
+                            break;
+                        }
+                    }
+
+                    if (sCmd.equals(it->m_sPrevSibling))
+                        break;
+                }
+
+                xTemp->insertByIndex(i+1, uno::makeAny(aPropSeq));
+            }
+        }
+    }
+
+    uno::Reference< container::XIndexAccess > xIndexAccess(xIndexContainer, uno::UNO_QUERY);
+    if (xIndexAccess.is())
+        xCfgManager->replaceSettings(sResourceURL, xIndexAccess);
+
+    uno::Reference< ui::XUIConfigurationPersistence > xUIConfigurationPersistence(xCfgManager, uno::UNO_QUERY);
+    if (xUIConfigurationPersistence.is())
+        xUIConfigurationPersistence->store();
+}
+
+uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const
+{ 
+    uno::Reference< ui::XUIConfigurationManager > xCfgManager;
+
+    for (sal_Int32 i=0; i<m_lCfgManagerSeq.getLength(); ++i)
+    {
+        if (m_lCfgManagerSeq[i].Name.equals(sModuleShortName))
+        {
+            m_lCfgManagerSeq[i].Value >>= xCfgManager; 
+            break;
+        }
+    }
+
+    return xCfgManager;
+}
+
+uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const
+{
+    uno::Reference< container::XIndexContainer > xNewMenuSettings;
+
+    for (sal_Int32 i=0; i<m_lNewVersionMenubarSettingsSeq.getLength(); ++i)
+    {
+        if (m_lNewVersionMenubarSettingsSeq[i].Name.equals(sModuleShortName))
+        {
+            m_lNewVersionMenubarSettingsSeq[i].Value >>= xNewMenuSettings;
+            break;
+        }
+    }
+
+    return xNewMenuSettings;
+}
+
+uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const
+{
+    uno::Reference< container::XIndexContainer > xNewToolbarSettings;
+
+    for (sal_Int32 i=0; i<m_lNewVersionToolbarSettingsSeq.getLength(); ++i)
+    {
+        if (m_lNewVersionToolbarSettingsSeq[i].Name.equals(sModuleShortName))
+        {
+            uno::Sequence< beans::PropertyValue > lToolbarSettingsSeq;
+            m_lNewVersionToolbarSettingsSeq[i].Value >>= lToolbarSettingsSeq;
+            for (sal_Int32 j=0; j<lToolbarSettingsSeq.getLength(); ++j)
+            {
+                if (lToolbarSettingsSeq[j].Name.equals(sToolbarName))
+                {
+                    lToolbarSettingsSeq[j].Value >>= xNewToolbarSettings;
+                    break;
+                }
+            }
+
+            break;
+        }
+    }
+
+    return xNewToolbarSettings;
+}
+
+void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModulesInfo)
+{
+    m_lCfgManagerSeq.realloc(vModulesInfo.size());
+    m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size());
+    m_lNewVersionToolbarSettingsSeq.realloc(vModulesInfo.size());
+
+    const ::rtl::OUString sModuleCfgSupplier = ::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier");
+    const ::rtl::OUString sMenubarResourceURL = ::rtl::OUString::createFromAscii("private:resource/menubar/menubar");
+    const ::rtl::OUString sToolbarResourcePre = ::rtl::OUString::createFromAscii("private:resource/toolbar/");
+
+    uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = uno::Reference< ui::XModuleUIConfigurationManagerSupplier >(::comphelper::getProcessServiceFactory()->createInstance(sModuleCfgSupplier), uno::UNO_QUERY);
+
+    for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
+    {
+        ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
+        if (sModuleIdentifier.getLength() > 0)
+        {
+            uno::Reference< ui::XUIConfigurationManager > xCfgManager = xModuleCfgSupplier->getUIConfigurationManager(sModuleIdentifier);
+            m_lCfgManagerSeq[i].Name = vModulesInfo[i].sModuleShortName;
+            m_lCfgManagerSeq[i].Value <<= xCfgManager;
+
+            if (vModulesInfo[i].bHasMenubar)
+            {
+                m_lNewVersionMenubarSettingsSeq[i].Name = vModulesInfo[i].sModuleShortName;
+                m_lNewVersionMenubarSettingsSeq[i].Value <<= xCfgManager->getSettings(sMenubarResourceURL, sal_True);
+            }
+
+            sal_Int32 nToolbars = vModulesInfo[i].m_vToolbars.size();
+            if (nToolbars > 0)
+            {
+                uno::Sequence< beans::PropertyValue > lPropSeq(nToolbars);
+                for (sal_Int32 j=0; j<nToolbars; ++j)
+                {
+                    ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
+                    ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
+
+                    lPropSeq[j].Name = sToolbarName;
+                    lPropSeq[j].Value <<= xCfgManager->getSettings(sToolbarResourceURL, sal_True);
+                }
+
+                m_lNewVersionToolbarSettingsSeq[i].Name = vModulesInfo[i].sModuleShortName;
+                m_lNewVersionToolbarSettingsSeq[i].Value <<= lPropSeq;
+            }
+        }
+    }
+}
+
 } // namespace desktop
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 9a2980faeb..d9177abe40 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -30,6 +30,7 @@
 #include <vector>
 #include <algorithm>
 #include <memory>
+#include <hash_map>
 
 #include "migration.hxx"
 
@@ -41,6 +42,13 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 
 #define NS_CSS com::sun::star
 #define NS_UNO com::sun::star::uno
@@ -80,6 +88,107 @@ typedef std::vector< migration_step > migrations_v;
 typedef std::auto_ptr< migrations_v > migrations_vr;
 typedef std::vector< supported_migration > migrations_available;
 
+//__________________________________________
+/**  
+    define the item, e.g.:menuitem, toolbaritem, to be migrated. we keep the information 
+    of the command URL, the previous sibling node and the parent node of a item
+*/
+struct MigrationItem
+{
+    ::rtl::OUString m_sParentNodeName;
+    ::rtl::OUString m_sPrevSibling;
+    ::rtl::OUString m_sCommandURL;
+    NS_UNO::Reference< NS_CSS::container::XIndexContainer > m_xPopupMenu;
+
+    MigrationItem()
+        :m_xPopupMenu(0)
+    {
+    }
+
+    MigrationItem(const ::rtl::OUString& sParentNodeName, 
+        const ::rtl::OUString& sPrevSibling, 
+        const ::rtl::OUString& sCommandURL, 
+        const NS_UNO::Reference< NS_CSS::container::XIndexContainer > xPopupMenu)
+    {
+        m_sParentNodeName = sParentNodeName;
+        m_sPrevSibling	  = sPrevSibling;
+        m_sCommandURL	  = sCommandURL;
+        m_xPopupMenu	  = xPopupMenu;
+    }
+
+    MigrationItem& operator=(const MigrationItem& aMigrationItem)
+    {
+        m_sParentNodeName = aMigrationItem.m_sParentNodeName;
+        m_sPrevSibling	  = aMigrationItem.m_sPrevSibling;
+        m_sCommandURL     = aMigrationItem.m_sCommandURL;
+        m_xPopupMenu      = aMigrationItem.m_xPopupMenu;
+
+        return *this;
+    }
+
+    sal_Bool operator==(const MigrationItem& aMigrationItem)
+    {
+        return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName &&
+            aMigrationItem.m_sPrevSibling    == m_sPrevSibling	   &&
+            aMigrationItem.m_sCommandURL     == m_sCommandURL	   &&
+            aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is()    );
+    }
+
+    ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; }
+};
+
+typedef ::std::hash_map< ::rtl::OUString, 
+                         ::std::vector< MigrationItem >, 
+                         ::rtl::OUStringHash, 
+                         ::std::equal_to< ::rtl::OUString > > MigrationHashMap;
+
+struct MigrationItemInfo
+{
+    ::rtl::OUString m_sResourceURL;
+    MigrationItem m_aMigrationItem;
+
+    MigrationItemInfo(){}
+
+    MigrationItemInfo(const ::rtl::OUString& sResourceURL, const MigrationItem& aMigratiionItem)
+    {
+        m_sResourceURL = sResourceURL;
+        m_aMigrationItem = aMigratiionItem;
+    }
+};
+
+//__________________________________________
+/**
+    information for the UI elements to be migrated for one module
+*/
+struct MigrationModuleInfo
+{
+    ::rtl::OUString sModuleShortName;
+    sal_Bool		bHasMenubar;
+    ::std::vector< ::rtl::OUString > m_vToolbars;
+
+    MigrationModuleInfo():bHasMenubar(sal_False){};
+};
+
+//__________________________________________
+/**
+    get the information before copying the ui configuration files of old version to new version 
+*/
+class NewVersionUIInfo
+{
+public:
+
+    NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager > getConfigManager(const ::rtl::OUString& sModuleShortName) const;
+    NS_UNO::Reference< NS_CSS::container::XIndexContainer > getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const;
+    NS_UNO::Reference< NS_CSS::container::XIndexContainer > getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const;
+    void init(const ::std::vector< MigrationModuleInfo >& vModulesInfo);
+
+private:
+
+    NS_UNO::Sequence< NS_CSS::beans::PropertyValue > m_lCfgManagerSeq;
+    NS_UNO::Sequence< NS_CSS::beans::PropertyValue > m_lNewVersionMenubarSettingsSeq;
+    NS_UNO::Sequence< NS_CSS::beans::PropertyValue > m_lNewVersionToolbarSettingsSeq;
+};
+
 class MigrationImpl
 {
 
@@ -91,6 +200,9 @@ private:
     migrations_vr        m_vrMigrations;         // list of all migration specs from config
     install_info         m_aInfo;                // info about the version being migrated
     strings_vr           m_vrFileList;           // final list of files to be copied
+     MigrationHashMap     m_aOldVersionItemsHashMap;
+     MigrationHashMap     m_aNewVersionItemsHashMap;
+     ::rtl::OUString      m_sModuleIdentifier;
 
     // functions to control the migration process
     bool          readAvailableMigrations(migrations_available&);
@@ -105,6 +217,16 @@ private:
     strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
     NS_UNO::Reference< NS_CSS::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
 
+    ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
+    void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName,
+        const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, 
+        const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xNewIndexContainer,
+        const ::rtl::OUString& sToolbarName);
+    void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, 
+        const NS_UNO::Reference< NS_CSS::container::XIndexContainer>& xIndexContainer,
+        const ::rtl::OUString& sModuleIdentifier,
+        const ::rtl::OUString& sResourceURL);
+
     // actual processing function that perform the migration steps
     void copyFiles();
     void copyConfig();
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 64a1fd54a0..67aab757cb 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -357,9 +357,9 @@ MigrationPage::MigrationPage(
     m_ftBody.SetText( aText );
 }
 
-sal_Bool MigrationPage::commitPage( CommitPageReason _eReason )
+sal_Bool MigrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
+    if (_eReason == svt::WizardTypes::eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
     {
         GetParent()->EnterWait();
         FirstStartWizard* pWizard = dynamic_cast< FirstStartWizard* >( GetParent() );
@@ -433,7 +433,7 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid)
     }
 }
 
-sal_Bool UserPage::commitPage( CommitPageReason )
+sal_Bool UserPage::commitPage( svt::WizardTypes::CommitPageReason )
 {
     SvtUserOptions aUserOpt;
     aUserOpt.SetFirstName(m_edFirst.GetText());
@@ -463,9 +463,9 @@ UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resi
     _setBold(m_ftHead);
 }
 
-sal_Bool UpdateCheckPage::commitPage( CommitPageReason _eReason )
+sal_Bool UpdateCheckPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if ( _eReason == eTravelForward )
+    if ( _eReason == svt::WizardTypes::eTravelForward )
     {
         try {
             Reference < XNameReplace > xUpdateAccess;
@@ -589,9 +589,9 @@ void RegistrationPage::updateButtonStates()
     m_rbNever.Show( m_bNeverVisible );
 }
 
-sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason )
+sal_Bool RegistrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
 {
-    if ( _eReason == eFinish )
+    if ( _eReason == svt::WizardTypes::eFinish )
     {
         ::utl::RegOptions aOptions;
         rtl::OUString aEvent;
@@ -665,7 +665,7 @@ void RegistrationPage::executeSingleMode()
     // the registration modes "Now" and "Later" are handled by the page
     RegistrationPage::RegistrationMode eMode = pPage->getRegistrationMode();
     if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
-        pPage->commitPage( IWizardPage::eFinish );
+        pPage->commitPage( WizardTypes::eFinish );
     if ( eMode != RegistrationPage::rmLater )
         ::utl::RegOptions().removeReminder();
 }
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 478782d266..3c0a6d0b07 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -125,7 +125,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > m_xThrobber;
 public:
     MigrationPage( svt::OWizardMachine* parent, const ResId& resid, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XThrobber > xThrobber );
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 protected:
     virtual void ActivatePage();
@@ -148,7 +148,7 @@ private:
 
 public:
     UserPage( svt::OWizardMachine* parent, const ResId& resid);
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 protected:
     virtual void ActivatePage();
 };
@@ -161,7 +161,7 @@ private:
     CheckBox m_cbUpdateCheck;
 public:
     UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resid);
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 protected:
     virtual void ActivatePage();
@@ -188,7 +188,7 @@ protected:
     virtual bool canAdvance() const;
     virtual void ActivatePage();
 
-    virtual sal_Bool commitPage( CommitPageReason _eReason );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
 
 public:
     RegistrationPage( Window* parent, const ResId& resid);
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 07e971b033..23f7cf019e 100755
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -139,17 +139,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration()
     }
 }
 
-void OO3ExtensionMigration::registerConfigurationPackage( const uno::Reference< deployment::XPackage > & xPkg)
-{
-    const ::rtl::OUString sMediaType = xPkg->getPackageType()->getMediaType();
-    if ( (sMediaType.equals(sConfigurationDataType) || sMediaType.equals(sConfigurationSchemaType) ) )
-    {
-        xPkg->revokePackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
-        xPkg->registerPackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
-    }
-}
-
- void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
+void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions )
 {
     osl::Directory    aScanRootDir( sSourceDir );
     osl::FileStatus   fs(FileStatusMask_Type | FileStatusMask_FileURL);
@@ -382,35 +372,6 @@ bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir
     return false;
 }
 
-bool OO3ExtensionMigration::copy( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
-{
-    bool bRet = false;
-
-    INetURLObject aSourceObj( sSourceDir );
-    INetURLObject aDestObj( sTargetDir );
-    String aName = aDestObj.getName();
-    aDestObj.removeSegment();
-    aDestObj.setFinalSlash();
-
-    try
-    {
-        ::ucbhelper::Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
-        uno::Reference< ucb::XCommandInfo > xInfo = aDestPath.getCommands();
-        ::rtl::OUString aTransferName = ::rtl::OUString::createFromAscii( "transfer" );
-        if ( xInfo->hasCommandByName( aTransferName ) )
-        {
-            aDestPath.executeCommand( aTransferName, uno::makeAny(
-                ucb::TransferInfo( sal_False, aSourceObj.GetMainURL( INetURLObject::NO_DECODE ), aName, ucb::NameClash::OVERWRITE ) ) );
-            bRet = true;
-        }
-    }
-    catch( uno::Exception& )
-    {
-    }
-
-    return bRet;
-}
-
 
 // -----------------------------------------------------------------------------
 // XServiceInfo
@@ -496,32 +457,6 @@ TStringVectorPtr getContent( const ::rtl::OUString& rBaseURL )
     return aResult;
 }
 
-// -----------------------------------------------------------------------------
-// XJob
-// -----------------------------------------------------------------------------
-
-void OO3ExtensionMigration::copyConfig( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
-{
-    ::rtl::OUString sEx1( m_sSourceDir );
-    sEx1 += sExcludeDir1;
-    ::rtl::OUString sEx2( m_sSourceDir );
-    sEx2 += sExcludeDir2;
-
-    TStringVectorPtr aList = getContent( sSourceDir );
-    TStringVector::const_iterator aI = aList->begin();
-    while ( aI != aList->end() )
-    {
-        ::rtl::OUString sSourceLocalName = aI->copy( sSourceDir.getLength() );
-        ::rtl::OUString aTemp = aI->copy( m_sSourceDir.getLength() );
-        if ( aTemp != sExcludeDir1 && aTemp != sExcludeDir2 )
-        {
-            ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName;
-            copy( (*aI), sTargetName );
-        }
-        ++aI;
-    }
-}
-
 Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
     throw (lang::IllegalArgumentException, Exception, RuntimeException)
 {
@@ -559,12 +494,6 @@ TmpRepositoryCommandEnv::TmpRepositoryCommandEnv()
 {
 }
 
-TmpRepositoryCommandEnv::TmpRepositoryCommandEnv(
-    uno::Reference< task::XInteractionHandler> const & handler)
-    : m_forwardHandler(handler)
-{
-}
-
 TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv()
 {
 }
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 4a2b389310..30dee04178 100755
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -97,16 +97,10 @@ namespace migration
         };
 
         ::osl::FileBase::RC     checkAndCreateDirectory( INetURLObject& rDirURL );
-        void					copyConfig( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir );
-        bool					copy( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir );
         ScanResult              scanExtensionFolder( const ::rtl::OUString& sExtFolder );
         void                    scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions );
         bool                    scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlFilePath );
         bool                    migrateExtension( const ::rtl::OUString& sSourceDir );
-        /* fills m_scriptElements and  m_dialogElements
-        */
-        void registerConfigurationPackage(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
 
     public:
         OO3ExtensionMigration(::com::sun::star::uno::Reference<
@@ -142,8 +136,6 @@ namespace migration
     public:
         virtual ~TmpRepositoryCommandEnv();
         TmpRepositoryCommandEnv();
-        TmpRepositoryCommandEnv(
-            ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> const & handler);
 
         // XCommandEnvironment
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 64b135d87f..92e905a79f 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -219,11 +219,6 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep
     defaultButton(WZB_NEXT);
 }
 
-void FirstStartWizard::EnableButtonsWhileMigration()
-{
-    enableButtons(0xff, sal_True);
-}
-
 void FirstStartWizard::DisableButtonsWhileMigration()
 {
     enableButtons(0xff, sal_False);
@@ -439,10 +434,10 @@ sal_Bool FirstStartWizard::leaveState(WizardState)
     return sal_True;
 }
 
-sal_Bool FirstStartWizard::onFinish(sal_Int32 _nResult)
+sal_Bool FirstStartWizard::onFinish()
 {
     // return sal_True;
-    if (svt::RoadmapWizard::onFinish(_nResult))
+    if ( svt::RoadmapWizard::onFinish() )
     {
 #ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments.
         enableQuickstart();
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 9f26a8b4f2..e0ffa04f93 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -62,7 +62,6 @@ public:
     virtual short Execute();
     virtual long PreNotify( NotifyEvent& rNEvt );
 
-    void EnableButtonsWhileMigration();
     void DisableButtonsWhileMigration();
 
 private:
@@ -97,7 +96,7 @@ protected:
     virtual TabPage* createPage(WizardState _nState);
     virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
     virtual	sal_Bool leaveState(WizardState _nState );
-    virtual sal_Bool onFinish(sal_Int32 _nResult);
+    virtual sal_Bool onFinish();
     virtual void     enterState(WizardState _nState);
     
     // from svt::RoadmapWizard
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
index c1ea62e2aa..3d630d8551 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -62,11 +62,48 @@ namespace drawinglayer
 
             To get better text quality, it is suggested to handle tis primitive directly
             in a renderer. In that case, e.g. hintings on the system can be supported.
+
+            @param maTextTransform
+            The text transformation contains the text start position (always baselined)
+            as translation, the FontSize as scale (where width relative to height defines
+            font scaling and width == height means no font scaling) and the font rotation
+            and shear.
+            When shear is used and a renderer does not support it, it may be better to use
+            the decomposition which will do everything correctly. Same is true for mirroring
+            which would be expressed as negative scalings.
+
+            @param rText
+            The text to be used. Only a part may be used, but a bigger part of the string
+            may be necessary for correct layouting (e.g. international)
+
+            @param aTextPosition
+            The index to the first character to use from rText
+
+            @param aTextLength
+            The number of characters to use from rText
+
+            @param rDXArray
+            The distances between the characters. This parameter may be empty, in that case
+            the renderer is responsible to do something useful. If it is given, it has to be of
+            the size aTextLength. Its values are in logical coordinates and describe the 
+            distance for each character to use. This is independent from the font width which
+            is given with maTextTransform. The first value is the offset to use from the start
+            point in FontCoordinateSystem X-Direction (given by maTextTransform) to the start 
+            point of the second character
+
+            @param rFontAttribute
+            The font definition
+
+            @param rLocale
+            The locale to use
+
+            @param rFontColor
+            The font color to use
          */
         class TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
-            /// text range transformation from unit range ([0.0 .. 1.0]) to text range
+            /// text transformation (FontCoordinateSystem)
             basegfx::B2DHomMatrix					maTextTransform;	
 
             /// The text, used from maTextPosition up to maTextPosition + maTextLength
@@ -78,10 +115,10 @@ namespace drawinglayer
             /// The length for maText usage, starting from maTextPosition
             xub_StrLen								maTextLength;		
             
-            /// The DX array scale-independent in unit coordinates
+            /// The DX array in logic units
             ::std::vector< double >					maDXArray;			
             
-            /// The font to use
+            /// The font definition
             attribute::FontAttribute			    maFontAttribute;	
             
             /// The Locale for the text
@@ -90,7 +127,7 @@ namespace drawinglayer
             /// font color
             basegfx::BColor							maFontColor;		
 
-            /// #i96669# add simple range buffering for this primitive
+            /// #i96669# internal: add simple range buffering for this primitive
             basegfx::B2DRange						maB2DRange;
 
         protected:
diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
index a6290b21a9..63918d5495 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
@@ -54,9 +54,12 @@ namespace drawinglayer
         class Shadow3DExtractingProcessor : public BaseProcessor3D
         {
         private:
+            /// typedef for data handling
+            typedef std::vector< primitive2d::BasePrimitive2D* > BasePrimitive2DVector;
+
             /// result holding vector (2D) and target vector for stacking (inited to &maPrimitive2DSequence)
-            primitive2d::Primitive2DSequence				maPrimitive2DSequence;
-            primitive2d::Primitive2DSequence*				mpPrimitive2DSequence;
+            BasePrimitive2DVector                           maPrimitive2DSequence;
+            BasePrimitive2DVector*                          mpPrimitive2DSequence;
 
             /// object transformation for scene for 2d definition
             basegfx::B2DHomMatrix							maObjectTransformation;
@@ -93,6 +96,10 @@ namespace drawinglayer
              */
             virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate);
 
+            /// helper to convert from BasePrimitive2DVector to primitive2d::Primitive2DSequence
+            const primitive2d::Primitive2DSequence getPrimitive2DSequenceFromBasePrimitive2DVector(
+                const BasePrimitive2DVector& rVector) const;
+
         public:
             Shadow3DExtractingProcessor(
                 const geometry::ViewInformation3D& rViewInformation,
@@ -100,9 +107,10 @@ namespace drawinglayer
                 const basegfx::B3DVector& rLightNormal,
                 double fShadowSlant,
                 const basegfx::B3DRange& rContained3DRange);
+            virtual ~Shadow3DExtractingProcessor();
 
             /// data read access
-            const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
+            const primitive2d::Primitive2DSequence getPrimitive2DSequence() const;
             const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
             const basegfx::B3DHomMatrix& getWorldToEye() const { return maWorldToEye; }
             const basegfx::B3DHomMatrix& getEyeToView() const { return maEyeToView; }
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 9d65643a27..71e9b1c455 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -94,8 +94,10 @@ namespace
         basegfx::BColor			maTextLineColor;
         basegfx::BColor			maOverlineColor;
 
-        /// clipping, font, etc.
-        Region                  maRegion;
+        /// clipping
+        basegfx::B2DPolyPolygon maClipPolyPoygon;
+
+        /// font, etc.
         Font                    maFont;
         RasterOp                maRasterOp;
         sal_uInt32              mnLayoutMode;
@@ -110,7 +112,7 @@ namespace
         bool					mbTextFillColor : 1;
         bool					mbTextLineColor : 1;
         bool					mbOverlineColor : 1;
-        bool					mbRegion : 1;
+        bool					mbClipPolyPolygonActive : 1;
 
     public:
         PropertyHolder()
@@ -122,7 +124,7 @@ namespace
             maTextFillColor(),
             maTextLineColor(),
             maOverlineColor(),
-            maRegion(),
+            maClipPolyPoygon(),
             maFont(),
             maRasterOp(ROP_OVERPAINT),
             mnLayoutMode(0),
@@ -134,7 +136,7 @@ namespace
             mbTextFillColor(false),
             mbTextLineColor(false),
             mbOverlineColor(false),
-            mbRegion(false)
+            mbClipPolyPolygonActive(false)
         {
         }
 
@@ -179,10 +181,10 @@ namespace
         bool getOverlineColorActive() const { return mbOverlineColor; }
         void setOverlineColorActive(bool bNew) { if(bNew != mbOverlineColor) mbOverlineColor = bNew; }
 
-        const Region& getRegion() const { return maRegion; }
-        void setRegion(const Region& rRegion) { if(rRegion != maRegion) maRegion = rRegion; }
-        bool getRegionActive() const { return mbRegion; }
-        void setRegionActive(bool bNew) { if(bNew != mbRegion) mbRegion = bNew; }
+        const basegfx::B2DPolyPolygon& getClipPolyPolygon() const { return maClipPolyPoygon; }
+        void setClipPolyPolygon(const basegfx::B2DPolyPolygon& rNew) { if(rNew != maClipPolyPoygon) maClipPolyPoygon = rNew; }
+        bool getClipPolyPolygonActive() const { return mbClipPolyPolygonActive; }
+        void setClipPolyPolygonActive(bool bNew) { if(bNew != mbClipPolyPolygonActive) mbClipPolyPolygonActive = bNew; }
 
         const Font& getFont() const { return maFont; }
         void setFont(const Font& rFont) { if(rFont != maFont) maFont = rFont; }
@@ -235,6 +237,12 @@ namespace
             return maPropertyHolders.size();
         }
 
+        void PushDefault()
+        {
+            PropertyHolder* pNew = new PropertyHolder();
+            maPropertyHolders.push_back(pNew);
+        }
+
         void Push(sal_uInt16 nPushFlags)
         {
             if(nPushFlags)
@@ -291,8 +299,8 @@ namespace
                             }
                             if(!(nPushFlags & PUSH_CLIPREGION     ))
                             {
-                                pLast->setRegion(pTip->getRegion());
-                                pLast->setRegionActive(pTip->getRegionActive());
+                                pLast->setClipPolyPolygon(pTip->getClipPolyPolygon());
+                                pLast->setClipPolyPolygonActive(pTip->getClipPolyPolygonActive());
                             }
                             if(!(nPushFlags & PUSH_RASTEROP       ))
                             {
@@ -336,11 +344,11 @@ namespace
                             }
                         }
                     }
-
-                    // execute the pop
-                    delete maPropertyHolders.back();
-                    maPropertyHolders.pop_back();
                 }
+
+                // execute the pop
+                delete maPropertyHolders.back();
+                maPropertyHolders.pop_back();
             }
         }
 
@@ -465,25 +473,18 @@ namespace
             // the buffer to not delete them in the destructor.
             aTargets.clear();
 
-            if(xRetval.hasElements() && rPropertyHolder.getRegionActive())
+            if(xRetval.hasElements() && rPropertyHolder.getClipPolyPolygonActive())
             {
-                const Region& rRegion = rPropertyHolder.getRegion();
+                const basegfx::B2DPolyPolygon& rClipPolyPolygon = rPropertyHolder.getClipPolyPolygon();
 
-                if(!rRegion.IsEmpty())
+                if(rClipPolyPolygon.count())
                 {
-                    basegfx::B2DPolyPolygon aClipPolyPolygon(getB2DPolyPolygonFromRegion(rRegion));
-
-                    if(aClipPolyPolygon.count())
-                    {
-                        aClipPolyPolygon.transform(rPropertyHolder.getTransformation());
-
-                        const drawinglayer::primitive2d::Primitive2DReference xMask(
-                            new drawinglayer::primitive2d::MaskPrimitive2D(
-                                aClipPolyPolygon,
-                                xRetval));
-                        
-                        xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xMask, 1);
-                    }
+                    const drawinglayer::primitive2d::Primitive2DReference xMask(
+                        new drawinglayer::primitive2d::MaskPrimitive2D(
+                            rClipPolyPolygon,
+                            xRetval));
+                    
+                    xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xMask, 1);
                 }
             }
 
@@ -943,14 +944,17 @@ namespace
             default : // case HATCH_SINGLE : 
             {
                 aHatchStyle = drawinglayer::attribute::HATCHSTYLE_SINGLE; 
+                break;
             }
             case HATCH_DOUBLE : 
             {
                 aHatchStyle = drawinglayer::attribute::HATCHSTYLE_DOUBLE; 
+                break;
             }
             case HATCH_TRIPLE :
             {
                 aHatchStyle = drawinglayer::attribute::HATCHSTYLE_TRIPLE;
+                break;
             }
         }
         
@@ -969,53 +973,56 @@ namespace
         a new target for embracing new geometry to the current region
      */
     void HandleNewClipRegion(
-        const Region* pRegion,
+        const basegfx::B2DPolyPolygon& rClipPolyPolygon,
         TargetHolders& rTargetHolders,
         PropertyHolders& rPropertyHolders)
     {
-        const bool bNewActive(pRegion && !pRegion->IsEmpty());
+        const bool bNewActive(rClipPolyPolygon.count());
 
-        // #i108636# The handlig of new ClipRegions was not done as good as possible
-        // in the first version of this interpreter; e.g. when a ClipRegion was set
+        // #i108636# The handlig of new ClipPolyPolygons was not done as good as possible
+        // in the first version of this interpreter; e.g. when a ClipPolyPolygon was set
         // initially and then using a lot of push/pop actions, the pop always leads
-        // to setting a 'new' ClipRegion which indeed is the return to the ClipRegion
+        // to setting a 'new' ClipPolyPolygon which indeed is the return to the ClipPolyPolygon
         // of the properties next on the stack.
-        // This ClipRegion is identical to the current one, so there is no need to
+        //
+        // This ClipPolyPolygon is identical to the current one, so there is no need to
         // create a MaskPrimitive2D containing the up-to-now created primitives, but
         // this was done before. While this does not lead to wrong primitive 
         // representations of the metafile data, it creates unneccesarily expensive
-        // representations. Just detecting when no really 'new' ClipRegion gets set
+        // representations. Just detecting when no really 'new' ClipPolyPolygon gets set
         // solves the problem.
 
-        if(!rPropertyHolders.Current().getRegionActive() && !bNewActive)
+        if(!rPropertyHolders.Current().getClipPolyPolygonActive() && !bNewActive)
         {
-            // no active region exchanged by no new one, done
+            // no active ClipPolyPolygon exchanged by no new one, done
             return;
         }
 
-        if(rPropertyHolders.Current().getRegionActive() && bNewActive)
+        if(rPropertyHolders.Current().getClipPolyPolygonActive() && bNewActive)
         {
-            // active region and new active region
-            if(rPropertyHolders.Current().getRegion() == *pRegion)
+            // active ClipPolyPolygon and new active ClipPolyPolygon
+            if(rPropertyHolders.Current().getClipPolyPolygon() == rClipPolyPolygon)
             {
-                // new region is the same as the old region, done
+                // new is the same as old, done
                 return;
             }
         }
 
-        // Here the old region and the new one are definitively different, maybe
+        // Here the old and the new are definitively different, maybe
         // old one and/or new one is not active.
 
-        // Handle deletion of old region.The process evtl. created primitives which 
-        // belong to this active region. These need to be embedded to a
+        // Handle deletion of old ClipPolyPolygon. The process evtl. created primitives which 
+        // belong to this active ClipPolyPolygon. These need to be embedded to a
         // MaskPrimitive2D accordingly.
-        if(rPropertyHolders.Current().getRegionActive() && rTargetHolders.size() > 1)
+        if(rPropertyHolders.Current().getClipPolyPolygonActive() && rTargetHolders.size() > 1)
         {
             drawinglayer::primitive2d::Primitive2DSequence aSubContent;
 
-            if(!rPropertyHolders.Current().getRegion().IsEmpty() && rTargetHolders.Current().size())
+            if(rPropertyHolders.Current().getClipPolyPolygon().count()
+                && rTargetHolders.Current().size())
             {
-                aSubContent = rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current());
+                aSubContent = rTargetHolders.Current().getPrimitive2DSequence(
+                    rPropertyHolders.Current());
             }
 
             rTargetHolders.Pop();
@@ -1030,11 +1037,11 @@ namespace
 
         // apply new settings to current properties by setting
         // the new region now
-        rPropertyHolders.Current().setRegionActive(bNewActive);
+        rPropertyHolders.Current().setClipPolyPolygonActive(bNewActive);
 
         if(bNewActive)
         {
-            rPropertyHolders.Current().setRegion(*pRegion);
+            rPropertyHolders.Current().setClipPolyPolygon(rClipPolyPolygon);
 
             // prepare new content holder for new active region
             rTargetHolders.Push();
@@ -2134,8 +2141,11 @@ namespace
                             drawinglayer::primitive2d::Primitive2DSequence xSubContent;
                             {
                                 rTargetHolders.Push();
+                                // #i# for sub-Mteafile contents, do start with new, default render state
+                                rPropertyHolders.PushDefault();
                                 interpretMetafile(aGDIMetaFile, rTargetHolders, rPropertyHolders, rViewInformation);
                                 xSubContent = rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current());
+                                rPropertyHolders.Pop();
                                 rTargetHolders.Pop();
                             }
 
@@ -2411,13 +2421,18 @@ namespace
 
                     if(pA->IsClipping())
                     {
-                        // new clipping
-                        HandleNewClipRegion(&pA->GetRegion(), rTargetHolders, rPropertyHolders);
+                        // new clipping. Get PolyPolygon and transform with current transformation
+                        basegfx::B2DPolyPolygon aNewClipPolyPolygon(getB2DPolyPolygonFromRegion(pA->GetRegion()));
+                        
+                        aNewClipPolyPolygon.transform(rPropertyHolders.Current().getTransformation());
+                        HandleNewClipRegion(aNewClipPolyPolygon, rTargetHolders, rPropertyHolders);
                     }
                     else
                     {
                         // end clipping
-                        HandleNewClipRegion(0, rTargetHolders, rPropertyHolders);
+                        const basegfx::B2DPolyPolygon aEmptyPolyPolygon;
+                        
+                        HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders);
                     }
 
                     break;
@@ -2431,49 +2446,60 @@ namespace
                     if(rRectangle.IsEmpty())
                     {
                         // intersect with empty rectangle will always give empty
-                        // region; start new clipping with empty region
-                        const Region aNewRegion;
-                        HandleNewClipRegion(&aNewRegion, rTargetHolders, rPropertyHolders);
+                        // ClipPolyPolygon; start new clipping with empty PolyPolygon
+                        const basegfx::B2DPolyPolygon aEmptyPolyPolygon;
+                        
+                        HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders);
                     }
                     else
                     {
-                        if(rPropertyHolders.Current().getRegionActive())
+                        // create transformed ClipRange
+                        basegfx::B2DRange aClipRange(
+                            rRectangle.Left(), rRectangle.Top(),
+                            rRectangle.Right(), rRectangle.Bottom());
+
+                        aClipRange.transform(rPropertyHolders.Current().getTransformation());
+
+                        if(rPropertyHolders.Current().getClipPolyPolygonActive())
                         {
-                            if(rPropertyHolders.Current().getRegion().IsEmpty())
+                            if(0 == rPropertyHolders.Current().getClipPolyPolygon().count())
                             {
-                                // nothing to do, empty active clip region will stay
+                                // nothing to do, empty active clipPolyPolygon will stay
                                 // empty when intersecting
                             }
                             else
                             {
-                                // AND existing region and new rectangle
+                                // AND existing region and new ClipRange
                                 const basegfx::B2DPolyPolygon aOriginalPolyPolygon(
-                                    getB2DPolyPolygonFromRegion(rPropertyHolders.Current().getRegion()));
+                                    rPropertyHolders.Current().getClipPolyPolygon());
                                 basegfx::B2DPolyPolygon aClippedPolyPolygon;
 
                                 if(aOriginalPolyPolygon.count())
                                 {
-                                    const basegfx::B2DRange aIntersectRange(
-                                        rRectangle.Left(), rRectangle.Top(), 
-                                        rRectangle.Right(), rRectangle.Bottom());
-
                                     aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnRange(
-                                        aOriginalPolyPolygon, aIntersectRange, true, false);
+                                        aOriginalPolyPolygon, 
+                                        aClipRange, 
+                                        true, 
+                                        false);
                                 }
                                 
                                 if(aClippedPolyPolygon != aOriginalPolyPolygon)
                                 {
                                     // start new clipping with intersected region
-                                    const Region aNewRegion(aClippedPolyPolygon);
-                                    HandleNewClipRegion(&aNewRegion, rTargetHolders, rPropertyHolders);
+                                    HandleNewClipRegion(
+                                        aClippedPolyPolygon, 
+                                        rTargetHolders, 
+                                        rPropertyHolders);
                                 }
                             }
                         }
                         else
                         {
-                            // start new clipping with rectangle
-                            const Region aNewRegion(rRectangle);
-                            HandleNewClipRegion(&aNewRegion, rTargetHolders, rPropertyHolders);
+                            // start new clipping with ClipRange
+                            const basegfx::B2DPolyPolygon aNewClipPolyPolygon(
+                                basegfx::tools::createPolygonFromRect(aClipRange));
+
+                            HandleNewClipRegion(aNewClipPolyPolygon, rTargetHolders, rPropertyHolders);
                         }
                     }
 
@@ -2488,50 +2514,48 @@ namespace
                     if(rNewRegion.IsEmpty())
                     {
                         // intersect with empty region will always give empty
-                        // region; start new clipping with empty region
-                        const Region aNewRegion;
-                        HandleNewClipRegion(&aNewRegion, rTargetHolders, rPropertyHolders);
+                        // region; start new clipping with empty PolyPolygon
+                        const basegfx::B2DPolyPolygon aEmptyPolyPolygon;
+                        
+                        HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders);
                     }
                     else
                     {
-                        if(rPropertyHolders.Current().getRegionActive())
+                        // get new ClipPolyPolygon, transform it with current transformation
+                        basegfx::B2DPolyPolygon aNewClipPolyPolygon(getB2DPolyPolygonFromRegion(rNewRegion));
+                        aNewClipPolyPolygon.transform(rPropertyHolders.Current().getTransformation());
+
+                        if(rPropertyHolders.Current().getClipPolyPolygonActive())
                         {
-                            if(rPropertyHolders.Current().getRegion().IsEmpty())
+                            if(0 == rPropertyHolders.Current().getClipPolyPolygon().count())
                             {
-                                // nothing to do, empty active clip region will stay empty
+                                // nothing to do, empty active clipPolyPolygon will stay empty
                                 // when intersecting with any region
                             }
                             else
                             {
                                 // AND existing and new region
                                 const basegfx::B2DPolyPolygon aOriginalPolyPolygon(
-                                    getB2DPolyPolygonFromRegion(rPropertyHolders.Current().getRegion()));
+                                    rPropertyHolders.Current().getClipPolyPolygon());
                                 basegfx::B2DPolyPolygon aClippedPolyPolygon;
 
                                 if(aOriginalPolyPolygon.count())
                                 {
-                                    const basegfx::B2DPolyPolygon aClipPolyPolygon(
-                                        getB2DPolyPolygonFromRegion(rNewRegion));
-
-                                    if(aClipPolyPolygon.count())
-                                    {
-                                        aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon(
-                                            aOriginalPolyPolygon, aClipPolyPolygon, true, false);
-                                    }
+                                    aClippedPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon(
+                                        aOriginalPolyPolygon, aNewClipPolyPolygon, true, false);
                                 }
                                 
                                 if(aClippedPolyPolygon != aOriginalPolyPolygon)
                                 {
-                                    // start new clipping with intersected region
-                                    const Region aNewRegion(aClippedPolyPolygon);
-                                    HandleNewClipRegion(&aNewRegion, rTargetHolders, rPropertyHolders);
+                                    // start new clipping with intersected ClipPolyPolygon
+                                    HandleNewClipRegion(aClippedPolyPolygon, rTargetHolders, rPropertyHolders);
                                 }
                             }
                         }
                         else
                         {
-                            // start new clipping with new region
-                            HandleNewClipRegion(&rNewRegion, rTargetHolders, rPropertyHolders);
+                            // start new clipping with new ClipPolyPolygon
+                            HandleNewClipRegion(aNewClipPolyPolygon, rTargetHolders, rPropertyHolders);
                         }
                     }
 
@@ -2542,24 +2566,31 @@ namespace
                     /** CHECKED, WORKS WELL */
                     const MetaMoveClipRegionAction* pA = (const MetaMoveClipRegionAction*)pAction;
 
-                    if(rPropertyHolders.Current().getRegionActive())
+                    if(rPropertyHolders.Current().getClipPolyPolygonActive())
                     {
-                        if(rPropertyHolders.Current().getRegion().IsEmpty())
+                        if(0 == rPropertyHolders.Current().getClipPolyPolygon().count())
                         {
                             // nothing to do
                         }
                         else
                         {
-                            // move using old interface
-                            Region aRegion(rPropertyHolders.Current().getRegion());
-
                             const sal_Int32 nHor(pA->GetHorzMove());
                             const sal_Int32 nVer(pA->GetVertMove());
 
                             if(0 != nHor || 0 != nVer)
                             {
-                                aRegion.Move(nHor, nVer);
-                                HandleNewClipRegion(&aRegion, rTargetHolders, rPropertyHolders);
+                                // prepare translation, add current transformation
+                                basegfx::B2DVector aVector(pA->GetHorzMove(), pA->GetVertMove());
+                                aVector *= rPropertyHolders.Current().getTransformation();
+                                basegfx::B2DHomMatrix aTransform(
+                                    basegfx::tools::createTranslateB2DHomMatrix(aVector));
+
+                                // transform existing region
+                                basegfx::B2DPolyPolygon aClipPolyPolygon(
+                                    rPropertyHolders.Current().getClipPolyPolygon());
+
+                                aClipPolyPolygon.transform(aTransform);
+                                HandleNewClipRegion(aClipPolyPolygon, rTargetHolders, rPropertyHolders);
                             }
                         }
                     }
@@ -2764,10 +2795,12 @@ namespace
                     const bool bRegionMayChange(rPropertyHolders.Current().getPushFlags() & PUSH_CLIPREGION);
                     const bool bRasterOpMayChange(rPropertyHolders.Current().getPushFlags() & PUSH_RASTEROP);
                     
-                    if(bRegionMayChange && rPropertyHolders.Current().getRegionActive())
+                    if(bRegionMayChange && rPropertyHolders.Current().getClipPolyPolygonActive())
                     {
                         // end evtl. clipping
-                        HandleNewClipRegion(0, rTargetHolders, rPropertyHolders);
+                        const basegfx::B2DPolyPolygon aEmptyPolyPolygon;
+
+                        HandleNewClipRegion(aEmptyPolyPolygon, rTargetHolders, rPropertyHolders);
                     }
                     
                     if(bRasterOpMayChange && rPropertyHolders.Current().isRasterOpActive())
@@ -2784,10 +2817,11 @@ namespace
                         HandleNewRasterOp(rPropertyHolders.Current().getRasterOp(), rTargetHolders, rPropertyHolders);
                     }
 
-                    if(bRegionMayChange && rPropertyHolders.Current().getRegionActive())
+                    if(bRegionMayChange && rPropertyHolders.Current().getClipPolyPolygonActive())
                     {
                         // start evtl. clipping
-                        HandleNewClipRegion(&rPropertyHolders.Current().getRegion(), rTargetHolders, rPropertyHolders);
+                        HandleNewClipRegion(
+                            rPropertyHolders.Current().getClipPolyPolygon(), rTargetHolders, rPropertyHolders);
                     }
 
                     break;
@@ -2935,8 +2969,11 @@ namespace
                             drawinglayer::primitive2d::Primitive2DSequence xSubContent;
                             {
                                 rTargetHolders.Push();
+                                // #i# for sub-Mteafile contents, do start with new, default render state
+                                rPropertyHolders.PushDefault();
                                 interpretMetafile(rContent, rTargetHolders, rPropertyHolders, rViewInformation);
                                 xSubContent = rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current());
+                                rPropertyHolders.Pop();
                                 rTargetHolders.Pop();
                             }
 
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6498ee34f1..d2d68359cb 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1225,17 +1225,16 @@ namespace drawinglayer
                 {
                     // need to handle PolyPolygonHatchPrimitive2D here to support XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END
                     SvtGraphicFill* pSvtGraphicFill = 0;
+                    const primitive2d::PolyPolygonHatchPrimitive2D& rHatchCandidate = static_cast< const primitive2d::PolyPolygonHatchPrimitive2D& >(rCandidate);
+                    const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
+                    basegfx::B2DPolyPolygon aLocalPolyPolygon(rHatchCandidate.getB2DPolyPolygon());
+                    aLocalPolyPolygon.transform(maCurrentTransformation);
 
                     if(!mnSvtGraphicFillCount)
                     {
-                        const primitive2d::PolyPolygonHatchPrimitive2D& rHatchCandidate = static_cast< const primitive2d::PolyPolygonHatchPrimitive2D& >(rCandidate);
-                        basegfx::B2DPolyPolygon aLocalPolyPolygon(rHatchCandidate.getB2DPolyPolygon());
-                        aLocalPolyPolygon.transform(maCurrentTransformation);
-
                         if(aLocalPolyPolygon.count())
                         {
                             // re-create a VCL hatch as base data
-                            const attribute::FillHatchAttribute& rFillHatchAttribute = rHatchCandidate.getFillHatch();
                             SvtGraphicFill::HatchType eHatch(SvtGraphicFill::hatchSingle);
 
                             switch(rFillHatchAttribute.getStyle())
@@ -1289,9 +1288,22 @@ namespace drawinglayer
 
                     // Do use decomposition; encapsulate with SvtGraphicFill
                     impStartSvtGraphicFill(pSvtGraphicFill);
-                    process(rCandidate.get2DDecomposition(getViewInformation2D()));
+
+                    // #i111954# do NOT use decomposition, but use direct VCL-command
+                    // process(rCandidate.get2DDecomposition(getViewInformation2D()));
+                    const PolyPolygon aToolsPolyPolygon(aLocalPolyPolygon);
+                    const HatchStyle aHatchStyle(
+                        attribute::HATCHSTYLE_SINGLE == rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
+                        attribute::HATCHSTYLE_DOUBLE == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
+                        HATCH_TRIPLE);
+
+                    mpOutputDevice->DrawHatch(aToolsPolyPolygon, 
+                        Hatch(aHatchStyle, 
+                            Color(rFillHatchAttribute.getColor()),
+                            basegfx::fround(rFillHatchAttribute.getDistance()),
+                            basegfx::fround(rFillHatchAttribute.getAngle() / F_PI1800)));
+
                     impEndSvtGraphicFill(pSvtGraphicFill);
-                    
                     break;
                 }
                 case PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D :
@@ -1429,7 +1441,11 @@ namespace drawinglayer
                             {
                                 // there is already a clip polygon set; build clipped union of 
                                 // current mask polygon and new one
-                                maClipPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon(aMask, maClipPolyPolygon, false, false);
+                                maClipPolyPolygon = basegfx::tools::clipPolyPolygonOnPolyPolygon(
+                                    aMask, 
+                                    maClipPolyPolygon, 
+                                    true, // #i106516# we want the inside of aMask, not the outside
+                                    false);
                             }
                             else
                             {
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 19f415faba..c21f3bc87a 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -284,20 +284,37 @@ namespace drawinglayer
                             if(bAllowUsingDrawTransparent && 1 == rContent.getLength())
                             {
                                 const primitive2d::Primitive2DReference xReference(rContent[0]);
-                                const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = dynamic_cast< const primitive2d::PolyPolygonColorPrimitive2D* >(xReference.get());
+                                const primitive2d::BasePrimitive2D* pBasePrimitive = dynamic_cast< const primitive2d::BasePrimitive2D* >(xReference.get());
 
-                                if(pPoPoColor && PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D == pPoPoColor->getPrimitive2DID())
+                                if(pBasePrimitive)
                                 {
-                                    // single transparent PolyPolygon identified, use directly
-                                    const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor()));
-                                    mpOutputDevice->SetFillColor(Color(aPolygonColor));
-                                    mpOutputDevice->SetLineColor();
-                                    
-                                    basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon());
-                                    aLocalPolyPolygon.transform(maCurrentTransformation);
-                                    
-                                    mpOutputDevice->DrawTransparent(aLocalPolyPolygon, rUniTransparenceCandidate.getTransparence());
-                                    bDrawTransparentUsed = true;
+                                    switch(pBasePrimitive->getPrimitive2DID())
+                                    {
+                                        case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D:
+                                        {
+                                            // single transparent PolyPolygon identified, use directly
+                                            const primitive2d::PolyPolygonColorPrimitive2D* pPoPoColor = static_cast< const primitive2d::PolyPolygonColorPrimitive2D* >(pBasePrimitive);
+                                            OSL_ENSURE(pPoPoColor, "OOps, PrimitiveID and PrimitiveType do not match (!)");
+                                            const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(pPoPoColor->getBColor()));
+                                            mpOutputDevice->SetFillColor(Color(aPolygonColor));
+                                            mpOutputDevice->SetLineColor();
+                                            
+                                            basegfx::B2DPolyPolygon aLocalPolyPolygon(pPoPoColor->getB2DPolyPolygon());
+                                            aLocalPolyPolygon.transform(maCurrentTransformation);
+                                            
+                                            mpOutputDevice->DrawTransparent(aLocalPolyPolygon, rUniTransparenceCandidate.getTransparence());
+                                            bDrawTransparentUsed = true;
+                                            break;
+                                        }
+                                        // #i# need to wait for #i101378# which is in CWS vcl112 to directly paint transparent hairlines
+                                        //case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D:
+                                        //{
+                                        //	// single transparent PolygonHairlinePrimitive2D identified, use directly
+                                        //	const primitive2d::PolygonHairlinePrimitive2D* pPoHair = static_cast< const primitive2d::PolygonHairlinePrimitive2D* >(pBasePrimitive);
+                                        //	OSL_ENSURE(pPoHair, "OOps, PrimitiveID and PrimitiveType do not match (!)");
+                                        //	break;
+                                        //}
+                                    }
                                 }
                             }
 
@@ -469,19 +486,29 @@ namespace drawinglayer
                         // This is wrong in principle, but looks nicer. This could also be done here directly
                         // without VCL usage if needed
                         const primitive2d::FillHatchPrimitive2D& rFillHatchPrimitive = static_cast< const primitive2d::FillHatchPrimitive2D& >(rCandidate);
+                        const attribute::FillHatchAttribute& rFillHatchAttributes = rFillHatchPrimitive.getFillHatch();
                         
                         // create hatch polygon in range size and discrete coordinates
                         basegfx::B2DRange aHatchRange(rFillHatchPrimitive.getObjectRange());
                         aHatchRange.transform(maCurrentTransformation);
                         const basegfx::B2DPolygon aHatchPolygon(basegfx::tools::createPolygonFromRect(aHatchRange));
 
+                        if(rFillHatchAttributes.isFillBackground())
+                        {
+                            // #i111846# background fill is active; draw fill polygon
+                            const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rFillHatchPrimitive.getBColor()));
+                            
+                            mpOutputDevice->SetFillColor(Color(aPolygonColor));
+                            mpOutputDevice->SetLineColor();
+                            mpOutputDevice->DrawPolygon(aHatchPolygon);
+                        }
+
                         // set hatch line color
                         const basegfx::BColor aHatchColor(maBColorModifierStack.getModifiedColor(rFillHatchPrimitive.getBColor()));
                         mpOutputDevice->SetFillColor();
                         mpOutputDevice->SetLineColor(Color(aHatchColor));
 
                         // get hatch style
-                        const attribute::FillHatchAttribute& rFillHatchAttributes = rFillHatchPrimitive.getFillHatch();
                         HatchStyle eHatchStyle(HATCH_SINGLE);
 
                         switch(rFillHatchAttributes.getStyle())
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 83b2d8e8ac..7b8848c61c 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -51,6 +51,25 @@ namespace drawinglayer
 {
     namespace processor3d
     {
+        /// helper to convert from BasePrimitive2DVector to primitive2d::Primitive2DSequence
+        const primitive2d::Primitive2DSequence Shadow3DExtractingProcessor::getPrimitive2DSequenceFromBasePrimitive2DVector(
+            const BasePrimitive2DVector& rVector) const
+        {
+            const sal_uInt32 nCount(rVector.size());
+            primitive2d::Primitive2DSequence aRetval(nCount);
+
+            for(sal_uInt32 a(0); a < nCount; a++)
+            {
+                aRetval[a] = rVector[a];
+            }
+
+            // all entries taken over; no need to delete entries, just reset to
+            // mark as empty
+            const_cast< BasePrimitive2DVector& >(rVector).clear();
+
+            return aRetval;
+        }
+
         // as tooling, the process() implementation takes over API handling and calls this
         // virtual render method when the primitive implementation is BasePrimitive3D-based.
         void Shadow3DExtractingProcessor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate)
@@ -64,8 +83,8 @@ namespace drawinglayer
                     const primitive3d::ShadowPrimitive3D& rPrimitive = static_cast< const primitive3d::ShadowPrimitive3D& >(rCandidate);
 
                     // set new target
-                    primitive2d::Primitive2DSequence aNewSubList;
-                    primitive2d::Primitive2DSequence* pLastTargetSequence = mpPrimitive2DSequence;
+                    BasePrimitive2DVector aNewSubList;
+                    BasePrimitive2DVector* pLastTargetSequence = mpPrimitive2DSequence;
                     mpPrimitive2DSequence = &aNewSubList;
                     
                     // activate convert
@@ -84,21 +103,26 @@ namespace drawinglayer
                     mbConvert = bLastConvert;
                     mpPrimitive2DSequence = pLastTargetSequence;
 
-                    // create 2d shadow primitive with result
-                    const primitive2d::Primitive2DReference xRef(new primitive2d::ShadowPrimitive2D(rPrimitive.getShadowTransform(), rPrimitive.getShadowColor(), aNewSubList));
+                    // create 2d shadow primitive with result. This also fetches all entries
+                    // from aNewSubList, so there is no need to delete them
+                    primitive2d::BasePrimitive2D* pNew = new primitive2d::ShadowPrimitive2D(
+                        rPrimitive.getShadowTransform(), 
+                        rPrimitive.getShadowColor(), 
+                        getPrimitive2DSequenceFromBasePrimitive2DVector(aNewSubList));
 
                     if(basegfx::fTools::more(rPrimitive.getShadowTransparence(), 0.0))
                     {
                         // create simpleTransparencePrimitive, add created primitives
-                        const primitive2d::Primitive2DSequence aNewTransPrimitiveVector(&xRef, 1L);
-                        const primitive2d::Primitive2DReference xRef2(new primitive2d::UnifiedTransparencePrimitive2D(aNewTransPrimitiveVector, rPrimitive.getShadowTransparence()));
-                        primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(*mpPrimitive2DSequence, xRef2);
-                    }
-                    else
-                    {
-                        // add directly
-                        primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(*mpPrimitive2DSequence, xRef);
+                        const primitive2d::Primitive2DReference xRef(pNew);
+                        const primitive2d::Primitive2DSequence aNewTransPrimitiveVector(&xRef, 1);
+                        
+                        pNew = new primitive2d::UnifiedTransparencePrimitive2D(
+                            aNewTransPrimitiveVector, 
+                            rPrimitive.getShadowTransparence());
                     }
+
+                    mpPrimitive2DSequence->push_back(pNew);
+
                     break;
                 }
                 case PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D :
@@ -161,8 +185,10 @@ namespace drawinglayer
                         if(a2DHairline.count())
                         {
                             a2DHairline.transform(getObjectTransformation());
-                            const primitive2d::Primitive2DReference xRef(new primitive2d::PolygonHairlinePrimitive2D(a2DHairline, maPrimitiveColor));
-                            primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(*mpPrimitive2DSequence, xRef);
+                            mpPrimitive2DSequence->push_back(
+                                new primitive2d::PolygonHairlinePrimitive2D(
+                                    a2DHairline, 
+                                    maPrimitiveColor));
                         }
                     }
                     break;
@@ -190,8 +216,10 @@ namespace drawinglayer
                         if(a2DFill.count())
                         {
                             a2DFill.transform(getObjectTransformation());
-                            const primitive2d::Primitive2DReference xRef(new primitive2d::PolyPolygonColorPrimitive2D(a2DFill, maPrimitiveColor));
-                            primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(*mpPrimitive2DSequence, xRef);
+                            mpPrimitive2DSequence->push_back(
+                                new primitive2d::PolyPolygonColorPrimitive2D(
+                                    a2DFill, 
+                                    maPrimitiveColor));
                         }
                     }
                     break;
@@ -251,6 +279,16 @@ namespace drawinglayer
             }
         }
 
+        Shadow3DExtractingProcessor::~Shadow3DExtractingProcessor()
+        {
+            OSL_ENSURE(0 == maPrimitive2DSequence.size(), 
+                "OOps, someone used Shadow3DExtractingProcessor, but did not fetch the results (!)");
+            for(sal_uInt32 a(0); a < maPrimitive2DSequence.size(); a++)
+            {
+                delete maPrimitive2DSequence[a];
+            }
+        }
+
         basegfx::B2DPolygon Shadow3DExtractingProcessor::impDoShadowProjection(const basegfx::B3DPolygon& rSource)
         {
             basegfx::B2DPolygon aRetval;
@@ -291,6 +329,12 @@ namespace drawinglayer
 
             return aRetval;
         }
+
+        const primitive2d::Primitive2DSequence Shadow3DExtractingProcessor::getPrimitive2DSequence() const 
+        { 
+            return getPrimitive2DSequenceFromBasePrimitive2DVector(maPrimitive2DSequence);
+        }
+
     } // end of namespace processor3d
 } // end of namespace drawinglayer
 
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 679e918bda..c051942d64 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -487,7 +487,7 @@ private:
     boost::shared_ptr< drawinglayer::texture::GeoTexSvx >     mpTransparenceGeoTexSvx;
     drawinglayer::attribute::MaterialAttribute3D              maMaterial;
     basegfx::B3DPolyPolygon                                   maPolyPolygon;
-    sal_uInt32                                                mfCenterZ;
+    double                                                    mfCenterZ;
 
     // bitfield
     bool                                                      mbModulate : 1;
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index bd8683429f..3ba1e820aa 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -232,6 +232,7 @@ public:
     ESelection      WordRight( const ESelection& rSelection, USHORT nWordType  ) const;
     ESelection      CursorLeft( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const;
     ESelection      CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const;
+    ESelection      SelectSentence( const ESelection& rCurSel ) const;
 
     void			Clear();
     void			SetText( const String& rStr );
@@ -396,7 +397,7 @@ public:
     // put spell position to start of current sentence
     void            PutSpellingToSentenceStart( EditView& rEditView );
     //applies a changed sentence
-    void            ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking );
+    void            ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck );
     //deinitialize sentence spelling
     void            EndSpelling();
 
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 88dad95d99..761f2821af 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -28,6 +28,8 @@
 #ifndef _MyEDITVIEW_HXX
 #define _MyEDITVIEW_HXX
 
+#include <com/sun/star/i18n/WordType.hpp>
+
 #include <rsc/rscsfx.hxx>
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
@@ -111,7 +113,7 @@ public:
     BOOL			HasSelection() const;
     ESelection		GetSelection() const;
     void			SetSelection( const ESelection& rNewSel );
-    BOOL			SelectCurrentWord();
+    BOOL            SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
 
     void			IndentBlock();
     void			UnindentBlock();
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 8efc42288d..5e1e62aded 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -389,6 +389,12 @@ public:
      Selection	GetSurroundingTextSelection() const;
 };
 
+
+// some thesaurus functionality to avoid code duplication in different projects...
+bool EDITENG_DLLPUBLIC  GetStatusValueForThesaurusFromContext( String &rStatusVal, LanguageType &rLang, const EditView &rEditView );
+void EDITENG_DLLPUBLIC  ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText );
+
+
 //#if 0 // _SOLAR__PRIVATE
 DECLARE_LIST(ViewList,OutlinerView*)
 //#else
@@ -1017,7 +1023,7 @@ public:
     // put spell position to start of current sentence
     void            PutSpellingToSentenceStart( EditView& rEditView );
     //applies a changed sentence
-    void            ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking );
+    void            ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck );
     void            EndSpelling();
 
     /** sets a link that is called at the beginning of a drag operation at an edit view */
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index 1be54f909f..8d2926adcf 100644
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -56,6 +56,7 @@ class EDITENG_DLLPUBLIC SvxSpellWrapper {
 private:
     friend class SvxSpellCheckDialog;
     friend class SvxHyphenWordDialog;
+    friend class SvxHyphenWordDialog_Impl;
 
     Window*		pWin;
     ::com::sun::star::uno::Reference<
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index fd06f8b68c..2a6e5f32a5 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -813,6 +813,14 @@ ESelection EditEngine::CursorRight( const ESelection& rSelection, USHORT nCharac
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
+ESelection EditEngine::SelectSentence( const ESelection& rCurSel ) const
+{
+    EditEngine* pE = (EditEngine*)this;
+    EditSelection aCurSel( pE->pImpEditEngine->CreateSel( rCurSel ) );
+    EditSelection aSentenceSel( pE->pImpEditEngine->SelectSentence( aCurSel ) );
+    return pE->pImpEditEngine->CreateESel( aSentenceSel );
+}
+
 sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView )
 {
     DBG_CHKTHIS( EditEngine, 0 );
@@ -2198,7 +2206,7 @@ void EditEngine::EndSpelling()
 bool EditEngine::SpellSentence(EditView& rView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking )
 {
     DBG_CHKTHIS( EditEngine, 0 );
-    return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking  );
+    return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking );
 }
 /*-- 08.09.2008 11:38:32---------------------------------------------------
 
@@ -2211,10 +2219,10 @@ void EditEngine::PutSpellingToSentenceStart( EditView& rEditView )
 /*-- 13.10.2003 16:43:27---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking )
+void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck )
 {
     DBG_CHKTHIS( EditEngine, 0 );
-    pImpEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bIsGrammarChecking  );
+    pImpEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck  );
 }
 
 sal_Bool EditEngine::HasConvertibleTextPortion( LanguageType nLang )
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index d9f60c5f64..c892117d0b 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -40,6 +40,7 @@
 #include <svl/languageoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
+#include <svtools/filter.hxx>
 
 #include <svl/srchitem.hxx>
 
@@ -62,6 +63,8 @@
 #include <editeng/acorrcfg.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/fontitem.hxx>
+#include <unotools/lingucfg.hxx>
+#include <osl/file.hxx>
 
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/beans/PropertyValues.hdl>
@@ -71,6 +74,8 @@
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
 
+#include <com/sun/star/lang/XServiceInfo.hpp>
+
 using ::rtl::OUString;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -1004,6 +1009,26 @@ sal_Bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMa
     return pImpEditView->IsWrongSpelledWord( aPaM , bMarkIfWrong );
 }
 
+
+static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
+{
+    Image aRes;
+    OUString aTmp;
+    osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
+//    ::rtl::OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() );
+#if defined(WNT)
+//    aTmp = lcl_Win_GetShortPathName( aTmp );
+#endif
+    Graphic aGraphic;
+    const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
+    if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
+    {
+        aRes = Image( aGraphic.GetBitmapEx() );
+    }
+    return aRes;
+}
+
+
 void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
 {
 #ifndef SVX_LIGHT
@@ -1114,25 +1139,54 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         else
             aPopupMenu.RemoveItem( MN_AUTOCORR );	// Loeschen?
 
-        Reference< XDictionaryList >  xDicList( SvxGetDictionaryList() );
+        SvtLinguConfig aCfg;
+        const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
+        Reference< XDictionaryList >  xDicList( SvxGetDictionaryList() );
         Sequence< Reference< XDictionary >  > aDics;
+        const Reference< XDictionary >  *pDic = NULL;
         if (xDicList.is())
-            aDics = xDicList->getDictionaries();
-        const Reference< XDictionary >  *pDic = aDics.getConstArray();
-        sal_uInt16 nLanguage = PIMPEE->GetLanguage( aPaM2 );
-        sal_uInt16 nDicCount = (USHORT)aDics.getLength();
-        for ( sal_uInt16 i = 0; i < nDicCount; i++ )
         {
-            Reference< XDictionary >  xDic( pDic[i], UNO_QUERY );
+            // add the default positive dictionary to dic-list (if not already done).
+            // This is to ensure that there is at least one dictionary to which
+            // words could be added.
+            uno::Reference< linguistic2::XDictionary >  xDic( SvxGetOrCreatePosDic( xDicList ) );
             if (xDic.is())
+                xDic->setActive( sal_True );
+            
+            aDics = xDicList->getDictionaries();
+            pDic  = aDics.getConstArray();
+            sal_uInt16 nCheckedLanguage = PIMPEE->GetLanguage( aPaM2 );
+            sal_uInt16 nDicCount = (USHORT)aDics.getLength();
+            for (sal_uInt16 i = 0; i < nDicCount; i++)
             {
-                sal_uInt16 nActLanguage = SvxLocaleToLanguage( xDic->getLocale() );
-                if( xDic->isActive() &&
-                    xDic->getDictionaryType() == DictionaryType_POSITIVE &&
-                    (nLanguage == nActLanguage || LANGUAGE_NONE == nActLanguage ) )
+                uno::Reference< linguistic2::XDictionary >  xDicTmp( pDic[i], uno::UNO_QUERY );
+                if (!xDicTmp.is() || SvxGetIgnoreAllList() == xDicTmp)
+                    continue;
+
+                uno::Reference< frame::XStorable > xStor( xDicTmp, uno::UNO_QUERY );
+                LanguageType nActLanguage = SvxLocaleToLanguage( xDicTmp->getLocale() );
+                if( xDicTmp->isActive()
+                    &&  xDicTmp->getDictionaryType() != linguistic2::DictionaryType_NEGATIVE
+                    && (nCheckedLanguage == nActLanguage || LANGUAGE_NONE == nActLanguage )
+                    && (!xStor.is() || !xStor->isReadonly()) )
                 {
-                    pInsertMenu->InsertItem( MN_DICTSTART + i, xDic->getName() );
+                    // the extra 1 is because of the (possible) external
+                    // linguistic entry above
+                    USHORT nPos = MN_DICTSTART + i;
+                    pInsertMenu->InsertItem( nPos, xDicTmp->getName() );
+
+                    uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY );
+                    if (xSvcInfo.is())
+                    {
+                        OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
+                                xSvcInfo->getImplementationName(), bHC) );
+                        if (aDictionaryImageUrl.getLength() > 0)
+                        {
+                            Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
+                            pInsertMenu->SetItemImage( nPos, aImage );
+                        }
+                    }
                 }
             }
         }
@@ -1256,13 +1310,13 @@ void EditView::SpellIgnoreWord()
     pImpEditView->SpellIgnoreOrAddWord( sal_False );
 }
 
-sal_Bool EditView::SelectCurrentWord()
+sal_Bool EditView::SelectCurrentWord( sal_Int16 nWordType )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     EditSelection aCurSel( pImpEditView->GetEditSelection() );
     pImpEditView->DrawSelection();
-    aCurSel = PIMPEE->SelectWord( aCurSel.Max() );
+    aCurSel = PIMPEE->SelectWord( aCurSel.Max(), nWordType );
     pImpEditView->SetEditSelection( aCurSel );
     pImpEditView->DrawSelection();
     ShowCursor( sal_True, sal_False );
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 5b760d8c46..0d91f179b7 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -208,6 +208,9 @@ void EditSpellWrapper::CheckSpellTo()
             pSpellInfo->aSpellTo.nIndex = aPaM.GetNode()->Len();
     }
 }
+
+//////////////////////////////////////////////////////////////////////
+
 SV_IMPL_VARARR( WrongRanges, WrongRange );
 
 WrongList::WrongList()
@@ -220,6 +223,14 @@ WrongList::~WrongList()
 {
 }
 
+void WrongList::MarkInvalid( USHORT nS, USHORT nE )
+{
+    if ( ( nInvalidStart == NOT_INVALID ) || ( nInvalidStart > nS ) )
+        nInvalidStart = nS;
+    if ( nInvalidEnd < nE )
+        nInvalidEnd = nE;
+}
+
 void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16 nNew, sal_Bool bPosIsSep )
 {
     if ( !IsInvalid() )
@@ -527,6 +538,7 @@ sal_Bool WrongList::DbgIsBuggy() const
 }
 #endif
 
+//////////////////////////////////////////////////////////////////////
 
 EdtAutoCorrDoc::EdtAutoCorrDoc( ImpEditEngine* pE, ContentNode* pN,
             sal_uInt16 nCrsr, xub_Unicode cIns )
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index a979b364c6..4873a16898 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -97,13 +97,7 @@ public:
 
     BOOL	IsInvalid() const 		{ return nInvalidStart != NOT_INVALID; }
     void 	SetValid() 				{ nInvalidStart = NOT_INVALID; nInvalidEnd = 0; }
-    void	MarkInvalid( USHORT nS, USHORT nE )
-            {
-                if ( ( nInvalidStart == NOT_INVALID ) || ( nInvalidStart > nS ) )
-                    nInvalidStart = nS;
-                if ( nInvalidEnd < nE )
-                    nInvalidEnd = nE;
-            }
+    void	MarkInvalid( USHORT nS, USHORT nE );
 
     USHORT			Count() const 				{ return WrongRanges::Count(); }
 
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 77316af584..dd38c4c16b 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1489,7 +1489,7 @@ void ImpEditView::HideDDCursor()
 
 void ImpEditView::ShowDDCursor( const Rectangle& rRect )
 {
-    if ( !pDragAndDropInfo->bVisCursor )
+    if ( pDragAndDropInfo && !pDragAndDropInfo->bVisCursor )
     {
         if ( pOutWin->GetCursor() )
             pOutWin->GetCursor()->Hide();
@@ -1544,6 +1544,8 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
 
     vos::OGuard aVclGuard( Application::GetSolarMutex() );
 
+    pDragAndDropInfo = NULL;
+
     Point aMousePosPixel( rDGE.DragOriginX, rDGE.DragOriginY );
 
     EditSelection aCopySel( GetEditSelection() );
@@ -1717,7 +1719,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
 
     DBG_ASSERT( pDragAndDropInfo, "Drop - No Drag&Drop info?!" );
 
-    if ( pDragAndDropInfo->bDragAccepted )
+    if ( pDragAndDropInfo && pDragAndDropInfo->bDragAccepted )
     {
         pEditEngine->GetBeginDropHdl().Call(GetEditViewPtr());
         BOOL bChanges = FALSE;
@@ -1817,7 +1819,7 @@ void ImpEditView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTarge
 
     HideDDCursor();
 
-    if ( !pDragAndDropInfo->bStarterOfDD )
+    if ( pDragAndDropInfo && !pDragAndDropInfo->bStarterOfDD )
     {
         delete pDragAndDropInfo;
         pDragAndDropInfo = NULL;
@@ -1837,7 +1839,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
     {
 //        sal_Int8 nSupportedActions = bReadOnly ? datatransfer::dnd::DNDConstants::ACTION_COPY : datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE;
 
-        if ( pDragAndDropInfo->bHasValidData /* && ( nSupportedActions & rDTDE.DropAction ) MT: Default = 0x80 ?! */ )
+        if ( pDragAndDropInfo && pDragAndDropInfo->bHasValidData /* && ( nSupportedActions & rDTDE.DropAction ) MT: Default = 0x80 ?! */ )
         {
             bAccept = sal_True;
 
@@ -1957,7 +1959,8 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
     if ( !bAccept )
     {
         HideDDCursor();
-        pDragAndDropInfo->bDragAccepted = FALSE;
+        if (pDragAndDropInfo)
+            pDragAndDropInfo->bDragAccepted = FALSE;
         rDTDE.Context->rejectDrag();
     }
 }
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 3d89cf9caa..9c425bc07c 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -164,6 +164,7 @@ struct SpellInfo
     EESpellState	eState;
     EPaM			aSpellStart;
     EPaM			aSpellTo;
+    EditPaM			aCurSentenceStart;
     sal_Bool		bSpellToEnd;
     sal_Bool		bMultipleDoc;
     ::svx::SpellPortions    aLastSpellPortions;
@@ -697,6 +698,8 @@ private:
      */
     void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const USHORT nIdx, const USHORT nLen) const;
 
+    SpellInfo *     CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs );
+
 protected:
     virtual void			Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
@@ -953,7 +956,7 @@ public:
     //put spelling back to start of current sentence - needed after switch of grammar support
     void                PutSpellingToSentenceStart( EditView& rEditView );
     //applies a changed sentence
-    void                ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking );
+    void                ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck );
     //deinitialize sentence spelling
     void            EndSpelling();
     //adds one or more portions of text to the SpellPortions depending on language changes
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 27d95e0979..e0e780c784 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2755,6 +2755,11 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
 
     EditPaM aCurPaM( aPaM );	// fuers Invalidieren
 
+    // get word boundaries in order to clear possible WrongList entries
+    // and invalidate all the necessary text (everything after and including the 
+    // start of the word)
+    EditSelection aCurWord( SelectWord( aCurPaM, i18n::WordType::DICTIONARY_WORD ) );
+
     XubString aText( rStr );
     aText.ConvertLineEnd( LINEEND_LF );
     SfxVoidItem aTabItem( EE_FEATURE_TAB );
@@ -2809,7 +2814,13 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
             }
             ParaPortion* pPortion = FindParaPortion( aPaM.GetNode() );
             DBG_ASSERT( pPortion, "Blinde Portion in InsertText" );
-            pPortion->MarkInvalid( aCurPaM.GetIndex(), aLine.Len() );
+
+            // now remove the Wrongs (red spell check marks) from both words...
+            WrongList *pWrongs = aCurPaM.GetNode()->GetWrongList();
+            if (pWrongs && pWrongs->HasWrongs())
+                pWrongs->ClearWrongs( aCurWord.Min().GetIndex(), aPaM.GetIndex(), aPaM.GetNode() );
+            // ... and mark both words as 'to be checked again'
+            pPortion->MarkInvalid( aCurWord.Min().GetIndex(), aLine.Len() );
         }
         if ( nEnd < aText.Len() )
             aPaM = ImpInsertParaBreak( aPaM );
@@ -4198,7 +4209,18 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
                     DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!");
                 }
 
+#if 0
                 long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos );
+#else
+                // #i74188# (positioning the cursor after deleting components of combined indic characters)
+                SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
+                SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
+                aTmpFont.SetPhysFont( GetRefDevice() );
+                ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
+                String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1);
+                long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
+                    sSegment, 0, nPos+1, NULL ).Width();
+#endif
 
                 if ( !pPortion->IsRightToLeft() )
                 {
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 125e0e898c..01d36c223c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3613,7 +3613,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b
             ContentNode* pNode = GetEditDoc().SaveGetObject( 0 );
             SeekCursor( pNode, 1, aTmpFont );
             Color aFontColor( aTmpFont.GetColor() );
-            if( aFontColor == COL_AUTO )
+            if( (aFontColor == COL_AUTO) || IsForceAutoColor() )
                 aFontColor = GetAutoColor();
 
             // #i69346# check for reverse color of input method attribute
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index e629a0a00f..6fc80acf06 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1455,6 +1455,23 @@ Reference< XSpellChecker1 > ImpEditEngine::GetSpeller()
     return xSpeller;
 }
 
+
+SpellInfo * ImpEditEngine::CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs )
+{
+    pSpellInfo = new SpellInfo;
+    pSpellInfo->bMultipleDoc = bMultipleDocs;
+    EditSelection aSentenceSel( SelectSentence( rSel ) );
+//    pSpellInfo->aSpellStart = CreateEPaM( aSentenceSel.Min() );
+//    pSpellInfo->aSpellTo    = CreateEPaM( rSel.HasRange()? aSentenceSel.Max() : aSentenceSel.Min() );
+    // always spell draw objects completely, startting at the top.
+    // (spelling in only a selection or not starting with the top requires 
+    // further changes elsewehe to work properly)
+    pSpellInfo->aSpellStart = EPaM();
+    pSpellInfo->aSpellTo    = EPaM( EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND );
+    return pSpellInfo;
+}
+
+
 EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc )
 {
 #ifdef SVX_LIGHT
@@ -1475,9 +1492,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc )
     }
 
     EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
-    pSpellInfo = new SpellInfo;
-    pSpellInfo->bMultipleDoc = bMultipleDoc;
-    pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ).Min() );
+    pSpellInfo = CreateSpellInfo( aCurSel, bMultipleDoc );
 
     sal_Bool bIsStart = sal_False;
     if ( bMultipleDoc )
@@ -1945,11 +1960,9 @@ void ImpEditEngine::EndSpelling()
 void ImpEditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
 {
     DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?");
-    pSpellInfo = new SpellInfo;
-    pSpellInfo->bMultipleDoc = bMultipleDoc;
     rEditView.pImpEditView->SetEditSelection( aEditDoc.GetStartPaM() );
     EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
-    pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ).Min() );
+    pSpellInfo = CreateSpellInfo( aCurSel, bMultipleDoc );
 }
 /*-- 13.10.2003 16:43:27---------------------------------------------------
     Search for the next wrong word within the given selection
@@ -2002,33 +2015,31 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r
 /*-- 13.10.2003 16:43:27---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-bool ImpEditEngine::SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool /*bIsGrammarChecking*/ )
+bool ImpEditEngine::SpellSentence(EditView& rEditView, 
+    ::svx::SpellPortions& rToFill, 
+    bool /*bIsGrammarChecking*/ )
 {
 #ifdef SVX_LIGHT
 #else
     bool bRet = false;
+    EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
     //the pSpellInfo has to be created on demand
     if(!pSpellInfo)
-    {
-        pSpellInfo = new SpellInfo;
-        pSpellInfo->bMultipleDoc = sal_True;
-        rEditView.pImpEditView->SetEditSelection( aEditDoc.GetStartPaM() );
-        EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
-        pSpellInfo->aSpellStart = CreateEPaM( SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD ).Min() );
-    }
+        pSpellInfo = CreateSpellInfo( aCurSel, true );
+    pSpellInfo->aCurSentenceStart = aCurSel.Min();
     DBG_ASSERT( xSpeller.is(), "Kein Speller gesetzt!" );
     pSpellInfo->aLastSpellPortions.clear();
     pSpellInfo->aLastSpellContentSelections.clear();
     rToFill.clear();
-    EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
     //if no selection previously exists the range is extended to the end of the object
     if(aCurSel.Min() == aCurSel.Max())
     {
         ContentNode* pLastNode = aEditDoc.SaveGetObject( aEditDoc.Count()-1);
         aCurSel.Max() = EditPaM(pLastNode, pLastNode->Len());
     }
+    // check for next error in aCurSel and set aCurSel to that one if any was found
     Reference< XSpellAlternatives > xAlt = ImpFindNextError(aCurSel);
-    if(xAlt.is())
+    if (xAlt.is())
     {
         bRet = true;
         //find the sentence boundaries
@@ -2060,6 +2071,7 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView, ::svx::SpellPortions& rTo
             aCurSel = aNextSel;
         }
         while( xAlt.is() );
+
         //set the selection to the end of the current sentence
         rEditView.pImpEditView->SetEditSelection(aSentencePaM.Max());
     }
@@ -2173,13 +2185,20 @@ void ImpEditEngine::AddPortionIterated(
 /*-- 13.10.2003 16:43:33---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool /*bIsGrammarChecking*/ )
+void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, 
+    const ::svx::SpellPortions& rNewPortions, 
+    bool bRecheck )
 {
 #ifdef SVX_LIGHT
 #else
     DBG_ASSERT(pSpellInfo, "pSpellInfo not initialized");
     if(pSpellInfo)
     {
+        // get current paragraph length to calculate later on how the sentence length changed,
+        // in order to place the cursor at the end of the sentence again
+        EditSelection aOldSel( rEditView.pImpEditView->GetEditSelection() );
+        xub_StrLen nOldLen = aOldSel.Max().GetNode()->Len();
+
         UndoActionStart( EDITUNDO_INSERT );
         if(pSpellInfo->aLastSpellPortions.size() == rNewPortions.size())
         {
@@ -2266,9 +2285,24 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::Spell
             }
         }
         UndoActionEnd( EDITUNDO_INSERT );
+
+        EditPaM aNext;
+        if (bRecheck)
+            aNext = pSpellInfo->aCurSentenceStart;
+        else
+        {
+            // restore cursor position to the end of the modified sentence.
+            // (This will define the continuation position for spell/grammar checking)
+            // First: check if the sentence/para length changed
+            sal_Int32 nDelta = rEditView.pImpEditView->GetEditSelection().Max().GetNode()->Len() - nOldLen;
+            xub_StrLen nEndOfSentence = aOldSel.Max().GetIndex() + nDelta;
+            aNext = EditPaM( aOldSel.Max().GetNode(), nEndOfSentence );
+        }
+        rEditView.pImpEditView->SetEditSelection( aNext );
+        
+        FormatAndUpdate();
+        aEditDoc.SetModified(TRUE);
     }
-    FormatAndUpdate();
-    aEditDoc.SetModified(TRUE);
 #endif
 }
 /*-- 08.09.2008 11:33:02---------------------------------------------------
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index f471e19206..c3d968d6d1 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -807,7 +807,7 @@ void Outliner::PutSpellingToSentenceStart( EditView& rEditView )
 /*-- 13.10.2003 16:56:25---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-void Outliner::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking )
+void Outliner::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck )
 {
-    pEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bIsGrammarChecking );
+    pEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck );
 }
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index e7ee6c7c16..4034b03d01 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -26,7 +26,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
+
 #include "precompiled_editeng.hxx"
+
+#include <com/sun/star/i18n/WordType.hpp>
+
 #include <svl/intitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
@@ -34,7 +38,9 @@
 #include <editeng/eerdll.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/fhgtitem.hxx>
+
 #include <svl/style.hxx>
+#include <i18npool/mslangid.hxx>
 
 #define _OUTLINER_CXX
 #include <editeng/outliner.hxx>
@@ -59,6 +65,8 @@
 #define OL_SCROLL_HOROFFSET			20  /* in % von VisibleSize.Width */
 #define OL_SCROLL_VEROFFSET			20  /* in % von VisibleSize.Height */
 
+using namespace ::com::sun::star;
+
 DBG_NAME(OutlinerView)
 
 
@@ -972,7 +980,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
     // Eigentlich nicht ganz richtig, das evtl. Einrueckungen
     // korrigiert werden muessen, aber das kommt spaeter durch ein
     // allgemeingueltiges Import.
-    // Dann wird im Inserted gleich ermittelt, was f�r eine Einrueckebene
+    // Dann wird im Inserted gleich ermittelt, was f�r eine Einrueckebene
     // Moegliche Struktur:
     // pImportInfo mit DestPara, DestPos, nFormat, pParaObj...
     // Evtl. Problematisch:
@@ -1295,7 +1303,7 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
 
 
 
-// =====================================================================
+// =====================================================================
 // ======================   Einfache Durchreicher =======================
 // ======================================================================
 
@@ -1670,3 +1678,57 @@ Selection OutlinerView::GetSurroundingTextSelection() const
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSurroundingTextSelection();
 }
+
+
+// ======================================================================
+// ===== some code for thesaurus sub menu within context menu
+// ======================================================================
+
+// returns: true if a word for thesaurus look-up was found at the current cursor position.
+// The status string will be word + iso language string (e.g. "light#en-US")
+bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( 
+    String &rStatusVal, 
+    LanguageType &rLang, 
+    const EditView &rEditView )
+{
+    // get text and locale for thesaurus look up
+    String aText;
+    EditEngine *pEditEngine = rEditView.GetEditEngine();
+    ESelection aTextSel( rEditView.GetSelection() );
+    if (!aTextSel.HasRange())
+        aTextSel = pEditEngine->GetWord( aTextSel, i18n::WordType::DICTIONARY_WORD );
+    aText = pEditEngine->GetText( aTextSel );
+    aTextSel.Adjust();
+    LanguageType nLang = pEditEngine->GetLanguage( aTextSel.nStartPara, aTextSel.nStartPos ); 
+    String aLangText( MsLangId::convertLanguageToIsoString( nLang ) );
+                    
+    // set word and locale to look up as status value
+    String aStatusVal( aText );
+    aStatusVal.AppendAscii( "#" );
+    aStatusVal += aLangText;
+    
+    rStatusVal  = aStatusVal;
+    rLang       = nLang;
+
+    return aText.Len() > 0;
+}
+
+    
+void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText )
+{
+    // get selection to use
+    ESelection aCurSel( rEditView.GetSelection() );
+    if (!rEditView.HasSelection())
+    {
+        // select the same word that was used in GetStatusValueForThesaurusFromContext by calling GetWord.
+        // (In the end both functions will call ImpEditEngine::SelectWord)
+        rEditView.SelectCurrentWord( i18n::WordType::DICTIONARY_WORD );
+        aCurSel = rEditView.GetSelection();
+    }
+
+    // replace word ...
+    rEditView.InsertText( rSynonmText );
+    rEditView.ShowCursor( sal_True, sal_False );
+}    
+
+
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 7dd81f3f17..106e1cc6a5 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -186,6 +186,8 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper5
 
     ::rtl::OUString m_aTempURL;
 
+    ::rtl::OUString m_aTempDumpURL;
+
     // STAMPIT solution
     // the following member is used during verb execution to detect whether the verb execution modifies the object
     VerbExecutionController m_aVerbExecutionController;
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index e1bf2754b6..c3dfd00271 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -46,10 +46,16 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 
 #include <rtl/logfile.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/mimeconfighelper.hxx>
+#include <comphelper/storagehelper.hxx>
 
 
 #include <targetstatecontrol.hxx>
@@ -674,6 +680,85 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
     return m_nObjectState;
 }
 
+namespace
+{
+    bool lcl_CopyStream(uno::Reference<io::XInputStream> xIn, uno::Reference<io::XOutputStream> xOut)
+    {
+        const sal_Int32 nChunkSize = 4096;
+        uno::Sequence< sal_Int8 > aData(nChunkSize);
+        sal_Int32 nTotalRead = 0;
+        sal_Int32 nRead;
+        do
+        {
+            nRead = xIn->readBytes(aData, nChunkSize);
+            nTotalRead += nRead;
+            xOut->writeBytes(aData);
+        } while (nRead == nChunkSize);
+        return nTotalRead != 0;
+    }
+
+    //Dump the objects content to a tempfile, just the "CONTENTS" stream if
+    //there is one for non-compound documents, otherwise the whole content.
+    //
+    //On success a file is returned which must be removed by the caller
+    rtl::OUString lcl_ExtractObject(::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory,
+        ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xObjectStream)
+    {
+        rtl::OUString sUrl;
+
+        // the solution is only active for Unix systems
+#ifndef WNT
+        uno::Reference <beans::XPropertySet> xNativeTempFile(
+            xFactory->createInstance(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile"))), uno::UNO_QUERY_THROW);
+        uno::Reference < io::XStream > xStream(xNativeTempFile, uno::UNO_QUERY_THROW);
+
+        uno::Sequence< uno::Any > aArgs( 2 );
+        aArgs[0] <<= xObjectStream;
+        aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+        uno::Reference< container::XNameContainer > xNameContainer(
+            xFactory->createInstanceWithArguments(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
+                aArgs ), uno::UNO_QUERY_THROW );
+        
+        uno::Reference< io::XStream > xCONTENTS;
+        xNameContainer->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONTENTS"))) >>= xCONTENTS;
+
+        sal_Bool bCopied = xCONTENTS.is() && lcl_CopyStream(xCONTENTS->getInputStream(), xStream->getOutputStream());
+
+        uno::Reference< io::XSeekable > xSeekableStor(xObjectStream, uno::UNO_QUERY);
+        if (xSeekableStor.is())
+            xSeekableStor->seek(0);
+
+        if (!bCopied)
+            bCopied = lcl_CopyStream(xObjectStream->getInputStream(), xStream->getOutputStream());
+
+        if (bCopied)
+        {
+            xNativeTempFile->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")),
+                uno::makeAny(sal_False));
+            uno::Any aUrl = xNativeTempFile->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")));
+            aUrl >>= sUrl;
+
+            xNativeTempFile = uno::Reference<beans::XPropertySet>();
+
+            uno::Reference<ucb::XSimpleFileAccess> xSimpleFileAccess(
+                xFactory->createInstance(
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
+                    uno::UNO_QUERY_THROW);
+
+            xSimpleFileAccess->setReadOnly(sUrl, sal_True);
+        }
+        else
+        {
+            xNativeTempFile->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile")),
+                uno::makeAny(sal_True));
+        }
+#endif
+        return sUrl;
+    }
+}
+
 //----------------------------------------------
 void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
         throw ( lang::IllegalArgumentException,
@@ -789,10 +874,28 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
             }
 
             if ( !m_pOwnView || !m_pOwnView->Open() )
-                throw embed::UnreachableStateException();
+            {
+                //Make a RO copy and see if the OS can find something to at
+                //least display the content for us
+                if (!m_aTempDumpURL.getLength())
+                    m_aTempDumpURL = lcl_ExtractObject(m_xFactory, m_xObjectStream);
+
+                if (m_aTempDumpURL.getLength())
+                {
+                    uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( m_xFactory->createInstance(
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))),
+                        uno::UNO_QUERY_THROW);
+                    xSystemShellExecute->execute(m_aTempDumpURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
+                }
+                else
+                    throw embed::UnreachableStateException();
+            }
         }
         else
+        {
+
             throw embed::UnreachableStateException();
+        }
     }
 }
 
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 7db1a22003..abb47f2a26 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -158,6 +158,9 @@ OleEmbeddedObject::~OleEmbeddedObject()
 
     if ( m_aTempURL.getLength() )
            KillFile_Impl( m_aTempURL, m_xFactory );
+
+    if ( m_aTempDumpURL.getLength() )
+           KillFile_Impl( m_aTempDumpURL, m_xFactory );
 }
 
 //------------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 63663e5690..85ed7795b9 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -147,6 +147,7 @@ VistaFilePickerImpl::VistaFilePickerImpl()
     , m_lLastFiles   ()
     , m_iEventHandler(new VistaFilePickerEventHandler(this))
     , m_bInExecute   (sal_False)
+    , m_bWasExecuted (sal_False)
     , m_sDirectory   ()
     , m_sFilename    ()
 {
@@ -851,6 +852,8 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
     // tasks must be done differently .-) (e.g. see impl_sta_getSelectedFiles())
     m_bInExecute = sal_True;
 
+    m_bWasExecuted = sal_True;
+
     aLock.clear();    
     // <- SYNCHRONIZED
 
@@ -1092,6 +1095,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
         return;
     
     css::uno::Any aValue;
+    if( m_bWasExecuted )
     switch (nId)
     {
         case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD :
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index f3be49c39e..5fe5ac8445 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -329,6 +329,8 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
         /// @todo document me
         ::sal_Bool m_bInExecute;
 
+        ::sal_Bool m_bWasExecuted;
+
         // handle to parent window
         HWND m_hParentWindow;
 
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index a3c5945626..f42284702d 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -82,13 +82,14 @@ class MenuManager : public ThreadHelpBase			,
             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();
 
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 66503d3176..5929b8b348 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -55,6 +55,7 @@
 #define STR_SET_LANGUAGE_FOR_PARAGRAPH          (RID_STR_START+19)
 #define STR_SET_LANGUAGE_FOR_ALL_TEXT           (RID_STR_START+20)
 #define STR_UNTITLED_DOCUMENT                   (RID_STR_START+21)
+#define STR_RESET_TO_DEFAULT_LANGUAGE           (RID_STR_START+22)
 
 #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION    (RID_MENU_START+0)
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index c23a38fb24..8efbbac090 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -34,10 +34,56 @@
 
 #include <i18npool/lang.h>
 #include <svl/languageoptions.hxx>
+#include <rtl/ustring.hxx>
+
+#include <set>
+
+class SvtLanguageTable;
+
+
+// flags for script types in use within selection
+#define LS_SCRIPT_LATIN     0x0001
+#define LS_SCRIPT_ASIAN     0x0002
+#define LS_SCRIPT_COMPLEX   0x0004
+
 
 namespace framework
 {
 
+// menu ids for language status bar control
+enum LangMenuIDs
+{
+    MID_LANG_SEL_1 = 1,     // need to start with 1 since xPopupMenu->execute will return 0 if the menu is cancelled
+    MID_LANG_SEL_2,
+    MID_LANG_SEL_3,
+    MID_LANG_SEL_4,
+    MID_LANG_SEL_5,
+    MID_LANG_SEL_6,
+    MID_LANG_SEL_7,
+    MID_LANG_SEL_8,
+    MID_LANG_SEL_9,
+    MID_LANG_SEL_NONE,
+    MID_LANG_SEL_RESET,
+    MID_LANG_SEL_MORE,
+
+    MID_LANG_PARA_SEPERATOR,
+    MID_LANG_PARA_STRING,
+
+    MID_LANG_PARA_1,
+    MID_LANG_PARA_2,
+    MID_LANG_PARA_3,
+    MID_LANG_PARA_4,
+    MID_LANG_PARA_5,
+    MID_LANG_PARA_6,
+    MID_LANG_PARA_7,
+    MID_LANG_PARA_8,
+    MID_LANG_PARA_9,
+    MID_LANG_PARA_NONE,
+    MID_LANG_PARA_RESET,
+    MID_LANG_PARA_MORE,
+};
+    
+    
 inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )
 {
     return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));
@@ -63,6 +109,15 @@ public:
             ,sal_Bool& _rIni
             ,const sal_Char* _pName);
 
+void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
+        const SvtLanguageTable &rLanguageTable,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
+        const LanguageGuessingHelper & rLangGuessHelper,
+        sal_Int16               nScriptType,
+        const ::rtl::OUString & rCurLang,
+        const ::rtl::OUString & rKeyboardLang,
+        const ::rtl::OUString & rGuessedTextLang );
+
 } // namespace framework
 
 #endif // __MISC_HELPER_HXX_
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 52b5ab8f1f..e9f61255b8 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -102,11 +102,10 @@ namespace framework
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Font;
             ::rtl::OUString														   m_aMenuCommandURL_CharDlgForParagraph;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph;
-            ::rtl::OUString     m_aCurrentLanguage;
             ::rtl::OUString     m_aCurLang;
             sal_Int16           m_nScriptType;
             ::rtl::OUString     m_aKeyboardLang;
-            ::rtl::OUString     m_aGuessedText;
+            ::rtl::OUString     m_aGuessedTextLang;
             LanguageGuessingHelper      m_aLangGuessHelper;
             
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode );
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index ad12225afa..5c2170a534 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -35,9 +35,15 @@
 #include <stdtypes.h>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <svtools/statusbarcontroller.hxx>
+#include <rtl/ustring.hxx>
 
 #include "helper/mischelper.hxx"
 
+#include <set>
+
+class SvtLanguageTable;
+
+
 // component helper namespace
 namespace framework {
 
@@ -86,12 +92,11 @@ class LangSelectionStatusbarController : public svt::StatusbarController
         void operator =(LangSelectionStatusbarController &); // not defined
 
     
-        sal_Bool            m_bShowMenu;
-        sal_Int16           m_nScriptType;
-        ::rtl::OUString     m_aCurrentLanguage;
-        ::rtl::OUString     m_aCurLang;
-        ::rtl::OUString     m_aKeyboardLang;
-        ::rtl::OUString     m_aGuessedText;
+        sal_Bool            m_bShowMenu;        // if the menu is to be displayed or not (depending on the selected object/text)
+        sal_Int16           m_nScriptType;      // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004
+        ::rtl::OUString     m_aCurLang;         // the language of the current selection, "*" if there are more than one languages
+        ::rtl::OUString     m_aKeyboardLang;    // the keyboard language
+        ::rtl::OUString     m_aGuessedTextLang;     // the 'guessed' language for the selection, "" if none could be guessed
         LanguageGuessingHelper      m_aLangGuessHelper;
         
         void LangMenu() throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index a4485da237..0c3448d482 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -60,6 +60,9 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
+//shizhoubo
+#include <com/sun/star/frame/XToolbarController.hpp>
+//end
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
@@ -185,6 +188,9 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL );
         void CreateControllers();
         void UpdateControllers();
+        //for update controller via Support Visiable by shizhoubo
+        void UpdateController( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xController);
+        //end
         void AddFrameActionListener();
         void AddImageOrientationListener();
         void UpdateImageOrientation();
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 4b7c702906..825a4b278c 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -357,6 +357,7 @@ MenuManager::MenuManager(
     SetHdl();
 }
 
+#if 0
 // #110897#
 MenuManager::MenuManager(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
@@ -413,6 +414,7 @@ MenuManager::MenuManager(
 
     SetHdl();
 }
+#endif
 
 void MenuManager::SetHdl()
 {
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index c8114e7129..5c0f7d087a 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -327,6 +327,11 @@ 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..." ;   
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index e70e79096e..6fce055238 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -29,10 +29,15 @@
 #include "precompiled_framework.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <tools/debug.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
+#include <i18npool/mslangid.hxx>
+#include <svtools/langtab.hxx>
 #include <comphelper/processfactory.hxx>
 #include <helper/mischelper.hxx>
 #include <services.h>
@@ -45,6 +50,9 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
+using ::rtl::OUString;
+
+
 namespace framework
 {
 
@@ -68,20 +76,23 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     return m_xLanguageGuesser;
 }
 
-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
-            ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
-            ,::rtl::OUString& _rModuleIdentifier
-            ,sal_Bool& _rIni
-            ,const sal_Char* _pName)
+////////////////////////////////////////////////////////////
+
+::rtl::OUString RetrieveLabelFromCommand( 
+    const ::rtl::OUString& aCmdURL,
+    const uno::Reference< lang::XMultiServiceFactory >& _xServiceFactory,
+    uno::Reference< container::XNameAccess >& _xUICommandLabels,
+    const uno::Reference< frame::XFrame >& _xFrame,
+    ::rtl::OUString& _rModuleIdentifier,
+    sal_Bool& _rIni,
+    const sal_Char* _pName)
 {
     ::rtl::OUString aLabel;
 
     // Retrieve popup menu labels
     if ( !_xUICommandLabels.is() )
     {
-        try
+      try
         {
             if ( !_rIni )
             {
@@ -138,5 +149,91 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
     return aLabel;
 }
     
+////////////////////////////////////////////////////////////
+
+void FillLangItems( std::set< OUString > &rLangItems, 
+        const SvtLanguageTable &    rLanguageTable,
+        const uno::Reference< frame::XFrame > & rxFrame,
+        const LanguageGuessingHelper & rLangGuessHelper,
+        sal_Int16        nScriptType,
+        const OUString & rCurLang,
+        const OUString & rKeyboardLang,
+        const OUString & rGuessedTextLang )
+{
+    rLangItems.clear();
+
+    //1--add current language
+    if( rCurLang != OUString() &&
+        LANGUAGE_DONTKNOW != rLanguageTable.GetType( rCurLang ))
+        rLangItems.insert( rCurLang );
+
+    //2--System
+    const AllSettings& rAllSettings = Application::GetSettings();
+    LanguageType rSystemLanguage = rAllSettings.GetLanguage();
+    if( rSystemLanguage != LANGUAGE_DONTKNOW )
+    {
+        if ( IsScriptTypeMatchingToLanguage( nScriptType, rSystemLanguage ))
+            rLangItems.insert( OUString( rLanguageTable.GetString( rSystemLanguage )) );
+    }
+
+    //3--UI
+    LanguageType rUILanguage = rAllSettings.GetUILanguage();
+    if( rUILanguage != LANGUAGE_DONTKNOW )
+    {
+        if ( IsScriptTypeMatchingToLanguage( nScriptType, rUILanguage ))
+            rLangItems.insert( OUString( rLanguageTable.GetString( rUILanguage )) );
+    }
+
+    //4--guessed language
+    uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( rLangGuessHelper.GetGuesser() );
+    if ( xLangGuesser.is() && rGuessedTextLang.getLength() > 0)
+    {
+        ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( rGuessedTextLang, 0, rGuessedTextLang.getLength()) );
+        LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
+        if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
+            && IsScriptTypeMatchingToLanguage( nScriptType, nLang ))
+            rLangItems.insert( rLanguageTable.GetString( nLang ));
+    }
+
+    //5--keyboard language
+    if( rKeyboardLang != OUString())
+    {
+        if ( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rKeyboardLang )))
+            rLangItems.insert( rKeyboardLang );
+    }
+
+    //6--all languages used in current document
+    Reference< com::sun::star::frame::XModel > xModel;
+    if ( rxFrame.is() )
+    {
+       Reference< com::sun::star::frame::XController > xController( rxFrame->getController(), UNO_QUERY );
+       if ( xController.is() )
+           xModel = xController->getModel();
+    }
+    Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, UNO_QUERY );
+    /*the description of nScriptType
+      LATIN :   0x001
+      ASIAN :   0x002
+      COMPLEX:  0x004
+    */
+    const sal_Int16 nMaxCount = 7;
+    if ( xDocumentLanguages.is() )
+    {
+        Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( nScriptType, nMaxCount ));
+        if ( rLocales.getLength() > 0 )
+        {
+            for ( USHORT i = 0; i < rLocales.getLength(); ++i )
+            {
+                if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )
+                    break;
+                const Locale& rLocale=rLocales[i];
+                if( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rLocale.Language )))
+                    rLangItems.insert( OUString( rLocale.Language ) );
+            }
+        }
+    }
+}
+    
 } // namespace framework
 
+
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index f501e1630c..0252a068eb 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -41,6 +41,7 @@
 #include "tools/urlobj.hxx"
 
 #include "unotools/dynamicmenuoptions.hxx"
+#include "unotools/historyoptions.hxx"
 #include "svtools/imagemgr.hxx"
 #include "svtools/svtools.hrc"
 
@@ -48,14 +49,18 @@
 #include "comphelper/sequenceashashmap.hxx"
 #include "comphelper/configurationhelper.hxx"
 
+#include "cppuhelper/implbase1.hxx"
+
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
+#include "osl/file.h"
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/container/XNameAccess.hpp"
 #include "com/sun/star/system/XSystemShellExecute.hpp"
 #include "com/sun/star/system/SystemShellExecuteFlags.hpp"
 #include "com/sun/star/task/XJobExecutor.hpp"
+#include "com/sun/star/util/XStringWidth.hpp"
 
 
 using namespace ::com::sun::star::beans;
@@ -110,6 +115,20 @@ Size DecoToolBox::getMinSize()
     return maMinSize;
 }
 
+class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth >
+{
+    public:
+        RecentFilesStringLength() {}
+        virtual ~RecentFilesStringLength() {}
+
+        // XStringWidth
+        sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString )
+            throw (::com::sun::star::uno::RuntimeException)
+        {
+            return aString.getLength();
+        }
+};
+
 #define STC_BUTTON_STYLE  (WB_LEFT | WB_VCENTER | WB_FLATBUTTON | WB_BEVELBUTTON)
 
 BackingWindow::BackingWindow( Window* i_pParent ) :
@@ -134,7 +153,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     mnLayoutStyle( 0 ),
     mpAccExec( NULL ),
     mnBtnPos( 120 ),
-    mnBtnTop( 150 )
+    mnBtnTop( 150 ),
+    mpRecentMenu( NULL )
 {
     mnColumnWidth[0] = mnColumnWidth[1] = 0;
     mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
@@ -233,6 +253,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 
 BackingWindow::~BackingWindow()
 {
+    delete mpRecentMenu;
     delete mpAccExec;
 }
 
@@ -261,6 +282,116 @@ void BackingWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
+void BackingWindow::prepareRecentFileMenu()
+{
+    if( ! mpRecentMenu )
+        mpRecentMenu = new PopupMenu();
+    mpRecentMenu->Clear();
+    maRecentFiles.clear();
+    
+    // get recent file list and dispatch arguments
+    Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) );
+
+    sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
+        
+    if( ( nPickListMenuItems > 0 ) )
+    {
+        maRecentFiles.reserve( nPickListMenuItems );
+        for ( sal_Int32 i = 0; i < nPickListMenuItems; i++ )
+        {
+            Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
+            rtl::OUString aURL, aFilter, aFilterOpt, aTitle;
+            
+            for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ )
+            {
+                const Any& a = rPickListEntry[j].Value;
+                
+                if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
+                    a >>= aURL;
+                else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER )
+                {
+                    a >>= aFilter;
+                    sal_Int32 nPos = aFilter.indexOf( '|' );
+                    if ( nPos >= 0 )
+                    {
+                        if ( nPos < ( aFilter.getLength() - 1 ) )
+                            aFilterOpt = aFilter.copy( nPos+1 );
+                        aFilter = aFilter.copy( 0, nPos-1 );
+                    }
+                }
+                else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_TITLE )
+                    a >>= aTitle;
+            }
+            maRecentFiles.push_back( LoadRecentFile() );
+            maRecentFiles.back().aTargetURL = aURL;
+
+            sal_Int32 nArgs = aFilterOpt.getLength() ? 4 : 3;
+            Sequence< PropertyValue >& rArgsList( maRecentFiles.back().aArgSeq );
+            rArgsList.realloc( nArgs );
+
+            nArgs--;
+            rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+            rArgsList[nArgs].Value = makeAny( aFilter );
+            
+            if( aFilterOpt.getLength() )
+            {
+                nArgs--;
+                rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterOptions" ));
+                rArgsList[nArgs].Value = makeAny( aFilterOpt );
+            }
+
+            // documents in the picklist will never be opened as templates
+            nArgs--;
+            rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
+            rArgsList[nArgs].Value = makeAny( (sal_Bool) sal_False );
+
+            nArgs--;
+            rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
+            rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
+            
+            // and finally create an entry in the popupmenu
+            rtl::OUString	aMenuTitle;
+            INetURLObject	aURLObj( aURL );
+            
+            if ( aURLObj.GetProtocol() == INET_PROT_FILE )
+            {
+                // Do handle file URL differently => convert it to a system
+                // path and abbreviate it with a special function:
+                String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
+                
+                rtl::OUString	aSystemPath( aFileSystemPath );
+                rtl::OUString	aCompactedSystemPath;
+                
+                oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
+                if ( !nError )
+                    aMenuTitle = String( aCompactedSystemPath );
+                else
+                    aMenuTitle = aSystemPath;
+            }
+            else
+            {
+                // Use INetURLObject to abbreviate all other URLs
+                Reference< util::XStringWidth > xStringLength( new RecentFilesStringLength() );
+                aMenuTitle = aURLObj.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS );
+            }
+            rtl::OUStringBuffer aBuf( aMenuTitle.getLength() + 5 );
+            if( i < 9 )
+            {
+                aBuf.append( sal_Unicode( '~' ) );
+                aBuf.append( i+1 );
+            }
+            else if( i == 9 )
+                aBuf.appendAscii( "1~0" );
+            else
+                aBuf.append( i+1 );
+            aBuf.appendAscii( ": " );
+            aBuf.append( aMenuTitle );
+            mpRecentMenu->InsertItem( static_cast<USHORT>(i+1), aBuf.makeStringAndClear() );
+        }
+        maOpenButton.SetPopupMenu( mpRecentMenu );
+    }
+}
+
 void BackingWindow::initBackground()
 {
     SetBackground( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
@@ -327,6 +458,9 @@ void BackingWindow::initBackground()
     loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
     loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
     
+    maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
+    maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) );
+    prepareRecentFileMenu();
 }
 
 void BackingWindow::initControls()
@@ -515,7 +649,7 @@ void BackingWindow::initControls()
     maWriterButton.GrabFocus();
 }
 
-void BackingWindow::loadImage( const ResId& i_rId, ImageButton& i_rButton )
+void BackingWindow::loadImage( const ResId& i_rId, PushButton& i_rButton )
 {
     BitmapEx aBmp( i_rId );
     Size aImgSize( aBmp.GetSizePixel() );
@@ -530,7 +664,7 @@ void BackingWindow::layoutButton(
                           const char* i_pURL, int nColumn,
                           const std::set<rtl::OUString>& i_rURLS,
                           SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
-                          ImageButton& i_rBtn,
+                          PushButton& i_rBtn,
                           MnemonicGenerator& i_rMnemns,
                           const String& i_rStr
                           )
@@ -908,6 +1042,20 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
     return 0;
 }
 
+IMPL_LINK( BackingWindow, SelectHdl, Button*, pButton )
+{
+    if( pButton == &maOpenButton )
+    {
+        sal_Int32 nItem = sal_Int32(maOpenButton.GetCurItemId())-1;
+        if( nItem >= 0 && nItem < sal_Int32(maRecentFiles.size()) )
+        {
+            Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
+            dispatchURL( maRecentFiles[nItem].aTargetURL, rtl::OUString(), xFrame, maRecentFiles[nItem].aArgSeq );
+        }
+    }
+    return 0;
+}
+
 struct ImplDelayedDispatch
 {
     Reference< XDispatch >      xDispatch;
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index e1ad2ca457..fdd8cf258d 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -31,6 +31,7 @@
 #include "rtl/ustring.hxx"
 
 #include "vcl/button.hxx"
+#include "vcl/menubtn.hxx"
 #include "vcl/fixed.hxx"
 #include "vcl/bitmapex.hxx"
 #include "vcl/toolbox.hxx"
@@ -77,6 +78,12 @@ namespace framework
 
     class BackingWindow : public Window
     {
+        struct LoadRecentFile
+        {
+            rtl::OUString                                                             aTargetURL;
+            com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >     aArgSeq;
+        };
+        
         com::sun::star::uno::Reference<com::sun::star::frame::XDesktop>                  mxDesktop;
         com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider >        mxDesktopDispatchProvider;
         com::sun::star::uno::Reference<com::sun::star::frame::XFrame>                    mxFrame;
@@ -89,7 +96,7 @@ namespace framework
         ImageButton                     maWriterButton;
         ImageButton                     maCalcButton;
         ImageButton                     maImpressButton;
-        ImageButton                     maOpenButton;
+        MenuButton                      maOpenButton;
         ImageButton                     maDrawButton;
         ImageButton                     maDBButton;
         ImageButton                     maMathButton;
@@ -123,6 +130,9 @@ namespace framework
         long                            mnBtnPos;
         long                            mnBtnTop;
         
+        PopupMenu*                      mpRecentMenu;
+        std::vector< LoadRecentFile >   maRecentFiles;
+
         static const int nItemId_Extensions = 1;
         static const int nItemId_Reg = 2;
         static const int nItemId_Info = 3;
@@ -132,11 +142,11 @@ namespace framework
         static const int nShadowRight = 45;
         static const int nShadowBottom = 50;
 
-        void loadImage( const ResId& i_rId, ImageButton& i_rButton );
+        void loadImage( const ResId& i_rId, PushButton& i_rButton );
 
         void layoutButton( const char* i_pURL, int nColumn, const std::set<rtl::OUString>& i_rURLS,
                            SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
-                           ImageButton& i_rBtn,
+                           PushButton& i_rBtn,
                            MnemonicGenerator& i_rMnemonicGen,
                            const String& i_rStr = String()
                            );
@@ -148,10 +158,12 @@ namespace framework
                           );
 
         DECL_LINK( ClickHdl, Button* );
+        DECL_LINK( SelectHdl, Button* );
         DECL_LINK( ToolboxHdl, void* );
 
         void initControls();
         void initBackground();
+        void prepareRecentFileMenu();
         public:
         BackingWindow( Window* pParent );
         ~BackingWindow();
@@ -160,7 +172,7 @@ namespace framework
         virtual void        Resize();
         virtual long        Notify( NotifyEvent& rNEvt );
         virtual void        DataChanged( const DataChangedEvent& rDCEvt );
-    virtual void        GetFocus();
+        virtual void        GetFocus();
 
         void setOwningFrame( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame );
     };
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index fbc83db937..ea22db175e 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -51,7 +51,7 @@ Window DLG_BACKING
     };
     String STR_BACKING_FILE
     {
-        Text [ en-US ] = "~Open a document...";
+        Text [ en-US ] = "~Open...";
     };
     String STR_BACKING_EXTHELP
     {
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 1b619e637c..cbdf12fe16 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -855,6 +855,7 @@ void PathSettings::impl_setPathValue(      sal_Int32      nID ,
                 ::rtl::OUString sVal;
                 aVal >>= sVal;
                 OUStringList lList = impl_convertOldStyle2Path(sVal);
+                impl_subst(lList, fa_getSubstitution(), sal_False);
                 impl_purgeKnownPaths(aChangePath, lList);
                 if (! impl_isValidPath(lList))
                     throw css::lang::IllegalArgumentException();
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 2d62fab3a5..a4827dc24b 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -293,11 +293,12 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
                         rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
                     }
                 }
+                rElementTypeData.bLoaded = true;
             }
         }
     }
 
-    rElementTypeData.bLoaded = true;
+    //rElementTypeData.bLoaded = true;
 }
 
 void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 521cacf1c6..22154db372 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <uielement/langselectionmenucontroller.hxx>
 
 //_________________________________________________________________________________________________________________
@@ -63,7 +64,7 @@
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-#include <map>
+
 #include <i18npool/mslangid.hxx>
 #include <svl/languageoptions.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
@@ -78,6 +79,9 @@
 #include "helper/mischelper.hxx"
 #include <vos/mutex.hxx>
 
+#include <map>
+#include <set>
+
 //_________________________________________________________________________________________________________________
 //	Defines
 //_________________________________________________________________________________________________________________
@@ -89,6 +93,7 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
 
+using ::rtl::OUString;
 
 namespace framework
 {
@@ -103,8 +108,8 @@ DEFINE_INIT_SERVICE                     (   LanguageSelectionMenuController, {}
 
 LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
     svt::PopupMenuControllerBase( xServiceManager ),
-    m_bShowMenu( sal_True )
-    ,m_aLangGuessHelper(xServiceManager)
+    m_bShowMenu( sal_True ),
+    m_aLangGuessHelper( xServiceManager )
 {
 }
 
@@ -137,25 +142,21 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState
         return;
 
     m_bShowMenu = sal_True;
-    m_nScriptType=7;//set the default value
+    m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX;  //set the default value
 
-    rtl::OUString               aStrValue;
-    Sequence< ::rtl::OUString > aSeq;
+    OUString               aStrValue;
+    Sequence< OUString > aSeq;
 
-    if ( Event.State >>= aStrValue )
-    {
-        m_aCurrentLanguage=aStrValue;
-    }
-    else if ( Event.State >>= aSeq )
+    if ( Event.State >>= aSeq )
     {
         if ( aSeq.getLength() == 4 )
         {
             // Retrieve all other values from the sequence and
             // store it members!
-            m_aCurLang=aSeq[0];
-            m_nScriptType= static_cast< sal_Int16 >(aSeq[1].toInt32());
-            m_aKeyboardLang=aSeq[2];
-            m_aGuessedText=aSeq[3];
+            m_aCurLang          = aSeq[0];
+            m_nScriptType       = static_cast< sal_Int16 >(aSeq[1].toInt32());
+            m_aKeyboardLang     = aSeq[2];
+            m_aGuessedTextLang  = aSeq[3];
         }
     }
     else if ( !Event.State.hasValue() )
@@ -186,14 +187,14 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >&
     {
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         if ( xDispatchProvider.is() )
-            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
     }
 
     if ( xDispatch.is() )
     {	
         Sequence<PropertyValue>	     aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("LanguageSelectionMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+            UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
         xDispatch->dispatch( aTargetURL, aArgs );
     }
 }
@@ -208,22 +209,22 @@ void LanguageSelectionMenuController::impl_setPopupMenu()
     // Register for language updates
     aTargetURL.Complete = m_aLangStatusCommandURL;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
     // Register for setting languages and opening language dialog
     aTargetURL.Complete = m_aMenuCommandURL_Lang;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
     // Register for opening character dialog
     aTargetURL.Complete = m_aMenuCommandURL_Font;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
     // Register for opening character dialog with preselected paragraph
     aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
     m_xURLTransformer->parseStrict( aTargetURL );
-    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
+    m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 }
 
 void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode )
@@ -245,143 +246,77 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     String aCmd_Language;
     if( eMode == MODE_SetLanguageSelectionMenu )
     {
-        aCmd_Dialog+=String::CreateFromAscii(".uno:FontDialog?Language:string=*");
-        aCmd_Language+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Current_");
+        aCmd_Dialog.AppendAscii(".uno:FontDialog?Language:string=*");
+        aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Current_");
     }
     else if ( eMode == MODE_SetLanguageParagraphMenu )
     {
-        aCmd_Dialog+=String::CreateFromAscii(".uno:FontDialogForParagraph");
-        aCmd_Language+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+        aCmd_Dialog.AppendAscii(".uno:FontDialogForParagraph");
+        aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Paragraph_");
     }
     else if ( eMode == MODE_SetLanguageAllTextMenu )
     {
-        aCmd_Dialog+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=*");
-        aCmd_Language+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Default_");
+        aCmd_Dialog.AppendAscii(".uno:LanguageStatus?Language:string=*");
+        aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Default_");
     }
 
-    //Reference< awt::XMenuExtended > m_xMenuExtended( m_xPopupMenu, UNO_QUERY );
-    std::map< ::rtl::OUString, ::rtl::OUString > LangItems;
-
-    SvtLanguageTable aLanguageTable;
-    USHORT nItemId = 1;
-
-    //1--add current language
-    if(m_aCurLang.getLength())
+    SvtLanguageTable    aLanguageTable;
+
+    // get languages to be displayed in the menu
+    std::set< OUString > aLangItems;
+    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
+    const OUString sEmpty;  // 'no language found' from language guessing
+    std::map< sal_Int16, OUString > aLangMap;
+    std::set< OUString >::const_iterator it;
+    for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
-        LangItems[m_aCurLang]=m_aCurLang;
-    }
-
-    SvtLanguageTable aLangTable;
-    //2--System
-    const AllSettings& rAllSettings=Application::GetSettings();
-    LanguageType rSystemLanguage = rAllSettings.GetLanguage();
-    if(rSystemLanguage!=LANGUAGE_DONTKNOW)
-    {
-        if (IsScriptTypeMatchingToLanguage(m_nScriptType,rSystemLanguage ))
-            LangItems[::rtl::OUString(aLangTable.GetString(rSystemLanguage))]=::rtl::OUString(aLangTable.GetString(rSystemLanguage));
-    }
-
-    //3--UI
-    LanguageType rUILanguage = rAllSettings.GetUILanguage();
-    if(rUILanguage!=LANGUAGE_DONTKNOW)
-    {
-        if (IsScriptTypeMatchingToLanguage(m_nScriptType, rUILanguage ))
-            LangItems[::rtl::OUString(aLangTable.GetString(rUILanguage))]=::rtl::OUString(aLangTable.GetString(rUILanguage));
-    }
-
-    //4--guessed language
-    uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( m_aLangGuessHelper.GetGuesser() );
-    if (xLangGuesser.is() && m_aGuessedText.getLength() > 0)
-    {
-        ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( m_aGuessedText, 0, m_aGuessedText.getLength()) );
-        LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
-        if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
-            && IsScriptTypeMatchingToLanguage( m_nScriptType, nLang ))
-            LangItems[aLangTable.GetString(nLang)]=aLangTable.GetString(nLang);
-    }
-
-    //5--keyboard language
-    if(m_aKeyboardLang!=::rtl::OUString::createFromAscii(""))
-    {
-        if (IsScriptTypeMatchingToLanguage(m_nScriptType, aLanguageTable.GetType(m_aKeyboardLang)))
-            LangItems[m_aKeyboardLang] = m_aKeyboardLang;
-    }
-
-    //6--all languages used in current document
-    Reference< com::sun::star::frame::XModel > xModel;
-    if ( m_xFrame.is() )
-    {
-       Reference< com::sun::star::frame::XController > xController( m_xFrame->getController(), UNO_QUERY );
-       if ( xController.is() )
-           xModel = xController->getModel();
-    }
-    Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, UNO_QUERY );
-    /*the description of m_nScriptType
-      LATIN : 1
-      ASIAN : 2
-      COMPLEX:4
-      LATIN  + ASIAN : 3
-      LATIN  + COMPLEX : 5
-      ASIAN + COMPLEX : 6
-      LATIN + ASIAN + COMPLEX : 7
-    */
-
-    sal_Int16 nCount=7;
-    if(xDocumentLanguages.is())
-    {
-        Sequence< Locale > rLocales(xDocumentLanguages->getDocumentLanguages(m_nScriptType,nCount));
-        if(rLocales.getLength()>0)
-        {
-            for(USHORT i = 0; i<rLocales.getLength();++i)
-            {
-                if (LangItems.size()==7)
-                    break;
-                const Locale& rLocale=rLocales[i];
-                if(IsScriptTypeMatchingToLanguage(m_nScriptType, aLanguageTable.GetType(rLocale.Language)))
-                    LangItems[rLocale.Language] = rLocale.Language;
-            }
-        }
-    }
-    std::map< sal_Int16, ::rtl::OUString > LangTable;
-
-    const ::rtl::OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));
-    bool bMultipleLanguages = (eMode != MODE_SetLanguageSelectionMenu) || m_aCurLang.compareToAscii( "*" ) == 0;
-    bool bNothingSelected = true;
-    MenuItemBits nItemBits = !bMultipleLanguages ? MIB_RADIOCHECK : 0;
-    for(std::map< ::rtl::OUString, ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it)
-    {
-        if(it->first != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-           it->first != sAsterix &&
-           it->first.getLength())
+        const OUString & rStr( *it );
+        if (rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
+            rStr != sAsterix &&
+            rStr != sEmpty)
         {
-            ++nItemId;
-            pPopupMenu->InsertItem( nItemId,it->first,nItemBits );
-            LangTable[nItemId] = it->first;
-            if(it->first == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
+            pPopupMenu->InsertItem( nItemId, rStr );
+            aCmd = aCmd_Language;
+            aCmd += String( rStr );
+            pPopupMenu->SetItemCommand( nItemId, aCmd );
+            if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
             {
                 //make a sign for the current language
-                pPopupMenu->CheckItem(nItemId,TRUE);
-                bNothingSelected = false;
+                pPopupMenu->CheckItem( nItemId, TRUE );
             }
-            aCmd=aCmd_Language;
-            aCmd+=(String)it->first;
-            pPopupMenu->SetItemCommand(nItemId,aCmd);
+            aLangMap[ nItemId ] = rStr;
+            ++nItemId;
         }
     }
 
-    //7--none
-    nItemId++;
-    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )), nItemBits );
-    if (bNothingSelected && !bMultipleLanguages)
-        pPopupMenu->CheckItem(nItemId,TRUE);
+    // entry for LANGUAGE_NONE
+    ++nItemId;
+    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )) );
+    aCmd=aCmd_Language;
+    aCmd.AppendAscii("LANGUAGE_NONE");
+    pPopupMenu->SetItemCommand( nItemId, aCmd );
+
+    // entry for 'Reset to default language'
+    ++nItemId;
+    pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_RESET_TO_DEFAULT_LANGUAGE )) );
     aCmd=aCmd_Language;
-    aCmd+=String::CreateFromAscii("LANGUAGE_NONE");
-    pPopupMenu->SetItemCommand(nItemId,aCmd);
+    aCmd.AppendAscii("RESET_LANGUAGES");
+    pPopupMenu->SetItemCommand( nItemId, aCmd );
 
-    //More...
-    nItemId++;
+    // entry for opening the Format/Character dialog
+    ++nItemId;
     pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_MORE )));
-    pPopupMenu->SetItemCommand(nItemId,aCmd_Dialog);
+    pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
 }
 
 
@@ -431,10 +366,10 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >
 
         if ( m_bInitialized )
         {
-            m_aLangStatusCommandURL				  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" ));
+            m_aLangStatusCommandURL				  = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" ));
             m_aMenuCommandURL_Lang				  = m_aLangStatusCommandURL;
-            m_aMenuCommandURL_Font			      = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" ));
-            m_aMenuCommandURL_CharDlgForParagraph = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" ));
+            m_aMenuCommandURL_Font			      = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" ));
+            m_aMenuCommandURL_CharDlgForParagraph = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" ));
         }
     }
 }
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 7c086f2d4a..cc408eb6f2 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include <uielement/langselectionstatusbarcontroller.hxx>
 #include <classes/fwkresid.hxx>
 #include <services.h>
@@ -53,8 +54,6 @@
 #include <com/sun/star/frame/XModule.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <map>
-#include <set>
 #include <classes/fwkresid.hxx>
 #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
@@ -74,6 +73,9 @@
 
 #include "helper/mischelper.hxx"
 
+#include <map>
+#include <set>
+
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -82,9 +84,14 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::document;
 
+using ::rtl::OUString;
+
+
 namespace framework
 {
 
+////////////////////////////////////////////////////////////
+
 DEFINE_XSERVICEINFO_MULTISERVICE        (   LangSelectionStatusbarController     	    ,
                                             OWeakObject                             ,
                                             SERVICENAME_STATUSBARCONTROLLER		    ,
@@ -94,10 +101,10 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   LangSelectionStatusbarController
 DEFINE_INIT_SERVICE                     (   LangSelectionStatusbarController, {} )
 
 LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ),
+    svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 ),
     m_bShowMenu( sal_True ),
-    m_nScriptType( 7 )
-    ,m_aLangGuessHelper(xServiceManager)
+    m_nScriptType( LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX ),
+    m_aLangGuessHelper( xServiceManager )
 {
 }
 
@@ -178,223 +185,158 @@ throw (::com::sun::star::uno::RuntimeException)
     return sal_False;
 }
 
-void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::RuntimeException)
+void LangSelectionStatusbarController::LangMenu()
+throw (::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::LangMenu" );
     if (!m_bShowMenu)
         return;
 
     //add context menu
-    const static ::rtl::OUString s_sPopupMenu(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PopupMenu"));
+    const static OUString s_sPopupMenu(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PopupMenu"));
     Reference< awt::XPopupMenu > xPopupMenu( m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY );
     //sub menu that contains all items except the last two items: Separator + Set Language for Paragraph
     Reference< awt::XPopupMenu > subPopupMenu(m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY );
 
-    std::set< ::rtl::OUString > LangItems;
-
-    SvtLanguageTable aLanguageTable;
-    USHORT nItemId=1;
-
-    //1--add current language
-    if( m_aCurLang != ::rtl::OUString( ) &&
-        LANGUAGE_DONTKNOW != aLanguageTable.GetType( m_aCurLang ))
-        LangItems.insert( m_aCurLang );
-
-    //2--System
-    SvtLanguageTable aLangTable;
-    const AllSettings& rAllSettings = Application::GetSettings();
-    LanguageType rSystemLanguage = rAllSettings.GetLanguage();
-    if( rSystemLanguage != LANGUAGE_DONTKNOW )
-    {
-        if ( IsScriptTypeMatchingToLanguage( m_nScriptType, rSystemLanguage ))
-            LangItems.insert( ::rtl::OUString( aLangTable.GetString( rSystemLanguage )) );
-    }
-
-    //3--UI
-    LanguageType rUILanguage = rAllSettings.GetUILanguage();
-    if( rUILanguage != LANGUAGE_DONTKNOW )
-    {
-        if ( IsScriptTypeMatchingToLanguage( m_nScriptType, rUILanguage ))
-            LangItems.insert( ::rtl::OUString( aLangTable.GetString( rUILanguage )) );
-    }
-
-    //4--guessed language
-    uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( m_aLangGuessHelper.GetGuesser() );
-    if ( xLangGuesser.is() && m_aGuessedText.getLength() > 0)
-    {
-        ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( m_aGuessedText, 0, m_aGuessedText.getLength()) );
-        LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
-        if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
-            && IsScriptTypeMatchingToLanguage( m_nScriptType, nLang ))
-            LangItems.insert( aLangTable.GetString( nLang ));
-    }
-
-    //5--keyboard language
-    if( m_aKeyboardLang != ::rtl::OUString::createFromAscii( "" ))
+    SvtLanguageTable    aLanguageTable;
+    
+    // get languages to be displayed in the menu
+    std::set< OUString > aLangItems;
+    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
+    std::map< sal_Int16, OUString > aLangMap;
+    std::set< OUString >::const_iterator it;
+    for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
     {
-        if ( IsScriptTypeMatchingToLanguage( m_nScriptType, aLanguageTable.GetType( m_aKeyboardLang )))
-            LangItems.insert( m_aKeyboardLang );
-    }
-
-    //6--all languages used in current document
-    Reference< com::sun::star::frame::XModel > xModel;
-    if ( m_xFrame.is() )
-    {
-       Reference< com::sun::star::frame::XController > xController( m_xFrame->getController(), UNO_QUERY );
-       if ( xController.is() )
-           xModel = xController->getModel();
-    }
-    Reference< document::XDocumentLanguages > xDocumentLanguages( xModel, UNO_QUERY );
-    /*the description of m_nScriptType
-      LATIN : 1
-      ASIAN : 2
-      COMPLEX:4
-      LATIN  + ASIAN : 3
-      LATIN  + COMPLEX : 5
-      ASIAN + COMPLEX : 6
-      LATIN + ASIAN + COMPLEX : 7
-    */
-
-    sal_Int16 nCount=7;
-    if ( xDocumentLanguages.is() )
-    {
-        Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( m_nScriptType, nCount ));
-        if ( rLocales.getLength() > 0 )
-        {
-            for ( USHORT i = 0; i<rLocales.getLength();++i )
-            {
-                if ( LangItems.size() == 7 )
-                    break;
-                const Locale& rLocale=rLocales[i];
-                if( IsScriptTypeMatchingToLanguage( m_nScriptType, aLangTable.GetType( rLocale.Language )))
-                    LangItems.insert( ::rtl::OUString( rLocale.Language ) );
-            }
-        }
-    }
-    std::map< sal_Int16, ::rtl::OUString > LangTable;
-    bool bMultipleLanguages = m_aCurLang.compareToAscii( "*" ) == 0;
-    bool bNothingSelected = true;
-    sal_Int16 nMenuItemStyle = !bMultipleLanguages ? css::awt::MenuItemStyle::RADIOCHECK : 0;
-
-    for( std::set< ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it )
-    {
-        if ( *it != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-             *it != ::rtl::OUString::createFromAscii( "*" ) &&
-             *it != ::rtl::OUString::createFromAscii( ""  ))
+        const OUString & rStr( *it );
+        if ( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) ) &&
+             rStr != sAsterix &&
+             rStr != sEmpty)
         {
-            //nItemId = xPopupMenu->getItemCount()+1;
-            nItemId++;
-            xPopupMenu->insertItem( nItemId, *it, nMenuItemStyle, nItemId );
-            LangTable[nItemId]=*it;
-            if( *it == m_aCurLang )
+            DBG_ASSERT( MID_LANG_SEL_1 <= nItemId && nItemId <= MID_LANG_SEL_9,
+                    "nItemId outside of expected range!" );
+            xPopupMenu->insertItem( nItemId, rStr, css::awt::MenuItemStyle::RADIOCHECK, nItemId );
+            if ( rStr == m_aCurLang )
             {
                 //make a sign for the current language
                 xPopupMenu->checkItem( nItemId, TRUE );
-                bNothingSelected = false;
             }
+            aLangMap[ nItemId ] = rStr;
+            ++nItemId;
         }
     }
-
-    //7--none
-    nItemId++;
-    xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), nMenuItemStyle, nItemId );
-    if (bNothingSelected && !bMultipleLanguages)
-        xPopupMenu->checkItem( nItemId, TRUE );
-
-    //More...
-    nItemId++;
-    xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), 0, nItemId );
-
-    for( ::std::set< ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it )
+    xPopupMenu->insertItem( MID_LANG_SEL_NONE,  String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_NONE );
+    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)
     {
-        if( *it != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&&
-            *it != ::rtl::OUString::createFromAscii( "*" ) &&
-            *it != ::rtl::OUString::createFromAscii( ""  ))
+        const OUString & rStr( *it );
+        if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
+            rStr != sAsterix &&
+            rStr != sEmpty)
         {
-            nItemId++;
-            subPopupMenu->insertItem( nItemId, *it, 0, nItemId );
-            LangTable[nItemId]=*it;
+            DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <= MID_LANG_PARA_9,
+                    "nItemId outside of expected range!" );
+            subPopupMenu->insertItem( nItemId, rStr, css::awt::MenuItemStyle::RADIOCHECK, nItemId );
+            aLangMap[nItemId] = rStr;
+            ++nItemId;
         }
     }
-    //7--none
-    nItemId++;
-    subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), 0, nItemId );
-    //More
-    nItemId++;
-    subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), 0, nItemId );
+    subPopupMenu->insertItem( MID_LANG_PARA_NONE,  String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_NONE );
+    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 );
 
-    nItemId++;
-    xPopupMenu->insertSeparator(nItemId);
+    //
+    // 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 );
 
-    nItemId++;
-    xPopupMenu->insertItem( nItemId, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), 0, nItemId );
-    xPopupMenu->setPopupMenu( nItemId, subPopupMenu );
 
-    //display the popup menu and execute every command
+    //
+    // now display the popup menu and execute every command ...
+    //
 
     Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
 
-    com::sun::star::awt::Rectangle mRectangle;
+    com::sun::star::awt::Rectangle aRectangle;
     Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow );
     const Point mMousePos = pWindow->GetPointerPosPixel();
-    mRectangle.X = mMousePos.X();
-    mRectangle.Y = mMousePos.Y();
-    sal_Int16 nId = xPopupMenu->execute( xParent, mRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
+    aRectangle.X = mMousePos.X();
+    aRectangle.Y = mMousePos.Y();
+    sal_Int16 nId = xPopupMenu->execute( xParent, aRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
     //click "More..."
     if ( nId && m_xFrame.is() )
     {
         uno::Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         util::URL aURL;
 
-        if ( nId < nItemId-3-subPopupMenu->getItemCount() )
+        if (MID_LANG_SEL_1 <= nId && nId <= MID_LANG_SEL_9)
         {
-            //1..7
             //set selected language as current language for selection
-            String SelectedLang = LangTable[nId];
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Current_");
-            aURL.Complete+=SelectedLang;
+            String aSelectedLang = aLangMap[nId];
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_");
+            aURL.Complete += aSelectedLang;
         }
-        else if ( nId == nItemId-3-subPopupMenu->getItemCount() )
+        else if (nId == MID_LANG_SEL_NONE)
         {
-            //8
             //set None as current language for selection
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+            aURL.Complete += OUString::createFromAscii(".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");
         }
-        else if ( nId == nItemId-2-subPopupMenu->getItemCount() )
+        else if (nId == MID_LANG_SEL_MORE)
         {
-            //9 (more)...
             //open the dialog "format/character" for current selection
-            aURL.Complete+=String::CreateFromAscii(".uno:FontDialog?Language:string=*");
+            aURL.Complete += OUString::createFromAscii(".uno:FontDialog?Language:string=*");
         }
-        else if ( nId < nItemId-3 && nId>nItemId-2-subPopupMenu->getItemCount() )
+        else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
         {
-            //1..7 para
             //set selected language for current paragraph
-            String SelectedLang = LangTable[nId];
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
-            aURL.Complete+=SelectedLang;
+            String aSelectedLang = aLangMap[nId];
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+            aURL.Complete += aSelectedLang;
         }
-        else if ( nId==nItemId-3 )
+        else if (nId == MID_LANG_PARA_NONE)
         {
-            //8 para
             //set None as language for current paragraph
-            aURL.Complete+=String::CreateFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
         }
-        else if ( nId==nItemId-2 )
+        else if (nId == MID_LANG_PARA_RESET)
+        {
+            // reset language attributes for paragraph
+            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES");
+        }
+        else if (nId == MID_LANG_PARA_MORE)
         {
-            //9 (more) para...
             //open the dialog "format/character" for current paragraph
-            aURL.Complete+=String::CreateFromAscii(".uno:FontDialogForParagraph");
+            aURL.Complete += OUString::createFromAscii(".uno:FontDialogForParagraph");
         }
 
-        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
         xURLTransformer->parseStrict( aURL );
-        uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL,::rtl::OUString(),0);
+        uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0);
         if( xDispatch.is() )
         {
             uno::Sequence< beans::PropertyValue > aPV;
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
+                UiEventLogHelper( OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
             xDispatch->dispatch( aURL, aPV);
         }
     }
@@ -443,6 +385,13 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
+    // This function will be called when observed data changes,
+    // for example the selection or keyboard language.
+    // - It displays the language in use in the status bar
+    // - and it stores the relevant data for creating the menu
+    //   at some later point in the member variables
+    //      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() );
 
@@ -451,25 +400,22 @@ throw ( RuntimeException )
 
     m_bShowMenu = sal_True;
 
-    m_nScriptType=7;//set the default value
+    m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX;  //set the default value
     Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow );
     if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 )
     {
-        rtl::OUString               aStrValue;
-        Sequence< ::rtl::OUString > aSeq;
+        OUString               aStrValue;
+        Sequence< OUString > aSeq;
 
         StatusBar*    pStatusBar = (StatusBar *)pWindow;
         if ( Event.State >>= aStrValue )
-        {
             pStatusBar->SetItemText( m_nID, aStrValue );
-            m_aCurrentLanguage = aStrValue;
-        }
         else if ( Event.State >>= aSeq )
         {
             if ( aSeq.getLength() == 4 )
             {
                 const String aMultipleLangText( FwkResId( STR_LANGSTATUS_MULTIPLE_LANGUAGES ) );
-                ::rtl::OUString aStatusText = aSeq[0];
+                OUString aStatusText = aSeq[0];
                 if ( 0 == aStatusText.compareToAscii( "*" ))
                     aStatusText = aMultipleLangText;
                 pStatusBar->SetItemText( m_nID, aStatusText );
@@ -479,7 +425,7 @@ throw ( RuntimeException )
                 m_aCurLang      = aSeq[0];
                 m_nScriptType   = static_cast< sal_Int16 >( aSeq[1].toInt32() );
                 m_aKeyboardLang = aSeq[2];
-                m_aGuessedText  = aSeq[3];
+                m_aGuessedTextLang  = aSeq[3];
             }
         }
         else if ( !Event.State.hasValue() )
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index c39b5a231b..7c82e2e825 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -92,6 +92,9 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
     resetPopupMenu( rPopupMenu );
     if ( pVCLPopupMenu )
         pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu();
+
+    if (!pPopupMenu)
+        return;
         
     // insert basic
     String aCommand = String::CreateFromAscii( ".uno:MacroDialog" );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index a804d9270b..e4cb7fd3ed 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -517,7 +517,47 @@ void ToolBarManager::UpdateControllers()
     }
     m_bUpdateControllers = sal_False;
 }
+//for update toolbar controller via Support Visible by shizhoubo
+void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xController)
+{
+    RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
+
+    if ( !m_bUpdateControllers )
+    {
+        m_bUpdateControllers = sal_True;
+        try
+        {   if(xController.is())
+            {
+                Reference< XUpdatable > xUpdatable( xController, UNO_QUERY );
+                if ( xUpdatable.is() )
+                    xUpdatable->update();
+            }
+         }
+         catch ( Exception& )
+         {
+         }
+
+       /* 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;
+}
+//end
 void ToolBarManager::frameAction( const FrameActionEvent& Action )
 throw ( RuntimeException )
 {
@@ -1072,6 +1112,19 @@ void ToolBarManager::CreateControllers()
 
                 Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
                 xInit->initialize( aArgs );
+                //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" )) || 
+                       aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" )) 
+                       )
+                        pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True));
+                }
+                
+                //end
             }
 
             // Request a item window from the toolbar controller and set it at the VCL toolbar
@@ -1092,6 +1145,31 @@ void ToolBarManager::CreateControllers()
                 }
             }
         }
+        //for update Controller via support visiable state by shizhoubo
+        Reference< XPropertySet > xPropSet( xController, UNO_QUERY );
+        if ( xPropSet.is() )
+        {
+            try
+            {
+                sal_Bool bSupportVisiable = sal_True;
+                Any a( xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SupportsVisiable" ))) );
+                a >>= bSupportVisiable;
+                if ( bSupportVisiable )
+                {
+                    Reference< XToolbarController > xTbxController( xController, UNO_QUERY );
+                    UpdateController(xTbxController);
+                }
+            }
+            catch ( RuntimeException& )
+            {
+                throw;
+            }
+            catch ( Exception& )
+            {
+            }
+        }
+        //end
+
     }
 
     AddFrameActionListener();
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 55cb3c0aea..6a65b9986f 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -113,6 +113,9 @@ SHL1STDLIBS=    \
                 $(UNOTOOLSLIB)      \
                 $(CPPUHELPERLIB)    \
                 $(TOOLSLIB)         \
+                $(SVTOOLLIB)        \
+                $(SVLLIB)        	\
+                $(I18NISOLANGLIB)   \
                 $(VOSLIB)           \
                 $(VCLLIB)           \
                 $(TKLIB)            \
@@ -205,7 +208,6 @@ SHL3STDLIBS=    \
                 $(SVTOOLLIB)                        \
                 $(UNOTOOLSLIB)                      \
                 $(TOOLSLIB)                         \
-                $(I18NISOLANGLIB)                   \
                 $(COMPHELPERLIB)                    \
                 $(CPPUHELPERLIB)                    \
                 $(COMPHELPERLIB)                    \
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 4647861b99..9199d43ad9 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
+
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index ea08c32260..04fc03b497 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -74,6 +74,12 @@ static const sal_Char*		pVerStr5	= "WBSWG5";
 static const sal_Char*		pVerStr6	= "WBSWG6";
 static const sal_Char*      pVerOOo7    = "OOoUserDict1";
 
+static const INT16 DIC_VERSION_DONTKNOW = -1;
+static const INT16 DIC_VERSION_2 = 2;
+static const INT16 DIC_VERSION_5 = 5;
+static const INT16 DIC_VERSION_6 = 6;
+static const INT16 DIC_VERSION_7 = 7;
+
 static sal_Bool getTag(const ByteString &rLine, 
         const sal_Char *pTagName, ByteString &rTagValue)
 {
@@ -89,7 +95,7 @@ static sal_Bool getTag(const ByteString &rLine,
 INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
 {
     // Sniff the header
-    INT16 nDicVersion;
+    INT16 nDicVersion = DIC_VERSION_DONTKNOW;
     sal_Char pMagicHeader[MAX_HEADER_LENGTH];
 
     nLng = LANGUAGE_NONE;
@@ -107,7 +113,7 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
         sal_Bool bSuccess;
         ByteString aLine;
 
-        nDicVersion = 7;
+        nDicVersion = DIC_VERSION_7;
 
         // 1st skip magic / header line
         rpStream->ReadLine(aLine);
@@ -160,17 +166,17 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
 
         // Check version magic
         if (0 == strcmp( pMagicHeader, pVerStr6 ))
-            nDicVersion = 6;
+            nDicVersion = DIC_VERSION_6;
         else if (0 == strcmp( pMagicHeader, pVerStr5 ))
-            nDicVersion = 5;
+            nDicVersion = DIC_VERSION_5;
         else if (0 == strcmp( pMagicHeader, pVerStr2 ))
-            nDicVersion = 2;
+            nDicVersion = DIC_VERSION_2;
         else
-            nDicVersion = -1;
+            nDicVersion = DIC_VERSION_DONTKNOW;
 
-        if (2 == nDicVersion ||
-            5 == nDicVersion ||
-            6 == nDicVersion)
+        if (DIC_VERSION_2 == nDicVersion ||
+            DIC_VERSION_5 == nDicVersion ||
+            DIC_VERSION_6 == nDicVersion)
         {
             // The language of the dictionary
             *rpStream >> nLng;
@@ -203,7 +209,7 @@ DictionaryNeo::DictionaryNeo() :
     nLanguage		(LANGUAGE_NONE)
 {
     nCount		 = 0;
-    nDicVersion	 = -1;
+    nDicVersion	 = DIC_VERSION_DONTKNOW;
     bNeedEntries = FALSE;
     bIsModified	 = bIsActive = FALSE;
     bIsReadonly	 = FALSE;
@@ -220,7 +226,7 @@ DictionaryNeo::DictionaryNeo(const OUString &rName,
     nLanguage       (nLang)
 {
     nCount		 = 0;
-    nDicVersion	 = -1;
+    nDicVersion	 = DIC_VERSION_DONTKNOW;
     bNeedEntries = TRUE;
     bIsModified	 = bIsActive = FALSE;
     bIsReadonly = !bWriteable;
@@ -230,8 +236,8 @@ DictionaryNeo::DictionaryNeo(const OUString &rName,
         BOOL bExists = FileExists( rMainURL );
         if( !bExists )
         {
-            // save new dictionaries with in 6.0 Format (uses UTF8)
-            nDicVersion	 = 6;
+            // save new dictionaries with in Format 7 (UTF8 plain text)
+            nDicVersion	 = DIC_VERSION_7;
 
             //! create physical representation of an **empty** dictionary
             //! that could be found by the dictionary-list implementation
@@ -303,13 +309,13 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
     eDicType = bNegativ ? DictionaryType_NEGATIVE : DictionaryType_POSITIVE;
 
     rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
-    if (nDicVersion >= 6)
+    if (nDicVersion >= DIC_VERSION_6)
         eEnc = RTL_TEXTENCODING_UTF8;
     nCount = 0;
 
-    if (6 == nDicVersion ||
-        5 == nDicVersion ||
-        2 == nDicVersion)
+    if (DIC_VERSION_6 == nDicVersion ||
+        DIC_VERSION_5 == nDicVersion ||
+        DIC_VERSION_2 == nDicVersion)
     {
         USHORT  nLen = 0;
         sal_Char aWordBuf[ BUFSIZE ];
@@ -363,7 +369,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
             *(aWordBuf + nLen) = 0;
         }
     }
-    else if (7 == nDicVersion)
+    else if (DIC_VERSION_7 == nDicVersion)
     {
         sal_Bool bSuccess;
         ByteString aLine;
@@ -436,10 +442,10 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
     ULONG nErr = sal::static_int_cast< ULONG >(-1);
 
     rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
-    if (nDicVersion >= 6)
+    if (nDicVersion >= DIC_VERSION_6)
         eEnc = RTL_TEXTENCODING_UTF8;
 
-    if (nDicVersion == 7)
+    if (nDicVersion == DIC_VERSION_7)
     {
         pStream->WriteLine(ByteString (pVerOOo7));
         if (0 != (nErr = pStream->GetError()))
@@ -482,7 +488,7 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
 
         // write version
         const sal_Char *pVerStr = NULL;
-        if (6 == nDicVersion)
+        if (DIC_VERSION_6 == nDicVersion)
             pVerStr = pVerStr6;
         else
             pVerStr = eDicType == DictionaryType_POSITIVE ? pVerStr2 : pVerStr5;
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index de7c14349e..989d0588e4 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
+#include <cppuhelper/factory.hxx>
+#include <i18npool/mslangid.hxx>
 #include <osl/file.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
@@ -52,6 +54,11 @@
 #include "dicimp.hxx"
 #include "lngopt.hxx"
 
+#include "defs.hxx"
+#include "dlistimp.hxx"
+#include "dicimp.hxx"
+#include "lngopt.hxx"
+
 //using namespace utl;
 using namespace osl;
 using namespace rtl;
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 5162329bfa..1d5dade69b 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -535,7 +535,7 @@
     </node>
     <node oor:name="F7_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-      <value xml:lang="en-US">.uno:Thesaurus</value>
+      <value xml:lang="en-US">.uno:ThesaurusDialog</value>
      </prop>
     </node>
     <node oor:name="F7_SHIFT" oor:op="replace">
@@ -568,6 +568,11 @@
       <value xml:lang="en-US">.uno:CalculateHard</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
@@ -1077,7 +1082,7 @@
     </node>
     <node oor:name="F7_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-      <value xml:lang="en-US">.uno:Thesaurus</value>
+      <value xml:lang="en-US">.uno:ThesaurusDialog</value>
      </prop>
     </node>
     <node oor:name="F8" oor:op="replace">
@@ -1090,6 +1095,11 @@
       <value xml:lang="en-US">.uno:TextFitToSize</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
@@ -1566,6 +1576,11 @@
       <value xml:lang="en-US">.uno:UpdateInputFields</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
@@ -2041,7 +2056,7 @@
     </node>
     <node oor:name="F7_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-      <value xml:lang="en-US">.uno:Thesaurus</value>
+      <value xml:lang="en-US">.uno:ThesaurusDialog</value>
      </prop>
     </node>
     <node oor:name="F8" oor:op="replace">
@@ -2054,6 +2069,11 @@
       <value xml:lang="en-US">.uno:TextFitToSize</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
@@ -2597,6 +2617,11 @@
       <value xml:lang="en-US">.uno:UpdateInputFields</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
@@ -4442,6 +4467,11 @@
       <value xml:lang="en-US">.uno:UpdateInputFields</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
@@ -5052,6 +5082,11 @@
       <value xml:lang="en-US">.uno:UpdateInputFields</value>
      </prop>
     </node>
+    <node oor:name="F_MOD1_MOD2" oor:op="replace">
+     <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+      <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+     </prop>
+    </node>    
     <node oor:name="F_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="de">.uno:Bold</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 52db8cb5de..4a8002e167 100644
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -63,5 +63,10 @@
         <value>vnd.sun.star.popup:*</value>
       </prop>
     </node>
+    <node oor:name="com.sun.star.comp.svx.FindbarDispatcher" oor:op="replace">
+      <prop oor:name="Protocols">
+        <value>vnd.sun.star.findbar:*</value>
+      </prop>
+    </node>    
   </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index b3ddf0ce33..85687bb9f4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -293,6 +293,26 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+                <prop oor:name="DockPos" oor:type="xs:string">
+                    <value>1,0</value>
+                </prop>
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>0</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Find</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+            </node>            
             <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
                 <prop oor:name="DockPos" oor:type="xs:string">
                     <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index fbe5971940..e09cbca03d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -383,6 +383,39 @@
           <value>com.sun.star.comp.chart2.ShapeToolbarController</value>
         </prop>
       </node>
+      <node oor:name="com.sun.star.svx.FindTextToolboxController" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FindText</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.svx.FindTextToolboxController</value>
+        </prop>
+      </node>
+      <node oor:name="com.sun.star.svx.DownSearchToolboxController" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:DownSearch</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.svx.DownSearchToolboxController</value>
+        </prop>
+      </node>
+      <node oor:name="com.sun.star.svx.UpSearchToolboxController" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:UpSearch</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.svx.UpSearchToolboxController</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="StatusBar">
       <node oor:name="c1" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 4a316a7c32..57a14b4889 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -106,6 +106,26 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+                <prop oor:name="DockPos" oor:type="xs:string">
+                    <value>1,0</value>
+                </prop>
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>0</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Find</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+            </node>
             <node oor:name="private:resource/toolbar/drawingobjectbar" oor:op="replace">
                 <prop oor:name="DockPos" oor:type="xs:string">
                     <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 02c922d9a2..175867d07d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1459,6 +1459,38 @@
                     <value>1</value>
                 </prop>
             </node>
+            <node oor:name=".uno:FindText" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Find Text</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DownSearch" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Find Next</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>            
+            <node oor:name=".uno:UpSearch" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Find Previous</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name="vnd.sun.star.findbar:FocusToFindbar" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Focus to Findbar</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>            
             <node oor:name=".uno:ExtendedHelp" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">What's ~This?</value>
@@ -2090,22 +2122,22 @@
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ChangeCaseToUpper" oor:op="replace">
+            <node oor:name=".uno:LanguageStatus" oor:op="replace">
+                    <prop oor:name="Label" oor:type="xs:string">
+                            <value xml:lang="en-US">Language Status</value>
+                    </prop>
+            </node>
+            <node oor:name=".uno:ChooseControls" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Uppercase</value>
+                    <value xml:lang="en-US">Insert Controls</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
-                        <node oor:name=".uno:LanguageStatus" oor:op="replace">
-                                <prop oor:name="Label" oor:type="xs:string">
-                                        <value xml:lang="en-US">Language Status</value>
-                                </prop>
-                        </node>
-                        <node oor:name=".uno:ChooseControls" oor:op="replace">
+            <node oor:name=".uno:ChangeCaseToSentenceCase" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert Controls</value>
+                    <value xml:lang="en-US">~Sentence case</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -2113,7 +2145,31 @@
             </node>
             <node oor:name=".uno:ChangeCaseToLower" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Lowercase</value>
+                    <value xml:lang="en-US">~lowercase</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ChangeCaseToUpper" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">~UPPERCASE</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ChangeCaseToTitleCase" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">~Capitalize Every Word</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ChangeCaseToToggleCase" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">~tOGGLE cASE</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -2989,7 +3045,7 @@
                     <value xml:lang="en-US">New FrameSet</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Thesaurus" oor:op="replace">
+            <node oor:name=".uno:ThesaurusDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Thesaurus...</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index f14f4d7931..e4ab860142 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -870,6 +870,26 @@
           <value>true</value>
         </prop>
       </node>
+      <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+        <prop oor:name="DockPos" oor:type="xs:string">
+          <value>1,0</value>
+        </prop>
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>true</value>
+        </prop>
+        <prop oor:name="DockingArea" oor:type="xs:int">
+          <value>0</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Find</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
     </node>
   </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 1a3db34f6e..7570fda066 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -156,7 +156,7 @@
             </node>
             <node oor:name=".uno:ToolBox" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Formula Elements</value>
+                    <value xml:lang="en-US">Elements</value>
                 </prop>
             </node>
             <node oor:name=".uno:FormelCursor" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 3988e6dcd6..c18fc70f36 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -52,6 +52,26 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+                <prop oor:name="DockPos" oor:type="xs:string">
+                    <value>1,0</value>
+                </prop>
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>0</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Find</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+            </node>			
             <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
                 <prop oor:name="DockPos" oor:type="xs:string">
                     <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 49c862fb92..5b0ddd349f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -52,6 +52,26 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+                <prop oor:name="DockPos" oor:type="xs:string">
+                    <value>1,0</value>
+                </prop>
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>0</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Find</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+            </node>			
             <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
                 <prop oor:name="DockPos" oor:type="xs:string">
                     <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index ec708174a6..51b7224b47 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -52,6 +52,26 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+                <prop oor:name="DockPos" oor:type="xs:string">
+                    <value>1,0</value>
+                </prop>
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>0</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Find</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+            </node>            
             <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
                 <prop oor:name="DockPos" oor:type="xs:string">
                     <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 841514c25f..a77f3fa59e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -53,6 +53,26 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/findbar" oor:op="replace">
+                <prop oor:name="DockPos" oor:type="xs:string">
+                    <value>1,0</value>
+                </prop>
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>0</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Find</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+                    <value>false</value>
+                </prop>
+            </node>			
             <node oor:name="private:resource/toolbar/textobjectbar" oor:op="replace">
                 <prop oor:name="DockPos" oor:type="xs:string">
                     <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 87dc968c4f..8e18ca575c 100755
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -37,6 +37,10 @@
         <prop oor:name="ooSetupVersionAboutBox" install:module="brand">
             <value>${ABOUTBOXPRODUCTVERSION}</value>
         </prop>
+        <prop oor:name="ooVendor" install:module="brand">
+            <value>${OOOVENDOR}</value>
+        </prop>
+    
         <prop oor:name="ooSetupExtension" install:module="brand">
             <value >${PRODUCTEXTENSION}</value>
         </prop>
@@ -86,6 +90,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >scalc</value>
                 </prop>
@@ -127,6 +134,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >sdraw</value>
                 </prop>
@@ -168,6 +178,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >simpress</value>
                 </prop>
@@ -207,6 +220,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >smath</value>
                 </prop>
@@ -246,6 +262,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >sglobal</value>
                 </prop>
@@ -287,6 +306,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >swriter</value>
                 </prop>
@@ -434,6 +456,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >sweb</value>
                 </prop>
@@ -686,6 +711,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >schart</value>
                 </prop>
@@ -725,6 +753,9 @@
                 <prop oor:name="ooSetupFactoryTemplateFile">
                     <value ></value>
                 </prop>
+                <prop oor:name="ooSetupFactorySystemDefaultTemplateChanged">
+                    <value >false</value>
+                </prop>
                 <prop oor:name="ooSetupFactoryShortName">
                     <value >dbapp</value>
                 </prop>
@@ -801,13 +832,13 @@
           <node oor:name="Common" oor:op="replace">
             <prop oor:name="IncludedFiles">
               <value>
-                .*/autotext/.*
-                .*/autocorr/.*
-                .*/config/.*\.so[bcdegh]
-                .*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml
-                .*/config/soffice.cfg/modules/.*/images/.*
-                .*/gallery/.*
-                .*/template/.*
+                <it>.*/autotext/.*</it>
+                <it>.*/autocorr/.*</it>
+                <it>.*/config/.*\.so[bcdegh]</it>
+                <it>.*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml</it>
+                <it>.*/config/soffice.cfg/modules/.*/images/.*</it>
+                <it>.*/gallery/.*</it>
+                <it>.*/template/.*</it>
               </value>
             </prop>
             <prop oor:name="IncludedNodes">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 220d94c89d..7cb13b7070 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -121,6 +121,31 @@
                     <label>Spell and grammar context menu dictionary image</label>
                 </info>
             </prop>
+            <prop oor:name="ThesaurusDialogImage" oor:type="xs:string">
+                <info>
+                    <desc>The path to the image for the thesaurus dialog.</desc>
+                    <label>Thesaurus dialog image</label>
+                </info>
+            </prop>
+            <prop oor:name="ThesaurusDialogImage_HC" oor:type="xs:string">
+                <info>
+                    <desc>The path to the image for the thesaurus dialog in high contrast mode.</desc>
+                    <label>Thesaurus dialog image</label>
+                </info>
+            </prop>
+            <prop oor:name="SynonymsContextMenuImage" oor:type="xs:string">
+                <info>
+                    <desc>The path to the image for the synonyms context menu.</desc>
+                    <label>Synonyms context menu image</label>
+                </info>
+            </prop>
+            <prop oor:name="SynonymsContextMenuImage_HC" oor:type="xs:string">
+                <info>
+                    <desc>The path to the image for the synonyms context menu in high contrast mode.</desc>
+                    <label>Synonyms context menu image</label>
+                </info>
+            </prop>
+
         </group>
 
         <group oor:name="GrammarCheckerEntry">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index c1f9e8aa96..caa8726b7c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -351,7 +351,7 @@
 			<prop oor:name="ToolboxVisible" oor:type="xs:boolean">
 				<!-- OldPath: Math/View -->
 				<!-- OldLocation: Soffice.cfg -->
-                <!-- UIHints: View - Formula Elements -->
+                <!-- UIHints: View - Elements -->
 				<info>
 					<author>TL</author>
 					<desc>Toggles the visibility of the ToolBox (Selection Box).</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index a3d5ba6e5d..76c4bb1778 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -155,6 +155,12 @@
 					<desc>Specifies the name of the standard template file for the factory.</desc>
 				</info>
 			</prop>
+			<prop oor:name="ooSetupFactorySystemDefaultTemplateChanged" oor:type="xs:boolean">
+				<!-- UIHints: setup -->
+				<info>
+					<desc>Indicates if the system default template has been changed.</desc>
+				</info>
+			</prop>
 			<prop oor:name="ooSetupFactoryWindowAttributes" oor:type="xs:string">
 				<!-- UIHints: setup -->
 				<info>
@@ -261,7 +267,15 @@
 				</info>
 				<value/>
 			</prop>
-			<prop oor:name="ooSetupExtension" oor:type="xs:string">
+			<prop oor:name="ooVendor" oor:type="xs:string">
+				<info>
+					<author>IHI</author>
+					<desc>Specifies the vendor who build the product.</desc>
+				</info>
+				<value/>
+			</prop>
+
+            <prop oor:name="ooSetupExtension" oor:type="xs:string">
 				<info>
 					<desc>Specifies the version number that appears on the user interface.</desc>
 				</info>
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 41a37d65e3..49c07a4787 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -28,26 +28,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scripting.hxx"
 
-#ifndef SCRIPTING_DLGPROV_HXX
 #include "dlgprov.hxx"
-#endif
 #include "dlgevtatt.hxx"
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
 #include <com/sun/star/io/XInputStreamProvider.hpp>
-#endif
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
-#endif
+#include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/beans/XIntrospection.hpp>
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <com/sun/star/resource/XStringResourceManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include "com/sun/star/resource/XStringResourceWithLocation.hpp"
+#include <com/sun/star/resource/XStringResourceWithLocation.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
@@ -691,13 +687,22 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
         //Reference< XDialog > xDialog;
         Reference< XControl > xCtrl;
         Reference< XControlModel > xCtrlMod;
-        // add support for basic RTL_FUNCTION
-        if ( m_BasicInfo.get() )
-            xCtrlMod = createDialogModelForBasic();
-        else
+        try
+        {
+            // add support for basic RTL_FUNCTION
+            if ( m_BasicInfo.get() )
+                xCtrlMod = createDialogModelForBasic();
+            else
+            {
+                OSL_ENSURE( URL.getLength(), "DialogProviderImpl::getDialog: no URL!" );
+                xCtrlMod = createDialogModel( URL );
+            }
+        }
+        catch ( const RuntimeException& ) { throw; }
+        catch ( const Exception& )
         {
-            OSL_ENSURE( URL.getLength(), "DialogProviderImpl::getDialog: no URL!" );
-            xCtrlMod = createDialogModel( URL );
+            const Any aError( ::cppu::getCaughtException() );
+            throw WrappedTargetRuntimeException( ::rtl::OUString(), *this, aError );
         }
         if ( xCtrlMod.is() )
         {
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 87fa15db4d..fe2667d128 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -101,6 +101,7 @@ public:
     const SfxFilter* GetTemplateFilter() const;
     static String	GetStandardTemplate( const String& rServiceName );
     static void		SetStandardTemplate( const String& rServiceName, const String& rTemplateName );
+    static void		SetSystemTemplate( const String& rServiceName, const String& rTemplateName );
 
     void			SetDocumentServiceName( const rtl::OUString& rServiceName );
     const rtl::OUString&	GetDocumentServiceName() const;
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index b54047b3d5..4221d2b405 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -102,30 +102,44 @@ private:
     DECL_LINK( SelectHdl, void * );
     Menu*				pSVMenu;
 
-private:
-                        // only declared, but not defined: don't allow copying
-                        SfxPopupMenuManager( const SfxPopupMenuManager& );
-                        SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
+    // when #i107205 gets fixed this one should be superfluous.
+    // But right now we want to avoid the memory leak that would otherwise occur,
+    // if we don't delete the pointer that got created in SfxPopupMenuManager::Popup
+    static PopupMenu *  pStaticThesSubMenu;
+
+    // only declared, but not defined: don't allow copying
+    SfxPopupMenuManager( const SfxPopupMenuManager& );
+    SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
 
 public:
                         SfxPopupMenuManager( const ResId&, SfxBindings& );
                         SfxPopupMenuManager( PopupMenu*, SfxBindings& );
                         ~SfxPopupMenuManager();
     static void         ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow );
+    // @deprecated!!
+    // Don't use this method any longer. The whole class will be removed in the future.
+    // Changing code which relies on Popup would need much more effort.
+    // Please contact cd@openoffice.org if you have questions or need help
     static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow );
 
     USHORT				Execute( const Point& rPos, Window *pWindow );
     USHORT              Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
     USHORT              Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
 
-    void				StartInsert();
+    // @deprecated (start)!!
+    // Don't use these methods any longer. The whole class will be removed in the future.
+    // Changing code which relies on these methods would need much more effort!
+    // Please contact cd@openoffice.org if you have questions or need help
+    void                StartInsert();
     void				EndInsert();
     void				CheckItem( USHORT, BOOL );
     void				RemoveItem( USHORT );
     void 				InsertItem( USHORT, const String&, MenuItemBits,
                                 USHORT nPos = MENU_APPEND );
     void 				InsertSeparator( USHORT nPos = MENU_APPEND );
-    void				RemoveDisabledEntries();
+    // @deprecated (end)
+    
+    void                RemoveDisabledEntries();
     void				AddClipboardFunctions();
     Menu*					GetSVMenu();
 };
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 07062e3c0f..846b6c547f 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -477,6 +477,9 @@
 #define SID_CAPTION                         (SID_SFX_START + 641)
 #define SID_STATUSBARTEXT                   (SID_SFX_START + 642)
 
+// id for thesaurs entry in context menu
+#define SID_THES                            (SID_SFX_START + 698)
+
 // default-ids for editing, cursor travellung and selection
 #define SID_REDO                            (SID_SFX_START + 700)
 #define SID_UNDO                            (SID_SFX_START + 701)
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 600b051170..8bd07c4f9d 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -243,6 +243,7 @@ protected:
     virtual void			   SAL_CALL release() throw();
 
     // XEventListener
+    using ::cppu::OPropertySetHelper::disposing;
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException );
 
     // XComponent
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 763c60810b..96320614ea 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,4 +1,4 @@
-sf      sfx2    :    l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL
+sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL
 sf	sfx2									usr1	-	all	sf_mkout NULL
 sf	sfx2\inc								nmake	-	all	sf_inc NULL
 sf	sfx2\prj								get		-	all	sf_prj NULL
@@ -22,3 +22,4 @@ sf	sfx2\source\explorer					nmake	-	all	sf_expl sf_sdi sf_inc NULL
 sf	sfx2\workben\custompanel                nmake   -   all sf_wb_custompanel NULL
 sf      sfx2\util                                                               nmake   -       all     sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL
 sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL
+sf  sfx2\qa\cppunit							nmake	-	all sf_qa_cppunit sf_util NULL
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
new file mode 100644
index 0000000000..2794c2ae92
--- /dev/null
+++ b/sfx2/qa/cppunit/makefile.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=../..
+PRJNAME=sfx2
+TARGET=qa_cppunit
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+DLLPRE = # no leading "lib" on .so files
+
+# --- Libs ---------------------------------------------------------
+
+SHL1OBJS=  \
+    $(SLO)/test_metadatable.obj \
+
+
+SHL1STDLIBS= \
+     $(CPPUNITLIB) \
+     $(SALLIB) \
+     $(CPPULIB) \
+     $(CPPUHELPERLIB) \
+     $(VCLLIB) \
+     $(SFXLIB) \
+
+
+SHL1TARGET= test_metadatable
+SHL1RPATH = NONE
+SHL1IMPLIB= i$(SHL1TARGET)
+# SHL1DEF= $(MISC)/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+# DEF1EXPORTFILE= export.exp
+SHL1VERSIONMAP= version.map
+
+# --- All object files ---------------------------------------------
+
+SLOFILES= \
+    $(SHL1OBJS) \
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+.INCLUDE : _cppunit.mk
+
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
new file mode 100644
index 0000000000..903be69203
--- /dev/null
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -0,0 +1,280 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "precompiled_sfx2.hxx"
+
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <rtl/ustrbuf.hxx>
+
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/Duration.hpp>
+
+#include <sfx2/Metadatable.hxx>
+#include <sfx2/XmlIdRegistry.hxx>
+
+
+using namespace ::com::sun::star;
+
+
+namespace {
+
+class MetadatableTest
+    : public ::CppUnit::TestFixture
+{
+public:
+    virtual void setUp();
+    virtual void tearDown();
+
+    void test();
+
+    CPPUNIT_TEST_SUITE(MetadatableTest);
+    CPPUNIT_TEST(test);
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+};
+
+void MetadatableTest::setUp()
+{
+}
+
+void MetadatableTest::tearDown()
+{
+}
+
+
+class MockMetadatable
+    : public ::sfx2::Metadatable
+{
+private:
+    ::sfx2::IXmlIdRegistry & m_rRegistry;
+
+public:
+    MockMetadatable(::sfx2::IXmlIdRegistry & i_rReg,
+            bool const i_isInClip = false)
+        : m_rRegistry(i_rReg)
+        , m_bInClipboard(i_isInClip), m_bInUndo(false), m_bInContent(true) {}
+    bool m_bInClipboard;
+    bool m_bInUndo;
+    bool m_bInContent;
+    virtual bool IsInClipboard() const { return m_bInClipboard; }
+    virtual bool IsInUndo() const { return m_bInUndo; }
+    virtual bool IsInContent() const { return m_bInContent; }
+    virtual ::sfx2::IXmlIdRegistry& GetRegistry() { return m_rRegistry; }
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::rdf::XMetadatable > MakeUnoObject() { return 0; }
+};
+
+static bool operator==(beans::StringPair p1, beans::StringPair p2)
+{
+    return p1.First == p2.First && p1.Second == p2.Second;
+}
+
+void MetadatableTest::test()
+{
+    OSL_TRACE("SwMetadatable test(): start\n");
+    ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg(
+        ::sfx2::createXmlIdRegistry(false) );
+    ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
+        ::sfx2::createXmlIdRegistry(true) );
+
+    MockMetadatable m1(*pReg);
+    MockMetadatable m2(*pReg);
+    MockMetadatable m3(*pReg);
+    MockMetadatable m4(*pReg);
+    MockMetadatable m5(*pReg);
+    ::rtl::OUString empty;
+    ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") );
+    ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") );
+    ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") );
+    ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") );
+    ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") );
+    ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") );
+    beans::StringPair id1(content, sid1);
+    beans::StringPair id2(content, sid2);
+    beans::StringPair id3(content, sid3);
+    beans::StringPair id4(styles,  sid4);
+    beans::StringPair id3e(empty,  sid3);
+    beans::StringPair id4e(empty,  sid4);
+    m1.SetMetadataReference(id1);
+    CPPUNIT_ASSERT_MESSAGE("set failed", m1.GetMetadataReference() == id1);
+    try {
+        m2.SetMetadataReference(id1);
+        CPPUNIT_ASSERT_MESSAGE("set duplicate succeeded", false);
+    } catch (lang::IllegalArgumentException) { }
+    m1.SetMetadataReference(id1);
+    CPPUNIT_ASSERT_MESSAGE("set failed (existing)",
+            m1.GetMetadataReference() == id1);
+    m1.EnsureMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("ensure failed (existing)",
+            m1.GetMetadataReference() == id1);
+
+    m2.EnsureMetadataReference();
+    beans::StringPair m2id(m2.GetMetadataReference());
+    CPPUNIT_ASSERT_MESSAGE("ensure failed", m2id.Second.getLength());
+    m2.EnsureMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("ensure failed (idempotent)",
+            m2.GetMetadataReference() == m2id);
+
+    m1.m_bInUndo = true;
+    CPPUNIT_ASSERT_MESSAGE("move to undo failed",
+            !m1.GetMetadataReference().Second.getLength());
+
+    m1.m_bInUndo = false;
+    CPPUNIT_ASSERT_MESSAGE("move from undo failed",
+            m1.GetMetadataReference() == id1);
+
+    m1.m_bInUndo = true;
+    try {
+        m2.SetMetadataReference(id1); // steal!
+    } catch (lang::IllegalArgumentException &) {
+        CPPUNIT_FAIL("set duplicate to undo failed");
+    }
+    m1.m_bInUndo = false;
+    CPPUNIT_ASSERT_MESSAGE("move from undo: duplicate",
+            !m1.GetMetadataReference().Second.getLength());
+
+    m3.RegisterAsCopyOf(m2);
+    CPPUNIT_ASSERT_MESSAGE("copy: source", m2.GetMetadataReference() == id1);
+    CPPUNIT_ASSERT_MESSAGE("copy: duplicate",
+            !m3.GetMetadataReference().Second.getLength());
+    m4.RegisterAsCopyOf(m3);
+    CPPUNIT_ASSERT_MESSAGE("copy: source", m2.GetMetadataReference() == id1);
+    CPPUNIT_ASSERT_MESSAGE("copy: duplicate",
+            !m3.GetMetadataReference().Second.getLength());
+    CPPUNIT_ASSERT_MESSAGE("copy: duplicate",
+            !m4.GetMetadataReference().Second.getLength());
+    m2.m_bInUndo = true;
+    CPPUNIT_ASSERT_MESSAGE("duplicate to undo",
+            m3.GetMetadataReference() == id1);
+    CPPUNIT_ASSERT_MESSAGE("duplicate to undo",
+            !m2.GetMetadataReference().Second.getLength());
+    m2.m_bInUndo = false;
+    CPPUNIT_ASSERT_MESSAGE("duplicate from undo",
+            m2.GetMetadataReference() == id1);
+    CPPUNIT_ASSERT_MESSAGE("duplicate from undo",
+            !m3.GetMetadataReference().Second.getLength());
+
+    m4.EnsureMetadataReference(); // new!
+    beans::StringPair m4id(m4.GetMetadataReference());
+    CPPUNIT_ASSERT_MESSAGE("ensure on duplicate",
+            m4id.Second.getLength() && !(m4id == id1));
+
+    MockMetadatable mc1(*pRegClip, true); // in clipboard
+    MockMetadatable mc2(*pRegClip, true);
+    MockMetadatable mc3(*pRegClip, true);
+    MockMetadatable mc4(*pRegClip, true);
+    MockMetadatable m2p(*pReg);
+    MockMetadatable m3p(*pReg);
+
+    mc1.SetMetadataReference(id2);
+    CPPUNIT_ASSERT_MESSAGE("set failed", mc1.GetMetadataReference() == id2);
+    try {
+        mc2.SetMetadataReference(id2);
+        CPPUNIT_FAIL("set duplicate succeeded");
+    } catch (lang::IllegalArgumentException) { }
+    mc1.SetMetadataReference(id2);
+    CPPUNIT_ASSERT_MESSAGE("set failed (existing)",
+            mc1.GetMetadataReference() == id2);
+    mc1.EnsureMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("ensure failed (existing)",
+            mc1.GetMetadataReference() == id2);
+    mc2.EnsureMetadataReference();
+    beans::StringPair mc2id(mc2.GetMetadataReference());
+    CPPUNIT_ASSERT_MESSAGE("ensure failed", mc2id.Second.getLength());
+    mc2.EnsureMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("ensure failed (idempotent)",
+            mc2.GetMetadataReference() == mc2id);
+    mc2.RemoveMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("remove failed",
+            !mc2.GetMetadataReference().Second.getLength());
+
+    // set up mc2 as copy of m2 and mc3 as copy of m3
+    mc3.RegisterAsCopyOf(m3);
+    CPPUNIT_ASSERT_MESSAGE("copy to clipboard (latent)",
+            !mc3.GetMetadataReference().Second.getLength() );
+    mc2.RegisterAsCopyOf(m2);
+    CPPUNIT_ASSERT_MESSAGE("copy to clipboard (non-latent)",
+            mc2.GetMetadataReference() == id1);
+    // paste mc2 to m2p and mc3 to m3p
+    m2p.RegisterAsCopyOf(mc2);
+    CPPUNIT_ASSERT_MESSAGE("paste from clipboard (non-latent)",
+            !m2p.GetMetadataReference().Second.getLength() );
+    m3p.RegisterAsCopyOf(mc3);
+    CPPUNIT_ASSERT_MESSAGE("paste from clipboard (latent)",
+            !m3p.GetMetadataReference().Second.getLength() );
+    // delete m2, m2p, m3
+    m2.RemoveMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("remove failed",
+            !m2.GetMetadataReference().Second.getLength());
+    CPPUNIT_ASSERT_MESSAGE("paste-remove (non-latent)",
+            m2p.GetMetadataReference() == id1);
+    m2p.RemoveMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("remove failed",
+            !m2p.GetMetadataReference().Second.getLength());
+    CPPUNIT_ASSERT_MESSAGE("paste-remove2 (non-latent)",
+            m3.GetMetadataReference() == id1);
+    m3.RemoveMetadataReference();
+    CPPUNIT_ASSERT_MESSAGE("remove failed",
+            !m3.GetMetadataReference().Second.getLength());
+    CPPUNIT_ASSERT_MESSAGE("paste-remove (latent)",
+            m3p.GetMetadataReference() == id1);
+    // delete mc2
+    mc2.SetMetadataReference(beans::StringPair());
+    CPPUNIT_ASSERT_MESSAGE("in clipboard becomes non-latent",
+            !mc3.GetMetadataReference().Second.getLength() );
+    // paste mc2
+    m2p.RegisterAsCopyOf(mc2);
+    CPPUNIT_ASSERT_MESSAGE("remove-paste",
+            !m2p.GetMetadataReference().Second.getLength());
+    CPPUNIT_ASSERT_MESSAGE("remove-paste (stolen)",
+            m3p.GetMetadataReference() == id1);
+
+    // auto-detect stream
+    m5.SetMetadataReference(id3e);
+    CPPUNIT_ASSERT_MESSAGE("auto-detect (content)",
+            m5.GetMetadataReference() == id3);
+    m5.m_bInContent = false;
+    m5.SetMetadataReference(id4e);
+    CPPUNIT_ASSERT_MESSAGE("auto-detect (styles)",
+            m5.GetMetadataReference() == id4);
+
+    OSL_TRACE("sfx2::Metadatable test(): finished\n");
+}
+
+
+CPPUNIT_TEST_SUITE_REGISTRATION(MetadatableTest);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
diff --git a/sfx2/qa/cppunit/version.map b/sfx2/qa/cppunit/version.map
new file mode 100644
index 0000000000..0dbbcc5a73
--- /dev/null
+++ b/sfx2/qa/cppunit/version.map
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+UDK_3_0_0 {
+    global:
+        cppunitTestPlugIn;
+
+    local:
+        *;
+};
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 283f7d07ce..bfff1068d9 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -8221,3 +8221,29 @@ SfxInt16Item PasteUnformatted SID_PASTE_UNFORMATTED
     GroupId = GID_EDIT;
 ]
 
+//--------------------------------------------------------------------------
+// call thesaurus dialog from context menu
+SfxInt16Item ThesaurusFromContext SID_THES
+(SfxStringItem WordReplace SID_THES)
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_TEXT;
+]
+
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 2dc396956a..409e29c1e4 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -33,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/useroptions.hxx>
@@ -119,6 +120,8 @@ const USHORT HI_TYPE = 2;
 const USHORT HI_VALUE = 3;
 const USHORT HI_ACTION = 4;
 
+static const char DOCUMENT_SIGNATURE_MENU_CMD[]      = "Signature";
+
 //------------------------------------------------------------------------
 String CreateSizeText( ULONG nSize, BOOL bExtraBytes = TRUE, BOOL bSmartExtraBytes = FALSE );
 String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes )
@@ -858,6 +861,13 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet )
         aNewSize.Width() -= nDelta;
         aUseUserDataCB.SetSizePixel( aNewSize );
     }
+    // See i96288
+    // Check if the document signature command is enabled
+    // on the main list enable/disable the pushbutton accordingly
+    SvtCommandOptions aCmdOptions;
+    if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
+                             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) )
+        aSignatureBtn.Disable();
 }
 
 //------------------------------------------------------------------------
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 5ca70ef53e..3167c13ccd 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -57,6 +57,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/stillreadwriteinteraction.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -542,33 +543,13 @@ void FileDialogHelper_Impl::updateExportButton()
 // ------------------------------------------------------------------------
 void FileDialogHelper_Impl::updateSelectionBox()
 {
-    if ( !mbExport )
+    if ( !mbHasSelectionBox )
         return;
 
-    // Does the selection box exist?
-    bool bSelectionBoxFound = false;
-    uno::Reference< XControlInformation > xCtrlInfo( mxFileDlg, UNO_QUERY );
-    if ( xCtrlInfo.is() )
-    {
-        Sequence< ::rtl::OUString > aCtrlList = xCtrlInfo->getSupportedControls();
-        sal_uInt32 nCount = aCtrlList.getLength();
-        for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl )
-            if ( aCtrlList[ nCtrl ].equalsAscii("SelectionBox") )
-            {
-                bSelectionBoxFound = true;
-                break;
-            }
-    }
-
-    if ( bSelectionBoxFound )
-    {
-        const SfxFilter* pFilter = getCurentSfxFilter();
-        updateExtendedControl(
-            ExtendedFilePickerElementIds::CHECKBOX_SELECTION,
-            ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ) );
-        uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY );
-        xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, makeAny( (sal_Bool)mbSelection ) );
-    }
+    const SfxFilter* pFilter = getCurentSfxFilter();
+    mbSelectionFltrEnabled = updateExtendedControl(
+        ExtendedFilePickerElementIds::CHECKBOX_SELECTION,
+        ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ) );
 }
 
 // ------------------------------------------------------------------------
@@ -956,6 +937,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
     mbPwdCheckBoxState		= sal_False;
     mbSelection				= sal_False;
     mbSelectionEnabled		= sal_True;
+    mbHasSelectionBox       = sal_False;
+    mbSelectionFltrEnabled  = sal_False;
 
     // default settings
     m_nDontFlags = SFX_FILTER_INTERNAL | SFX_FILTER_NOTINFILEDLG | SFX_FILTER_NOTINSTALLED;
@@ -1025,6 +1008,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
                 nTemplateDescription = TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION;
                 mbHasAutoExt = sal_True;
                 mbIsSaveDlg = sal_True;
+                mbHasSelectionBox = sal_True;
                 if ( mbExport && !mxFilterCFG.is() && xFactory.is() )
                 {
                     mxFilterCFG = uno::Reference< XNameAccess >(
@@ -2072,6 +2056,21 @@ void FileDialogHelper_Impl::saveConfig()
                 bWriteConfig = sal_True;
             }
         }
+        
+        if( mbHasSelectionBox && mbSelectionFltrEnabled )
+        {
+            try
+            {
+                aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 );
+                sal_Bool bSelection = sal_True;
+                aValue >>= bSelection;
+                if ( aUserData.GetTokenCount(' ') < 3 )
+                    aUserData.Append(' ');
+                aUserData.SetToken( 2, ' ', String::CreateFromInt32( (sal_Int32) bSelection ) );
+                bWriteConfig = sal_True;
+            }
+            catch( IllegalArgumentException ){}
+        }
 
         if ( bWriteConfig )
             aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aUserData ) ) );
@@ -2205,6 +2204,17 @@ void FileDialogHelper_Impl::loadConfig()
             }
             catch( IllegalArgumentException ){}
         }
+        
+        if( mbHasSelectionBox )
+        {
+            sal_Int32 nFlag = aUserData.GetToken( 2, ' ' ).ToInt32();
+            aValue <<= (sal_Bool) nFlag;
+            try
+            {
+                xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, aValue );
+            }
+            catch( IllegalArgumentException ){}
+        }
 
         if ( !maPath.getLength() )
             displayFolder( SvtPathOptions().GetWorkPath() );
@@ -2664,10 +2674,12 @@ static int impl_isFolder( const OUString& rPath )
     {
     }
 
+    ::rtl::Reference< ::comphelper::StillReadWriteInteraction > aHandler = new ::comphelper::StillReadWriteInteraction( xHandler );
+
     try
     {
         ::ucbhelper::Content aContent(
-            rPath, new ::ucbhelper::CommandEnvironment( xHandler, uno::Reference< ucb::XProgressHandler >() ) );
+            rPath, new ::ucbhelper::CommandEnvironment( static_cast< task::XInteractionHandler* > ( aHandler.get() ), uno::Reference< ucb::XProgressHandler >() ) );
         if ( aContent.isFolder() )
             return 1;
 
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 2d20b2eca6..f7b6f8d41c 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -107,6 +107,8 @@ namespace sfx2
         sal_Bool					mbPwdCheckBoxState		: 1;
         sal_Bool					mbSelection				: 1;
         sal_Bool					mbSelectionEnabled   	: 1;
+        sal_Bool                    mbHasSelectionBox       : 1;
+        sal_Bool                    mbSelectionFltrEnabled  : 1;
 
     private:
         void					addFilters( sal_Int64 nFlags,
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index b21e0c2a7e..f77883555c 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1682,168 +1682,6 @@ throw (uno::RuntimeException)
 
 #if OSL_DEBUG_LEVEL > 1
 
-static ::sfx2::XmlIdRegistryDocument s_Reg;
-static ::sfx2::XmlIdRegistryClipboard s_RegClip;
-
-class MockMetadatable : public ::sfx2::Metadatable
-{
-public:
-    MockMetadatable(bool i_isInClip = false) :
-        m_bInClipboard(i_isInClip), m_bInUndo(false), m_bInContent(true) {}
-    bool m_bInClipboard;
-    bool m_bInUndo;
-    bool m_bInContent;
-    virtual bool IsInClipboard() const { return m_bInClipboard; }
-    virtual bool IsInUndo() const { return m_bInUndo; }
-    virtual bool IsInContent() const { return m_bInContent; }
-    virtual ::sfx2::XmlIdRegistry& GetRegistry() { return m_bInClipboard ? static_cast< ::sfx2::XmlIdRegistry&>(s_RegClip) : static_cast< ::sfx2::XmlIdRegistry&>(s_Reg); }
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::rdf::XMetadatable > MakeUnoObject() { return 0; }
-};
-
-bool operator==(beans::StringPair p1, beans::StringPair p2)
-{
-    return p1.First == p2.First && p1.Second == p2.Second;
-}
-
-void test()
-{
-    OSL_TRACE("SwMetadatable test(): start\n");
-    MockMetadatable m1;
-    MockMetadatable m2;
-    MockMetadatable m3;
-    MockMetadatable m4;
-    MockMetadatable m5;
-    ::rtl::OUString empty;
-    ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") );
-    ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") );
-    ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") );
-    ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") );
-    ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") );
-    ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") );
-    beans::StringPair id1(content, sid1);
-    beans::StringPair id2(content, sid2);
-    beans::StringPair id3(content, sid3);
-    beans::StringPair id4(styles,  sid4);
-    beans::StringPair id3e(empty,  sid3);
-    beans::StringPair id4e(empty,  sid4);
-    m1.SetMetadataReference(id1);
-    OSL_ENSURE(m1.GetMetadataReference() == id1, "set failed");
-    try {
-        m2.SetMetadataReference(id1);
-        OSL_ENSURE(false, "set duplicate succeeded");
-    } catch (lang::IllegalArgumentException) { }
-    m1.SetMetadataReference(id1);
-    OSL_ENSURE(m1.GetMetadataReference() == id1, "set failed (existing)");
-    m1.EnsureMetadataReference();
-    OSL_ENSURE(m1.GetMetadataReference() == id1, "ensure failed (existing)");
-
-    m2.EnsureMetadataReference();
-    beans::StringPair m2id(m2.GetMetadataReference());
-    OSL_ENSURE(m2id.Second.getLength(), "ensure failed");
-    m2.EnsureMetadataReference();
-    OSL_ENSURE(m2.GetMetadataReference() == m2id, "ensure failed (idempotent)");
-
-    m1.m_bInUndo = true;
-    OSL_ENSURE(!m1.GetMetadataReference().Second.getLength(), "move to undo failed");
-
-    m1.m_bInUndo = false;
-    OSL_ENSURE(m1.GetMetadataReference() == id1, "move from undo failed");
-
-    m1.m_bInUndo = true;
-    try {
-        m2.SetMetadataReference(id1); // steal!
-    } catch (lang::IllegalArgumentException &) {
-        OSL_ENSURE(false, "set duplicate to undo failed");
-    }
-    m1.m_bInUndo = false;
-    OSL_ENSURE(!m1.GetMetadataReference().Second.getLength(), "move from undo: duplicate");
-
-    m3.RegisterAsCopyOf(m2);
-    OSL_ENSURE(m2.GetMetadataReference() == id1, "copy: source");
-    OSL_ENSURE(!m3.GetMetadataReference().Second.getLength(), "copy: duplicate");
-    m4.RegisterAsCopyOf(m3);
-    OSL_ENSURE(m2.GetMetadataReference() == id1, "copy: source");
-    OSL_ENSURE(!m3.GetMetadataReference().Second.getLength(), "copy: duplicate");
-    OSL_ENSURE(!m4.GetMetadataReference().Second.getLength(), "copy: duplicate");
-    m2.m_bInUndo = true;
-    OSL_ENSURE(m3.GetMetadataReference() == id1, "duplicate to undo");
-    OSL_ENSURE(!m2.GetMetadataReference().Second.getLength(), "duplicate to undo");
-    m2.m_bInUndo = false;
-    OSL_ENSURE(m2.GetMetadataReference() == id1, "duplicate from undo");
-    OSL_ENSURE(!m3.GetMetadataReference().Second.getLength(), "duplicate from undo");
-
-    m4.EnsureMetadataReference(); // new!
-    beans::StringPair m4id(m4.GetMetadataReference());
-    OSL_ENSURE(m4id.Second.getLength() && !(m4id == id1), "ensure on duplicate");
-
-    MockMetadatable mc1(true); // in clipboard
-    MockMetadatable mc2(true);
-    MockMetadatable mc3(true);
-    MockMetadatable mc4(true);
-    MockMetadatable m2p;
-    MockMetadatable m3p;
-
-    mc1.SetMetadataReference(id2);
-    OSL_ENSURE(mc1.GetMetadataReference() == id2, "set failed");
-    try {
-        mc2.SetMetadataReference(id2);
-        OSL_ENSURE(false, "set duplicate succeeded");
-    } catch (lang::IllegalArgumentException) { }
-    mc1.SetMetadataReference(id2);
-    OSL_ENSURE(mc1.GetMetadataReference() == id2, "set failed (existing)");
-    mc1.EnsureMetadataReference();
-    OSL_ENSURE(mc1.GetMetadataReference() == id2, "ensure failed (existing)");
-    mc2.EnsureMetadataReference();
-    beans::StringPair mc2id(mc2.GetMetadataReference());
-    OSL_ENSURE(mc2id.Second.getLength(), "ensure failed");
-    mc2.EnsureMetadataReference();
-    OSL_ENSURE(mc2.GetMetadataReference() == mc2id, "ensure failed (idempotent)");
-    mc2.RemoveMetadataReference();
-    OSL_ENSURE(!mc2.GetMetadataReference().Second.getLength(), "remove failed");
-
-    // set up mc2 as copy of m2 and mc3 as copy of m3
-    mc3.RegisterAsCopyOf(m3);
-    OSL_ENSURE(!mc3.GetMetadataReference().Second.getLength() , "copy to clipboard (latent)");
-    mc2.RegisterAsCopyOf(m2);
-    OSL_ENSURE(mc2.GetMetadataReference() == id1, "copy to clipboard (non-latent)");
-    // paste mc2 to m2p and mc3 to m3p
-    m2p.RegisterAsCopyOf(mc2);
-    OSL_ENSURE(!m2p.GetMetadataReference().Second.getLength() , "paste from clipboard (non-latent)");
-    m3p.RegisterAsCopyOf(mc3);
-    OSL_ENSURE(!m3p.GetMetadataReference().Second.getLength() , "paste from clipboard (latent)");
-    // delete m2, m2p, m3
-    m2.RemoveMetadataReference();
-    OSL_ENSURE(!m2.GetMetadataReference().Second.getLength(), "remove failed");
-    OSL_ENSURE(m2p.GetMetadataReference() == id1, "paste-remove (non-latent)");
-    m2p.RemoveMetadataReference();
-    OSL_ENSURE(!m2p.GetMetadataReference().Second.getLength(), "remove failed");
-    OSL_ENSURE(m3.GetMetadataReference() == id1, "paste-remove2 (non-latent)");
-    m3.RemoveMetadataReference();
-    OSL_ENSURE(!m3.GetMetadataReference().Second.getLength(), "remove failed");
-    OSL_ENSURE(m3p.GetMetadataReference() == id1, "paste-remove (latent)");
-    // delete mc2
-    mc2.SetMetadataReference(beans::StringPair());
-    OSL_ENSURE(!mc3.GetMetadataReference().Second.getLength() , "in clipboard becomes non-latent");
-    // paste mc2
-    m2p.RegisterAsCopyOf(mc2);
-    OSL_ENSURE(!m2p.GetMetadataReference().Second.getLength(), "remove-paste");
-    OSL_ENSURE(m3p.GetMetadataReference() == id1, "remove-paste (stolen)");
-
-    // auto-detect stream
-    m5.SetMetadataReference(id3e);
-    OSL_ENSURE(m5.GetMetadataReference() == id3, "auto-detect (content)");
-    m5.m_bInContent = false;
-    m5.SetMetadataReference(id4e);
-    OSL_ENSURE(m5.GetMetadataReference() == id4, "auto-detect (styles)");
-
-    OSL_TRACE("sfx2::Metadatable test(): finished\n");
-}
-
-struct Test { Test() { test(); }  };
-static Test s_test;
-
-
 #include <stdio.h>
 
 static void dump(sfx2::XmlIdList_t * pList)
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index e0c75790d0..448d89b7d2 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -30,13 +30,19 @@
 #include <com/sun/star/registry/MergeConflictException.hpp>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/document/XTypeDetection.hpp>
+#include <com/sun/star/frame/XLoadable.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
 #include <comphelper/processfactory.hxx>
 #include <tools/config.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <unotools/localfilehelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/configurationhelper.hxx>
 
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfilt.hxx>
@@ -49,9 +55,15 @@
 #include <sfx2/mnumgr.hxx>
 #include "sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
+#include "syspath.hxx"
+#include <osl/file.hxx>
+#include <osl/security.hxx>
 #include "doc.hrc"
 
+#include <assert.h>
+
 namespace css = ::com::sun::star;
+using namespace ::com::sun::star;
 
 //========================================================================
 
@@ -182,13 +194,130 @@ void SfxObjectFactory::SetModule_Impl( SfxModule *pMod )
     pImpl->pModule = pMod;
 }
 
+void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const String& rTemplateName )
+{
+    static const int nMaxPathSize = 16000;
+    static ::rtl::OUString SERVICE_FILTER_FACTORY = ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" );
+    static ::rtl::OUString SERVICE_TYPE_DECTECTION = ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" );
+    static ::rtl::OUString SERVICE_SIMPLE_ACCESS = ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" );
+
+    static ::rtl::OUString CONF_ROOT  = ::rtl::OUString::createFromAscii( "/org.openoffice.Setup");
+    static ::rtl::OUString CONF_PATH  = ::rtl::OUString::createFromAscii( "Office/Factories/" ) + ::rtl::OUString( rServiceName );
+    static ::rtl::OUString PROP_DEF_TEMPL_CHANGED  = ::rtl::OUString::createFromAscii( "ooSetupFactorySystemDefaultTemplateChanged" );
+    static ::rtl::OUString PROP_ACTUAL_FILTER  = ::rtl::OUString::createFromAscii( "ooSetupFactoryActualFilter" );
+
+    static ::rtl::OUString DEF_TPL_STR = ::rtl::OUString::createFromAscii("/soffice.");
+
+    String      sURL;
+    String      sPath;
+    sal_Unicode aPathBuffer[nMaxPathSize];
+    if ( SystemPath::GetUserTemplateLocation( aPathBuffer, nMaxPathSize ))
+        sPath = String( aPathBuffer );
+    ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, sURL );
+
+    ::rtl::OUString aUserTemplateURL( sURL ); 
+    if ( aUserTemplateURL.getLength() != 0)
+    {
+        try
+        {
+            uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+            uno::Reference< uno::XInterface > xConfig = ::comphelper::ConfigurationHelper::openConfig(
+                xFactory, CONF_ROOT, ::comphelper::ConfigurationHelper::E_STANDARD );
+
+            ::rtl::OUString aActualFilter;
+            ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_ACTUAL_FILTER ) >>= aActualFilter;
+            sal_Bool bChanged(sal_False);
+            ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED ) >>= bChanged;
+
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                xFactory->createInstance( SERVICE_FILTER_FACTORY ), uno::UNO_QUERY_THROW );
+            uno::Reference< container::XNameAccess > xTypeDetection(
+                xFactory->createInstance( SERVICE_TYPE_DECTECTION ), uno::UNO_QUERY_THROW );
+
+            ::rtl::OUString aActualFilterTypeName;
+            uno::Sequence< beans::PropertyValue > aActuralFilterData;
+            xFilterFactory->getByName( aActualFilter ) >>= aActuralFilterData;
+            for ( sal_Int32 nInd = 0; nInd < aActuralFilterData.getLength(); nInd++ )
+                if ( aActuralFilterData[nInd].Name.equalsAscii( "Type" ) )
+                    aActuralFilterData[nInd].Value >>= aActualFilterTypeName;
+            ::comphelper::SequenceAsHashMap aProps1( xTypeDetection->getByName( aActualFilterTypeName ) );
+            uno::Sequence< ::rtl::OUString > aAllExt =
+                aProps1.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Extensions" ), uno::Sequence< ::rtl::OUString >() );
+            //To-do: check if aAllExt is empty first
+            ::rtl::OUString aExt = aAllExt[0];
+
+            aUserTemplateURL += DEF_TPL_STR;
+            aUserTemplateURL += aExt;
+
+            uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess( 
+                xFactory->createInstance( SERVICE_SIMPLE_ACCESS ), uno::UNO_QUERY_THROW );
+
+            ::rtl::OUString aBackupURL;
+            ::osl::Security().getConfigDir(aBackupURL);
+            aBackupURL += ::rtl::OUString::createFromAscii( "/temp" );
+
+            if ( !xSimpleFileAccess->exists( aBackupURL ) )
+                xSimpleFileAccess->createFolder( aBackupURL );
+
+            aBackupURL += DEF_TPL_STR;
+            aBackupURL += aExt;
+
+            if ( rTemplateName.Len() != 0 )
+            {
+                if ( xSimpleFileAccess->exists( aUserTemplateURL ) && !bChanged )
+                    xSimpleFileAccess->copy( aUserTemplateURL, aBackupURL );
+
+                uno::Reference< document::XTypeDetection > xTypeDetector( xTypeDetection, uno::UNO_QUERY );
+                ::comphelper::SequenceAsHashMap aProps2( xTypeDetection->getByName( xTypeDetector->queryTypeByURL( rTemplateName ) ) );
+                ::rtl::OUString aFilterName =
+                    aProps2.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("PreferredFilter"), ::rtl::OUString() );
+
+                uno::Sequence< beans::PropertyValue > aArgs( 3 );
+                aArgs[0].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                aArgs[0].Value <<= aFilterName;
+                aArgs[1].Name = ::rtl::OUString::createFromAscii( "AsTemplate" );
+                aArgs[1].Value <<= sal_True;
+                aArgs[2].Name = ::rtl::OUString::createFromAscii( "URL" );
+                aArgs[2].Value <<= ::rtl::OUString( rTemplateName );
+
+                uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( ::rtl::OUString( rServiceName ) ), uno::UNO_QUERY );
+                xLoadable->load( aArgs );
+
+                aArgs.realloc( 2 );
+                aArgs[1].Name = ::rtl::OUString::createFromAscii( "Overwrite" );
+                aArgs[1].Value <<= sal_True;
+
+                uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY );
+                xStorable->storeToURL( aUserTemplateURL, aArgs );
+                ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED, uno::makeAny( sal_True ));
+                ::comphelper::ConfigurationHelper::flush( xConfig );
+            }
+            else
+            {
+                DBG_ASSERT( bChanged, "invalid ooSetupFactorySystemDefaultTemplateChanged value!" );
+
+                xSimpleFileAccess->copy( aBackupURL, aUserTemplateURL );
+                xSimpleFileAccess->kill( aBackupURL );
+                ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED, uno::makeAny( sal_False ));
+                ::comphelper::ConfigurationHelper::flush( xConfig );
+            }
+        }
+        catch( uno::Exception& )
+        {
+        }
+    }
+}
+
 void SfxObjectFactory::SetStandardTemplate( const String& rServiceName, const String& rTemplate )
 {
     SvtModuleOptions::EFactory eFac = SvtModuleOptions::ClassifyFactoryByServiceName(rServiceName);
     if (eFac == SvtModuleOptions::E_UNKNOWN_FACTORY)
         eFac = SvtModuleOptions::ClassifyFactoryByShortName(rServiceName);
     if (eFac != SvtModuleOptions::E_UNKNOWN_FACTORY)
+    {
+        SetSystemTemplate( rServiceName, rTemplate );
         SvtModuleOptions().SetFactoryStandardTemplate(eFac, rTemplate);
+    }
 }
 
 String SfxObjectFactory::GetStandardTemplate( const String& rServiceName )
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
index b766921e34..b1bddf82e4 100644
--- a/sfx2/source/doc/makefile.mk
+++ b/sfx2/source/doc/makefile.mk
@@ -83,7 +83,9 @@ SLOFILES =	\
         $(SLO)$/sfxmodelfactory.obj \
         $(SLO)$/sfxacldetect.obj \
         $(SLO)$/docstoragemodifylistener.obj \
-        $(SLO)$/querytemplate.obj
+        $(SLO)$/querytemplate.obj \
+        $(SLO)$/syspath.obj \
+        $(SLO)$/syspathw32.obj
 
 #                $(SLO)$/applet.obj \
 
@@ -91,7 +93,8 @@ SLOFILES =	\
 
 #HACK TO DISABLE PCH
 NOOPTFILES= \
-        $(SLO)$/sfxacldetect.obj
+        $(SLO)$/sfxacldetect.obj \
+        $(SLO)$/syspathw32.obj
 .ENDIF        
 
 
diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx
new file mode 100644
index 0000000000..f12f5abf46
--- /dev/null
+++ b/sfx2/source/doc/syspath.cxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: shutdowniconw32.cxx,v $
+* $Revision: 1.48 $
+*
+* 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
+// Comment out precompiled statement due to redefinition errors
+#include "precompiled_sfx2.hxx"
+
+#include "syspath.hxx"
+
+extern "C" bool GetUserTemplateLocation(sal_Unicode*, int nSize);
+
+bool SystemPath::GetUserTemplateLocation(sal_Unicode* pFolder, int nSize )
+{
+#ifdef WNT
+    return ::GetUserTemplateLocation( pFolder, nSize );
+#else
+    (void)pFolder;
+    (void)nSize;
+    return false;
+#endif
+}
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
new file mode 100644
index 0000000000..cc1a1ef2ed
--- /dev/null
+++ b/sfx2/source/doc/syspath.hxx
@@ -0,0 +1,44 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: shutdowniconw32.cxx,v $
+* $Revision: 1.48 $
+*
+* 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 __SYSPATH_HXX__
+#define __SYSPATH_HXX__
+//#pragma warning(disable:4917)
+
+#include <sfx2/dllapi.h>
+
+class SFX2_DLLPUBLIC SystemPath
+{
+public:
+    static bool GetUserTemplateLocation(sal_Unicode*, int nSize);
+};
+
+#endif
+
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx
new file mode 100644
index 0000000000..51dc9d8d66
--- /dev/null
+++ b/sfx2/source/doc/syspathw32.cxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2008 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: shutdowniconw32.cxx,v $
+* $Revision: 1.48 $
+*
+* 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.
+*
+************************************************************************/
+
+#ifdef WNT
+#ifdef _MSC_VER
+#pragma warning(disable:4917) 
+#endif
+#include <shlobj.h>
+
+static bool _SHGetSpecialFolderW32( int nFolderID, WCHAR* pszFolder, int nSize )
+{
+    LPITEMIDLIST	pidl;
+    HRESULT			hHdl = SHGetSpecialFolderLocation( NULL, nFolderID, &pidl );
+
+    if( hHdl == NOERROR )
+    {
+        WCHAR *lpFolder = static_cast< WCHAR* >( HeapAlloc( GetProcessHeap(), 0, 16000 ));
+
+        SHGetPathFromIDListW( pidl, lpFolder );
+        wcsncpy( pszFolder, lpFolder, nSize );
+        
+        HeapFree( GetProcessHeap(), 0, lpFolder );
+        IMalloc	*pMalloc;
+        if( NOERROR == SHGetMalloc(&pMalloc) )
+        {
+            pMalloc->Free( pidl );
+            pMalloc->Release();
+        }
+    }
+    return true;
+}
+
+#endif
+
+// Copied from sal/types.h to circumvent problems with precompiled headers
+// and redefinitions of BOOL, INT32 and other types. Unfortunately tools
+// also define these type incompatible with Win32 types which leads from
+// time to time to very nasty compilation errors. If someone finds a better
+// way to solve these probs please remove this copied part!
+typedef unsigned short sal_uInt16;
+#if ( defined(WIN32) && !defined(__MINGW32__) )
+    typedef wchar_t             sal_Unicode;
+#else
+    typedef sal_uInt16          sal_Unicode;
+#endif
+
+extern "C" bool GetUserTemplateLocation(sal_Unicode* pFolder, int nSize)
+{
+#ifdef WNT
+    return _SHGetSpecialFolderW32( CSIDL_TEMPLATES, pFolder, nSize );
+#else
+    (void)pFolder;
+    (void)nSize;
+    return false;
+#endif
+}
diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
index d3b209fc4a..8b55bd0840 100644
--- a/sfx2/source/menu/makefile.mk
+++ b/sfx2/source/menu/makefile.mk
@@ -43,10 +43,11 @@ SRS1NAME=$(TARGET)
 SRC1FILES = menu.src
 
 SLOFILES =	\
+        $(SLO)$/mnuitem.obj \
         $(SLO)$/mnumgr.obj \
-        $(SLO)$/virtmenu.obj \
         $(SLO)$/objmnctl.obj \
-        $(SLO)$/mnuitem.obj
+        $(SLO)$/thessubmenu.obj \
+        $(SLO)$/virtmenu.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc
index 71f5b60507..3b89f474c3 100644
--- a/sfx2/source/menu/menu.hrc
+++ b/sfx2/source/menu/menu.hrc
@@ -64,6 +64,10 @@
 #define STR_MENU_ADDONS						RID_SFX_MENU_START+2
 #define STR_MENU_ADDONHELP					RID_SFX_MENU_START+3
 
+#define STR_MENU_SYNONYMS                   (RID_SFX_MENU_START+11)
+#define STR_MENU_NO_SYNONYM_FOUND           (RID_SFX_MENU_START+12)
+#define STR_MENU_THESAURUS                  (RID_SFX_MENU_START+13)
+
 #define MN_CLIPBOARDFUNCS					RID_SFX_MENU_START+1
 #endif
 
diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src
index a84198917d..cf13af67c3 100644
--- a/sfx2/source/menu/menu.src
+++ b/sfx2/source/menu/menu.src
@@ -72,6 +72,21 @@ String STR_MENU_ADDONHELP
     Text [ en-US ] = "Add-~On Help" ;
 };
 
+String STR_MENU_SYNONYMS
+{
+    Text [ en-US ] = "Synonyms" ;
+};
+
+String STR_MENU_NO_SYNONYM_FOUND
+{
+    Text [ en-US ] = "(none)" ;
+};
+
+String STR_MENU_THESAURUS
+{
+    Text [ en-US ] = "~Thesaurus..." ;
+};
+
 // ******************************************************************* EOF
 
 
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 0ac68900c4..8269611c97 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -27,8 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
+
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/embed/VerbAttributes.hpp>
+#include <com/sun/star/container/XNamed.hpp>
 
 #ifdef SOLARIS
 // HACK: prevent conflict between STLPORT and Workshop headers on Solaris 8
@@ -50,9 +52,14 @@
 #include <framework/addonmenu.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <unotools/lingucfg.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
+#include <svl/stritem.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <osl/file.hxx>
+#include <vcl/graph.hxx>
+#include <svtools/filter.hxx>
 
 #include <sfx2/mnumgr.hxx>
 
@@ -76,10 +83,15 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objface.hxx>
+#include "thessubmenu.hxx"
+
 
 static const USHORT nCompatVersion = 4;
 static const USHORT nVersion = 5;
 
+// static member initialization
+PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
+
 using namespace com::sun::star;
 
 //=========================================================================
@@ -166,6 +178,101 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
 }
 
 
+//--------------------------------------------------------------------
+
+
+static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
+{
+    Image aRes;
+    
+    ::rtl::OUString aTmp;
+    osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
+    
+    Graphic aGraphic;
+    const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
+    if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
+    {
+        aRes = Image( aGraphic.GetBitmapEx() );
+    }
+    return aRes;
+}
+
+
+PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
+{
+    //
+    // build thesaurus sub menu if look-up string is available
+    //
+    PopupMenu* pThesSubMenu = 0;
+    SfxPoolItem *pItem = 0;
+    pBindings->QueryState( SID_THES, pItem );
+    String aThesLookUpStr;
+    SfxStringItem *pStrItem = dynamic_cast< SfxStringItem * >(pItem);
+    xub_StrLen nDelimPos = STRING_LEN;
+    if (pStrItem)
+    {
+        aThesLookUpStr = pStrItem->GetValue();
+        nDelimPos = aThesLookUpStr.SearchBackward( '#' );
+    }
+    if (aThesLookUpStr.Len() > 0 && nDelimPos != STRING_NOTFOUND)
+    {
+        // get synonym list for sub menu
+        std::vector< ::rtl::OUString > aSynonyms;
+        SfxThesSubMenuHelper aHelper;
+        ::rtl::OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) );
+        lang::Locale aLocale;
+        aHelper.GetLocale( aLocale, aThesLookUpStr, nDelimPos );
+        const bool bHasMoreSynonyms = aHelper.GetMeanings( aSynonyms, aText, aLocale, 7 /*max number of synonyms to retrieve*/ );
+        (void) bHasMoreSynonyms;
+
+        pThesSubMenu = new PopupMenu;
+        pThesSubMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+        const size_t nNumSynonyms = aSynonyms.size();
+        if (nNumSynonyms > 0)
+        {
+            SvtLinguConfig aCfg;
+            const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+            
+            Image aImage;
+            String sThesImplName( aHelper.GetThesImplName( aLocale ) );
+            ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName, bHC ) );
+            if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
+                aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
+
+            for (USHORT i = 0; (size_t)i < nNumSynonyms; ++i)
+            {
+                //! item ids should start with values > 0, since 0 has special meaning
+                const USHORT nId = i + 1;
+                
+                String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
+                pThesSubMenu->InsertItem( nId, aItemText );
+                ::rtl::OUString aCmd( ::rtl::OUString::createFromAscii( ".uno:ThesaurusFromContext?WordReplace:string=" ) );
+                aCmd += aItemText;
+                pThesSubMenu->SetItemCommand( nId, aCmd );
+
+                if (aSynonymsImageUrl.getLength() > 0)
+                    pThesSubMenu->SetItemImage( nId, aImage );
+            }
+        }
+        else // nNumSynonyms == 0
+        {
+            const String aItemText( SfxResId( STR_MENU_NO_SYNONYM_FOUND ) );
+            pThesSubMenu->InsertItem( 1, aItemText, MIB_NOSELECT );
+        }
+        pThesSubMenu->InsertSeparator();
+        const String sThesaurus( SfxResId( STR_MENU_THESAURUS ) );
+        pThesSubMenu->InsertItem( 100, sThesaurus );
+        pThesSubMenu->SetItemCommand( 100, ::rtl::OUString::createFromAscii( ".uno:ThesaurusDialog" ) );
+
+        pSVMenu->InsertSeparator();
+        const String sSynonyms( SfxResId( STR_MENU_SYNONYMS ) );
+        pSVMenu->InsertItem( SID_THES, sSynonyms );
+        pSVMenu->SetPopupMenu( SID_THES, pThesSubMenu );
+    }
+
+    return pThesSubMenu;
+}
+
 
 //--------------------------------------------------------------------
 
@@ -305,7 +412,9 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
 USHORT SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
 {
     DBG_MEMTEST();
-    return ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
+    USHORT nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
+    delete pStaticThesSubMenu;  pStaticThesSubMenu = NULL;
+    return nVal;
 }
 
 //--------------------------------------------------------------------
@@ -429,6 +538,10 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
             break;
     }
 
+    PopupMenu* pThesSubMenu = InsertThesaurusSubmenu_Impl( &pFrame->GetBindings(), pSVMenu );
+    // #i107205# (see comment in header file)
+    pStaticThesSubMenu = pThesSubMenu;
+
     if ( n == nCount )
     {
         PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
@@ -461,6 +574,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
         aMgr->RemoveDisabledEntries();
         return aMgr;
     }
+
     return 0;
 }
 
@@ -475,6 +589,8 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
             break;
     }
 
+    PopupMenu* pThesSubMenu = InsertThesaurusSubmenu_Impl( &pFrame->GetBindings(), pSVMenu );
+
     if ( n == nCount )
     {
         PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
@@ -507,6 +623,8 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         aPop.RemoveDisabledEntries();
         aPop.Execute( rPoint, pWindow );
     }
+
+    delete pThesSubMenu;
 }
 
 Menu* SfxPopupMenuManager::GetSVMenu()
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
new file mode 100644
index 0000000000..a47e1b18a4
--- /dev/null
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -0,0 +1,274 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: thessubmenu.cxx,v $
+ * $Revision: 1.0 $
+ *
+ * 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_sfx2.hxx"
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/linguistic2/XThesaurus.hpp>
+#include <com/sun/star/linguistic2/XMeaning.hpp>
+#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
+
+#include <comphelper/processfactory.hxx>
+#include <svl/stritem.hxx>
+#include <tools/debug.hxx>
+#include <vcl/graph.hxx>
+#include <svtools/filter.hxx>
+
+
+#include <vector>
+
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/viewsh.hxx>
+#include "thessubmenu.hxx"
+
+
+using namespace ::com::sun::star;
+using ::rtl::OUString;
+
+
+// STATIC DATA -----------------------------------------------------------
+
+SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem);
+
+////////////////////////////////////////////////////////////
+
+String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText )
+{
+    // The strings returned by the thesaurus sometimes have some
+    // explanation text put in between '(' and ')' or a trailing '*'.
+    // These parts should not be put in the ReplaceEdit Text that may get
+    // inserted into the document. Thus we strip them from the text.
+ 
+    String aText( rText );
+
+    xub_StrLen nPos = aText.Search( sal_Unicode('(') );
+    while (STRING_NOTFOUND != nPos)
+    {
+        xub_StrLen nEnd = aText.Search( sal_Unicode(')'), nPos );
+        if (STRING_NOTFOUND != nEnd)
+            aText.Erase( nPos, nEnd-nPos+1 );
+        else
+            break;
+        nPos = aText.Search( sal_Unicode('(') );
+    }
+
+    nPos = aText.Search( sal_Unicode('*') );
+    if (STRING_NOTFOUND != nPos)
+        aText.Erase( nPos );
+
+    // remove any possible remaining ' ' that may confuse the thesaurus
+    // when it gets called with the text
+    aText.EraseLeadingAndTrailingChars( sal_Unicode(' ') );
+    
+    return aText;
+}
+
+////////////////////////////////////////////////////////////
+
+
+/*
+    Ctor; setzt Select-Handler am Menu und traegt Menu
+    in seinen Parent ein.
+ */
+SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings )
+    : SfxMenuControl( nSlotId, rBindings ),
+    pMenu(new PopupMenu),
+    rParent(rMenu)
+{
+    rMenu.SetPopupMenu(nSlotId, pMenu);
+    pMenu->SetSelectHdl(LINK(this, SfxThesSubMenuControl, MenuSelect));
+    pMenu->Clear();
+    rParent.EnableItem( GetId(), FALSE );
+}
+
+
+SfxThesSubMenuControl::~SfxThesSubMenuControl()
+{
+    delete pMenu;
+}
+
+
+/*
+    Statusbenachrichtigung;
+    Ist die Funktionalit"at disabled, wird der entsprechende
+    Menueeintrag im Parentmenu disabled, andernfalls wird er enabled.
+ */
+void SfxThesSubMenuControl::StateChanged( 
+    USHORT /*nSID*/, 
+    SfxItemState eState,
+    const SfxPoolItem* /*pState*/ )
+{
+    rParent.EnableItem(GetId(), SFX_ITEM_AVAILABLE == eState );
+}
+
+
+/*
+    Select-Handler des Menus;
+    das selektierte Verb mit ausgef"uhrt,
+ */
+IMPL_LINK_INLINE_START( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
+{
+    const USHORT nSlotId = pSelMenu->GetCurItemId();
+    if( nSlotId )
+        GetBindings().Execute(nSlotId);
+    return 1;
+}
+IMPL_LINK_INLINE_END( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
+
+
+PopupMenu* SfxThesSubMenuControl::GetPopup() const
+{
+    return pMenu;
+}
+
+
+////////////////////////////////////////////////////////////
+
+OUString SfxThesSubMenuHelper::GetText( 
+    const String &rLookUpString, 
+    xub_StrLen nDelimPos )
+{
+    return OUString( rLookUpString.Copy( 0, nDelimPos ) );
+}
+
+    
+void SfxThesSubMenuHelper::GetLocale( 
+    lang::Locale /*out */ &rLocale, 
+    const String &rLookUpString, 
+    xub_StrLen nDelimPos  )
+{
+    String aIsoLang( rLookUpString.Copy( nDelimPos + 1) );
+    const xub_StrLen nPos = aIsoLang.Search( '-' );
+    if (nPos != STRING_NOTFOUND)
+    {
+        rLocale.Language    = aIsoLang.Copy( 0, nPos );
+        rLocale.Country     = aIsoLang.Copy( nPos + 1 );
+        rLocale.Variant     = String::EmptyString();
+    }
+}
+
+    
+SfxThesSubMenuHelper::SfxThesSubMenuHelper()
+{
+    try
+    {
+        uno::Reference< lang::XMultiServiceFactory >  xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+        m_xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance(
+                OUString( RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW );
+        m_xThesarus = m_xLngMgr->getThesaurus();
+    }
+    catch (uno::Exception &e)    
+    {
+        (void) e;
+        DBG_ASSERT( 0, "failed to get thesaurus" );
+    }    
+}
+
+    
+SfxThesSubMenuHelper::~SfxThesSubMenuHelper()
+{
+}    
+
+
+bool SfxThesSubMenuHelper::IsSupportedLocale( const lang::Locale & rLocale ) const
+{
+    return m_xThesarus.is() && m_xThesarus->hasLocale( rLocale );
+}
+    
+
+bool SfxThesSubMenuHelper::GetMeanings( 
+    std::vector< OUString > & rSynonyms, 
+    const OUString & rWord,
+    const lang::Locale & rLocale, 
+    sal_Int16 nMaxSynonms )
+{
+    bool bHasMoreSynonyms = false;
+    rSynonyms.clear();
+    if (IsSupportedLocale( rLocale ) && rWord.getLength() && nMaxSynonms > 0)
+    {
+        try
+        {
+            // get all meannings
+            const uno::Sequence< uno::Reference< linguistic2::XMeaning > > aMeaningSeq( 
+                    m_xThesarus->queryMeanings( rWord, rLocale, uno::Sequence< beans::PropertyValue >() ));
+            const uno::Reference< linguistic2::XMeaning > *pxMeaning = aMeaningSeq.getConstArray();
+            const sal_Int32 nMeanings = aMeaningSeq.getLength();
+        
+            // iterate over all meanings until nMaxSynonms are found or all meanings are processed
+            sal_Int32 nCount = 0;
+            sal_Int32 i = 0;
+            for ( ;  i < nMeanings && nCount < nMaxSynonms;  ++i)
+            {
+                const uno::Sequence< OUString > aSynonymSeq( pxMeaning[i]->querySynonyms() );
+                const OUString *pSynonyms = aSynonymSeq.getConstArray();
+                const sal_Int32 nSynonyms = aSynonymSeq.getLength();
+                sal_Int32 k = 0;
+                for ( ;  k < nSynonyms && nCount < nMaxSynonms;  ++k)
+                {
+                    rSynonyms.push_back( pSynonyms[k] );
+                    ++nCount;
+                }
+                bHasMoreSynonyms = k < nSynonyms;    // any synonym from this meaning skipped?
+            }
+            
+            bHasMoreSynonyms |= i < nMeanings;   // any meaning skipped?
+        }
+        catch (uno::Exception &e)
+        {
+            (void) e;
+            DBG_ASSERT( 0, "failed to get synonyms" );
+        }    
+    }
+    return bHasMoreSynonyms;
+}
+    
+
+String SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) const
+{
+    String aRes;
+    DBG_ASSERT( m_xLngMgr.is(), "LinguServiceManager missing" );
+    if (m_xLngMgr.is())
+    {
+        uno::Sequence< OUString > aServiceNames = m_xLngMgr->getConfiguredServices(
+                OUString::createFromAscii("com.sun.star.linguistic2.Thesaurus"), rLocale );
+        // there should be at most one thesaurus configured for each language
+        DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
+        if (aServiceNames.getLength() == 1)
+            aRes = aServiceNames[0];
+    }    
+    return aRes;
+}    
+
+////////////////////////////////////////////////////////////
+
+
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
new file mode 100644
index 0000000000..13438a917a
--- /dev/null
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: thessubmenu.hxx,v $
+ * $Revision: 1.0 $
+ *
+ * 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 _THESSUBMENU_HXX_
+#define _THESSUBMENU_HXX_
+
+#include <com/sun/star/linguistic2/XThesaurus.hpp>
+#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
+
+#include <vcl/menu.hxx>
+#include <sfx2/mnuitem.hxx>
+
+class SfxBindings;
+class PopupMenu;
+class Menu;
+
+namespace css = ::com::sun::star;
+
+////////////////////////////////////////////////////////////
+
+String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText );
+
+////////////////////////////////////////////////////////////
+
+class SfxThesSubMenuControl : public SfxMenuControl
+{
+    PopupMenu*			pMenu;
+    Menu&				rParent;
+
+private:
+    virtual void    StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    DECL_LINK( MenuSelect, Menu * );
+
+public:
+    SfxThesSubMenuControl(USHORT, Menu&, SfxBindings&);
+    ~SfxThesSubMenuControl();
+    
+    virtual PopupMenu*  GetPopup() const;
+    
+    SFX_DECL_MENU_CONTROL();
+};
+
+////////////////////////////////////////////////////////////
+
+class SfxThesSubMenuHelper
+{
+    css::uno::Reference< css::linguistic2::XLinguServiceManager >   m_xLngMgr;
+    css::uno::Reference< css::linguistic2::XThesaurus >             m_xThesarus;
+
+private:
+    
+    // don't use copy c-tor and assignment operator
+    SfxThesSubMenuHelper( const SfxThesSubMenuHelper & );
+    SfxThesSubMenuHelper & operator = ( const SfxThesSubMenuHelper & );
+    
+public:
+    SfxThesSubMenuHelper();
+    ~SfxThesSubMenuHelper();
+
+    static ::rtl::OUString     GetText( const String &rLookUpString, xub_StrLen nDelimPos );
+    
+    // returns the Locale to be used for the selected text when the thesaurus is to be called
+    static void GetLocale( css::lang::Locale /*out */ &rLocale, const String &rLookUpString, xub_StrLen nDelimPos );
+
+    // returns true if the locale is upported by the theasaurus
+    bool    IsSupportedLocale( const css::lang::Locale & rLocale ) const;
+
+    // get the first nMax Synonym entries, even if different meanings need to be evaluated
+    bool    GetMeanings( std::vector< ::rtl::OUString > & rSynonyms, const ::rtl::OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms );
+
+    String  GetThesImplName( const css::lang::Locale &rLocale ) const;
+};
+
+////////////////////////////////////////////////////////////
+
+    
+#endif
+
+
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 15d07472b0..b4e6b05f7b 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -129,28 +129,6 @@ SfxPrinterController::SfxPrinterController( const Any& i_rComplete,
         StartListening( *mpViewShell );
         mpObjectShell = mpViewShell->GetObjectShell();
         StartListening( *mpObjectShell );
-        m_bOrigStatus = mpObjectShell->IsEnableSetModified();
-
-        // check configuration: shall update of printing information in DocInfo set the document to "modified"?
-        if ( m_bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
-        {
-            mpObjectShell->EnableSetModified( sal_False );
-            m_bNeedsChange = sal_True;
-        }
-
-        // refresh document info
-        uno::Reference<document::XDocumentProperties> xDocProps(mpObjectShell->getDocProperties());
-        m_aLastPrintedBy = xDocProps->getPrintedBy();
-        m_aLastPrinted = xDocProps->getPrintDate();
-
-        xDocProps->setPrintedBy( mpObjectShell->IsUseUserData()
-            ? ::rtl::OUString( SvtUserOptions().GetFullName() )
-            : ::rtl::OUString() );
-        ::DateTime now;
-
-        xDocProps->setPrintDate( util::DateTime(
-            now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(),
-            now.GetDay(), now.GetMonth(), now.GetYear() ) );
     }
     
     // initialize extra ui options
@@ -283,6 +261,29 @@ void SfxPrinterController::jobStarted()
 {
     if ( mpObjectShell )
     {
+        m_bOrigStatus = mpObjectShell->IsEnableSetModified();
+
+        // check configuration: shall update of printing information in DocInfo set the document to "modified"?
+        if ( m_bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
+        {
+            mpObjectShell->EnableSetModified( sal_False );
+            m_bNeedsChange = sal_True;
+        }
+
+        // refresh document info
+        uno::Reference<document::XDocumentProperties> xDocProps(mpObjectShell->getDocProperties());
+        m_aLastPrintedBy = xDocProps->getPrintedBy();
+        m_aLastPrinted = xDocProps->getPrintDate();
+
+        xDocProps->setPrintedBy( mpObjectShell->IsUseUserData()
+            ? ::rtl::OUString( SvtUserOptions().GetFullName() )
+            : ::rtl::OUString() );
+        ::DateTime now;
+
+        xDocProps->setPrintDate( util::DateTime(
+            now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(),
+            now.GetDay(), now.GetMonth(), now.GetYear() ) );
+
         // FIXME: how to get all print options incl. AdditionalOptions easily?
         uno::Sequence < beans::PropertyValue > aOpts;
         mpObjectShell->Broadcast( SfxPrintingHint( view::PrintableState_JOB_STARTED, aOpts ) );
diff --git a/sfx2/workben/custompanel/CalcWindowState.xcu b/sfx2/workben/custompanel/CalcWindowState.xcu
index 2f224f32aa..17629c0bf6 100644
--- a/sfx2/workben/custompanel/CalcWindowState.xcu
+++ b/sfx2/workben/custompanel/CalcWindowState.xcu
@@ -4,7 +4,7 @@
     <node oor:name="States">
       <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/0000FF" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Soylent Blue</value>
+          <value>Soylent Blue</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
diff --git a/sfx2/workben/custompanel/DrawWindowState.xcu b/sfx2/workben/custompanel/DrawWindowState.xcu
index 3c0992bc48..6037a3f5a0 100644
--- a/sfx2/workben/custompanel/DrawWindowState.xcu
+++ b/sfx2/workben/custompanel/DrawWindowState.xcu
@@ -4,7 +4,7 @@
     <node oor:name="States">
       <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FFFF00" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Soylent Yellow</value>
+          <value>Soylent Yellow</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
diff --git a/sfx2/workben/custompanel/ImpressWindowState.xcu b/sfx2/workben/custompanel/ImpressWindowState.xcu
index 0fc1bb9d40..a8fea859bb 100644
--- a/sfx2/workben/custompanel/ImpressWindowState.xcu
+++ b/sfx2/workben/custompanel/ImpressWindowState.xcu
@@ -4,7 +4,7 @@
     <node oor:name="States">
       <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FFCC99" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Soylent Orange</value>
+          <value>Soylent Orange</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
diff --git a/sfx2/workben/custompanel/WriterWindowState.xcu b/sfx2/workben/custompanel/WriterWindowState.xcu
index f1edd4a128..248a2e14a3 100644
--- a/sfx2/workben/custompanel/WriterWindowState.xcu
+++ b/sfx2/workben/custompanel/WriterWindowState.xcu
@@ -4,7 +4,7 @@
     <node oor:name="States">
       <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/00FF00" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Soylent Green</value>
+          <value>Soylent Green</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
@@ -18,7 +18,7 @@
       </node>
       <node oor:name="private:resource/toolpanel/org.openoffice.example.colorpanel/FF0000" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Soylent Red</value>
+          <value>Soylent Red</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>false</value>
diff --git a/sfx2/workben/custompanel/description.xml b/sfx2/workben/custompanel/description.xml
index 7b85d64eaf..a90aa73a77 100644
--- a/sfx2/workben/custompanel/description.xml
+++ b/sfx2/workben/custompanel/description.xml
@@ -8,7 +8,7 @@
   <version value="0.1" />
   <platform value="UPDATED_SUPPORTED_PLATFORM" />
   <display-name>
-    <name lang="en-US">Custom Tool Panel Example</name>
+    <name>Custom Tool Panel Example</name>
   </display-name>
   <dependencies>
     <OpenOffice.org-minimal-version value="3.3" d:name="OpenOffice.org 3.3"/>
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 41d0d42bdf..22dc0b1772 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1332,17 +1332,38 @@
             {\
                 MenuItem\
                 {\
-                    Identifier = SID_TRANSLITERATE_UPPER ; \
-                    Command = ".uno:ChangeCaseToUpper" ; \
-                    HelpID = SID_TRANSLITERATE_UPPER ; \
-                    Text [ en-US ] = "~Uppercase";\
+                    Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \
+                    Command = ".uno:ChangeCaseToSentenceCase" ; \
+                    HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \
+                    Text [ en-US ] = "~Sentence case";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_LOWER; \
                     Command = ".uno:ChangeCaseToLower" ; \
                     HelpID = SID_TRANSLITERATE_LOWER; \
-                    Text [ en-US ] = "~Lowercase";\
+                    Text [ en-US ] = "~lowercase";\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_TRANSLITERATE_UPPER ; \
+                    Command = ".uno:ChangeCaseToUpper" ; \
+                    HelpID = SID_TRANSLITERATE_UPPER ; \
+                    Text [ en-US ] = "~UPPERCASE";\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_TRANSLITERATE_TITLE_CASE; \
+                    Command = ".uno:ChangeCaseToTitleCase" ; \
+                    HelpID = SID_TRANSLITERATE_TITLE_CASE; \
+                    Text [ en-US ] = "~Capitalize Every Word";\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_TRANSLITERATE_TOGGLE_CASE; \
+                    Command = ".uno:ChangeCaseToToggleCase" ; \
+                    HelpID = SID_TRANSLITERATE_TOGGLE_CASE; \
+                    Text [ en-US ] = "~tOGGLE cASE";\
                 };\
                 MenuItem\
                 {\
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index a183735b6c..29899ed5ae 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -278,6 +278,7 @@
 #define HID_SVX_SENDMENU_SIGNANDENCRYPT                             (HID_SVX_START + 245)
 #define HID_SVX_TP_APPEARANCE                                       (HID_SVX_START + 246)
 #define HID_SVX_TP_DESKTOP                                          (HID_SVX_START + 247)
+#define HID_CT_THES_ALTERNATIVES									(HID_SVX_START + 248)
 
 // please adjust ACT_SVX_HID_END2 below if you add entries here!
 
@@ -285,7 +286,7 @@
 // Overrun check ---------------------------------------------------------
 // -----------------------------------------------------------------------
 
-#define ACT_SVX_HID_END		(HID_SVX_START+247)
+#define ACT_SVX_HID_END		(HID_SVX_START+248)
 #if ACT_SVX_HID_END > HID_SVX_END
 #error Resource-Ueberlauf in #line, #file
 #endif
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 686679be1f..46417de887 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -674,7 +674,7 @@
 #define	SIP_SA_CIRCRESERVE1					(SIP_Begin + 177)
 #define	SIP_SA_CIRCRESERVE2					(SIP_Begin + 178)
 #define	SIP_SA_CIRCRESERVE3					(SIP_Begin + 179)
-//BFS01#define	SIP_SDRATTRSET_CIRC					(SIP_Begin + 180)
+#define	SIP_SA_OBJVISIBLE					(SIP_Begin + 180)
 #define	SIP_SA_OBJMOVEPROTECT				(SIP_Begin + 181)
 #define	SIP_SA_OBJSIZEPROTECT				(SIP_Begin + 182)
 #define	SIP_SA_OBJPRINTABLE					(SIP_Begin + 183)
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index ba7077ae79..f050ed2ac1 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -69,15 +69,19 @@ protected:
         @return
             returns an empty vector if no error could be found
     */
-    virtual SpellPortions GetNextWrongSentence (void) = 0;
+    virtual SpellPortions GetNextWrongSentence (bool bRecheck) = 0;
 
     /** This abstract method applies the changes made in the spelling dialog
      to the document.
      The dialog always updates its settings when it gets the focus. The document
      can rely on the fact that the methods ApplyChangedSentence() is called for the
      position that the last GetNextWrongSentence() returned.
+     If 'bRecheck' is set to true then the same sentence should be rechecked once from
+     the start. This should be used too find errors that the user has introduced by
+     manual changes in the edit field, and in order to not miss the still following errors
+     in that sentence.
     */
-    virtual void ApplyChangedSentence(const SpellPortions& rChanged) = 0;
+    virtual void ApplyChangedSentence(const SpellPortions& rChanged, bool bRecheck ) = 0;
     /** This methods determines whether the application supports AutoCorrection
      */
     virtual bool HasAutoCorrection();
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index 2fa6a603dd..29446b8a22 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -89,8 +89,6 @@ namespace sdr
         // operators
         sal_Bool operator==(const MasterPageDescriptor& rCandidate) const;
         sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const;
-
-        const SfxItemSet& getCorrectFillAttributes() const;
     };
 } // end of namespace sdr
 
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index 12ced57c57..a7215fc763 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -203,7 +203,8 @@
 #define SDRATTR_TRANSFORMREF2X      (SDRATTR_NOTPERSIST_FIRST+32)  /*   1212  long,   def=0     */
 #define SDRATTR_TRANSFORMREF2Y      (SDRATTR_NOTPERSIST_FIRST+33)  /*   1213  long,   def=0     */
 #define SDRATTR_TEXTDIRECTION		(SDRATTR_NOTPERSIST_FIRST+34)  /*   1214 V4+++  long,   def=0     */
-#define SDRATTR_NOTPERSIST_LAST     (SDRATTR_TEXTDIRECTION)  /*	1228 V4+++*/ /*	1213*/	/*	1085 */ /*	1040 */ /*	1123 */ /* Pool V1: 1065 */
+#define SDRATTR_OBJVISIBLE			(SDRATTR_NOTPERSIST_FIRST+35)
+#define SDRATTR_NOTPERSIST_LAST     (SDRATTR_OBJVISIBLE)		   /*	1228 V4+++*/ /*	1213*/	/*	1085 */ /*	1040 */ /*	1123 */ /* Pool V1: 1065 */
 // kein SetItem hierfuer
 
 #define SDRATTR_GRAF_FIRST			(SDRATTR_NOTPERSIST_LAST+1)		/*	1229 V4+++*/
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index d3029e2e7d..ae3bea80b4 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -283,6 +283,7 @@ public:
     BOOL						bSizProt;
     BOOL						bNoPrint;
     BOOL						bClosedObj;
+    bool						mbVisible;
     SdrLayerID					mnLayerID;
 
 public:
@@ -469,10 +470,10 @@ protected:
     unsigned					bGrouped : 1;   // Member eines GroupObjektes?
 
     // Die folgende Flags werden gestreamt
-    unsigned					bMovProt : 1; // Position geschuetzt
-    unsigned					bSizProt : 1; // Groesse geschuetzt
-    unsigned					bNoPrint : 1; // Nicht drucken
-
+    unsigned					bMovProt : 1; // If true, the position is protected
+    unsigned					bSizProt : 1; // If true, the size is protected
+    unsigned					bNoPrint : 1; // If true, the object is not printed.
+    unsigned					mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint
     // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein
     // Praesentationsobjekt, dem noch kein Inhalt zugewiesen
     // wurde. Default ist das Flag auf FALSE. Die Verwaltung
@@ -1020,6 +1021,8 @@ public:
     sal_Bool IsResizeProtect() const { return bSizProt; }
     void SetPrintable(sal_Bool bPrn);
     sal_Bool IsPrintable() const { return !bNoPrint; }
+    void SetVisible(sal_Bool bVisible);
+    sal_Bool IsVisible() const { return mbVisible; }
     void SetEmptyPresObj(sal_Bool bEpt) { bEmptyPresObj=bEpt; }
     sal_Bool IsEmptyPresObj() const { return bEmptyPresObj; }
     void SetNotVisibleAsMaster(sal_Bool bFlg) { bNotVisibleAsMaster=bFlg; }
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 6b387da6fe..435ab2fda1 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -376,7 +376,6 @@ private:
 public:
     // construct/destruct
     SdrPageProperties(SdrPage& rSdrPage);
-    SdrPageProperties(const SdrPageProperties& rCandidate);
     virtual ~SdrPageProperties();
 
     // Notify(...) from baseclass SfxListener
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 0996b4291d..7c67690256 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -383,6 +383,7 @@
 #define FN_INSERT_HARD_SPACE    (FN_INSERT + 44)    /* hard space */
 #define FN_INSERT_HARDHYPHEN    (FN_INSERT + 85)   /* hyphen withou break*/
 
+//!! be aware to not overwrite something that is used in sw/inc/cmdid.h already !!
 #define FN_FORMAT               (SID_SW_START +  400)
 #define FN_SET_JUSTIFY_PARA     (FN_FORMAT + 21)
 #define FN_FORMAT_RESET         (FN_FORMAT + 69)
@@ -1239,6 +1240,7 @@
 #define SID_TABLE_STYLE_SETTINGS						(SID_SVX_START+1089)
 #define SID_CHAR_DLG_PREVIEW_STRING                     (SID_SVX_START+1090)
 #define SID_RECHECK_DOCUMENT                            (SID_SVX_START+1091)
+
 #define SID_OBJECT_MIRROR                               (SID_SVX_START+1093)
 
 #define SID_DELETE_POSTIT								(SID_SVX_START+1094)
@@ -1250,8 +1252,12 @@
 #define SID_DELETEALLBYAUTHOR_POSTIT					(SID_SVX_START+1100)
 #define SID_INSERT_POSTIT							    (SID_SVX_START+1101)
 
+#define SID_TRANSLITERATE_SENTENCE_CASE                 (SID_SVX_START+1102)
+#define SID_TRANSLITERATE_TITLE_CASE                    (SID_SVX_START+1103)
+#define SID_TRANSLITERATE_TOGGLE_CASE                   (SID_SVX_START+1104)
+
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE								SID_INSERT_POSTIT + 1
+#define SID_SVX_FIRSTFREE								(SID_TRANSLITERATE_TOGGLE_CASE + 1)
 
 // --------------------------------------------------------------------------
 // Overflow check for slot IDs
diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx
index 18a633f987..cce103b716 100644
--- a/svx/inc/svx/sxopitm.hxx
+++ b/svx/inc/svx/sxopitm.hxx
@@ -39,4 +39,10 @@ public:
     SdrObjPrintableItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJPRINTABLE,rIn) {}
 };
 
+class SdrObjVisibleItem: public SdrYesNoItem {
+public:
+    SdrObjVisibleItem(bool bOn=true): SdrYesNoItem(SDRATTR_OBJVISIBLE,bOn) {}
+    SdrObjVisibleItem(SvStream& rIn): SdrYesNoItem(SDRATTR_OBJVISIBLE,rIn) {}
+};
+
 #endif
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index aa825b8c9f..4d537cd09d 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -325,6 +325,7 @@
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_MOVEPROTECT),	SDRATTR_OBJMOVEPROTECT			, &::getBooleanCppuType(),						0,	0}, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_NAME),			SDRATTR_OBJECTNAME				, &::getCppuType((const ::rtl::OUString*)0),	0,	0}, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE),	SDRATTR_OBJPRINTABLE			, &::getBooleanCppuType(),						0,	0}, \
+    { MAP_CHAR_LEN("Visible"),						SDRATTR_OBJVISIBLE				, &::getBooleanCppuType(),						0,	0}, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SIZEPROTECT),	SDRATTR_OBJSIZEPROTECT			, &::getBooleanCppuType(),						0,	0},\
     { MAP_CHAR_LEN("UINameSingular"),				OWN_ATTR_UINAME_SINGULAR		, &::getCppuType((const ::rtl::OUString*)0),	::com::sun::star::beans::PropertyAttribute::READONLY,	0}, \
     { MAP_CHAR_LEN("UINamePlural"),					OWN_ATTR_UINAME_PLURAL			, &::getCppuType((const ::rtl::OUString*)0),	::com::sun::star::beans::PropertyAttribute::READONLY,	0},	\
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
new file mode 100644
index 0000000000..12cff7ecd1
--- /dev/null
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -0,0 +1,282 @@
+/*************************************************************************
+ *
+ * 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 __TBUNOSEARCHCONTROLLERS_HXX_
+#define __TBUNOSEARCHCONTROLLERS_HXX_
+
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/frame/DispatchDescriptor.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/XStatusListener.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+
+#include <comphelper/sequenceasvector.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/weak.hxx>
+#include <svtools/toolboxcontroller.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/window.hxx>
+
+#include <map>
+
+namespace css = ::com::sun::star        ;
+namespace svx
+{
+
+class FindTextFieldControl : public ComboBox
+{
+public:
+    FindTextFieldControl( Window* pParent, WinBits nStyle, 
+        css::uno::Reference< css::frame::XFrame >& xFrame, 
+        css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
+    virtual ~FindTextFieldControl();
+
+    virtual void Modify();
+    virtual long PreNotify( NotifyEvent& rNEvt );
+
+    void InitControls_Impl();
+    void Remember_Impl(const String& rStr);
+
+private:
+
+    css::uno::Reference< css::frame::XFrame > m_xFrame;
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager;
+    sal_Bool m_bToClearTextField;
+
+};
+
+class SearchToolbarControllersManager
+{
+public:
+
+    SearchToolbarControllersManager();
+    ~SearchToolbarControllersManager();
+
+    static SearchToolbarControllersManager* createControllersManager();
+
+    void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL );
+    void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL );
+    css::uno::Reference< css::frame::XStatusListener > findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL );
+
+private:
+
+    static SearchToolbarControllersManager* m_pInstance;
+
+    typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec;
+    typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap;
+    SearchToolbarControllersMap aSearchToolbarControllersMap;
+
+};
+
+class FindTextToolbarController : public svt::ToolboxController, 
+                                  public css::lang::XServiceInfo
+{
+public:
+
+    FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager );
+    ~FindTextToolbarController();
+
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // 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 );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.FindTextToolboxController" ));
+    }
+
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException);
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException ); 
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException );
+
+    DECL_LINK(EditModifyHdl, void*);
+
+private:
+
+    FindTextFieldControl* m_pFindTextFieldControl;
+
+    USHORT m_nDownSearchId; // item position of findbar
+    USHORT m_nUpSearchId;   // item position of findbar
+
+};
+
+class DownSearchToolboxController : public svt::ToolboxController, 
+                                    public css::lang::XServiceInfo
+{
+public:
+
+    DownSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager );
+    ~DownSearchToolboxController();
+
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // 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 );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.DownSearchToolboxController" ));
+    }
+
+    static css::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException);
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException );
+
+};
+
+class UpSearchToolboxController : public svt::ToolboxController, 
+                                  public css::lang::XServiceInfo
+{
+public:
+
+    UpSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager );
+    ~UpSearchToolboxController();
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // 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 );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svx.UpSearchToolboxController" ));	
+    }
+
+    static css::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException);
+
+    // XToolbarController
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException );
+
+    // XStatusListener
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException );
+
+};
+
+// protocol handler for "vnd.sun.star.findbar:*" URLs
+// The dispatch object will be used for shortcut commands for findbar
+class FindbarDispatcher : public css::lang::XServiceInfo, 
+                          public css::lang::XInitialization, 
+                          public css::frame::XDispatchProvider, 
+                          public css::frame::XDispatch,
+                          public ::cppu::OWeakObject
+{
+public:
+
+    FindbarDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+    virtual ~FindbarDispatcher();
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL acquire() throw();
+    virtual void SAL_CALL release() throw();
+
+    // 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 );
+
+    static ::rtl::OUString getImplementationName_Static() throw()
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.Impl.FindbarDispatcher" ));
+    }
+
+    static css::uno::Sequence< ::rtl::OUString >  getSupportedServiceNames_Static() throw();
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException );
+
+    // XDispatchProvider
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) throw( css::uno::RuntimeException );
+
+    // XDispatch
+    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException );
+
+private:
+
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+    css::uno::Reference< css::frame::XFrame > m_xFrame;
+
+};
+
+// createInstance
+css::uno::Reference< css::uno::XInterface > SAL_CALL FindTextToolbarController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+css::uno::Reference< css::uno::XInterface > SAL_CALL DownSearchToolboxController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+css::uno::Reference< css::uno::XInterface > SAL_CALL UpSearchToolboxController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr );
+
+}
+
+#endif // __TBUNOSEARCHCONTROLLERS_HXX_
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index ecd6fcd930..c5069ad2eb 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1455,6 +1455,81 @@ SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAGANA
 ]
 
 //--------------------------------------------------------------------------
+SfxVoidItem ChangeCaseToSentenceCase SID_TRANSLITERATE_SENTENCE_CASE
+()
+[
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+SfxVoidItem ChangeCaseToTitleCase SID_TRANSLITERATE_TITLE_CASE
+()
+[
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+SfxVoidItem ChangeCaseToToggleCase SID_TRANSLITERATE_TOGGLE_CASE
+()
+[
+    /* flags: */
+    AutoUpdate = TRUE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
 SfxVoidItem ChangeCaseToLower SID_TRANSLITERATE_LOWER
 ()
 [
@@ -10834,7 +10909,7 @@ SdrTextFitToSizeTypeItem TextFitToSize SID_ATTR_TEXT_FITTOSIZE
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem Thesaurus SID_THESAURUS
+SfxVoidItem ThesaurusDialog SID_THESAURUS
 ()
 [
     /* flags: */
@@ -10843,7 +10918,7 @@ SfxVoidItem Thesaurus SID_THESAURUS
     FastCall = FALSE,
     HasCoreId = FALSE,
     HasDialog = TRUE,
-    ReadOnlyDoc = TRUE,
+    ReadOnlyDoc = FALSE,
     Toggle = FALSE,
     Container = FALSE,
     RecordAbsolute = FALSE,
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 410f792fd1..12123ecc58 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -468,6 +468,10 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
             const rtl::OUString	sSwitched			( RTL_CONSTASCII_USTRINGPARAM( "Switched" ) );
             const rtl::OUString	sPolar				( RTL_CONSTASCII_USTRINGPARAM( "Polar" ) );
 //			const rtl::OUString	sMap				( RTL_CONSTASCII_USTRINGPARAM( "Map" ) );
+            const rtl::OUString	sRefX				( RTL_CONSTASCII_USTRINGPARAM( "RefX" ) );
+            const rtl::OUString	sRefY				( RTL_CONSTASCII_USTRINGPARAM( "RefY" ) );
+            const rtl::OUString	sRefAngle			( RTL_CONSTASCII_USTRINGPARAM( "RefAngle" ) );
+            const rtl::OUString	sRefR				( RTL_CONSTASCII_USTRINGPARAM( "RefR" ) );
             const rtl::OUString	sRadiusRangeMinimum	( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMinimum" ) );
             const rtl::OUString	sRadiusRangeMaximum	( RTL_CONSTASCII_USTRINGPARAM( "RadiusRangeMaximum" ) );
             const rtl::OUString	sRangeXMinimum		( RTL_CONSTASCII_USTRINGPARAM( "RangeXMinimum" ) );
@@ -526,6 +530,26 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle(
                 }
             }
 */
+            else if ( rPropVal.Name.equals( sRefX ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefX )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFX;
+            }
+            else if ( rPropVal.Name.equals( sRefY ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefY )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFY;
+            }
+            else if ( rPropVal.Name.equals( sRefAngle ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefAngle )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFANGLE;
+            }
+            else if ( rPropVal.Name.equals( sRefR ) )
+            {
+                if ( rPropVal.Value >>= rDestinationHandle.nRefR )
+                    rDestinationHandle.nFlags |= HANDLE_FLAGS_REFR;
+            }
             else if ( rPropVal.Name.equals( sRadiusRangeMinimum ) )
             {
                 if ( rPropVal.Value >>= rDestinationHandle.aRadiusRangeMinimum )
@@ -1182,131 +1206,141 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
         Handle aHandle;
         if ( ConvertSequenceToEnhancedCustomShape2dHandle( seqHandles[ nIndex ], aHandle ) )
         {
-            sal_Bool bAdjFirst = aHandle.aPosition.First.Type == EnhancedCustomShapeParameterType::ADJUSTMENT;
-            sal_Bool bAdjSecond= aHandle.aPosition.Second.Type == EnhancedCustomShapeParameterType::ADJUSTMENT;
-            if ( bAdjFirst || bAdjSecond )
+            Point aP( rPosition.X, rPosition.Y );
+            // apply the negative object rotation to the controller position
+
+            aP.Move( -aLogicRect.Left(), -aLogicRect.Top() );
+            if ( bFlipH )
+                aP.X() = aLogicRect.GetWidth() - aP.X();
+            if ( bFlipV )
+                aP.Y() = aLogicRect.GetHeight() - aP.Y();
+            if ( nRotateAngle )
             {
-                Point aP( rPosition.X, rPosition.Y );
-                // apply the negative object rotation to the controller position
-
-                aP.Move( -aLogicRect.Left(), -aLogicRect.Top() );
-                if ( bFlipH )
-                    aP.X() = aLogicRect.GetWidth() - aP.X();
-                if ( bFlipV )
-                    aP.Y() = aLogicRect.GetHeight() - aP.Y();
-                if ( nRotateAngle )
-                {
-                    double a = -nRotateAngle * F_PI18000;
-                    RotatePoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), sin( a ), cos( a ) );
-                }
-                const GeoStat aGeoStat( ((SdrObjCustomShape*)pCustomShapeObj)->GetGeoStat() );
-                if ( aGeoStat.nShearWink )
-                {
-                    double nTan = -aGeoStat.nTan;
-                    if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV))
-                        nTan = -nTan;
-                    ShearPoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), nTan );
-                }
+                double a = -nRotateAngle * F_PI18000;
+                RotatePoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), sin( a ), cos( a ) );
+            }
+            const GeoStat aGeoStat( ((SdrObjCustomShape*)pCustomShapeObj)->GetGeoStat() );
+            if ( aGeoStat.nShearWink )
+            {
+                double nTan = -aGeoStat.nTan;
+                if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV))
+                    nTan = -nTan;
+                ShearPoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), nTan );
+            }
 
-                double fPos1 = aP.X();	//( bFlipH ) ? aLogicRect.GetWidth() - aP.X() : aP.X();
-                double fPos2 = aP.Y();	//( bFlipV ) ? aLogicRect.GetHeight() -aP.Y() : aP.Y();
-                fPos1 /= fXScale;
-                fPos2 /= fYScale;
+            double fPos1 = aP.X();	//( bFlipH ) ? aLogicRect.GetWidth() - aP.X() : aP.X();
+            double fPos2 = aP.Y();	//( bFlipV ) ? aLogicRect.GetHeight() -aP.Y() : aP.Y();
+            fPos1 /= fXScale;
+            fPos2 /= fYScale;
 
-                if ( aHandle.nFlags & HANDLE_FLAGS_SWITCHED )
+            if ( aHandle.nFlags & HANDLE_FLAGS_SWITCHED )
+            {
+                if ( aLogicRect.GetHeight() > aLogicRect.GetWidth() )
                 {
-                    if ( aLogicRect.GetHeight() > aLogicRect.GetWidth() )
-                    {
-                        double fX = fPos1;
-                        double fY = fPos2;
-                        fPos1 = fY;
-                        fPos2 = fX;
-                    }
+                    double fX = fPos1;
+                    double fY = fPos2;
+                    fPos1 = fY;
+                    fPos2 = fX;
                 }
+            }
 
-                sal_Int32 nFirstAdjustmentValue = 0, nSecondAdjustmentValue = 0;
+            sal_Int32 nFirstAdjustmentValue = -1, nSecondAdjustmentValue = -1;
+
+            if ( aHandle.aPosition.First.Type == EnhancedCustomShapeParameterType::ADJUSTMENT )
                 aHandle.aPosition.First.Value >>= nFirstAdjustmentValue;
+            if ( aHandle.aPosition.Second.Type == EnhancedCustomShapeParameterType::ADJUSTMENT )
                 aHandle.aPosition.Second.Value>>= nSecondAdjustmentValue;
 
-                if ( aHandle.nFlags & HANDLE_FLAGS_POLAR )
+            if ( aHandle.nFlags & HANDLE_FLAGS_POLAR )
+            {
+                double fXRef, fYRef, fAngle;
+                GetParameter( fXRef, aHandle.aPolar.First, sal_False, sal_False );
+                GetParameter( fYRef, aHandle.aPolar.Second, sal_False, sal_False );
+                const double fDX = fPos1 - fXRef;
+                fAngle = -( atan2( -fPos2 + fYRef, ( ( fDX == 0.0L ) ? 0.000000001 : fDX ) ) / F_PI180 );
+                double fX = ( fPos1 - fXRef );
+                double fY = ( fPos2 - fYRef );
+                double fRadius = sqrt( fX * fX + fY * fY );
+                if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MINIMUM )
+                {
+                    double fMin;
+                    GetParameter( fMin,  aHandle.aRadiusRangeMinimum, sal_False, sal_False );
+                    if ( fRadius < fMin )
+                        fRadius = fMin;
+                }
+                if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM )
+                {
+                    double fMax;
+                    GetParameter( fMax, aHandle.aRadiusRangeMaximum, sal_False, sal_False );
+                    if ( fRadius > fMax )
+                        fRadius = fMax;
+                }
+                if ( nFirstAdjustmentValue >= 0 )
+                    SetAdjustValueAsDouble( fRadius, nFirstAdjustmentValue );
+                if ( nSecondAdjustmentValue >= 0 )
+                    SetAdjustValueAsDouble( fAngle,  nSecondAdjustmentValue );
+            }
+            else
+            {
+                if ( aHandle.nFlags & HANDLE_FLAGS_REFX )
+                {
+                    nFirstAdjustmentValue = aHandle.nRefX;
+                    fPos1 *= 100000.0;
+                    fPos1 /= nCoordWidth;
+                }
+                if ( aHandle.nFlags & HANDLE_FLAGS_REFY )
                 {
-                    double fXRef, fYRef, fAngle;
-                    GetParameter( fXRef, aHandle.aPolar.First, sal_False, sal_False );
-                    GetParameter( fYRef, aHandle.aPolar.Second, sal_False, sal_False );
-                    const double fDX = fPos1 - fXRef;
-                    fAngle = -( atan2( -fPos2 + fYRef, ( ( fDX == 0.0L ) ? 0.000000001 : fDX ) ) / F_PI180 );
-                    double fX = ( fPos1 - fXRef );
-                    double fY = ( fPos2 - fYRef );
-                    double fRadius = sqrt( fX * fX + fY * fY );
-                    if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MINIMUM )
+                    nSecondAdjustmentValue = aHandle.nRefY;
+                    fPos2 *= 100000.0;
+                    fPos2 /= nCoordHeight;
+                }
+                if ( nFirstAdjustmentValue >= 0 )
+                {
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MINIMUM )		// check if horizontal handle needs to be within a range
                     {
-                        double fMin;
-                        GetParameter( fMin,  aHandle.aRadiusRangeMinimum, sal_False, sal_False );
-                        if ( fRadius < fMin )
-                            fRadius = fMin;
+                        double fXMin;
+                        GetParameter( fXMin, aHandle.aXRangeMinimum, sal_False, sal_False );
+                        if ( fPos1 < fXMin )
+                            fPos1 = fXMin;
                     }
-                    if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM )
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MAXIMUM )		// check if horizontal handle needs to be within a range
                     {
-                        double fMax;
-                        GetParameter( fMax, aHandle.aRadiusRangeMaximum, sal_False, sal_False );
-                        if ( fRadius > fMax )
-                            fRadius = fMax;
+                        double fXMax;
+                        GetParameter( fXMax, aHandle.aXRangeMaximum, sal_False, sal_False );
+                        if ( fPos1 > fXMax )
+                            fPos1 = fXMax;
                     }
-                    if ( bAdjFirst )
-                        SetAdjustValueAsDouble( fRadius, nFirstAdjustmentValue );
-                    if ( bAdjSecond )
-                        SetAdjustValueAsDouble( fAngle,  nSecondAdjustmentValue );
+                    SetAdjustValueAsDouble( fPos1, nFirstAdjustmentValue );
                 }
-                else
+                if ( nSecondAdjustmentValue >= 0 )
                 {
-                    if ( bAdjFirst )
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MINIMUM )		// check if vertical handle needs to be within a range
                     {
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MINIMUM )		// check if horizontal handle needs to be within a range
-                        {
-                            double fXMin;
-                            GetParameter( fXMin, aHandle.aXRangeMinimum, sal_False, sal_False );
-                            if ( fPos1 < fXMin )
-                                fPos1 = fXMin;
-                        }
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MAXIMUM )		// check if horizontal handle needs to be within a range
-                        {
-                            double fXMax;
-                            GetParameter( fXMax, aHandle.aXRangeMaximum, sal_False, sal_False );
-                            if ( fPos1 > fXMax )
-                                fPos1 = fXMax;
-                        }
-                        SetAdjustValueAsDouble( fPos1, nFirstAdjustmentValue );
+                        double fYMin;
+                        GetParameter( fYMin, aHandle.aYRangeMinimum, sal_False, sal_False );
+                        if ( fPos2 < fYMin )
+                            fPos2 = fYMin;
                     }
-                    if ( bAdjSecond )
+                    if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MAXIMUM )		// check if vertical handle needs to be within a range
                     {
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MINIMUM )		// check if vertical handle needs to be within a range
-                        {
-                            double fYMin;
-                            GetParameter( fYMin, aHandle.aYRangeMinimum, sal_False, sal_False );
-                            if ( fPos2 < fYMin )
-                                fPos2 = fYMin;
-                        }
-                        if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MAXIMUM )		// check if vertical handle needs to be within a range
-                        {
-                            double fYMax;
-                            GetParameter( fYMax, aHandle.aYRangeMaximum, sal_False, sal_False );
-                            if ( fPos2 > fYMax )
-                                fPos2 = fYMax;
-                        }
-                        SetAdjustValueAsDouble( fPos2, nSecondAdjustmentValue );
+                        double fYMax;
+                        GetParameter( fYMax, aHandle.aYRangeMaximum, sal_False, sal_False );
+                        if ( fPos2 > fYMax )
+                            fPos2 = fYMax;
                     }
+                    SetAdjustValueAsDouble( fPos2, nSecondAdjustmentValue );
                 }
-                // and writing them back into the GeometryItem
-                SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)
-                    (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
-                const rtl::OUString	sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
-                com::sun::star::beans::PropertyValue aPropVal;
-                aPropVal.Name = sAdjustmentValues;
-                aPropVal.Value <<= seqAdjustmentValues;
-                aGeometryItem.SetPropertyValue( aPropVal );
-                pCustomShapeObj->SetMergedItem( aGeometryItem );
-                bRetValue = sal_True;
             }
+            // and writing them back into the GeometryItem
+            SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)
+                (const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
+            const rtl::OUString	sAdjustmentValues( RTL_CONSTASCII_USTRINGPARAM ( "AdjustmentValues" ) );
+            com::sun::star::beans::PropertyValue aPropVal;
+            aPropVal.Name = sAdjustmentValues;
+            aPropVal.Value <<= seqAdjustmentValues;
+            aGeometryItem.SetPropertyValue( aPropVal );
+            pCustomShapeObj->SetMergedItem( aGeometryItem );
+            bRetValue = sal_True;
         }
     }
     return bRetValue;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index 6123e7f4c9..9853b5f1b7 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -67,6 +67,10 @@ class SvxMSDffAdjustmentHandle;
 #define HANDLE_FLAGS_RANGE_Y_MAXIMUM		0x0100
 #define HANDLE_FLAGS_RADIUS_RANGE_MINIMUM	0x0200
 #define HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM	0x0400
+#define HANDLE_FLAGS_REFX					0x0800
+#define HANDLE_FLAGS_REFY					0x1000
+#define HANDLE_FLAGS_REFANGLE				0x2000
+#define HANDLE_FLAGS_REFR					0x4000
 
 // MSDFF_HANDLE_FLAGS_RANGE_Y seems to be not defined in
 // escher, but we are using it internally in to differentiate
@@ -145,12 +149,20 @@ class EnhancedCustomShape2d : public SfxItemSet
             com::sun::star::drawing::EnhancedCustomShapeParameterPair	aPosition;
             com::sun::star::drawing::EnhancedCustomShapeParameterPair	aPolar;
 
+            sal_Int32	nRefX;
+            sal_Int32	nRefY;
+            sal_Int32	nRefAngle;
+            sal_Int32	nRefR;
+
             com::sun::star::drawing::EnhancedCustomShapeParameter		aRadiusRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter		aRadiusRangeMaximum;
             com::sun::star::drawing::EnhancedCustomShapeParameter		aXRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter		aXRangeMaximum;
             com::sun::star::drawing::EnhancedCustomShapeParameter		aYRangeMinimum;
             com::sun::star::drawing::EnhancedCustomShapeParameter		aYRangeMaximum;
+
+            Handle() : bMirroredX ( sal_False ), bMirroredY ( sal_False ), bSwitched( sal_False ),
+                nRefX( -1 ), nRefY( -1 ), nRefAngle( -1 ), nRefR( -1 ) {};
         };
 
         sal_Bool					IsFlipVert() { return bFlipV; };
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 01951caa14..ac608fae8e 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -74,6 +74,7 @@ SRC2FILES =  \
 LIB1TARGET=$(SLB)$/$(TARGET)-core.lib
 
 LIB1OBJFILES= \
+        $(SLO)$/checklbx.obj \
         $(SLO)$/dialmgr.obj\
         $(SLO)$/dlgutil.obj \
         $(SLO)$/framelink.obj\
@@ -86,7 +87,6 @@ LIB2TARGET=$(SLB)$/$(TARGET).lib
 
 LIB2OBJFILES= \
         $(SLO)$/charmap.obj \
-        $(SLO)$/checklbx.obj \
         $(SLO)$/connctrl.obj \
         $(SLO)$/contwnd.obj \
         $(SLO)$/ctredlin.obj \
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index f5392534e2..7e8d41b71e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1214,9 +1214,7 @@ void SvxRuler::UpdateTabs()
         long nRightFrameMargin = GetRightFrameMargin();
 
     //#i24363# tab stops relative to indent
-        const long nParaItemTxtLeft = pRuler_Imp->bIsTabsRelativeToIndent ?
-                                      pParaItem->GetTxtLeft() :
-                                      0;
+        const long nParaItemTxtLeft = pParaItem->GetTxtLeft();
 
         const long lParaIndent = nLeftFrameMargin + nParaItemTxtLeft;
 
@@ -1253,7 +1251,7 @@ void SvxRuler::UpdateTabs()
             const SvxTabStop *pTab = &(*pTabStopItem)[j];
             pTabs[nTabCount+TAB_GAP].nPos =
                 ConvertHPosPixel(
-                    lParaIndent + pTab->GetTabPos() + lAppNullOffset);
+                (pRuler_Imp->bIsTabsRelativeToIndent ? lParaIndent : 0 ) + pTab->GetTabPos() + lAppNullOffset);
             if(bRTL)
             {
                 pTabs[nTabCount+TAB_GAP].nPos = lParaIndentPix + lRightPixMargin - pTabs[nTabCount+TAB_GAP].nPos;
@@ -1286,13 +1284,37 @@ void SvxRuler::UpdateTabs()
         {
             for(j = 0; j < nDefTabBuf; ++j)
             {
-                pTabs[nTabCount + TAB_GAP].nPos =
-                    pTabs[nTabCount].nPos + nDefTabDist;
+                if( j == 0 )
+                {
+                    //set the first default tab stop
+                    if(pRuler_Imp->bIsTabsRelativeToIndent)
+                    {
+                        pTabs[nTabCount + TAB_GAP].nPos =
+                            (pTabs[nTabCount].nPos + nDefTabDist);
+                        pTabs[nTabCount + TAB_GAP].nPos -= 
+                            ((pTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix)
+                                % nDefTabDist );
+                    }
+                    else
+                    {
+                        if( pTabs[nTabCount].nPos < 0 )
+                        {
+                            pTabs[nTabCount + TAB_GAP].nPos = ( pTabs[nTabCount].nPos / nDefTabDist ) * nDefTabDist;
+                        }
+                        else
+                        {
+                            pTabs[nTabCount + TAB_GAP].nPos = ( pTabs[nTabCount].nPos / nDefTabDist + 1 ) * nDefTabDist;
+                        }
+                    }
 
-                if(j == 0 )
-                    pTabs[nTabCount + TAB_GAP].nPos -=
-                        ((pTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix)
-                         % nDefTabDist );
+                }
+                else
+                {
+                    //simply add the default distance to the last position
+                    pTabs[nTabCount + TAB_GAP].nPos =
+                    pTabs[nTabCount].nPos + nDefTabDist;
+                }
+                
                 if(pTabs[nTabCount+TAB_GAP].nPos >= lRightIndent)
                     break;
                 pTabs[nTabCount + TAB_GAP].nStyle = RULER_TAB_DEFAULT;
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 01ddb1f308..0bd03d0229 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -336,8 +336,18 @@ UINT16 E3dScene::GetObjIdentifier() const
 
 void E3dScene::SetBoundRectDirty()
 {
-    // avoid resetting aOutRect which in case of this object is model data,
-    // not re-creatable view data
+    E3dScene* pScene = GetScene();
+
+    if(pScene == this)
+    {
+        // avoid resetting aOutRect which in case of a 3D scene used as 2d object 
+        // is model data,not re-creatable view data
+    }
+    else
+    {
+        // if not the outmost scene it is used as group in 3d, call parent
+        E3dObject::SetBoundRectDirty();
+    }
 }
 
 /*************************************************************************
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 0487ef0530..8f56c8b331 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -75,6 +75,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 
 #define ITEMVALUE(ItemSet,Id,Cast)	((const Cast&)(ItemSet).Get(Id)).GetValue()
 
@@ -1066,77 +1067,39 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
 struct E3dDepthNeighbour
 {
-    E3dDepthNeighbour*	pNext;
-    E3dExtrudeObj*		pObj;
-
-    E3dDepthNeighbour() { pNext = NULL; pObj = NULL; }
+    E3dDepthNeighbour*	        mpNext;
+    E3dExtrudeObj*		        mpObj;
+    basegfx::B2DPolyPolygon     maPreparedPolyPolygon;
+
+    E3dDepthNeighbour()
+    :   mpNext(0),
+        mpObj(0),
+        maPreparedPolyPolygon()
+    { 
+    }
 };
 
 struct E3dDepthLayer
 {
-    E3dDepthLayer*		pDown;
-    E3dDepthNeighbour*	pNext;
-
-    E3dDepthLayer() { pDown = NULL; pNext = NULL; }
-    ~E3dDepthLayer() { while(pNext) { E3dDepthNeighbour* pSucc = pNext->pNext; delete pNext; pNext = pSucc; }}
-};
-
-bool ImpDoesOverlap(const basegfx::B2DPolygon& rPolygonA, const basegfx::B2DPolygon& rPolygonB)
-{
-    bool bRetval(false);
-    const basegfx::B2DRange aRangeA(basegfx::tools::getRange(rPolygonA));
-    const basegfx::B2DRange aRangeB(basegfx::tools::getRange(rPolygonB));
-    
-    if(aRangeA.overlaps(aRangeB))
-    {
-        // A in B ?
-        if(basegfx::tools::isInside(rPolygonA, rPolygonB))
-            return true;
-
-        // B in A ?
-        if(basegfx::tools::isInside(rPolygonB, rPolygonA))
-            return true;
+    E3dDepthLayer*		        mpDown;
+    E3dDepthNeighbour*	        mpNext;
 
-        // A and B the same ?
-        if(basegfx::tools::isInside(rPolygonB, rPolygonA, true))
-            return true;
+    E3dDepthLayer() 
+    :   mpDown(0),
+        mpNext(0)
+    { 
     }
 
-    return bRetval;
-}
-
-bool ImpDoesOverlap(const basegfx::B2DPolyPolygon& rPolyPolygonA, const basegfx::B2DPolyPolygon& rPolyPolygonB)
-{
-    bool bRetval(false);
-    const basegfx::B2DRange aRangeA(basegfx::tools::getRange(rPolyPolygonA));
-    const basegfx::B2DRange aRangeB(basegfx::tools::getRange(rPolyPolygonB));
-    
-    if(aRangeA.overlaps(aRangeB))
-    {
-        const sal_uInt32 nCntA(rPolyPolygonA.count());
-        const sal_uInt32 nCntB(rPolyPolygonB.count());
-        
-        for(sal_uInt32 a(0L); !bRetval && a < nCntA; a++)
-        {
-            const basegfx::B2DPolygon aPolygonA(rPolyPolygonA.getB2DPolygon(a));
-            
-            if(aPolygonA.isClosed())
-            {
-                for(sal_uInt32 b(0L); !bRetval && b < nCntB; b++)
-                {
-                    const basegfx::B2DPolygon aPolygonB(rPolyPolygonB.getB2DPolygon(b));
-
-                    if(aPolygonB.isClosed())
-                    {
-                        bRetval = ImpDoesOverlap(aPolygonA, aPolygonB);
-                    }
-                }
-            }
+    ~E3dDepthLayer() 
+    { 
+        while(mpNext) 
+        { 
+            E3dDepthNeighbour* pSucc = mpNext->mpNext; 
+            delete mpNext; 
+            mpNext = pSucc; 
         }
     }
-
-    return bRetval;
-}
+};
 
 void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 {
@@ -1147,39 +1110,41 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
         E3dDepthLayer* pBaseLayer = NULL;
         E3dDepthLayer* pLayer = NULL;
         INT32 nNumLayers = 0;
-        //SfxItemPool& rPool = pMod->GetItemPool();
 
         while(aIter.IsMore())
         {
-            E3dObject* pSubObj = (E3dObject*)aIter.Next();
+            E3dExtrudeObj* pExtrudeObj = dynamic_cast< E3dExtrudeObj* >(aIter.Next());
 
-            if(pSubObj && pSubObj->ISA(E3dExtrudeObj))
+            if(pExtrudeObj)
             {
-                E3dExtrudeObj* pExtrudeObj = (E3dExtrudeObj*)pSubObj;
-                const basegfx::B2DPolyPolygon aExtrudePoly(pExtrudeObj->GetExtrudePolygon());
-
+                const basegfx::B2DPolyPolygon aExtrudePoly(
+                    basegfx::tools::prepareForPolygonOperation(pExtrudeObj->GetExtrudePolygon()));
                 const SfxItemSet& rLocalSet = pExtrudeObj->GetMergedItemSet();
-                XFillStyle eLocalFillStyle = ITEMVALUE(rLocalSet, XATTR_FILLSTYLE, XFillStyleItem);
-                Color aLocalColor = ((const XFillColorItem&)(rLocalSet.Get(XATTR_FILLCOLOR))).GetColorValue();
+                const XFillStyle eLocalFillStyle = ITEMVALUE(rLocalSet, XATTR_FILLSTYLE, XFillStyleItem);
+                const Color aLocalColor = ((const XFillColorItem&)(rLocalSet.Get(XATTR_FILLCOLOR))).GetColorValue();
 
-                // ExtrudeObj einordnen
+                // sort in ExtrudeObj
                 if(pLayer)
                 {
-                    // Gibt es eine Ueberschneidung mit einem Objekt dieses
-                    // Layers?
-                    BOOL bOverlap(FALSE);
-                    E3dDepthNeighbour* pAct = pLayer->pNext;
+                    // do we have overlap with an object of this layer?
+                    bool bOverlap(false);
+                    E3dDepthNeighbour* pAct = pLayer->mpNext;
 
                     while(!bOverlap && pAct)
                     {
-                        // ueberlappen sich pAct->pObj und pExtrudeObj ?
-                        const basegfx::B2DPolyPolygon aActPoly(pAct->pObj->GetExtrudePolygon());
-                        bOverlap = ImpDoesOverlap(aExtrudePoly, aActPoly);
-
+                        // do pAct->mpObj and pExtrudeObj overlap? Check by
+                        // using logical AND clipping
+                        const basegfx::B2DPolyPolygon aAndPolyPolygon(
+                            basegfx::tools::solvePolygonOperationAnd(
+                                aExtrudePoly, 
+                                pAct->maPreparedPolyPolygon));
+
+                        bOverlap = (0 != aAndPolyPolygon.count());
+                        
                         if(bOverlap)
                         {
                             // second ciriteria: is another fillstyle or color used?
-                            const SfxItemSet& rCompareSet = pAct->pObj->GetMergedItemSet();
+                            const SfxItemSet& rCompareSet = pAct->mpObj->GetMergedItemSet();
                             
                             XFillStyle eCompareFillStyle = ITEMVALUE(rCompareSet, XATTR_FILLSTYLE, XFillStyleItem);
 
@@ -1201,71 +1166,74 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
                             }
                         }
 
-                        pAct = pAct->pNext;
+                        pAct = pAct->mpNext;
                     }
 
                     if(bOverlap)
                     {
-                        // ja, beginne einen neuen Layer
-                        pLayer->pDown = new E3dDepthLayer;
-                        pLayer = pLayer->pDown;
+                        // yes, start a new layer
+                        pLayer->mpDown = new E3dDepthLayer;
+                        pLayer = pLayer->mpDown;
                         nNumLayers++;
-                        pLayer->pNext = new E3dDepthNeighbour;
-                        pLayer->pNext->pObj = pExtrudeObj;
+                        pLayer->mpNext = new E3dDepthNeighbour;
+                        pLayer->mpNext->mpObj = pExtrudeObj;
+                        pLayer->mpNext->maPreparedPolyPolygon = aExtrudePoly;
                     }
                     else
                     {
-                        // nein, Objekt kann in aktuellen Layer
+                        // no, add to current layer
                         E3dDepthNeighbour* pNewNext = new E3dDepthNeighbour;
-                        pNewNext->pObj = pExtrudeObj;
-                        pNewNext->pNext = pLayer->pNext;
-                        pLayer->pNext = pNewNext;
+                        pNewNext->mpObj = pExtrudeObj;
+                        pNewNext->maPreparedPolyPolygon = aExtrudePoly;
+                        pNewNext->mpNext = pLayer->mpNext;
+                        pLayer->mpNext = pNewNext;
                     }
                 }
                 else
                 {
-                    // erster Layer ueberhaupt
+                    // first layer ever
                     pBaseLayer = new E3dDepthLayer;
                     pLayer = pBaseLayer;
                     nNumLayers++;
-                    pLayer->pNext = new E3dDepthNeighbour;
-                    pLayer->pNext->pObj = pExtrudeObj;
+                    pLayer->mpNext = new E3dDepthNeighbour;
+                    pLayer->mpNext->mpObj = pExtrudeObj;
+                    pLayer->mpNext->maPreparedPolyPolygon = aExtrudePoly;
                 }
             }
         }
 
-        // Anzahl Layer steht fest
+        // number of layers is done
         if(nNumLayers > 1)
         {
-            // Arrangement ist notwendig
+            // need to be arranged
             double fMinDepth = fDepth * 0.8;
             double fStep = (fDepth - fMinDepth) / (double)nNumLayers;
             pLayer = pBaseLayer;
 
             while(pLayer)
             {
-                // an pLayer entlangspazieren
-                E3dDepthNeighbour* pAct = pLayer->pNext;
+                // move along layer
+                E3dDepthNeighbour* pAct = pLayer->mpNext;
 
                 while(pAct)
                 {
-                    // Anpassen
-                    pAct->pObj->SetMergedItem(SfxUInt32Item(SDRATTR_3DOBJ_DEPTH, sal_uInt32(fMinDepth + 0.5)));
+                    // adapt extrude value
+                    pAct->mpObj->SetMergedItem(SfxUInt32Item(SDRATTR_3DOBJ_DEPTH, sal_uInt32(fMinDepth + 0.5)));
 
-                    // Naechster Eintrag
-                    pAct = pAct->pNext;
+                    // next
+                    pAct = pAct->mpNext;
                 }
 
-                // naechster Layer
-                pLayer = pLayer->pDown;
+                // next layer
+                pLayer = pLayer->mpDown;
                 fMinDepth += fStep;
             }
         }
 
-        // angelegte Strukturen aufraeumen
+        // cleanup
         while(pBaseLayer)
         {
-            pLayer = pBaseLayer->pDown;
+            pLayer = pBaseLayer->mpDown;
             delete pBaseLayer;
             pBaseLayer = pLayer;
         }
diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
index 3ed86b3bcd..4d0686baac 100644
--- a/svx/source/intro/makefile.mk
+++ b/svx/source/intro/makefile.mk
@@ -36,10 +36,6 @@ TARGET=intro
 
 RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES
 
-# setting the compiled by $user$ string in the About box
-OOO_VENDOR*=$(USER)$(USERNAME)
-RSCDEFS+=-DOOO_VENDOR="$(OOO_VENDOR)"
-
 # --- Allgemein -----------------------------------------------------------
 
 LOCALIZE_ME=intro_tmpl.hrc
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 074c9b305f..b63a0f131a 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -93,7 +93,7 @@ ModalDialog RID_DEFAULTABOUT
     };
     String ABOUT_STR_COPYRIGHT
     {
-        Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by " OOO_VENDOR ", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";	
+        Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";	
     };
     StringArray ABOUT_STR_DEVELOPER_ARY
     {
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index d397917edf..1f6801f394 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -61,11 +61,30 @@ namespace sdr
         drawinglayer::primitive2d::Primitive2DSequence ViewContactOfMasterPageDescriptor::createViewIndependentPrimitive2DSequence() const
         {
             drawinglayer::primitive2d::Primitive2DSequence xRetval;
+            drawinglayer::attribute::SdrFillAttribute aFill;
+            const SdrPage* pCorrectPage = &GetMasterPageDescriptor().GetOwnerPage();
+            const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties();
 
-            // build primitive from page fill attributes
-            const SfxItemSet& rPageFillAttributes = GetMasterPageDescriptor().getCorrectFillAttributes();
-            const drawinglayer::attribute::SdrFillAttribute aFill(
-                drawinglayer::primitive2d::createNewSdrFillAttribute(rPageFillAttributes));
+            if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
+            {
+                pCorrectPage = &GetMasterPageDescriptor().GetUsedPage();
+                pCorrectProperties = &pCorrectPage->getSdrPageProperties();
+            }
+
+            if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet())
+            {
+                // #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets,
+                // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all
+                // MasterPages should have a StyleSheet excactly for this reason, but historically
+                // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others).
+                pCorrectProperties = 0;
+            }
+
+            if(pCorrectProperties)
+            {
+                // create page fill attributes when correct properties were identified
+                aFill = drawinglayer::primitive2d::createNewSdrFillAttribute(pCorrectProperties->GetItemSet());
+            }
 
             if(!aFill.isDefault())
             {
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 0bf51d58f9..2eacc9083d 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -203,10 +203,18 @@ namespace sdr
                 }
                 else
                 {
-                    // build primitive from pObject's attributes
-                    const SfxItemSet& rFillAttributes = rPage.getSdrPageProperties().GetItemSet();
-                    const drawinglayer::attribute::SdrFillAttribute aFill(
-                        drawinglayer::primitive2d::createNewSdrFillAttribute(rFillAttributes));
+                    drawinglayer::attribute::SdrFillAttribute aFill;
+
+                    // #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets,
+                    // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all
+                    // MasterPages should have a StyleSheet excactly for this reason, but historically
+                    // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others).
+                    if(rPage.getSdrPageProperties().GetStyleSheet())
+                    {
+                        // create page fill attributes with correct properties
+                        aFill = drawinglayer::primitive2d::createNewSdrFillAttribute(
+                            rPage.getSdrPageProperties().GetItemSet());
+                    }
 
                     if(!aFill.isDefault())
                     {
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 88e7e842f7..3174dfff38 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
@@ -57,51 +57,56 @@ namespace sdr
 
         drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfGroup::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
         {
-            const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+            drawinglayer::primitive2d::Primitive2DSequence xRetval;
 
-            if(nSubHierarchyCount)
+            // check model-view visibility
+            if(isPrimitiveVisible(rDisplayInfo))
             {
-                const sal_Bool bDoGhostedDisplaying(
-                    GetObjectContact().DoVisualizeEnteredGroup() 
-                    && !GetObjectContact().isOutputToPrinter()
-                    && GetObjectContact().getActiveViewContact() == &GetViewContact());
+                const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
 
-                if(bDoGhostedDisplaying)
+                if(nSubHierarchyCount)
                 {
-                    rDisplayInfo.ClearGhostedDrawMode();
-                }
+                    const sal_Bool bDoGhostedDisplaying(
+                        GetObjectContact().DoVisualizeEnteredGroup() 
+                        && !GetObjectContact().isOutputToPrinter()
+                        && GetObjectContact().getActiveViewContact() == &GetViewContact());
+
+                    if(bDoGhostedDisplaying)
+                    {
+                        rDisplayInfo.ClearGhostedDrawMode();
+                    }
 
-                // create object hierarchy
-                drawinglayer::primitive2d::Primitive2DSequence xRetval(getPrimitive2DSequenceSubHierarchy(rDisplayInfo));
+                    // create object hierarchy
+                    xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
 
-                if(xRetval.hasElements())
-                {
-                    // get ranges
-                    const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
-                    const ::basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
-                    const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-                    
-                    // check geometrical visibility
-                    if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
+                    if(xRetval.hasElements())
                     {
-                        // not visible, release
-                        xRetval.realloc(0);
+                        // get ranges
+                        const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
+                        const ::basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
+                        const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
+                        
+                        // check geometrical visibility
+                        if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
+                        {
+                            // not visible, release
+                            xRetval.realloc(0);
+                        }
                     }
-                }
 
-                if(bDoGhostedDisplaying)
+                    if(bDoGhostedDisplaying)
+                    {
+                        rDisplayInfo.SetGhostedDrawMode();
+                    }
+                }
+                else
                 {
-                    rDisplayInfo.SetGhostedDrawMode();
+                    // draw replacement object for group. This will use ViewContactOfGroup::createViewIndependentPrimitive2DSequence
+                    // which creates the replacement primitives for an empty group
+                    xRetval = ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo);
                 }
-
-                return xRetval;
-            }
-            else
-            {
-                // draw replacement object for group. This will use ViewContactOfGroup::createViewIndependentPrimitive2DSequence
-                // which creates the replacement primitives for an empty group
-                return ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo);
             }
+            return xRetval;
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 16f5ba7bbf..6e658af973 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -68,10 +68,17 @@ namespace sdr
                 return false;
             }
 
-            // Test if print output but not printable
-            if(GetObjectContact().isOutputToPrinter() && !rObject.IsPrintable())
+            if(GetObjectContact().isOutputToPrinter() )
             {
-                return false;
+                // Test if print output but not printable
+                if( !rObject.IsPrintable())
+                    return false;
+            }
+            else
+            {
+                // test is object is not visible on screen
+                if( !rObject.IsVisible() )
+                    return false;
             }
 
             // Test for hidden object on MasterPage
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index c94a9bf054..439568f213 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1314,12 +1314,12 @@ namespace sdr { namespace contact {
         {
             // the layer of our object
             SdrLayerID nObjectLayer = _rUnoObject.GetLayer();
-            // is the layer we're residing in visible in this view?
-            bool bIsObjectLayerVisible = _rPageView.isLayerVisible( nObjectLayer );
+            // is the object we're residing in visible in this view?
+            bool bIsObjectVisible = _rUnoObject.IsVisible() && _rPageView.isLayerVisible( nObjectLayer );
 
-            if ( _bForce || ( bIsObjectLayerVisible != _bIsCurrentlyVisible ) )
+            if ( _bForce || ( bIsObjectVisible != _bIsCurrentlyVisible ) )
             {
-                _rControl.setVisible( bIsObjectLayerVisible );
+                _rControl.setVisible( bIsObjectVisible );
             }
         }
     }
@@ -1870,7 +1870,8 @@ namespace sdr { namespace contact {
 
             if(pSdrPageView)
             {
-                const bool bIsLayerVisible(pSdrPageView->GetVisibleLayers().IsSet(getSdrObject().GetLayer()));
+                const SdrObject& rObject = getSdrObject();
+                const bool bIsLayerVisible( rObject.IsVisible() && pSdrPageView->GetVisibleLayers().IsSet(rObject.GetLayer()));
 
                 if(rControl.isVisible() != bIsLayerVisible)
                 {
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 9c36397600..2cd0dc02e2 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -51,13 +51,11 @@ namespace drawinglayer
             if(!getSdrLFSTAttribute().getFill().isDefault() 
                 && getUnitPolyPolygon().isClosed())
             {
-                // take care for orientations
-                const basegfx::B2DPolyPolygon aOrientedUnitPolyPolygon(
-                    basegfx::tools::correctOrientations(getUnitPolyPolygon()));
-
+                // #i108255# no need to use correctOrientations here; target is
+                // straight visualisation
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, 
                     createPolyPolygonFillPrimitive(
-                        aOrientedUnitPolyPolygon, 
+                        getUnitPolyPolygon(), 
                         getTransform(), 
                         getSdrLFSTAttribute().getFill(), 
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx
index 136101fb48..c4a7ec0c25 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -60,7 +60,7 @@ SdrObject* SdrObjectPrimitiveHit(
     }
     else
     {
-        if(!pVisiLayer || pVisiLayer->IsSet(rObject.GetLayer()))
+        if( rObject.IsVisible() && (!pVisiLayer || pVisiLayer->IsSet(rObject.GetLayer())))
         {
             // single object, 3d object, empty scene or empty group. Check if 
             // it's a single 3D object
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 3437567da3..9d6ba449d0 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -113,18 +113,6 @@ namespace sdr
             || &maUsedPage != &rCandidate.maUsedPage
             || maVisibleLayers != rCandidate.maVisibleLayers);
     }
-
-    const SfxItemSet& MasterPageDescriptor::getCorrectFillAttributes() const
-    {
-        const SfxItemSet& rOwnerPageAtributes = GetOwnerPage().getSdrPageProperties().GetItemSet();
-
-        if(XFILL_NONE != ((const XFillStyleItem&)rOwnerPageAtributes.Get(XATTR_FILLSTYLE)).GetValue())
-        {
-            return rOwnerPageAtributes;
-        }
-
-        return GetUsedPage().getSdrPageProperties().GetItemSet();
-    }
 } // end of namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 5d30191e21..20af90e3ae 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -189,6 +189,7 @@ SdrItemPool::SdrItemPool(
     mppLocalPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrObjMoveProtectItem;
     mppLocalPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new SdrObjSizeProtectItem;
     mppLocalPoolDefaults[SDRATTR_OBJPRINTABLE   -SDRATTR_START]=new SdrObjPrintableItem;
+    mppLocalPoolDefaults[SDRATTR_OBJVISIBLE		-SDRATTR_START]=new SdrObjVisibleItem;
     mppLocalPoolDefaults[SDRATTR_LAYERID        -SDRATTR_START]=new SdrLayerIdItem;
     mppLocalPoolDefaults[SDRATTR_LAYERNAME      -SDRATTR_START]=new SdrLayerNameItem;
     mppLocalPoolDefaults[SDRATTR_OBJECTNAME     -SDRATTR_START]=new SdrObjectNameItem;
@@ -546,6 +547,7 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
         case SDRATTR_OBJMOVEPROTECT : nResId = SIP_SA_OBJMOVEPROTECT;break;
         case SDRATTR_OBJSIZEPROTECT : nResId = SIP_SA_OBJSIZEPROTECT;break;
         case SDRATTR_OBJPRINTABLE   : nResId = SIP_SA_OBJPRINTABLE;break;
+        case SDRATTR_OBJVISIBLE		: nResId = SIP_SA_OBJVISIBLE;break;
         case SDRATTR_LAYERID        : nResId = SIP_SA_LAYERID;break;
         case SDRATTR_LAYERNAME      : nResId = SIP_SA_LAYERNAME;break;
         case SDRATTR_OBJECTNAME     : nResId = SIP_SA_OBJECTNAME;break;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 7023aa8913..de7a564ff1 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -805,6 +805,12 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark)
 
 void SdrEditView::DeleteMarkedObj()
 {
+    // #i110981# return when nothing is to be done at all
+    if(!GetMarkedObjectCount())
+    {
+        return;
+    }
+
     // moved breaking action and undo start outside loop
     BrkAction();
     BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_DELETE);
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 0e0c2e8aa9..bd0f0473d3 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -760,6 +760,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
     BOOL bMovProtect=FALSE,bMovProtectDC=FALSE;
     BOOL bSizProtect=FALSE,bSizProtectDC=FALSE;
     BOOL bPrintable =TRUE ,bPrintableDC=FALSE;
+    BOOL bVisible = TRUE, bVisibleDC=FALSE;
     SdrLayerID nLayerId=0; BOOL bLayerDC=FALSE;
     XubString aObjName;     BOOL bObjNameDC=FALSE,bObjNameSet=FALSE;
     long nSnapPosX=0;      BOOL bSnapPosXDC=FALSE;
@@ -781,6 +782,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
             bMovProtect=pObj->IsMoveProtect();
             bSizProtect=pObj->IsResizeProtect();
             bPrintable =pObj->IsPrintable();
+            bVisible = pObj->IsVisible();
             Rectangle aSnapRect2(pObj->GetSnapRect());
             Rectangle aLogicRect2(pObj->GetLogicRect());
             nSnapPosX=aSnapRect2.Left();
@@ -798,6 +800,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
             if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect())   bMovProtectDC=TRUE;
             if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=TRUE;
             if (!bPrintableDC  && bPrintable !=pObj->IsPrintable())     bPrintableDC=TRUE;
+            if (!bVisibleDC	   && bVisible !=pObj->IsVisible())         bVisibleDC=TRUE;
             if (!bRotAngleDC   && nRotAngle  !=pObj->GetRotateAngle())  bRotAngleDC=TRUE;
             if (!bShrAngleDC   && nShrAngle  !=pObj->GetShearAngle())   bShrAngleDC=TRUE;
             if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) {
@@ -837,6 +840,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
     rAttr.Put(SdrRotateOneItem());
     rAttr.Put(SdrHorzShearOneItem());
     rAttr.Put(SdrVertShearOneItem());
+
     if (nMarkAnz>1) {
         rAttr.Put(SdrResizeXAllItem());
         rAttr.Put(SdrResizeYAllItem());
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index f04280ea35..5b49ae936f 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1090,7 +1090,16 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
 
                         if(!bFirstObjectComplete)
                         {
-                            aMergePolyPolygonA = aTmpPoly;
+                            // #i111987# Also need to collect ORed source shape when more than
+                            // a single polygon is involved
+                            if(aMergePolyPolygonA.count())
+                            {
+                                aMergePolyPolygonA = basegfx::tools::solvePolygonOperationOr(aMergePolyPolygonA, aTmpPoly);
+                            }
+                            else
+                            {
+                                aMergePolyPolygonA = aTmpPoly;
+                            }
                         }
                         else
                         {
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 3d25b44844..d55e21e745 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -85,6 +85,11 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel):
     bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE)
 {
     aVD.EnableOutput(FALSE);
+
+    // #i111954# init to no fill and no line initially
+    aVD.SetLineColor();
+    aVD.SetFillColor();
+
     aOldLineColor.SetRed( aVD.GetLineColor().GetRed() + 1 ); // invalidate old line color
     pLineAttr=new SfxItemSet(rModel.GetItemPool(),XATTR_LINE_FIRST,XATTR_LINE_LAST);
     pFillAttr=new SfxItemSet(rModel.GetItemPool(),XATTR_FILL_FIRST,XATTR_FILL_LAST);
@@ -380,17 +385,61 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale )
             pObj->NbcMove( Size( aOfs.X(), aOfs.Y() ) );
     }
 
-    aTmpList.InsertObject( pObj );
-    if ( HAS_BASE( SdrPathObj, pObj ) )
+    // #i111954# check object for visibility
+    // used are SdrPathObj, SdrRectObj, SdrCircObj, SdrGrafObj
+    bool bVisible(false);
+
+    if(pObj->HasLineStyle())
+    {
+        bVisible = true;
+    }
+
+    if(!bVisible && pObj->HasFillStyle())
+    {
+        bVisible = true;
+    }
+
+    if(!bVisible)
+    {
+        SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >(pObj);
+
+        if(pTextObj && pTextObj->HasText())
+        {
+            bVisible = true;
+        }
+    }
+
+    if(!bVisible)
     {
-        FASTBOOL bClosed=pObj->IsClosedObj();
-        bLastObjWasPolyWithoutLine=bNoLine && bClosed;
-        bLastObjWasLine=!bClosed;
+        SdrGrafObj* pGrafObj = dynamic_cast< SdrGrafObj* >(pObj);
+
+        if(pGrafObj)
+        {
+            // this may be refined to check if the graphic really is visible. It
+            // is here to ensure that graphic objects without fill, line and text
+            // get created
+            bVisible = true;
+        }
+    }
+
+    if(!bVisible)
+    {
+        SdrObject::Free(pObj);
     }
     else
     {
-        bLastObjWasPolyWithoutLine = FALSE;
-        bLastObjWasLine = FALSE;
+        aTmpList.InsertObject( pObj );
+        if ( HAS_BASE( SdrPathObj, pObj ) )
+        {
+            FASTBOOL bClosed=pObj->IsClosedObj();
+            bLastObjWasPolyWithoutLine=bNoLine && bClosed;
+            bLastObjWasLine=!bClosed;
+        }
+        else
+        {
+            bLastObjWasPolyWithoutLine = FALSE;
+            bLastObjWasLine = FALSE;
+        }
     }
 }
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 59d1eee267..3d72ef276c 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1226,6 +1226,10 @@ void SdrMarkView::CheckMarked()
         }
         bRaus=bRaus || pPV->GetLockedLayers().IsSet(nLay) ||  // Layer gesperrt?
                        !pPV->GetVisibleLayers().IsSet(nLay);  // Layer nicht sichtbar?
+
+        if( !bRaus )
+            bRaus = !pObj->IsVisible(); // not visible objects can not be marked
+
         if (!bRaus) {
             // Joe am 9.3.1997: Gruppierte Objekten koennen nun auch
             // markiert werden. Nach EnterGroup muessen aber die Objekte
@@ -1629,7 +1633,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
 #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */
 SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
 {
-    if((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) 
+    if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible()))
     {
         return NULL;
     }
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8e8951b21a..ea643fe643 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -235,6 +235,7 @@ SdrObjGeoData::SdrObjGeoData():
     bSizProt(FALSE),
     bNoPrint(FALSE),
     bClosedObj(FALSE),
+    mbVisible(true),
     mnLayerID(0)
 {
     DBG_CTOR(SdrObjGeoData,NULL);
@@ -414,6 +415,7 @@ SdrObject::SdrObject()
     bEmptyPresObj    =FALSE;
     bNotVisibleAsMaster=FALSE;
     bClosedObj       =FALSE;
+    mbVisible		 = true;
 
     // #i25616#
     mbLineIsOutsideGeometry = sal_False;
@@ -1049,6 +1051,7 @@ void SdrObject::operator=(const SdrObject& rObj)
     bSizProt=rObj.bSizProt;
     bMovProt=rObj.bMovProt;
     bNoPrint=rObj.bNoPrint;
+    mbVisible=rObj.mbVisible;
     bMarkProt=rObj.bMarkProt;
     //EmptyPresObj wird nicht kopiert: nun doch! (25-07-1995, Joe)
     bEmptyPresObj =rObj.bEmptyPresObj;
@@ -1920,6 +1923,7 @@ void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
     rGeo.bMovProt      =bMovProt      ;
     rGeo.bSizProt      =bSizProt      ;
     rGeo.bNoPrint      =bNoPrint      ;
+    rGeo.mbVisible	   =mbVisible     ;
     rGeo.bClosedObj    =bClosedObj    ;
     rGeo.mnLayerID = mnLayerID;
 
@@ -1946,6 +1950,7 @@ void SdrObject::RestGeoData(const SdrObjGeoData& rGeo)
     bMovProt      =rGeo.bMovProt      ;
     bSizProt      =rGeo.bSizProt      ;
     bNoPrint      =rGeo.bNoPrint      ;
+    mbVisible     =rGeo.mbVisible     ;
     bClosedObj    =rGeo.bClosedObj    ;
     mnLayerID = rGeo.mnLayerID;
 
@@ -2153,6 +2158,11 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         SetPrintable(b);
     }
 
+    if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+        bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue();
+        SetVisible(b);
+    }
+
     SdrLayerID nLayer=SDRLAYER_NOTFOUND;
     if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
         nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue();
@@ -2214,6 +2224,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const
     lcl_SetItem(rAttr,bMerge,SdrObjMoveProtectItem(IsMoveProtect()));
     lcl_SetItem(rAttr,bMerge,SdrObjSizeProtectItem(IsResizeProtect()));
     lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable()));
+    lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible()));
     lcl_SetItem(rAttr,bMerge,SdrRotateAngleItem(GetRotateAngle()));
     lcl_SetItem(rAttr,bMerge,SdrShearAngleItem(GetShearAngle()));
     lcl_SetItem(rAttr,bMerge,SdrOneSizeWidthItem(rSnap.GetWidth()-1));
@@ -2692,11 +2703,29 @@ void SdrObject::SetResizeProtect(sal_Bool bProt)
 
 void SdrObject::SetPrintable(sal_Bool bPrn)
 {
-    bNoPrint=!bPrn;
-    SetChanged();
-    if (IsInserted() && pModel!=NULL) {
-        SdrHint aHint(*this);
-        pModel->Broadcast(aHint);
+    if( bPrn == bNoPrint )
+    {
+        bNoPrint=!bPrn;
+        SetChanged();
+        if (IsInserted() && pModel!=NULL)
+        {
+            SdrHint aHint(*this);
+            pModel->Broadcast(aHint);
+        }
+    }
+}
+
+void SdrObject::SetVisible(sal_Bool bVisible)
+{
+    if( bVisible != mbVisible )
+    {
+        mbVisible = bVisible;
+        SetChanged();
+        if (IsInserted() && pModel!=NULL)
+        {
+            SdrHint aHint(*this);
+            pModel->Broadcast(aHint);
+        }
     }
 }
 
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 8c14a33564..288cfcc593 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -239,8 +239,9 @@ basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const SdrObjKind eCicrleKind, c
     else
     {
         // mirror start, end for geometry creation since model coordinate system is mirrored in Y
-        const double fStart(((36000 - nEnd) % 36000) * F_PI18000);
-        const double fEnd(((36000 - nStart) % 36000) * F_PI18000);
+        // #i111715# increase numerical correctness by first dividing and not using F_PI1800
+        const double fStart((((36000 - nEnd) % 36000) / 18000.0) * F_PI);
+        const double fEnd((((36000 - nStart) % 36000) / 18000.0) * F_PI);
 
         // create circle segment. This is not closed by default
         aCircPolygon = basegfx::tools::createPolygonFromEllipseSegment(
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 537703e622..6abb9b200b 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1674,6 +1674,11 @@ void SdrEdgeObj::SetEdgeTrackPath( const basegfx::B2DPolyPolygon& rPoly )
         *pEdgeTrack = XPolygon( rPoly.getB2DPolygon( 0 ) );
         bEdgeTrackDirty = sal_False;
         bEdgeTrackUserDefined = sal_True;
+
+        // #i110629# also set aRect and maSnapeRect dependent from pEdgeTrack
+        const Rectangle aPolygonBounds(pEdgeTrack->GetBoundRect());
+        aRect = aPolygonBounds;
+        maSnapRect = aPolygonBounds;
     }
 }
 
@@ -2100,7 +2105,7 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
         // Problem: Gruppenobjekt mit verschiedenen Layern liefert LayerID 0 !!!!
         no--;
         SdrObject* pObj=pOL->GetObj(no);
-        if (rVisLayer.IsSet(pObj->GetLayer()) &&       // nur sichtbare Objekte
+        if (rVisLayer.IsSet(pObj->GetLayer()) && pObj->IsVisible() &&      // only visible objects
             (pThis==NULL || pObj!=(SdrObject*)pThis) && // nicht an mich selbst connecten
             pObj->IsNode())
         {
@@ -2206,17 +2211,31 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
 
 void SdrEdgeObj::NbcSetSnapRect(const Rectangle& rRect)
 {
-    Rectangle aOld(GetSnapRect());
-    long nMulX = rRect.Right()  - rRect.Left();
-    long nDivX = aOld.Right()   - aOld.Left();
-    long nMulY = rRect.Bottom() - rRect.Top();
-    long nDivY = aOld.Bottom()  - aOld.Top();
-    if ( nDivX == 0 ) { nMulX = 1; nDivX = 1; }
-    if ( nDivY == 0 ) { nMulY = 1; nDivY = 1; }
-    Fraction aX(nMulX, nDivX);
-    Fraction aY(nMulY, nDivY);
-    NbcResize(aOld.TopLeft(), aX, aY);
-    NbcMove(Size(rRect.Left() - aOld.Left(), rRect.Top() - aOld.Top()));
+    const Rectangle aOld(GetSnapRect());
+
+    if(aOld != rRect)
+    {
+        if(aRect.IsEmpty() && 0 == pEdgeTrack->GetPointCount())
+        {
+            // #i110629# When initializing, do not scale on empty Rectangle; this
+            // will mirror the underlying text object (!)
+            aRect = rRect;
+            maSnapRect = rRect;
+        }
+        else
+        {
+            long nMulX = rRect.Right()  - rRect.Left();
+            long nDivX = aOld.Right()   - aOld.Left();
+            long nMulY = rRect.Bottom() - rRect.Top();
+            long nDivY = aOld.Bottom()  - aOld.Top();
+            if ( nDivX == 0 ) { nMulX = 1; nDivX = 1; }
+            if ( nDivY == 0 ) { nMulY = 1; nDivY = 1; }
+            Fraction aX(nMulX, nDivX);
+            Fraction aY(nMulY, nDivY);
+            NbcResize(aOld.TopLeft(), aX, aY);
+            NbcMove(Size(rRect.Left() - aOld.Left(), rRect.Top() - aOld.Top()));
+        }
+    }
 }
 
 void SdrEdgeObj::NbcMove(const Size& rSiz)
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index afcef6b1b2..0b3fb3a2bf 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -107,15 +107,13 @@ namespace
             maLocale(rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale()),
             mbRTL(rInfo.mrFont.IsVertical() ? false : rInfo.IsRTL())
         {
-            if(mnTextLength)
+            if(mnTextLength && rInfo.mpDXArray)
             {
                 maDblDXArray.reserve(mnTextLength);
-                const sal_Int32 nFontWidth(0L == maFont.GetWidth() ? maFont.GetHeight() : maFont.GetWidth());
-                const double fScaleFactor(0L != nFontWidth ? 1.0 / (double)nFontWidth : 1.0);
                 
                 for(xub_StrLen a(0); a < mnTextLength; a++)
                 {
-                    maDblDXArray.push_back((double)rInfo.mpDXArray[a] * fScaleFactor);
+                    maDblDXArray.push_back((double)rInfo.mpDXArray[a]);
                 }
             }
         }
@@ -291,7 +289,8 @@ namespace
             const double fPolyLength(basegfx::tools::getLength(aPolygonCandidate));
             double fPolyEnd(fPolyLength);
             double fPolyStart(0.0);
-            double fScaleFactor(1.0);
+            double fAutosizeScaleFactor(1.0);
+            bool bAutosizeScale(false);
 
             if(maSdrFormTextAttribute.getFormTextMirror())
             {
@@ -352,7 +351,8 @@ namespace
                     // if scale, prepare scale factor between curve length and text length
                     if(0.0 != fParagraphTextLength)
                     {
-                        fScaleFactor = (fPolyEnd - fPolyStart) / fParagraphTextLength;
+                        fAutosizeScaleFactor = (fPolyEnd - fPolyStart) / fParagraphTextLength;
+                        bAutosizeScale = true;
                     }
                 }
             }
@@ -382,10 +382,10 @@ namespace
                         // prepare portion length. Takes RTL sections into account.
                         double fPortionLength(pCandidate->getDisplayLength(nUsedTextLength, nNextGlyphLen));
 
-                        if(XFT_AUTOSIZE == maSdrFormTextAttribute.getFormTextAdjust())
+                        if(bAutosizeScale)
                         {
-                            // when scaling, expand portion length
-                            fPortionLength *= fScaleFactor;
+                            // when autosize scaling, expand portion length
+                            fPortionLength *= fAutosizeScaleFactor;
                         }
 
                         // create transformation
@@ -397,10 +397,10 @@ namespace
                         aNewTransformA.scale(aFontScaling.getX(), aFontScaling.getY());
 
                         // prepare scaling of text primitive
-                        if(XFT_AUTOSIZE == maSdrFormTextAttribute.getFormTextAdjust())
+                        if(bAutosizeScale)
                         {
-                            // when scaling, expand text primitive scaling
-                            aNewTransformA.scale(fScaleFactor, fScaleFactor);
+                            // when autosize scaling, expand text primitive scaling to it
+                            aNewTransformA.scale(fAutosizeScaleFactor, fAutosizeScaleFactor);
                         }
 
                         // eventually create shadow primitives from aDecomposition and add to rDecomposition
@@ -497,17 +497,42 @@ namespace
                             aNewTransformB.translate(aPerpendicular.getX(), aPerpendicular.getY());
                         }
 
-                        // shadow primitive creation
-                        if(bShadow)
+                        if(pCandidate->getText().Len() && nNextGlyphLen)
                         {
-                            if(pCandidate->getText().Len() && nNextGlyphLen)
+                            const xub_StrLen nPortionIndex(pCandidate->getPortionIndex(nUsedTextLength, nNextGlyphLen));
+                            ::std::vector< double > aNewDXArray;
+                            
+                            if(nNextGlyphLen > 1 && pCandidate->getDoubleDXArray().size())
                             {
+                                // copy DXArray for portion
+                                aNewDXArray.insert(
+                                    aNewDXArray.begin(),
+                                    pCandidate->getDoubleDXArray().begin() + nPortionIndex,
+                                    pCandidate->getDoubleDXArray().begin() + (nPortionIndex + nNextGlyphLen));
+
+                                if(nPortionIndex > 0)
+                                {
+                                    // adapt to portion start
+                                    double fDXOffset= *(pCandidate->getDoubleDXArray().begin() + (nPortionIndex - 1));
+                                    ::std::transform(
+                                        aNewDXArray.begin(), aNewDXArray.end(),
+                                        aNewDXArray.begin(), ::std::bind2nd(::std::minus<double>(), fDXOffset));
+                                }
+
+                                if(bAutosizeScale)
+                                {
+                                    // when autosize scaling, adapt to DXArray, too
+                                    ::std::transform(
+                                        aNewDXArray.begin(), aNewDXArray.end(),
+                                        aNewDXArray.begin(), ::std::bind2nd(::std::multiplies<double>(), fAutosizeScaleFactor));
+                                }
+                            }
+
+                            if(bShadow)
+                            {
+                                // shadow primitive creation
                                 const Color aShadowColor(maSdrFormTextAttribute.getFormTextShdwColor());
                                 const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor());
-                                const xub_StrLen nPortionIndex(pCandidate->getPortionIndex(nUsedTextLength, nNextGlyphLen));
-                                const ::std::vector< double > aNewDXArray(
-                                    pCandidate->getDoubleDXArray().begin() + nPortionIndex,
-                                    pCandidate->getDoubleDXArray().begin() + nPortionIndex + nNextGlyphLen);
 
                                 drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pNew = 
                                     new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
@@ -522,30 +547,25 @@ namespace
                                 
                                 mrShadowDecomposition.push_back(pNew);
                             }
-                        }
 
-                        // primitive creation
-                        if(pCandidate->getText().Len() && nNextGlyphLen)
-                        {
-                            const Color aColor(pCandidate->getFont().GetColor());
-                            const basegfx::BColor aRGBColor(aColor.getBColor());
-                            const xub_StrLen nPortionIndex(pCandidate->getPortionIndex(nUsedTextLength, nNextGlyphLen));
-                            const ::std::vector< double > aNewDXArray(
-                                pCandidate->getDoubleDXArray().begin() + nPortionIndex,
-                                pCandidate->getDoubleDXArray().begin() + nPortionIndex + nNextGlyphLen);
-
-                            drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pNew = 
-                                new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
-                                    aNewTransformB * aNewTransformA, 
-                                    pCandidate->getText(), 
-                                    nPortionIndex, 
-                                    nNextGlyphLen, 
-                                    aNewDXArray, 
-                                    aCandidateFontAttribute, 
-                                    pCandidate->getLocale(),
-                                    aRGBColor);
-                            
-                            mrDecomposition.push_back(pNew);
+                            {
+                                // primitive creation
+                                const Color aColor(pCandidate->getFont().GetColor());
+                                const basegfx::BColor aRGBColor(aColor.getBColor());
+
+                                drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pNew = 
+                                    new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+                                        aNewTransformB * aNewTransformA, 
+                                        pCandidate->getText(), 
+                                        nPortionIndex, 
+                                        nNextGlyphLen, 
+                                        aNewDXArray, 
+                                        aCandidateFontAttribute, 
+                                        pCandidate->getLocale(),
+                                        aRGBColor);
+                                
+                                mrDecomposition.push_back(pNew);
+                            }
                         }
 
                         // consume from portion // no += here, xub_StrLen is USHORT and the compiler will gererate a warning here
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 738526f015..20f248c3c9 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -125,5 +125,8 @@ XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara,
 
 const SdrTextObj* SdrOutliner::GetTextObj() const
 {
-    return static_cast< SdrTextObj* >( mpTextObj.get() );
+    if( mpTextObj.is() )
+        return static_cast< SdrTextObj* >( mpTextObj.get() );
+    else
+        return 0;
 }
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 8cb92ceeb1..f9dc3c313d 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1221,18 +1221,6 @@ SdrPageProperties::SdrPageProperties(SdrPage& rSdrPage)
     }
 }
 
-SdrPageProperties::SdrPageProperties(const SdrPageProperties& rCandidate)
-:   SfxListener(),
-    mpSdrPage(rCandidate.mpSdrPage),
-    mpStyleSheet(0),
-    mpProperties(new SfxItemSet(*rCandidate.mpProperties))
-{
-    if(rCandidate.GetStyleSheet())
-    {
-        ImpAddStyleSheet(*rCandidate.GetStyleSheet());
-    }
-}
-
 SdrPageProperties::~SdrPageProperties()
 {
     ImpRemoveStyleSheet();
@@ -1365,6 +1353,8 @@ SdrPage::SdrPage(const SdrPage& rSrcPage)
     // Warning: this leads to slicing (see issue 93186) and has to be
     // removed as soon as possible.
     *this = rSrcPage;
+    OSL_ENSURE(mpSdrPageProperties, 
+        "SdrPage::SdrPage: operator= did not create needed SdrPageProperties (!)");
 
     // be careful and correct eListKind, a member of SdrObjList which
     // will be changed by the SdrOIbjList::operator= before...
@@ -1382,8 +1372,6 @@ SdrPage::SdrPage(const SdrPage& rSrcPage)
         mxUnoPage = NULL;
         xComponent->dispose();
     }
-
-    mpSdrPageProperties = new SdrPageProperties(rSrcPage.getSdrPageProperties());
 }
 
 SdrPage::~SdrPage()
@@ -1478,8 +1466,28 @@ void SdrPage::operator=(const SdrPage& rSrcPage)
     mbObjectsNotPersistent = rSrcPage.mbObjectsNotPersistent;
 
     {
-        delete mpSdrPageProperties;
-        mpSdrPageProperties = new SdrPageProperties(rSrcPage.getSdrPageProperties());
+        // #i111122# delete SdrPageProperties when model is different
+        if(mpSdrPageProperties && GetModel() != rSrcPage.GetModel())
+        {
+            delete mpSdrPageProperties;
+            mpSdrPageProperties = 0;
+        }
+
+        if(!mpSdrPageProperties)
+        {
+            mpSdrPageProperties = new SdrPageProperties(*this);
+        }
+        else
+        {
+            mpSdrPageProperties->ClearItem(0);
+        }
+
+        if(!IsMasterPage())
+        {
+            mpSdrPageProperties->PutItemSet(rSrcPage.getSdrPageProperties().GetItemSet());
+        }
+
+        mpSdrPageProperties->SetStyleSheet(rSrcPage.getSdrPageProperties().GetStyleSheet());
     }
 
     // Now copy the contained obejcts (by cloning them)
@@ -1659,7 +1667,17 @@ void SdrPage::SetModel(SdrModel* pNewModel)
         }
         pLayerAdmin->SetModel(pNewModel);
 
-        SdrPageProperties *pNew = new SdrPageProperties(getSdrPageProperties());
+        // create new SdrPageProperties with new model (due to SfxItemSet there)
+        // and copy ItemSet and StyleSheet
+        SdrPageProperties *pNew = new SdrPageProperties(*this);
+
+        if(!IsMasterPage())
+        {
+            pNew->PutItemSet(getSdrPageProperties().GetItemSet());
+        }
+
+        pNew->SetStyleSheet(getSdrPageProperties().GetStyleSheet());
+
         delete mpSdrPageProperties;
         mpSdrPageProperties = pNew;
     }
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 59e99d8d82..669ec8c49b 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -754,6 +754,12 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
             return sal_False;
         }
 
+        // only visible are markable
+        if( !pObj->IsVisible() )
+        {
+            return sal_False;
+        }
+
         // #112440#
         if(pObj->ISA(SdrObjGroup))
         {
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 4d1e6f302d..6250983305 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2395,6 +2395,11 @@ String SIP_SA_OBJPRINTABLE
     Text [ en-US ] = "Object, printable";
 };
 
+String SIP_SA_OBJVISIBLE
+{
+    Text [ en-US ] = "Object, visible";
+};
+
 String SIP_SA_LAYERID
 {
     Text [ en-US ] = "Level ID";
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
index 9b08caa587..73a178d975 100644
--- a/svx/source/tbxctrls/makefile.mk
+++ b/svx/source/tbxctrls/makefile.mk
@@ -61,7 +61,8 @@ LIB2OBJFILES= \
         $(SLO)$/verttexttbxctrl.obj \
         $(SLO)$/subtoolboxcontrol.obj \
         $(SLO)$/tbxcolor.obj \
-        $(SLO)$/tbunocontroller.obj
+        $(SLO)$/tbunocontroller.obj \
+        $(SLO)$/tbunosearchcontrollers.obj
 
 SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
new file mode 100644
index 0000000000..407ef59149
--- /dev/null
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -0,0 +1,867 @@
+/*************************************************************************
+ *
+ * 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_svx.hxx"
+
+#include "tbunosearchcontrollers.hxx"
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/util/URL.hpp>
+
+#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+
+namespace svx
+{
+
+static const ::rtl::OUString SEARCHITEM_SEARCHSTRING   = ::rtl::OUString::createFromAscii("SearchItem.SearchString");
+static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD = ::rtl::OUString::createFromAscii("SearchItem.Backward");
+
+static const ::rtl::OUString COMMAND_EXECUTESEARCH = ::rtl::OUString::createFromAscii(".uno:ExecuteSearch");
+static const ::rtl::OUString COMMAND_FINDTEXT   = ::rtl::OUString::createFromAscii(".uno:FindText")  ;
+static const ::rtl::OUString COMMAND_DOWNSEARCH = ::rtl::OUString::createFromAscii(".uno:DownSearch");
+static const ::rtl::OUString COMMAND_UPSEARCH   = ::rtl::OUString::createFromAscii(".uno:UpSearch")  ;
+static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY   = ::rtl::OUString::createFromAscii("AppendSearchHistory");
+
+static const ::rtl::OUString SERVICENAME_URLTRANSFORMER = ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer");
+static const sal_Int32       REMEMBER_SIZE = 10;
+
+void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
+{
+    css::uno::Reference< css::util::XURLTransformer > xURLTransformer( rSMgr->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY );
+    if ( xURLTransformer.is() )
+    {        
+        css::util::URL aURL;
+        aURL.Complete = COMMAND_EXECUTESEARCH;
+        xURLTransformer->parseStrict(aURL);
+
+        css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider(xFrame, css::uno::UNO_QUERY);
+        if ( xDispatchProvider.is() )
+        {
+            css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 );        
+            if ( xDispatch.is() && aURL.Complete.getLength() > 0 )
+                xDispatch->dispatch( aURL, lArgs );
+        }
+    }
+}
+
+FindTextFieldControl::FindTextFieldControl( Window* pParent, WinBits nStyle, 
+    css::uno::Reference< css::frame::XFrame >& xFrame,
+    css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager) :
+    ComboBox( pParent, nStyle ),
+    m_xFrame(xFrame),
+    m_xServiceManager(xServiceManager),
+    m_bToClearTextField(sal_True)
+{
+    InitControls_Impl();
+}
+
+FindTextFieldControl::~FindTextFieldControl()
+{
+}
+
+void FindTextFieldControl::InitControls_Impl()
+{
+    SetText( String( ::rtl::OUString::createFromAscii("Find") ) );
+    SetControlForeground(COL_GRAY);
+
+    EnableAutocomplete(TRUE, TRUE);
+}
+
+void FindTextFieldControl::Remember_Impl(const String& rStr)
+{
+    USHORT nCount = GetEntryCount();
+
+    for (USHORT i=0; i<nCount; ++i)
+    {
+        if ( rStr == GetEntry(i))
+            return;
+    }
+
+    if (nCount == REMEMBER_SIZE)
+        RemoveEntry(REMEMBER_SIZE-1);
+
+    InsertEntry(rStr, 0);
+}
+
+void FindTextFieldControl::Modify()
+{
+    ComboBox::Modify();
+
+    SetControlForeground( Color( COL_BLACK ) );
+}
+
+long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
+{
+    long nRet= ComboBox::PreNotify( rNEvt );
+
+    switch ( rNEvt.GetType() )
+    {
+        case EVENT_KEYINPUT:
+        {
+            const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
+            sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
+            sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2();
+            sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift();
+            sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
+
+            if ( (bCtrl && bAlt && KEY_F == nCode) || KEY_ESCAPE == nCode )
+                GrabFocusToDocument();
+
+            if ( KEY_RETURN == nCode )
+            {
+                Remember_Impl(GetText());
+
+                ::rtl::OUString sFindText = GetText();
+                css::uno::Sequence< css::beans::PropertyValue > lArgs(2);
+
+                lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+                lArgs[0].Value <<= sFindText;
+
+                lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+                if (bShift)
+                    lArgs[1].Value <<= sal_True;
+                else
+                    lArgs[1].Value <<= sal_False;
+
+                impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
+            }
+            break;
+        }
+
+        case EVENT_GETFOCUS:
+            if ( m_bToClearTextField )
+            {
+                SetText( String() );
+                m_bToClearTextField = sal_False;
+            }
+            SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+            break;
+
+        case EVENT_LOSEFOCUS:
+            if ( GetText().Len() == 0 )
+            {
+                SetText( String( ::rtl::OUString::createFromAscii("Find") ) );
+                SetControlForeground(COL_GRAY);
+                m_bToClearTextField = sal_True;
+            }
+            break;
+    }
+
+    return nRet;
+}
+
+
+//-----------------------------------------------------------------------------------------------------------
+// SearchToolbarControllersManager
+
+SearchToolbarControllersManager* SearchToolbarControllersManager::m_pInstance = 0;
+
+SearchToolbarControllersManager::SearchToolbarControllersManager()
+{
+}
+
+SearchToolbarControllersManager::~SearchToolbarControllersManager()
+{
+}
+
+SearchToolbarControllersManager* SearchToolbarControllersManager::createControllersManager()
+{
+    if (!m_pInstance)
+        m_pInstance = new SearchToolbarControllersManager();
+
+    return m_pInstance;
+}
+
+void SearchToolbarControllersManager::registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL )
+{
+    SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame);
+    if (pIt == aSearchToolbarControllersMap.end())
+    {
+        SearchToolbarControllersVec lControllers(1);
+        lControllers[0].Name = sCommandURL;
+        lControllers[0].Value <<= xStatusListener;
+        aSearchToolbarControllersMap.insert(SearchToolbarControllersMap::value_type(xFrame, lControllers));
+    }
+    else
+    {
+        sal_Int32 nSize = pIt->second.size();
+        for (sal_Int32 i=0; i<nSize; ++i)
+        {
+            if (pIt->second[i].Name.equals(sCommandURL))
+                return;
+        }
+
+        pIt->second.resize(nSize+1);
+        pIt->second[nSize].Name = sCommandURL;
+        pIt->second[nSize].Value <<= xStatusListener;
+    }
+}
+
+void SearchToolbarControllersManager::freeController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& /*xStatusListener*/, const ::rtl::OUString& sCommandURL )
+{
+    SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame);
+    if (pIt != aSearchToolbarControllersMap.end())
+    {
+        for (SearchToolbarControllersVec::iterator pItCtrl=pIt->second.begin(); pItCtrl!=pIt->second.end(); ++pItCtrl)
+        {
+            if (pItCtrl->Name.equals(sCommandURL))
+            {
+                pIt->second.erase(pItCtrl);
+                break;
+            }
+        }
+
+        if (pIt->second.empty())
+            aSearchToolbarControllersMap.erase(pIt);
+    }
+}
+
+css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManager::findController( const css::uno::Reference< css::frame::XFrame >& xFrame, const ::rtl::OUString& sCommandURL )
+{
+    css::uno::Reference< css::frame::XStatusListener > xStatusListener;
+
+    SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame);
+    if (pIt != aSearchToolbarControllersMap.end())
+    {
+        for (SearchToolbarControllersVec::iterator pItCtrl =pIt->second.begin(); pItCtrl != pIt->second.end(); ++pItCtrl)
+        {
+            if (pItCtrl->Name.equals(sCommandURL))
+            {
+                pItCtrl->Value >>= xStatusListener;
+                break;
+            }
+        }
+    }
+
+    return xStatusListener;
+}
+
+//-----------------------------------------------------------------------------------------------------------
+// FindTextToolbarController
+
+FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
+    :svt::ToolboxController( rServiceManager, 
+    css::uno::Reference< css::frame::XFrame >(), 
+    COMMAND_FINDTEXT )
+{
+}
+
+FindTextToolbarController::~FindTextToolbarController()
+{
+}
+
+// XInterface
+css::uno::Any SAL_CALL FindTextToolbarController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException )
+{
+    css::uno::Any a = ToolboxController::queryInterface( aType );
+    if ( a.hasValue() )
+        return a;
+
+    return ::cppu::queryInterface( aType, static_cast< css::lang::XServiceInfo* >( this ) );
+}
+
+void SAL_CALL FindTextToolbarController::acquire() throw ()
+{
+    ToolboxController::acquire();
+}
+
+void SAL_CALL FindTextToolbarController::release() throw ()
+{
+    ToolboxController::release();
+}
+
+// XServiceInfo
+::rtl::OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException )
+{
+    return getImplementationName_Static(); 
+}
+
+sal_Bool SAL_CALL FindTextToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException )
+{	
+    const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString * pArray = aSNL.getConstArray();
+
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
+        if( pArray[i] == ServiceName )
+            return true;
+
+    return false;
+}
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException )
+{
+    return getSupportedServiceNames_Static();
+}
+
+css::uno::Sequence< ::rtl::OUString >  FindTextToolbarController::getSupportedServiceNames_Static() throw()
+{
+    css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
+    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) );
+    return aSNS;
+}
+
+// XComponent
+void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeException )
+{
+    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+
+    SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+    
+    svt::ToolboxController::dispose();
+    delete m_pFindTextFieldControl;
+    m_pFindTextFieldControl = 0;
+}
+
+// XInitialization
+void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException)
+{
+    svt::ToolboxController::initialize(aArguments);
+
+    Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
+    ToolBox* pToolBox = (ToolBox*)pWindow;
+    if ( pToolBox )
+    {
+        USHORT nItemCount = pToolBox->GetItemCount();
+        for ( USHORT i=0; i<nItemCount; ++i )
+        {
+            ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
+            if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) )
+                m_nDownSearchId = i;
+            else if (sItemCommand.equals( COMMAND_UPSEARCH ))
+                m_nUpSearchId = i;
+        }
+    }
+
+    SearchToolbarControllersManager::createControllersManager()->registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+}
+
+// XToolbarController
+void SAL_CALL FindTextToolbarController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException )
+{
+}
+
+css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException )
+{
+    css::uno::Reference< css::awt::XWindow > xItemWindow;
+
+    css::uno::Reference< css::awt::XWindow > xParent( Parent );
+    Window* pParent = VCLUnoHelper::GetWindow( xParent );
+    if ( pParent )
+    {
+        ToolBox* pToolbar =  ( ToolBox* )pParent;
+        m_pFindTextFieldControl = new FindTextFieldControl( pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, m_xServiceManager );
+
+        Size aSize(100, m_pFindTextFieldControl->GetTextHeight() + 200);
+        m_pFindTextFieldControl->SetSizePixel( aSize );
+        m_pFindTextFieldControl->SetModifyHdl(LINK(this, FindTextToolbarController, EditModifyHdl));
+    }
+    xItemWindow = VCLUnoHelper::GetInterface( m_pFindTextFieldControl );
+
+    return xItemWindow;
+}
+
+// XStatusListener
+void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException )
+{
+    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    if ( m_bDisposed )
+        return;
+
+    ::rtl::OUString aFeatureURL = rEvent.FeatureURL.Complete;
+    if (aFeatureURL.equalsAscii("AppendSearchHistory"))
+    {
+        m_pFindTextFieldControl->Remember_Impl(m_pFindTextFieldControl->GetText());
+    }
+}
+
+IMPL_LINK( FindTextToolbarController, EditModifyHdl, void *, EMPTYARG )
+{
+    // enable or disable item DownSearch/UpSearch of findbar 
+    Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
+    ToolBox* pToolBox = (ToolBox*)pWindow;
+    if ( pToolBox && m_pFindTextFieldControl )
+    {
+        if (m_pFindTextFieldControl->GetText().Len()>0)
+        {
+            if ( !pToolBox->IsItemEnabled(m_nDownSearchId) )
+                pToolBox->EnableItem(m_nDownSearchId, sal_True);
+            if ( !pToolBox->IsItemEnabled(m_nUpSearchId) )
+                pToolBox->EnableItem(m_nUpSearchId, sal_True);
+        }
+        else
+        {
+            if ( pToolBox->IsItemEnabled(m_nDownSearchId) )
+                pToolBox->EnableItem(m_nDownSearchId, sal_False);
+            if ( pToolBox->IsItemEnabled(m_nUpSearchId) )
+                pToolBox->EnableItem(m_nUpSearchId, sal_False);
+        }
+    }
+
+    return 0;
+}
+
+//-----------------------------------------------------------------------------------------------------------
+// class DownSearchToolboxController
+
+DownSearchToolboxController::DownSearchToolboxController(const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
+    : svt::ToolboxController( rServiceManager, 
+    css::uno::Reference< css::frame::XFrame >(), 
+    COMMAND_DOWNSEARCH )
+{
+}
+
+DownSearchToolboxController::~DownSearchToolboxController()
+{
+}
+
+// XInterface
+css::uno::Any SAL_CALL DownSearchToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException )
+{
+    css::uno::Any a = ToolboxController::queryInterface( aType );
+    if ( a.hasValue() )
+        return a;
+
+    return ::cppu::queryInterface( aType, static_cast< css::lang::XServiceInfo* >( this ) );
+}
+
+void SAL_CALL DownSearchToolboxController::acquire() throw ()
+{
+    ToolboxController::acquire();
+}
+
+void SAL_CALL DownSearchToolboxController::release() throw ()
+{
+    ToolboxController::release();
+}
+
+// XServiceInfo
+::rtl::OUString SAL_CALL DownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException )
+{
+    return getImplementationName_Static();
+}
+
+sal_Bool SAL_CALL DownSearchToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException )
+{	
+    const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString * pArray = aSNL.getConstArray();
+
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
+        if( pArray[i] == ServiceName )
+            return true;
+
+    return false;
+}
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL DownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException )
+{
+    return getSupportedServiceNames_Static();
+}
+
+css::uno::Sequence< ::rtl::OUString >  DownSearchToolboxController::getSupportedServiceNames_Static() throw()
+{
+    css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
+    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    return aSNS;
+}
+
+// XComponent
+void SAL_CALL DownSearchToolboxController::dispose() throw ( css::uno::RuntimeException )
+{
+    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+
+    SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
+    svt::ToolboxController::dispose();
+}
+
+// XInitialization
+void SAL_CALL DownSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+    svt::ToolboxController::initialize( aArguments );
+    SearchToolbarControllersManager::createControllersManager()->registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+}
+
+// XToolbarController
+void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException)
+{
+    if ( m_bDisposed )
+        throw css::lang::DisposedException();
+
+    ::rtl::OUString sFindText;
+    Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
+    ToolBox* pToolBox = (ToolBox*)pWindow;
+    if ( pToolBox )
+    {
+        USHORT nItemCount = pToolBox->GetItemCount();
+        for ( USHORT i=0; i<nItemCount; ++i )
+        {
+            ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
+            if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
+            {
+                Window* pItemWin = pToolBox->GetItemWindow(i);
+                if (pItemWin)
+                    sFindText = pItemWin->GetText();
+                break;
+            }                    
+        }
+    }
+
+    css::uno::Sequence< css::beans::PropertyValue > lArgs(2);
+    lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+    lArgs[0].Value <<= sFindText;
+    lArgs[1].Name = SEARCHITEM_SEARCHBACKWARD;
+    lArgs[1].Value <<= sal_False;
+
+    impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
+
+    css::frame::FeatureStateEvent aEvent;
+    aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+    css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager()->findController(m_xFrame, COMMAND_FINDTEXT);
+    if (xStatusListener.is())
+        xStatusListener->statusChanged( aEvent );
+}
+
+// XStatusListener
+void SAL_CALL DownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException )
+{
+    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    if ( m_bDisposed )
+        return;
+}
+
+//-----------------------------------------------------------------------------------------------------------
+// class UpSearchToolboxController
+
+UpSearchToolboxController::UpSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager )
+    :svt::ToolboxController( rServiceManager, 
+    css::uno::Reference< css::frame::XFrame >(), 
+    COMMAND_UPSEARCH )
+{
+}
+
+UpSearchToolboxController::~UpSearchToolboxController()
+{
+}
+
+// XInterface
+css::uno::Any SAL_CALL UpSearchToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException )
+{
+    css::uno::Any a = ToolboxController::queryInterface( aType );
+    if ( a.hasValue() )
+        return a;
+
+    return ::cppu::queryInterface( aType, static_cast< css::lang::XServiceInfo* >( this ) );
+}
+
+void SAL_CALL UpSearchToolboxController::acquire() throw ()
+{
+    ToolboxController::acquire();
+}
+
+void SAL_CALL UpSearchToolboxController::release() throw ()
+{
+    ToolboxController::release();
+}
+
+// XServiceInfo
+::rtl::OUString SAL_CALL UpSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException )
+{
+    return getImplementationName_Static(); 
+}
+
+sal_Bool SAL_CALL UpSearchToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException )
+{	
+    const css::uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString * pArray = aSNL.getConstArray();
+
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
+        if( pArray[i] == ServiceName )
+            return true;
+
+    return false;
+}
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL UpSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException )
+{
+    return getSupportedServiceNames_Static();
+}
+
+css::uno::Sequence< ::rtl::OUString >  UpSearchToolboxController::getSupportedServiceNames_Static() throw()
+{
+    css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
+    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) );
+    return aSNS;
+}
+
+// XComponent
+void SAL_CALL UpSearchToolboxController::dispose() throw ( css::uno::RuntimeException )
+{
+    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+
+    SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
+    svt::ToolboxController::dispose();
+}
+
+// XInitialization
+void SAL_CALL UpSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+    svt::ToolboxController::initialize( aArguments );
+    SearchToolbarControllersManager::createControllersManager()->registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+}
+
+// XToolbarController
+void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException )
+{
+    if ( m_bDisposed )
+        throw css::lang::DisposedException();
+
+    ::rtl::OUString sFindText;
+    Window* pWindow = VCLUnoHelper::GetWindow( getParent() );
+    ToolBox* pToolBox = (ToolBox*)pWindow;
+    if ( pToolBox )
+    {
+        USHORT nItemCount = pToolBox->GetItemCount();
+        for ( USHORT i=0; i<nItemCount; ++i )
+        {
+            ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
+            if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
+            {
+                Window* pItemWin = pToolBox->GetItemWindow(i);
+                if (pItemWin)
+                    sFindText = pItemWin->GetText();
+                break;
+            }                    
+        }
+    }
+
+    css::uno::Sequence< css::beans::PropertyValue > lArgs(2);
+    lArgs[0].Name = SEARCHITEM_SEARCHSTRING;
+    lArgs[0].Value <<= sFindText;
+    lArgs[1].Name =  SEARCHITEM_SEARCHBACKWARD;
+    lArgs[1].Value <<= sal_True;
+
+    impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
+
+    css::frame::FeatureStateEvent aEvent;
+    aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
+    css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager()->findController(m_xFrame, COMMAND_FINDTEXT);
+    if (xStatusListener.is())
+        xStatusListener->statusChanged( aEvent );
+}
+
+// XStatusListener
+void SAL_CALL UpSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException )
+{
+    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    if ( m_bDisposed )
+        return;
+}
+
+//-----------------------------------------------------------------------------------------------------------
+// class FindbarDispatcher
+
+FindbarDispatcher::FindbarDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory)
+    : m_xFactory( xFactory )
+{
+}
+
+FindbarDispatcher::~FindbarDispatcher()
+{
+    m_xFactory = NULL;
+    m_xFrame = NULL;
+}
+
+// XInterface
+css::uno::Any SAL_CALL FindbarDispatcher::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException )
+{
+    css::uno::Any aReturn( ::cppu::queryInterface( aType,
+        static_cast< css::lang::XServiceInfo* >(this),
+        static_cast< css::lang::XInitialization* >(this),
+        static_cast< css::frame::XDispatchProvider* >(this),
+        static_cast< css::frame::XDispatch* >(this)) );
+
+    if ( aReturn.hasValue() )
+        return aReturn;
+
+    return OWeakObject::queryInterface( aType );
+}
+
+void SAL_CALL FindbarDispatcher::acquire() throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL FindbarDispatcher::release() throw()
+{
+    OWeakObject::release();
+}
+
+// XServiceInfo
+::rtl::OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException )
+{
+    return getImplementationName_Static();
+}
+
+sal_Bool SAL_CALL FindbarDispatcher::supportsService( const ::rtl::OUString& ServiceName ) throw( css::uno::RuntimeException )
+{	
+    return (
+        ServiceName.equalsAscii("com.sun.star.comp.svx.FindbarDispatcher") ||
+        ServiceName.equalsAscii("com.sun.star.frame.ProtocolHandler")
+        );
+}
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException )
+{
+    return getSupportedServiceNames_Static();
+}
+
+css::uno::Sequence< ::rtl::OUString >  FindbarDispatcher::getSupportedServiceNames_Static() throw()
+{
+    css::uno::Sequence< ::rtl::OUString > aSNS( 2 );
+    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FindbarDispatcher" ));
+    aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ProtocolHandler" ));
+    return aSNS;
+}
+
+// XInitialization
+void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+    if ( aArguments.getLength() )
+        aArguments[0] >>= m_xFrame;
+}
+
+// XDispatchProvider
+css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const ::rtl::OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException )
+{
+    css::uno::Reference< css::frame::XDispatch > xDispatch;
+
+    if ( aURL.Protocol.equalsAscii("vnd.sun.star.findbar:") )
+        xDispatch = this;
+
+    return xDispatch;
+}
+
+css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL FindbarDispatcher::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException )
+{
+    sal_Int32 nCount = seqDescripts.getLength();
+    css::uno::Sequence < css::uno::Reference < XDispatch > > lDispatcher( nCount );
+
+    for( sal_Int32 i=0; i<nCount; ++i )
+        lDispatcher[i] = queryDispatch( seqDescripts[i].FeatureURL, seqDescripts[i].FrameName, seqDescripts[i].SearchFlags );
+
+    return lDispatcher;
+}
+
+// XDispatch
+void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException )
+{
+    //vnd.sun.star.findbar:FocusToFindbar  - set cursor to the FindTextFieldControl of the findbar
+    if ( aURL.Path.equalsAscii("FocusToFindbar") )
+    {
+        css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY);
+        if(!xPropSet.is())
+            return;
+
+        css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
+        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") );
+        aValue >>= xLayoutManager;
+        if (!xLayoutManager.is())
+            return;
+
+        const ::rtl::OUString sResourceURL = ::rtl::OUString::createFromAscii("private:resource/toolbar/findbar");
+        css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
+        if (!xUIElement.is())
+            return;
+
+        css::uno::Reference< css::awt::XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY);
+        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        ToolBox* pToolBox = (ToolBox*)pWindow;
+        if ( pToolBox )
+        {
+            USHORT nItemCount = pToolBox->GetItemCount();
+            for ( USHORT i=0; i<nItemCount; ++i )
+            {
+                ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
+                if ( sItemCommand.equalsAscii(".uno:FindText") )
+                {
+                    Window* pItemWin = pToolBox->GetItemWindow( i );
+                    if ( pItemWin )
+                    {
+                        pItemWin->GrabFocus();
+                        return;
+                    }
+                }
+            }
+        }
+
+    }
+}
+
+void SAL_CALL FindbarDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException )
+{
+}
+
+void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException )
+{
+}
+
+//-----------------------------------------------------------------------------------------------------------
+// create Instance 
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL FindTextToolbarController_createInstance( 
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
+{
+    return *new FindTextToolbarController( rSMgr );
+}
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL DownSearchToolboxController_createInstance( 
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
+{
+    return *new DownSearchToolboxController( rSMgr );
+}
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL UpSearchToolboxController_createInstance( 
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
+{
+    return *new UpSearchToolboxController( rSMgr );
+}
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createInstance( 
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
+{
+    return *new FindbarDispatcher( rSMgr );
+}
+
+//-----------------------------------------------------------------------------------------------------------
+}
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 5125998969..060ab89ffc 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -39,6 +39,7 @@
 #include "recoveryui.hxx"
 #include "xmlgrhlp.hxx"
 #include "tbunocontroller.hxx"
+#include "tbunosearchcontrollers.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
@@ -288,6 +289,12 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
             writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() );
             writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() );
             writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() );
+
+            writeInfo( pKey, svx::FindTextToolbarController::getImplementationName_Static(), svx::FindTextToolbarController::getSupportedServiceNames_Static() );
+            writeInfo( pKey, svx::DownSearchToolboxController::getImplementationName_Static(), svx::DownSearchToolboxController::getSupportedServiceNames_Static() );
+            writeInfo( pKey, svx::UpSearchToolboxController::getImplementationName_Static(), svx::UpSearchToolboxController::getSupportedServiceNames_Static() );
+            writeInfo( pKey, svx::FindbarDispatcher::getImplementationName_Static(), svx::FindbarDispatcher::getSupportedServiceNames_Static() );
+
             writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() );
 
             // XPrimitiveFactory2D
@@ -358,6 +365,34 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
                 svx::FontHeightToolBoxControl_createInstance,
                 svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() );
         }
+        else if ( svx::FindTextToolbarController::getImplementationName_Static().equalsAscii( pImplName ) )
+        {
+            xFactory = createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
+                svx::FindTextToolbarController::getImplementationName_Static(),
+                svx::FindTextToolbarController_createInstance,
+                svx::FindTextToolbarController::getSupportedServiceNames_Static() );
+        }
+        else if ( svx::DownSearchToolboxController::getImplementationName_Static().equalsAscii( pImplName ) )
+        {
+            xFactory = createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
+                svx::DownSearchToolboxController::getImplementationName_Static(),
+                svx::DownSearchToolboxController_createInstance,
+                svx::DownSearchToolboxController::getSupportedServiceNames_Static() );
+        }
+        else if ( svx::UpSearchToolboxController::getImplementationName_Static().equalsAscii( pImplName ) )
+        {
+            xFactory = createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
+                svx::UpSearchToolboxController::getImplementationName_Static(),
+                svx::UpSearchToolboxController_createInstance,
+                svx::UpSearchToolboxController::getSupportedServiceNames_Static() );
+        }
+        else if ( svx::FindbarDispatcher::getImplementationName_Static().equalsAscii( pImplName ) )
+        {
+            xFactory = createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
+                svx::FindbarDispatcher::getImplementationName_Static(),
+                svx::FindbarDispatcher_createInstance,
+                svx::FindbarDispatcher::getSupportedServiceNames_Static() );
+        }
         else if( ::unogallery::GalleryThemeProvider_getImplementationName().equalsAscii( pImplName ) )
         {
             xFactory = ::cppu::createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index a6a6ca22e8..8b5004334e 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2771,6 +2771,16 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         }
         break;
     }
+    case SDRATTR_OBJVISIBLE:
+    {
+        sal_Bool bVisible = sal_Bool();
+        if( rValue >>= bVisible )
+        {
+            mpObj->SetVisible(bVisible);
+            return true;
+        }
+        break;
+    }
     case SDRATTR_OBJSIZEPROTECT:
     {
         sal_Bool bResizeProtect = sal_Bool();
@@ -3147,11 +3157,15 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
     }
 
     case SDRATTR_OBJPRINTABLE:
-        rValue = uno::makeAny( (sal_Bool) mpObj->IsPrintable() );
+        rValue <<= static_cast<sal_Bool>( mpObj->IsPrintable() );
+        break;
+
+    case SDRATTR_OBJVISIBLE:
+        rValue <<= static_cast<sal_Bool>( mpObj->IsVisible() );
         break;
 
     case SDRATTR_OBJSIZEPROTECT:
-        rValue = uno::makeAny( (sal_Bool)mpObj->IsResizeProtect() );
+        rValue <<= static_cast<sal_Bool>( mpObj->IsResizeProtect() );
         break;
 
     case OWN_ATTR_PAGE_NUMBER:
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 4183b85273..f5599595fe 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -673,7 +673,7 @@ UUIInteractionHelper::handlePasswordRequest(
                                false /* bool bMSCryptoMode */);
         return true;
     }
-
+    
     task::DocumentMSPasswordRequest aDocumentMSPasswordRequest;
     if (aAnyRequest >>= aDocumentMSPasswordRequest)
     {
@@ -684,5 +684,17 @@ UUIInteractionHelper::handlePasswordRequest(
                                true /* bool bMSCryptoMode */);
         return true;
     }
+
+    task::PasswordRequest aPasswordRequest;
+    if( aAnyRequest >>= aPasswordRequest )
+    {
+        handlePasswordRequest_(getParentProperty(),
+                               aPasswordRequest.Mode,
+                               rRequest->getContinuations(),
+                               rtl::OUString(),
+                               false /* bool bMSCryptoMode */);
+        return true;
+    }
+
     return false;
 }
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 2c1d4d7395..e90a064993 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -868,14 +868,15 @@ UUIInteractionHelper::handleRequest_impl(
                 return true;
 
 // @@@ Todo #i29340#: activate!
-//            ucb::NameClashResolveRequest aNameClashResolveRequest;
-//            if (aAnyRequest >>= aNameClashResolveRequest)
-//            {
-//                handleNameClashResolveRequest(aNameClashResolveRequest,
-//                                              rRequest->getContinuations());
-//                return true;
-//            }
-
+#if 0
+            ucb::NameClashResolveRequest aNameClashResolveRequest;
+            if (aAnyRequest >>= aNameClashResolveRequest)
+            {
+                handleNameClashResolveRequest(aNameClashResolveRequest,
+                                              rRequest->getContinuations());
+                return true;
+            }
+#endif
             if ( handleMasterPasswordRequest( rRequest ) )
                 return true;
 
@@ -1187,6 +1188,8 @@ executeMessageBox(
     return aResult;
 }
 
+// @@@ Todo #i29340#: activate!
+#if 0
 enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE };
 
 NameClashResolveDialogResult
@@ -1214,9 +1217,11 @@ executeSimpleNameClashResolveDialog(
                 "executeSimpleNameClashResolveDialog not yet implemented!" );
     return ABORT;
 }
-
+#endif
 } // namespace
 
+// @@@ Todo #i29340#: activate!
+#if 0
 void
 UUIInteractionHelper::handleNameClashResolveRequest(
     ucb::NameClashResolveRequest const & rRequest,
@@ -1284,6 +1289,7 @@ UUIInteractionHelper::handleNameClashResolveRequest(
         break;
     }
 }
+#endif
 
 void
 UUIInteractionHelper::handleGenericErrorRequest(
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index b77032e3cf..0f54e9ee8a 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -215,6 +215,8 @@ private:
             com::sun::star::task::XInteractionRequest > const & rRequest)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
+// @@@ Todo #i29340#: activate!
+#if 0
     void
     handleNameClashResolveRequest(
         com::sun::star::ucb::NameClashResolveRequest const & rRequest,
@@ -223,6 +225,7 @@ private:
                 com::sun::star::task::XInteractionContinuation > > const &
                     rContinuations)
         SAL_THROW((com::sun::star::uno::RuntimeException));
+#endif
 
     bool
     handleMasterPasswordRequest(
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index da776a9934..bf9c909d4b 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -81,7 +81,7 @@ public:
 
     void SetProgress( sal_Int32 nPercentage );
 
-    UniReference< XMLPropertySetMapper > GetPropertySetMapper() const { return maExportHelper.GetPropertySetMapper(); }
+    UniReference< XMLPropertySetMapper > GetPropertySetMapper() const;
 
     // XServiceInfo ( : SvXMLExport )
     virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 773e439778..2b00decf57 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -69,6 +69,8 @@ enum SchXMLChartElemTokenMap
 
 enum SchXMLPlotAreaElemTokenMap
 {
+    XML_TOK_PA_COORDINATE_REGION_EXT,
+    XML_TOK_PA_COORDINATE_REGION,
     XML_TOK_PA_AXIS,
     XML_TOK_PA_SERIES,
     XML_TOK_PA_WALL,
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmlnmspe.hxx
index 1d6a96ef54..1451cdeb57 100644
--- a/xmloff/inc/xmlnmspe.hxx
+++ b/xmloff/inc/xmlnmspe.hxx
@@ -87,8 +87,10 @@ const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX	= key;
 
 XML_NAMESPACE_EXT( OFFICE,      37U )
 XML_NAMESPACE_EXT( TABLE,       38U )
+XML_NAMESPACE_EXT( CHART,       39U )
+XML_NAMESPACE_EXT( DRAW,		40U )
 
-#define _XML_OLD_NAMESPACE_BASE 39U
+#define _XML_OLD_NAMESPACE_BASE 41U
 
 // namespaces used in the technical preview (SO 5.2)
 XML_OLD_NAMESPACE( FO,		0U )
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
index e2d175c006..698ac3b0c8 100644
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
@@ -40,41 +40,9 @@
 #include <queue>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
-    namespace chart {
-        class XDiagram;
-        class XChartDocument;
-        struct ChartSeriesAddress;
-    }
-    namespace chart2 {
-        class XDiagram;
-        class XChartDocument;
-        class XDataSeries;
-        namespace data
-        {
-            class XDataProvider;
-            class XDataSequence;
-        }
-    }
-    namespace drawing {
-        class XShape;
-        class XShapes;
-    }
-    namespace task {
-        class XStatusIndicator;
-    }
-    namespace frame {
-        class XModel;
-    }
-    namespace xml {
-        namespace sax {
-            class XAttributeList;
-}}}}}
-
 class SvXMLAutoStylePoolP;
-class XMLChartExportPropertyMapper;
 class SvXMLExport;
-class XMLPropertyHandlerFactory;
+class SchXMLExportHelper_Impl;
 
 /** With this class you can export a <chart:chart> element containing
     its data as <table:table> element or without internal table. In
@@ -84,153 +52,22 @@ class XMLPropertyHandlerFactory;
 class XMLOFF_DLLPUBLIC SchXMLExportHelper : public UniRefBase
 {
 public:
-    // first: data sequence for label, second: data sequence for values.
-    typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >,
-            ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tLabelValuesDataPair;
-    typedef ::std::vector< tLabelValuesDataPair > tDataSequenceCont;
-
-private:
-    SvXMLExport& mrExport;
-    SvXMLAutoStylePoolP& mrAutoStylePool;
-    UniReference< XMLPropertyHandlerFactory > mxPropertyHandlerFactory;
-    UniReference< XMLPropertySetMapper > mxPropertySetMapper;
-    UniReference< XMLChartExportPropertyMapper > mxExpPropMapper;
-
-    rtl::OUString msTableName;
-    rtl::OUStringBuffer msStringBuffer;
-    rtl::OUString msString;
-
-    // members filled by InitRangeSegmentationProperties (retrieved from DataProvider)
-    sal_Bool mbHasSeriesLabels;
-    sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
-    sal_Bool mbRowSourceColumns;
-    rtl::OUString msChartAddress;
-    rtl::OUString msTableNumberList;
-    ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping;
-
-    rtl::OUString msCLSID;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes;
-
-    tDataSequenceCont m_aDataSequencesToExport;
-    rtl::OUString maCategoriesRange;
-
-    /** first parseDocument: collect autostyles and store names in this queue
-        second parseDocument: export content and use names from this queue
-     */
-    ::std::queue< ::rtl::OUString > maAutoStyleNameQueue;
-    SAL_DLLPRIVATE void CollectAutoStyle(
-        const std::vector< XMLPropertyState >& aStates );
-    SAL_DLLPRIVATE void AddAutoStyleAttribute(
-        const std::vector< XMLPropertyState >& aStates );
-
-    SAL_DLLPRIVATE SvXMLAutoStylePoolP& GetAutoStylePoolP()
-    { return mrAutoStylePool; }
-
-    /// if bExportContent is false the auto-styles are collected
-    SAL_DLLPRIVATE void parseDocument( com::sun::star::uno::Reference<
-                            com::sun::star::chart::XChartDocument >& rChartDoc,
-                        sal_Bool bExportContent,
-                        sal_Bool bIncludeTable = sal_False );
-    SAL_DLLPRIVATE void exportTable();
-    SAL_DLLPRIVATE void exportPlotArea(
-        com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > xDiagram,
-        com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > xNewDiagram,
-        const ::com::sun::star::awt::Size & rPageSize,
-        sal_Bool bExportContent,
-        sal_Bool bIncludeTable );
-    SAL_DLLPRIVATE void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram,
-                                    const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram,
-                                    sal_Bool bExportContent );
-
-    SAL_DLLPRIVATE void exportSeries(
-        const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram,
-        const ::com::sun::star::awt::Size & rPageSize,
-        sal_Bool bExportContent,
-        sal_Bool bHasTwoYAxes );
-    SAL_DLLPRIVATE void exportCandleStickSeries(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XDataSeries > > & aSeriesSeq,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
-        sal_Bool bJapaneseCandleSticks,
-        sal_Bool bExportContent );
-    SAL_DLLPRIVATE void exportDataPoints(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & xSeriesProperties,
-        sal_Int32 nSeriesLength,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDiagram > & xDiagram,
-        sal_Bool bExportContent );
-    SAL_DLLPRIVATE void exportRegressionCurve(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XDataSeries > & xSeries,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > & xSeriesProp,
-        const ::com::sun::star::awt::Size & rPageSize,
-        sal_Bool bExportContent );
-
-    /// add svg position as attribute for current element
-    SAL_DLLPRIVATE void addPosition( const ::com::sun::star::awt::Point & rPosition );
-    SAL_DLLPRIVATE void addPosition( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
-    /// add svg size as attribute for current element
-    SAL_DLLPRIVATE void addSize( const ::com::sun::star::awt::Size & rSize );
-    SAL_DLLPRIVATE void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
-    /// fills the member msString with the appropriate String (i.e. "A3")
-    SAL_DLLPRIVATE void getCellAddress( sal_Int32 nCol, sal_Int32 nRow );
-    /// exports a string as a paragraph element
-    SAL_DLLPRIVATE void exportText( const ::rtl::OUString& rText, bool bConvertTabsLFs = false );
-    SAL_DLLPRIVATE void exportErrorBarRanges();
-
-    SAL_DLLPRIVATE SchXMLExportHelper(SchXMLExportHelper &); // not defined
-    SAL_DLLPRIVATE void operator =(SchXMLExportHelper &); // not defined
-
-public:
     SchXMLExportHelper( SvXMLExport& rExport,
                         SvXMLAutoStylePoolP& rASPool );
 
     virtual ~SchXMLExportHelper();
 
-    // auto-styles
-    /// parse chart and collect all auto-styles used in current pool
-    void collectAutoStyles( com::sun::star::uno::Reference<
-                            com::sun::star::chart::XChartDocument > rChartDoc );
-    /// write the styles collected into the current pool as <style:style> elements
-    void exportAutoStyles();
-
-    /** export the <chart:chart> element corresponding to rChartDoc
-        if bIncludeTable is true, the chart data is exported as <table:table>
-        element (inside the chart element).
-
-        Otherwise the external references stored in the chart document are used
-        for writing the corresponding attributes at series
-
-        All attributes contained in xAttrList are written at the chart element,
-        which ist the outer element of a chart. So these attributes can easily
-        be parsed again by the container
-     */
-    void exportChart( com::sun::star::uno::Reference<
-                          com::sun::star::chart::XChartDocument > rChartDoc,
-                      sal_Bool bIncludeTable );
-
     /// returns the string corresponding to the current FileFormat CLSID for Chart
     const rtl::OUString& getChartCLSID();
 
-    UniReference< XMLPropertySetMapper > GetPropertySetMapper() const { return mxPropertySetMapper; }
-
-    void SetChartRangeAddress( const ::rtl::OUString& rAddress )
-        { msChartAddress = rAddress; }
-    void SetTableNumberList( const ::rtl::OUString& rList )
-        { msTableNumberList = rList; }
-
-    void InitRangeSegmentationProperties(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+private:
+    SchXMLExportHelper(); // not defined
+    SchXMLExportHelper(SchXMLExportHelper &); // not defined
+    void operator =(SchXMLExportHelper &); // not defined
 
-    ::com::sun::star::awt::Size getPageSize(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XChartDocument > & xChartDoc ) const;
+private:
+    SchXMLExportHelper_Impl* m_pImpl;
+    friend class SchXMLExport;
 };
 
 #endif	// _XMLOFF_SCH_XMLEXPORTHELPER_HXX_
diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx
index d6319874a3..9f28c27207 100644
--- a/xmloff/inc/xmloff/shapeexport.hxx
+++ b/xmloff/inc/xmloff/shapeexport.hxx
@@ -191,6 +191,9 @@ private:
     SAL_DLLPRIVATE UniReference< SvXMLExportPropertyMapper > GetPropertySetMapper() const { return mxPropertySetMapper;	}
 
     const rtl::OUString							msZIndex;
+    const rtl::OUString							msPrintable;
+    const rtl::OUString							msVisible;
+
     const rtl::OUString							msEmptyPres;
     const rtl::OUString							msModel;
     const rtl::OUString							msStartShape;
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 44c5f364ff..f631c5855d 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -147,7 +147,10 @@ namespace xmloff { namespace token {
 
         XML_NP_TABLE_EXT,
         XML_N_TABLE_EXT,
-        
+
+        XML_NP_DRAW_EXT,
+        XML_N_DRAW_EXT,
+
         // units
         XML_UNIT_MM,
         XML_UNIT_M,
@@ -2548,6 +2551,9 @@ namespace xmloff { namespace token {
         XML_DIMENSION,
         XML_VALIDATION_NAME,
 
+        XML_SCREEN,
+        XML_PRINTER,
+
         // XForms tokens
         // already defined: XML_ACTION, XML_VERSION, XML_ENCODING,
         //                  XML_REPLACE, XML_SEPARATOR, XML_TYPE, XML_ID
@@ -3095,6 +3101,11 @@ namespace xmloff { namespace token {
         XML_ENDS_WITH,
         XML_DOES_NOT_END_WITH,
 
+        //chart
+        XML_NP_CHART_EXT,
+        XML_N_CHART_EXT,
+        XML_COORDINATE_REGION,
+
         XML_TOKEN_END
     };
 
diff --git a/xmloff/qa/unoapi/knownissues.xcl b/xmloff/qa/unoapi/knownissues.xcl
index 401d33d9a8..ac15aad11e 100644
--- a/xmloff/qa/unoapi/knownissues.xcl
+++ b/xmloff/qa/unoapi/knownissues.xcl
@@ -10,17 +10,6 @@ xmloff.Impress.XMLImporter::com::sun::star::xml::sax::XDocumentHandler
 xmloff.Impress.XMLMetaImporter::com::sun::star::xml::sax::XDocumentHandler
 xmloff.Impress.XMLStylesImporter::com::sun::star::xml::sax::XDocumentHandler
 
-### i86555 ###
-xmloff.Chart.XMLExporter::com::sun::star::document::XFilter
-xmloff.Chart.XMLContentExporter::com::sun::star::document::XFilter
-xmloff.Impress.XMLSettingsExporter::com::sun::star::document::XFilter
-xmloff.Impress.XMLMetaExporter::com::sun::star::document::XFilter
-xmloff.Impress.XMLImporter::com::sun::star::document::XFilter
-xmloff.Impress.XMLExporter::com::sun::star::document::XFilter
-xmloff.Draw.XMLContentExporter::com::sun::star::document::XFilter
-xmloff.Draw.XMLMetaExporter::com::sun::star::document::XFilter
-xmloff.Draw.XMLSettingsImporter::com::sun::star::document::XFilter
-
 ### i87695 ###
 xmloff.Draw.XMLStylesExporter
 xmloff.Impress.XMLStylesExporter
diff --git a/xmloff/qa/unoapi/xmloff.sce b/xmloff/qa/unoapi/xmloff.sce
index c73533f4e4..69166aec62 100644
--- a/xmloff/qa/unoapi/xmloff.sce
+++ b/xmloff/qa/unoapi/xmloff.sce
@@ -3,7 +3,7 @@
 #111102# -o xmloff.Chart.XMLExporter
 #111102# -o xmloff.Chart.XMLImporter
 #111102# -o xmloff.Chart.XMLStylesExporter
-#111102# -o xmloff.Chart.XMLStylesImporter
+#111102# #i112047 -o xmloff.Chart.XMLStylesImporter
 -o xmloff.Draw.XMLContentExporter
 -o xmloff.Draw.XMLContentImporter
 -o xmloff.Draw.XMLExporter
@@ -16,7 +16,7 @@
 -o xmloff.Draw.XMLStylesImporter
 #i111224 -o xmloff.Impress.XMLContentExporter
 -o xmloff.Impress.XMLContentImporter
--o xmloff.Impress.XMLExporter
+#i112048 -o xmloff.Impress.XMLExporter
 #i111111# -o xmloff.Impress.XMLImporter
 -o xmloff.Impress.XMLMetaExporter
 -o xmloff.Impress.XMLMetaImporter
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index e8245b3d0d..6d897c5e0f 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -76,6 +76,7 @@
 #include <com/sun/star/chart/X3DDisplay.hpp>
 #include <com/sun/star/chart/XStatisticDisplay.hpp>
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
+#include <com/sun/star/chart/XDiagramPositioning.hpp>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
@@ -116,6 +117,161 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 using ::std::vector;
 
+// ========================================
+// class SchXMLExportHelper_Impl
+// ========================================
+
+class SchXMLExportHelper_Impl
+{
+public:
+    // first: data sequence for label, second: data sequence for values.
+    typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >,
+            ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tLabelValuesDataPair;
+    typedef ::std::vector< tLabelValuesDataPair > tDataSequenceCont;
+
+public:
+    SchXMLExportHelper_Impl( SvXMLExport& rExport,
+                        SvXMLAutoStylePoolP& rASPool );
+
+    virtual ~SchXMLExportHelper_Impl();
+
+    // auto-styles
+    /// parse chart and collect all auto-styles used in current pool
+    void collectAutoStyles( com::sun::star::uno::Reference<
+                            com::sun::star::chart::XChartDocument > rChartDoc );
+
+    /// write the styles collected into the current pool as <style:style> elements
+    void exportAutoStyles();
+
+    /** export the <chart:chart> element corresponding to rChartDoc
+        if bIncludeTable is true, the chart data is exported as <table:table>
+        element (inside the chart element).
+
+        Otherwise the external references stored in the chart document are used
+        for writing the corresponding attributes at series
+
+        All attributes contained in xAttrList are written at the chart element,
+        which ist the outer element of a chart. So these attributes can easily
+        be parsed again by the container
+     */
+    void exportChart( com::sun::star::uno::Reference<
+                          com::sun::star::chart::XChartDocument > rChartDoc,
+                      sal_Bool bIncludeTable );
+
+    UniReference< XMLPropertySetMapper > GetPropertySetMapper() const;
+
+    void SetChartRangeAddress( const ::rtl::OUString& rAddress )
+        { msChartAddress = rAddress; }
+    void SetTableNumberList( const ::rtl::OUString& rList )
+        { msTableNumberList = rList; }
+
+    void InitRangeSegmentationProperties(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+
+    ::com::sun::star::awt::Size getPageSize(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::chart2::XChartDocument > & xChartDoc ) const;    
+
+    /** first parseDocument: collect autostyles and store names in this queue
+        second parseDocument: export content and use names from this queue
+     */
+    ::std::queue< ::rtl::OUString > maAutoStyleNameQueue;
+    void CollectAutoStyle(
+        const std::vector< XMLPropertyState >& aStates );
+    void AddAutoStyleAttribute(
+        const std::vector< XMLPropertyState >& aStates );
+
+    SvXMLAutoStylePoolP& GetAutoStylePoolP()
+    { return mrAutoStylePool; }
+
+    /// if bExportContent is false the auto-styles are collected
+    void parseDocument( com::sun::star::uno::Reference<
+                            com::sun::star::chart::XChartDocument >& rChartDoc,
+                        sal_Bool bExportContent,
+                        sal_Bool bIncludeTable = sal_False );
+    void exportTable();
+    void exportPlotArea(
+        com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > xDiagram,
+        com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > xNewDiagram,
+        const ::com::sun::star::awt::Size & rPageSize,
+        sal_Bool bExportContent,
+        sal_Bool bIncludeTable );
+    void exportCoordinateRegion( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram );
+    void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram,
+                                    const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram,
+                                    sal_Bool bExportContent );
+
+    void exportSeries(
+        const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram,
+        const ::com::sun::star::awt::Size & rPageSize,
+        sal_Bool bExportContent,
+        sal_Bool bHasTwoYAxes );
+    void exportCandleStickSeries(
+        const ::com::sun::star::uno::Sequence<
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::chart2::XDataSeries > > & aSeriesSeq,
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        sal_Bool bJapaneseCandleSticks,
+        sal_Bool bExportContent );
+    void exportDataPoints(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::beans::XPropertySet > & xSeriesProperties,
+        sal_Int32 nSeriesLength,
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::chart2::XDiagram > & xDiagram,
+        sal_Bool bExportContent );
+    void exportRegressionCurve(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::chart2::XDataSeries > & xSeries,
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::beans::XPropertySet > & xSeriesProp,
+        const ::com::sun::star::awt::Size & rPageSize,
+        sal_Bool bExportContent );
+
+    /// add svg position as attribute for current element
+    void addPosition( const ::com::sun::star::awt::Point & rPosition );
+    void addPosition( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
+    /// add svg size as attribute for current element
+    void addSize( const ::com::sun::star::awt::Size & rSize );
+    void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
+    /// fills the member msString with the appropriate String (i.e. "A3")
+    void getCellAddress( sal_Int32 nCol, sal_Int32 nRow );
+    /// exports a string as a paragraph element
+    void exportText( const ::rtl::OUString& rText, bool bConvertTabsLFs = false );
+    void exportErrorBarRanges();
+
+    SchXMLExportHelper_Impl(SchXMLExportHelper_Impl &); // not defined
+    void operator =(SchXMLExportHelper_Impl &); // not defined
+    
+public:
+    SvXMLExport& mrExport;
+    SvXMLAutoStylePoolP& mrAutoStylePool;
+    UniReference< XMLPropertyHandlerFactory > mxPropertyHandlerFactory;
+    UniReference< XMLPropertySetMapper > mxPropertySetMapper;
+    UniReference< XMLChartExportPropertyMapper > mxExpPropMapper;
+
+    rtl::OUString msTableName;
+    rtl::OUStringBuffer msStringBuffer;
+    rtl::OUString msString;
+
+    // members filled by InitRangeSegmentationProperties (retrieved from DataProvider)
+    sal_Bool mbHasSeriesLabels;
+    sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
+    sal_Bool mbRowSourceColumns;
+    rtl::OUString msChartAddress;
+    rtl::OUString msTableNumberList;
+    ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping;
+
+    rtl::OUString msCLSID;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes;
+
+    tDataSequenceCont m_aDataSequencesToExport;
+    rtl::OUString maCategoriesRange;
+};
+
 namespace
 {
 Reference< uno::XComponentContext > lcl_getComponentContext()
@@ -354,7 +510,7 @@ tLabelAndValueRange lcl_getLabelAndValueRangeByRole(
     const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aSeqCnt,
     const OUString & rRole,
     const Reference< chart2::XChartDocument > & xDoc,
-    SchXMLExportHelper::tDataSequenceCont & rOutSequencesToExport )
+    SchXMLExportHelper_Impl::tDataSequenceCont & rOutSequencesToExport )
 {
     tLabelAndValueRange aResult;
 
@@ -371,7 +527,7 @@ tLabelAndValueRange lcl_getLabelAndValueRangeByRole(
             aResult.second = lcl_ConvertRange( xValueSeq->getSourceRangeRepresentation(), xDoc );
 
         if( xLabelSeq.is() || xValueSeq.is())
-            rOutSequencesToExport.push_back( SchXMLExportHelper::tLabelValuesDataPair( xLabelSeq, xValueSeq ));
+            rOutSequencesToExport.push_back( SchXMLExportHelper_Impl::tLabelValuesDataPair( xLabelSeq, xValueSeq ));
     }
 
     return aResult;
@@ -453,10 +609,10 @@ OUString lcl_getLabelString( const Reference< chart2::data::XDataSequence > & xL
 }
 
 sal_Int32 lcl_getMaxSequenceLength(
-    const SchXMLExportHelper::tDataSequenceCont & rContainer )
+    const SchXMLExportHelper_Impl::tDataSequenceCont & rContainer )
 {
     sal_Int32 nResult = 0;
-    for( SchXMLExportHelper::tDataSequenceCont::const_iterator aIt( rContainer.begin());
+    for( SchXMLExportHelper_Impl::tDataSequenceCont::const_iterator aIt( rContainer.begin());
          aIt != rContainer.end(); ++aIt )
     {
         if( aIt->second.is())
@@ -571,7 +727,7 @@ template< class T >
     };
 
 
-typedef ::std::map< sal_Int32, SchXMLExportHelper::tLabelValuesDataPair >
+typedef ::std::map< sal_Int32, SchXMLExportHelper_Impl::tLabelValuesDataPair >
     lcl_DataSequenceMap;
 
 struct lcl_SequenceToMapElement :
@@ -594,7 +750,7 @@ struct lcl_SequenceToMapElement :
 };
 
 void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
-    SchXMLExportHelper::tDataSequenceCont & rInOutSequences )
+    SchXMLExportHelper_Impl::tDataSequenceCont & rInOutSequences )
 {
     lcl_DataSequenceMap aIndexSequenceMap;
     ::std::transform( rInOutSequences.begin(), rInOutSequences.end(),
@@ -611,7 +767,7 @@ void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
         // fill empty columns
         for( ; nIndex < aIt->first; ++nIndex )
             rInOutSequences.push_back(
-                SchXMLExportHelper::tDataSequenceCont::value_type( 0, 0 ));
+                SchXMLExportHelper_Impl::tDataSequenceCont::value_type( 0, 0 ));
         OSL_ASSERT( nIndex == aIt->first );
         rInOutSequences.push_back( aIt->second );
     }
@@ -619,7 +775,7 @@ void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
 
 
 lcl_TableData lcl_getDataForLocalTable(
-    const SchXMLExportHelper::tDataSequenceCont & aSequencesToExport,
+    const SchXMLExportHelper_Impl::tDataSequenceCont & aSequencesToExport,
     const Reference< chart::XComplexDescriptionAccess >& xComplexDescriptionAccess,
     const OUString& rCategoriesRange,
     bool bSeriesFromColumns,
@@ -641,10 +797,10 @@ lcl_TableData lcl_getDataForLocalTable(
             aResult.aComplexRowDescriptions = xComplexDescriptionAccess->getComplexRowDescriptions();
         }
 
-        SchXMLExportHelper::tDataSequenceCont::size_type nNumSequences = aSequencesToExport.size();
-        SchXMLExportHelper::tDataSequenceCont::const_iterator aBegin( aSequencesToExport.begin());
-        SchXMLExportHelper::tDataSequenceCont::const_iterator aEnd( aSequencesToExport.end());
-        SchXMLExportHelper::tDataSequenceCont::const_iterator aIt( aBegin );
+        SchXMLExportHelper_Impl::tDataSequenceCont::size_type nNumSequences = aSequencesToExport.size();
+        SchXMLExportHelper_Impl::tDataSequenceCont::const_iterator aBegin( aSequencesToExport.begin());
+        SchXMLExportHelper_Impl::tDataSequenceCont::const_iterator aEnd( aSequencesToExport.end());
+        SchXMLExportHelper_Impl::tDataSequenceCont::const_iterator aIt( aBegin );
 
         size_t nMaxSequenceLength( lcl_getMaxSequenceLength( aSequencesToExport ));
         size_t nCategoriesLength( aSimpleCategories.getLength() );
@@ -832,7 +988,53 @@ struct SchXMLDataPointStruct
 // class SchXMLExportHelper
 // ========================================
 
-SchXMLExportHelper::SchXMLExportHelper(
+SchXMLExportHelper::SchXMLExportHelper(	SvXMLExport& rExport, SvXMLAutoStylePoolP& rASPool )
+    : m_pImpl( new SchXMLExportHelper_Impl( rExport, rASPool ) )
+{
+}
+
+SchXMLExportHelper::~SchXMLExportHelper()
+{
+    delete m_pImpl;
+}
+
+const OUString& SchXMLExportHelper::getChartCLSID()
+{
+    return m_pImpl->msCLSID;
+}
+
+UniReference< XMLPropertySetMapper > SchXMLExportHelper_Impl::GetPropertySetMapper() const
+{
+    return mxPropertySetMapper;
+}
+
+void SchXMLExportHelper_Impl::exportAutoStyles()
+{
+    if( mxExpPropMapper.is())
+    {
+        //ToDo: when embedded in calc/writer this is not necessary because the
+        // numberformatter is shared between both documents
+        mrExport.exportAutoDataStyles();
+
+        // export chart auto styles
+        mrAutoStylePool.exportXML(
+            XML_STYLE_FAMILY_SCH_CHART_ID
+            , mrExport.GetDocHandler(),
+            mrExport.GetMM100UnitConverter(),
+            mrExport.GetNamespaceMap()
+            );
+
+        // export auto styles for additional shapes
+        mrExport.GetShapeExport()->exportAutoStyles();
+        // and for text in additional shapes
+        mrExport.GetTextParagraphExport()->exportTextAutoStyles();
+    }
+}
+
+// private methods
+// ---------------
+
+SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
     SvXMLExport& rExport,
     SvXMLAutoStylePoolP& rASPool ) :
         mrExport( rExport ),
@@ -901,56 +1103,22 @@ SchXMLExportHelper::SchXMLExportHelper(
         String( 'T' ));
 }
 
-SchXMLExportHelper::~SchXMLExportHelper() {}
-
-const OUString& SchXMLExportHelper::getChartCLSID()
-{
-    return msCLSID;
-}
-
-void SchXMLExportHelper::exportAutoStyles()
+SchXMLExportHelper_Impl::~SchXMLExportHelper_Impl()
 {
-    if( mxExpPropMapper.is())
-    {
-        //ToDo: when embedded in calc/writer this is not necessary because the
-        // numberformatter is shared between both documents
-        mrExport.exportAutoDataStyles();
-
-        // export chart auto styles
-        mrAutoStylePool.exportXML(
-            XML_STYLE_FAMILY_SCH_CHART_ID
-            , mrExport.GetDocHandler(),
-            mrExport.GetMM100UnitConverter(),
-            mrExport.GetNamespaceMap()
-            );
-
-        // export auto styles for additional shapes
-        mrExport.GetShapeExport()->exportAutoStyles();
-        // and for text in additional shapes
-        mrExport.GetTextParagraphExport()->exportTextAutoStyles();
-    }
 }
 
-void SchXMLExportHelper::collectAutoStyles( Reference< chart::XChartDocument > rChartDoc )
+void SchXMLExportHelper_Impl::collectAutoStyles( Reference< chart::XChartDocument > rChartDoc )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", "bm", "::SchXMLExportHelper::collectAutoStyles" );
-
     parseDocument( rChartDoc, sal_False );
 }
 
-void SchXMLExportHelper::exportChart( Reference< chart::XChartDocument > rChartDoc,
+void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rChartDoc,
                                       sal_Bool bIncludeTable )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", "bm", "::SchXMLExportHelper::exportChart" );
-
     parseDocument( rChartDoc, sal_True, bIncludeTable );
     DBG_ASSERT( maAutoStyleNameQueue.empty(), "There are still remaining autostyle names in the queue" );
 }
 
-
-// private methods
-// ---------------
-
 ::rtl::OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ )
 {
     const sal_Int32* pArray = rSequenceMapping.getConstArray();
@@ -975,7 +1143,7 @@ void SchXMLExportHelper::exportChart( Reference< chart::XChartDocument > rChartD
 }
 
 /// if bExportContent is false the auto-styles are collected
-void SchXMLExportHelper::parseDocument( Reference< chart::XChartDocument >& rChartDoc,
+void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& rChartDoc,
                                         sal_Bool bExportContent,
                                         sal_Bool bIncludeTable )
 {
@@ -1425,7 +1593,7 @@ void lcl_exportComplexLabel( const Sequence< OUString >& rComplexLabel, SvXMLExp
     }
 }
 
-void SchXMLExportHelper::exportTable()
+void SchXMLExportHelper_Impl::exportTable()
 {
     // table element
     // -------------
@@ -1602,7 +1770,7 @@ void SchXMLExportHelper::exportTable()
     OSL_ASSERT( bHasOwnData || (aRowDescriptions_RangeIter == aRowDescriptions_RangeEnd) );
 }
 
-void SchXMLExportHelper::exportPlotArea(
+void SchXMLExportHelper_Impl::exportPlotArea(
     Reference< chart::XDiagram > xDiagram,
     Reference< chart2::XDiagram > xNewDiagram,
     const awt::Size & rPageSize,
@@ -1762,9 +1930,12 @@ void SchXMLExportHelper::exportPlotArea(
             }
         }
 
-        // element
+        // plot-area element
         pElPlotArea = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, sal_True, sal_True );
 
+        //inner position rectangle element
+        exportCoordinateRegion( xDiagram );
+
         // light sources (inside plot area element)
         if( bIs3DChart &&
             rShapeExport.is())
@@ -1925,7 +2096,27 @@ void SchXMLExportHelper::exportPlotArea(
         delete pElPlotArea;
 }
 
-void SchXMLExportHelper::exportAxes(
+void SchXMLExportHelper_Impl::exportCoordinateRegion( const uno::Reference< chart::XDiagram >& xDiagram )
+{
+    const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
+    if( nCurrentODFVersion <= SvtSaveOptions::ODFVER_012 )//do not export to ODF 1.2 or older
+        return;
+    if( nCurrentODFVersion != SvtSaveOptions::ODFVER_LATEST )//export only if extensions are enabled //#i100778# todo: change this dependent on fileformat evolution
+        return;
+
+    Reference< chart::XDiagramPositioning > xDiaPos( xDiagram, uno::UNO_QUERY );
+    DBG_ASSERT( xDiaPos.is(), "Invalid xDiaPos as parameter" );
+    if( !xDiaPos.is() )
+        return;
+
+    awt::Rectangle aRect( xDiaPos->calculateDiagramPositionExcludingAxes() );
+    addPosition( awt::Point(aRect.X,aRect.Y) );
+    addSize( awt::Size(aRect.Width,aRect.Height) );
+    
+    SvXMLElementExport aCoordinateRegion( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, sal_True, sal_True );//#i100778# todo: change to chart namespace in future - dependent on fileformat
+}
+
+void SchXMLExportHelper_Impl::exportAxes(
     const Reference< chart::XDiagram > & xDiagram,
     const Reference< chart2::XDiagram > & xNewDiagram,
     sal_Bool bExportContent )
@@ -2527,7 +2718,7 @@ void SchXMLExportHelper::exportAxes(
     }
 }
 
-void SchXMLExportHelper::exportSeries(
+void SchXMLExportHelper_Impl::exportSeries(
     const Reference< chart2::XDiagram > & xNewDiagram,
     const awt::Size & rPageSize,
     sal_Bool bExportContent,
@@ -2896,7 +3087,7 @@ void SchXMLExportHelper::exportSeries(
     }
 }
 
-void SchXMLExportHelper::exportRegressionCurve(
+void SchXMLExportHelper_Impl::exportRegressionCurve(
     const Reference< chart2::XDataSeries > & xSeries,
     const Reference< beans::XPropertySet > & xSeriesProp,
     const awt::Size & rPageSize,
@@ -3003,7 +3194,7 @@ void SchXMLExportHelper::exportRegressionCurve(
     }
 }
 
-void SchXMLExportHelper::exportCandleStickSeries(
+void SchXMLExportHelper_Impl::exportCandleStickSeries(
     const Sequence< Reference< chart2::XDataSeries > > & aSeriesSeq,
     const Reference< chart2::XDiagram > & xDiagram,
     sal_Bool bJapaneseCandleSticks,
@@ -3121,7 +3312,7 @@ void SchXMLExportHelper::exportCandleStickSeries(
     }
 }
 
-void SchXMLExportHelper::exportDataPoints(
+void SchXMLExportHelper_Impl::exportDataPoints(
     const uno::Reference< beans::XPropertySet > & xSeriesProperties,
     sal_Int32 nSeriesLength,
     const uno::Reference< chart2::XDiagram > & xDiagram,
@@ -3369,7 +3560,7 @@ void SchXMLExportHelper::exportDataPoints(
 }
 
 
-void SchXMLExportHelper::getCellAddress( sal_Int32 nCol, sal_Int32 nRow )
+void SchXMLExportHelper_Impl::getCellAddress( sal_Int32 nCol, sal_Int32 nRow )
 {
     msStringBuffer.append( (sal_Unicode)'.' );
     if( nCol < 26 )
@@ -3389,7 +3580,7 @@ void SchXMLExportHelper::getCellAddress( sal_Int32 nCol, sal_Int32 nRow )
     msStringBuffer.append( nRow + (sal_Int32)1 );
 }
 
-void SchXMLExportHelper::addPosition( const awt::Point & rPosition )
+void SchXMLExportHelper_Impl::addPosition( const awt::Point & rPosition )
 {
     mrExport.GetMM100UnitConverter().convertMeasure( msStringBuffer, rPosition.X );
     msString = msStringBuffer.makeStringAndClear();
@@ -3400,13 +3591,13 @@ void SchXMLExportHelper::addPosition( const awt::Point & rPosition )
     mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_Y, msString );
 }
 
-void SchXMLExportHelper::addPosition( Reference< drawing::XShape > xShape )
+void SchXMLExportHelper_Impl::addPosition( Reference< drawing::XShape > xShape )
 {
     if( xShape.is())
         addPosition( xShape->getPosition());
 }
 
-void SchXMLExportHelper::addSize( const awt::Size & rSize )
+void SchXMLExportHelper_Impl::addSize( const awt::Size & rSize )
 {
     mrExport.GetMM100UnitConverter().convertMeasure( msStringBuffer, rSize.Width );
     msString = msStringBuffer.makeStringAndClear();
@@ -3417,13 +3608,13 @@ void SchXMLExportHelper::addSize( const awt::Size & rSize )
     mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_HEIGHT, msString );
 }
 
-void SchXMLExportHelper::addSize( Reference< drawing::XShape > xShape )
+void SchXMLExportHelper_Impl::addSize( Reference< drawing::XShape > xShape )
 {
     if( xShape.is())
         addSize( xShape->getSize() );
 }
 
-awt::Size SchXMLExportHelper::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ) const
+awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ) const
 {
     awt::Size aSize( 8000, 7000 );
     uno::Reference< embed::XVisualObject > xVisualObject( xChartDoc, uno::UNO_QUERY );
@@ -3434,13 +3625,13 @@ awt::Size SchXMLExportHelper::getPageSize( const Reference< chart2::XChartDocume
     return aSize;
 }
 
-void SchXMLExportHelper::CollectAutoStyle( const std::vector< XMLPropertyState >& aStates )
+void SchXMLExportHelper_Impl::CollectAutoStyle( const std::vector< XMLPropertyState >& aStates )
 {
     if( !aStates.empty() )
         maAutoStyleNameQueue.push( GetAutoStylePoolP().Add( XML_STYLE_FAMILY_SCH_CHART_ID, aStates ));
 }
 
-void SchXMLExportHelper::AddAutoStyleAttribute( const std::vector< XMLPropertyState >& aStates )
+void SchXMLExportHelper_Impl::AddAutoStyleAttribute( const std::vector< XMLPropertyState >& aStates )
 {
     if( !aStates.empty() )
     {
@@ -3451,7 +3642,7 @@ void SchXMLExportHelper::AddAutoStyleAttribute( const std::vector< XMLPropertySt
     }
 }
 
-void SchXMLExportHelper::exportText( const OUString& rText, bool bConvertTabsLFs )
+void SchXMLExportHelper_Impl::exportText( const OUString& rText, bool bConvertTabsLFs )
 {
     SchXMLTools::exportText( mrExport, rText, bConvertTabsLFs );
 }
@@ -3468,6 +3659,8 @@ SchXMLExport::SchXMLExport(
     maAutoStylePool( *this ),
     maExportHelper( *this, maAutoStylePool )
 {
+    if( getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
+        _GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
 }
 
 
@@ -3484,7 +3677,7 @@ SchXMLExport::~SchXMLExport()
 sal_uInt32 SchXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
 {
     Reference< chart2::XChartDocument > xChartDoc( GetModel(), uno::UNO_QUERY );
-    maExportHelper.InitRangeSegmentationProperties( xChartDoc );
+    maExportHelper.m_pImpl->InitRangeSegmentationProperties( xChartDoc );
     return SvXMLExport::exportDoc( eClass );
 }
 
@@ -3507,8 +3700,8 @@ void SchXMLExport::_ExportAutoStyles()
         Reference< chart::XChartDocument > xChartDoc( GetModel(), uno::UNO_QUERY );
         if( xChartDoc.is())
         {
-            maExportHelper.collectAutoStyles( xChartDoc );
-            maExportHelper.exportAutoStyles();
+            maExportHelper.m_pImpl->collectAutoStyles( xChartDoc );
+            maExportHelper.m_pImpl->exportAutoStyles();
         }
         else
         {
@@ -3557,13 +3750,13 @@ void SchXMLExport::_ExportContent()
                             aAny = xProp->getPropertyValue(
                                 OUString::createFromAscii( "ChartRangeAddress" ));
                             aAny >>= sChartAddress;
-                            maExportHelper.SetChartRangeAddress( sChartAddress );
+                            maExportHelper.m_pImpl->SetChartRangeAddress( sChartAddress );
 
                             OUString sTableNumberList;
                             aAny = xProp->getPropertyValue(
                                 OUString::createFromAscii( "TableNumberList" ));
                             aAny >>= sTableNumberList;
-                            maExportHelper.SetTableNumberList( sTableNumberList );
+                            maExportHelper.m_pImpl->SetTableNumberList( sTableNumberList );
 
                             // do not include own table if there are external addresses
                             bIncludeTable = (sChartAddress.getLength() == 0);
@@ -3576,7 +3769,7 @@ void SchXMLExport::_ExportContent()
                 }
             }
         }
-        maExportHelper.exportChart( xChartDoc, bIncludeTable );
+        maExportHelper.m_pImpl->exportChart( xChartDoc, bIncludeTable );
     }
     else
     {
@@ -3591,7 +3784,12 @@ void SchXMLExport::SetProgress( sal_Int32 nPercentage )
         mxStatusIndicator->setValue( nPercentage );
 }
 
-void SchXMLExportHelper::InitRangeSegmentationProperties( const Reference< chart2::XChartDocument > & xChartDoc )
+UniReference< XMLPropertySetMapper > SchXMLExport::GetPropertySetMapper() const
+{
+    return maExportHelper.m_pImpl->GetPropertySetMapper();
+}
+
+void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< chart2::XChartDocument > & xChartDoc )
 {
     if( xChartDoc.is())
         try
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index b8e06e3da8..85a9597b28 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -281,6 +281,8 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
     {
         static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
 {
+    { XML_NAMESPACE_CHART_EXT,	XML_COORDINATE_REGION,		XML_TOK_PA_COORDINATE_REGION_EXT },
+    { XML_NAMESPACE_CHART,	XML_COORDINATE_REGION,		XML_TOK_PA_COORDINATE_REGION },
     { XML_NAMESPACE_CHART,	XML_AXIS,					XML_TOK_PA_AXIS				},
     { XML_NAMESPACE_CHART,	XML_SERIES,				    XML_TOK_PA_SERIES			},
     { XML_NAMESPACE_CHART,	XML_WALL,					XML_TOK_PA_WALL				},
@@ -657,6 +659,7 @@ SchXMLImport::SchXMLImport(
         SvXMLImport( xServiceFactory, nImportFlags )
 {
     GetNamespaceMap().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
+    GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
 
     mbIsGraphicLoadOnDemandSupported = false;
 }
@@ -670,6 +673,7 @@ SchXMLImport::SchXMLImport(
 :	SvXMLImport( xServiceFactory, xModel, rGrfContainer )
 {
     GetNamespaceMap().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
+    GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
 
     // get status indicator (if requested)
     if( bShowProgress )
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 7a2b91cafb..c6722cf485 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -61,6 +61,7 @@
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart/X3DDisplay.hpp>
 #include <com/sun/star/chart/XStatisticDisplay.hpp>
+#include <com/sun/star/chart/XDiagramPositioning.hpp>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -199,8 +200,8 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
         mnSeries( 0 ),
         m_aGlobalSeriesImportInfo( rAllRangeAddressesAvailable ),
         maSceneImportHelper( rImport ),
-        mbHasSize(false),
-        mbHasPosition(false),
+        m_aOuterPositioning( rImport ),
+        m_aInnerPositioning( rImport ),
         mbPercentStacked(false),
         m_bAxisPositionAttributeImported(false),
         m_rXLinkHRefAttributeToIndicateDataProvider(rXLinkHRefAttributeToIndicateDataProvider),
@@ -296,15 +297,6 @@ SchXMLPlotAreaContext::~SchXMLPlotAreaContext()
 
 void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
-    uno::Any aTransMatrixAny;
-
-    // initialize size and position
-    uno::Reference< drawing::XShape > xDiaShape( mxDiagram, uno::UNO_QUERY );
-    bool bHasSizeWidth = false;
-    bool bHasSizeHeight = false;
-    bool bHasPositionX = false;
-    bool bHasPositionY = false;
-
     // parse attributes
     sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
     const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetPlotAreaAttrTokenMap();
@@ -320,20 +312,10 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
             case XML_TOK_PA_X:
-                GetImport().GetMM100UnitConverter().convertMeasure( maPosition.X, aValue );
-                bHasPositionX = true;
-                break;
             case XML_TOK_PA_Y:
-                GetImport().GetMM100UnitConverter().convertMeasure( maPosition.Y, aValue );
-                bHasPositionY = true;
-                break;
             case XML_TOK_PA_WIDTH:
-                GetImport().GetMM100UnitConverter().convertMeasure( maSize.Width, aValue );
-                bHasSizeWidth = true;
-                break;
             case XML_TOK_PA_HEIGHT:
-                GetImport().GetMM100UnitConverter().convertMeasure( maSize.Height, aValue );
-                bHasSizeHeight = true;
+                m_aOuterPositioning.readPositioningAttribute( nPrefix, aLocalName, aValue );
                 break;
             case XML_TOK_PA_STYLE_NAME:
                 msAutoStyleName = aValue;
@@ -369,9 +351,6 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
         }
     }
 
-    mbHasSize = bHasSizeWidth && bHasSizeHeight;
-    mbHasPosition = bHasPositionX && bHasPositionY;
-
     if( ! mxNewDoc.is())
     {
         uno::Reference< beans::XPropertySet > xDocProp( mrImportHelper.GetChartDocument(), uno::UNO_QUERY );
@@ -426,14 +405,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
                         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lines")), pPropStyleContext, pStylesCtxt );
 
                     //handle automatic position and size
-                    bool bAutoSize = false;
-                    bool bAutoPosition = false;
-                    SchXMLTools::getPropertyFromContext(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticSize")), pPropStyleContext, pStylesCtxt ) >>= bAutoSize;
-                    SchXMLTools::getPropertyFromContext(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticPosition")), pPropStyleContext, pStylesCtxt ) >>= bAutoPosition;
-                    mbHasSize = mbHasSize && !bAutoSize;
-                    mbHasPosition = mbHasPosition && !bAutoPosition;
+                    m_aOuterPositioning.readAutomaticPositioningProperties( pPropStyleContext, pStylesCtxt );
 
                     //correct default starting angle for old 3D pies
                     if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_0( GetImport().GetModel() ) )
@@ -548,6 +520,13 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
 
     switch( rTokenMap.Get( nPrefix, rLocalName ))
     {
+        case XML_TOK_PA_COORDINATE_REGION_EXT:
+        case XML_TOK_PA_COORDINATE_REGION:
+        {
+            pContext = new SchXMLCoordinateRegionContext( GetImport(), nPrefix, rLocalName, m_aInnerPositioning );
+        }
+        break;
+
         case XML_TOK_PA_AXIS:
         {
             bool bAddMissingXAxisForNetCharts = false;
@@ -711,13 +690,22 @@ void SchXMLPlotAreaContext::EndElement()
     }
 
     // set changed size and position after properties (esp. 3d)
-    uno::Reference< drawing::XShape > xDiaShape( mxDiagram, uno::UNO_QUERY );
-    if( xDiaShape.is())
+    
+    uno::Reference< chart::XDiagramPositioning > xDiaPos( mxDiagram, uno::UNO_QUERY );
+    if( xDiaPos.is())
     {
-        if( mbHasSize )
-            xDiaShape->setSize( maSize );
-        if( mbHasPosition )
-            xDiaShape->setPosition( maPosition );
+        if( !m_aOuterPositioning.isAutomatic() )
+        {
+            if( m_aInnerPositioning.hasPosSize() )
+                xDiaPos->setDiagramPositionExcludingAxes( m_aInnerPositioning.getRectangle() );
+            else if( m_aOuterPositioning.hasPosSize() )
+            {
+                if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_3( GetImport().GetModel() ) ) //old version of OOo did write a wrong rectangle for the diagram size
+                    xDiaPos->setDiagramPositionIncludingAxesAndAxisTitles( m_aOuterPositioning.getRectangle() );
+                else
+                    xDiaPos->setDiagramPositionIncludingAxes( m_aOuterPositioning.getRectangle() );
+            }
+        }
     }
 
     CorrectAxisPositions();
@@ -1686,6 +1674,134 @@ void SchXMLCategoriesContext::StartElement( const uno::Reference< xml::sax::XAtt
 
 // ========================================
 
+SchXMLPositonAttributesHelper::SchXMLPositonAttributesHelper( SvXMLImport& rImporter )
+    : m_rImport( rImporter )
+    , m_aPosition(0,0)
+    , m_aSize(0,0)
+    , m_bHasSizeWidth( false )
+    , m_bHasSizeHeight( false )
+    , m_bHasPositionX( false )
+    , m_bHasPositionY( false )
+    , m_bAutoSize( false )
+    , m_bAutoPosition( false )
+{
+}
+
+SchXMLPositonAttributesHelper::~SchXMLPositonAttributesHelper()
+{
+}
+
+bool SchXMLPositonAttributesHelper::hasSize() const
+{
+    return m_bHasSizeWidth && m_bHasSizeHeight;
+}
+bool SchXMLPositonAttributesHelper::hasPosition() const
+{
+    return m_bHasPositionX && m_bHasPositionY;
+}
+bool SchXMLPositonAttributesHelper::hasPosSize() const
+{
+    return hasPosition() && hasSize();
+}
+bool SchXMLPositonAttributesHelper::isAutomatic() const
+{
+    return m_bAutoSize || m_bAutoPosition;
+}
+awt::Point SchXMLPositonAttributesHelper::getPosition() const
+{
+    return m_aPosition;
+}
+awt::Size SchXMLPositonAttributesHelper::getSize() const
+{
+    return m_aSize;
+}
+awt::Rectangle SchXMLPositonAttributesHelper::getRectangle() const
+{
+    return awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );
+}
+
+bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
+{
+    //returns true if the attribute was proccessed
+    bool bReturn = true;
+
+    if( XML_NAMESPACE_SVG == nPrefix )
+    {
+        if( IsXMLToken( rLocalName, XML_X ) )
+        {
+            m_rImport.GetMM100UnitConverter().convertMeasure( m_aPosition.X, rValue );
+            m_bHasPositionX = true;
+        }
+        else if( IsXMLToken( rLocalName, XML_Y ) )
+        {
+            m_rImport.GetMM100UnitConverter().convertMeasure( m_aPosition.Y, rValue );
+            m_bHasPositionY = true;
+        }
+        else if( IsXMLToken( rLocalName, XML_WIDTH ) )
+        {
+            m_rImport.GetMM100UnitConverter().convertMeasure( m_aSize.Width, rValue );
+            m_bHasSizeWidth = true;
+        }
+        else if( IsXMLToken( rLocalName, XML_HEIGHT ) )
+        {
+            m_rImport.GetMM100UnitConverter().convertMeasure( m_aSize.Height, rValue );
+            m_bHasSizeHeight = true;
+        }
+        else
+            bReturn = false;
+    }
+    else
+        bReturn = false;
+   
+    return bReturn;
+}
+
+
+void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt )
+{
+    if( pPropStyleContext && pStylesCtxt )
+    {
+        //handle automatic position and size
+        SchXMLTools::getPropertyFromContext(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticSize")), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize;
+        SchXMLTools::getPropertyFromContext(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticPosition")), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition;
+    }
+}
+
+// ========================================
+
+SchXMLCoordinateRegionContext::SchXMLCoordinateRegionContext(
+          SvXMLImport& rImport
+        , sal_uInt16 nPrefix
+        , const rtl::OUString& rLocalName
+        , SchXMLPositonAttributesHelper& rPositioning )
+        : SvXMLImportContext( rImport, nPrefix, rLocalName )
+        , m_rPositioning( rPositioning )
+{
+}
+
+SchXMLCoordinateRegionContext::~SchXMLCoordinateRegionContext()
+{
+}
+
+void SchXMLCoordinateRegionContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+{
+    // parse attributes
+    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+    
+    for( sal_Int16 i = 0; i < nAttrCount; i++ )
+    {
+        rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
+        rtl::OUString aLocalName;
+        rtl::OUString aValue = xAttrList->getValueByIndex( i );
+        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        m_rPositioning.readPositioningAttribute( nPrefix, aLocalName, aValue );
+    }
+}
+
+// ========================================
+
 SchXMLWallFloorContext::SchXMLWallFloorContext(
     SchXMLImportHelper& rImpHelper,
     SvXMLImport& rImport,
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 0a5d237b78..c7e55f9571 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -66,6 +66,43 @@ private:
     SchXML3DSceneAttributesHelper();
 };
 
+// ----------------------------------------
+
+class SchXMLPositonAttributesHelper
+{
+public:
+    SchXMLPositonAttributesHelper( SvXMLImport& rImporter );
+    ~SchXMLPositonAttributesHelper();
+
+    bool readPositioningAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue );
+    void readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt );
+
+    bool hasPosSize() const;
+    bool isAutomatic() const;
+    ::com::sun::star::awt::Rectangle getRectangle() const;
+    
+
+private:
+    bool hasSize() const;
+    bool hasPosition() const;
+    ::com::sun::star::awt::Size getSize() const;
+    ::com::sun::star::awt::Point getPosition() const;
+
+    SvXMLImport& m_rImport;
+
+    ::com::sun::star::awt::Point m_aPosition;
+    ::com::sun::star::awt::Size m_aSize;
+    
+    bool m_bHasSizeWidth;
+    bool m_bHasSizeHeight;
+    bool m_bHasPositionX;
+    bool m_bHasPositionY;
+    sal_Bool m_bAutoSize;
+    sal_Bool m_bAutoPosition;
+};
+
+// ----------------------------------------
+
 class SchXMLPlotAreaContext : public SvXMLImportContext
 {
 public:
@@ -110,10 +147,8 @@ private:
     GlobalSeriesImportInfo m_aGlobalSeriesImportInfo;
 
     SchXML3DSceneAttributesHelper maSceneImportHelper;
-    ::com::sun::star::awt::Size maSize;
-    ::com::sun::star::awt::Point maPosition;
-    bool mbHasSize;
-    bool mbHasPosition;
+    SchXMLPositonAttributesHelper m_aOuterPositioning;//including axes and axes titles
+    SchXMLPositonAttributesHelper m_aInnerPositioning;//excluding axes and axes titles
     bool mbPercentStacked;
     bool m_bAxisPositionAttributeImported;
     ::rtl::OUString msAutoStyleName;
@@ -216,6 +251,23 @@ public:
 
 // ----------------------------------------
 
+class SchXMLCoordinateRegionContext : public SvXMLImportContext
+{
+public:
+    SchXMLCoordinateRegionContext(
+            SvXMLImport& rImport
+            , sal_uInt16 nPrefix
+            , const rtl::OUString& rLocalName
+            , SchXMLPositonAttributesHelper& rPositioning );
+    virtual ~SchXMLCoordinateRegionContext();
+    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+private:
+    SchXMLPositonAttributesHelper& m_rPositioning;
+};
+
+// ----------------------------------------
+
 class SchXMLWallFloorContext : public SvXMLImportContext
 {
 public:
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index cd504d5485..dd477e67d9 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -757,6 +757,29 @@ void setBuildIDAtImportInfo( uno::Reference< frame::XModel > xModel, Reference<
         SvXMLMetaDocumentContext::setBuildId( aGenerator, xImportInfo );
 }
 
+bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const uno::Reference< frame::XModel >& xChartModel )
+{
+    bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan3_0( xChartModel );
+    if( !bResult )
+    {
+        ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) );
+        if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/3") ) ) != -1 )
+        {
+            if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/300m") ) ) != -1 )
+            {
+                sal_Int32 nBuilId = lcl_getBuildIDFromGenerator( lcl_getGeneratorFromModel(xChartModel) );
+                if( nBuilId>0 && nBuilId<9491 ) //9491 is build id of dev300m76
+                    bResult= true;
+            }
+            else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/310m") ) ) != -1 )
+                bResult= true;
+            else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/320m") ) ) != -1 )
+                bResult= true;
+        }
+    }
+    return bResult;
+}
+
 bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const uno::Reference< frame::XModel >& xChartModel )
 {
     bool bResult = isDocumentGeneratedWithOpenOfficeOlderThan2_3( xChartModel );
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 8e797a6fa0..176618d002 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -54,6 +54,7 @@ namespace SchXMLTools
     bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
     bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
     bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
+    bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel);
 
     void setBuildIDAtImportInfo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel
         , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xImportInfo );
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 25965187f4..9b1ddcb088 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -387,7 +387,7 @@ void SvXMLExport::_InitCtor()
         mpNamespaceMap->Add( GetXMLToken(XML_NP_OOOC),  GetXMLToken(XML_N_OOOC),    XML_NAMESPACE_OOOC );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_OF),    GetXMLToken(XML_N_OF),      XML_NAMESPACE_OF );
 
-        if (getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST)
+        if (getDefaultVersion() > SvtSaveOptions::ODFVER_012)
         {
             mpNamespaceMap->Add(
                 GetXMLToken(XML_NP_TABLE_EXT), GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT);
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index e128bfc556..ba559a00e7 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -99,6 +99,7 @@ sal_Char __READONLY_DATA sXML_np__text[] = "_text";
 sal_Char __READONLY_DATA sXML_np__table[] = "_table";
 sal_Char __READONLY_DATA sXML_np__table_ext[] = "_table_ooo";
 sal_Char __READONLY_DATA sXML_np__draw[] = "_draw";
+sal_Char __READONLY_DATA sXML_np__draw_ext[] = "_draw_ooo";
 sal_Char __READONLY_DATA sXML_np__dr3d[] = "_dr3d";
 sal_Char __READONLY_DATA sXML_np__fo[] = "_fo";
 sal_Char __READONLY_DATA sXML_np__xlink[] = "_xlink";
@@ -263,6 +264,9 @@ void SvXMLImport::_InitCtor()
         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw ) ),
                             GetXMLToken(XML_N_DRAW),
                             XML_NAMESPACE_DRAW );
+        mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw_ext ) ),
+                            GetXMLToken(XML_N_DRAW_EXT),
+                            XML_NAMESPACE_DRAW_EXT );
         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM (sXML_np__dr3d ) ),
                             GetXMLToken(XML_N_DR3D),
                             XML_NAMESPACE_DR3D );
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 7913bde7cd..7ed6e82287 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -156,6 +156,9 @@ namespace xmloff { namespace token {
         TOKEN( "tableooo", XML_NP_TABLE_EXT ),
         TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ),
 
+        TOKEN( "drawooo", XML_NP_DRAW_EXT ),
+        TOKEN( "http://openoffice.org/2010/draw", XML_N_DRAW_EXT ),
+
         // units
         TOKEN( "mm",                              XML_UNIT_MM ),
         TOKEN( "m",                               XML_UNIT_M ),
@@ -2552,6 +2555,9 @@ namespace xmloff { namespace token {
         TOKEN( "dimension",                    XML_DIMENSION ),
         TOKEN( "validation-name",				XML_VALIDATION_NAME ),
 
+        TOKEN( "screen",					   XML_SCREEN ),
+        TOKEN( "printer",					   XML_PRINTER ),
+
         // XForms token
         TOKEN( "model",                            XML_MODEL ),
         TOKEN( "schema",                           XML_SCHEMA ),
@@ -3096,6 +3102,10 @@ namespace xmloff { namespace token {
         TOKEN( "ends-with",             XML_ENDS_WITH ),
         TOKEN( "does-not-end-with",     XML_DOES_NOT_END_WITH ),
 
+        TOKEN( "chartooo", XML_NP_CHART_EXT ),
+        TOKEN( "http://openoffice.org/2010/chart", XML_N_CHART_EXT ),
+        TOKEN( "coordinate-region",    XML_COORDINATE_REGION ),
+
 #if OSL_DEBUG_LEVEL > 0
         { 0, NULL, NULL,                       XML_TOKEN_END }
 #else
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index a0eb4b7e56..e8074759de 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -641,12 +641,17 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
         GetXMLToken(XML_N_ANIMATION), 
         XML_NAMESPACE_ANIMATION);
 
-    if( getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
+    if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
     {
         _GetNamespaceMap().Add(
             GetXMLToken(XML_NP_OFFICE_EXT),
             GetXMLToken(XML_N_OFFICE_EXT), 
             XML_NAMESPACE_OFFICE_EXT);
+
+        _GetNamespaceMap().Add(
+            GetXMLToken(XML_NP_DRAW_EXT),
+            GetXMLToken(XML_N_DRAW_EXT), 
+            XML_NAMESPACE_DRAW_EXT);
     }
 
     GetShapeExport()->enableLayerExport();
@@ -2808,7 +2813,7 @@ void SdXMLExport::collectAnnotationAutoStyles( const Reference<XDrawPage>& xDraw
 void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
 {
     // do not export in ODF 1.2 or older
-    if( getDefaultVersion() != SvtSaveOptions::ODFVER_LATEST )
+    if( getDefaultVersion() <= SvtSaveOptions::ODFVER_012 )
         return;
         
     Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY );
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index a0fb695556..76353ba6a3 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -83,6 +83,8 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
     // #88546# init to FALSE
     mbHandleProgressBar( sal_False ),
     msZIndex( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ),
+    msPrintable( RTL_CONSTASCII_USTRINGPARAM("Printable") ),
+    msVisible( RTL_CONSTASCII_USTRINGPARAM("Visible") ),
     msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ),
     msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
     msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
@@ -705,6 +707,39 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         }
     }
 
+    // export draw:display (do not export in ODF 1.2 or older)
+    if( xSet.is() && ( mrExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) )
+    {
+        if( aShapeInfo.meShapeType != XmlShapeTypeDrawPageShape && aShapeInfo.meShapeType != XmlShapeTypePresPageShape &&
+            aShapeInfo.meShapeType != XmlShapeTypeHandoutShape )
+            
+        try
+        {
+            sal_Bool bVisible = sal_True;
+            sal_Bool bPrintable = sal_True;
+
+            xSet->getPropertyValue(msVisible) >>= bVisible;
+            xSet->getPropertyValue(msPrintable) >>= bPrintable;
+
+            XMLTokenEnum eDisplayToken = XML_TOKEN_INVALID;
+            const unsigned short nDisplay = (bVisible ? 2 : 0) | (bPrintable ? 1 : 0);
+            switch( nDisplay )
+            {
+            case 0: eDisplayToken = XML_NONE; break;
+            case 1: eDisplayToken = XML_PRINTER; break;
+            case 2: eDisplayToken = XML_SCREEN; break;
+            // case 3: eDisplayToken = XML_ALWAYS break; this is the default
+            }
+
+            if( eDisplayToken != XML_TOKEN_INVALID )
+                mrExport.AddAttribute(XML_NAMESPACE_DRAW_EXT, XML_DISPLAY, eDisplayToken );
+        }
+        catch( uno::Exception& )
+        {
+            DBG_ERROR( "XMLShapeExport::exportShape(), exception caught!" );
+        }
+    }
+
     // #82003# test export count
     // #91587# ALWAYS increment since now ALL to be exported shapes are counted.
     if(mrExport.GetShapeExport()->IsHandleProgressBarEnabled())
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 055736f67c..be5d6e2ef7 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/drawing/ConnectorType.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
@@ -1247,27 +1246,6 @@ void XMLShapeExport::ImpExportChartShape(
     SvXMLAttributeList* pAttrList )
 {
     ImpExportOLE2Shape( xShape, eShapeType, nFeatures, pRefPoint, pAttrList );
-/*
-        // Transformation
-        ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
-
-        uno::Reference< chart::XChartDocument > xChartDoc;
-        if( !bIsEmptyPresObj )
-            xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ) >>= xChartDoc;
-
-        if( xChartDoc.is() )
-        {
-            // export chart data if the flag is not set (default)
-            sal_Bool bExportOwnData = ( nFeatures & SEF_EXPORT_NO_CHART_DATA ) == 0;
-            mrExport.GetChartExport()->exportChart( xChartDoc, bExportOwnData );
-        }
-        else
-        {
-            // write chart object (fake for now, replace later)
-            SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_CHART, XML_CHART, sal_True, sal_True);
-        }
-    }
-*/
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 90b098a32a..82285ba30d 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -167,6 +167,8 @@ SdXMLShapeContext::SdXMLShapeContext(
 ,	mnZOrder(-1)
 ,	maSize(1, 1)
 ,	maPosition(0, 0)
+,	mbVisible(true)
+,	mbPrintable(true)
 {
 }
 
@@ -444,6 +446,20 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
                 xMultiPropertyStates->setAllPropertiesToDefault();
         }
 
+        if( !mbVisible || !mbPrintable ) try
+        {
+            uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW );
+            if( !mbVisible )
+                xSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ), uno::Any( sal_False ) );
+
+            if( !mbPrintable )
+                xSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Printable" ) ), uno::Any( sal_False ) );
+        }
+        catch( Exception& )
+        {
+            DBG_ERROR( "SdXMLShapeContext::AddShape(), exception caught!" );
+        }
+
         // #107848#
         if(!mbTemporaryShape && (!GetImport().HasTextImport()
             || !GetImport().GetTextImport()->IsInsideDeleteContext()))
@@ -777,7 +793,7 @@ void SdXMLShapeContext::SetThumbnail()
 void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue )
 {
     bool bHaveXmlId( false );
-    if( XML_NAMESPACE_DRAW == nPrefix )
+    if( (XML_NAMESPACE_DRAW == nPrefix) || (XML_NAMESPACE_DRAW_EXT == nPrefix) )
     {
         if( IsXMLToken( rLocalName, XML_ZINDEX ) )
         {
@@ -807,6 +823,11 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUStr
         {
             mnTransform.SetString(rValue, GetImport().GetMM100UnitConverter());
         }
+        else if( IsXMLToken( rLocalName, XML_DISPLAY ) )
+        {
+            mbVisible = IsXMLToken( rValue, XML_ALWAYS ) || IsXMLToken( rValue, XML_SCREEN );
+            mbPrintable = IsXMLToken( rValue, XML_ALWAYS ) || IsXMLToken( rValue, XML_PRINTER );
+        }
     }
     else if( XML_NAMESPACE_PRESENTATION == nPrefix )
     {
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 8101b89c4d..17b7c7a420 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -83,6 +83,9 @@ protected:
     com::sun::star::awt::Size	maSize;
     com::sun::star::awt::Point	maPosition;
 
+    bool						mbVisible;
+    bool						mbPrintable;
+
     /** if bSupportsStyle is false, auto styles will be set but not	a style */
     void SetStyle( bool bSupportsStyle = true );
     void SetLayer();
diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx
index e99aa05bd2..76113a6c7b 100644
--- a/xmloff/source/forms/valueproperties.cxx
+++ b/xmloff/source/forms/valueproperties.cxx
@@ -116,7 +116,7 @@ namespace xmloff
     void OValuePropertiesMetaData::getValueLimitPropertyNames(sal_Int16 _nFormComponentType,
         sal_Char const * & _rpMinValuePropertyName, sal_Char const * & _rpMaxValuePropertyName)
     {
-        _rpMinValuePropertyName = _rpMinValuePropertyName = NULL;
+        _rpMinValuePropertyName = _rpMaxValuePropertyName = NULL;
         switch (_nFormComponentType)
         {
             case FormComponentType::DATEFIELD:
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 4fbf91d2b0..e4a47d14fa 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -119,7 +119,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::xmloff::token;
 using ::com::sun::star::util::DateTime;
 using namespace ::com::sun::star::ucb;
-
+using namespace ::com::sun::star;
 using ::comphelper::UStringLess;
 
 
@@ -1823,8 +1823,28 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                     Reference<XTextContent> xTextContent(xTmp, UNO_QUERY);
                     if (m_pImpl->m_xText.is() && xRange.is())
                     {
-                        m_pImpl->m_xText->insertTextContent(
-                            xRange, xTextContent, sal_True);
+                        // #i107225# the combined characters need to be inserted first
+                        // the selected text has to be removed afterwards
+                        m_pImpl->m_xText->insertTextContent( xRange->getStart(), xTextContent, sal_True );
+                        
+                        if( xRange->getString().getLength() )
+                        {
+                            try
+                            {
+                                uno::Reference< text::XTextCursor > xCrsr = xRange->getText()->createTextCursorByRange( xRange->getStart() );
+                                xCrsr->goLeft( 1, true );
+                                uno::Reference< beans::XPropertySet> xCrsrProperties( xCrsr, uno::UNO_QUERY_THROW );
+                                //the hard properties of the removed text need to be applied to the combined characters field
+                                pStyle->FillPropertySet( xCrsrProperties );
+                                xCrsr->collapseToEnd();
+                                xCrsr->gotoRange( xRange->getEnd(), true );
+                                xCrsr->setString( ::rtl::OUString() );
+                            }
+                            catch( const uno::Exception& rEx )
+                            {
+                                (void)rEx;
+                            }
+                        }
                     }
                 }
             }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 2818d0755e..2449c09377 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -653,6 +653,8 @@ void ElementDescriptor::readTreeControlModel( StyleBag * all_styles )
 
     // collect elements
     readDefaults();
+    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
     readSelectionTypeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectionType") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":selectiontype") ) );
     
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 5f73dc93a4..1c43cc83d9 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -930,6 +930,9 @@ void TreeControlElement::endElement()
     }
     
     ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
+    ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
+                               OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
+                               _xAttributes );
     ctx.importSelectionTypeProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectionType") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("selectiontype") ),
                               _xAttributes );