Skip to content

C
core
Kaydet (Commit) 74970948 authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: #i120300# Add new property "ShowContentTips"... 

in com.sun.star.text.ViewSettings

(cherry picked from commit 8c5cd0cb)

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
üst 23dadfa9
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 18 deletions
offapi/com/sun/star/text/ViewSettings.idl
Dosyayı görüntüle @ 74970948
......@@ -247,6 +247,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 LibreOffice 4.1
*/
[optional, property] boolean ShowContentTips;
};
......
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
Dosyayı görüntüle @ 74970948
......@@ -1046,13 +1046,14 @@
</info>
<value>true</value>
</prop>
<prop oor:name="PreventTips" oor:type="xs:boolean" oor:nillable="false">
<prop oor:name="ShowContentTips" oor:type="xs:boolean">
<!-- OldPath: Writer/Content/Display/PreventTips -->
<!-- UIHints: Not accessible via user interface -->
<info>
<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">
......
sfx2/source/appl/newhelp.cxx
Dosyayı görüntüle @ 74970948
......@@ -3114,7 +3114,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL ,
Reference < XPropertySet > xViewProps = xSettings->getViewSettings();
Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo();
Any aBoolAny = makeAny( sal_Bool( sal_True ) );
xViewProps->setPropertyValue( "PreventHelpTips", aBoolAny );
xViewProps->setPropertyValue( "ShowContentTips", makeAny( sal_Bool( sal_False ) ) );
xViewProps->setPropertyValue( "ShowGraphics", aBoolAny );
xViewProps->setPropertyValue( "ShowTables", aBoolAny );
xViewProps->setPropertyValue( "HelpURL", makeAny( OUString("HID:SFX2_HID_HELP_ONHELP") ) );
......
sw/inc/viewopt.hxx
Dosyayı görüntüle @ 74970948
......@@ -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); }
......
sw/source/ui/config/usrpref.cxx
Dosyayı görüntüle @ 74970948
......@@ -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",
......
sw/source/ui/docvw/edtwin2.cxx
Dosyayı görüntüle @ 74970948
......@@ -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);
......
sw/source/ui/uno/unomod.cxx
Dosyayı görüntüle @ 74970948
......@@ -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 :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment