incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1363583 - in /incubator/ooo/trunk/main: binfilter/bf_sw/source/ui/config/ binfilter/bf_sw/source/ui/uno/ binfilter/inc/bf_sw/ offapi/com/sun/star/text/ officecfg/registry/schema/org/openoffice/Office/ sfx2/source/appl/ sw/inc/ sw/source/ui...
Date Thu, 19 Jul 2012 23:32:34 GMT
Author: arielch
Date: Thu Jul 19 23:32:34 2012
New Revision: 1363583

URL: http://svn.apache.org/viewvc?rev=1363583&view=rev
Log:
#i120300# - Add new property "ShowContentTips" in com.sun.star.text.ViewSettings

Modified:
    incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
    incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
    incubator/ooo/trunk/main/binfilter/inc/bf_sw/viewopt.hxx
    incubator/ooo/trunk/main/offapi/com/sun/star/text/ViewSettings.idl
    incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
    incubator/ooo/trunk/main/sfx2/source/appl/newhelp.cxx
    incubator/ooo/trunk/main/sw/inc/viewopt.hxx
    incubator/ooo/trunk/main/sw/source/ui/config/usrpref.cxx
    incubator/ooo/trunk/main/sw/source/ui/docvw/edtwin2.cxx
    incubator/ooo/trunk/main/sw/source/ui/uno/unomod.cxx

Modified: incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx (original)
+++ incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx Thu Jul 19 23:32:34
2012
@@ -99,7 +99,7 @@ using namespace ::com::sun::star::uno;
 /*N*/ 		"Display/DrawingControl",  					//  2
 /*N*/ 		"Display/FieldCode",	   					//  3
 /*N*/ 		"Display/Note",								//  4
-/*N*/         "Display/PreventTips",                      //  5
+/*N*/         "Display/ShowContentTips",                      //  5
 /*N*/         "NonprintingCharacter/MetaCharacters",     //   6
 /*N*/         "NonprintingCharacter/ParagraphEnd",        //  7
 /*N*/         "NonprintingCharacter/OptionalHyphen",      //  8
@@ -166,7 +166,7 @@ using namespace ::com::sun::star::uno;
 /*N*/ 					case  2: rParent.SetDraw(bSet);    	break;// "Display/DrawingControl",
 /*N*/ 					case  3: rParent.SetFldName(bSet); 	break;// "Display/FieldCode",
 /*N*/ 					case  4: rParent.SetPostIts(bSet); 	break;// "Display/Note",
-/*N*/                     case  5: rParent.SetPreventTips(bSet);  break;// "Display/PreventTips",
+/*N*/                     case  5: rParent.SetShowContentTips(bSet);  break;// "Display/ShowContentTips",
 /*N*/                     case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
 /*N*/                     case  7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
 /*N*/                     case  8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",

Modified: incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx (original)
+++ incubator/ooo/trunk/main/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx Thu Jul 19 23:32:34
2012
@@ -144,7 +144,7 @@ enum SwViewSettingsPropertyHandles
 	HANDLE_VIEWSET_SOLID_MARK_HANDLES,
 	HANDLE_VIEWSET_ZOOM_TYPE,
 	HANDLE_VIEWSET_ZOOM,
-    HANDLE_VIEWSET_PREVENT_TIPS,
+    HANDLE_VIEWSET_SHOW_CONTENT_TIPS,
     HANDLE_VIEWSET_HELP_URL,
     HANDLE_VIEWSET_VRULER_RIGHT,
     HANDLE_VIEWSET_SHOW_RULER
@@ -173,7 +173,7 @@ static ChainablePropertySetInfo * lcl_cr
 	{
 		{ RTL_CONSTASCII_STRINGPARAM ( "HelpURL" ),				HANDLE_VIEWSET_HELP_URL          	, CPPUTYPE_OUSTRING,
PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT
        , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM ( "PreventHelpTips" ),     HANDLE_VIEWSET_PREVENT_TIPS
        , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+        { RTL_CONSTASCII_STRINGPARAM ( "ShowContentTips" ),     HANDLE_VIEWSET_SHOW_CONTENT_TIPS
   , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM ( "ShowAnnotations" ),     HANDLE_VIEWSET_ANNOTATIONS
         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"),			HANDLE_VIEWSET_BREAKS               , CPPUTYPE_BOOLEAN,
PROPERTY_NONE,	0},
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"),			HANDLE_VIEWSET_DRAWINGS             ,
CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
@@ -681,7 +681,7 @@ void SwXViewSettings::_setSingleValue( c
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);
   break;
 		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal);
break;
 		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   mpViewOption->SetSolidMarkHdl(bVal);
break;
-        case  HANDLE_VIEWSET_PREVENT_TIPS :            mpViewOption->SetPreventTips(bVal);
break;
+        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal);
break;
         break;
         case  HANDLE_VIEWSET_ZOOM                   :
 		{
@@ -787,7 +787,7 @@ void SwXViewSettings::_getSingleValue( c
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries();
break;
 		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   bBoolVal = mpConstViewOption->IsSmoothScroll();
break;
 		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   bBoolVal = mpConstViewOption->IsSolidMarkHdl();
break;
-        case  HANDLE_VIEWSET_PREVENT_TIPS :            bBoolVal = mpConstViewOption->IsPreventTips();
break;
+        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   bBoolVal = mpConstViewOption->IsShowContentTips();
break;
         case  HANDLE_VIEWSET_ZOOM                   :
 				bBool = FALSE;
 				rValue <<= (sal_Int16)mpConstViewOption->GetZoom();

Modified: incubator/ooo/trunk/main/binfilter/inc/bf_sw/viewopt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/inc/bf_sw/viewopt.hxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/inc/bf_sw/viewopt.hxx (original)
+++ incubator/ooo/trunk/main/binfilter/inc/bf_sw/viewopt.hxx Thu Jul 19 23:32:34 2012
@@ -98,7 +98,7 @@ class SwDocShell;
 #define VIEWOPT_2_KEEPASPECTRATIO   0x00020000L
 #define VIEWOPT_2_GRFKEEPZOOM	    0x00040000L
 #define VIEWOPT_2_EXECHYPERLINKS    0x00080000L
-#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
@@ -446,8 +446,8 @@ public:
 		{ return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE;	  }
 	BOOL 	IsExecHyperlinks() const
 		{ return nUIOptions & VIEWOPT_2_EXECHYPERLINKS ? TRUE : FALSE; }
-    BOOL    IsPreventTips() const
-        { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? TRUE : FALSE; }
+    BOOL    IsShowContentTips() const
+        { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? TRUE : FALSE; }
 	BOOL 	IsPrtFormat() const
 		{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; }
 
@@ -465,8 +465,8 @@ public:
 		{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM);
}
 	void SetExecHyperlinks( BOOL b)
 		{ b ? (nUIOptions |= VIEWOPT_2_EXECHYPERLINKS) : (nUIOptions &= ~VIEWOPT_2_EXECHYPERLINKS);
}
-    void SetPreventTips( BOOL b)
-        { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS);
}
+    void SetShowContentTips( BOOL b)
+        { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS);
}
     void SetPrtFormat( BOOL b)
 		{ b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
 

Modified: incubator/ooo/trunk/main/offapi/com/sun/star/text/ViewSettings.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/offapi/com/sun/star/text/ViewSettings.idl?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/offapi/com/sun/star/text/ViewSettings.idl (original)
+++ incubator/ooo/trunk/main/offapi/com/sun/star/text/ViewSettings.idl Thu Jul 19 23:32:34
2012
@@ -325,7 +325,7 @@ published service ViewSettings
      */
     [optional, property] boolean ShowHiddenCharacters;
     //-------------------------------------------------------------------------
-    /** If this proeperty is <TRUE/>, the settings of nonprinting characters are applied.
+    /** If this property is <TRUE/>, the settings of nonprinting characters are applied.
 
         <p>This option controls the use of the settings ShowHiddenCharacters,
         ShowTabstops, ShowSpaces, ShowBreaks and ShowParaBreaks </p>
@@ -349,6 +349,13 @@ published service ViewSettings
         @since OOo 3.1
      */
     [optional, property] long VerticalRulerMetric;
+    //-------------------------------------------------------------------------
+    /** If this property is <TRUE/>, tips for document content are shown,
+        typically in a help balloon when the mouse is over the content.
+
+        @since Apache OpenOffice 3.5
+     */
+    [optional, property] boolean ShowContentTips;
 };
 
 //=============================================================================

