Reverted unneeded changes

qgis · Jan 10, 2022 · 5e8a531 · 5e8a531
1 parent 2973735
commit 5e8a531
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/src/app/labeling/qgsmaptoolmovelabel.cpp b/src/app/labeling/qgsmaptoolmovelabel.cpp
@@ -189,9 +189,6 @@ void QgsMapToolMoveLabel::cadCanvasPressEvent( QgsMapMouseEvent *e )
         if ( mCurrentLabel.settings.dataDefinedProperties().isActive( QgsPalLayerSettings::PositionPoint ) )
           mCurrentLabel.settings.dataDefinedProperties().property( QgsPalLayerSettings::PositionPoint ).setActive( false );
 
-        mPalProperties.clear();
-        mPalProperties << QgsPalLayerSettings::PositionX;
-        mPalProperties << QgsPalLayerSettings::PositionY;
         QgsPalIndexes indexes;
         if ( createAuxiliaryFields( indexes ) )
           return;
@@ -226,15 +223,8 @@ void QgsMapToolMoveLabel::cadCanvasPressEvent( QgsMapMouseEvent *e )
         yCol = indexes[ QgsDiagramLayerSettings::PositionY ];
       }
 
-      bool usesAuxFields = false;
-      if ( xCol >= 0 && yCol >= 0 )
-        usesAuxFields = vlayer->fields().fieldOrigin( xCol ) == QgsFields::OriginJoin
-                        && vlayer->fields().fieldOrigin( yCol ) == QgsFields::OriginJoin;
-
-      if ( mCurrentLabel.settings.dataDefinedProperties().isActive( QgsPalLayerSettings::PositionPoint )
-           && !mCurrentLabel.pos.isDiagram )
-        usesAuxFields = vlayer->fields().fieldOrigin( pointCol ) == QgsFields::OriginJoin;
-
+      const bool usesAuxFields = vlayer->fields().fieldOrigin( xCol ) == QgsFields::OriginJoin
+                                 && vlayer->fields().fieldOrigin( yCol ) == QgsFields::OriginJoin;
       if ( !usesAuxFields && !vlayer->isEditable() )
       {
         if ( vlayer->startEditing() )