CWS-TOOLING: integrate CWS os117

39 files changed, 201 insertions, 118 deletions

diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 5fd60a655978..df99aa0570e5 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbui.hrc,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.66.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -83,6 +83,7 @@
 #define STR_FILTER_CSV          (RC_DBUI_BEGIN + 9)
 #define STR_FILTER_ALL_DATA     (RC_DBUI_BEGIN + 10)
 #define STR_FILTER_MDB          (RC_DBUI_BEGIN + 11)
+#define STR_FILTER_ACCDB        (RC_DBUI_BEGIN + 12)
 
 // Bitmaps ------------------------------------------------------------------
 
@@ -105,6 +106,8 @@
 #define FT_CREATEDOCUMENTS  13
 #define FT_PROGRESS         14
 #define FT_COUNTING         15
+#define STR_SAVEMON         16
+#define FT_SAVING           17
 
 #define MM_PART_TITLE                   0
 #define MM_PART_FIRSTNAME               1
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 7c6eee639aa1..9ac3b02652d2 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: SwXMLTextBlocks.cxx,v $
- * $Revision: 1.39 $
+ * $Revision: 1.39.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -230,7 +230,16 @@ ULONG SwXMLTextBlocks::Rename( USHORT nIdx, const String& rNewShort, const Strin
     }
 
     if(aOldName != aPackageName)
-        xBlkRoot->renameElement ( aOldName, aPackageName );
+    {
+        try
+        {
+            xBlkRoot->renameElement ( aOldName, aPackageName );
+        }
+        catch( const container::ElementExistException& rEx )
+        {
+            (void)rEx;
+        }
+    }
     uno::Reference < embed::XTransactedObject > xTrans( xBlkRoot, uno::UNO_QUERY );
     if ( xTrans.is() )
         xTrans->commit();
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 68f4a72bbd67..0c5d257ee395 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: applab.cxx,v $
- * $Revision: 1.34 $
+ * $Revision: 1.34.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -242,12 +242,19 @@ static sal_uInt16 nBCTitleNo = 0;
         const SfxPoolItem* pFrameItem = 0;
         if(pArgs)
             pArgs->GetItemState(SID_DOCFRAME, FALSE, &pFrameItem);
