[ooo-build-commit] Branch 'ooo/OOO320' - 3 commits - shell/source svx/inc svx/source

Jan Holesovsky kendy at kemper.freedesktop.org
Tue Oct 27 21:21:57 PDT 2009


 shell/source/aqua/sysshell/makefile.mk                   |   61 ++++++
 shell/source/aqua/sysshell/systemshell.cxx               |  133 +++++++++++++++
 svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx    |   25 +-
 svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx |    7 
 svx/inc/svx/svdoashp.hxx                                 |    2 
 svx/source/cui/optimprove2.cxx                           |    8 
 svx/source/customshapes/EnhancedCustomShape2d.cxx        |   13 -
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx       |    5 
 svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx     |   28 +--
 svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx  |    7 
 svx/source/svdraw/svdoashp.cxx                           |    6 
 11 files changed, 256 insertions(+), 39 deletions(-)

New commits:
commit 19568c0682aaaeff3469902fb0ea03aba6b01092
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Oct 27 15:20:25 2009 +0000

    CWS-TOOLING: integrate CWS ooo32gsl01
    2009-10-13 15:59:25 +0200 hdu  r276868 : #i100000# fix remaining merge conflict
    2009-10-12 16:08:38 +0200 hdu  r276837 : CWS-TOOLING: rebase CWS ooo32gsl01 to branches/OOO320 at 276773 (milestone: OOO320:m1)
    2009-09-15 10:09:52 +0200 hdu  r276150 : #i104861# adjust metrics to pseudo-emUnits==1000 expectation
    for better precision allow non-integer charwidth/stemwidth
    2009-09-15 09:58:00 +0200 hdu  r276149 : #i104861# prepare to fix by updating cff.cxx to latest version from CWS vcl105
    2009-09-14 16:06:46 +0200 hdu  r276130 : #i104221# treat judeo-spanish varika as diacritic also in problematic fonts (thanks yoramg)
    2009-09-14 15:27:14 +0200 hdu  r276126 : #i104221# fix regression with he/ar diacritics
    2009-09-10 15:39:58 +0200 aw  r276038 : #i104867# added a GraphicVersion number to EmbeddedObjectRef to allow Grahic chamge checks without fetching the graphic
    2009-09-10 15:38:41 +0200 aw  r276037 : #i104867# added GraphicVersionNumber to SdrOleContentPrimitive to detect OLE content change without getting the Graphic
    2009-09-09 17:16:43 +0200 hdu  r276006 : #i104886# Aqua: fix for 101491 only applies to non-hairlines
    2009-09-09 16:39:05 +0200 hdu  r276002 : #i99849# don't give up on ScriptItemize too early

