kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 2 Packages Projects 9 Releases 2 Wiki Activity

Gui: Optimize ViewProviderDocumentObject::getDocument()

Browse Source
This commit is contained in:
wmayer
2020-07-20 13:10:27 +02:00
parent 51585ac4a1
commit aff2e5a76d
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Gui/ViewProviderDocumentObject.cpp
View File

@@ -69,8 +69,8 @@ using namespace Gui;
PROPERTY_SOURCE(Gui::ViewProviderDocumentObject, Gui::ViewProvider)
ViewProviderDocumentObject::ViewProviderDocumentObject()
: pcObject(0)
, pcDocument(0)
: pcObject(nullptr)
, pcDocument(nullptr)
{
ADD_PROPERTY(DisplayMode,((long)0));
ADD_PROPERTY(Visibility,(true));
@@ -194,7 +194,9 @@ void ViewProviderDocumentObject::onChanged(const App::Property* prop)
// this is undesired behaviour. So, if this change marks the document as
// modified then it must be be reversed.
if (!testStatus(Gui::ViewStatus::TouchDocument)) {
bool mod = pcDocument->isModified();
bool mod = false;
if (pcDocument)
mod = pcDocument->isModified();
getObject()->Visibility.setValue(Visibility.getValue());
if (pcDocument)
pcDocument->setModified(mod);
@@ -333,8 +335,13 @@ Gui::Document* ViewProviderDocumentObject::getDocument() const
{
if(!pcObject)
throw Base::RuntimeError("View provider detached");
App::Document* pAppDoc = pcObject->getDocument();
return Gui::Application::Instance->getDocument(pAppDoc);
if (pcDocument) {
return pcDocument;
}
else {
App::Document* pAppDoc = pcObject->getDocument();
return Gui::Application::Instance->getDocument(pAppDoc);
}
}
Gui::MDIView* ViewProviderDocumentObject::getActiveView() const