diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-09-10 16:59:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:44 +0100 |
| commit | 87b5cdd5ed13f5d05fe90b11b01e3832e5725b72 (patch) | |
| tree | 3ce67b9dd7f1c9378a09b0d55bafb8d416f7d894 /sfx2 | |
| parent | 644cb58ac6ea53abab37c61e49d047eab0a1735c (diff) | |
convert writer, draw, impress, calc and starmath printer dialogs
to new-style widget layout mostly described in .ui format
Change-Id: I8ead53a246a8ac3e2d446d158f06d7e2e436ce60
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index ec88716e179d..7155eefb9ed4 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -596,6 +596,7 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow { String sModuleName = GetHelpModuleName_Impl(); String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); + fprintf(stderr, "A sHelpText %s for id %s\n", rtl::OUStringToOString(sHelpText, RTL_TEXTENCODING_UTF8).getStr(), rtl::OUStringToOString(aCommandURL, RTL_TEXTENCODING_UTF8).getStr()); rtl::OString aNewHelpId; @@ -607,6 +608,7 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow { aNewHelpId = pParent->GetHelpId(); sHelpText = pImp->GetHelpText( rtl::OStringToOUString(aNewHelpId, RTL_TEXTENCODING_UTF8), sModuleName ); + fprintf(stderr, "B sHelpText %s for id %s\n", rtl::OUStringToOString(sHelpText, RTL_TEXTENCODING_UTF8).getStr(), aNewHelpId.getStr()); if ( sHelpText.Len() > 0 ) pParent = NULL; else @@ -710,6 +712,8 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S // no URL, just a HelpID (maybe empty in case of keyword search) aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + fprintf(stderr, "C aHelpURL %s\n", rtl::OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8).getStr()); + if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { // no help found -> try with parent help id. @@ -717,15 +721,23 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S while ( pParent ) { rtl::OString aHelpId = pParent->GetHelpId(); + fprintf(stderr, "D helpid %s for %p\n", aHelpId.getStr(), pParent); aHelpURL = CreateHelpURL( rtl::OStringToOUString(aHelpId, RTL_TEXTENCODING_UTF8), aHelpModuleName ); + fprintf(stderr, "D aHelpURL %s\n", rtl::OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8).getStr()); if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + { + fprintf(stderr, "found as %s\n", rtl::OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8).getStr()); break; + } else { pParent = pParent->GetParent(); if ( !pParent ) + { + fprintf(stderr, "no more parents\n"); // create help url of start page ( helpid == 0 -> start page) aHelpURL = CreateHelpURL( String(), aHelpModuleName ); + } } } } |