Kaydet (Commit) 01e6c68e authored tarafından Michael Meeks's avatar Michael Meeks

targetted revert of fdo#30917 - wrt. storing hierarchical view data

Change-Id: Ifffcad11e7691a8371be4e11143776f83c3608f5
üst 1227034d
...@@ -1772,10 +1772,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox ) ...@@ -1772,10 +1772,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
((StyleTreeListBox_Impl*)pTreeBox)-> ((StyleTreeListBox_Impl*)pTreeBox)->
SetDropHdl(LINK(this, SfxCommonTemplateDialog_Impl, DropHdl)); SetDropHdl(LINK(this, SfxCommonTemplateDialog_Impl, DropHdl));
pTreeBox->SetIndent(10); pTreeBox->SetIndent(10);
SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
SfxObjectShell *pDocShell = pViewFrame->GetObjectShell();
if (pDocShell)
SaveFactoryStyleFilter( pDocShell, HIERARCHICAL_FILTER_INDEX );
FillTreeBox(); FillTreeBox();
SelectStyle(aSelectEntry); SelectStyle(aSelectEntry);
pTreeBox->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST)); pTreeBox->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST));
...@@ -2263,9 +2259,6 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( ...@@ -2263,9 +2259,6 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
{ {
pDlgWindow->FreeResource(); pDlgWindow->FreeResource();
SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
pCurObjShell = pViewFrame->GetObjectShell();
sal_uInt16 nSavedFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) );
Initialize(); Initialize();
m_aActionTbL.SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, ToolBoxLSelect)); m_aActionTbL.SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, ToolBoxLSelect));
...@@ -2277,12 +2270,6 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( ...@@ -2277,12 +2270,6 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
aFont.SetWeight( WEIGHT_NORMAL ); aFont.SetWeight( WEIGHT_NORMAL );
aFilterLb.SetFont( aFont ); aFilterLb.SetFont( aFont );
m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
if( nSavedFilter == HIERARCHICAL_FILTER_INDEX )
{
bHierarchical = sal_False; // Force content refresh
aFilterLb.SelectEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)));
FilterSelectHdl(&aFilterLb);
}
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment