View | Details | Raw Unified | Return to issue 120300
Collapse All | Expand All

(-)a/main/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx (-2 / +2 lines)
Lines 99-105 using namespace ::com::sun::star::uno; Link Here
99
/*N*/ 		"Display/DrawingControl",  					//  2
99
/*N*/ 		"Display/DrawingControl",  					//  2
100
/*N*/ 		"Display/FieldCode",	   					//  3
100
/*N*/ 		"Display/FieldCode",	   					//  3
101
/*N*/ 		"Display/Note",								//  4
101
/*N*/ 		"Display/Note",								//  4
102
/*N*/         "Display/PreventTips",                      //  5
102
/*N*/         "Display/ShowContentTips",                      //  5
103
/*N*/         "NonprintingCharacter/MetaCharacters",     //   6
103
/*N*/         "NonprintingCharacter/MetaCharacters",     //   6
104
/*N*/         "NonprintingCharacter/ParagraphEnd",        //  7
104
/*N*/         "NonprintingCharacter/ParagraphEnd",        //  7
105
/*N*/         "NonprintingCharacter/OptionalHyphen",      //  8
105
/*N*/         "NonprintingCharacter/OptionalHyphen",      //  8
Lines 166-172 using namespace ::com::sun::star::uno; Link Here
166
/*N*/ 					case  2: rParent.SetDraw(bSet);    	break;// "Display/DrawingControl",
166
/*N*/ 					case  2: rParent.SetDraw(bSet);    	break;// "Display/DrawingControl",
167
/*N*/ 					case  3: rParent.SetFldName(bSet); 	break;// "Display/FieldCode",
167
/*N*/ 					case  3: rParent.SetFldName(bSet); 	break;// "Display/FieldCode",
168
/*N*/ 					case  4: rParent.SetPostIts(bSet); 	break;// "Display/Note",
168
/*N*/ 					case  4: rParent.SetPostIts(bSet); 	break;// "Display/Note",
169
/*N*/                     case  5: rParent.SetPreventTips(bSet);  break;// "Display/PreventTips",
169
/*N*/                     case  5: rParent.SetShowContentTips(bSet);  break;// "Display/ShowContentTips",
170
/*N*/                     case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
170
/*N*/                     case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
171
/*N*/                     case  7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
171
/*N*/                     case  7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
172
/*N*/                     case  8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",
172
/*N*/                     case  8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",
(-)a/main/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx (-4 / +4 lines)
Lines 144-150 enum SwViewSettingsPropertyHandles Link Here
144
	HANDLE_VIEWSET_SOLID_MARK_HANDLES,
144
	HANDLE_VIEWSET_SOLID_MARK_HANDLES,
145
	HANDLE_VIEWSET_ZOOM_TYPE,
145
	HANDLE_VIEWSET_ZOOM_TYPE,
146
	HANDLE_VIEWSET_ZOOM,
146
	HANDLE_VIEWSET_ZOOM,
147
    HANDLE_VIEWSET_PREVENT_TIPS,
147
    HANDLE_VIEWSET_SHOW_CONTENT_TIPS,
148
    HANDLE_VIEWSET_HELP_URL,
148
    HANDLE_VIEWSET_HELP_URL,
149
    HANDLE_VIEWSET_VRULER_RIGHT,
149
    HANDLE_VIEWSET_VRULER_RIGHT,
150
    HANDLE_VIEWSET_SHOW_RULER
150
    HANDLE_VIEWSET_SHOW_RULER
