slidecopy: merge

author: Frank Schoenheit [fs] <frank.schoenheit@sun.com> 2010-04-12 20:04:24 +0200
committer: Frank Schoenheit [fs] <frank.schoenheit@sun.com> 2010-04-12 20:04:24 +0200
commit: b69204c901926a091621b92df6ff6e27f62ab8d9 (patch)
tree: c7a87e51b500b9398fc1f145aa9448a4cf77a58b /framework/source/services
parent: e761f21bb4e09c90a6ccc9d23f8e1cafb2898641 (diff)
parent: 1955c30b72135397ff095ebf4712cc6db2a2c407 (diff)
20 files changed, 493 insertions, 378 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index c8731b0af5..41dbe9b603 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1,15 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autorecovery.cxx,v $
- *
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 #include "services/autorecovery.hxx"
+#include <loadenv/loadenv.hxx>
 
 //_______________________________________________
 // own includes
-#include <loadenv/loaddispatchlistener.hxx>
 #include <loadenv/targethelper.hxx>
 #include <pattern/frame.hxx>
 #include <threadhelp/readguard.hxx>
@@ -51,6 +47,8 @@
 // interface includes
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XLoadable.hpp>
+#include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -71,6 +69,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/document/XDocumentRecovery.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
@@ -79,10 +78,12 @@
 // other includes
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
+#include <comphelper/namedvaluecollection.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
 #include <tools/link.hxx>
 #include <tools/string.hxx>
+#include <tools/diagnose_ex.h>
 #include <unotools/tempfile.hxx>
 #include <ucbhelper/content.hxx>
 
@@ -92,6 +93,7 @@
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
 #include <svl/documentlockfile.hxx>
+#include <cppuhelper/exc_hlp.hxx>
 
 #include <tools/urlobj.hxx>
 
@@ -102,6 +104,23 @@
 namespace css = ::com::sun::star;
 #endif
 
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::UNO_QUERY_THROW;
+using ::com::sun::star::uno::UNO_SET_THROW;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::beans::PropertyValue;
+using ::com::sun::star::container::XEnumeration;
+using ::com::sun::star::document::XDocumentRecovery;
+using ::com::sun::star::frame::XModel2;
+using ::com::sun::star::frame::XModel;
+using ::com::sun::star::frame::XFrame;
+using ::com::sun::star::frame::XController2;
+using ::com::sun::star::frame::XLoadable;
+using ::com::sun::star::frame::XStorable;
+using ::com::sun::star::lang::XComponent;
+
 namespace fpf = ::framework::pattern::frame;
 
 namespace framework
@@ -135,6 +154,7 @@ static const ::rtl::OUString CFG_ENTRY_PROP_DOCUMENTSTATE     = ::rtl::OUString:
 static const ::rtl::OUString CFG_ENTRY_PROP_FILTER            = ::rtl::OUString::createFromAscii("Filter"       );
 static const ::rtl::OUString CFG_ENTRY_PROP_TITLE             = ::rtl::OUString::createFromAscii("Title"        );
 static const ::rtl::OUString CFG_ENTRY_PROP_ID                = ::rtl::OUString::createFromAscii("ID"           );
+static const ::rtl::OUString CFG_ENTRY_PROP_VIEWNAMES         = ::rtl::OUString::createFromAscii("ViewNames"    );
 
 static const ::rtl::OUString FILTER_PROP_TYPE                = ::rtl::OUString::createFromAscii("Type"            );
 static const ::rtl::OUString FILTER_PROP_NAME                = ::rtl::OUString::createFromAscii("Name"            );
@@ -144,6 +164,7 @@ static const ::rtl::OUString DOCINFO_PROP_TEMPLATE           = ::rtl::OUString::
 // setup.xcu
 static const ::rtl::OUString CFG_ENTRY_PROP_EMPTYDOCUMENTURL = ::rtl::OUString::createFromAscii("ooSetupFactoryEmptyDocumentURL");
 static const ::rtl::OUString CFG_ENTRY_PROP_DEFAULTFILTER    = ::rtl::OUString::createFromAscii("ooSetupFactoryDefaultFilter"   );
+static const ::rtl::OUString CFG_ENTRY_PROP_FACTORYSERVICE   = ::rtl::OUString::createFromAscii("ooSetupFactoryDocumentService"   );
 
 static const ::rtl::OUString EVENT_ON_NEW                    = ::rtl::OUString::createFromAscii("OnNew"          );
 static const ::rtl::OUString EVENT_ON_LOAD                   = ::rtl::OUString::createFromAscii("OnLoad"         );
@@ -623,7 +644,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
             // dont enable AutoSave hardly !
             // reload configuration to know the current state.
             implts_readAutoSaveConfig();
-            implts_actualizeTimer();
+            implts_updateTimer();
             // can it happen that might be the listener was stopped ? .-)
             // make sure it runs always ... even if AutoSave itself was disabled temporarly.
             implts_startListening();
@@ -779,7 +800,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
     // <- SAFE ----------------------------------
 
     // depends on bAllowAutoSaveReactivation implicitly by looking on m_eJob=E_AUTO_SAVE! see before ...
-    implts_actualizeTimer();
+    implts_updateTimer();
 
     if (bAllowAutoSaveReactivation)
         implts_startListening();
@@ -795,7 +816,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
     // container is threadsafe by using a shared mutex!
     m_lListener.addInterface(aURL.Complete, xListener);
 
