diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-07-19 22:32:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-18 14:26:15 +0100 |
| commit | 74970948bbd410278964bd02cb5741c6c87eb30d (patch) | |
| tree | 3c21d5f09c33847f9b2ab438bba11a4ab60b0e0d /sw/inc | |
| parent | 23dadfa9d3770c346d49b9d0941766abf3d96e67 (diff) | |
Resolves: #i120300# Add new property "ShowContentTips"...
in com.sun.star.text.ViewSettings
(cherry picked from commit 8c5cd0cbad918949f898d7fccb4f1a00a8a9f5f5)
Conflicts:
offapi/com/sun/star/text/ViewSettings.idl
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
sfx2/source/appl/newhelp.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/uno/unomod.cxx
Change-Id: Ia03bea5c7a81efbf1f3f40e8299168887140fe40
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/viewopt.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index a306bcfd2f46..f13e6c52e1b7 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -83,7 +83,7 @@ namespace svtools{ class ColorConfig;} #define VIEWOPT_2_MODIFIED 0x00010000L #define VIEWOPT_2_KEEPASPECTRATIO 0x00020000L #define VIEWOPT_2_GRFKEEPZOOM 0x00040000L -#define VIEWOPT_2_PREVENT_TIPS 0x00100000L +#define VIEWOPT_2_CONTENT_TIPS 0x00100000L #define VIEWOPT_2_RESERVED3 0x00200000L #define VIEWOPT_2_RESERVED4 0x00400000L #define VIEWOPT_2_PRTFORMAT 0x00800000L @@ -464,8 +464,8 @@ public: { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False; } sal_Bool IsGrfKeepZoom() const { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False; } - sal_Bool IsPreventTips() const - { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? sal_True : sal_False; } + sal_Bool IsShowContentTips() const + { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? sal_True : sal_False; } sal_Bool IsPrtFormat() const { return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; } @@ -481,8 +481,8 @@ public: { b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); } void SetGrfKeepZoom (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); } - void SetPreventTips( sal_Bool b) - { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); } + void SetShowContentTips( sal_Bool b) + { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); } void SetPrtFormat( sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } |