3 files changed, 8 insertions, 7 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index e95d127f2147..b7d787b53aae 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -288,7 +288,7 @@ void AssignmentPersistentData::ImplCommit()
     AssignmentPersistentData::AssignmentPersistentData()
         :ConfigItem("Office.DataAccess/AddressBook")
     {
-        Sequence< OUString > aStoredNames = GetNodeNames("Fields");
+        const Sequence< OUString > aStoredNames = GetNodeNames("Fields");
         m_aStoredFields.insert(aStoredNames.begin(), aStoredNames.end());
     }
 
@@ -846,7 +846,7 @@ void AssignmentPersistentData::ImplCommit()
 
 
         // for quicker access
-        ::std::set< OUString > aColumnNameSet(aColumnNames.begin(), aColumnNames.end());
+        ::std::set< OUString > aColumnNameSet(std::cbegin(aColumnNames), std::cend(aColumnNames));
 
         std::vector<OUString>::iterator aInitialSelection = m_pImpl->aFieldAssignments.begin() + m_pImpl->nFieldScrollPos;
 
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index ada6aafecbd3..698e49e0725a 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -148,16 +148,17 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog::getSupportedServiceNam
 // XPropertyAccess
 uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
 {
-    auto pProp = std::find_if(maMediaDescriptor.begin(), maMediaDescriptor.end(),
+    auto pProp = std::find_if(std::cbegin(maMediaDescriptor), std::cend(maMediaDescriptor),
         [](const beans::PropertyValue& rProp) { return rProp.Name == "FilterData"; });
-    auto i = static_cast<sal_Int32>(std::distance(maMediaDescriptor.begin(), pProp));
+    auto i = static_cast<sal_Int32>(std::distance(std::cbegin(maMediaDescriptor), pProp));
     sal_Int32 nCount = maMediaDescriptor.getLength();
     if ( i == nCount )
         maMediaDescriptor.realloc( ++nCount );
 
     // the "FilterData" Property is an Any that will contain our PropertySequence of Values
-    maMediaDescriptor[ i ].Name = "FilterData";
-    maMediaDescriptor[ i ].Value <<= maFilterDataSequence;
+    auto& item = maMediaDescriptor[ i ];
+    item.Name = "FilterData";
+    item.Value <<= maFilterDataSequence;
     return maMediaDescriptor;
 }
 
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 96f3722b994c..14f9c6977fca 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -652,7 +652,7 @@ namespace svt::table
         else
         {
             ::std::vector< ::Color > aColors( aAPIColors.getLength() );
-            std::transform(aAPIColors.begin(), aAPIColors.end(), aColors.begin(),
+            std::transform(std::cbegin(aAPIColors), std::cend(aAPIColors), aColors.begin(),
                 [](const css::util::Color& rAPIColor) -> ::Color { return Color(ColorTransparency, rAPIColor); });
             m_aRowColors = aColors;
         }