diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
| commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
| tree | 7d938fd9373eb827095787955e2feffca942b8fd /sfx2/source/appl/newhelp.cxx | |
| parent | e65c0fe553a9d1b85dcacfff7af9df8231427876 (diff) | |
fix mis-merge all-around.
Diffstat (limited to 'sfx2/source/appl/newhelp.cxx')
| -rwxr-xr-x | sfx2/source/appl/newhelp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 22e964149f61..605b674e23ab 100755 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2640,8 +2640,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( IMG_HELP_TOOLBOX_COPY ) ) + ); aMenu.SetHelpId( TBI_COPY, ".uno:Copy" ); - ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3083,7 +3083,7 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG ) ::rtl::OUString sHelpURL; - BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); + bool bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); if (bComplete) sHelpURL = ::rtl::OUString(aEntry); |