Lines 173-179 static ChainablePropertySetInfo * lcl_createViewSettingsInfo() Link Here
173
	{
173
	{
174
		{ RTL_CONSTASCII_STRINGPARAM ( "HelpURL" ),				HANDLE_VIEWSET_HELP_URL          	, CPPUTYPE_OUSTRING,	PROPERTY_NONE,	0},
174
		{ RTL_CONSTASCII_STRINGPARAM ( "HelpURL" ),				HANDLE_VIEWSET_HELP_URL          	, CPPUTYPE_OUSTRING,	PROPERTY_NONE,	0},
175
        { RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
175
        { RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
176
        { RTL_CONSTASCII_STRINGPARAM ( "PreventHelpTips" ),     HANDLE_VIEWSET_PREVENT_TIPS         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
176
        { RTL_CONSTASCII_STRINGPARAM ( "ShowContentTips" ),     HANDLE_VIEWSET_SHOW_CONTENT_TIPS    , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
177
        { RTL_CONSTASCII_STRINGPARAM ( "ShowAnnotations" ),     HANDLE_VIEWSET_ANNOTATIONS          , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
177
        { RTL_CONSTASCII_STRINGPARAM ( "ShowAnnotations" ),     HANDLE_VIEWSET_ANNOTATIONS          , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
178
		{ RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"),			HANDLE_VIEWSET_BREAKS               , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
178
		{ RTL_CONSTASCII_STRINGPARAM ( "ShowBreaks"),			HANDLE_VIEWSET_BREAKS               , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
179
		{ RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"),			HANDLE_VIEWSET_DRAWINGS             , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
179
		{ RTL_CONSTASCII_STRINGPARAM ( "ShowDrawings"),			HANDLE_VIEWSET_DRAWINGS             , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
Lines 681-687 void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c Link Here
681
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);    break;
681
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);    break;
682
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal);	break;
682
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal);	break;
683
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   mpViewOption->SetSolidMarkHdl(bVal);	break;
683
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   mpViewOption->SetSolidMarkHdl(bVal);	break;
684
        case  HANDLE_VIEWSET_PREVENT_TIPS :            mpViewOption->SetPreventTips(bVal); break;
684
        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal); break;
685
        break;
685
        break;
686
        case  HANDLE_VIEWSET_ZOOM                   :
686
        case  HANDLE_VIEWSET_ZOOM                   :
687
		{
687
		{
Lines 787-793 void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, : Link Here
787
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries(); break;
787
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries(); break;
788
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   bBoolVal = mpConstViewOption->IsSmoothScroll();	break;
788
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   bBoolVal = mpConstViewOption->IsSmoothScroll();	break;
789
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   bBoolVal = mpConstViewOption->IsSolidMarkHdl();	break;
789
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   bBoolVal = mpConstViewOption->IsSolidMarkHdl();	break;
790
        case  HANDLE_VIEWSET_PREVENT_TIPS :            bBoolVal = mpConstViewOption->IsPreventTips(); break;
790
        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   bBoolVal = mpConstViewOption->IsShowContentTips(); break;
791
        case  HANDLE_VIEWSET_ZOOM                   :
791
        case  HANDLE_VIEWSET_ZOOM                   :
792
				bBool = FALSE;
792
				bBool = FALSE;
793
				rValue <<= (sal_Int16)mpConstViewOption->GetZoom();
793
				rValue <<= (sal_Int16)mpConstViewOption->GetZoom();
(-)a/main/binfilter/inc/bf_sw/viewopt.hxx (-5 / +5 lines)
Lines 98-104 class SwDocShell; Link Here
98
#define VIEWOPT_2_KEEPASPECTRATIO   0x00020000L
98
#define VIEWOPT_2_KEEPASPECTRATIO   0x00020000L
99
#define VIEWOPT_2_GRFKEEPZOOM	    0x00040000L
99
#define VIEWOPT_2_GRFKEEPZOOM	    0x00040000L
100
#define VIEWOPT_2_EXECHYPERLINKS    0x00080000L
100
#define VIEWOPT_2_EXECHYPERLINKS    0x00080000L
101
#define VIEWOPT_2_PREVENT_TIPS      0x00100000L
101
#define VIEWOPT_2_CONTENT_TIPS      0x00100000L
102
#define VIEWOPT_2_RESERVED3         0x00200000L
102
#define VIEWOPT_2_RESERVED3         0x00200000L
103
#define VIEWOPT_2_RESERVED4         0x00400000L
103
#define VIEWOPT_2_RESERVED4         0x00400000L
104
#define VIEWOPT_2_PRTFORMAT         0x00800000L
104
#define VIEWOPT_2_PRTFORMAT         0x00800000L
Lines 446-453 public: Link Here
446
		{ return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE;	  }
446
		{ return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE;	  }
447
	BOOL 	IsExecHyperlinks() const
447
	BOOL 	IsExecHyperlinks() const
448
		{ return nUIOptions & VIEWOPT_2_EXECHYPERLINKS ? TRUE : FALSE; }
448
		{ return nUIOptions & VIEWOPT_2_EXECHYPERLINKS ? TRUE : FALSE; }
449
    BOOL    IsPreventTips() const
449
    BOOL    IsShowContentTips() const
450
        { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? TRUE : FALSE; }
450
        { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? TRUE : FALSE; }
451
	BOOL 	IsPrtFormat() const
451
	BOOL 	IsPrtFormat() const
452
		{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; }
452
		{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; }
453
453
Lines 465-472 public: Link Here
465
		{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); }
465
		{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); }
466
	void SetExecHyperlinks( BOOL b)
466
	void SetExecHyperlinks( BOOL b)
467
		{ b ? (nUIOptions |= VIEWOPT_2_EXECHYPERLINKS) : (nUIOptions &= ~VIEWOPT_2_EXECHYPERLINKS); }
467
		{ b ? (nUIOptions |= VIEWOPT_2_EXECHYPERLINKS) : (nUIOptions &= ~VIEWOPT_2_EXECHYPERLINKS); }
468
    void SetPreventTips( BOOL b)
468
    void SetShowContentTips( BOOL b)
469
        { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); }
469
        { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); }
470
    void SetPrtFormat( BOOL b)
470
    void SetPrtFormat( BOOL b)
471
		{ b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
471
		{ b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
472
472
(-)a/main/offapi/com/sun/star/text/ViewSettings.idl (-1 / +8 lines)
Lines 325-331 published service ViewSettings Link Here
325
     */
325
     */
326
    [optional, property] boolean ShowHiddenCharacters;
326
    [optional, property] boolean ShowHiddenCharacters;
327
    //-------------------------------------------------------------------------
327
    //-------------------------------------------------------------------------
328
    /** If this proeperty is <TRUE/>, the settings of nonprinting characters are applied.
328
    /** If this property is <TRUE/>, the settings of nonprinting characters are applied.
329
329
330
        <p>This option controls the use of the settings ShowHiddenCharacters,
330
        <p>This option controls the use of the settings ShowHiddenCharacters,
331
        ShowTabstops, ShowSpaces, ShowBreaks and ShowParaBreaks </p>
331
        ShowTabstops, ShowSpaces, ShowBreaks and ShowParaBreaks </p>
Lines 349-354 published service ViewSettings Link Here
349
        @since OOo 3.1
349
        @since OOo 3.1
350
     */
350
     */
351
    [optional, property] long VerticalRulerMetric;
351
    [optional, property] long VerticalRulerMetric;
352
    //-------------------------------------------------------------------------
353
    /** If this property is <TRUE/>, tips for document content are shown,
354
        typically in a help balloon when the mouse is over the content.
355
356
        @since Apache OpenOffice 3.5
357
     */
358
    [optional, property] boolean ShowContentTips;
352
};
359
};
353
360
354
//=============================================================================
361
//=============================================================================
(-)a/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs (-4 / +5 lines)
Lines 1095-1108 Link Here
1095
					</info>
1095
					</info>
1096
					<value>true</value>
1096
					<value>true</value>
1097
				</prop>
1097
				</prop>
1098
				<prop oor:name="PreventTips" oor:type="xs:boolean">
1098
				<prop oor:name="ShowContentTips" oor:type="xs:boolean">
1099
                    <!-- OldPath: Writer/Content/Display/PreventTips -->
1099
					<!-- UIHints: Not accessible via user interface -->
1100
					<!-- UIHints: Not accessible via user interface -->
1100
					<info>
1101
					<info>
1101
						<author>OS</author>
1102
						<author>OS</author>
1102
						<desc>Enables the writer to prevent the display of help tips programmatically.</desc>
1103
						<desc>Enables the writer to prevent the display of tips for document content programmatically.</desc>
1103
						<label>Prevent help tips</label>
1104
						<label>Show document content tips</label>
1104
					</info>
1105
					</info>
1105
					<value>false</value>
1106
					<value>true</value>
1106
				</prop>
1107
				</prop>
1107
			</group>
1108
			</group>
1108
			<group oor:name="NonprintingCharacter">
1109
			<group oor:name="NonprintingCharacter">
(-)a/main/sfx2/source/appl/newhelp.cxx (-1 / +1 lines)
Lines 3173-3179 void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL , Link Here
3173
				Reference < XPropertySet > xViewProps = xSettings->getViewSettings();
3173
				Reference < XPropertySet > xViewProps = xSettings->getViewSettings();
3174
                Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo();
3174
                Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo();
3175
				Any aBoolAny = makeAny( sal_Bool( sal_True ) );
3175
				Any aBoolAny = makeAny( sal_Bool( sal_True ) );
3176
				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("PreventHelpTips"), aBoolAny );
3176
				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowContentTips"), makeAny( sal_Bool( sal_False ) ) );
3177
				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowGraphics"), aBoolAny );
3177
				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowGraphics"), aBoolAny );
3178
				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny );
3178
				xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny );
3179
                xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:SFX2_HID_HELP_ONHELP") ) );
3179
                xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:SFX2_HID_HELP_ONHELP") ) );
(-)a/main/sw/inc/viewopt.hxx (-5 / +5 lines)
Lines 89-95 namespace svtools{ class ColorConfig;} Link Here
89
#define VIEWOPT_2_MODIFIED		    0x00010000L
89
#define VIEWOPT_2_MODIFIED		    0x00010000L
90
#define VIEWOPT_2_KEEPASPECTRATIO   0x00020000L
90
#define VIEWOPT_2_KEEPASPECTRATIO   0x00020000L
91
#define VIEWOPT_2_GRFKEEPZOOM	    0x00040000L
91
#define VIEWOPT_2_GRFKEEPZOOM	    0x00040000L
92
#define VIEWOPT_2_PREVENT_TIPS      0x00100000L
92
#define VIEWOPT_2_CONTENT_TIPS      0x00100000L
93
#define VIEWOPT_2_RESERVED3         0x00200000L
93
#define VIEWOPT_2_RESERVED3         0x00200000L
94
#define VIEWOPT_2_RESERVED4         0x00400000L
94
#define VIEWOPT_2_RESERVED4         0x00400000L
95
#define VIEWOPT_2_PRTFORMAT         0x00800000L
95
#define VIEWOPT_2_PRTFORMAT         0x00800000L
Lines 470-477 public: Link Here
470
		{ return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False;	  }
470
		{ return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False;	  }
471
	sal_Bool 	IsGrfKeepZoom()	   const
471
	sal_Bool 	IsGrfKeepZoom()	   const
472
		{ return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False;	  }
472
		{ return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False;	  }
473
    sal_Bool    IsPreventTips() const
473
    sal_Bool    IsShowContentTips() const
474
        { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? sal_True : sal_False; }
474
        { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? sal_True : sal_False; }
475
	sal_Bool 	IsPrtFormat() const
475
	sal_Bool 	IsPrtFormat() const
476
		{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; }
476
		{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; }
477
477
Lines 487-494 public: Link Here
487
		{ b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); }
487
		{ b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); }
