[ooo-build-commit] Branch 'ooo/OOO320' - sd/source

[Jan Holesovsky]

 sd/source/core/sdpage.cxx |   34 ----------------------------------
 1 file changed, 34 deletions(-)

New commits:
commit 05985d1b43d498a1989964a8bd9afa52fb5ec7b8
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Fri Nov 20 15:29:19 2009 +0000

    CWS-TOOLING: integrate CWS impress182
    2009-11-10 16:17:30 +0100 cl  r277433 : #i106678# remove unnecessary scaling as it causes only trouble
    2009-11-09 15:10:33 +0100 cl  r277413 : #i106678# fixed previous fix as writer pool returns wrong which id for slod SID_ATTR_NUMBERING_RULE

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 3459c5f..2d0169c 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2049,40 +2049,6 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
                     pObj->NbcMove(aVec);
                 }
 
-                Rectangle aBoundRect = pObj->GetCurrentBoundRect();
-
-                if (!aBorderRect.IsInside(aBoundRect))
-                {
-                    /**********************************************************
-                    * Objekt liegt nicht vollstaendig innerhalb der Raender
-                    * -> Position korrigieren
-                    **********************************************************/
-                    Point aOldPos(aBoundRect.TopLeft());
-                    aNewPos = aOldPos;
-
-                    // Position links oben ggf. korrigieren
-                    aNewPos.X() = Max(aNewPos.X(), aBorderRect.Left());
-                    aNewPos.Y() = Max(aNewPos.Y(), aBorderRect.Top());
-                    aVec = Size(aNewPos.X() - aOldPos.X(), aNewPos.Y() - aOldPos.Y());
-
-                    if (aVec.Height() != 0 || aVec.Width() != 0)
-                    {
-                        pObj->NbcMove(aVec);
-                    }
-
-                    // Position rechts unten ggf. korrigieren
-                    aOldPos = aBoundRect.BottomRight();
-                    aNewPos = aOldPos;
-                    aNewPos.X() = Min(aNewPos.X(), aBorderRect.Right());
-                    aNewPos.Y() = Min(aNewPos.Y(), aBorderRect.Bottom());
-                    aVec = Size(aNewPos.X() - aOldPos.X(), aNewPos.Y() - aOldPos.Y());
-
-                    if (aVec.Height() != 0 || aVec.Width() != 0)
-                    {
-                        pObj->NbcMove(aVec);
-                    }
-                }
-
                 pObj->SetChanged();
                 pObj->BroadcastObjectChange();
             }