sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Followup 64949d : fix failure to load provider-provided style

Browse Source
This commit is contained in:
nirvn 2019-11-14 14:55:51 +07:00
parent 6180c59fa8
commit 7cb9e04762
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/qgsvectorlayer.cpp
View File

@ -4677,20 +4677,26 @@ QString QgsVectorLayer::loadNamedStyle( const QString &theURI, bool &resultFlag,
{
QgsDataSourceUri dsUri( theURI );
QString returnMessage;
QString qml, errorMsg;
if ( !loadFromLocalDB && mDataProvider && mDataProvider->isSaveAndLoadStyleToDatabaseSupported() )
{
QString qml, errorMsg;
qml = QgsProviderRegistry::instance()->loadStyle( mProviderKey, mDataSource, errorMsg );
if ( !qml.isEmpty() )
{
QDomDocument myDocument( QStringLiteral( "qgis" ) );
myDocument.setContent( qml );
resultFlag = importNamedStyle( myDocument, errorMsg );
returnMessage = QObject::tr( "Loaded from Provider" );
}
}
returnMessage = QgsMapLayer::loadNamedStyle( theURI, resultFlag, categories );
emit styleLoaded( categories );
if ( !qml.isEmpty() )
{
QDomDocument myDocument( QStringLiteral( "qgis" ) );
myDocument.setContent( qml );
resultFlag = importNamedStyle( myDocument, errorMsg );
returnMessage = QObject::tr( "Loaded from Provider" );
}
else
{
returnMessage = QgsMapLayer::loadNamedStyle( theURI, resultFlag, categories );
}
if ( resultFlag )
emit styleLoaded( categories );
return returnMessage;
}