1 files changed, 14 insertions, 14 deletions

diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 356a694dc513..b07cd7eb145e 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -44,7 +44,8 @@
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/componentbase.hxx>
 #include <rtl/ref.hxx>
-#include <tools/diagnose_ex.h>
+#include <utility>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace pcr
 {
@@ -58,7 +59,6 @@ namespace pcr
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::beans::Property;
@@ -306,7 +306,7 @@ namespace pcr
                     Reference< XMap > xControlMap;
                     Any any = m_xContext->getValueByName( "ControlShapeAccess" );
                     any >>= xControlMap;
-                    m_xAssociatedShape.set( xControlMap->get( makeAny( xControlModel ) ), UNO_QUERY_THROW );
+                    m_xAssociatedShape.set( xControlMap->get( Any( xControlModel ) ), UNO_QUERY_THROW );
                     m_xShapeProperties.set( m_xAssociatedShape, UNO_QUERY_THROW );
                 }
             }
@@ -640,7 +640,7 @@ namespace pcr
                     continue;
 
                 sal_Int32 nHeightOrWidth( 0 );
-                OSL_VERIFY( xRowOrColumn->getPropertyValue( _bRows ? OUString(PROPERTY_HEIGHT) : OUString(PROPERTY_WIDTH) ) >>= nHeightOrWidth );
+                OSL_VERIFY( xRowOrColumn->getPropertyValue( _bRows ? PROPERTY_HEIGHT : PROPERTY_WIDTH ) >>= nHeightOrWidth );
 
                 if ( nAccumulated + nHeightOrWidth > rRelativePos )
                     break;
@@ -671,7 +671,7 @@ namespace pcr
                 if ( xSheet.is() )
                 {
                     css::awt::Point aPreservePosition( m_xAssociatedShape->getPosition() );
-                    m_xShapeProperties->setPropertyValue( PROPERTY_ANCHOR, makeAny( xSheet ) );
+                    m_xShapeProperties->setPropertyValue( PROPERTY_ANCHOR, Any( xSheet ) );
                     m_xAssociatedShape->setPosition( aPreservePosition );
                 }
                 break;
@@ -720,9 +720,9 @@ namespace pcr
             OUString sPropertyName;
             Any             aNewPropertyValue;
 
-            EventTranslation( const OUString& _propertyName, const Any& _newPropertyValue )
-                :sPropertyName( _propertyName )
-                ,aNewPropertyValue( _newPropertyValue )
+            EventTranslation( OUString _propertyName, Any _newPropertyValue )
+                :sPropertyName(std::move( _propertyName ))
+                ,aNewPropertyValue(std::move( _newPropertyValue ))
             {
             }
         };
@@ -739,22 +739,22 @@ namespace pcr
         if ( _event.PropertyName == "Position" )
         {
             css::awt::Point aPos = m_xShape->getPosition();
-            aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) );
-            aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) );
+            aEventTranslations.emplace_back(PROPERTY_POSITIONX, Any( aPos.X ));
+            aEventTranslations.emplace_back(PROPERTY_POSITIONY, Any( aPos.Y ));
         }
         else if ( _event.PropertyName == "Size" )
         {
             css::awt::Size aSize = m_xShape->getSize();
-            aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) );
-            aEventTranslations.push_back( EventTranslation( PROPERTY_HEIGHT, makeAny( aSize.Height ) ) );
+            aEventTranslations.emplace_back(PROPERTY_WIDTH, Any( aSize.Width ));
+            aEventTranslations.emplace_back(PROPERTY_HEIGHT, Any( aSize.Height ));
         }
         else if ( _event.PropertyName == PROPERTY_ANCHOR_TYPE )
         {
-            aEventTranslations.push_back( EventTranslation( PROPERTY_TEXT_ANCHOR_TYPE, _event.NewValue ) );
+            aEventTranslations.emplace_back(PROPERTY_TEXT_ANCHOR_TYPE, _event.NewValue);
         }
         else if ( _event.PropertyName == PROPERTY_ANCHOR )
         {
-            aEventTranslations.push_back( EventTranslation( PROPERTY_SHEET_ANCHOR_TYPE, _event.NewValue ) );
+            aEventTranslations.emplace_back(PROPERTY_SHEET_ANCHOR_TYPE, _event.NewValue);
         }
 
         PropertyChangeEvent aTranslatedEvent( _event );