diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 3a9e4d1982..eab83192d5 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -39,8 +39,6 @@ Public Class ucrDataViewReoGrid Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved - Private toolTip1 As New ToolTip() - Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns Dim workSheetColumnHeader As ColumnHeader Dim variableTextColour As Color @@ -104,7 +102,6 @@ Public Class ucrDataViewReoGrid End If Next - If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then grdData.CurrentWorksheet.ScrollToCell("A1") ' will always set the scrollbar at the top. End If diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index bf80b3f16f..6d665f59ec 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1005,9 +1005,7 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne } else if (type == "rename_with") { if (missing(.fn)) stop(.fn, "is missing with no default.") curr_col_names <- names(curr_data) - current_geom_col <- attr(private$data, "sf_column") private$data <- curr_data |> - dplyr::rename_with( .fn = .fn, .cols = {{ .cols }}, ...