488
	void   SetGrfKeepZoom	(sal_Bool b)
488
	void   SetGrfKeepZoom	(sal_Bool b)
489
		{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); }
489
		{ b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); }
490
    void SetPreventTips( sal_Bool b)
490
    void SetShowContentTips( sal_Bool b)
491
        { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); }
491
        { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); }
492
    void SetPrtFormat( sal_Bool b)
492
    void SetPrtFormat( sal_Bool b)
493
        { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
493
        { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
494
494
(-)a/main/sw/source/ui/config/usrpref.cxx (-3 / +3 lines)
Lines 96-102 Sequence<OUString> SwContentViewConfig::GetPropertyNames() Link Here
96
		"Display/DrawingControl",  					//  2
96
		"Display/DrawingControl",  					//  2
97
		"Display/FieldCode",	   					//  3
97
		"Display/FieldCode",	   					//  3
98
		"Display/Note",								//  4
98
		"Display/Note",								//  4
99
        "Display/PreventTips",                      //  5
99
        "Display/ShowContentTips",                      //  5
100
        "NonprintingCharacter/MetaCharacters",     //   6
100
        "NonprintingCharacter/MetaCharacters",     //   6
101
        "NonprintingCharacter/ParagraphEnd",        //  7
101
        "NonprintingCharacter/ParagraphEnd",        //  7
102
        "NonprintingCharacter/OptionalHyphen",      //  8
102
        "NonprintingCharacter/OptionalHyphen",      //  8
Lines 166-172 void SwContentViewConfig::Commit() Link Here
166
			case  2: bVal = rParent.IsDraw();    	break;// "Display/DrawingControl",
166
			case  2: bVal = rParent.IsDraw();    	break;// "Display/DrawingControl",
167
			case  3: bVal = rParent.IsFldName(); 	break;// "Display/FieldCode",
167
			case  3: bVal = rParent.IsFldName(); 	break;// "Display/FieldCode",
168
			case  4: bVal = rParent.IsPostIts(); 	break;// "Display/Note",
168
			case  4: bVal = rParent.IsPostIts(); 	break;// "Display/Note",
169
            case  5: bVal = rParent.IsPreventTips(); break; // "Display/PreventTips"
169
            case  5: bVal = rParent.IsShowContentTips(); break; // "Display/ShowContentTips"
170
            case  6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
170
            case  6: bVal = rParent.IsViewMetaChars(); break; //"NonprintingCharacter/MetaCharacters"
171
            case  7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd",
171
            case  7: bVal = rParent.IsParagraph(sal_True); break;// "NonprintingCharacter/ParagraphEnd",
172
            case  8: bVal = rParent.IsSoftHyph(); break;// "NonprintingCharacter/OptionalHyphen",
172
            case  8: bVal = rParent.IsSoftHyph(); break;// "NonprintingCharacter/OptionalHyphen",
Lines 209-215 void SwContentViewConfig::Load() Link Here
209
					case  2: rParent.SetDraw(bSet);    	break;// "Display/DrawingControl",
209
					case  2: rParent.SetDraw(bSet);    	break;// "Display/DrawingControl",
210
					case  3: rParent.SetFldName(bSet); 	break;// "Display/FieldCode",
210
					case  3: rParent.SetFldName(bSet); 	break;// "Display/FieldCode",
211
					case  4: rParent.SetPostIts(bSet); 	break;// "Display/Note",
211
					case  4: rParent.SetPostIts(bSet); 	break;// "Display/Note",
212
                    case  5: rParent.SetPreventTips(bSet);  break;// "Display/PreventTips",
212
                    case  5: rParent.SetShowContentTips(bSet);  break;// "Display/ShowContentTips",
213
                    case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
213
                    case  6: rParent.SetViewMetaChars(bSet); break; //"NonprintingCharacter/MetaCharacters"
214
                    case  7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
214
                    case  7: rParent.SetParagraph(bSet); break;// "NonprintingCharacter/ParagraphEnd",
215
                    case  8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",
215
                    case  8: rParent.SetSoftHyph(bSet); break;// "NonprintingCharacter/OptionalHyphen",
(-)a/main/sw/source/ui/docvw/edtwin2.cxx (-1 / +1 lines)
Lines 108-114 void SwEditWin::RequestHelp(const HelpEvent &rEvt) Link Here
108
{
108
{
109
    SwWrtShell &rSh = rView.GetWrtShell();
109
    SwWrtShell &rSh = rView.GetWrtShell();
110
    sal_Bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
110
    sal_Bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
111
    if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips())
111
    if(bQuickBalloon && !rSh.GetViewOptions()->IsShowContentTips())
112
        return;
112
        return;
113
    sal_Bool bWeiter = sal_True;
113
    sal_Bool bWeiter = sal_True;
114
    SET_CURR_SHELL(&rSh);
114
    SET_CURR_SHELL(&rSh);
(-)a/main/sw/source/ui/uno/unomod.cxx (-4 / +4 lines)
Lines 89-95 enum SwViewSettingsPropertyHandles Link Here
89
	HANDLE_VIEWSET_SOLID_MARK_HANDLES,
89
	HANDLE_VIEWSET_SOLID_MARK_HANDLES,
90
	HANDLE_VIEWSET_ZOOM_TYPE,
90
	HANDLE_VIEWSET_ZOOM_TYPE,
91
	HANDLE_VIEWSET_ZOOM,
91
	HANDLE_VIEWSET_ZOOM,
92
    HANDLE_VIEWSET_PREVENT_TIPS,
92
    HANDLE_VIEWSET_SHOW_CONTENT_TIPS,
93
    HANDLE_VIEWSET_HELP_URL,
93
    HANDLE_VIEWSET_HELP_URL,
94
    HANDLE_VIEWSET_VRULER_RIGHT,
94
    HANDLE_VIEWSET_VRULER_RIGHT,
95
    HANDLE_VIEWSET_SHOW_RULER,
95
    HANDLE_VIEWSET_SHOW_RULER,
Lines 133-139 static ChainablePropertySetInfo * lcl_createViewSettingsInfo() Link Here
133
        { RTL_CONSTASCII_STRINGPARAM ( "IsRasterVisible"),      HANDLE_VIEWSET_IS_RASTER_VISIBLE,       CPPUTYPE_BOOLEAN,   PROPERTY_NONE, 0},
133
        { RTL_CONSTASCII_STRINGPARAM ( "IsRasterVisible"),      HANDLE_VIEWSET_IS_RASTER_VISIBLE,       CPPUTYPE_BOOLEAN,   PROPERTY_NONE, 0},
134
        { RTL_CONSTASCII_STRINGPARAM ( "IsSnapToRaster"),       HANDLE_VIEWSET_IS_SNAP_TO_RASTER,       CPPUTYPE_BOOLEAN,   PROPERTY_NONE, 0},
134
        { RTL_CONSTASCII_STRINGPARAM ( "IsSnapToRaster"),       HANDLE_VIEWSET_IS_SNAP_TO_RASTER,       CPPUTYPE_BOOLEAN,   PROPERTY_NONE, 0},
135
        { RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
135
        { RTL_CONSTASCII_STRINGPARAM ( "IsVertRulerRightAligned"),HANDLE_VIEWSET_VRULER_RIGHT         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
136
        { RTL_CONSTASCII_STRINGPARAM ( "PreventHelpTips" ),     HANDLE_VIEWSET_PREVENT_TIPS         , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
136
        { RTL_CONSTASCII_STRINGPARAM ( "ShowContentTips" ),     HANDLE_VIEWSET_SHOW_CONTENT_TIPS      , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
137
        { RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionX"),    HANDLE_VIEWSET_RASTER_RESOLUTION_X,     CPPUTYPE_INT32,     PROPERTY_NONE, 0},
137
        { RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionX"),    HANDLE_VIEWSET_RASTER_RESOLUTION_X,     CPPUTYPE_INT32,     PROPERTY_NONE, 0},
138
        { RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionY"),    HANDLE_VIEWSET_RASTER_RESOLUTION_Y,     CPPUTYPE_INT32,     PROPERTY_NONE, 0},
138
        { RTL_CONSTASCII_STRINGPARAM ( "RasterResolutionY"),    HANDLE_VIEWSET_RASTER_RESOLUTION_Y,     CPPUTYPE_INT32,     PROPERTY_NONE, 0},
139
        { RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionX"),   HANDLE_VIEWSET_RASTER_SUBDIVISION_X,    CPPUTYPE_INT32,     PROPERTY_NONE, 0},
139
        { RTL_CONSTASCII_STRINGPARAM ( "RasterSubdivisionX"),   HANDLE_VIEWSET_RASTER_SUBDIVISION_X,    CPPUTYPE_INT32,     PROPERTY_NONE, 0},
Lines 686-692 void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c Link Here
686
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);    break;
686
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);    break;
687
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal);	break;
687
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal);	break;
688
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   mpViewOption->SetSolidMarkHdl(bVal);	break;
688
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   mpViewOption->SetSolidMarkHdl(bVal);	break;
689
        case  HANDLE_VIEWSET_PREVENT_TIPS :            mpViewOption->SetPreventTips(bVal); break;
689
        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal); break;
690
        case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : mpViewOption->SetGridVisible(bVal); break;
690
        case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : mpViewOption->SetGridVisible(bVal); break;
691
        case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : mpViewOption->SetSnap(bVal); break;
691
        case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : mpViewOption->SetSnap(bVal); break;
692
        case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :
692
        case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :
Lines 917-923 void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u Link Here
917
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries(); break;
917
        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries(); break;
918
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   bBoolVal = mpConstViewOption->IsSmoothScroll();	break;
918
		case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   bBoolVal = mpConstViewOption->IsSmoothScroll();	break;
919
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   bBoolVal = mpConstViewOption->IsSolidMarkHdl();	break;
919
		case  HANDLE_VIEWSET_SOLID_MARK_HANDLES    :   bBoolVal = mpConstViewOption->IsSolidMarkHdl();	break;
920
        case  HANDLE_VIEWSET_PREVENT_TIPS :            bBoolVal = mpConstViewOption->IsPreventTips(); break;
920
        case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   bBoolVal = mpConstViewOption->IsShowContentTips(); break;
921
        case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : bBoolVal = mpConstViewOption->IsGridVisible(); break;
921
        case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : bBoolVal = mpConstViewOption->IsGridVisible(); break;
922
        case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : bBoolVal = mpConstViewOption->IsSnap(); break;
922
        case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : bBoolVal = mpConstViewOption->IsSnap(); break;
923
        case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :
923
        case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :

Return to issue 120300