-        if(!pFrameItem)
-            return ;
-        SfxFrame* pFr = ((const SfxFrameItem*)pFrameItem)->GetFrame();
-        xDocSh->PutItem(SfxBoolItem(SID_HIDDEN, TRUE));
-        pFr->InsertDocument(xDocSh);
-        SfxViewFrame *pFrame = pFr->GetCurrentViewFrame();
+
+        SfxViewFrame* pFrame = 0;
+        if( pFrameItem )
+        {
+            SfxFrame* pFr = ((const SfxFrameItem*)pFrameItem)->GetFrame();
+            xDocSh->PutItem(SfxBoolItem(SID_HIDDEN, TRUE));
+            pFr->InsertDocument(xDocSh);
+            pFrame = pFr->GetCurrentViewFrame();
+        }
+        else
+        {
+            pFrame = SfxViewFrame::CreateViewFrame( *xDocSh, 0, TRUE );
+        }
         SwView      *pNewView = (SwView*) pFrame->GetViewShell();
         pNewView->AttrChangedNotify( &pNewView->GetWrtShell() );//Damit SelectShell gerufen wird.
 
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 8e09327a9e0e..7759ae2c204d 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbmgr.cxx,v $
- * $Revision: 1.132 $
+ * $Revision: 1.132.44.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1100,6 +1100,7 @@ BOOL SwNewDBMgr::MergePrintDocuments( SwView& rView,
     USHORT nDocEnd = pConfigItem->GetPrintRangeEnd();
     DBG_ASSERT(nDocStart < nDocEnd && nDocEnd <= pConfigItem->GetMergedDocumentCount(),
             "merge print settings are not correct")
+
     for( sal_uInt32 nPrintDocument = nDocStart; nPrintDocument < nDocEnd; ++nPrintDocument)
     {
         SwDocMergeInfo& rDocInfo = pConfigItem->GetDocumentMergeInfo(nPrintDocument);
@@ -1380,7 +1381,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
 
             }
 
-            PrintMonitor aPrtMonDlg(&pSourceShell->GetView().GetEditWin());
+            PrintMonitor aPrtMonDlg(&pSourceShell->GetView().GetEditWin(), PrintMonitor::MONITOR_TYPE_PRINT);
             aPrtMonDlg.aDocName.SetText(pSourceShell->GetView().GetDocShell()->GetTitle(22));
 
             aPrtMonDlg.aCancel.SetClickHdl(LINK(this, SwNewDBMgr, PrtCancelHdl));
@@ -2636,6 +2637,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
     String sFilterCSV(SW_RES(STR_FILTER_CSV));
 #ifdef WNT
     String sFilterMDB(SW_RES(STR_FILTER_MDB));
+    String sFilterACCDB(SW_RES(STR_FILTER_ACCDB));
 #endif
     xFltMgr->appendFilter( sFilterAll, C2U("*") );
     xFltMgr->appendFilter( sFilterAllData, C2U("*.ods;*.sxc;*.dbf;*.xls;*.txt;*.csv"));
@@ -2648,6 +2650,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
     xFltMgr->appendFilter( sFilterCSV, C2U("*.csv") );
 #ifdef WNT
     xFltMgr->appendFilter( sFilterMDB, C2U("*.mdb") );
+    xFltMgr->appendFilter( sFilterACCDB, C2U("*.accdb") );
 #endif
 
     xFltMgr->setCurrentFilter( sFilterAll ) ;
@@ -2714,6 +2717,13 @@ String SwNewDBMgr::LoadAndRegisterDataSource()
             aURLAny <<= sDBURL;
             aSuppressVersionsAny <<= makeAny(true);
         }
