diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:05:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:05:22 +0000 |
| commit | 23aa0e0900952d8ae263830f15ca63681b90d8c7 (patch) | |
| tree | 49caa24a05afc32f4d3c8d084d34a9a6629505da /sfx2 | |
| parent | de223cc9ae27c55246831a6a9584c6350fd41656 (diff) | |
INTEGRATION: CWS fwk86 (1.127.198); FILE MERGED
2008/04/30 15:47:31 pb 1.127.198.2: RESYNC: (1.127-1.129); FILE MERGED
2008/04/07 10:37:04 pb 1.127.198.1: fix: #i87677# SwViewProp 'IsExecuteHyperlinks' was removed
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index deb00e8ccef4..5051f71ab78e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: newhelp.cxx,v $ - * $Revision: 1.129 $ + * $Revision: 1.130 $ * * This file is part of OpenOffice.org. * @@ -3178,12 +3178,15 @@ void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL , { Reference < XViewSettingsSupplier > xSettings( xController, UNO_QUERY ); 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("ShowGraphics"), aBoolAny ); xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny ); xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:68245") ) ); - xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("IsExecuteHyperlinks"), aBoolAny ); + ::rtl::OUString sProperty( DEFINE_CONST_OUSTRING("IsExecuteHyperlinks") ); + if ( xInfo->hasPropertyByName( sProperty ) ) + xViewProps->setPropertyValue( sProperty, aBoolAny ); xController->restoreViewData(pHelpInterceptor->GetViewData()); } } |