diff options
Diffstat (limited to 'sfx2/source/appl/newhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 09268a375e6c..3e39f645395c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -296,7 +296,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId ) ContentListBox_Impl::~ContentListBox_Impl() { sal_uInt16 nPos = 0; - SvLBoxEntry* pEntry = GetEntry( nPos++ ); + SvTreeListEntry* pEntry = GetEntry( nPos++ ); while ( pEntry ) { ::rtl::OUString aTemp( GetEntryText( pEntry ) ); @@ -325,7 +325,7 @@ void ContentListBox_Impl::InitRoot() aURL = aRow.GetToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); sal_Bool bIsFolder = ( '1' == cFolder ); - SvLBoxEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True ); + SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True ); if ( bIsFolder ) pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) ); } @@ -333,9 +333,9 @@ void ContentListBox_Impl::InitRoot() // ----------------------------------------------------------------------- -void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent ) +void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) { - SvLBoxEntry* pEntry = FirstChild( pParent ); + SvTreeListEntry* pEntry = FirstChild( pParent ); while ( pEntry ) { ::rtl::OUString aTemp( GetEntryText( pEntry ) ); @@ -347,7 +347,7 @@ void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent ) // ----------------------------------------------------------------------- -void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent ) +void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { try { @@ -370,7 +370,7 @@ void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent ) aURL = aRow.GetToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); sal_Bool bIsFolder = ( '1' == cFolder ); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( bIsFolder ) { pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, sal_True ); @@ -414,7 +414,7 @@ long ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) String ContentListBox_Impl::GetSelectEntry() const { String aRet; - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( pEntry && !( (ContentEntry_Impl*)pEntry->GetUserData() )->bIsFolder ) aRet = ( (ContentEntry_Impl*)pEntry->GetUserData() )->aURL; return aRet; @@ -2170,7 +2170,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { sCurrentFactory = SfxHelp::GetCurrentModuleIdentifier(); - Reference< XMultiServiceFactory > xMultiServiceFac = ::comphelper::getProcessServiceFactory(); + Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInterface > xConfig; ::rtl::OUString sPath( PATH_OFFICE_FACTORIES ); sPath += sCurrentFactory; @@ -2185,7 +2185,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) try { xConfiguration = ConfigurationHelper::openConfig( - xMultiServiceFac, PACKAGE_SETUP, ConfigurationHelper::E_STANDARD ); + xContext, PACKAGE_SETUP, ConfigurationHelper::E_STANDARD ); if ( xConfiguration.is() ) { Any aAny = ConfigurationHelper::readRelativeKey( xConfiguration, sPath, sKey ); |