-    // REINTRANT !? -> --------------------------------
+    // REENTRANT !? -> --------------------------------
     CacheLockGuard aCacheLock(this, m_aLock, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
 
     // THREAD SAFE -> ----------------------------------
@@ -849,7 +870,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
     else
     if (aEvent.EventName.equals(EVENT_ON_MODIFYCHANGED))
     {
-        implts_actualizeModifiedState(xDocument);
+        implts_updateModifiedState(xDocument);
     }
     /* at least one document starts saving process =>
        Our application code isnt ready for multiple save requests
@@ -958,7 +979,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
     // Note: This call stops the timer and starts it again.
     // But it checks the different timer states internaly and
     // may be supress the restart!
-    implts_actualizeTimer();
+    implts_updateTimer();
 }
 
 //-----------------------------------------------
@@ -1100,7 +1121,7 @@ void AutoRecovery::implts_readConfig()
 
     css::uno::Reference< css::container::XHierarchicalNameAccess > xCommonRegistry(implts_openConfig(), css::uno::UNO_QUERY);
 
-    // REINTRANT -> --------------------------------
+    // REENTRANT -> --------------------------------
     CacheLockGuard aCacheLock(this, m_aLock, m_nDocCacheLock, LOCK_FOR_CACHE_ADD_REMOVE);
 
     // THREADSAFE -> -------------------------------
@@ -1112,7 +1133,7 @@ void AutoRecovery::implts_readConfig()
     // <- THREADSAFE -------------------------------
 
     aCacheLock.unlock();
-    // <- REINTRANT --------------------------------
+    // <- REENTRANT --------------------------------
 
     css::uno::Any aValue;
 
@@ -1127,7 +1148,7 @@ void AutoRecovery::implts_readConfig()
               sal_Int32                             c      = lItems.getLength();
               sal_Int32                             i      = 0;
 
-        // REINTRANT -> --------------------------
+        // REENTRANT -> --------------------------
         aCacheLock.lock(LOCK_FOR_CACHE_ADD_REMOVE);
 
         for (i=0; i<c; ++i)
@@ -1147,7 +1168,8 @@ void AutoRecovery::implts_readConfig()
             xItem->getPropertyValue(CFG_ENTRY_PROP_DOCUMENTSTATE) >>= aInfo.DocumentState;
             xItem->getPropertyValue(CFG_ENTRY_PROP_MODULE       ) >>= aInfo.AppModule    ;
             xItem->getPropertyValue(CFG_ENTRY_PROP_TITLE        ) >>= aInfo.Title        ;
-            implts_specifyAppModuleAndFactoryURL(aInfo);
+            xItem->getPropertyValue(CFG_ENTRY_PROP_VIEWNAMES    ) >>= aInfo.ViewNames    ;
+            implts_specifyAppModuleAndFactory(aInfo);
             implts_specifyDefaultFilterAndExtension(aInfo);
 
             if (pItems[i].indexOf(RECOVERY_ITEM_BASE_IDENTIFIER)==0)
@@ -1177,10 +1199,10 @@ void AutoRecovery::implts_readConfig()
         }
 
         aCacheLock.unlock();
-        // <- REINTRANT --------------------------
+        // <- REENTRANT --------------------------
     }
 
-    implts_actualizeTimer();
+    implts_updateTimer();
 }
 
 //-----------------------------------------------
@@ -1245,17 +1267,12 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
 }
 
 //-----------------------------------------------
-void AutoRecovery::implts_specifyAppModuleAndFactoryURL(AutoRecovery::TDocumentInfo& rInfo)
+void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo)
 {
-    if (
-        (!rInfo.AppModule.getLength()) &&
-        (!rInfo.Document.is()        )
-       )
-    {
-        throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Cant find out the application module nor its factory URL, if no application module (or a suitable) document is known!"),
-                static_cast< css::frame::XDispatch* >(this));
-    }
+    ENSURE_OR_THROW2(
+        rInfo.AppModule.getLength() || rInfo.Document.is(),
+        "Cant find out the application module nor its factory URL, if no application module (or a suitable) document is known!",
+        *this );
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -1271,6 +1288,65 @@ void AutoRecovery::implts_specifyAppModuleAndFactoryURL(AutoRecovery::TDocumentI
 
     ::comphelper::SequenceAsHashMap lModuleDescription(xModuleConfig->getByName(rInfo.AppModule));
     lModuleDescription[CFG_ENTRY_PROP_EMPTYDOCUMENTURL] >>= rInfo.FactoryURL;
+    lModuleDescription[CFG_ENTRY_PROP_FACTORYSERVICE] >>= rInfo.FactoryService;
+}
+
+//-----------------------------------------------
+void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i_rInfo )
+{
+    ENSURE_OR_THROW2( i_rInfo.Document.is(), "need at document, at the very least", *this );
+
+    i_rInfo.ViewNames.realloc(0);
+
+    // obtain list of controllers of this document
+    ::std::vector< ::rtl::OUString > aViewNames;
+    const Reference< XModel2 > xModel( i_rInfo.Document, UNO_QUERY );
+    if ( xModel.is() )
+    {
+        const Reference< XEnumeration > xEnumControllers( xModel->getControllers() );
+        while ( xEnumControllers->hasMoreElements() )
+        {
+            const Reference< XController2 > xController( xEnumControllers->nextElement(), UNO_QUERY );
+            ::rtl::OUString sViewName;
+            if ( xController.is() )
+                sViewName = xController->getViewControllerName();
+            OSL_ENSURE( sViewName.getLength(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
+
+            if ( sViewName.getLength() )
+                aViewNames.push_back( sViewName );
+        }
+    }
+    else
+    {
+        const Reference< XController2 > xController( xModel->getCurrentController(), UNO_QUERY );
+        ::rtl::OUString sViewName;
+        if ( xController.is() )
+            sViewName = xController->getViewControllerName();
+        OSL_ENSURE( sViewName.getLength(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
+
+        if ( sViewName.getLength() )
+            aViewNames.push_back( sViewName );
+    }
+
+    i_rInfo.ViewNames.realloc( aViewNames.size() );
+    ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() );
+}
+
+//-----------------------------------------------
+void AutoRecovery::implts_persistAllActiveViewNames()
+{
+    // SAFE -> ----------------------------------
+    WriteGuard aWriteLock(m_aLock);
+
+    // This list will be filled with every document
+    AutoRecovery::TDocumentList::iterator pIt;
+    for (  pIt  = m_lDocCache.begin();
+           pIt != m_lDocCache.end()  ;
+         ++pIt                       )
+    {
+        implts_collectActiveViewNames( *pIt );
+        implts_flushConfigItem( *pIt );
+    }
 }
 
 //-----------------------------------------------
@@ -1323,6 +1399,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
             xSet->setPropertyValue(CFG_ENTRY_PROP_DOCUMENTSTATE, css::uno::makeAny(rInfo.DocumentState));
             xSet->setPropertyValue(CFG_ENTRY_PROP_MODULE       , css::uno::makeAny(rInfo.AppModule    ));
             xSet->setPropertyValue(CFG_ENTRY_PROP_TITLE        , css::uno::makeAny(rInfo.Title        ));
+            xSet->setPropertyValue(CFG_ENTRY_PROP_VIEWNAMES    , css::uno::makeAny(rInfo.ViewNames    ));
 
             if (bNew)
                 xModify->insertByName(sID, css::uno::makeAny(xSet));
@@ -1482,7 +1559,7 @@ void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo&
 }
 
 //-----------------------------------------------
-void AutoRecovery::implts_actualizeTimer()
+void AutoRecovery::implts_updateTimer()
 {
     implts_stopTimer();
 
@@ -1573,7 +1650,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
             m_eTimerType = AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED;
             aWriteLock.unlock();
             // <- SAFE ------------------------------
-            implts_actualizeTimer();
+            implts_updateTimer();
             return 0;
         }
 
@@ -1588,7 +1665,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
             sal_Bool bUserIdle = (Application::GetLastInputInterval()>MIN_TIME_FOR_USER_IDLE);
             if (!bUserIdle)
             {
-                implts_actualizeTimer();
+                implts_updateTimer();
                 return 0;
             }
         }
@@ -1629,7 +1706,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
         aWriteLock.unlock();
         // <- SAFE ----------------------------------
 
-        implts_actualizeTimer();
+        implts_updateTimer();
     }
     catch(const css::uno::Exception&)
     {
@@ -1666,7 +1743,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     // notification for already existing document !
     // Can happen if events came in asynchronous on recovery time.
     // Then our cache was filled from the configuration ... but now we get some
-    // asynchronous events from the global event broadcaster. We must be shure that
+    // asynchronous events from the global event broadcaster. We must be sure that
     // we dont add the same document more then once.
     AutoRecovery::TDocumentList::iterator pIt = AutoRecovery::impl_searchDocument(m_lDocCache, xDocument);
     if (pIt != m_lDocCache.end())
@@ -1674,7 +1751,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
         // Normaly nothing must be done for this "late" notification.
         // But may be the modified state was changed inbetween.
         // Check it ...
-        implts_actualizeModifiedState(xDocument);
+        implts_updateModifiedState(xDocument);
         return;
     }
 
@@ -1699,6 +1776,11 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     if (!xDesktop.is())
         return;
 
+    // if the document doesn't support the XDocumentRecovery interface, we're not interested in it.
+    Reference< XDocumentRecovery > xDocRecovery( xDocument, UNO_QUERY );
+    if ( !xDocRecovery.is() )
+        return;
+
     // get all needed informations of this document
     // We need it to update our cache or to locate already existing elements there!
     AutoRecovery::TDocumentInfo aNew;
@@ -1718,7 +1800,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     // <- SAFE ----------------------------------
 
     // classify the used application module, which is used by this document.
-    implts_specifyAppModuleAndFactoryURL(aNew);
+    implts_specifyAppModuleAndFactory(aNew);
 
     // Hack! Check for "illegal office documents" ... as e.g. the Basic IDE
     // Its not realy a full featured office document. It doesnt provide an URL, any filter, a factory URL etcpp.
@@ -1727,7 +1809,12 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
         (!aNew.OrgURL.getLength()    ) &&
         (!aNew.FactoryURL.getLength())
        )
-       return;
+    {
+        OSL_ENSURE( false, "AutoRecovery::implts_registerDocument: this should not happen anymore!" );
+        // nowadays, the Basic IDE should already die on the "supports XDocumentRecovery" check. And no other known
+        // document type fits in here ...
+        return;
+    }
 
     // By the way - get some information about the default format for saving!
     // and save an information about the real used filter by this document.
@@ -1748,7 +1835,6 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     if (xModifyCheck->isModified())
     {
         aNew.DocumentState |= AutoRecovery::E_MODIFIED;
-        aNew.DocumentState |= AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE;
     }
 
     aCacheLock.lock(LOCK_FOR_CACHE_ADD_REMOVE);
@@ -1756,7 +1842,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    // create a new cache entry ... this document isnt well known.
+    // create a new cache entry ... this document isn't known.
     ++m_nIdPool;
     aNew.ID = m_nIdPool;
     LOG_ASSERT(m_nIdPool>=0, "AutoRecovery::implts_registerDocument()\nOverflow of ID pool detected.")
@@ -1835,7 +1921,6 @@ void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::
     if (pIt != m_lDocCache.end())
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
-        rInfo.DocumentState |= AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE;
 
         /* Now we know, that this document was modified again and must be saved next time.
            But we dont need this information for every e.g. key input of the user.
@@ -1850,7 +1935,7 @@ void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::
 }
 
 //-----------------------------------------------
-void AutoRecovery::implts_actualizeModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument)
+void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument)
 {
     CacheLockGuard aCacheLock(this, m_aLock, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
 
@@ -1870,12 +1955,10 @@ void AutoRecovery::implts_actualizeModifiedState(const css::uno::Reference< css:
         if (bModified)
         {
             rInfo.DocumentState |= AutoRecovery::E_MODIFIED;
-            rInfo.DocumentState |= AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE;
         }
         else
         {
             rInfo.DocumentState &= ~AutoRecovery::E_MODIFIED;
-            rInfo.DocumentState &= ~AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE;
         }
     }
 
@@ -1968,6 +2051,33 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument(      Au
 }
 
 //-----------------------------------------------
+namespace
+{
+    void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, sal_Bool i_bVisible )
+    {
+        css::uno::Reference< css::container::XIndexAccess > xFramesContainer( i_rFrames->getFrames(), css::uno::UNO_QUERY );
+        const sal_Int32 count = xFramesContainer->getCount();
+
+        Any aElement;
+        for ( sal_Int32 i=0; i < count; ++i )
+        {
+            aElement = xFramesContainer->getByIndex(i);
+            // check for sub frames
+            css::uno::Reference< css::frame::XFramesSupplier > xFramesSupp( aElement, css::uno::UNO_QUERY );
+            if ( xFramesSupp.is() )
+                lcl_changeVisibility( xFramesSupp, i_bVisible );
+
+            css::uno::Reference< css::frame::XFrame > xFrame( aElement, css::uno::UNO_QUERY );
+            if ( !xFrame.is() )
+                continue;
+
+            css::uno::Reference< css::awt::XWindow > xWindow( xFrame->getContainerWindow(), UNO_SET_THROW );
+            xWindow->setVisible( i_bVisible );
+        }
+    }
+}
+
+//-----------------------------------------------
 void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible)
 {
     // SAFE -> ----------------------------------
@@ -1976,22 +2086,8 @@ void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible)
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
-    css::uno::Reference< css::frame::XFramesSupplier >  xDesktop  (xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY);
-    css::uno::Reference< css::container::XIndexAccess > xContainer(xDesktop->getFrames()                     , css::uno::UNO_QUERY);
-    sal_Int32 c = xContainer->getCount();
-    sal_Int32 i = 0;
-
-    for (i=0; i<c; ++i)
-    {
-        css::uno::Reference< css::frame::XFrame > xTask;
-
-        xContainer->getByIndex(i) >>= xTask;
-        if (!xTask.is())
-            continue;
-
-        css::uno::Reference< css::awt::XWindow > xWindow = xTask->getContainerWindow();
-        xWindow->setVisible(bVisible);
-    }
+    css::uno::Reference< css::frame::XFramesSupplier > xDesktop(xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY);
+    lcl_changeVisibility( xDesktop, bVisible );
 
     aReadLock.unlock();
     // <- SAFE ----------------------------------
@@ -2184,15 +2280,15 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
             continue;
 
         // already auto saved during this session :-)
-        // This state must be reseted for all documents
+        // This state must be reset for all documents
         // if timer is started with normnal AutoSaveTimerIntervall!
         if ((aInfo.DocumentState & AutoRecovery::E_HANDLED) == AutoRecovery::E_HANDLED)
             continue;
 
         // Not modified documents are not saved.
         // We safe an information about the URL only!
-        sal_Bool bModified = ((aInfo.DocumentState & AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE ) == AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE);
-        if (! bModified)
+        Reference< XDocumentRecovery > xDocRecover( aInfo.Document, UNO_QUERY_THROW );
+        if ( !xDocRecover->wasModifiedSinceLastSave() )
         {
             aInfo.DocumentState |= AutoRecovery::E_HANDLED;
             continue;
@@ -2337,7 +2433,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
     // try to save this document as a new temp file everytimes.
     // Mark AutoSave state as "INCOMPLETE" if it failed.
     // Because the last temp file is to old and does not include all changes.
-    css::uno::Reference< css::frame::XStorable > xStore(rInfo.Document, css::uno::UNO_QUERY_THROW);
+    Reference< XDocumentRecovery > xDocRecover(rInfo.Document, css::uno::UNO_QUERY_THROW);
 
     // safe the state about "trying to save"
     // ... we need it for recovery if e.g. a crash occures inside next line!
@@ -2350,7 +2446,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
     {
         try
         {
-            xStore->storeToURL(rInfo.NewTempURL, lNewArgs.getAsConstPropertyValueList());
+            xDocRecover->storeToRecoveryFile( rInfo.NewTempURL, lNewArgs.getAsConstPropertyValueList() );
 
             #ifdef TRIGGER_FULL_DISC_CHECK
             throw css::uno::Exception();
@@ -2394,7 +2490,6 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
         rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE;
         rInfo.DocumentState |=  AutoRecovery::E_HANDLED;
         rInfo.DocumentState |=  AutoRecovery::E_SUCCEDED;
-        rInfo.DocumentState &= ~AutoRecovery::E_MODIFIED_SINCE_LAST_AUTOSAVE;
     }
     else
     {
@@ -2470,6 +2565,9 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= REFERRER_USER;
         lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString();
 
+        // recovered documents are loaded hidden, and shown all at once, later
+        lDescriptor[::comphelper::MediaDescriptor::PROP_HIDDEN()] <<= true;
+
         if (aParams.m_xProgress.is())
             lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress;
 
@@ -2535,6 +2633,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         else
             continue; // TODO ERROR!
 
+        LoadEnv::initializeUIDefaults( m_xSMGR, lDescriptor, true, NULL );
+
         // <- SAFE ------------------------------
         aWriteLock.unlock();
 
@@ -2575,12 +2675,18 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         {
             ::comphelper::MediaDescriptor lPatchDescriptor(rInfo.Document->getArgs());
             lPatchDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.RealFilter;
-            rInfo.Document->attachResource(sURL, lPatchDescriptor.getAsConstPropertyValueList());
+            rInfo.Document->attachResource(rInfo.Document->getURL(), lPatchDescriptor.getAsConstPropertyValueList());
+                // do *not* use sURL here. In case this points to the recovery file, it has already been passed
+                // to recoverFromFile. Also, passing it here is logically wrong, as attachResource is intended
+                // to take the logical file URL.
         }
 
         css::uno::Reference< css::util::XModifiable > xModify(rInfo.Document, css::uno::UNO_QUERY);
-        sal_Bool bModified = ((rInfo.DocumentState & AutoRecovery::E_MODIFIED) == AutoRecovery::E_MODIFIED);
-        xModify->setModified(bModified);
+        if ( xModify.is() )
+        {
+            sal_Bool bModified = ((rInfo.DocumentState & AutoRecovery::E_MODIFIED) == AutoRecovery::E_MODIFIED);
+            xModify->setModified(bModified);
+        }
 
         rInfo.DocumentState &= ~AutoRecovery::E_TRY_LOAD_BACKUP;
         rInfo.DocumentState &= ~AutoRecovery::E_TRY_LOAD_ORIGINAL;
@@ -2593,8 +2699,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
 
         /* Normaly we listen as XModifyListener on a document to know if a document was changed
            since our last AutoSave. And we deregister us in case we know this state.
-           But directly after one documentw as recovered ... we must start listening.
-           Otherwhise the first "modify" dont reach us. Because weself called setModified()
+           But directly after one document as recovered ... we must start listening.
+           Otherwhise the first "modify" doesnt reach us. Because we ourself called setModified()
            on the document via API. And currently we dont listen for any events (not at the GlobalEventBroadcaster
            nor at any document!).
         */
@@ -2622,60 +2728,113 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString&               sURL
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
-    css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW);
-    css::util::URL aURL;
-    aURL.Complete = sURL;
-    xParser->parseStrict(aURL);
-
-    LoadDispatchListener*                                      pLoadListener = new LoadDispatchListener();
-    css::uno::Reference< css::frame::XDispatchResultListener > xLoadListener (static_cast< css::frame::XDispatchResultListener* >(pLoadListener), css::uno::UNO_QUERY_THROW);
-
-    css::uno::Reference< css::frame::XFrame >             xDesktop   (xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW);
-    css::uno::Reference< css::frame::XFrame >             xNewTarget = xDesktop->findFrame(SPECIALTARGET_BLANK, 0);
-    css::uno::Reference< css::frame::XDispatchProvider >  xProvider  (xNewTarget, css::uno::UNO_QUERY_THROW);
-    css::uno::Reference< css::frame::XNotifyingDispatch > xDispatcher(
-        xProvider->queryDispatch(aURL, SPECIALTARGET_SELF, 0),
-        css::uno::UNO_QUERY_THROW);
-
-    // load the document and listen for the state of this operation.
-    pLoadListener->setURL(aURL.Complete);
-
-    // make sure the right progress is used always.
-    impl_establishProgress(rInfo, lDescriptor, xNewTarget);
+    css::uno::Reference< css::frame::XFrame > xDesktop( xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW );
 