diff --git a/shell/source/aqua/sysshell/makefile.mk b/shell/source/aqua/sysshell/makefile.mk
new file mode 100644
index 0000000..b3cf3ab
--- /dev/null
+++ b/shell/source/aqua/sysshell/makefile.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.3 $
+#
+# 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=shell
+TARGET=sysshell
+LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CFLAGSCXX+=$(OBJCXXFLAGS)
+
+# --- Files --------------------------------------------------------
+
+.IF "$(OS)" == "MACOSX"
+
+LIB1OBJFILES=$(SLO)$/systemshell.obj
+LIB1TARGET=$(SLB)$/$(TARGET).lib
+LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
+
+.ELSE
+
+dummy:
+    @echo "Nothing to build for $(OS)"
+
+.ENDIF # MACOSX
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/shell/source/aqua/sysshell/systemshell.cxx b/shell/source/aqua/sysshell/systemshell.cxx
new file mode 100644
index 0000000..11d02aa
--- /dev/null
+++ b/shell/source/aqua/sysshell/systemshell.cxx
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: systemshell.cxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_shell.hxx"
+#include "systemshell.hxx"
+
+#include <comphelper/processfactory.hxx>
+
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_Hpp_
+#include <com/sun/star/beans/XPropertySet.hpp>
+#endif
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
+#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+#include <premac.h>
+#include <Cocoa/Cocoa.h>
+#include <postmac.h>
+
+using namespace ::com::sun::star;
+
+// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
+// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+{
+    rtl::OUString extUrl;
+        
+    uno::Reference< lang::XMultiServiceFactory > sm = comphelper::getProcessServiceFactory();
+    if (sm.is())
+    {
+        uno::Reference< beans::XPropertySet > pset;
+        sm->queryInterface( getCppuType( &pset )) >>= pset;
+        if (pset.is())
+        {
+            uno::Reference< uno::XComponentContext > context;
+            static const rtl::OUString DEFAULT_CONTEXT( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) );
+            pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
+            if (context.is())
+                extUrl = uri::ExternalUriReferenceTranslator::create(context)->translateToExternal(internalUrl);
+        }
+    }
+    return extUrl;
+}
+
+// #i104525# many versions of OSX have problems with some URLs:
+// when an app requests OSX to add one of these URLs to the "Recent Items" list
+// then this app gets killed (TextEdit, Preview, etc. and also OOo)
+static bool isDangerousUrl( const rtl::OUString& rUrl)
+{
+    // use a heuristic that detects all known cases since there is no official comment
+    // on the exact impact and root cause of the OSX bug
+    const int nLen = rUrl.getLength();
+    const sal_Unicode* p = rUrl.getStr();
+    for( int i = 0; i < nLen-3; ++i, ++p) {
+        if( p[0] != '%')
+            continue;
+        // escaped percent?
+        if( (p[1] == '2') && (p[2] == '5'))
+            return true;
+        // escapes are considered to be UTF-8 encoded
+        // => check for invalid UTF-8 leading byte
+        if( (p[1] != 'f') && (p[1] != 'F'))
+            continue;
+        int cLowNibble = p[2];
+        if( (cLowNibble >= '0') && (cLowNibble <= '9'))
+            return false;
+        if( cLowNibble >= 'a')
+            cLowNibble -= 'a' - 'A';
+        if( (cLowNibble < 'A') || (cLowNibble >= 'C'))
+            return true;
+    }
+
+    return false;
+}
+
+namespace SystemShell {
+    
+    //##############################
+    void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& /*aMimeType*/)
+    {
+        // Convert file URL for external use (see above)
+        rtl::OUString externalUrl = translateToExternalUrl(aFileUrl);
+        if( 0 == externalUrl.getLength() )
+            externalUrl = aFileUrl;
+
+        if( externalUrl.getLength()
+        &&  !isDangerousUrl( externalUrl))
+        {
+            NSString* pString = [[NSString alloc] initWithCharacters: externalUrl.getStr() length: externalUrl.getLength()];
+            NSURL* pURL = [NSURL URLWithString: pString];
+
+            if( pURL )
+            {
+                NSDocumentController* pCtrl = [NSDocumentController sharedDocumentController];
+                [pCtrl noteNewRecentDocumentURL: pURL];
+            }
+            if( pString )
+                [pString release];
+
+        }
+    }
+    
+} // namespace SystemShell
+
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index f54028d..e29bfb6 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -53,6 +53,11 @@ namespace drawinglayer
             SdrObjectWeakRef                            mpSdrOle2Obj;
             basegfx::B2DHomMatrix						maObjectTransform;
 
+            // #i104867# The GraphicVersion number to identify in operator== if
+            // the graphic has changed, but without fetching it (which may
+            // be expensive, e.g. triggering chart creation)
+            sal_uInt32                                  mnGraphicVersion;
+
             // bitfield
             unsigned                                    mbHighContrast : 1;
 
@@ -64,6 +69,7 @@ namespace drawinglayer
             SdrOleContentPrimitive2D(
                 const SdrOle2Obj& rSdrOle2Obj,
                 const basegfx::B2DHomMatrix& rObjectTransform, 
+                sal_uInt32 nGraphicVersion,
                 bool bHighContrast);
 
             // compare operator
@@ -74,6 +80,7 @@ namespace drawinglayer
 
             // data access
             const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
+            sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; }
             bool getHighContrast() const { return mbHighContrast; }
 
             // provide unique ID
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 454b68c..3facc1c 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -113,6 +113,11 @@ namespace sdr
                     new drawinglayer::primitive2d::SdrOleContentPrimitive2D(
                         GetOle2Obj(),
                         aObjectMatrix,
+
+                        // #i104867# add GraphicVersion number to be able to check for
+                        // content change in the primitive later
+                        GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion(),
+
                         bHighContrast));
                 
                 // create primitive. Use Ole2 primitive here. Prepare attribute settings, will be used soon anyways.
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 9c5616e..164e122 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -157,10 +157,12 @@ namespace drawinglayer
         SdrOleContentPrimitive2D::SdrOleContentPrimitive2D(
             const SdrOle2Obj& rSdrOle2Obj,
             const basegfx::B2DHomMatrix& rObjectTransform, 
+            sal_uInt32 nGraphicVersion,
             bool bHighContrast)
         :	BasePrimitive2D(),
             mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)),
             maObjectTransform(rObjectTransform),
