exchgcmtdoc2: merge with DEV300 m69

8 files changed, 23 insertions, 59 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index aa20281038da..5d9b90a2f9e0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -44,7 +44,6 @@
 #include <svx/svdviter.hxx>
 #include <svx/svdview.hxx>
 #include <svx/shapepropertynotifier.hxx>
-// AW, OD 2004-04-30 #i28501#
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <fmtornt.hxx>
@@ -69,31 +68,17 @@
 #include <txtfrm.hxx>
 #include <editsh.hxx>
 #include <docary.hxx>
-
-// OD 2004-02-11 #110582#-2
 #include <flyfrms.hxx>
-
-// OD 18.06.2003 #108784#
-#include <algorithm>
-// OD 2004-05-24 #i28701#
 #include <sortedobjs.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-
-// AW: For VCOfDrawVirtObj and stuff
-#ifndef _SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/sdr/contact/viewcontactofvirtobj.hxx>
-#endif
-
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-#endif
-
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#endif
-
 #include <com/sun/star/text/WritingMode2.hpp>
 
+#include <algorithm>
+
 using namespace ::com::sun::star;
 
 
@@ -2605,9 +2590,7 @@ void SwDrawVirtObj::RecalcBoundRect()
 basegfx::B2DPolyPolygon SwDrawVirtObj::TakeXorPoly() const
 {
     basegfx::B2DPolyPolygon aRetval(rRefObj.TakeXorPoly());
-    basegfx::B2DHomMatrix aMatrix;
-    aMatrix.translate(GetOffset().X(), GetOffset().Y());
-    aRetval.transform(aMatrix);
+    aRetval.transform(basegfx::tools::createTranslateB2DHomMatrix(GetOffset().X(), GetOffset().Y()));
 
     return aRetval;
 }