+    ::std::vector< Reference< XComponent > > aCleanup;
     try
     {
-        xDispatcher->dispatchWithNotification(
-            aURL,
-            lDescriptor.getAsConstPropertyValueList(),
-            xLoadListener);
+        // create a new document of the desired type
+        Reference< XModel2 > xModel( xSMGR->createInstance( rInfo.FactoryService ), UNO_QUERY_THROW );
+        aCleanup.push_back( xModel.get() );
 
-        pLoadListener->wait(0); // wait for ever!
+        // put the filter name into the descriptor - we're not going to involve any type detection, so
+        // the document might be lost without the FilterName property
+        lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
 
-        css::frame::DispatchResultEvent aResult = pLoadListener->getResult();
-        if (aResult.State != css::frame::DispatchResultState::SUCCESS)
+        if ( sURL == rInfo.FactoryURL )
         {
-            ::rtl::OUStringBuffer sMsg(256);
-            sMsg.appendAscii("Recovery of \"");
-            sMsg.append     (aURL.Complete   );
-            sMsg.appendAscii("\" failed."    );
-            throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< css::frame::XDispatch* >(this));
+            // if the document was a new, unmodified document, then there's nothing to recover, just to init
+            ENSURE_OR_THROW( ( rInfo.DocumentState & AutoRecovery::E_MODIFIED ) == 0,
+                "unexpected document state" );
+            Reference< XLoadable > xModelLoad( xModel, UNO_QUERY_THROW );
+            xModelLoad->initNew();
+
+            // TODO: remove load-process specific arguments from the descriptor, e.g. the status indicator
+            xModel->attachResource( sURL, lDescriptor.getAsConstPropertyValueList() );
         }
+        else
+        {
+            // let it recover itself
+            Reference< XDocumentRecovery > xDocRecover( xModel, UNO_QUERY_THROW );
+            xDocRecover->recoverFromFile(
+                sURL,
+                lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString() ),
+                lDescriptor.getAsConstPropertyValueList()
+            );
+
+            // No attachResource needed here. By definition (of XDocumentRecovery), the implementation is responsible
+            // for completely initializing the model, which includes attachResource (or equivalent), if required.
+        }
+
+        // re-create all the views
+        ::std::vector< ::rtl::OUString > aViewsToRestore( rInfo.ViewNames.getLength() );
+        if ( rInfo.ViewNames.getLength() )
+            ::std::copy( rInfo.ViewNames.getConstArray(), rInfo.ViewNames.getConstArray() + rInfo.ViewNames.getLength(), aViewsToRestore.begin() );
+        // if we don't have views for whatever reason, then create a default-view, at least
+        if ( aViewsToRestore.empty() )
+            aViewsToRestore.push_back( ::rtl::OUString() );
+
+        for (   ::std::vector< ::rtl::OUString >::const_iterator viewName = aViewsToRestore.begin();
+                viewName != aViewsToRestore.end();
+                ++viewName
+            )
+        {
+            // create a frame
+            Reference< XFrame > xTargetFrame = xDesktop->findFrame( SPECIALTARGET_BLANK, 0 );
+            aCleanup.push_back( xTargetFrame.get() );
 
-        rInfo.Document = fpf::extractFrameModel(xNewTarget);
+            // create a view to the document
+            Reference< XController2 > xController;
+            if ( viewName->getLength() )
+            {
+                xController.set( xModel->createViewController( *viewName, Sequence< PropertyValue >(), xTargetFrame ), UNO_SET_THROW );
+            }
+            else
+            {
+                xController.set( xModel->createDefaultViewController( xTargetFrame ), UNO_SET_THROW );
+            }
+
+            // introduce model/view/controller to each other
+            xController->attachModel( xModel.get() );
+            xModel->connectController( xController.get() );
+            xTargetFrame->setComponent( xController->getComponentWindow(), xController.get() );
+            xController->attachFrame( xTargetFrame );
+            xModel->setCurrentController( xController.get() );
+        }
+
+        rInfo.Document = xModel.get();
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
     {
-        css::uno::Reference< css::util::XCloseable > xClose(xNewTarget, css::uno::UNO_QUERY);
-        xClose->close(sal_True);
-        xNewTarget.clear();
-        throw;
-    }
+        Any aCaughtException( ::cppu::getCaughtException() );
+
+        // clean up
+        for (   ::std::vector< Reference< XComponent > >::const_iterator component = aCleanup.begin();
+                component != aCleanup.end();
+                ++component
+            )
+        {
+            css::uno::Reference< css::util::XCloseable > xClose( *component, css::uno::UNO_QUERY );
+            if ( xClose.is() )
+                xClose->close( sal_True );
+            else
+                (*component)->dispose();
+        }
 