+            mnGraphicVersion(nGraphicVersion),
             mbHighContrast(bHighContrast)
         {
         }
@@ -176,6 +178,11 @@ namespace drawinglayer
                 
                 return ((bBothNot || bBothAndEqual)
                     && getObjectTransform() == rCompare.getObjectTransform()
+
+                    // #i104867# to find out if the Graphic content of the
+                    // OLE has changed, use GraphicVersion number
+                    && getGraphicVersion() == rCompare.getGraphicVersion()
+
                     && getHighContrast() == rCompare.getHighContrast());
             }
 
commit 0f47431f5af2ae029287f4ecfd3440e2f22cecf5
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Oct 27 14:01:25 2009 +0000

    CWS-TOOLING: integrate CWS impress178
    2009-10-16 19:54:41 +0200 sj  r276995 : removed warning
    2009-10-16 17:46:12 +0200 sj  r276993 : #i103757# applied patch (fixed crash if model changes)
    2009-10-16 16:06:07 +0200 sj  r276985 : CWS-TOOLING: rebase CWS impress178 to branches/OOO320 at 276942 (milestone: OOO320:m2)
    2009-10-08 13:51:23 +0200 sj  r276790 : #i105654# fixed closing of line geometry
    2009-10-07 17:26:56 +0200 sj  r276762 : #i105606# fixed object shadow
    2009-10-07 17:25:39 +0200 sj  r276761 : minor improvements
    2009-10-07 11:48:26 +0200 af  r276745 : #i103047# Prevent context menu of LayoutMenu from being shown when user clicks on background.
    2009-10-07 11:33:59 +0200 af  r276743 : #i99866# Set position of the design control manually.
    2009-10-06 17:18:23 +0200 sj  r276721 : minor improvements
    2009-10-05 18:34:23 +0200 sj  r276692 : #105606# fixed fontsize problem
    2009-10-05 17:26:21 +0200 af  r276691 : #i105354# Never process more than one request in a row.
    2009-10-02 13:24:25 +0200 af  r276639 : #i94242# Taking insertion position of slide sorter correctly into account.
    2009-10-01 13:46:47 +0200 aw  r276602 : #i102224# some Polygon/PolyPolygon usages in SVMConverter ignored the possible curve status of tools::Polygon; added at least an AdaptiveSubdivide
    2009-10-01 12:33:56 +0200 aw  r276588 : #i102224# ImplWritePolyPolygon killed the curve information at the PolyPolygon by NOT copying the flags
    2009-09-30 17:48:56 +0200 aw  r276567 : #i102224# removed GetSimple() from Polygon and PolyPolygon, replaced completely with AdaptiveSubdivide
    2009-09-30 15:45:46 +0200 aw  r276559 : #i102048# secured primitive creation for dimension lines with linestyle none
    2009-09-30 14:56:41 +0200 af  r276556 : #i105471# Reordered statements in ~SdModule.
    2009-09-30 14:47:12 +0200 aw  r276555 : #i105373# corrected curve ignoring places in MetaFile export

diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 3e31be6..f228d6c 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -39,19 +39,19 @@
 //////////////////////////////////////////////////////////////////////////////
 // predefines
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer { namespace primitive2d {
+    enum MeasureTextPosition
     {
-        enum MeasureTextPosition
-        {
-            MEASURETEXTPOSITION_AUTOMATIC,
-            MEASURETEXTPOSITION_NEGATIVE,
-            MEASURETEXTPOSITION_CENTERED,
-            MEASURETEXTPOSITION_POSITIVE
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+        MEASURETEXTPOSITION_AUTOMATIC,
+        MEASURETEXTPOSITION_NEGATIVE,
+        MEASURETEXTPOSITION_CENTERED,
+        MEASURETEXTPOSITION_POSITIVE
+    };
+}}
+
+namespace drawinglayer { namespace attribute {
+    class SdrLineAttribute;
+}}
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -80,6 +80,7 @@ namespace drawinglayer
 
             // internal decomposition helper
             Primitive2DReference impCreatePart(
+                const attribute::SdrLineAttribute& rLineAttribute,
                 const basegfx::B2DHomMatrix& rObjectMatrix, 
                 const basegfx::B2DPoint& rStart, 
                 const basegfx::B2DPoint& rEnd, 
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 1238cea..6ce8f54 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -179,6 +179,8 @@ public:
     virtual UINT16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
+    virtual void SetModel(SdrModel* pNewModel);
+
     virtual void RecalcSnapRect();
 
     virtual const Rectangle& GetSnapRect()  const;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 16f4858..dc3b010 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1701,19 +1701,6 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
 
     if(aNewB2DPolyPolygon.count())
     {
-        if( !bLineGeometryNeededOnly )
-        {
-            // hack aNewB2DPolyPolygon to fill logic rect - this is
-            // needed to produce gradient fills that look like mso
-            aNewB2DPolygon.clear();
-            aNewB2DPolygon.append(basegfx::B2DPoint(0,0));
-            aNewB2DPolyPolygon.append(aNewB2DPolygon);
-
-            aNewB2DPolygon.clear();
-            aNewB2DPolygon.append(basegfx::B2DPoint(aLogicRect.GetWidth(),
-                                                    aLogicRect.GetHeight()));
-            aNewB2DPolyPolygon.append(aNewB2DPolygon);
-        }
         // #i37011#
         bool bForceCreateTwoObjects(false);
 
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 9d58a01..ce9f400 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -52,27 +52,29 @@ namespace drawinglayer
     namespace primitive2d
     {
         Primitive2DReference SdrMeasurePrimitive2D::impCreatePart(
+            const attribute::SdrLineAttribute& rLineAttribute,
             const basegfx::B2DHomMatrix& rObjectMatrix, 
             const basegfx::B2DPoint& rStart, 
             const basegfx::B2DPoint& rEnd, 
             bool bLeftActive, 
             bool bRightActive) const
         {
+            const attribute::SdrLineStartEndAttribute* pLineStartEnd = getSdrLSTAttribute().getLineStartEnd();
             basegfx::B2DPolygon aPolygon;
+
             aPolygon.append(rStart);
             aPolygon.append(rEnd);
 
-            if(!getSdrLSTAttribute().getLineStartEnd() || (!bLeftActive && !bRightActive))
+            if(!pLineStartEnd || (!bLeftActive && !bRightActive))
             {
-                return createPolygonLinePrimitive(aPolygon, rObjectMatrix, *getSdrLSTAttribute().getLine(), 0L);
+                return createPolygonLinePrimitive(aPolygon, rObjectMatrix, rLineAttribute, 0);
             }
         
             if(bLeftActive && bRightActive)
             {
-                return createPolygonLinePrimitive(aPolygon, rObjectMatrix, *getSdrLSTAttribute().getLine(), getSdrLSTAttribute().getLineStartEnd());
+                return createPolygonLinePrimitive(aPolygon, rObjectMatrix, rLineAttribute, pLineStartEnd);
             }
             
-            const attribute::SdrLineStartEndAttribute* pLineStartEnd = getSdrLSTAttribute().getLineStartEnd();
             const basegfx::B2DPolyPolygon aEmpty;
             const attribute::SdrLineStartEndAttribute aLineStartEnd(
                 bLeftActive ? pLineStartEnd->getStartPolyPolygon() : aEmpty, bRightActive ? pLineStartEnd->getEndPolyPolygon() : aEmpty,
@@ -80,7 +82,7 @@ namespace drawinglayer
                 bLeftActive ? pLineStartEnd->isStartActive() : false, bRightActive ? pLineStartEnd->isEndActive() : false,
                 bLeftActive ? pLineStartEnd->isStartCentered() : false, bRightActive? pLineStartEnd->isEndCentered() : false);
 
-            return createPolygonLinePrimitive(aPolygon, rObjectMatrix, *getSdrLSTAttribute().getLine(), &aLineStartEnd);
+            return createPolygonLinePrimitive(aPolygon, rObjectMatrix, rLineAttribute, &aLineStartEnd);
         }
 
         Primitive2DSequence SdrMeasurePrimitive2D::createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const
@@ -278,12 +280,12 @@ namespace drawinglayer
                     const basegfx::B2DPoint aMainLeftLeft(aMainLeft.getX() - fLenLeft, aMainLeft.getY());
                     const basegfx::B2DPoint aMainRightRight(aMainRight.getX() + fLenRight, aMainRight.getY());
 
-                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aMainLeftLeft, aMainLeft, false, true));
-                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aMainRight, aMainRightRight, true, false));
+                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aMainLeftLeft, aMainLeft, false, true));
+                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aMainRight, aMainRightRight, true, false));
 
                     if(!bMainLineSplitted || MEASURETEXTPOSITION_CENTERED != eHorizontal)
                     {
-                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aMainLeft, aMainRight, false, false));
+                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(* pLineAttribute, aObjectMatrix, aMainLeft, aMainRight, false, false));
                     }
                 }
                 else
