Attachment #49416 for issue #70671

View | Details | Raw Unified | Return to issue 70671
Collapse All | Expand All




	// Hide the page that contains the page objects.
    SetPageVisible (FALSE);

	LocalModelHasChanged();
}



{
    if (mbModelChangedWhileModifyEnabled)
    {
		// Lock the controller
		controller::SlideSorterController::ModelChangeLock aLock( GetController() );

		// Make the controller deal with the model change
		GetController().HandleModelChange();

		LocalModelHasChanged();
		ShowSdrPage(mpPage);
    
		// Initialize everything that depends on a page view, now that we have
		// one.
		GetSdrPageView()->SetApplicationBackgroundColor(
			Application::GetSettings().GetStyleSettings().GetWindowColor());

        UpdatePageBorders();
    }
}




void SlideSorterView::LocalModelHasChanged(void) 
{
	mbModelChangedWhileModifyEnabled = false;

	// First call our base class.
	View::ModelHasChanged ();

	// Then re-set the page as current page that contains the page objects.
	ShowSdrPage(mpPage);

	// Initialize everything that depends on a page view, now that we have
	// one.
	GetSdrPageView()->SetApplicationBackgroundColor(
		Application::GetSettings().GetStyleSettings().GetWindowColor());

	UpdatePageBorders();
}




void SlideSorterView::PreModelChange (void)
{
    // Reset the slide under the mouse.  It will be set to the correct slide

Lines 150-155 Link Here

(-)old/SlideSorterView.hxx (+2 lines)
150		150
151	virtual void ModelHasChanged (void);	151	virtual void ModelHasChanged (void);
152		152
		153	void LocalModelHasChanged(void);
		154
153	/** This method is typically called before a model change takes place.	155	/** This method is typically called before a model change takes place.
154	All references to model data are released. PostModelChange() has to	156	All references to model data are released. PostModelChange() has to
155	be called to complete the handling of the model change. When the	157	be called to complete the handling of the model change. When the

Return to issue 70671

Lines 114-120 Link Here

(-)old/SlideSorterView.cxx (-13 / +27 lines)
114	// Hide the page that contains the page objects.	114	// Hide the page that contains the page objects.
115	SetPageVisible (FALSE);	115	SetPageVisible (FALSE);
116		116
117	ModelHasChanged();	117	LocalModelHasChanged();
118	}	118	}
119		119
120		120
Lines 228-253 Link Here
228	{	228	{
229	if (mbModelChangedWhileModifyEnabled)	229	if (mbModelChangedWhileModifyEnabled)
230	{	230	{
231	mbModelChangedWhileModifyEnabled = false;	231	// Lock the controller
		232	controller::SlideSorterController::ModelChangeLock aLock( GetController() );
232		233
233	// First call our base class.	234	// Make the controller deal with the model change
234	View::ModelHasChanged ();	235	GetController().HandleModelChange();
235		236
236	// Then re-set the page as current page that contains the page objects.	237	LocalModelHasChanged();
237	ShowSdrPage(mpPage);
238
239	// Initialize everything that depends on a page view, now that we have
240	// one.
241	GetSdrPageView()->SetApplicationBackgroundColor(
242	Application::GetSettings().GetStyleSettings().GetWindowColor());
243
244	UpdatePageBorders();
245	}	238	}
246	}	239	}
247		240
248		241
249		242
250		243
		244	void SlideSorterView::LocalModelHasChanged(void)
		245	{
		246	mbModelChangedWhileModifyEnabled = false;
		247
		248	// First call our base class.
		249	View::ModelHasChanged ();
		250
		251	// Then re-set the page as current page that contains the page objects.
		252	ShowSdrPage(mpPage);
		253
		254	// Initialize everything that depends on a page view, now that we have
		255	// one.
		256	GetSdrPageView()->SetApplicationBackgroundColor(
		257	Application::GetSettings().GetStyleSettings().GetWindowColor());
		258
		259	UpdatePageBorders();
		260	}
		261
		262
		263
		264
251	void SlideSorterView::PreModelChange (void)	265	void SlideSorterView::PreModelChange (void)
252	{	266	{
253	// Reset the slide under the mouse. It will be set to the correct slide	267	// Reset the slide under the mouse. It will be set to the correct slide