1 files changed, 36 insertions, 26 deletions
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 29aabc0774ea..e83097e722ba 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * This file incorporates work covered by the following license notice:
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 
 #include "Client.hxx"
@@ -132,10 +123,29 @@ void Client::ObjectAreaChanged()
     if (rMarkList.GetMarkCount() == 1)
     {
         SdrMark* pMark = rMarkList.GetMark(0);
-        SdrObject* pObj = pMark->GetMarkedSdrObj();
+		SdrOle2Obj* pObj = dynamic_cast< SdrOle2Obj* >(pMark->GetMarkedSdrObj());
 
-        // no need to check for changes, this method is called only if the area really changed
-        pObj->SetLogicRect( GetScaledObjArea() );
+        if(pObj)
+        {
+            // no need to check for changes, this method is called only if the area really changed
+            Rectangle aNewRectangle(GetScaledObjArea());
+
+            // #i118524# if sheared/rotated, center to non-rotated LogicRect
+            pObj->setSuppressSetVisAreaSize(true);
+
+            if(pObj->GetGeoStat().nDrehWink || pObj->GetGeoStat().nShearWink)
+            {
+                pObj->SetLogicRect( aNewRectangle );
+
+                const Rectangle& rBoundRect = pObj->GetCurrentBoundRect();
+                const Point aDelta(aNewRectangle.Center() - rBoundRect.Center());
+
+                aNewRectangle.Move(aDelta.X(), aDelta.Y());
+            }
+
+            pObj->SetLogicRect( aNewRectangle );
+            pObj->setSuppressSetVisAreaSize(false);
+        }
     }
 }