@@ -294,12 +296,12 @@ namespace drawinglayer
                         const basegfx::B2DPoint aMainInnerLeft(aMainLeft.getX() + fHalfLength, aMainLeft.getY());
                         const basegfx::B2DPoint aMainInnerRight(aMainRight.getX() - fHalfLength, aMainRight.getY());
 
-                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aMainLeft, aMainInnerLeft, true, false));
-                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aMainInnerRight, aMainRight, false, true));
+                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aMainLeft, aMainInnerLeft, true, false));
+                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aMainInnerRight, aMainRight, false, true));
                     }
                     else
                     {
-                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aMainLeft, aMainRight, true, true));
+                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aMainLeft, aMainRight, true, true));
                     }
                 }
 
@@ -312,13 +314,13 @@ namespace drawinglayer
                 const basegfx::B2DPoint aLeftUp(0.0, fTopEdge);
                 const basegfx::B2DPoint aLeftDown(0.0, fBottomLeft);
 
-                appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aLeftDown, aLeftUp, false, false));
+                appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aLeftDown, aLeftUp, false, false));
 
                 // right help line
                 const basegfx::B2DPoint aRightUp(fDistance, fTopEdge);
                 const basegfx::B2DPoint aRightDown(fDistance, fBottomRight);
 
-                appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(aObjectMatrix, aRightDown, aRightUp, false, false));
+                appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, impCreatePart(*pLineAttribute, aObjectMatrix, aRightDown, aRightUp, false, false));
 
                 // text horizontal position
                 if(MEASURETEXTPOSITION_NEGATIVE == eHorizontal)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index f8220ad..44a29c6 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1673,6 +1673,12 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     }
 }
 
+void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
+{
+    SdrTextObj::SetModel(pNewModel);
+    mXRenderedCustomShape.clear();
+}
+
 UINT16 SdrObjCustomShape::GetObjIdentifier() const
 {
     return UINT16(OBJ_CUSTOMSHAPE);
commit 1e7a88b028f7f8cae82b194418eb4847b34b4421
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Oct 27 12:27:51 2009 +0000

    CWS-TOOLING: integrate CWS oooimprovement5
    2009-10-14 15:43:16 +0200 b_michaelsen  r276902 : #i105835# removing explict flushes in comphelper as logging::Logger handles flushing
    2009-10-14 15:40:00 +0200 b_michaelsen  r276901 : #i105835# logging::Filehandler::flush flushes, logging::Logger::publish flushes all handlers
    2009-10-14 14:56:03 +0200 b_michaelsen  r276900 : #i105835# flushing filehandler in uieventslogger after each logged record because of buffered i/o
    2009-10-14 14:52:32 +0200 b_michaelsen  r276899 : #i105835# loading the user feedback log readonly with the csv-filter (no need for an import dialog)
    2009-10-14 14:40:46 +0200 od  r276898 : #i105571# method <SwFntObj::GetCrsrOfst(..)>
              - skip character cells also for CJK

diff --git a/svx/source/cui/optimprove2.cxx b/svx/source/cui/optimprove2.cxx
index 2898908..b988c7b 100644
--- a/svx/source/cui/optimprove2.cxx
+++ b/svx/source/cui/optimprove2.cxx
@@ -149,7 +149,13 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG )
     {
         ::rtl::OUString sLogFile( m_sLogPath );
         sLogFile += C2S("/Current.csv");
-        uno::Sequence< beans::PropertyValue > aArgs;
+        uno::Sequence< beans::PropertyValue > aArgs(3);
+        aArgs[0].Name = ::rtl::OUString::createFromAscii("FilterName");
+        aArgs[0].Value = uno::makeAny(::rtl::OUString::createFromAscii("Text - txt - csv (StarCalc)"));
+        aArgs[1].Name = ::rtl::OUString::createFromAscii("FilterOptions");
+        aArgs[1].Value = uno::makeAny(::rtl::OUString::createFromAscii("44,34,12,1,"));
+        aArgs[2].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+        aArgs[2].Value = uno::makeAny(true);
 
         uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch(
             xDesktop, sLogFile, C2S("_default"), 0, aArgs );


More information about the ooo-build-commit mailing list