@@ -2615,9 +2598,7 @@ basegfx::B2DPolyPolygon SwDrawVirtObj::TakeXorPoly() const
 basegfx::B2DPolyPolygon SwDrawVirtObj::TakeContour() const
 {
     basegfx::B2DPolyPolygon aRetval(rRefObj.TakeContour());
-    basegfx::B2DHomMatrix aMatrix;
-    aMatrix.translate(GetOffset().X(), GetOffset().Y());
-    aRetval.transform(aMatrix);
+    aRetval.transform(basegfx::tools::createTranslateB2DHomMatrix(GetOffset().X(), GetOffset().Y()));
 
     return aRetval;
 }
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 15ca46ca2456..cda428f124eb 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -196,7 +196,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        class SwVirtFlyDrawObjPrimitive : public BasePrimitive2D
+        class SwVirtFlyDrawObjPrimitive : public BufferedDecompositionPrimitive2D
         {
         private:
             const SwVirtFlyDrawObj&                 mrSwVirtFlyDrawObj;
@@ -204,13 +204,13 @@ namespace drawinglayer
 
         protected:
             // method which is to be used to implement the local decomposition of a 2D primitive
-            virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
 
         public:
             SwVirtFlyDrawObjPrimitive(
                 const SwVirtFlyDrawObj& rSwVirtFlyDrawObj,
                 const basegfx::B2DRange &rOuterRange)
-            :   BasePrimitive2D(),
+            :   BufferedDecompositionPrimitive2D(),
                 mrSwVirtFlyDrawObj(rSwVirtFlyDrawObj),
                 maOuterRange(rOuterRange)
             {
@@ -239,7 +239,7 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        Primitive2DSequence SwVirtFlyDrawObjPrimitive::createLocalDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        Primitive2DSequence SwVirtFlyDrawObjPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
             Primitive2DSequence aRetval;
 
@@ -269,7 +269,7 @@ namespace drawinglayer
 
         bool SwVirtFlyDrawObjPrimitive::operator==(const BasePrimitive2D& rPrimitive) const
         {
-            if(BasePrimitive2D::operator==(rPrimitive))
+            if(BufferedDecompositionPrimitive2D::operator==(rPrimitive))
             {
                 const SwVirtFlyDrawObjPrimitive& rCompare = (SwVirtFlyDrawObjPrimitive&)rPrimitive;
 
@@ -295,7 +295,7 @@ namespace drawinglayer
             getSwVirtFlyDrawObj().wrap_DoPaintObject();
 
             // call parent
-            return BasePrimitive2D::get2DDecomposition(rViewInformation);
+            return BufferedDecompositionPrimitive2D::get2DDecomposition(rViewInformation);
         }
 
         // provide unique ID
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index f8256a7ada0b..4f1b2c1770e3 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -75,19 +75,12 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <basegfx/numeric/ftools.hxx>
-// OD 2004-05-05 #i28701#
+#include <algorithm>
 #include <fmtwrapinfluenceonobjpos.hxx>
-// --> OD 2004-11-10 #i35007#
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-// <--
-// --> OD 2005-03-10 #i44334#, #i44681#
-// --> OD 2007-01-03 #i73079# - use correct matrix type
 #include <basegfx/matrix/b2dhommatrix.hxx>
-// <--
-// --> OD 2009-01-16 #i59051
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <com/sun/star/drawing/PointSequence.hpp>
-// <--
-
 #include <vcl/svapp.hxx>
 #include <slist>
 #include <iterator>
@@ -2860,8 +2853,8 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
             // apply translation difference to PolyPolygonBezier.
             if ( aTranslateDiff.X != 0 || aTranslateDiff.Y != 0 )
             {
-                basegfx::B2DHomMatrix aMatrix;
-                aMatrix.translate( aTranslateDiff.X, aTranslateDiff.Y );
+                const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix(
+                    aTranslateDiff.X, aTranslateDiff.Y));
 
                 const sal_Int32 nOuterSequenceCount(aConvertedPath.Coordinates.getLength());
                 drawing::PointSequence* pInnerSequence = aConvertedPath.Coordinates.getArray();
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 7ae4b209f49f..ee1055b276c9 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -270,8 +270,8 @@ void SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
                     sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
         }
 
-        if(pRange && pRange->GetDoc()  == GetDoc() ||
-            pCursor && pCursor->GetDoc()  == GetDoc())
+        if( (pRange && pRange->GetDoc()  == GetDoc()) ||
+            (pCursor && pCursor->GetDoc()  == GetDoc()) )
         {
             const SwStartNode* pOwnStartNode = GetStartNode();
             if(pCursor)
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index 25276c2cc4bc..e0e4826a93d4 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -209,11 +209,7 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const
 
 const String&   SwCondCollItem::GetStyle(USHORT nPos) const
 {
-#ifndef IRIX
     return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr;
-#else
-    return nPos < COND_COMMAND_COUNT ? (String)sStyles[nPos] : aEmptyStr;
-#endif
 }
 
 /****************************************************************************
@@ -224,11 +220,7 @@ const String&   SwCondCollItem::GetStyle(USHORT nPos) const
 void SwCondCollItem::SetStyle(const String* pStyle, USHORT nPos)
 {
     if( nPos < COND_COMMAND_COUNT )
-#ifndef IRIX
         sStyles[nPos] = pStyle ? *pStyle : aEmptyStr;
-#else
-        sStyles[nPos] = pStyle ? (String)*pStyle : aEmptyStr;
-#endif
 }
 
 
diff --git a/sw/source/ui/docvw/postit.cxx b/sw/source/ui/docvw/postit.cxx
index 3079cc855c50..77ded3905220 100644
--- a/sw/source/ui/docvw/postit.cxx
+++ b/sw/source/ui/docvw/postit.cxx
@@ -1953,7 +1953,7 @@ private:
     ShadowState                 maShadowState;
 
 protected:
-    virtual drawinglayer::primitive2d::Primitive2DSequence createLocalDecomposition(
+    virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
         const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
@@ -1977,7 +1977,7 @@ public:
     DeclPrimitrive2DIDBlock()
 };
 
-drawinglayer::primitive2d::Primitive2DSequence SwPostItShadowPrimitive::createLocalDecomposition(
+drawinglayer::primitive2d::Primitive2DSequence SwPostItShadowPrimitive::create2DDecomposition(
     const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/) const
 {
     // get logic sizes in object coordinate system
@@ -2140,7 +2140,7 @@ private:
     bool                            mbLineSolid : 1;
 
 protected:
-    virtual drawinglayer::primitive2d::Primitive2DSequence createLocalDecomposition(
+    virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
         const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
 
 public:
@@ -2179,7 +2179,7 @@ public:
     DeclPrimitrive2DIDBlock()
 };
 
-drawinglayer::primitive2d::Primitive2DSequence SwPostItAnkorPrimitive::createLocalDecomposition(
+drawinglayer::primitive2d::Primitive2DSequence SwPostItAnkorPrimitive::create2DDecomposition(
     const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/) const
 {
     drawinglayer::primitive2d::Primitive2DSequence aRetval;
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 92467fe455d0..26a1253c5486 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -717,6 +717,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
 
 
         if(!bApi)
+        {
             if(bNotFoundMessage)
             {
                 InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute();
@@ -728,6 +729,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
                 pTextView->SetSelection( TextSelection( aPaM, aPaM ) );
                 StartSearchAndReplace( rSearchItem, FALSE, FALSE, TRUE );
             }
+        }
     }
     return nFound;
 }
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index fc1ff731b4c4..08afadc10698 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -43,10 +43,6 @@ USE_DEFFILE=TRUE
 
 # --- Allgemein -----------------------------------------------------------
 
-.IF "$(OS)"=="IRIX"
-LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=40
-.ENDIF
-
 sw_res_files= \
     $(SRS)$/app.srs          \
     $(SRS)$/dialog.srs       \