-    // of course we must forget all references to this temp(!) progress
-    impl_forgetProgress(rInfo, lDescriptor, xNewTarget);
+        // re-throw
+        ::rtl::OUStringBuffer sMsg(256);
+        sMsg.appendAscii("Recovery of \"");
+        sMsg.append     (sURL            );
+        sMsg.appendAscii("\" failed."    );
+
+        throw css::lang::WrappedTargetException(
+            sMsg.makeStringAndClear(),
+            static_cast< css::frame::XDispatch* >(this),
+            aCaughtException
+        );
+    }
 }
 
 //-----------------------------------------------
@@ -2787,7 +2946,7 @@ void AutoRecovery::implts_informListener(      sal_Int32                      eJ
     if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
         sFeature.append(CMD_DO_AUTO_SAVE);
     #ifdef ENABLE_WARNINGS
-    else
+    else if ( eJob != AutoRecovery::E_NO_JOB )
         LOG_WARNING("AutoRecovery::implst_getJobDescription()", "Invalid job identifier detected.")
     #endif
 
@@ -2846,35 +3005,18 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(
     if (sEventType.equals(OPERATION_UPDATE) && pInfo)
     {
         // pack rInfo for transport via UNO
-        css::uno::Sequence< css::beans::NamedValue > lInfo(8);
-        lInfo[0].Name    = CFG_ENTRY_PROP_ID;
-        lInfo[0].Value <<= pInfo->ID;
-
-        lInfo[1].Name    = CFG_ENTRY_PROP_ORIGINALURL;
-        lInfo[1].Value <<= pInfo->OrgURL;
+        ::comphelper::NamedValueCollection aInfo;
+        aInfo.put( CFG_ENTRY_PROP_ID, pInfo->ID );
+        aInfo.put( CFG_ENTRY_PROP_ORIGINALURL,      pInfo->OrgURL           );
+        aInfo.put( CFG_ENTRY_PROP_FACTORYURL,       pInfo->FactoryURL       );
+        aInfo.put( CFG_ENTRY_PROP_TEMPLATEURL,      pInfo->TemplateURL      );
+        aInfo.put( CFG_ENTRY_PROP_TEMPURL,          pInfo->OldTempURL.getLength() ? pInfo->OldTempURL : pInfo->NewTempURL );
+        aInfo.put( CFG_ENTRY_PROP_MODULE,           pInfo->AppModule        );
+        aInfo.put( CFG_ENTRY_PROP_TITLE,            pInfo->Title            );
+        aInfo.put( CFG_ENTRY_PROP_VIEWNAMES,        pInfo->ViewNames        );
+        aInfo.put( CFG_ENTRY_PROP_DOCUMENTSTATE,    pInfo->DocumentState    );
 
-        lInfo[2].Name    = CFG_ENTRY_PROP_FACTORYURL;
-        lInfo[2].Value <<= pInfo->FactoryURL;
-
-        lInfo[3].Name    = CFG_ENTRY_PROP_TEMPLATEURL;
-        lInfo[3].Value <<= pInfo->TemplateURL;
-
-        lInfo[4].Name    = CFG_ENTRY_PROP_TEMPURL;
-        if (pInfo->OldTempURL.getLength())
-            lInfo[4].Value <<= pInfo->OldTempURL;
-        else
-            lInfo[4].Value <<= pInfo->NewTempURL;
-
-        lInfo[5].Name    = CFG_ENTRY_PROP_MODULE;
-        lInfo[5].Value <<= pInfo->AppModule;
-
-        lInfo[6].Name    = CFG_ENTRY_PROP_TITLE;
-        lInfo[6].Value <<= pInfo->Title;
-
-        lInfo[7].Name    = CFG_ENTRY_PROP_DOCUMENTSTATE;
-        lInfo[7].Value <<= pInfo->DocumentState;
-
-        aEvent.State <<= lInfo;
+        aEvent.State <<= aInfo.getPropertyValues();
     }
 
     return aEvent;
@@ -2932,6 +3074,9 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
         css::uno::makeAny(sal_True),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
+    // for all docs, store their current view/names in the configurtion
+    implts_persistAllActiveViewNames();
+
     // The called method for saving documents runs
     // during normal AutoSave more then once. Because
     // it postpone active documents and save it later.
@@ -2999,6 +3144,9 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
     // Be sure to know all open documents realy .-)
     implts_verifyCacheAgainstDesktopDocumentList();
 
+    // for all docs, store their current view/names in the configurtion
+    implts_persistAllActiveViewNames();
+
     // The called method for saving documents runs
     // during normal AutoSave more then once. Because
     // it postpone active documents and save it later.
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index f1deffa53b..f59ea721ec 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingcomp.cxx,v $
- *
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 34d6794eba..c565720034 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingwindow.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -113,39 +110,66 @@ Size DecoToolBox::getMinSize()
     return maMinSize;
 }
 
+#define STC_BUTTON_STYLE  (WB_LEFT | WB_VCENTER | WB_FLATBUTTON | WB_BEVELBUTTON)
 
 BackingWindow::BackingWindow( Window* i_pParent ) :
     Window( i_pParent, FwkResId( DLG_BACKING ) ),
     maWelcome( this, WB_LEFT ),
     maProduct( this, WB_LEFT ),
-    maCreateText( this, WB_LEFT ),
     maWriterText( this, WB_WORDBREAK | WB_VCENTER ),
-    maWriterButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maWriterButton( this, STC_BUTTON_STYLE ),
     maCalcText( this, WB_WORDBREAK | WB_VCENTER ),
-    maCalcButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maCalcButton( this, STC_BUTTON_STYLE ),
     maImpressText( this, WB_WORDBREAK | WB_VCENTER ),
-    maImpressButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maImpressButton( this, STC_BUTTON_STYLE ),
+    maOpenText( this, WB_WORDBREAK | WB_VCENTER ),
+    maOpenButton( this, STC_BUTTON_STYLE ),
     maDrawText( this, WB_WORDBREAK | WB_VCENTER ),
-    maDrawButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maDrawButton( this, STC_BUTTON_STYLE ),
     maDBText( this, WB_WORDBREAK | WB_VCENTER ),
-    maDBButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maDBButton( this, STC_BUTTON_STYLE ),
     maMathText( this, WB_WORDBREAK | WB_VCENTER ),
-    maMathButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maMathButton( this, STC_BUTTON_STYLE ),
     maTemplateText( this, WB_WORDBREAK | WB_VCENTER ),
-    maTemplateButton( this, WB_CENTER | WB_BEVELBUTTON ),
-    maOpenText( this, WB_WORDBREAK | WB_VCENTER ),
-    maOpenButton( this, WB_CENTER | WB_BEVELBUTTON ),
+    maTemplateButton( this, STC_BUTTON_STYLE ),
     maToolbox( this, WB_DIALOGCONTROL ),
     maWelcomeString( FwkResId( STR_BACKING_WELCOME ) ),
     maProductString( FwkResId( STR_BACKING_WELCOMEPRODUCT ) ),
-    maCreateString( FwkResId( STR_BACKING_CREATE ) ),
     maOpenString( FwkResId( STR_BACKING_FILE ) ),
     maTemplateString( FwkResId( STR_BACKING_TEMPLATE ) ),
     maButtonImageSize( 10, 10 ),
     mbInitControls( false ),
-    mpAccExec( NULL )
+    mnLayoutStyle( 0 ),
+    mpAccExec( NULL ),
+    mnBtnPos( 120 )
 {
     mnColumnWidth[0] = mnColumnWidth[1] = 0;
+    mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0;
+
+    try
+    {
+        Reference<lang::XMultiServiceFactory> xConfig( comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY);
+        if( xConfig.is() )
+        {
+            Sequence<Any> args(1);
+            PropertyValue val(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath") ),
+                0,
+                Any(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/Help/StartCenter"))),
+                PropertyState_DIRECT_VALUE);
+            args.getArray()[0] <<= val;
+            Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY);
+            if( xNameAccess.is() )
+            {
+                //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
+                Any value( xNameAccess->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartCenterLayoutStyle"))) );
+                mnLayoutStyle = value.get<sal_Int32>();
+            }
+        }
+    }
+    catch (Exception& )
+    {
+    }
 
     // get icon images from vcl resource and set them on the appropriate buttons
     loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton );
@@ -154,16 +178,12 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton );
     loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton );
     loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
-    loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
-    loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
+    loadImage( FwkResId( BMP_BACKING_FOLDER ), maOpenButton );
+    loadImage( FwkResId( BMP_BACKING_FOLDER ), maTemplateButton );
 
-    BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-    BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
     String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
-    BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
-    BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) );
     String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
 
     // clean up resource stack
@@ -183,25 +203,25 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE );
 
     // insert toolbox items
-    maToolbox.InsertItem( nItemId_TplRep, Image( aTplRepImage ) );
+    maToolbox.InsertItem( nItemId_TplRep, Image() );
     maToolbox.SetItemText( nItemId_TplRep, aTplRepHelpText );
     maToolbox.SetQuickHelpText( nItemId_TplRep, aTplRepHelpText );
     maToolbox.SetItemCommand( nItemId_TplRep, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateRepository" ) ) );
     maToolbox.ShowItem( nItemId_TplRep );
 
-    maToolbox.InsertItem( nItemId_Extensions, Image( aExtImage ) );
+    maToolbox.InsertItem( nItemId_Extensions, Image() );
     maToolbox.SetQuickHelpText( nItemId_Extensions, aExtHelpText );
     maToolbox.SetItemText( nItemId_Extensions, aExtHelpText );
     maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
     maToolbox.ShowItem( nItemId_Extensions );
 
-    maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
+    maToolbox.InsertItem( nItemId_Reg, Image() );
     maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
     maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
     maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
     maToolbox.ShowItem( nItemId_Reg );
 
-    maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
+    maToolbox.InsertItem( nItemId_Info, Image() );
     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
     maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
     maToolbox.SetItemCommand( nItemId_Info, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Info" ) ) );
@@ -262,7 +282,13 @@ void BackingWindow::initBackground()
     SetBackground( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
 
     bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode();
-    maWelcomeTextColor = maLabelTextColor =  bDark ? Color( COL_WHITE ) : Color( 0x26, 0x35, 0x42 );
+    if( bDark )
+        maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE );
+    else if( mnLayoutStyle == 1 )
+        maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK );
+    else 
+        maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 );
+    
     Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
 
     // select image set
@@ -289,13 +315,15 @@ void BackingWindow::initBackground()
         maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_LEFT ) );
         maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
     }
+    maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
+    maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) );
+    maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
+    maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) );
 
     maWelcome.SetControlForeground( maWelcomeTextColor );
     maWelcome.SetBackground();
     maProduct.SetControlForeground( maWelcomeTextColor );
     maProduct.SetBackground();
-    maCreateText.SetControlForeground( maLabelTextColor );
-    maCreateText.SetControlBackground( aTextBGColor );
     maWriterText.SetControlForeground( maLabelTextColor );
     maWriterText.SetControlBackground( aTextBGColor );
     maCalcText.SetControlForeground( maLabelTextColor );
@@ -312,6 +340,14 @@ void BackingWindow::initBackground()
     maTemplateText.SetControlBackground( aTextBGColor );
     maOpenText.SetControlForeground( maLabelTextColor );
     maOpenText.SetControlBackground( aTextBGColor );
+    
+    if( mnLayoutStyle == 1 )
+    {
+        if( Application::GetSettings().GetLayoutRTL() )
+            mnBtnPos = maBackgroundRight.GetSizePixel().Width() + 40;
+        else
+            mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40;
+    }
 }
 
 void BackingWindow::initControls()
@@ -347,10 +383,8 @@ void BackingWindow::initControls()
 
     nYPos += (maWelcomeSize.Height()*3)/2;
 
-    if( maControlRect.GetWidth() < nBtnPos + maWelcomeSize.Width() + 20 )
-        maControlRect.Right() = maControlRect.Left() + maWelcomeSize.Width() + nBtnPos + 20;
-
-    maWelcome.Show();
+    if( maControlRect.GetWidth() < mnBtnPos + maWelcomeSize.Width() + 20 )
+        maControlRect.Right() = maControlRect.Left() + maWelcomeSize.Width() + mnBtnPos + 20;
 
     nYPos += maWelcomeSize.Height();
 
@@ -368,10 +402,14 @@ void BackingWindow::initControls()
     maProductSize = Size( maProduct.GetTextWidth( maProductString ), maProduct.GetTextHeight() );
     maProductSize.Width() = (maProductSize.Width() * 20)/19;
 
-    if( maControlRect.GetWidth() < maProductSize.Width() + nBtnPos + 10 )
-        maControlRect.Right() = maControlRect.Left() + maProductSize.Width() + nBtnPos + 10;
+    if( maControlRect.GetWidth() < maProductSize.Width() + mnBtnPos + 10 )
+        maControlRect.Right() = maControlRect.Left() + maProductSize.Width() + mnBtnPos + 10;
 
-    maProduct.Show();
+    if( mnLayoutStyle == 1 )
+    {
+        maWelcome.Show();        
+        maProduct.Show();
+    }
 
     nYPos += (maProductSize.Height()*3)/2;
 
@@ -379,14 +417,6 @@ void BackingWindow::initControls()
     maTextFont.SetSize( Size( 0, 11 ) );
     maTextFont.SetWeight( WEIGHT_NORMAL );
 
-    maCreateText.SetText( maCreateString );
-    maCreateText.SetFont( maTextFont );
-    maCreateText.SetControlFont( maTextFont );
-    maCreateSize = Size( maCreateText.GetTextWidth( maCreateString ), maCreateText.GetTextHeight() );
-    maCreateText.Show();
-
-    nYPos += (maCreateSize.Height()*3)/2;
-
     // collect the URLs of the entries in the File/New menu
     SvtModuleOptions	aModuleOptions;
     std::set< rtl::OUString > aFileNewAppsAvailable;
@@ -429,41 +459,62 @@ void BackingWindow::initControls()
     layoutButtonAndText( WRITER_URL, 0, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SWRITER,
                          maWriterButton, maWriterText, aMnemns );
-    layoutButtonAndText( CALC_URL, 1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SCALC,
-                         maCalcButton, maCalcText, aMnemns );
-    nYPos += maButtonImageSize.Height() + 10;
-    layoutButtonAndText( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SIMPRESS,
-                         maImpressButton, maImpressText, aMnemns );
     layoutButtonAndText( DRAW_URL, 1, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SDRAW,
                          maDrawButton, maDrawText, aMnemns );
     nYPos += maButtonImageSize.Height() + 10;
-    layoutButtonAndText( BASE_URL, 0, aFileNewAppsAvailable,
+    layoutButtonAndText( CALC_URL, 0, aFileNewAppsAvailable,
+                         aModuleOptions, SvtModuleOptions::E_SCALC,
+                         maCalcButton, maCalcText, aMnemns );
+    layoutButtonAndText( BASE_URL, 1, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SDATABASE,
                          maDBButton, maDBText, aMnemns );
+    nYPos += maButtonImageSize.Height() + 10;
+    layoutButtonAndText( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
+                         aModuleOptions, SvtModuleOptions::E_SIMPRESS,
+                         maImpressButton, maImpressText, aMnemns );
     layoutButtonAndText( MATH_URL, 1, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SMATH,
                          maMathButton, maMathText, aMnemns );
 
     nYPos += 3*maButtonImageSize.Height() / 2;
-    layoutButtonAndText( NULL, -1, aFileNewAppsAvailable,
-                         aModuleOptions, SvtModuleOptions::E_SWRITER,
-                         maTemplateButton, maTemplateText, aMnemns, maTemplateString );
-
-    nYPos += 10;
-    layoutButtonAndText( NULL, -1, aFileNewAppsAvailable,
+    
+    layoutButtonAndText( NULL, 0, aFileNewAppsAvailable,
                          aModuleOptions, SvtModuleOptions::E_SWRITER,
                          maOpenButton, maOpenText, aMnemns, maOpenString );
+    layoutButtonAndText( NULL, 1, aFileNewAppsAvailable,
+                         aModuleOptions, SvtModuleOptions::E_SWRITER,
+                         maTemplateButton, maTemplateText, aMnemns, maTemplateString );    
     nYPos += 10;
 
     DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" );
-    if( mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20 > maControlRect.GetWidth() )
-        maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20;
+    if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 > maControlRect.GetWidth() )
+        maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20;
+    
+    mnTextColumnWidth[0] = mnColumnWidth[0];
+    mnTextColumnWidth[1] = mnColumnWidth[1];
+
+    if( mnTextColumnWidth[1] > mnTextColumnWidth[0] )
+    {
+        mnColumnWidth[0]     = mnColumnWidth[1];
+        mnTextColumnWidth[0] = mnTextColumnWidth[1];
+    }
+    else
+    {
+        mnColumnWidth[1]     = mnColumnWidth[0];
+        mnTextColumnWidth[1] = mnTextColumnWidth[0];
+    }
+    if( maControlRect.GetWidth() < maControlRect.GetHeight() * 3 / 2 )
+    {
+        maControlRect.Right() = maControlRect.Left() + maControlRect.GetHeight() * 3 / 2;
+        long nDelta = (maControlRect.GetWidth() - mnBtnPos - mnColumnWidth[1] - mnColumnWidth[0] - 20);
+        mnColumnWidth[0] += nDelta/2;
+        mnColumnWidth[1] += nDelta/2;
+    }
 
     maToolbox.SetSelectHdl( LINK( this, BackingWindow, ToolboxHdl ) );
-    maToolbox.Show();
+    if( mnLayoutStyle == 0 )
+        maToolbox.Show();
 
     // scale middle map to formatted width
     Size aMiddleSegmentSize( maControlRect.GetSize().Width() + nShadowLeft + nShadowRight,
@@ -513,37 +564,34 @@ void BackingWindow::layoutButtonAndText(
     }
 
     // setup text
-    i_rText.SetFont( maTextFont );
-    i_rText.SetControlFont( maTextFont );
+    i_rBtn.SetFont( maTextFont );
+    i_rBtn.SetControlFont( maTextFont );
     String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) );
     i_rMnemns.CreateMnemonic( aText );
-    i_rText.SetText( aText );
+    i_rBtn.SetText( aText );
+    
+    long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
-    long nTextWidth = i_rText.GetTextWidth( i_rText.GetText() );
-    i_rText.SetPaintTransparent( TRUE );
-
-    nTextWidth += maButtonImageSize.Width() + 30;
+    nTextWidth += maButtonImageSize.Width();
     if( nColumn >= 0 && nColumn < static_cast<int>(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) )
     {
         if( nTextWidth > mnColumnWidth[nColumn] )
             mnColumnWidth[nColumn] = nTextWidth;
     }
 
+    i_rBtn.SetImageAlign( IMAGEALIGN_LEFT );
     // show the controls
     i_rBtn.Show();
-    i_rText.Show();
+    i_rText.Show( FALSE );
+
+
+    // FIXME: the only reason the FixedTexts are left are not to trigger
+    // a translation change due to changed src files. For the next minor
+    // the FixedTexts should be removed completely
 }
 
 void BackingWindow::Paint( const Rectangle& )
 {
-    bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    Color aBackColor( bDark ? COL_BLACK : COL_WHITE );
-
-    // fill control rect
-    SetLineColor();
-    SetFillColor( aBackColor );
-    DrawRect( maControlRect );
 
     // draw bitmap
     if( GetSettings().GetLayoutRTL() )
@@ -610,8 +658,10 @@ void BackingWindow::Resize()
 
     maToolbox.calcMinSize();
     Size aTBSize( maToolbox.getMinSize() );
-    Point aTBPos( maControlRect.Right() - aTBSize.Width() - 10,
+    Point aTBPos( maControlRect.Left() + mnBtnPos,
                   maControlRect.Bottom() - aTBSize.Height() - 10 );
+    if( Application::GetSettings().GetLayoutRTL() )
+        aTBPos.X() = maControlRect.Right() - aTBSize.Width() - mnBtnPos;
     maToolbox.SetPosSizePixel( aTBPos, aTBSize );
 
     // #i93631# squeeze controls so they fit into the box
@@ -620,7 +670,6 @@ void BackingWindow::Resize()
     const long nWDelta    = maWelcomeSize.Height();
     const long nW2Delta   = (maWelcomeSize.Height()*3)/2;
     const long nPDelta    = (maProductSize.Height()*3)/2;
-    const long nCDelta    = (maCreateSize.Height()*3)/2;
     const long nBDelta    = maButtonImageSize.Height() + 10;
     const long nB2Delta   = 3*maButtonImageSize.Height()/2;
     const long nLastDelta = maButtonImageSize.Height();
@@ -629,7 +678,6 @@ void BackingWindow::Resize()
                  (nWDelta - nDiff) +
                  (nW2Delta- nDiff) +
                  (nPDelta - nDiff) +
-                 (nCDelta - nDiff) +
              3 * (nBDelta - nDiff) +
                  (nB2Delta- nDiff) +
                  nLastDelta
@@ -640,47 +688,26 @@ void BackingWindow::Resize()
 
     long nYPos = maControlRect.Top();
     nYPos += nW2Delta - nDiff;
-    maWelcome.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ),
-                                Size( maControlRect.GetWidth() - nBtnPos - 5, (maWelcomeSize.Height()*20)/19 ) );
+    maWelcome.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ),
+                                Size( maControlRect.GetWidth() - mnBtnPos - 5, (maWelcomeSize.Height()*20)/19 ) );
     nYPos += nWDelta - nDiff;
-    maProduct.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), Size( maControlRect.GetWidth() - nBtnPos - 5, (maProductSize.Height()*20)/19 ) );
+    maProduct.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( maControlRect.GetWidth() - mnBtnPos - 5, (maProductSize.Height()*20)/19 ) );
     nYPos += nPDelta - nDiff;
 
-    maCreateText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ),
-                                  Size( maControlRect.GetWidth() - nBtnPos - 5, maCreateSize.Height() ) );
+    nYPos += nWDelta/2 - nDiff;
 
