[ooo-build-commit] .: sw/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Sep 30 07:21:40 PDT 2010


 sw/source/ui/docvw/romenu.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 32bf07e007d951e7a5bde231b82e0ddd5d76310b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 30 15:21:28 2010 +0100

    #i113322# sw: && || ambiguity in romenu.cxx

diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index b412c7a..7ebe4f1 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -238,9 +238,13 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
         EnableItem( MN_READONLY_COPY, FALSE );
 
     eState = pVFrame->GetBindings().QueryState( SID_EDITDOC, pState );
-    if(eState < SFX_ITEM_DEFAULT ||
-        rSh.IsGlobalDoc() && rView.GetDocShell()->IsReadOnlyUI())
+    if (
+        eState < SFX_ITEM_DEFAULT ||
+        (rSh.IsGlobalDoc() && rView.GetDocShell()->IsReadOnlyUI())
+       )
+    {
         EnableItem( MN_READONLY_EDITDOC, FALSE );
+    }
 
     if ( !sURL.Len() )
     {


More information about the ooo-build-commit mailing list