Modified: incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs (original)
+++ incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs Thu
Jul 19 23:32:34 2012
@@ -1095,14 +1095,15 @@
 					</info>
 					<value>true</value>
 				</prop>
-				<prop oor:name="PreventTips" oor:type="xs:boolean">
+				<prop oor:name="ShowContentTips" oor:type="xs:boolean">
+                    <!-- OldPath: Writer/Content/Display/PreventTips -->
 					<!-- UIHints: Not accessible via user interface -->
 					<info>
 						<author>OS</author>
-						<desc>Enables the writer to prevent the display of help tips programmatically.</desc>
-						<label>Prevent help tips</label>
+						<desc>Enables the writer to prevent the display of tips for document content
programmatically.</desc>
+						<label>Show document content tips</label>
 					</info>
-					<value>false</value>
+					<value>true</value>
 				</prop>
 			</group>
 			<group oor:name="NonprintingCharacter">

Modified: incubator/ooo/trunk/main/sfx2/source/appl/newhelp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/newhelp.cxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/appl/newhelp.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/appl/newhelp.cxx Thu Jul 19 23:32:34 2012
@@ -3173,7 +3173,7 @@ void SfxHelpWindow_Impl::openDone(const 
 				Reference < XPropertySet > xViewProps = xSettings->getViewSettings();
                 Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo();
 				Any aBoolAny = makeAny( sal_Bool( sal_True ) );
-				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("PreventHelpTips"), aBoolAny );
+				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowContentTips"), makeAny( sal_Bool(
sal_False ) ) );
 				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowGraphics"), aBoolAny );
 				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny );
                 xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny(
DEFINE_CONST_OUSTRING("HID:SFX2_HID_HELP_ONHELP") ) );

Modified: incubator/ooo/trunk/main/sw/inc/viewopt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/inc/viewopt.hxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/inc/viewopt.hxx (original)
+++ incubator/ooo/trunk/main/sw/inc/viewopt.hxx Thu Jul 19 23:32:34 2012
@@ -89,7 +89,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
@@ -470,8 +470,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; }
 
@@ -487,8 +487,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);
}
 

Modified: incubator/ooo/trunk/main/sw/source/ui/config/usrpref.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/config/usrpref.cxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/config/usrpref.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/ui/config/usrpref.cxx Thu Jul 19 23:32:34 2012
@@ -96,7 +96,7 @@ Sequence<OUString> SwContentViewConfig::
 		"Display/DrawingControl",  					//  2
 		"Display/FieldCode",	   					//  3
 		"Display/Note",								//  4
-        "Display/PreventTips",                      //  5
+        "Display/ShowContentTips",                      //  5
         "NonprintingCharacter/MetaCharacters",     //   6
         "NonprintingCharacter/ParagraphEnd",        //  7
         "NonprintingCharacter/OptionalHyphen",      //  8
@@ -166,7 +166,7 @@ void SwContentViewConfig::Commit()
 			case  2: bVal = rParent.IsDraw();    	break;// "Display/DrawingControl",
 			case  3: bVal = rParent.IsFldName(); 	break;// "Display/FieldCode",
 			case  4: bVal = rParent.IsPostIts(); 	break;// "Display/Note",
-            case  5: bVal = rParent.IsPreventTips(); break; // "Display/PreventTips"
+            case  5: bVal = rParent.IsShowContentTips(); break; // "Display/ShowContentTips"
             case  6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
             case  7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd",
             case  8: bVal = rParent.IsSoftHyph(); break;// "NonprintingCharacter/OptionalHyphen",
@@ -209,7 +209,7 @@ void SwContentViewConfig::Load()
 					case  2: rParent.SetDraw(bSet);    	break;// "Display/DrawingControl",
 					case  3: rParent.SetFldName(bSet); 	break;// "Display/FieldCode",
 					case  4: rParent.SetPostIts(bSet); 	break;// "Display/Note",
-                    case  5: rParent.SetPreventTips(bSet);  break;// "Display/PreventTips",
+                    case  5: rParent.SetShowContentTips(bSet);  break;// "Display/ShowContentTips",
                     case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
                     case  7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
                     case  8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",

Modified: incubator/ooo/trunk/main/sw/source/ui/docvw/edtwin2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/docvw/edtwin2.cxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/docvw/edtwin2.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/ui/docvw/edtwin2.cxx Thu Jul 19 23:32:34 2012
@@ -108,7 +108,7 @@ void SwEditWin::RequestHelp(const HelpEv
 {
     SwWrtShell &rSh = rView.GetWrtShell();
     sal_Bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON
));
-    if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips())
+    if(bQuickBalloon && !rSh.GetViewOptions()->IsShowContentTips())
         return;
     sal_Bool bWeiter = sal_True;
     SET_CURR_SHELL(&rSh);

Modified: incubator/ooo/trunk/main/sw/source/ui/uno/unomod.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/uno/unomod.cxx?rev=1363583&r1=1363582&r2=1363583&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/uno/unomod.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/ui/uno/unomod.cxx Thu Jul 19 23:32:34 2012
@@ -89,7 +89,7 @@ enum SwViewSettingsPropertyHandles
 	HANDLE_VIEWSET_SOLID_MARK_HANDLES,
 	HANDLE_VIEWSET_ZOOM_TYPE,
 	HANDLE_VIEWSET_ZOOM,
-    HANDLE_VIEWSET_PREVENT_TIPS,
+    HANDLE_VIEWSET_SHOW_CONTENT_TIPS,
     HANDLE_VIEWSET_HELP_URL,
     HANDLE_VIEWSET_VRULER_RIGHT,
     HANDLE_VIEWSET_SHOW_RULER,
@@ -133,7 +133,7 @@ static ChainablePropertySetInfo * lcl_cr
         { RTL_CONSTASCII_STRINGPARAM ( "IsRasterVisible"),      HANDLE_VIEWSET_IS_RASTER_VISIBLE,
      CPPUTYPE_BOOLEAN,   PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM ( "IsSnapToRaster"),       HANDLE_VIEWSET_IS_SNAP_TO_RASTER,
      CPPUTYPE_BOOLEAN,   PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT
        , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM ( "PreventHelpTips" ),     HANDLE_VIEWSET_PREVENT_TIPS
        , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
+        { RTL_CONSTASCII_STRINGPARAM ( "ShowContentTips" ),     HANDLE_VIEWSET_SHOW_CONTENT_TIPS
     , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionX"),    HANDLE_VIEWSET_RASTER_RESOLUTION_X,
    CPPUTYPE_INT32,     PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionY"),    HANDLE_VIEWSET_RASTER_RESOLUTION_Y,
    CPPUTYPE_INT32,     PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionX"),   HANDLE_VIEWSET_RASTER_SUBDIVISION_X,
   CPPUTYPE_INT32,     PROPERTY_NONE, 0},
@@ -686,7 +686,7 @@ void SwXViewSettings::_setSingleValue( c
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);
   break;
 		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal);
break;
 		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   mpViewOption->SetSolidMarkHdl(bVal);
break;
-        case  HANDLE_VIEWSET_PREVENT_TIPS :            mpViewOption->SetPreventTips(bVal);
break;
+        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal);
break;
         case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : mpViewOption->SetGridVisible(bVal);
break;
         case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : mpViewOption->SetSnap(bVal); break;
         case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :
@@ -917,7 +917,7 @@ void SwXViewSettings::_getSingleValue( c
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries();
break;
 		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   bBoolVal = mpConstViewOption->IsSmoothScroll();
break;
 		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   bBoolVal = mpConstViewOption->IsSolidMarkHdl();
break;
-        case  HANDLE_VIEWSET_PREVENT_TIPS :            bBoolVal = mpConstViewOption->IsPreventTips();
break;
+        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   bBoolVal = mpConstViewOption->IsShowContentTips();
break;
         case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : bBoolVal = mpConstViewOption->IsGridVisible();
break;
         case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : bBoolVal = mpConstViewOption->IsSnap();
break;
         case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :



Mime
View raw message