+        else if(sExt.EqualsIgnoreCaseAscii("accdb"))
+        {
+            rtl::OUString sDBURL(C2U("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA SOURCE="));
+            sDBURL += aTempURL.PathToFileName();
+            aURLAny <<= sDBURL;
+            aSuppressVersionsAny <<= makeAny(true);
+        }
 #endif
         try
         {
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx
index 89ff032ebe8f..5590a46c1674 100644
--- a/sw/source/ui/dbui/dbui.cxx
+++ b/sw/source/ui/dbui/dbui.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbui.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,21 +45,66 @@
     Beschreibung:
 ---------------------------------------------------------------------*/
 
-PrintMonitor::PrintMonitor( Window *pParent, BOOL bEMail )
+PrintMonitor::PrintMonitor( Window *pParent, PrintMonitorType eType )
 :   ModelessDialog( pParent, SW_RES(DLG_PRINTMONITOR) ),
     aDocName    (this, SW_RES( FT_DOCNAME )),
-    aPrinting   (this, SW_RES( bEMail ? FT_SENDING : FT_PRINTING )),
+    aPrinting   (this, SW_RES(
+        eType == MONITOR_TYPE_MAIL ?
+            FT_SENDING : eType == MONITOR_TYPE_SAVE ? FT_SAVING : FT_PRINTING )),
     aPrinter    (this, SW_RES( FT_PRINTER       )),
     aPrintInfo  (this, SW_RES( FT_PRINTINFO     )),
     aCancel     (this, SW_RES( PB_CANCELPRNMON  ))
 {
-    if (bEMail)
+    switch (eType)
     {
-        SetText(SW_RES(STR_EMAILMON));
+        case MONITOR_TYPE_SAVE: SetText(SW_RES(STR_SAVEMON)); break;
+        case MONITOR_TYPE_MAIL: SetText(SW_RES(STR_EMAILMON)); break;
+        case MONITOR_TYPE_PRINT: break;
     }
     FreeResource();
 }
+/*---------------------------------------------------------------------
+
+---------------------------------------------------------------------*/
+void lcl_ResizeControl( Window* pWin, long nDiff )
+{
+    Size aSize( pWin->GetSizePixel() );
+    aSize.Width() += nDiff;
+    pWin->SetSizePixel( aSize );
+}
+void lcl_RePosControl( Window* pWin, long nDiff )
+{
+    Point aPos( pWin->GetPosPixel() );
+    aPos.X()  += nDiff;
+    pWin->SetPosPixel( aPos );
+}
+
+void PrintMonitor::ResizeControls()
+{
+    Size aDlgSize( GetSizePixel() );
+    Size aPrinterSize( aPrinter.GetSizePixel() );
+    long nPrinterTextWidth = aPrinter.GetTextWidth( aPrinter.GetText() );
+    if( nPrinterTextWidth > aPrinterSize.Width() )
+    {
+        //increase control and dialog width if printer text is too long
+        //do not increase dialog width more than three times
+        long nDiff = nPrinterTextWidth - aPrinterSize.Width();
+        if( nDiff > 2 * aDlgSize.Width() )
+        {
+            aPrinter.SetStyle( WB_RIGHT | aPrinter.GetStyle() );
+            nDiff = 2 * aDlgSize.Width();
+        }
+        aDlgSize.Width() += nDiff;
+        SetSizePixel(aDlgSize);
+        lcl_ResizeControl( &aPrinter, nDiff );
 
+        nDiff /= 2;
+        lcl_RePosControl( &aDocName, nDiff );
+        lcl_RePosControl( &aPrinting, nDiff );
+        lcl_RePosControl( &aPrintInfo, nDiff );
+        lcl_RePosControl( &aCancel, nDiff );
+    }
+}
 /*---------------------------------------------------------------------
     Progress Indicator for Creation of personalized Mail Merge documents:
 ---------------------------------------------------------------------*/
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index dedc048f6ae0..cf6929437b3f 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbui.src,v $
- * $Revision: 1.34 $
+ * $Revision: 1.34.66.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -72,96 +72,62 @@ ModelessDialog DLG_PRINTMONITOR
     SVLOOK = TRUE ;
     HIDE = TRUE ;
     OUTPUTSIZE = TRUE ;
-    _WHMAPMODE = MAP_APPFONT ;
-    _WIDTH = 118 ;
-    _HEIGHT = 72 ;
+    Size = MAP_APPFONT ( 118, 72 ) ;
     MOVEABLE = TRUE ;
     APP = FALSE ;
     FixedText FT_DOCNAME
     {
-        HIDE = FALSE ;
-        _XYMAPMODE = MAP_APPFONT ;
-        _X = 6 ;
-        _Y = 6 ;
-        _WHMAPMODE = MAP_APPFONT ;
-        _WIDTH = 100 ;
-        _HEIGHT = 8 ;
-        TEXT = "" ;
-        LEFT = FALSE ;
+        Pos = MAP_APPFONT ( 6,6 ) ;
+        Size = MAP_APPFONT ( 100, 8 ) ;
         CENTER = TRUE ;
-        RIGHT = FALSE ;
     };
     FixedText FT_PRINTING
     {
-        HIDE = FALSE ;
-        _XYMAPMODE = MAP_APPFONT ;
-        _X = 6 ;
-        _Y = 17 ;
-        _WHMAPMODE = MAP_APPFONT ;
-        _WIDTH = 100 ;
-        _HEIGHT = 8 ;
-        LEFT = FALSE ;
+        Pos = MAP_APPFONT ( 6, 17 ) ;
+        Size = MAP_APPFONT (  100, 8 ) ;
         CENTER = TRUE ;
-        RIGHT = FALSE ;
         Text [ en-US ] = "is being printed on" ;
     };
     FixedText FT_SENDING
     {
-        HIDE = FALSE ;
-        _XYMAPMODE = MAP_APPFONT ;
-        _X = 6 ;
-        _Y = 17 ;
-        _WHMAPMODE = MAP_APPFONT ;
-        _WIDTH = 100 ;
-        _HEIGHT = 8 ;
-        LEFT = FALSE ;
+        Pos = MAP_APPFONT ( 6, 17 ) ;
+        Size = MAP_APPFONT (  100, 8 ) ;
         CENTER = TRUE ;
-        RIGHT = FALSE ;
         Text [ en-US ] = "is being sent to";
     };
+    FixedText FT_SAVING
+    {
+        Pos = MAP_APPFONT ( 6, 17 ) ;
+        Size = MAP_APPFONT (  100, 8 ) ;
+        CENTER = TRUE ;
+        Text [ en-US ] = "is being saved to" ;
+    };
     FixedText FT_PRINTER
     {
-        HIDE = FALSE ;
-        _XYMAPMODE = MAP_APPFONT ;
-        _X = 6 ;
-        _Y = 28 ;
-        _WHMAPMODE = MAP_APPFONT ;
-        _WIDTH = 100 ;
-        _HEIGHT = 8 ;
-        TEXT = "" ;
-        LEFT = FALSE ;
+        Pos = MAP_APPFONT ( 6, 28 ) ;
+        Size = MAP_APPFONT (  100, 8 ) ;
         CENTER = TRUE ;
-        RIGHT = FALSE ;
     };
     FixedText FT_PRINTINFO
     {
-        HIDE = FALSE ;
-        _XYMAPMODE = MAP_APPFONT ;
-        _X = 6 ;
-        _Y = 39 ;
-        _WHMAPMODE = MAP_APPFONT ;
-        _WIDTH = 100 ;
-        _HEIGHT = 8 ;
-        TEXT = "" ;
-        LEFT = FALSE ;
+        Pos = MAP_APPFONT ( 6, 39 ) ;
+        Size = MAP_APPFONT (  100, 8 ) ;
         CENTER = TRUE ;
-        RIGHT = FALSE ;
     };
     CancelButton PB_CANCELPRNMON
     {
-        HIDE = FALSE ;
-        _XYMAPMODE = MAP_APPFONT ;
-        _X = 31 ;
-        _Y = 52 ;
-        _WHMAPMODE = MAP_APPFONT ;
-        _WIDTH = 50 ;
-        _HEIGHT = 14 ;
+        Pos = MAP_APPFONT ( 31, 52 ) ;
+        Size = MAP_APPFONT (  50, 14 ) ;
         TABSTOP = TRUE ;
     };
     String STR_EMAILMON
     {
         Text [ en-US ] = "Send-Monitor";
     };
+    String STR_SAVEMON
+    {
+        Text [ en-US ] = "Save-Monitor";
+    };
     Text [ en-US ] = "Print monitor" ;
 };
 
