Merge commit 'ooo/DEV300_m103'

Conflicts:
sw/inc/calbck.hxx
sw/inc/crsrsh.hxx
sw/inc/dcontact.hxx
sw/inc/doc.hxx
sw/inc/docufld.hxx
sw/inc/editsh.hxx
sw/inc/expfld.hxx
sw/inc/fchrfmt.hxx
sw/inc/fmtcol.hxx
sw/inc/fmthdft.hxx
sw/inc/fmtpdsc.hxx
sw/inc/format.hxx
sw/inc/frmfmt.hxx
sw/inc/ndhints.hxx
sw/inc/ndtxt.hxx
sw/inc/node.hxx
sw/inc/numrule.hxx
sw/inc/paratr.hxx
sw/inc/swtable.hxx
sw/inc/unocrsr.hxx
sw/inc/unofield.hxx
sw/inc/unoframe.hxx
sw/inc/unoport.hxx
sw/inc/unostyle.hxx
sw/inc/usrfld.hxx
sw/inc/viewopt.hxx
sw/inc/viewsh.hxx
sw/source/core/access/accframebase.cxx
sw/source/core/access/accmap.cxx
sw/source/core/access/accnotextframe.cxx
sw/source/core/access/accpara.cxx
sw/source/core/access/accpara.hxx
sw/source/core/attr/calbck.cxx
sw/source/core/crsr/callnk.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/doc/acmplwrd.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/docdraw.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/fmtcol.cxx
sw/source/core/doc/htmltbl.cxx
sw/source/core/doc/number.cxx
sw/source/core/docnode/ndsect.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/docnode/node.cxx
sw/source/core/docnode/node2lay.cxx
sw/source/core/docnode/section.cxx
sw/source/core/docnode/swbaslnk.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/draw/dview.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/editsh.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/fields/authfld.cxx
sw/source/core/fields/dbfld.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/reffld.cxx
sw/source/core/fields/tblcalc.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/frmedt/feshview.cxx
sw/source/core/frmedt/tblsel.cxx
sw/source/core/inc/flyfrm.hxx
sw/source/core/inc/prevwpage.hxx
sw/source/core/inc/rolbck.hxx
sw/source/core/inc/txtfrm.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/layout/findfrm.cxx
sw/source/core/layout/flowfrm.cxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/flylay.cxx
sw/source/core/layout/frmtool.cxx
sw/source/core/layout/hffrm.cxx
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/pagedesc.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/layout/sectfrm.cxx
sw/source/core/layout/ssfrm.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/layout/wsfrm.cxx
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
sw/source/core/table/swtable.cxx
sw/source/core/text/EnhancedPDFExportHelper.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/txtdrop.cxx
sw/source/core/text/txtfly.cxx
sw/source/core/text/txtfrm.cxx
sw/source/core/text/txtio.cxx
sw/source/core/text/txttab.cxx
sw/source/core/tox/tox.cxx
sw/source/core/txtnode/atrflyin.cxx
sw/source/core/txtnode/fmtatr2.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/undo/SwUndoPageDesc.cxx
sw/source/core/undo/undraw.cxx
sw/source/core/unocore/unochart.cxx
sw/source/core/unocore/unocoll.cxx
sw/source/core/unocore/unodraw.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoftn.cxx
sw/source/core/unocore/unoidx.cxx
sw/source/core/unocore/unoobj2.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/core/unocore/unoport.cxx
sw/source/core/unocore/unoportenum.cxx
sw/source/core/unocore/unoredline.cxx
sw/source/core/unocore/unoredlines.cxx
sw/source/core/unocore/unorefmk.cxx
sw/source/core/unocore/unosect.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/core/unocore/unotbl.cxx
sw/source/core/unocore/unotext.cxx
sw/source/core/view/viewimp.cxx
sw/source/core/view/viewpg.cxx
sw/source/core/view/viewsh.cxx
sw/source/core/view/vnew.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/filter/ww8/rtfexport.hxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtww8gr.cxx
sw/source/filter/xml/XMLRedlineImportHelper.cxx
sw/source/ui/app/apphdl.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/swmodul1.cxx
sw/source/ui/config/viewopt.cxx
sw/source/ui/fldui/fldpage.cxx
sw/source/ui/uiview/srcview.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uno/unotxdoc.cxx
sw/source/ui/vba/wordvbahelper.cxx
sw/source/ui/wrtsh/wrtsh1.cxx

