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/source | |
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/source')
-rw-r--r-- | sw/source/ui/config/usrpref.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/unomod.cxx | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index 286ca229d6c5..2a58f61c941c 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -83,7 +83,7 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() "Display/DrawingControl", // 2 "Display/FieldCode", // 3 "Display/Note", // 4 - "Display/PreventTips", // 5 + "Display/ShowContentTips", // 5 "NonprintingCharacter/MetaCharacters", // 6 "NonprintingCharacter/ParagraphEnd", // 7 "NonprintingCharacter/OptionalHyphen", // 8 @@ -145,7 +145,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", @@ -186,7 +186,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", diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 2b028864b4d2..eb97eedcda99 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -98,7 +98,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) { SwWrtShell &rSh = m_rView.GetWrtShell(); bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON )); - if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips()) + if(bQuickBalloon && !rSh.GetViewOptions()->IsShowContentTips()) return; bool bWeiter = true; SET_CURR_SHELL(&rSh); diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index d194ccfbe164..54423f655422 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -77,7 +77,7 @@ enum SwViewSettingsPropertyHandles HANDLE_VIEWSET_SMOOTH_SCROLLING, 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, @@ -122,7 +122,7 @@ static ChainablePropertySetInfo * lcl_createViewSettingsInfo() { 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}, @@ -638,7 +638,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, sal_True); break; case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(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 : @@ -865,7 +865,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = SwViewOption::IsTableBoundaries(); break; case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = SwViewOption::IsDocBoundaries(); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); 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 : |