@@ -228,7 +194,11 @@ String STR_FILTER_CSV
 };
 String STR_FILTER_MDB
 {
-    Text = "Microsoft Access (*.mdb)" ;
+    Text [ en-US ] = "Microsoft Access (*.mdb)" ;
+};
+String STR_FILTER_ACCDB
+{
+    Text [ en-US ] = "Microsoft Access 2007 (*.accdb)" ;
 };
 
  // DLG_MM_CREATIONMONITOR ------------------------------------------------------
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 46d9efac9d6d..9c63c6d1b9b1 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mmoutputpage.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.136.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -92,10 +92,11 @@
 #include <sfx2/event.hxx>
 #include <swevent.hxx>
 #include <mmoutputpage.hrc>
+#include <dbui.hxx>
 #include <dbui.hrc>
 #include <helpid.h>
 #include <sfx2/app.hxx>
-
+#include <statstr.hrc>
 #include <unomid.h>
 
 using namespace svt;
@@ -377,6 +378,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
 #ifdef MSC
 #pragma warning (default : 4355)
 #endif
+    m_bCancelSaving( false ),
     m_pWizard(_pParent),
     m_pTempPrinter( 0 ),
     m_pDocumentPrinterCopy(0)
@@ -719,6 +721,14 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
     }
     return 0;
 }