1 files changed, 42 insertions, 127 deletions

diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 85a7bd82f81e..b8d9593178ec 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -157,6 +157,44 @@ SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
     return pDlg;
 }
 
+// Disable "multiple layout"
+
+void    SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
+{
+    GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet );
+    UpdateFontList();
+    SwView* pTempView = _pView ? _pView : (SwView*)GetView();
+    if( pTempView )
+    {
+        pTempView->GetViewFrame()->GetBindings().Invalidate(FN_SHADOWCURSOR);
+        if( !GetDoc()->getPrinter( false ) )
+            pTempView->SetPrinter( GetDoc()->getPrinter( false ), SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP );
+        GetDoc()->CheckDefaultPageFmt();
+        SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
+        do {
+            if( pTmpFrm != pTempView->GetViewFrame() )
+            {
+                pTmpFrm->DoClose();
+                pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
+            }
+            else
+                pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False);
+
+        } while ( pTmpFrm );
+        const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions();
+        pTempView->GetWrtShell().CheckBrowseView( sal_True );
+        pTempView->CheckVisArea();
+        if( bSet )
+        {
+            const SvxZoomType eType = (SvxZoomType)rViewOptions.GetZoomType();
+            if ( SVX_ZOOM_PERCENT != eType)
+                ((SwView*)GetView())->SetZoom( eType );
+        }
+        pTempView->InvalidateBorder();
+        pTempView->SetNewWindowAllowed(!bSet);
+    }
+}
+// End of disabled "multiple layout"
 
 // update text fields on document properties changes
 void SwDocShell::DoFlushDocInfo()
@@ -655,7 +693,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                      pDocSh = (SwDocShell*)SfxObjectShell::GetNext( *pDocSh, &aType ) )
                 {
                     SwDoc* pTmp = pDocSh->GetDoc();
-                    if ( pTmp->GetRootFrm() )
+                    if ( pTmp->GetCurrentViewShell() )  //swmod 071108//swmod 071225
                         pTmp->InvalidateAutoCompleteFlag();
                 }
             }
@@ -692,11 +730,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
                 sal_uInt16 nSlotId = 0;
                 if( bSet && !bFound )   // Nothing found, so create new Preview
-                {
-                    // Don't create new one for BrowseView!
-                    if( !GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE) )
                         nSlotId = SID_VIEWSHELL1;
-                }
                 else if( bFound && !bSet )
                     nSlotId = bOnly ? SID_VIEWSHELL0 : SID_VIEWSHELL1;
 
@@ -930,6 +964,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     //pSavePrinter must not be deleted again
                 }
                 pViewFrm->GetBindings().SetState(SfxBoolItem(SID_SOURCEVIEW, nSlot == SID_VIEWSHELL2));
+                pViewFrm->GetBindings().Invalidate( SID_NEWWINDOW );
                 pViewFrm->GetBindings().Invalidate( SID_BROWSER_MODE );
                 pViewFrm->GetBindings().Invalidate( FN_PRINT_LAYOUT );
             }
@@ -1096,60 +1131,6 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 SW_MOD()->CheckSpellChanges(sal_False, sal_True, sal_True, sal_False );
             break;
 
-            case SID_BROWSER_MODE:
-            case FN_PRINT_LAYOUT:   // for Web, inverse to BrowserMode
-            {
-                int eState = STATE_TOGGLE;
-                sal_Bool bSet = sal_True;
-                const SfxPoolItem* pAttr=NULL;
-                if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , sal_False, &pAttr ))
-                {
-                    bSet = ((SfxBoolItem*)pAttr)->GetValue();
-                    if ( nWhich == FN_PRINT_LAYOUT )
-                        bSet = !bSet;
-                    eState = bSet ? STATE_ON : STATE_OFF;
-                }
-
-                if ( STATE_TOGGLE == eState )
-                    bSet = !GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE);
-
-                ToggleBrowserMode(bSet, 0);
-
-                // OS: mind the numerical order!
-                static sal_uInt16 const aInva[] =
-                                    {
-                                        SID_NEWWINDOW,/*5620*/
-                                        SID_BROWSER_MODE, /*6313*/
-                                        SID_RULER_BORDERS, SID_RULER_PAGE_POS,
-                                        SID_ATTR_LONG_LRSPACE,
-                                        SID_HTML_MODE,
-                                        SID_RULER_PROTECT,
-                                        SID_AUTOSPELL_CHECK,
-                                        FN_RULER,       /*20211*/
-                                        FN_VIEW_GRAPHIC,    /*20213*/
-                                        FN_VIEW_BOUNDS,     /**/
-                                        FN_VIEW_FIELDS,     /*20215*/
-                                        FN_VLINEAL,             /*20216*/
-                                        FN_VSCROLLBAR,      /*20217*/
-                                        FN_HSCROLLBAR,      /*20218*/
-                                        FN_VIEW_META_CHARS, /**/
-                                        FN_VIEW_MARKS,      /**/
-                                        FN_VIEW_FIELDNAME,  /**/
-                                        FN_VIEW_TABLEGRID,  /*20227*/
-                                        FN_PRINT_LAYOUT, /*20237*/
-                                        FN_QRY_MERGE,   /*20364*/
-                                        0
-                                    };
-                // the view must not exist!
-                SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst( this );
-                if( pTmpFrm )
-                    pTmpFrm->GetBindings().Invalidate( aInva );
-                if ( !pAttr )
-                    rReq.AppendItem( SfxBoolItem( nWhich, bSet ) );
-                rReq.Done();
-            }
-            break;
-
         case SID_MAIL_PREPAREEXPORT:
         {
             //pWrtShell is not set in page preview
@@ -1162,7 +1143,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 pWrtShell->EndAllAction();
         }
         break;
-          case SID_MAIL_EXPORT_FINISHED:
+
+        case SID_MAIL_EXPORT_FINISHED:
         {
                 if(pWrtShell)
                     pWrtShell->StartAllAction();
@@ -1697,73 +1679,6 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
         pDoc->ResetModified();
 }
 
-void    SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
-{
-    GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet );
-    UpdateFontList();
-    SwView* pTempView = _pView ? _pView : (SwView*)GetView();
-    if( pTempView )
-    {
-        SfxBindings& rBind = pTempView->GetViewFrame()->GetBindings();
-        rBind.Invalidate(FN_SHADOWCURSOR);
-        rBind.Invalidate(SID_BROWSER_MODE);
-        rBind.Invalidate(FN_PRINT_LAYOUT);
-
-        if( !GetDoc()->getPrinter( false ) )
-        {
-            pTempView->SetPrinter( GetDoc()->getPrinter( false ),
-                                   SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP );
-        }
-
-        // #i44963# Good occasion to check if page sizes in
-        // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
-        GetDoc()->CheckDefaultPageFmt();
-
-        // Currently there can be only one view (layout) if the document is viewed in Web layout
-        // So if there are more views we are in print layout and for toggling to Web layout all other views must be closed
-        SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
-        do {
-            if( pTmpFrm != pTempView->GetViewFrame() )
-            {
-                pTmpFrm->DoClose();
-                pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
-            }
-            else
-                pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False);
-
-        } while ( pTmpFrm );
-
-        const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions();
-
-        // set view columns before toggling:
-        if ( bSet )
-        {
-            const sal_uInt16 nColumns  = rViewOptions.GetViewLayoutColumns();
-            const bool   bBookMode = rViewOptions.IsViewLayoutBookMode();
-            if ( 1 != nColumns || bBookMode )
-            {
-                ((SwView*)GetView())->SetViewLayout( 1, false );
-            }
-        }
-
-        // Triggeres a formatting:
-        pTempView->GetWrtShell().CheckBrowseView( sal_True );
-        pTempView->CheckVisArea();
-
-        if( GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE) )
-        {
-            const SvxZoomType eType = (SvxZoomType)rViewOptions.GetZoomType();
-
-            if ( SVX_ZOOM_PERCENT != eType)
-            {
-                ((SwView*)GetView())->SetZoom( eType );
-            }
-        }
-        pTempView->InvalidateBorder();
-        pTempView->SetNewWindowAllowed(!bSet);
-    }
-}
-
 sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
                     SwgReaderOption& rOpt, sal_Bool bUnoCall )
 {