diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 10:09:28 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 10:09:28 +0000 |
commit | a2c0449f0c0c0013886ef27225ed22b06305a6e6 (patch) | |
tree | 5e8709ee38b9decfecd9feac4f68879cfe254cc0 | |
parent | b1e66d1cae9cf15e3738b64d6000ed7d507cced5 (diff) |
INTEGRATION: CWS pb17 (1.42.160); FILE MERGED
2006/07/25 08:28:50 pb 1.42.160.1: fix: #i67363# no rulers on preview doc
-rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 25d3b8f73518..e1165e7f4b5f 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewshe2.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: kz $ $Date: 2006-02-01 18:41:35 $ + * last change: $Author: ihi $ $Date: 2006-08-04 11:09:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1127,7 +1127,7 @@ void ViewShell::WriteUserData(String& rString) void ViewShell::SetRuler(BOOL bRuler) { - mbHasRulers = bRuler; + mbHasRulers = ( bRuler && !GetDocSh()->IsPreview() ); // no rulers on preview mode if (mpHorizontalRuler.get() != NULL) { |