+/*-- 17.07.2008 08:09:06---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+IMPL_LINK(SwMailMergeOutputPage, SaveCancelHdl_Impl, Button*, EMPTYARG )
+{
+    m_bCancelSaving = true;
+    return 0;
+}
 /*-- 17.05.2004 13:51:02---------------------------------------------------
 
   -----------------------------------------------------------------------*/
@@ -779,7 +789,18 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
         uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
         xStore->storeToURL( sTargetTempURL, aValues   );
 
-        for(sal_uInt32 nDoc = nBegin; nDoc < nEnd; ++nDoc)
+        SwView* pSourceView = rConfigItem.GetSourceView();
+        PrintMonitor aSaveMonitor(this, PrintMonitor::MONITOR_TYPE_SAVE);
+        aSaveMonitor.aDocName.SetText(pSourceView->GetDocShell()->GetTitle(22));
+        aSaveMonitor.aCancel.SetClickHdl(LINK(this, SwMailMergeOutputPage, SaveCancelHdl_Impl));
+        aSaveMonitor.aPrinter.SetText( INetURLObject( sPath ).getFSysPath( INetURLObject::FSYS_DETECT ) );
+        aSaveMonitor.ResizeControls();
+
+        m_bCancelSaving = false;
+        aSaveMonitor.Show();
+        m_pWizard->enableButtons(WZB_CANCEL, sal_False);
+
+        for(sal_uInt32 nDoc = nBegin; nDoc < nEnd && !m_bCancelSaving; ++nDoc)
         {
             SwDocMergeInfo& rInfo = rConfigItem.GetDocumentMergeInfo(nDoc);
             INetURLObject aURL(sPath);
@@ -791,6 +812,10 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
                 sPath += '.';
                 sPath += sExtension;
             }
+            String sStat(SW_RES(STR_STATSTR_LETTER));
+            sStat += ' ';
+            sStat += String::CreateFromInt32( nDoc );
+            aSaveMonitor.aPrintInfo.SetText(sStat);
 
             //now extract a document from the target document
             SfxObjectShellRef xTempDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
@@ -856,6 +881,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
         }
         ::osl::File::remove( sTargetTempURL );
     }
+    m_pWizard->enableButtons(WZB_CANCEL, sal_True);
     m_pWizard->enableButtons(WZB_FINISH, sal_True);
     return 0;
 }
@@ -926,7 +952,6 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
         if(nEnd > rConfigItem.GetMergedDocumentCount())
             nEnd = rConfigItem.GetMergedDocumentCount();
     }
-    SfxBoolItem aSilent( SID_SILENT, sal_True);
     rConfigItem.SetPrintRange( (USHORT)nBegin, (USHORT)nEnd );
     SwWrtShell& rSh = pTargetView->GetWrtShell();
     pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False);
@@ -940,12 +965,14 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
     SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, pObjSh));
     rSh.GetNewDBMgr()->SetMergeType( DBMGR_MERGE_DOCUMENTS );
     SfxDispatcher *pDis = pTargetView->GetViewFrame()->GetDispatcher();
-    SfxBoolItem aMergeSilent(SID_SILENT, TRUE);
+    SfxBoolItem aMergeSilent(SID_SILENT, sal_False);
+    m_pWizard->enableButtons(WZB_CANCEL, sal_False);
     pDis->Execute(SID_PRINTDOCDIRECT,
             SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aMergeSilent, 0L);
     SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, pObjSh));
 
     pTargetView->SetMailMergeConfigItem(0, 0, sal_False);
+    m_pWizard->enableButtons(WZB_CANCEL, sal_True);
     m_pWizard->enableButtons(WZB_FINISH, sal_True);
     return 0;
 }
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index a1f544ab80f7..6a02a8482416 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mmoutputpage.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -118,6 +118,8 @@ class SwMailMergeOutputPage : public svt::OWizardPage
     long            m_nFromToNFPos;
     long            m_nRBOffset;
 
