CWS swlayoutrefactoring: resync to m96, no conflict resolution

2 files changed, 24 insertions, 60 deletions

diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index aca39b5b29b7..e2ac04bf7e85 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -32,6 +32,7 @@
 #include <editeng/protitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/fmmodel.hxx>
+#include <sot/exchange.hxx>
 
 #include "swtypes.hxx"
 #include "pagefrm.hxx"
@@ -991,6 +992,14 @@ void SwDrawView::CheckPossibilities()
                             bSzProtect |= ( embed::EmbedMisc::EMBED_NEVERRESIZE & xObj->getStatus( embed::Aspects::MSOLE_CONTENT ) ) ? TRUE : FALSE;
 
                             // <--
+
+                            // #i972: protect position if it is a Math object anchored 'as char' and baseline alignment is activated
+                            SwDoc* pDoc = Imp().GetShell()->GetDoc();
+                            const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() )
+                                    && FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId()
+                                    && pDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
+                            if (bProtectMathPos)
+                                bMoveProtect = true;
                         }
                     }
                 }
@@ -1101,3 +1110,18 @@ void SwDrawView::DeleteMarked()
         pTmpRoot->EndAllAction();   //swmod 080218
 }
 
+<<<<<<< local
+=======
+/********
+JP 02.10.98: sollte als Fix fuer 57153 gelten, hatte aber Nebenwirkungen,
+            wie Bug 57475
+const SdrMarkList& SwDrawView::GetMarkedObjectList() const
+{
+    FlushComeBackTimer();
+    return FmFormView::GetMarkedObjectList();
+}
+*************/
+
+
+
+>>>>>>> other
diff --git a/sw/source/core/draw/makefile.mk b/sw/source/core/draw/makefile.mk
deleted file mode 100644
index a57b1b530e7f..000000000000
--- a/sw/source/core/draw/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sw
-TARGET=draw
-
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/sw.mk
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/dview.obj	\
-        $(SLO)$/dcontact.obj	\
-        $(SLO)$/dflyobj.obj \
-        $(SLO)$/drawdoc.obj \
-        $(SLO)$/dobjfac.obj \
-        $(SLO)$/dpage.obj
-
-EXCEPTIONSFILES= \
-                $(SLO)$/dview.obj	\
-                $(SLO)$/dcontact.obj	\
-                $(SLO)$/drawdoc.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-