|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
From fe3ddc22e24a6815481c16e17cd1050bd91b5fe2 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
From: Michael Stahl <mstahl@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
Date: Wed, 1 Feb 2012 15:49:16 +0100
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
Subject: [PATCH 2/4] fdo#37024: SwView::SwView: fix BROWSE_MODE setting:
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
Apparently there is a check in SwDoc::SetAllUniqueFlyNames so that when
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
frames with certain anchor types are in a document, then SetLoaded()
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
is never called. Checking this flag via IsLoaded() here seems
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
unnecessary.
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
This problem was introduced with ebc5777548dea42ed966a16c66d879b1485bbfb4,
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
from CWS swlayoutrefactoring.
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
Signed-off-by: Noel Power <noel.power@novell.com>
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
---
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
sw/source/ui/uiview/view.cxx | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
index f6912af..b2c920a 100644
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
--- a/sw/source/ui/uiview/view.cxx
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
+++ b/sw/source/ui/uiview/view.cxx
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
@@ -835,7 +835,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
if( !bOldShellWasSrcView && pWebDShell && !bOldShellWasPagePreView )
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
aUsrPref.setBrowseMode( sal_True );
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
- else if( rDoc.IsLoaded() )
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
+ else
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) );
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
//Fuer den BrowseMode wollen wir keinen Factor uebernehmen.
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
--
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
1.7.7.6
|
|
![](https://seccdn.libravatar.org/avatar/458cba86a9e3c708792786cff75e0477690c6568e870645d469cf18baaf50224?s=16&d=retro) |
da68d2e |
|