+    bool            m_bCancelSaving;
+
     SwMailMergeWizard*  m_pWizard;
 
     //some dialog data
@@ -138,7 +140,7 @@ class SwMailMergeOutputPage : public svt::OWizardPage
     DECL_LINK(SendAsHdl_Impl, PushButton*);
     DECL_LINK(SendDocumentsHdl_Impl, PushButton*);
     DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*);
-
+    DECL_LINK(SaveCancelHdl_Impl, Button*);
 protected:
         virtual bool    canAdvance() const;
         virtual void    ActivatePage();
diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx
index fe8fc8cce3f9..6f8ba6e42665 100644
--- a/sw/source/ui/inc/dbui.hxx
+++ b/sw/source/ui/inc/dbui.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbui.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -38,16 +38,24 @@
 #include <vcl/fixed.hxx>
 
 
-class PrintMonitor: public ModelessDialog
+class SW_DLLPUBLIC PrintMonitor: public ModelessDialog
 {
 public:
+    enum PrintMonitorType
+    {
+        MONITOR_TYPE_PRINT,
+        MONITOR_TYPE_MAIL,
+        MONITOR_TYPE_SAVE
+    };
     FixedText       aDocName;
     FixedText       aPrinting;
     FixedText       aPrinter;
     FixedText       aPrintInfo;
     CancelButton    aCancel;
 
-    PrintMonitor( Window *pParent, BOOL bEMail = FALSE );
+    PrintMonitor( Window *pParent, PrintMonitorType eType );
+
+    void ResizeControls();
 };
 
 class CreateMonitor : public ModelessDialog
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 3cf7d885d0e8..be8c9842a9e2 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tabledlg.cxx,v $
- * $Revision: 1.35 $
+ * $Revision: 1.35.136.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -241,6 +241,8 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
         aRightMF.SetRefValue(pTblData->GetSpace());
         aLeftMF.MetricField::SetMin(0); // wird vom Percentfield ueberschrieben
         aRightMF.MetricField::SetMin(0);//                 -""-
+        aLeftMF.MetricField::SetMax(99); //
+        aRightMF.MetricField::SetMax(99);//
         aLeftMF.SetPrcntValue(aLeftMF.NormalizePercent(nLeft ), FUNIT_TWIP );
         aRightMF.SetPrcntValue(aRightMF.NormalizePercent(nRight ), FUNIT_TWIP );
     }
diff --git a/sw/uiconfig/sglobal/accelerator/de/default.xml b/sw/uiconfig/sglobal/accelerator/de/default.xml
index e8800bdf0159..b134a2a41a89 100644
--- a/sw/uiconfig/sglobal/accelerator/de/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/de/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sglobal/accelerator/en-GB/default.xml b/sw/uiconfig/sglobal/accelerator/en-GB/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/sglobal/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/en-GB/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sglobal/accelerator/en-US/default.xml b/sw/uiconfig/sglobal/accelerator/en-US/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/sglobal/accelerator/en-US/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/en-US/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sglobal/accelerator/es/default.xml b/sw/uiconfig/sglobal/accelerator/es/default.xml
index 2044b8f50187..42b11d834e20 100644
--- a/sw/uiconfig/sglobal/accelerator/es/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/es/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sglobal/accelerator/fr/default.xml b/sw/uiconfig/sglobal/accelerator/fr/default.xml
index 7e22b692d36f..4ee8b9e2a1ec 100644
--- a/sw/uiconfig/sglobal/accelerator/fr/default.xml
+++ b/sw/uiconfig/sglobal/accelerator/fr/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sweb/accelerator/de/default.xml b/sw/uiconfig/sweb/accelerator/de/default.xml
index e8800bdf0159..b134a2a41a89 100644
--- a/sw/uiconfig/sweb/accelerator/de/default.xml
+++ b/sw/uiconfig/sweb/accelerator/de/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sweb/accelerator/en-GB/default.xml b/sw/uiconfig/sweb/accelerator/en-GB/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/sweb/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/sweb/accelerator/en-GB/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sweb/accelerator/en-US/default.xml b/sw/uiconfig/sweb/accelerator/en-US/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/sweb/accelerator/en-US/default.xml
+++ b/sw/uiconfig/sweb/accelerator/en-US/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sweb/accelerator/es/default.xml b/sw/uiconfig/sweb/accelerator/es/default.xml
index 2044b8f50187..42b11d834e20 100644
--- a/sw/uiconfig/sweb/accelerator/es/default.xml
+++ b/sw/uiconfig/sweb/accelerator/es/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/sweb/accelerator/fr/default.xml b/sw/uiconfig/sweb/accelerator/fr/default.xml
index 7e22b692d36f..4ee8b9e2a1ec 100644
--- a/sw/uiconfig/sweb/accelerator/fr/default.xml
+++ b/sw/uiconfig/sweb/accelerator/fr/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swform/accelerator/de/default.xml b/sw/uiconfig/swform/accelerator/de/default.xml
index 3282d9e12059..8ac4a74fd3a3 100644
--- a/sw/uiconfig/swform/accelerator/de/default.xml
+++ b/sw/uiconfig/swform/accelerator/de/default.xml
@@ -34,7 +34,7 @@
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_F" accel:shift="true" accel:mod1="true" xlink:href=".uno:Bold"/>
   <accel:item accel:code="KEY_F10" accel:mod1="true" xlink:href=".uno:ControlCodes"/>