-    nYPos += nCDelta - nDiff;
-
-    maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maWriterText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                  Size( mnColumnWidth[0] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    maCalcButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + mnColumnWidth[0], nYPos ), maButtonImageSize );
-    maCalcText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10 + mnColumnWidth[0], nYPos ),
-                                  Size( mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
+    maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
     nYPos += nBDelta - nDiff;
-    maImpressButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maImpressText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                  Size( mnColumnWidth[0] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + mnColumnWidth[0], nYPos ), maButtonImageSize );
-    maDrawText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10 + mnColumnWidth[0], nYPos ),
-                                  Size( mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
+    maCalcButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maDBButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
     nYPos += nBDelta - nDiff;
-    maDBButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maDBText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                  Size( mnColumnWidth[0] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    maMathButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + mnColumnWidth[0], nYPos ), maButtonImageSize );
-    maMathText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10 + mnColumnWidth[0], nYPos ),
-                                    Size( mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
+    maImpressButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maMathButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
 
     nYPos += nB2Delta - nDiff;
-    maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maTemplateText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                Size( mnColumnWidth[0]+mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    nYPos += nBDelta - nDiff;
-    maOpenButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize );
-    maOpenText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos + maButtonImageSize.Width() + 10, nYPos ),
-                                Size( mnColumnWidth[0]+mnColumnWidth[1] - maButtonImageSize.Width() - 10, maButtonImageSize.Height() ) );
-    nYPos += nBDelta - nDiff;
+    maOpenButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
+    maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
 }
 
 IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index e02206cf5f..fa993fac34 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingwindow.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -89,14 +86,14 @@ namespace framework
         Size                            maWelcomeSize;
         FixedText                       maProduct;
         Size                            maProductSize;
-        FixedText                       maCreateText;
-        Size                            maCreateSize;
         FixedText                       maWriterText;
         ImageButton                     maWriterButton;
         FixedText                       maCalcText;
         ImageButton                     maCalcButton;
         FixedText                       maImpressText;
         ImageButton                     maImpressButton;
+        FixedText                       maOpenText;
+        ImageButton                     maOpenButton;
         FixedText                       maDrawText;
         ImageButton                     maDrawButton;
         FixedText                       maDBText;
@@ -105,8 +102,6 @@ namespace framework
         ImageButton                     maMathButton;
         FixedText                       maTemplateText;
         ImageButton                     maTemplateButton;
-        FixedText                       maOpenText;
-        ImageButton                     maOpenButton;
 
         DecoToolBox                     maToolbox;
 
@@ -124,16 +119,17 @@ namespace framework
         Rectangle                       maControlRect;
 
         long                            mnColumnWidth[2];
+        long                            mnTextColumnWidth[2];
         Color                           maLabelTextColor;
         Color                           maWelcomeTextColor;
 
         Size                            maButtonImageSize;
 
         bool                            mbInitControls;
+        sal_Int32                       mnLayoutStyle;
         svt::AcceleratorExecute*        mpAccExec;
+        long                            mnBtnPos;
 
-
-        static const long nBtnPos = 240;
         static const int nItemId_Extensions = 1;
         static const int nItemId_Reg = 2;
         static const int nItemId_Info = 3;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index fd983ed492..6a07b7fda0 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: desktop.cxx,v $
- * $Revision: 1.64.80.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 0413cbfdbc..d6c7fe6288 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchhelper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 709bfb6bd0..08f9b171a9 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1,15 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frame.cxx,v $
- *
- * $Revision: 1.106.80.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2705,21 +2701,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sPr
                 break;
 
         case FRAME_PROPHANDLE_ISHIDDEN :
-//                aValue <<= m_bIsHidden;
-                {
-                    sal_Bool bLoadedHidden = m_bIsHidden;
-                    css::uno::Reference< css::frame::XModel > xModel;
-                    if (m_xController.is())
-                        xModel = m_xController->getModel();
-                    if (xModel.is())
-                    {
-                        ::comphelper::MediaDescriptor lDesc(xModel->getArgs());
-                        bLoadedHidden = lDesc.getUnpackedValueOrDefault(
-                                                    ::comphelper::MediaDescriptor::PROP_HIDDEN(),
-                                                    (sal_Bool)sal_False);
-                    }
-                    aValue <<= bLoadedHidden;
-                }
+                aValue <<= m_bIsHidden;
                 break;
 
         case FRAME_PROPHANDLE_LAYOUTMANAGER :
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index b3916da9e3..7329b381c1 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwk_services.src,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -80,42 +77,22 @@ Window DLG_BACKING
     {
         File = "odf_32.png";
     };
-    Bitmap BMP_BACKING_OPENFILE
-    {
-        File = "open_32.png";
-    };
-    Bitmap BMP_BACKING_OPENTEMPLATE
-    {
-        File = "template_32.png";
-    };
-    Bitmap BMP_BACKING_EXT
+    Bitmap BMP_BACKING_FOLDER
     {
-        File = "extension_plus_26.png";
+        File = "folder_32.png";
     };
     String STR_BACKING_EXTHELP
     {
         Text [ en-US ] = "Add new features to %PRODUCTNAME";
     };
-    Bitmap BMP_BACKING_REG
-    {
-        File = "register_32.png";
-    };
     String STR_BACKING_REGHELP
     {
         Text [ en-US ] = "Register your %PRODUCTNAME";
     };
-    Bitmap BMP_BACKING_INFO
-    {
-        File = "info_26.png";
-    };
     String STR_BACKING_INFOHELP
     {
         Text [ en-US ] = "Get more information about %PRODUCTNAME";
     };
-    Bitmap BMP_BACKING_TPLREP
-    {
-        File = "addtemplate_32.png";
-    };
     String STR_BACKING_TPLREP
     {
         Text [ en-US ] = "Get more templates for %PRODUCTNAME";
@@ -144,6 +121,22 @@ Resource RES_BACKING_IMAGES
     {
         File = "backing_rtl_right.png";
     };
+    Bitmap BMP_BACKING_EXT
+    {
+        File = "extension.png";
+    };
+    Bitmap BMP_BACKING_REG
+    {
+        File = "register_32.png";
+    };
+    Bitmap BMP_BACKING_INFO
+    {
+        File = "info_26.png";
+    };
+    Bitmap BMP_BACKING_TPLREP
+    {
+        File = "addtemplate_32.png";
+    };
 };
 
 Resource RES_BACKING_IMAGES_HC
@@ -168,6 +161,22 @@ Resource RES_BACKING_IMAGES_HC
     {
         File = "backing_rtl_right_hc.png";
     };
+    Bitmap BMP_BACKING_EXT
+    {
+        File = "extension_hc.png";
+    };
+    Bitmap BMP_BACKING_REG
+    {
+        File = "register_hc.png";
+    };
+    Bitmap BMP_BACKING_INFO
+    {
+        File = "info_hc.png";
+    };
+    Bitmap BMP_BACKING_TPLREP
+    {
+        File = "template_hc.png";
+    };
 };
 
 Window WIN_TABWINDOW
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index c34d7908d1..064c3b0ac8 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: license.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
index a7360e854e..2978d9aacf 100644
--- a/framework/source/services/makefile.mk
+++ b/framework/source/services/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 74087a50bb..f1934193c4 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediatypedetectionhelper.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx
index 30050b88fd..0fb110c3a3 100644
--- a/framework/source/services/menudocumenthandler.cxx
+++ b/framework/source/services/menudocumenthandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menudocumenthandler.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 2bb57c30ad..c6320a91c8 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modulemanager.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 8871fea734..1b619e637c 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pathsettings.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index eabcfcedf1..82e89010f6 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sessionlistener.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 3080f7cd8b..4e38983ba7 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: substitutepathvars.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 71136a9ac4..6775e6d478 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 363767e75f..869a65dc42 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: taskcreatorsrv.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index c7655f5cc5..c88cdf9e21 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uriabbreviation.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index f04827592e..8ee168bda7 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
author	Frank Schoenheit [fs] <frank.schoenheit@sun.com>	2010-04-12 20:04:24 +0200
committer	Frank Schoenheit [fs] <frank.schoenheit@sun.com>	2010-04-12 20:04:24 +0200
commit	b69204c901926a091621b92df6ff6e27f62ab8d9 (patch)
tree	c7a87e51b500b9398fc1f145aa9448a4cf77a58b /framework/source/services
parent	e761f21bb4e09c90a6ccc9d23f8e1cafb2898641 (diff)
parent	1955c30b72135397ff095ebf4712cc6db2a2c407 (diff)