[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - sw/qa sw/source

[Noel Power]

 sw/qa/unoapi/knownissues.xcl |    3 ---
 sw/source/ui/uiview/view.cxx |    2 +-
 sw/source/ui/uno/unomod.cxx  |    7 +++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 7fcb1bb88d0809c64ac4be2aa95a96a883e55af8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 12 12:19:54 2011 +0200

    fs34b: #i117545# (patch provided by mathias.bauer at oracle.com)
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index fd32cc5..ff33fcf 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -748,8 +748,13 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
                 aOpt.setBrowseMode( bVal );
                 pView->GetWrtShell().ApplyViewOptions( aOpt );
                 pView->RecheckBrowseMode();
+
+                // must be set in mpViewOption as this will overwrite settings in _post!
                 if(mpViewOption)
                     mpViewOption->setBrowseMode(bVal);
+
+                // disable multiple layout
+                pView->GetDocShell()->ToggleBrowserMode(bVal, pView );
             }
         }
         break;
commit 1f5f826f54684f8f19e69408cffa04cf25b5ad72
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Feb 7 17:15:03 2012 +0000

    fdo#35661: fix sw.SwXViewSettings::com::sun::star::text::ViewSettings
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/sw/qa/unoapi/knownissues.xcl b/sw/qa/unoapi/knownissues.xcl
index 3cea081..a9315fe 100644
--- a/sw/qa/unoapi/knownissues.xcl
+++ b/sw/qa/unoapi/knownissues.xcl
@@ -188,8 +188,5 @@ sw.SwXTextViewCursor::com::sun::star::view::XScreenCursor
 ### fd#35660 ###
 sw.DocumentSettings::com::sun::star::text::PrintSettings
 
-### fd#35661 ###
-sw.SwXViewSettings::com::sun::star::text::ViewSettings
-
 ### fd#35662 ###
 sw.SwXPrintSettings::com::sun::star::text::PrintSettings
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index 8139a07..fd32cc5 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -748,6 +748,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
                 aOpt.setBrowseMode( bVal );
                 pView->GetWrtShell().ApplyViewOptions( aOpt );
                 pView->RecheckBrowseMode();
+                if(mpViewOption)
+                    mpViewOption->setBrowseMode(bVal);
             }
         }
         break;
commit fe3ddc22e24a6815481c16e17cd1050bd91b5fe2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 1 15:49:16 2012 +0100

    fdo#37024: SwView::SwView: fix BROWSE_MODE setting:
    
    Apparently there is a check in SwDoc::SetAllUniqueFlyNames so that when
    frames with certain anchor types are in a document, then SetLoaded()
    is never called.  Checking this flag via IsLoaded() here seems
    unnecessary.
    This problem was introduced with ebc5777548dea42ed966a16c66d879b1485bbfb4,
    from CWS swlayoutrefactoring.
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index f6912af..b2c920a 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -835,7 +835,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
 
         if( !bOldShellWasSrcView && pWebDShell && !bOldShellWasPagePreView )
             aUsrPref.setBrowseMode( sal_True );
-        else if( rDoc.IsLoaded() )
+        else
             aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) );
 
         //Fuer den BrowseMode wollen wir keinen Factor uebernehmen.