-  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
   <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
diff --git a/sw/uiconfig/swform/accelerator/en-US/default.xml b/sw/uiconfig/swform/accelerator/en-US/default.xml
index 5ff6ddac434d..5abee2cd7fd6 100644
--- a/sw/uiconfig/swform/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swform/accelerator/en-US/default.xml
@@ -35,7 +35,7 @@
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_F" accel:shift="true" accel:mod1="true" xlink:href=".uno:RepeatSearch"/>
   <accel:item accel:code="KEY_F10" accel:mod1="true" xlink:href=".uno:ControlCodes"/>
-  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
   <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
diff --git a/sw/uiconfig/swform/accelerator/es/default.xml b/sw/uiconfig/swform/accelerator/es/default.xml
index f9043092f2ea..db982a44d7f6 100644
--- a/sw/uiconfig/swform/accelerator/es/default.xml
+++ b/sw/uiconfig/swform/accelerator/es/default.xml
@@ -33,7 +33,7 @@
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_F" accel:shift="true" accel:mod1="true" xlink:href=".uno:RepeatSearch"/>
   <accel:item accel:code="KEY_F10" accel:mod1="true" xlink:href=".uno:ControlCodes"/>
-  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
   <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
diff --git a/sw/uiconfig/swform/accelerator/fr/default.xml b/sw/uiconfig/swform/accelerator/fr/default.xml
index 890376e7ead6..98b7eb4c0cd8 100644
--- a/sw/uiconfig/swform/accelerator/fr/default.xml
+++ b/sw/uiconfig/swform/accelerator/fr/default.xml
@@ -34,7 +34,7 @@
   <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/>
   <accel:item accel:code="KEY_F" accel:shift="true" accel:mod1="true" xlink:href=".uno:RepeatSearch"/>
   <accel:item accel:code="KEY_F10" accel:mod1="true" xlink:href=".uno:ControlCodes"/>
-  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+  <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
   <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
   <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
