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, 75 insertions, 4 deletions

diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 84746fd6510e..9b55a8247ebd 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -48,15 +48,17 @@
 #include <sfx2/bindings.hxx>
 #include <uivwimp.hxx>
 #include <avmedia/mediaplayer.hxx>
+//#include <swlinguconfig.hxx>
 #include <swmodule.hxx>
 
 #include <sfx2/objface.hxx>
 #include <navipi.hxx>
 #include <wrtsh.hxx>
-#include "doc.hxx"
+#include <edtwin.hxx>
 #include "view.hxx"
 #include "basesh.hxx"
 #include "docsh.hxx"
+#include "doc.hxx"
 #include "globals.hrc"
 #include "cmdid.h"          // FN_       ...
 #include "globdoc.hxx"
@@ -198,6 +200,46 @@ void lcl_SetViewMetaChars( SwViewOption& rVOpt, sal_Bool bOn)
     }
 }
 
+void SwView::RecheckBrowseMode()
+{
+    // OS: numerische Reihenfolge beachten!
+    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,
+            //SID_AUTOSPELL_MARKOFF,
+            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*/
+            FN_SHADOWCURSOR, /**/
+            0
+        };
+    // the view must not exist!
+    GetViewFrame()->GetBindings().Invalidate(aInva);
+    CheckVisArea();
+
+    SvxZoomType eType;
+    if( GetWrtShell().GetViewOptions()->getBrowseMode() && SVX_ZOOM_PERCENT != (eType = (SvxZoomType)
+        GetWrtShell().GetViewOptions()->GetZoomType()) )
+        SetZoom( eType );
+    InvalidateBorder();
+}
+
 /*--------------------------------------------------------------------
     State of view options
  --------------------------------------------------------------------*/
@@ -212,7 +254,6 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
     while(nWhich)
     {
         sal_Bool bReadonly = GetDocShell()->IsReadOnly();
-        sal_Bool bBrowse = pIDSA ? pIDSA->get( IDocumentSettingAccess::BROWSE_MODE ) : sal_False;
         if ( bReadonly && nWhich != FN_VIEW_GRAPHIC )
         {
             rSet.DisableItem(nWhich);
@@ -231,6 +272,15 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
                     aBool.SetValue( pOpt->IsViewAnyRuler());
             }
             break;
+            case SID_BROWSER_MODE:
+            case FN_PRINT_LAYOUT:
+            {
+                sal_Bool bState = pOpt->getBrowseMode();
+                if(FN_PRINT_LAYOUT == nWhich)
+                    bState = !bState;
+                aBool.SetValue( bState );
+            }
+            break;
             case FN_VIEW_BOUNDS:
                 aBool.SetValue( SwViewOption::IsDocBoundaries()); break;
             case FN_VIEW_GRAPHIC:
@@ -270,7 +320,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
             case FN_VLINEAL:
                 aBool.SetValue( 0 != StatVLineal() ); break;
             case FN_HSCROLLBAR:
-                if(bBrowse)
+                if( pOpt->getBrowseMode() )
                 {
                     rSet.DisableItem(nWhich);
                     nWhich = 0;
@@ -283,7 +333,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
                 aBool.SetValue( pOpt->IsOnlineSpell() );
             break;
             case FN_SHADOWCURSOR:
-                if (pIDSA == 0 || pIDSA->get( IDocumentSettingAccess::BROWSE_MODE ))
+                if (pIDSA == 0 || pOpt->getBrowseMode() )
                 {
                     rSet.DisableItem( nWhich );
                     nWhich = 0;
@@ -313,6 +363,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
 
     int eState = STATE_TOGGLE;
     sal_Bool bSet = sal_False;
+    bool bBrowseModeChanged = false;
 
     const SfxItemSet *pArgs = rReq.GetArgs();
     sal_uInt16 nSlot = rReq.GetSlot();
@@ -369,6 +420,19 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
                 pOpt->SetCrossHair( bFlag );
                 break;
 
+        case SID_BROWSER_MODE:
+        case FN_PRINT_LAYOUT:
+                if( STATE_TOGGLE == eState )
+                    bFlag = !pOpt->getBrowseMode();
+                else if( nSlot == FN_PRINT_LAYOUT )
+                    bFlag = !bFlag;
+                bBrowseModeChanged = bFlag != pOpt->getBrowseMode();
+                // Disable "multiple layout"
+                GetDocShell()->ToggleBrowserMode( bFlag, this );
+
+                pOpt->setBrowseMode( bFlag );
+                break;
+
     case FN_VIEW_NOTES:
                 if ( STATE_TOGGLE == eState )
                     bFlag = !pOpt->IsPostIts();
@@ -497,6 +561,11 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     if( !(*rSh.GetViewOptions() == *pOpt ))
     {
         rSh.ApplyViewOptions( *pOpt );
+        if( bBrowseModeChanged )
+        {
+            RecheckBrowseMode();
+            CheckVisArea();
+        }
 
         //Die UsrPref muessen als Modified gekennzeichnet werden.
         //call for initialization
@@ -517,6 +586,8 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
     const sal_Bool bLockedView = rSh.IsViewLocked();
     rSh.LockView( sal_True );    //lock visible section
     GetWrtShell().EndAction();
+    if( bBrowseModeChanged && !bFlag )
+        CalcVisArea( GetEditWin().GetOutputSizePixel() );
     rSh.LockView( bLockedView );
 
     delete pOpt;