You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/01/26 18:50:48 UTC
[openoffice] branch AOO42X updated: Use nicer ASCII art, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new bd29bd9f66 Use nicer ASCII art, removed whitespace
bd29bd9f66 is described below
commit bd29bd9f66cd4c9cbc11d23f0fb682c9801282b7
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Jan 26 19:35:31 2023 +0100
Use nicer ASCII art, removed whitespace
(cherry picked from commit 15e1fb6f8be2dab068d70089d19ab118cd5fa46f)
---
main/sfx2/source/appl/sfxhelp.cxx | 1001 ++++++++++++++++++-------------------
1 file changed, 500 insertions(+), 501 deletions(-)
diff --git a/main/sfx2/source/appl/sfxhelp.cxx b/main/sfx2/source/appl/sfxhelp.cxx
index b00bce576c..0586320987 100644
--- a/main/sfx2/source/appl/sfxhelp.cxx
+++ b/main/sfx2/source/appl/sfxhelp.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,19 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
@@ -92,21 +92,21 @@ using namespace ::com::sun::star::lang;
class NoHelpErrorBox : public ErrorBox
{
public:
- NoHelpErrorBox( Window* _pParent );
+ NoHelpErrorBox( Window* _pParent );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
};
NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
- ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
+ ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
{
- // Error message: "No help available"
+ // Error message: "No help available"
}
void NoHelpErrorBox::RequestHelp( const HelpEvent& )
{
- // do nothing, because no help available
+ // do nothing, because no help available
}
// -----------------------------------------------------------------------
@@ -122,8 +122,8 @@ rtl::OUString HelpLocaleString()
Any aLocale =
::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty(
::utl::ConfigManager::LOCALE );
- aLocale >>= aLocaleStr;
- bool bOk = aLocaleStr.getLength() != 0;
+ aLocale >>= aLocaleStr;
+ bool bOk = aLocaleStr.getLength() != 0;
if ( bOk )
{
rtl::OUString aBaseInstallPath;
@@ -143,7 +143,7 @@ rtl::OUString HelpLocaleString()
if (nSepPos != STRING_NOTFOUND)
{
bOk = true;
- sLang = sLang.Copy( 0, nSepPos );
+ sLang = sLang.Copy( 0, nSepPos );
sHelpPath = aBaseInstallPath +
rtl::OUString::createFromAscii(szHelpPath) + sLang;
if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
@@ -184,10 +184,10 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
sal_Bool bRet = sal_False;
::rtl::OUString sAnchor;
- // --> OD 2009-07-01 #159496#
- // do not release solar mutex due to crash regarding accessibility
-// sal_uIntPtr nSolarCount = Application::ReleaseSolarMutex();
- // <--
+ // --> OD 2009-07-01 #159496#
+ // do not release solar mutex due to crash regarding accessibility
+// sal_uIntPtr nSolarCount = Application::ReleaseSolarMutex();
+ // <--
try
{
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
@@ -209,9 +209,9 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
catch( ::com::sun::star::uno::Exception& )
{
}
- // --> OD 2009-07-01 #159496#
-// Application::AcquireSolarMutex( nSolarCount );
- // <--
+ // --> OD 2009-07-01 #159496#
+// Application::AcquireSolarMutex( nSolarCount );
+ // <--
return bRet;
}
@@ -221,25 +221,25 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
class SfxHelpOptions_Impl : public utl::ConfigItem
{
private:
- std::set < rtl::OString > m_aIds;
+ std::set < rtl::OString > m_aIds;
public:
- SfxHelpOptions_Impl();
- ~SfxHelpOptions_Impl();
+ SfxHelpOptions_Impl();
+ ~SfxHelpOptions_Impl();
- bool HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; }
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
- virtual void Commit();
+ bool HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; }
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+ virtual void Commit();
};
static Sequence< ::rtl::OUString > GetPropertyNames()
{
static const char* aPropNames[] =
{
- "HelpAgentStarterList",
+ "HelpAgentStarterList",
};
- const int nCount = sizeof( aPropNames ) / sizeof( const char* );
+ const int nCount = sizeof( aPropNames ) / sizeof( const char* );
Sequence< ::rtl::OUString > aNames( nCount );
::rtl::OUString* pNames = aNames.getArray();
::rtl::OUString* pEnd = pNames + aNames.getLength();
@@ -253,7 +253,7 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
// -----------------------------------------------------------------------
SfxHelpOptions_Impl::SfxHelpOptions_Impl()
- : ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
+ : ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
{
Sequence< ::rtl::OUString > aNames = GetPropertyNames();
Sequence< Any > aValues = GetProperties( aNames );
@@ -269,31 +269,31 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
{
switch ( nProp )
{
- case STARTERLIST :
- {
- ::rtl::OUString aCodedList;
- if ( pValues[nProp] >>= aCodedList )
- {
- const rtl::OString aTmp( OUStringToOString( aCodedList, RTL_TEXTENCODING_UTF8 ));
- sal_Int32 nIndex = 0;
- do
- {
- rtl::OString aToken = aTmp.getToken( 0, ',', nIndex );
- if ( aToken.getLength() )
- m_aIds.insert( aToken );
- }
- while ( nIndex >= 0 );
- }
- else {
- DBG_ERRORFILE( "Wrong property type!" );
- }
-
- break;
- }
+ case STARTERLIST :
+ {
+ ::rtl::OUString aCodedList;
+ if ( pValues[nProp] >>= aCodedList )
+ {
+ const rtl::OString aTmp( OUStringToOString( aCodedList, RTL_TEXTENCODING_UTF8 ));
+ sal_Int32 nIndex = 0;
+ do
+ {
+ rtl::OString aToken = aTmp.getToken( 0, ',', nIndex );
+ if ( aToken.getLength() )
+ m_aIds.insert( aToken );
+ }
+ while ( nIndex >= 0 );
+ }
+ else {
+ DBG_ERRORFILE( "Wrong property type!" );
+ }
+
+ break;
+ }
default:
- DBG_ERRORFILE( "Wrong property!" );
- break;
+ DBG_ERRORFILE( "Wrong property!" );
+ break;
}
}
}
@@ -319,16 +319,16 @@ class SfxHelp_Impl
{
private:
sal_Bool m_bIsDebug; // environment variable "help_debug=1"
- SfxHelpOptions_Impl* m_pOpt; // the options
+ SfxHelpOptions_Impl* m_pOpt; // the options
::std::vector< ::rtl::OUString > m_aModulesList; // list of all installed modules
void Load();
public:
- SfxHelp_Impl( sal_Bool bDebug );
- ~SfxHelp_Impl();
+ SfxHelp_Impl( sal_Bool bDebug );
+ ~SfxHelp_Impl();
- SfxHelpOptions_Impl* GetOptions();
- static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
+ SfxHelpOptions_Impl* GetOptions();
+ static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed
sal_Bool IsHelpInstalled(); // module list not empty
};
@@ -336,14 +336,14 @@ public:
SfxHelp_Impl::SfxHelp_Impl( sal_Bool bDebug ) :
m_bIsDebug ( bDebug ),
- m_pOpt ( NULL )
+ m_pOpt ( NULL )
{
}
SfxHelp_Impl::~SfxHelp_Impl()
{
- delete m_pOpt;
+ delete m_pOpt;
}
void SfxHelp_Impl::Load()
@@ -374,7 +374,7 @@ void SfxHelp_Impl::Load()
String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule )
{
// create help url
- String aHelpURL = SfxHelp::CreateHelpURL( aCommandURL, rModule );
+ String aHelpURL = SfxHelp::CreateHelpURL( aCommandURL, rModule );
// added 'active' parameter
aHelpURL.Insert( String( DEFINE_CONST_UNICODE("&Active=true") ), aHelpURL.SearchBackward( '#' ) );
// load help string
@@ -384,9 +384,9 @@ String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String
SfxHelpOptions_Impl* SfxHelp_Impl::GetOptions()
{
// create if not exists
- if ( !m_pOpt )
- m_pOpt = new SfxHelpOptions_Impl;
- return m_pOpt;
+ if ( !m_pOpt )
+ m_pOpt = new SfxHelpOptions_Impl;
+ return m_pOpt;
}
sal_Bool SfxHelp_Impl::HasModule( const ::rtl::OUString& rModule )
@@ -409,199 +409,199 @@ sal_Bool SfxHelp_Impl::IsHelpInstalled()
#include <tools/stream.hxx>
void TestHids()
{
- static const char* aModules[] =
- {
- "swriter",
- "scalc",
- "simpress",
- "sdraw",
- "sdatabase",
- "smath",
- "schart",
- "sbasic"
- };
-
- SvFileStream* pOut[] =
- {
- 0,0,0,0,0,0,0,0,0
- };
-
- String aIn = String::CreateFromAscii("/data/OOo/replacer/hidsin.lst");
- String aOut = String::CreateFromAscii("/data/OOo/replacer/");
- SvFileStream aInStrm( aIn, STREAM_READ );
- ByteString aBuffer;
- while ( aInStrm.ReadLine( aBuffer ) )
- {
- ByteString aHid = aBuffer.GetToken(0, ' ');
- ByteString aNr = aBuffer.GetToken(1, ' ');
- bool bFound=false;
- for (sal_Int32 n= 0; n<8; n++)
- {
- bFound = false;
- String aHelpURL = SfxHelp::CreateHelpURL( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
- if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
- {
- if (!pOut[n])
- {
- String aTmp( aOut );
- aTmp += String( aModules[n], RTL_TEXTENCODING_UTF8 );
- aTmp += String::CreateFromAscii(".lst");
- pOut[n] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
- }
- pOut[n]->WriteLine( aHid );
- bFound = true;
- break;
- }
- }
-
- if (!bFound)
- {
- if (!pOut[8])
- {
- String aTmp( aOut );
- aTmp += String( "notfound", RTL_TEXTENCODING_UTF8 );
- aTmp += String::CreateFromAscii(".lst");
- pOut[8] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
- }
- pOut[8]->WriteLine( aHid );
- }
- }
-
- for (sal_Int32 n= 0; n<9; n++)
- DELETEZ( pOut[n] );
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "sdraw",
+ "sdatabase",
+ "smath",
+ "schart",
+ "sbasic"
+ };
+
+ SvFileStream* pOut[] =
+ {
+ 0,0,0,0,0,0,0,0,0
+ };
+
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/hidsin.lst");
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ ByteString aHid = aBuffer.GetToken(0, ' ');
+ ByteString aNr = aBuffer.GetToken(1, ' ');
+ bool bFound=false;
+ for (sal_Int32 n= 0; n<8; n++)
+ {
+ bFound = false;
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ {
+ if (!pOut[n])
+ {
+ String aTmp( aOut );
+ aTmp += String( aModules[n], RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[n] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[n]->WriteLine( aHid );
+ bFound = true;
+ break;
+ }
+ }
+
+ if (!bFound)
+ {
+ if (!pOut[8])
+ {
+ String aTmp( aOut );
+ aTmp += String( "notfound", RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[8] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[8]->WriteLine( aHid );
+ }
+ }
+
+ for (sal_Int32 n= 0; n<9; n++)
+ DELETEZ( pOut[n] );
}
void TestHids2()
{
- static const char* aModules[] =
- {
- "swriter",
- "scalc",
- "simpress",
- "smath",
- "sbasic"
- };
-
- String aOut = String::CreateFromAscii("/data/OOo/replacer/");
- aOut += String::CreateFromAscii("lost.lst");
- SvFileStream aOutStrm( aOut, STREAM_WRITE | STREAM_TRUNC );
- for (sal_Int32 n= 0; n<5; n++)
- {
- String aIn = String::CreateFromAscii("/data/OOo/replacer/help/");
- aIn += String::CreateFromAscii( aModules[n] );
- aIn += String::CreateFromAscii(".lst");
- SvFileStream aInStrm( aIn, STREAM_READ );
- ByteString aBuffer;
- while ( aInStrm.ReadLine( aBuffer ) )
- {
- String aHelpURL = SfxHelp::CreateHelpURL( String( aBuffer, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
- if ( SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
- aOutStrm.WriteLine( aBuffer );
- }
- }
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "smath",
+ "sbasic"
+ };
+
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/");
+ aOut += String::CreateFromAscii("lost.lst");
+ SvFileStream aOutStrm( aOut, STREAM_WRITE | STREAM_TRUNC );
+ for (sal_Int32 n= 0; n<5; n++)
+ {
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/help/");
+ aIn += String::CreateFromAscii( aModules[n] );
+ aIn += String::CreateFromAscii(".lst");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aBuffer, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ aOutStrm.WriteLine( aBuffer );
+ }
+ }
}
#include <tools/stream.hxx>
void TestHids3()
{
- static const char* aModules[] =
- {
- "swriter",
- "scalc",
- "simpress",
- "sdraw",
- "sdatabase",
- "smath",
- "schart",
- "sbasic"
- };
-
- SvFileStream* pOut[] =
- {
- 0,0,0,0,0,0,0,0,0
- };
-
- String aIn = String::CreateFromAscii("/data/OOo/replacer/hidsin.lst");
- String aOut = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
- SvFileStream aInStrm( aIn, STREAM_READ );
- ByteString aBuffer;
- while ( aInStrm.ReadLine( aBuffer ) )
- {
- ByteString aHid = aBuffer.GetToken(0, ' ');
- ByteString aNr = aBuffer.GetToken(1, ' ');
- bool bFound=false;
- for (sal_Int32 n= 0; n<8; n++)
- {
- bFound = false;
- String aHelpURL = SfxHelp::CreateHelpURL( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
- if ( SfxContentHelper::GetActiveHelpString( aHelpURL ).Len() )
-// if ( SfxHelp_Impl::GetHelpText( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) ).Len() )
- {
- if (!pOut[n])
- {
- String aTmp( aOut );
- aTmp += String( aModules[n], RTL_TEXTENCODING_UTF8 );
- aTmp += String::CreateFromAscii(".lst");
- pOut[n] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
- }
- pOut[n]->WriteLine( aHid );
- bFound = true;
- break;
- }
- }
-
- if (!bFound)
- {
- if (!pOut[8])
- {
- String aTmp( aOut );
- aTmp += String( "notfound", RTL_TEXTENCODING_UTF8 );
- aTmp += String::CreateFromAscii(".lst");
- pOut[8] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
- }
- pOut[8]->WriteLine( aHid );
- }
- }
-
- for (sal_Int32 n= 0; n<9; n++)
- DELETEZ( pOut[n] );
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "sdraw",
+ "sdatabase",
+ "smath",
+ "schart",
+ "sbasic"
+ };
+
+ SvFileStream* pOut[] =
+ {
+ 0,0,0,0,0,0,0,0,0
+ };
+
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/hidsin.lst");
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ ByteString aHid = aBuffer.GetToken(0, ' ');
+ ByteString aNr = aBuffer.GetToken(1, ' ');
+ bool bFound=false;
+ for (sal_Int32 n= 0; n<8; n++)
+ {
+ bFound = false;
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( SfxContentHelper::GetActiveHelpString( aHelpURL ).Len() )
+// if ( SfxHelp_Impl::GetHelpText( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) ).Len() )
+ {
+ if (!pOut[n])
+ {
+ String aTmp( aOut );
+ aTmp += String( aModules[n], RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[n] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[n]->WriteLine( aHid );
+ bFound = true;
+ break;
+ }
+ }
+
+ if (!bFound)
+ {
+ if (!pOut[8])
+ {
+ String aTmp( aOut );
+ aTmp += String( "notfound", RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[8] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[8]->WriteLine( aHid );
+ }
+ }
+
+ for (sal_Int32 n= 0; n<9; n++)
+ DELETEZ( pOut[n] );
}
void TestHids4()
{
- static const char* aModules[] =
- {
- "swriter",
- "scalc",
- "simpress",
- "smath",
- "sbasic"
- };
-
- String aOut = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
- aOut += String::CreateFromAscii("lost.lst");
- SvFileStream aOutStrm( aOut, STREAM_WRITE | STREAM_TRUNC );
- for (sal_Int32 n= 0; n<5; n++)
- {
- String aIn = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
- aIn += String::CreateFromAscii( aModules[n] );
- aIn += String::CreateFromAscii(".lst");
- SvFileStream aInStrm( aIn, STREAM_READ );
- ByteString aBuffer;
- while ( aInStrm.ReadLine( aBuffer ) )
- {
- String aHelpURL = SfxHelp::CreateHelpURL( String( aBuffer, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
- if ( !SfxContentHelper::GetActiveHelpString( aHelpURL ).Len() )
- aOutStrm.WriteLine( aBuffer );
- }
- }
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "smath",
+ "sbasic"
+ };
+
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
+ aOut += String::CreateFromAscii("lost.lst");
+ SvFileStream aOutStrm( aOut, STREAM_WRITE | STREAM_TRUNC );
+ for (sal_Int32 n= 0; n<5; n++)
+ {
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
+ aIn += String::CreateFromAscii( aModules[n] );
+ aIn += String::CreateFromAscii(".lst");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aBuffer, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( !SfxContentHelper::GetActiveHelpString( aHelpURL ).Len() )
+ aOutStrm.WriteLine( aBuffer );
+ }
+ }
}
*/
SfxHelp::SfxHelp() :
bIsDebug( sal_False ),
- pImp ( NULL )
+ pImp ( NULL )
{
// read the environment variable "HELP_DEBUG"
@@ -615,186 +615,186 @@ SfxHelp::SfxHelp() :
pImp = new SfxHelp_Impl( bIsDebug );
- ::rtl::OUString aLocaleStr = HelpLocaleString();
-
- sal_Int32 nSepPos = aLocaleStr.indexOf( '_' );
- if ( nSepPos != -1 )
- {
- aLanguageStr = aLocaleStr.copy( 0, nSepPos );
- aCountryStr = aLocaleStr.copy( nSepPos+1 );
- }
- else
- {
- nSepPos = aLocaleStr.indexOf( '-' );
- if ( nSepPos != -1 )
- {
- aLanguageStr = aLocaleStr.copy( 0, nSepPos );
- aCountryStr = aLocaleStr.copy( nSepPos+1 );
- }
- else
- {
- aLanguageStr = aLocaleStr;
- }
- }
+ ::rtl::OUString aLocaleStr = HelpLocaleString();
+
+ sal_Int32 nSepPos = aLocaleStr.indexOf( '_' );
+ if ( nSepPos != -1 )
+ {
+ aLanguageStr = aLocaleStr.copy( 0, nSepPos );
+ aCountryStr = aLocaleStr.copy( nSepPos+1 );
+ }
+ else
+ {
+ nSepPos = aLocaleStr.indexOf( '-' );
+ if ( nSepPos != -1 )
+ {
+ aLanguageStr = aLocaleStr.copy( 0, nSepPos );
+ aCountryStr = aLocaleStr.copy( nSepPos+1 );
+ }
+ else
+ {
+ aLanguageStr = aLocaleStr;
+ }
+ }
}
SfxHelp::~SfxHelp()
{
- delete pImp;
+ delete pImp;
}
::rtl::OUString getDefaultModule_Impl()
{
- rtl::OUString sDefaultModule;
- SvtModuleOptions aModOpt;
- if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
- sDefaultModule = DEFINE_CONST_UNICODE("swriter");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
- sDefaultModule = DEFINE_CONST_UNICODE("scalc");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
- sDefaultModule = DEFINE_CONST_UNICODE("simpress");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
- sDefaultModule = DEFINE_CONST_UNICODE("sdraw");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
- sDefaultModule = DEFINE_CONST_UNICODE("smath");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) )
- sDefaultModule = DEFINE_CONST_UNICODE("schart");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) )
- sDefaultModule = DEFINE_CONST_UNICODE("sbasic");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
- sDefaultModule = DEFINE_CONST_UNICODE("sdatabase");
- else
- {
- DBG_ERRORFILE( "getDefaultModule_Impl(): no module installed" );
- }
- return sDefaultModule;
+ rtl::OUString sDefaultModule;
+ SvtModuleOptions aModOpt;
+ if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("swriter");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("scalc");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("simpress");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("sdraw");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("smath");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("schart");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("sbasic");
+ else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
+ sDefaultModule = DEFINE_CONST_UNICODE("sdatabase");
+ else
+ {
+ DBG_ERRORFILE( "getDefaultModule_Impl(): no module installed" );
+ }
+ return sDefaultModule;
}
::rtl::OUString getCurrentModuleIdentifier_Impl()
{
- ::rtl::OUString sIdentifier;
- Reference < XFrame > xCurrentFrame;
- Reference < XModuleManager > xModuleManager( ::comphelper::getProcessServiceFactory()->createInstance(
- DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), UNO_QUERY );
- Reference < XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
- DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
- if ( xDesktop.is() )
- xCurrentFrame = xDesktop->getCurrentFrame();
-
- if ( xCurrentFrame.is() && xModuleManager.is() )
- {
- try
- {
- sIdentifier = xModuleManager->identify( xCurrentFrame );
- }
- catch ( ::com::sun::star::frame::UnknownModuleException& )
- {
- DBG_WARNING( "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" );
- }
- catch ( Exception& )
- {
- DBG_ERRORFILE( "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" );
- }
- }
-
- return sIdentifier;
+ ::rtl::OUString sIdentifier;
+ Reference < XFrame > xCurrentFrame;
+ Reference < XModuleManager > xModuleManager( ::comphelper::getProcessServiceFactory()->createInstance(
+ DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), UNO_QUERY );
+ Reference < XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
+ DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
+ if ( xDesktop.is() )
+ xCurrentFrame = xDesktop->getCurrentFrame();
+
+ if ( xCurrentFrame.is() && xModuleManager.is() )
+ {
+ try
+ {
+ sIdentifier = xModuleManager->identify( xCurrentFrame );
+ }
+ catch ( ::com::sun::star::frame::UnknownModuleException& )
+ {
+ DBG_WARNING( "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" );
+ }
+ catch ( Exception& )
+ {
+ DBG_ERRORFILE( "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" );
+ }
+ }
+
+ return sIdentifier;
}
String SfxHelp::GetHelpModuleName_Impl()
{
- String sModuleName;
- rtl::OUString aFactoryShortName;
- rtl::OUString aModuleIdentifier = getCurrentModuleIdentifier_Impl();
-
- if ( aModuleIdentifier.getLength() > 0 )
- {
- try
- {
- Reference < XModuleManager > xModuleManager(
- ::comphelper::getProcessServiceFactory()->createInstance(
- DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), UNO_QUERY );
- Sequence< PropertyValue > lProps;
- Reference< ::com::sun::star::container::XNameAccess > xCont( xModuleManager, UNO_QUERY);
- if ( xCont.is() )
- xCont->getByName( aModuleIdentifier ) >>= lProps;
- for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
- {
- if ( lProps[i].Name.equalsAscii("ooSetupFactoryShortName") )
- {
- lProps[i].Value >>= aFactoryShortName;
- break;
- }
- }
- }
- catch ( Exception& )
- {
- DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" );
- }
- }
-
- rtl::OUString sDefaultModule = getDefaultModule_Impl();
- if ( aFactoryShortName.getLength() > 0 )
- {
- // Map some module identifiers to their "real" help module string.
- if ( aFactoryShortName.equalsAscii( "chart2" ) )
- aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "schart" ) );
- else if ( aFactoryShortName.equalsAscii( "BasicIDE" ) )
- aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sbasic" ) );
- else if ( aFactoryShortName.equalsAscii( "sweb" )
- || aFactoryShortName.equalsAscii( "sglobal" )
- || aFactoryShortName.equalsAscii( "swxform" ) )
- aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" ) );
- else if ( aFactoryShortName.equalsAscii( "dbquery" )
- || aFactoryShortName.equalsAscii( "dbbrowser" )
- || aFactoryShortName.equalsAscii( "dbrelation" )
- || aFactoryShortName.equalsAscii( "dbtable" )
- || aFactoryShortName.equalsAscii( "dbapp" )
- || aFactoryShortName.equalsAscii( "dbreport" )
- || aFactoryShortName.equalsAscii( "swreport" )
- || aFactoryShortName.equalsAscii( "dbbrowser" )
- || aFactoryShortName.equalsAscii( "swform" ) )
- aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sdatabase" ) );
- else if ( aFactoryShortName.equalsAscii( "sbibliography" )
- || aFactoryShortName.equalsAscii( "StartModule" ) )
- aFactoryShortName = sDefaultModule;
- }
- else
- aFactoryShortName = sDefaultModule;
-
- sModuleName = String( aFactoryShortName );
- return sModuleName;
+ String sModuleName;
+ rtl::OUString aFactoryShortName;
+ rtl::OUString aModuleIdentifier = getCurrentModuleIdentifier_Impl();
+
+ if ( aModuleIdentifier.getLength() > 0 )
+ {
+ try
+ {
+ Reference < XModuleManager > xModuleManager(
+ ::comphelper::getProcessServiceFactory()->createInstance(
+ DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), UNO_QUERY );
+ Sequence< PropertyValue > lProps;
+ Reference< ::com::sun::star::container::XNameAccess > xCont( xModuleManager, UNO_QUERY);
+ if ( xCont.is() )
+ xCont->getByName( aModuleIdentifier ) >>= lProps;
+ for ( sal_Int32 i = 0; i < lProps.getLength(); ++i )
+ {
+ if ( lProps[i].Name.equalsAscii("ooSetupFactoryShortName") )
+ {
+ lProps[i].Value >>= aFactoryShortName;
+ break;
+ }
+ }
+ }
+ catch ( Exception& )
+ {
+ DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" );
+ }
+ }
+
+ rtl::OUString sDefaultModule = getDefaultModule_Impl();
+ if ( aFactoryShortName.getLength() > 0 )
+ {
+ // Map some module identifiers to their "real" help module string.
+ if ( aFactoryShortName.equalsAscii( "chart2" ) )
+ aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "schart" ) );
+ else if ( aFactoryShortName.equalsAscii( "BasicIDE" ) )
+ aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sbasic" ) );
+ else if ( aFactoryShortName.equalsAscii( "sweb" )
+ || aFactoryShortName.equalsAscii( "sglobal" )
+ || aFactoryShortName.equalsAscii( "swxform" ) )
+ aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" ) );
+ else if ( aFactoryShortName.equalsAscii( "dbquery" )
+ || aFactoryShortName.equalsAscii( "dbbrowser" )
+ || aFactoryShortName.equalsAscii( "dbrelation" )
+ || aFactoryShortName.equalsAscii( "dbtable" )
+ || aFactoryShortName.equalsAscii( "dbapp" )
+ || aFactoryShortName.equalsAscii( "dbreport" )
+ || aFactoryShortName.equalsAscii( "swreport" )
+ || aFactoryShortName.equalsAscii( "dbbrowser" )
+ || aFactoryShortName.equalsAscii( "swform" ) )
+ aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sdatabase" ) );
+ else if ( aFactoryShortName.equalsAscii( "sbibliography" )
+ || aFactoryShortName.equalsAscii( "StartModule" ) )
+ aFactoryShortName = sDefaultModule;
+ }
+ else
+ aFactoryShortName = sDefaultModule;
+
+ sModuleName = String( aFactoryShortName );
+ return sModuleName;
}
String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName )
{
// build up the help URL
- String aHelpURL;
+ String aHelpURL;
sal_Bool bHasAnchor = sal_False;
String aAnchor;
String aModuleName( rModuleName );
if ( aModuleName.Len() == 0 )
- aModuleName = getDefaultModule_Impl();
+ aModuleName = getDefaultModule_Impl();
- aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
- aHelpURL += aModuleName;
+ aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
+ aHelpURL += aModuleName;
- if ( !aCommandURL.Len() )
- aHelpURL += String::CreateFromAscii("/start");
- else
- {
- aHelpURL += '/';
- aHelpURL += String( rtl::Uri::encode( aCommandURL,
- rtl_UriCharClassRelSegment,
- rtl_UriEncodeKeepEscapes,
- RTL_TEXTENCODING_UTF8 ));
+ if ( !aCommandURL.Len() )
+ aHelpURL += String::CreateFromAscii("/start");
+ else
+ {
+ aHelpURL += '/';
+ aHelpURL += String( rtl::Uri::encode( aCommandURL,
+ rtl_UriCharClassRelSegment,
+ rtl_UriEncodeKeepEscapes,
+ RTL_TEXTENCODING_UTF8 ));
String aTempURL = aHelpURL;
- AppendConfigToken_Impl( aTempURL, sal_True );
+ AppendConfigToken_Impl( aTempURL, sal_True );
bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor );
}
- AppendConfigToken_Impl( aHelpURL, sal_True );
+ AppendConfigToken_Impl( aHelpURL, sal_True );
if ( bHasAnchor )
{
@@ -802,66 +802,66 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo
aHelpURL += aAnchor;
}
- return aHelpURL;
+ return aHelpURL;
}
-SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask ,
- Reference< XFrame >& rHelpContent)
+SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask ,
+ Reference< XFrame >& rHelpContent)
{
- Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
+ Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
- // otherwise - create new help task
- Reference< XFrame > xHelpTask = xDesktop->findFrame(
- ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")),
- FrameSearchFlag::TASKS | FrameSearchFlag::CREATE);
- if (!xHelpTask.is())
- return 0;
-
- // create all internal windows and sub frames ...
- Reference< ::com::sun::star::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow();
- Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
- SfxHelpWindow_Impl* pHelpWindow = new SfxHelpWindow_Impl( xHelpTask, pParentWindow, WB_DOCKBORDER );
- Reference< ::com::sun::star::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow );
-
- Reference< XFrame > xHelpContent;
- if (xHelpTask->setComponent( xHelpWindow, Reference< XController >() ))
- {
- // Customize UI ...
- xHelpTask->setName( ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")) );
-
- Reference< XPropertySet > xProps(xHelpTask, UNO_QUERY);
- if (xProps.is())
- xProps->setPropertyValue(
- DEFINE_CONST_UNICODE("Title"),
- makeAny(::rtl::OUString(String(SfxResId(STR_HELP_WINDOW_TITLE)))));
-
- pHelpWindow->setContainerWindow( xParentWindow );
- xParentWindow->setVisible(sal_True);
- xHelpWindow->setVisible(sal_True);
-
- // This sub frame is created internally (if we called new SfxHelpWindow_Impl() ...)
- // It should exist :-)
- xHelpContent = xHelpTask->findFrame(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")), FrameSearchFlag::CHILDREN);
- }
-
- if (!xHelpContent.is())
- {
- delete pHelpWindow;
- return NULL;
- }
-
- xHelpContent->setName(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")));
-
- rHelpTask = xHelpTask;
- rHelpContent = xHelpContent;
- return pHelpWindow;
+ // otherwise - create new help task
+ Reference< XFrame > xHelpTask = xDesktop->findFrame(
+ ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")),
+ FrameSearchFlag::TASKS | FrameSearchFlag::CREATE);
+ if (!xHelpTask.is())
+ return 0;
+
+ // create all internal windows and sub frames ...
+ Reference< ::com::sun::star::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow();
+ Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
+ SfxHelpWindow_Impl* pHelpWindow = new SfxHelpWindow_Impl( xHelpTask, pParentWindow, WB_DOCKBORDER );
+ Reference< ::com::sun::star::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow );
+
+ Reference< XFrame > xHelpContent;
+ if (xHelpTask->setComponent( xHelpWindow, Reference< XController >() ))
+ {
+ // Customize UI ...
+ xHelpTask->setName( ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")) );
+
+ Reference< XPropertySet > xProps(xHelpTask, UNO_QUERY);
+ if (xProps.is())
+ xProps->setPropertyValue(
+ DEFINE_CONST_UNICODE("Title"),
+ makeAny(::rtl::OUString(String(SfxResId(STR_HELP_WINDOW_TITLE)))));
+
+ pHelpWindow->setContainerWindow( xParentWindow );
+ xParentWindow->setVisible(sal_True);
+ xHelpWindow->setVisible(sal_True);
+
+ // This sub frame is created internally (if we called new SfxHelpWindow_Impl() ...)
+ // It should exist :-)
+ xHelpContent = xHelpTask->findFrame(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")), FrameSearchFlag::CHILDREN);
+ }
+
+ if (!xHelpContent.is())
+ {
+ delete pHelpWindow;
+ return NULL;
+ }
+
+ xHelpContent->setName(::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")));
+
+ rHelpTask = xHelpTask;
+ rHelpContent = xHelpContent;
+ return pHelpWindow;
}
XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow )
-{
- String sModuleName = GetHelpModuleName_Impl();
- String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
+{
+ String sModuleName = GetHelpModuleName_Impl();
+ String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
ByteString aNewHelpId;
@@ -883,21 +883,21 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow
aNewHelpId.Erase();
}
- // add some debug information?
- if ( bIsDebug )
- {
- sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
- sHelpText += String( sModuleName );
- sHelpText += DEFINE_CONST_UNICODE(": ");
- sHelpText += aCommandURL;
+ // add some debug information?
+ if ( bIsDebug )
+ {
+ sHelpText += DEFINE_CONST_UNICODE("\n_____________\n");
+ sHelpText += String( sModuleName );
+ sHelpText += DEFINE_CONST_UNICODE(": ");
+ sHelpText += aCommandURL;
if ( aNewHelpId.Len() )
{
sHelpText += DEFINE_CONST_UNICODE(" - ");
sHelpText += String( aNewHelpId, RTL_TEXTENCODING_UTF8 );
}
- }
+ }
- return sHelpText;
+ return sHelpText;
}
sal_Bool SfxHelp::SearchKeyword( const XubString& rKeyword )
@@ -907,37 +907,37 @@ sal_Bool SfxHelp::SearchKeyword( const XubString& rKeyword )
sal_Bool SfxHelp::Start( const String& rURL, const Window* pWindow )
{
- return Start_Impl( rURL, pWindow, String() );
+ return Start_Impl( rURL, pWindow, String() );
}
sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword )
{
- // check if help is available
- String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
- AppendConfigToken_Impl( aHelpRootURL, sal_True );
- Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
- if ( 0 == aFactories.getLength() )
- {
- // no factories -> no help -> error message and return
- NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
- aErrBox.Execute();
- return sal_False;
- }
-
- /* rURL may be
+ // check if help is available
+ String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
+ AppendConfigToken_Impl( aHelpRootURL, sal_True );
+ Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
+ if ( 0 == aFactories.getLength() )
+ {
+ // no factories -> no help -> error message and return
+ NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
+ aErrBox.Execute();
+ return sal_False;
+ }
+
+ /* rURL may be
- a "real" URL
- a HelpID (formerly a long, now a string)
If rURL is a URL, CreateHelpURL should be called for this URL
If rURL is an arbitrary string, the same should happen, but the URL should be tried out
- if it delivers real help content. In case only the Help Error Document is returned, the
+ if it delivers real help content. In case only the Help Error Document is returned, the
parent of the window for that help was called, is asked for its HelpID.
For compatibility reasons this upward search is not implemented for "real" URLs.
- Help keyword search now is implemented as own method; in former versions it
+ Help keyword search now is implemented as own method; in former versions it
was done via Help::Start, but this implementation conflicted with the upward search.
*/
String aHelpURL;
INetURLObject aParser( rURL );
- INetProtocol nProtocol = aParser.GetProtocol();
+ INetProtocol nProtocol = aParser.GetProtocol();
String aHelpModuleName( GetHelpModuleName_Impl() );
switch ( nProtocol )
{
@@ -948,7 +948,7 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S
default:
{
// no URL, just a HelpID (maybe empty in case of keyword search)
- aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName );
+ aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName );
if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
{
// no help found -> try with parent help id.
@@ -972,43 +972,43 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S
}
}
- Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
+ Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
- // check if help window is still open
- // If not, create a new one and return access directly to the internal sub frame showing the help content
- // search must be done here; search one desktop level could return an arbitraty frame
- Reference< XFrame > xHelp = xDesktop->findFrame(
- ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")),
- FrameSearchFlag::CHILDREN);
- Reference< XFrame > xHelpContent = xDesktop->findFrame(
- ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")),
- FrameSearchFlag::CHILDREN);
-
- SfxHelpWindow_Impl* pHelpWindow = 0;
- if (!xHelp.is())
- pHelpWindow = impl_createHelp(xHelp, xHelpContent);
- else
- pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow());
- if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
- return sal_False;
+ // check if help window is still open
+ // If not, create a new one and return access directly to the internal sub frame showing the help content
+ // search must be done here; search one desktop level could return an arbitrary frame
+ Reference< XFrame > xHelp = xDesktop->findFrame(
+ ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")),
+ FrameSearchFlag::CHILDREN);
+ Reference< XFrame > xHelpContent = xDesktop->findFrame(
+ ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP")),
+ FrameSearchFlag::CHILDREN);
+
+ SfxHelpWindow_Impl* pHelpWindow = 0;
+ if (!xHelp.is())
+ pHelpWindow = impl_createHelp(xHelp, xHelpContent);
+ else
+ pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow());
+ if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
+ return sal_False;
#ifdef DBG_UTIL
- ByteString aTmp("SfxHelp: HelpId = ");
- aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 );
- DBG_TRACE( aTmp.GetBuffer() );
+ ByteString aTmp("SfxHelp: HelpId = ");
+ aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 );
+ DBG_TRACE( aTmp.GetBuffer() );
#endif
- pHelpWindow->SetHelpURL( aHelpURL );
- pHelpWindow->loadHelpContent(aHelpURL);
- if ( rKeyword.Len() )
+ pHelpWindow->SetHelpURL( aHelpURL );
+ pHelpWindow->loadHelpContent(aHelpURL);
+ if ( rKeyword.Len() )
pHelpWindow->OpenKeyword( rKeyword );
Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY );
- if ( xTopWindow.is() )
- xTopWindow->toFront();
+ if ( xTopWindow.is() )
+ xTopWindow->toFront();
- return sal_True;
+ return sal_True;
}
String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName )
@@ -1032,16 +1032,16 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
{
SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
- if ( !pOpt->HasId( sHelpId ) )
- return;
+ if ( !pOpt->HasId( sHelpId ) )
+ return;
try
{
URL aURL;
- aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() );
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
+ aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY );
- xTrans->parseStrict(aURL);
+ xTrans->parseStrict(aURL);
Reference < XFrame > xCurrentFrame;
Reference < XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
@@ -1049,31 +1049,30 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
if ( xDesktop.is() )
xCurrentFrame = xDesktop->getCurrentFrame();
- Reference< XDispatchProvider > xDispProv( xCurrentFrame, UNO_QUERY );
+ Reference< XDispatchProvider > xDispProv( xCurrentFrame, UNO_QUERY );
Reference< XDispatch > xHelpDispatch;
if ( xDispProv.is() )
xHelpDispatch = xDispProv->queryDispatch(
aURL, ::rtl::OUString::createFromAscii("_helpagent"),
FrameSearchFlag::PARENT | FrameSearchFlag::SELF );
- DBG_ASSERT( xHelpDispatch.is(), "OpenHelpAgent: could not get a dispatcher!" );
+ DBG_ASSERT( xHelpDispatch.is(), "OpenHelpAgent: could not get a dispatcher!" );
if ( xHelpDispatch.is() )
xHelpDispatch->dispatch( aURL, Sequence< PropertyValue >() );
}
catch( const Exception& )
{
- DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
+ DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
}
}
}
String SfxHelp::GetDefaultHelpModule()
{
- return getDefaultModule_Impl();
+ return getDefaultModule_Impl();
}
::rtl::OUString SfxHelp::GetCurrentModuleIdentifier()
{
- return getCurrentModuleIdentifier_Impl();
+ return getCurrentModuleIdentifier_Impl();
}
-