diff --git a/sw/uiconfig/swreport/accelerator/de/default.xml b/sw/uiconfig/swreport/accelerator/de/default.xml
index e8800bdf0159..b134a2a41a89 100644
--- a/sw/uiconfig/swreport/accelerator/de/default.xml
+++ b/sw/uiconfig/swreport/accelerator/de/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swreport/accelerator/en-GB/default.xml b/sw/uiconfig/swreport/accelerator/en-GB/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/swreport/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swreport/accelerator/en-GB/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swreport/accelerator/en-US/default.xml b/sw/uiconfig/swreport/accelerator/en-US/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/swreport/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swreport/accelerator/en-US/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swreport/accelerator/es/default.xml b/sw/uiconfig/swreport/accelerator/es/default.xml
index 2044b8f50187..42b11d834e20 100644
--- a/sw/uiconfig/swreport/accelerator/es/default.xml
+++ b/sw/uiconfig/swreport/accelerator/es/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swreport/accelerator/fr/default.xml b/sw/uiconfig/swreport/accelerator/fr/default.xml
index 7e22b692d36f..4ee8b9e2a1ec 100644
--- a/sw/uiconfig/swreport/accelerator/fr/default.xml
+++ b/sw/uiconfig/swreport/accelerator/fr/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swriter/accelerator/de/default.xml b/sw/uiconfig/swriter/accelerator/de/default.xml
index 45c786cbc656..537dccba0601 100644
--- a/sw/uiconfig/swriter/accelerator/de/default.xml
+++ b/sw/uiconfig/swriter/accelerator/de/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swriter/accelerator/en-GB/default.xml b/sw/uiconfig/swriter/accelerator/en-GB/default.xml
index 7ad8488f97f4..ca695169d5ad 100644
--- a/sw/uiconfig/swriter/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swriter/accelerator/en-GB/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swriter/accelerator/en-US/default.xml b/sw/uiconfig/swriter/accelerator/en-US/default.xml
index 7ad8488f97f4..df27dd334685 100644
--- a/sw/uiconfig/swriter/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swriter/accelerator/en-US/default.xml
@@ -3,8 +3,8 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
-    <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
+        <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_UNDO" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swriter/accelerator/es/default.xml b/sw/uiconfig/swriter/accelerator/es/default.xml
index 5a11d871e22b..e3810a85f0cb 100644
--- a/sw/uiconfig/swriter/accelerator/es/default.xml
+++ b/sw/uiconfig/swriter/accelerator/es/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swriter/accelerator/fr/default.xml b/sw/uiconfig/swriter/accelerator/fr/default.xml
index f743210ed8e3..27b26eec9f6a 100644
--- a/sw/uiconfig/swriter/accelerator/fr/default.xml
+++ b/sw/uiconfig/swriter/accelerator/fr/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swxform/accelerator/de/default.xml b/sw/uiconfig/swxform/accelerator/de/default.xml
index e8800bdf0159..b134a2a41a89 100644
--- a/sw/uiconfig/swxform/accelerator/de/default.xml
+++ b/sw/uiconfig/swxform/accelerator/de/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swxform/accelerator/en-GB/default.xml b/sw/uiconfig/swxform/accelerator/en-GB/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/swxform/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swxform/accelerator/en-GB/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swxform/accelerator/en-US/default.xml b/sw/uiconfig/swxform/accelerator/en-US/default.xml
index 4979ce6647cf..2bc37195b94c 100644
--- a/sw/uiconfig/swxform/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swxform/accelerator/en-US/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swxform/accelerator/es/default.xml b/sw/uiconfig/swxform/accelerator/es/default.xml
index 2044b8f50187..42b11d834e20 100644
--- a/sw/uiconfig/swxform/accelerator/es/default.xml
+++ b/sw/uiconfig/swxform/accelerator/es/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
diff --git a/sw/uiconfig/swxform/accelerator/fr/default.xml b/sw/uiconfig/swxform/accelerator/fr/default.xml
index 7e22b692d36f..4ee8b9e2a1ec 100644
--- a/sw/uiconfig/swxform/accelerator/fr/default.xml
+++ b/sw/uiconfig/swxform/accelerator/fr/default.xml
@@ -3,7 +3,7 @@
     <accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" xlink:href=".uno:StyleNewByExample"/>
     <accel:item accel:code="KEY_F11" accel:shift="true" accel:mod1="true" xlink:href=".uno:StyleUpdateByExample"/>
-    <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
+        <accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:ActivateStyleApply"/>
     <accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
     <accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
     <accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>