Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2DC759186 for ; Wed, 16 May 2012 15:08:23 +0000 (UTC) Received: (qmail 23840 invoked by uid 500); 16 May 2012 15:08:23 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 23811 invoked by uid 500); 16 May 2012 15:08:23 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 23802 invoked by uid 99); 16 May 2012 15:08:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2012 15:08:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 May 2012 15:08:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C0CA72388C06; Wed, 16 May 2012 15:07:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1339213 [6/11] - in /incubator/ooo/branches/alg/aw080: ./ ext_sources/ extras/l10n/source/en-GB/ extras/l10n/source/pt-BR/ extras/l10n/source/zh-CN/ extras/l10n/source/zh-TW/ main/ main/apache-commons/java/codec/ main/apache-commons/java/h... Date: Wed, 16 May 2012 15:07:08 -0000 To: ooo-commits@incubator.apache.org From: alg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120516150726.C0CA72388C06@eris.apache.org> Modified: incubator/ooo/branches/alg/aw080/main/NOTICE URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/NOTICE?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/NOTICE (original) +++ incubator/ooo/branches/alg/aw080/main/NOTICE Wed May 16 15:07:00 2012 @@ -6,7 +6,8 @@ The Apache Software Foundation (http://w ____ -[placeholder for Andrew Rist (arist) to include copyright notice from Oracle] + +Portions of this software copyright (c) 2000-2011, Oracle and/or its affiliates . ____ Modified: incubator/ooo/branches/alg/aw080/main/apache-commons/java/codec/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/apache-commons/java/codec/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/apache-commons/java/codec/makefile.mk (original) +++ incubator/ooo/branches/alg/aw080/main/apache-commons/java/codec/makefile.mk Wed May 16 15:07:00 2012 @@ -38,16 +38,16 @@ ANT_BUILDFILE=build.xml .IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" # --- Files -------------------------------------------------------- -TARFILE_NAME=commons-codec-1.3-src -TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1 +TARFILE_NAME=commons-codec-1.6-src +TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7 -TARFILE_ROOTDIR=commons-codec-1.3 +TARFILE_ROOTDIR=commons-codec-1.6-src PATCH_FILES=$(PRJ)$/patches$/codec.patch #CONVERTFILES=build.xml -OUT2CLASS=dist$/commons-codec-1.3.jar +OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= Modified: incubator/ooo/branches/alg/aw080/main/apache-commons/java/httpclient/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/apache-commons/java/httpclient/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/apache-commons/java/httpclient/makefile.mk (original) +++ incubator/ooo/branches/alg/aw080/main/apache-commons/java/httpclient/makefile.mk Wed May 16 15:07:00 2012 @@ -45,14 +45,14 @@ TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776 TARFILE_ROOTDIR=commons-httpclient-3.1 -#PATCH_FILES=$(PRJ)$/patches$/httpclient.patch +PATCH_FILES=$(PRJ)$/patches$/httpclient.patch #CONVERTFILES=build.xml OUT2CLASS=dist$/commons-httpclient.jar COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar -COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar +COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.6-SNAPSHOT.jar .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= Modified: incubator/ooo/branches/alg/aw080/main/apache-commons/java/lang/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/apache-commons/java/lang/makefile.mk?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/apache-commons/java/lang/makefile.mk (original) +++ incubator/ooo/branches/alg/aw080/main/apache-commons/java/lang/makefile.mk Wed May 16 15:07:00 2012 @@ -40,16 +40,16 @@ TAR!:=$(GNUTAR) .IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" # --- Files -------------------------------------------------------- -TARFILE_NAME=commons-lang-2.3-src -TARFILE_MD5=2ae988b339daec234019a7066f96733e +TARFILE_NAME=commons-lang-2.4-src +TARFILE_MD5=625ff5f2f968dd908bca43c9469d6e6b -TARFILE_ROOTDIR=commons-lang-2.3-src +TARFILE_ROOTDIR=commons-lang-2.4-src #PATCH_FILES=$(PRJ)$/patches$/logging.patch #CONVERTFILES=build.xml -OUT2CLASS=dist$/commons-lang-2.3.jar +OUT2CLASS=dist$/commons-lang-2.4.jar .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= Modified: incubator/ooo/branches/alg/aw080/main/apache-commons/patches/codec.patch URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/apache-commons/patches/codec.patch?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/apache-commons/patches/codec.patch (original) +++ incubator/ooo/branches/alg/aw080/main/apache-commons/patches/codec.patch Wed May 16 15:07:00 2012 @@ -1,17 +1,20 @@ ---- misc/build/commons-codec-1.3/build.xml-old 2008-01-31 15:28:58.000000000 +0100 -+++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.000000000 +0100 -@@ -90,14 +90,12 @@ +--- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05 22:12:32.000000000 -0500 ++++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000 -0500 +@@ -96,7 +96,6 @@ - + -- +- + - +@@ -104,8 +103,7 @@ -- - - - +- +- ++ + + + Modified: incubator/ooo/branches/alg/aw080/main/apache-commons/prj/d.lst URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/apache-commons/prj/d.lst?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/apache-commons/prj/d.lst (original) +++ incubator/ooo/branches/alg/aw080/main/apache-commons/prj/d.lst Wed May 16 15:07:00 2012 @@ -1,5 +1,5 @@ ..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-logging-1.1.1.jar -..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin%_EXT%\commons-codec-1.3.jar +..\%__SRC%\class\commons-codec-1.6-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-codec-1.6.jar ..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin%_EXT%\commons-httpclient-3.1.jar -..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin%_EXT%\commons-lang-2.3.jar +..\%__SRC%\class\commons-lang-2.4.jar %_DEST%\bin%_EXT%\commons-lang-2.4.jar Modified: incubator/ooo/branches/alg/aw080/main/binfilter/bf_svtools/source/config/svt_miscopt.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/binfilter/bf_svtools/source/config/svt_miscopt.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/binfilter/bf_svtools/source/config/svt_miscopt.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/binfilter/bf_svtools/source/config/svt_miscopt.cxx Wed May 16 15:07:00 2012 @@ -260,7 +260,6 @@ static sal_Int16 implSymbolsStyleFromVCL case STYLE_SYMBOLS_DEFAULT: return SFX_SYMBOLS_STYLE_DEFAULT; case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST; case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL; - case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO; } return SFX_SYMBOLS_STYLE_AUTO; @@ -274,7 +273,6 @@ static ULONG implSymbolsStyleToVCL( sal_ case SFX_SYMBOLS_STYLE_DEFAULT: return STYLE_SYMBOLS_DEFAULT; case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST; case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL; - case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO; } return STYLE_SYMBOLS_AUTO; Modified: incubator/ooo/branches/alg/aw080/main/binfilter/inc/bf_svtools/imgdef.hxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/binfilter/inc/bf_svtools/imgdef.hxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/binfilter/inc/bf_svtools/imgdef.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/binfilter/inc/bf_svtools/imgdef.hxx Wed May 16 15:07:00 2012 @@ -40,7 +40,6 @@ enum SfxSymbolsStyle SFX_SYMBOLS_STYLE_DEFAULT, SFX_SYMBOLS_STYLE_HICONTRAST, SFX_SYMBOLS_STYLE_INDUSTRIAL, - SFX_SYMBOLS_STYLE_TANGO }; #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 Modified: incubator/ooo/branches/alg/aw080/main/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed May 16 15:07:00 2012 @@ -355,7 +355,7 @@ extern "C" typedef void (*PrivateSnippet int const codeSnippetSize = 16; unsigned char * codeSnippet( - unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, + unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset, typelib_TypeClass returnTypeClass) { if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { @@ -401,7 +401,7 @@ unsigned char * codeSnippet( // jmp privateSnippetExecutor: *p++ = 0xE9; *reinterpret_cast< sal_Int32 * >(p) - = ((unsigned char *) exec) - p - sizeof (sal_Int32); + = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff; p += sizeof (sal_Int32); OSL_ASSERT(p - code <= codeSnippetSize); return code + codeSnippetSize; @@ -434,7 +434,7 @@ bridges::cpp_uno::shared::VtableFactory: } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - Slot ** slots, unsigned char * code, + Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { @@ -447,9 +447,9 @@ unsigned char * bridges::cpp_uno::shared switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( member)->pAttributeTypeRef->eTypeClass); // Setter: @@ -457,17 +457,17 @@ unsigned char * bridges::cpp_uno::shared typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, typelib_TypeClass_VOID); } break; case typelib_TypeClass_INTERFACE_METHOD: - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( member)->pReturnTypeRef->eTypeClass); break; Modified: incubator/ooo/branches/alg/aw080/main/configure.in URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/configure.in?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/configure.in (original) +++ incubator/ooo/branches/alg/aw080/main/configure.in Wed May 16 15:07:00 2012 @@ -4102,7 +4102,22 @@ if test -n "$with_system_lucene" -o -n " }'; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([no, you need lucene 2]) + AC_MSG_RESULT([no]) + AC_MSG_CHECKING([whether lucene is version 3.x]) + + if $PERL -e 'use Archive::Zip; + my $file = "$ENV{'LUCENE_CORE_JAR'}"; + my $zip = Archive::Zip->new( $file ); + my $mf = $zip->contents ( "META-INF/MANIFEST.MF" ); + if ( $mf =~ m/Specification-Version: 3.*/ ) { + exit 0; + } else { + exit 1; + }'; then + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([no, you need lucene 2 or 3]) + fi fi else Modified: incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/backgrnd.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/backgrnd.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/backgrnd.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/backgrnd.cxx Wed May 16 15:07:00 2012 @@ -63,6 +63,8 @@ #include //CHINA001 #include //CHINA001 #include //CHINA001 +#include + using namespace ::com::sun::star; // static ---------------------------------------------------------------- Modified: incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tparea.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tparea.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tparea.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tparea.cxx Wed May 16 15:07:00 2012 @@ -1132,9 +1132,9 @@ sal_Bool SvxAreaTabPage::FillItemSet( Sf if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbBitmap.GetSavedValue() ) { - XOBitmap aXOBitmap = pBitmapList->GetBitmap( nPos )->GetXBitmap(); - String aString = aLbBitmap.GetSelectEntry(); - XFillBitmapItem aFillBitmapItem( aString, aXOBitmap ); + const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); + const String aString(aLbBitmap.GetSelectEntry()); + const XFillBitmapItem aFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()); pOld = GetOldItem( rAttrs, XATTR_FILLBITMAP ); if ( !pOld || !( *(const XFillBitmapItem*)pOld == aFillBitmapItem ) ) { @@ -2250,16 +2250,16 @@ IMPL_LINK( SvxAreaTabPage, ModifyBitmapH if( _nPos != LISTBOX_ENTRY_NOTFOUND ) { // ItemSet fuellen und an aCtlXRectPreview weiterleiten - XBitmapEntry* pEntry = pBitmapList->GetBitmap( _nPos ); + const XBitmapEntry* pEntry = pBitmapList->GetBitmap(_nPos); - rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); - rXFSet.Put( XFillBitmapItem( String(), pEntry->GetXBitmap() ) ); + rXFSet.Put(XFillStyleItem(XFILL_BITMAP)); + rXFSet.Put(XFillBitmapItem(String(), pEntry->GetGraphicObject())); } // NEU else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) ) { - rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) ); - rXFSet.Put( XFillBitmapItem( String(), ( ( const XFillBitmapItem* ) pPoolItem )->GetBitmapValue() ) ); + rXFSet.Put(XFillStyleItem(XFILL_BITMAP)); + rXFSet.Put(XFillBitmapItem(String(), ((const XFillBitmapItem*)pPoolItem)->GetGraphicObject())); } else rXFSet.Put( XFillStyleItem( XFILL_NONE ) ); Modified: incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpbitmap.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpbitmap.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpbitmap.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpbitmap.cxx Wed May 16 15:07:00 2012 @@ -112,7 +112,7 @@ SvxBitmapTabPage::SvxBitmapTabPage pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), aXFStyleItem ( XFILL_BITMAP ), - aXBitmapItem ( String(), XOBitmap() ), + aXBitmapItem ( String(), Graphic() ), aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { @@ -265,33 +265,29 @@ sal_Bool SvxBitmapTabPage::FillItemSet( { if( *pDlgType == 0 && *pbAreaTP == sal_False ) // Flaechen-Dialog { - if( *pPageType == PT_BITMAP ) + if(PT_BITMAP == *pPageType) { - // CheckChanges_Impl(); <-- doppelte Abfrage ? - - XOBitmap aXOBitmap; - String aString; - sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND ) - { - aXOBitmap = pBitmapList->GetBitmap( nPos )->GetXBitmap(); - aString = aLbBitmaps.GetSelectEntry(); - + const sal_uInt16 nPos(aLbBitmaps.GetSelectEntryPos()); + + _rOutAttrs.Put(XFillStyleItem(XFILL_BITMAP)); + + if(LISTBOX_ENTRY_NOTFOUND != nPos) + { + const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); + const String aString(aLbBitmaps.GetSelectEntry()); + + _rOutAttrs.Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject())); } else { - aXOBitmap = aBitmapCtl.GetXBitmap(); - - // #85339# if it's an array, force conversion to bitmap before using it. - if(aXOBitmap.GetBitmapType() == XBITMAP_8X8) - aXOBitmap.GetBitmap(); + const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx()); + _rOutAttrs.Put(XFillBitmapItem(String(), Graphic(aBitmapEx))); } - _rOutAttrs.Put( XFillStyleItem( XFILL_BITMAP ) ); - _rOutAttrs.Put( XFillBitmapItem( aString, aXOBitmap ) ); } } - return sal_True; + + return sal_True; } // ----------------------------------------------------------------------- @@ -306,7 +302,7 @@ void SvxBitmapTabPage::Reset( const SfxI aBitmapCtl.SetBmpArray( aCtlPixel.GetBitmapPixelPtr() ); // Bitmap holen und darstellen - XFillBitmapItem aBmpItem( (const String &) String(), aBitmapCtl.GetXBitmap() ); + const XFillBitmapItem aBmpItem(String(), Graphic(aBitmapCtl.GetBitmapEx())); rXFSet.Put( aBmpItem ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); aCtlPreview.Invalidate(); @@ -341,153 +337,49 @@ SfxTabPage* SvxBitmapTabPage::Create( Wi IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) { - XOBitmap* pXOBitmap = NULL; - int nPos = aLbBitmaps.GetSelectEntryPos(); + GraphicObject* pGraphicObject = 0; + int nPos(aLbBitmaps.GetSelectEntryPos()); - if( nPos != LISTBOX_ENTRY_NOTFOUND ) - pXOBitmap = new XOBitmap( ( (XBitmapEntry*) pBitmapList->GetBitmap( nPos ) )->GetXBitmap() ); + if(LISTBOX_ENTRY_NOTFOUND != nPos) + { + pGraphicObject = new GraphicObject(pBitmapList->GetBitmap(nPos)->GetGraphicObject()); + } else { - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), sal_True, &pPoolItem ) ) + const SfxPoolItem* pPoolItem = 0; + + if(SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLSTYLE), true, &pPoolItem)) { - XFillStyle eXFS = (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue(); - if( ( XFILL_BITMAP == eXFS ) && - ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) ) ) + const XFillStyle eXFS((XFillStyle)((const XFillStyleItem*)pPoolItem)->GetValue()); + + if((XFILL_BITMAP == eXFS) && (SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLBITMAP), true, &pPoolItem))) { - pXOBitmap = new XOBitmap( ( ( const XFillBitmapItem* ) pPoolItem )->GetBitmapValue() ); + pGraphicObject = new GraphicObject(((const XFillBitmapItem*)pPoolItem)->GetGraphicObject()); } } - if( !pXOBitmap ) + + if(!pGraphicObject) { - aLbBitmaps.SelectEntryPos( 0 ); + aLbBitmaps.SelectEntryPos(0); nPos = aLbBitmaps.GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND ) - pXOBitmap = new XOBitmap( ( (XBitmapEntry*) pBitmapList->GetBitmap( nPos ) )->GetXBitmap() ); + + if(LISTBOX_ENTRY_NOTFOUND != nPos) + { + pGraphicObject = new GraphicObject(pBitmapList->GetBitmap(nPos)->GetGraphicObject()); + } } } - if( pXOBitmap ) - { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //sal_uInt16 nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //sal_Bool bPixelColor = sal_False; - //sal_uInt16 nWidth = pBitmap->GetSizePixel().Width(); - //sal_uInt16 nHeight = pBitmap->GetSizePixel().Height(); - - // #85339# try to convert bitmapped item to array item. - if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) - { - Bitmap aBitmap(pXOBitmap->GetBitmap()); - Size aSizePixel(aBitmap.GetSizePixel()); - - if(8 == aSizePixel.Width() && 8 == aSizePixel.Height()) - { - sal_uInt16* pPixelArray = new sal_uInt16[64]; - sal_uInt32 nCol1(0xffffffff); // background - sal_uInt32 nCol2(0xffffffff); // pixel - BitmapReadAccess* pAccess = aBitmap.AcquireReadAccess(); - sal_Bool bValid(sal_True); - - if(pAccess) - { - for(sal_uInt32 a(0); bValid && a < 64; a++) - { - const BitmapColor aBmCol = pAccess->GetColor(a>>3, a%8); - Color aRgbCol(aBmCol.GetRed(), aBmCol.GetGreen(), aBmCol.GetBlue()); - sal_uInt32 nColVal = aRgbCol.GetRGBColor(); - - // test with nCol1 - if(nCol1 != nColVal) - { - if(0xffffffff == nCol1) - { - // nCol1 is used first time - nCol1 = nColVal; - pPixelArray[a] = 0; - } - else - { - // test with nCol2 - if(nCol2 != nColVal) - { - if(0xffffffff == nCol2) - { - // nCol2 used first time - nCol2 = nColVal; - pPixelArray[a] = 1; - } - else - { - // Third color detected - bValid = sal_False; - } - } - else - { - // color is pixel color - pPixelArray[a] = 1; - } - } - } - else - { - // color is background color - pPixelArray[a] = 0; - } - } - - // release ReadAccess - aBitmap.ReleaseAccess(pAccess); - } - else - { - // no access -> no success - bValid = sal_False; - } - if(bValid) - { - Color aCol1(nCol1); - Color aCol2(nCol2); - - // no pixel color found? Use opposite od background color. - if(0xffffffff == nCol2) - { - aCol2 = Color( - 0xff - aCol1.GetRed(), - 0xff - aCol1.GetGreen(), - 0xff - aCol1.GetBlue()); - } - - // transformation did work, create a new Item - delete pXOBitmap; - pXOBitmap = new XOBitmap(pPixelArray, aCol2, aCol1); - } - - // cleanup - delete[] pPixelArray; - } - } + if(pGraphicObject) + { + BitmapColor aBack; + BitmapColor aFront; + bool bIs8x8(isHistorical8x8(pGraphicObject->GetGraphic().GetBitmap(), aBack, aFront)); - aLbColor.SetNoSelection(); + aLbColor.SetNoSelection(); aLbBackgroundColor.SetNoSelection(); - if( pXOBitmap->GetBitmapType() == XBITMAP_IMPORT ) - { - aCtlPixel.Reset(); - aCtlPixel.SetPaintable( sal_False ); - aCtlPixel.Disable(); - aFtPixelEdit.Disable(); - aFtColor.Disable(); - aLbColor.Disable(); - aFtBackgroundColor.Disable(); - aLbBackgroundColor.Disable(); - aBtnModify.Disable(); - aBtnAdd.Disable(); - } - else if( pXOBitmap->GetBitmapType() == XBITMAP_8X8 ) + if(bIs8x8) { aCtlPixel.SetPaintable( sal_True ); aCtlPixel.Enable(); @@ -500,10 +392,10 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitma aBtnAdd.Enable(); // Setzen des PixelControls - aCtlPixel.SetXBitmap( *pXOBitmap ); + aCtlPixel.SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx()); - Color aPixelColor = pXOBitmap->GetPixelColor(); - Color aBackColor = pXOBitmap->GetBackgroundColor(); + Color aPixelColor = aFront; + Color aBackColor = aBack; aBitmapCtl.SetPixelColor( aPixelColor ); aBitmapCtl.SetBackgroundColor( aBackColor ); @@ -529,19 +421,34 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitma aLbBackgroundColor.SelectEntry( aBackColor ); } } - aCtlPixel.Invalidate(); + else + { + aCtlPixel.Reset(); + aCtlPixel.SetPaintable( sal_False ); + aCtlPixel.Disable(); + aFtPixelEdit.Disable(); + aFtColor.Disable(); + aLbColor.Disable(); + aFtBackgroundColor.Disable(); + aLbBackgroundColor.Disable(); + aBtnModify.Disable(); + aBtnAdd.Disable(); + } + + aCtlPixel.Invalidate(); // Bitmap darstellen - XFillBitmapItem aXBmpItem( (const String &) String(), *pXOBitmap ); + const XFillBitmapItem aXBmpItem(String(), *pGraphicObject); rXFSet.Put( aXBmpItem ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); aCtlPreview.Invalidate(); bBmpChanged = sal_False; - delete pXOBitmap; + delete pGraphicObject; } - return 0L; + + return 0; } // ----------------------------------------------------------------------- @@ -667,21 +574,17 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl XBitmapEntry* pEntry = 0; if( aCtlPixel.IsEnabled() ) { - XOBitmap aXOBitmap = aBitmapCtl.GetXBitmap(); + const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx()); - // #85339# if it's an array, force conversion to bitmap before using it. - if(aXOBitmap.GetBitmapType() == XBITMAP_8X8) - aXOBitmap.GetBitmap(); - - pEntry = new XBitmapEntry( aXOBitmap, aName ); + pEntry = new XBitmapEntry(Graphic(aBitmapEx), aName); } else // Es muss sich um eine nicht vorhandene importierte Bitmap handeln { - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( XATTR_FILLBITMAP, sal_True, &pPoolItem ) ) + const SfxPoolItem* pPoolItem = 0; + + if(SFX_ITEM_SET == rOutAttrs.GetItemState(XATTR_FILLBITMAP, true, &pPoolItem)) { - XOBitmap aXOBitmap( ( ( const XFillBitmapItem* ) pPoolItem )->GetBitmapValue() ); - pEntry = new XBitmapEntry( aXOBitmap, aName ); + pEntry = new XBitmapEntry(dynamic_cast< const XFillBitmapItem* >(pPoolItem)->GetGraphicObject(), aName); } } @@ -795,9 +698,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImport if( !nError ) { - Bitmap aBmp( aGraphic.GetBitmap() ); - XBitmapEntry* pEntry = - new XBitmapEntry( XOBitmap( aBmp ), aName ); + XBitmapEntry* pEntry = new XBitmapEntry( aGraphic, aName ); pBitmapList->Insert( pEntry ); aLbBitmaps.Append( pEntry ); @@ -875,13 +776,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickModify pEntry->SetName( aName ); - XOBitmap aXOBitmap = aBitmapCtl.GetXBitmap(); - - // #85339# if it's an array, force conversion to bitmap before using it. - if(aXOBitmap.GetBitmapType() == XBITMAP_8X8) - aXOBitmap.GetBitmap(); + const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx()); - pEntry->SetXBitmap( aXOBitmap ); + pEntry->SetGraphicObject(Graphic(aBitmapEx)); aLbBitmaps.Modify( pEntry, nPos ); aLbBitmaps.SelectEntryPos( nPos ); @@ -1111,7 +1008,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangePixel aBitmapCtl.SetPixelColor( aLbColor.GetSelectEntryColor() ); // Bitmap holen und darstellen - rXFSet.Put( XFillBitmapItem( String(), aBitmapCtl.GetXBitmap() ) ); + rXFSet.Put(XFillBitmapItem(String(), Graphic(aBitmapCtl.GetBitmapEx()))); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); aCtlPreview.Invalidate(); @@ -1130,7 +1027,7 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBackg aBitmapCtl.SetBackgroundColor( aLbBackgroundColor.GetSelectEntryColor() ); // Bitmap holen und darstellen - rXFSet.Put( XFillBitmapItem( String(), aBitmapCtl.GetXBitmap() ) ); + rXFSet.Put(XFillBitmapItem(String(), Graphic(aBitmapCtl.GetBitmapEx()))); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); aCtlPreview.Invalidate(); @@ -1148,7 +1045,7 @@ void SvxBitmapTabPage::PointChanged( Win aBitmapCtl.SetBmpArray( aCtlPixel.GetBitmapPixelPtr() ); // Bitmap holen und darstellen - rXFSet.Put( XFillBitmapItem( String(), aBitmapCtl.GetXBitmap() ) ); + rXFSet.Put(XFillBitmapItem(String(), Graphic(aBitmapCtl.GetBitmapEx()))); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); aCtlPreview.Invalidate(); Modified: incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx Wed May 16 15:07:00 2012 @@ -62,7 +62,6 @@ #include #include #include -#include #include #include "paragrph.hrc" #include "sfx2/opengrf.hxx" Modified: incubator/ooo/branches/alg/aw080/main/desktop/source/app/app.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/desktop/source/app/app.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/desktop/source/app/app.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/desktop/source/app/app.cxx Wed May 16 15:07:00 2012 @@ -837,8 +837,6 @@ static bool needsInstallBundledExtension continue; if (aFileStat.getFileType() != ::osl::FileStatus::Regular) continue; - const sal_uInt32 nT1 (aFileStat.getModifyTime().Seconds); - const sal_uInt32 nT2 (aMarkerModifyTime.Seconds); if (aFileStat.getModifyTime().Seconds > aMarkerModifyTime.Seconds) { rDirectory.close(); @@ -2023,7 +2021,7 @@ void Desktop::Main() if ( !pExecGlobals->bRestartRequested ) { - if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsHeadless() ) && + if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsHeadless() && !pCmdLineArgs->IsQuickstart()) && (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) && (!bExistsRecoveryData ) && (!bExistsSessionData ) && Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/Library_drawinglayer.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/Library_drawinglayer.mk?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/Library_drawinglayer.mk (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/Library_drawinglayer.mk Wed May 16 15:07:00 2012 @@ -111,6 +111,7 @@ $(eval $(call gb_Library_add_exception_o drawinglayer/source/primitive2d/mediaprimitive2d \ drawinglayer/source/primitive2d/metafileprimitive2d \ drawinglayer/source/primitive2d/modifiedcolorprimitive2d \ + drawinglayer/source/primitive2d/objectinfoprimitive2d \ drawinglayer/source/primitive2d/pagepreviewprimitive2d \ drawinglayer/source/primitive2d/patternfillprimitive2d \ drawinglayer/source/primitive2d/polypolygonprimitive2d \ @@ -168,6 +169,7 @@ $(eval $(call gb_Library_add_exception_o drawinglayer/source/processor2d/hittestprocessor2d \ drawinglayer/source/processor2d/textaspolygonextractor2d \ drawinglayer/source/processor2d/hairlineextractor2d \ + drawinglayer/source/processor2d/objectinfoextractor2d \ drawinglayer/source/processor3d/baseprocessor3d \ drawinglayer/source/processor3d/cutfindprocessor3d \ drawinglayer/source/processor3d/defaultprocessor3d \ Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/Package_inc.mk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/Package_inc.mk?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/Package_inc.mk (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/Package_inc.mk Wed May 16 15:07:00 2012 @@ -49,6 +49,7 @@ $(eval $(call gb_Package_add_file,drawin $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/mediaprimitive2d.hxx,drawinglayer/primitive2d/mediaprimitive2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/metafileprimitive2d.hxx,drawinglayer/primitive2d/metafileprimitive2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx,drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx,drawinglayer/primitive2d/objectinfoprimitive2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx,drawinglayer/primitive2d/pagepreviewprimitive2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx,drawinglayer/primitive2d/patternfillprimitive2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx,drawinglayer/primitive2d/pointarrayprimitive2d.hxx)) @@ -109,6 +110,7 @@ $(eval $(call gb_Package_add_file,drawin $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hittestprocessor2d.hxx,drawinglayer/processor2d/hittestprocessor2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx,drawinglayer/processor2d/textaspolygonextractor2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hairlineextractor2d.hxx,drawinglayer/processor2d/hairlineextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/objectinfoextractor2d.hxx,drawinglayer/processor2d/objectinfoextractor2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/baseprocessor3d.hxx,drawinglayer/processor3d/baseprocessor3d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx)) Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx Wed May 16 15:07:00 2012 @@ -25,10 +25,11 @@ #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX #include + ////////////////////////////////////////////////////////////////////////////// // predefines -class Bitmap; +class BitmapEx; namespace basegfx { class B2DRange; @@ -54,7 +55,7 @@ namespace drawinglayer public: /// constructors/assignmentoperator/destructor SdrFillBitmapAttribute( - const Bitmap& rBitmap, + const BitmapEx& rBitmapEx, const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset, const basegfx::B2DVector& rOffsetPosition, @@ -74,7 +75,7 @@ namespace drawinglayer bool operator==(const SdrFillBitmapAttribute& rCandidate) const; // data read access - const Bitmap& getBitmap() const; + const BitmapEx& getBitmapEx() const; const basegfx::B2DVector& getSize() const; const basegfx::B2DVector& getOffset() const; const basegfx::B2DVector& getOffsetPosition() const; Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx Wed May 16 15:07:00 2012 @@ -104,6 +104,7 @@ #define PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 65) #define PRIMITIVE2D_ID_CROPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 66) #define PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 67) +#define PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 68) ////////////////////////////////////////////////////////////////////////////// Copied: incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx (from r1338722, incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx) URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx?p2=incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx&p1=incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx&r1=1338722&r2=1339213&rev=1339213&view=diff ============================================================================== --- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx Wed May 16 15:07:00 2012 @@ -62,9 +62,6 @@ namespace drawinglayer const rtl::OUString& getTitle() const { return maTitle; } const rtl::OUString& getDesc() const { return maDesc; } - /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; - /// provide unique ID DeclPrimitrive2DIDBlock() }; Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx Wed May 16 15:07:00 2012 @@ -186,6 +186,7 @@ namespace drawinglayer const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd, SpreadMethod aSpreadMethod = Spread_pad); + virtual ~SvgLinearGradientPrimitive2D(); /// data read access const basegfx::B2DPoint& getEnd() const { return maEnd; } @@ -196,7 +197,7 @@ namespace drawinglayer /// provide unique ID DeclPrimitrive2DIDBlock() }; -} // end of namespace primitive2d + } // end of namespace primitive2d } // end of namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// @@ -250,6 +251,7 @@ namespace drawinglayer double fRadius, SpreadMethod aSpreadMethod = Spread_pad, const basegfx::B2DPoint* pFocal = 0); + virtual ~SvgRadialGradientPrimitive2D(); /// data read access double getRadius() const { return mfRadius; } Copied: incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx (from r1338722, incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx) URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx?p2=incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx&p1=incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx&r1=1338722&r2=1339213&rev=1339213&view=diff ============================================================================== --- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx Wed May 16 15:07:00 2012 @@ -47,7 +47,9 @@ namespace drawinglayer const primitive2d::ObjectInfoPrimitive2D* mpFound; /// tooling methods - void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate); + virtual void processBasePrimitive2D( + const primitive2d::BasePrimitive2D& rCandidate, + const primitive2d::Primitive2DReference& rUnoCandidate); public: ObjectInfoPrimitiveExtractor2D(const geometry::ViewInformation2D& rViewInformation); Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx Wed May 16 15:07:00 2012 @@ -41,7 +41,7 @@ namespace drawinglayer sal_uInt32 mnRefCount; // data definitions - Bitmap maBitmap; + BitmapEx maBitmapEx; basegfx::B2DVector maSize; basegfx::B2DVector maOffset; basegfx::B2DVector maOffsetPosition; @@ -53,7 +53,7 @@ namespace drawinglayer bool mbLogSize : 1; ImpSdrFillBitmapAttribute( - const Bitmap& rBitmap, + const BitmapEx& rBitmapEx, const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset, const basegfx::B2DVector& rOffsetPosition, @@ -62,7 +62,7 @@ namespace drawinglayer bool bStretch, bool bLogSize) : mnRefCount(0), - maBitmap(rBitmap), + maBitmapEx(rBitmapEx), maSize(rSize), maOffset(rOffset), maOffsetPosition(rOffsetPosition), @@ -74,7 +74,7 @@ namespace drawinglayer } // data read access - const Bitmap& getBitmap() const { return maBitmap; } + const BitmapEx& getBitmapEx() const { return maBitmapEx; } const basegfx::B2DVector& getSize() const { return maSize; } const basegfx::B2DVector& getOffset() const { return maOffset; } const basegfx::B2DVector& getOffsetPosition() const { return maOffsetPosition; } @@ -85,7 +85,7 @@ namespace drawinglayer bool operator==(const ImpSdrFillBitmapAttribute& rCandidate) const { - return (getBitmap() == rCandidate.getBitmap() + return (getBitmapEx() == rCandidate.getBitmapEx() && getSize() == rCandidate.getSize() && getOffset() == rCandidate.getOffset() && getOffsetPosition() == rCandidate.getOffsetPosition() @@ -102,7 +102,7 @@ namespace drawinglayer if(!pDefault) { pDefault = new ImpSdrFillBitmapAttribute( - Bitmap(), + BitmapEx(), basegfx::B2DVector(), basegfx::B2DVector(), basegfx::B2DVector(), @@ -120,7 +120,7 @@ namespace drawinglayer }; SdrFillBitmapAttribute::SdrFillBitmapAttribute( - const Bitmap& rBitmap, + const BitmapEx& rBitmapEx, const basegfx::B2DVector& rSize, const basegfx::B2DVector& rOffset, const basegfx::B2DVector& rOffsetPosition, @@ -128,8 +128,16 @@ namespace drawinglayer bool bTiling, bool bStretch, bool bLogSize) - : mpSdrFillBitmapAttribute(new ImpSdrFillBitmapAttribute( - rBitmap, rSize, rOffset, rOffsetPosition, rRectPoint, bTiling, bStretch, bLogSize)) + : mpSdrFillBitmapAttribute( + new ImpSdrFillBitmapAttribute( + rBitmapEx, + rSize, + rOffset, + rOffsetPosition, + rRectPoint, + bTiling, + bStretch, + bLogSize)) { } @@ -197,9 +205,9 @@ namespace drawinglayer return (*rCandidate.mpSdrFillBitmapAttribute == *mpSdrFillBitmapAttribute); } - const Bitmap& SdrFillBitmapAttribute::getBitmap() const + const BitmapEx& SdrFillBitmapAttribute::getBitmapEx() const { - return mpSdrFillBitmapAttribute->getBitmap(); + return mpSdrFillBitmapAttribute->getBitmapEx(); } const basegfx::B2DVector& SdrFillBitmapAttribute::getSize() const @@ -240,8 +248,8 @@ namespace drawinglayer FillBitmapAttribute SdrFillBitmapAttribute::getFillBitmapAttribute(const basegfx::B2DRange& rRange) const { // get logical size of bitmap (before expanding eventually) - Bitmap aBitmap(getBitmap()); - const basegfx::B2DVector aLogicalSize(aBitmap.GetPrefSize().getWidth(), aBitmap.GetPrefSize().getHeight()); + BitmapEx aBitmapEx(getBitmapEx()); + const basegfx::B2DVector aLogicalSize(aBitmapEx.GetPrefSize().getWidth(), aBitmapEx.GetPrefSize().getHeight()); // get hor/ver shiftings and apply them eventually to the bitmap, but only // when tiling is on @@ -252,45 +260,45 @@ namespace drawinglayer { if(0.0 != getOffset().getX() || 0.0 != getOffset().getY()) { - const sal_uInt32 nWidth(aBitmap.GetSizePixel().getWidth()); - const sal_uInt32 nHeight(aBitmap.GetSizePixel().getHeight()); + const sal_uInt32 nWidth(aBitmapEx.GetSizePixel().getWidth()); + const sal_uInt32 nHeight(aBitmapEx.GetSizePixel().getHeight()); if(0.0 != getOffset().getX()) { bExpandHeight = true; const sal_uInt32 nOffset(basegfx::fround(((double)nWidth * getOffset().getX()) / 100.0)); - aBitmap.Expand(0L, nHeight); + aBitmapEx.Expand(0L, nHeight); const Size aSizeA(nOffset, nHeight); const Rectangle aDstA(Point(0L, nHeight), aSizeA); const Rectangle aSrcA(Point(nWidth - nOffset, 0L), aSizeA); - aBitmap.CopyPixel(aDstA, aSrcA); + aBitmapEx.CopyPixel(aDstA, aSrcA); const Size aSizeB(nWidth - nOffset, nHeight); const Rectangle aDstB(Point(nOffset, nHeight), aSizeB); const Rectangle aSrcB(Point(0L, 0L), aSizeB); - aBitmap.CopyPixel(aDstB, aSrcB); + aBitmapEx.CopyPixel(aDstB, aSrcB); } else { bExpandWidth = true; const sal_uInt32 nOffset(basegfx::fround(((double)nHeight * getOffset().getY()) / 100.0)); - aBitmap.Expand(nWidth, 0L); + aBitmapEx.Expand(nWidth, 0L); const Size aSize(nWidth, nHeight); const Rectangle aDst(Point(nWidth, 0L), aSize); const Rectangle aSrc(Point(0L, 0L), aSize); - aBitmap.CopyPixel(aDst, aSrc); + aBitmapEx.CopyPixel(aDst, aSrc); const Size aSizeA(nWidth, nOffset); const Rectangle aDstA(Point(0L, 0L), aSizeA); const Rectangle aSrcA(Point(nWidth, nHeight - nOffset), aSizeA); - aBitmap.CopyPixel(aDstA, aSrcA); + aBitmapEx.CopyPixel(aDstA, aSrcA); const Size aSizeB(nWidth, nHeight - nOffset); const Rectangle aDstB(Point(0L, nOffset), aSizeB); const Rectangle aSrcB(Point(nWidth, 0L), aSizeB); - aBitmap.CopyPixel(aDstB, aSrcB); + aBitmapEx.CopyPixel(aDstB, aSrcB); } } } @@ -391,7 +399,7 @@ namespace drawinglayer aBitmapSize.setY(aBitmapSize.getY() / fRangeHeight); } - return FillBitmapAttribute(BitmapEx(aBitmap), aBitmapTopLeft, aBitmapSize, getTiling()); + return FillBitmapAttribute(aBitmapEx, aBitmapTopLeft, aBitmapSize, getTiling()); } } // end of namespace attribute } // end of namespace drawinglayer Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx Wed May 16 15:07:00 2012 @@ -2970,9 +2970,13 @@ namespace { /** CHECKED, WORKS WELL */ const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*)pAction; - const Rectangle aTargetRectangle(pA->GetPoint(), pA->GetSize()); + const basegfx::B2DRange aTargetRange( + pA->GetPoint().X(), + pA->GetPoint().Y(), + pA->GetPoint().X() + pA->GetSize().Width(), + pA->GetPoint().Y() + pA->GetSize().Height()); - if(!aTargetRectangle.IsEmpty()) + if(!aTargetRange.isEmpty()) { const GDIMetaFile& rContent = pA->GetGDIMetaFile(); @@ -2993,6 +2997,32 @@ namespace if(xSubContent.hasElements()) { + // create SourceRange + const basegfx::B2DRange aSourceRange( + rContent.GetPrefMapMode().GetOrigin().X(), + rContent.GetPrefMapMode().GetOrigin().Y(), + rContent.GetPrefMapMode().GetOrigin().X() + rContent.GetPrefSize().Width(), + rContent.GetPrefMapMode().GetOrigin().Y() + rContent.GetPrefSize().Height()); + + // apply mapping if aTargetRange and aSourceRange are not equal + if(!aSourceRange.equal(aTargetRange)) + { + basegfx::B2DHomMatrix aTransform; + + aTransform.translate(-aSourceRange.getMinX(), -aSourceRange.getMinY()); + aTransform.scale( + aTargetRange.getWidth() / (basegfx::fTools::equalZero(aSourceRange.getWidth()) ? 1.0 : aSourceRange.getWidth()), + aTargetRange.getHeight() / (basegfx::fTools::equalZero(aSourceRange.getHeight()) ? 1.0 : aSourceRange.getHeight())); + aTransform.translate(aTargetRange.getMinX(), aTargetRange.getMinY()); + + const drawinglayer::primitive2d::Primitive2DReference aEmbeddedTransform( + new drawinglayer::primitive2d::TransformPrimitive2D( + aTransform, + xSubContent)); + + xSubContent = drawinglayer::primitive2d::Primitive2DSequence(&aEmbeddedTransform, 1); + } + // check if gradient is a real gradient const Gradient& rGradient = pA->GetGradient(); const drawinglayer::attribute::FillGradientAttribute aAttribute(createFillGradientAttribute(rGradient)); @@ -3008,9 +3038,7 @@ namespace else { // really a gradient. Create gradient sub-content (with correct scaling) - basegfx::B2DRange aRange( - aTargetRectangle.Left(), aTargetRectangle.Top(), - aTargetRectangle.Right(), aTargetRectangle.Bottom()); + basegfx::B2DRange aRange(aTargetRange); aRange.transform(rPropertyHolders.Current().getTransformation()); // prepare gradient for transparent content Copied: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx (from r1338722, incubator/ooo/trunk/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx) URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx?p2=incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx&p1=incubator/ooo/trunk/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx&r1=1338722&r2=1339213&rev=1339213&view=diff ============================================================================== --- incubator/ooo/trunk/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx Wed May 16 15:07:00 2012 @@ -49,20 +49,6 @@ namespace drawinglayer { } - bool ObjectInfoPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const - { - if(GroupPrimitive2D::operator==(rPrimitive)) - { - const ObjectInfoPrimitive2D& rCompare = (ObjectInfoPrimitive2D&)rPrimitive; - - return (getName() == rCompare.getName() - && getTitle() == rCompare.getTitle() - && getDesc() == rCompare.getDesc()); - } - - return false; - } - // provide unique ID ImplPrimitrive2DIDBlock(ObjectInfoPrimitive2D, PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D) Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Wed May 16 15:07:00 2012 @@ -346,13 +346,18 @@ namespace drawinglayer rFrom.getColor(), rFrom.getOffset() + nOffset, rTo.getColor(), rTo.getOffset() + nOffset)); - const double fTransFrom(1.0 - rFrom.getOpacity()); - const double fTransTo(1.0 - rTo.getOpacity()); + if(!getFullyOpaque()) + { + const double fTransFrom(1.0 - rFrom.getOpacity()); + const double fTransTo(1.0 - rTo.getOpacity()); + const basegfx::BColor aColorFrom(fTransFrom, fTransFrom, fTransFrom); + const basegfx::BColor aColorTo(fTransTo, fTransTo, fTransTo); - rTargetOpacity.push_back( - new SvgLinearAtomPrimitive2D( - basegfx::BColor(fTransFrom, fTransFrom, fTransFrom), rFrom.getOffset() + nOffset, - basegfx::BColor(fTransTo,fTransTo, fTransTo), rTo.getOffset() + nOffset)); + rTargetOpacity.push_back( + new SvgLinearAtomPrimitive2D( + aColorFrom, rFrom.getOffset() + nOffset, + aColorTo, rTo.getOffset() + nOffset)); + } } } @@ -527,6 +532,10 @@ namespace drawinglayer { } + SvgLinearGradientPrimitive2D::~SvgLinearGradientPrimitive2D() + { + } + basegfx::B2DRange SvgLinearGradientPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // return ObjectRange @@ -596,27 +605,30 @@ namespace drawinglayer rTo.getColor(), fScaleTo)); } - const double fTransFrom(1.0 - rFrom.getOpacity()); - const double fTransTo(1.0 - rTo.getOpacity()); - const basegfx::BColor aColorFrom(fTransFrom, fTransFrom, fTransFrom); - const basegfx::BColor aColorTo(fTransTo, fTransTo, fTransTo); - - if(isFocalSet()) + if(!getFullyOpaque()) { - const basegfx::B2DVector aTranslateFrom(maFocalVector * (maFocalLength - fScaleFrom)); - const basegfx::B2DVector aTranslateTo(maFocalVector * (maFocalLength - fScaleTo)); + const double fTransFrom(1.0 - rFrom.getOpacity()); + const double fTransTo(1.0 - rTo.getOpacity()); + const basegfx::BColor aColorFrom(fTransFrom, fTransFrom, fTransFrom); + const basegfx::BColor aColorTo(fTransTo, fTransTo, fTransTo); + + if(isFocalSet()) + { + const basegfx::B2DVector aTranslateFrom(maFocalVector * (maFocalLength - fScaleFrom)); + const basegfx::B2DVector aTranslateTo(maFocalVector * (maFocalLength - fScaleTo)); - rTargetOpacity.push_back( - new SvgRadialAtomPrimitive2D( - aColorFrom, fScaleFrom, aTranslateFrom, - aColorTo, fScaleTo, aTranslateTo)); - } - else - { - rTargetOpacity.push_back( - new SvgRadialAtomPrimitive2D( - aColorFrom, fScaleFrom, - aColorTo, fScaleTo)); + rTargetOpacity.push_back( + new SvgRadialAtomPrimitive2D( + aColorFrom, fScaleFrom, aTranslateFrom, + aColorTo, fScaleTo, aTranslateTo)); + } + else + { + rTargetOpacity.push_back( + new SvgRadialAtomPrimitive2D( + aColorFrom, fScaleFrom, + aColorTo, fScaleTo)); + } } } } @@ -772,7 +784,7 @@ namespace drawinglayer maMirroredGradientEntries(), mbFocalSet(false) { - if(pFocal) + if(pFocal && !pFocal->equal(getStart())) { maFocal = *pFocal; maFocalVector = maFocal - getStart(); @@ -780,6 +792,10 @@ namespace drawinglayer } } + SvgRadialGradientPrimitive2D::~SvgRadialGradientPrimitive2D() + { + } + basegfx::B2DRange SvgRadialGradientPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const { // return ObjectRange @@ -812,28 +828,30 @@ namespace drawinglayer // use color distance and discrete lengths to calculate step count const sal_uInt32 nSteps(calculateStepsForSvgGradient(getColorA(), getColorB(), fDelta, fDiscreteUnit)); - // prepare loop and polygon (with overlap for linear gradients) - double fStart(0.0); - double fStep(fDelta / nSteps); + // prepare polygon in needed width at start position (with discrete overlap) const basegfx::B2DPolygon aPolygon( basegfx::tools::createPolygonFromRect( basegfx::B2DRange( getOffsetA() - fDiscreteUnit, 0.0, - getOffsetA() + fStep + fDiscreteUnit, + getOffsetA() + (fDelta / nSteps) + fDiscreteUnit, 1.0))); - // loop and create primitives + // prepare loop (inside to outside, [0.0 .. 1.0[) + double fUnitScale(0.0); + const double fUnitStep(1.0 / nSteps); + + // prepare result set (known size) xRetval.realloc(nSteps); - for(sal_uInt32 a(0); a < nSteps; a++, fStart += fStep) + for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep) { basegfx::B2DPolygon aNew(aPolygon); - aNew.transform(basegfx::tools::createTranslateB2DHomMatrix(fStart, 0.0)); + aNew.transform(basegfx::tools::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0)); xRetval[a] = new PolyPolygonColorPrimitive2D( basegfx::B2DPolyPolygon(aNew), - basegfx::interpolate(getColorA(), getColorB(), fStart/fDelta)); + basegfx::interpolate(getColorA(), getColorB(), fUnitScale)); } } @@ -882,24 +900,24 @@ namespace drawinglayer // use color distance and discrete lengths to calculate step count const sal_uInt32 nSteps(calculateStepsForSvgGradient(getColorA(), getColorB(), fDeltaScale, fDiscreteUnit)); - // prepare loop (outside to inside, full polygons, no polypolygons with holes) - double fEndScale(getScaleB()); - double fStepScale(fDeltaScale / nSteps); + // prepare loop ([0.0 .. 1.0[, full polygons, no polypolygons with holes) + double fUnitScale(0.0); + const double fUnitStep(1.0 / nSteps); - // loop and create primitives + // prepare result set (known size) xRetval.realloc(nSteps); - for(sal_uInt32 a(0); a < nSteps; a++, fEndScale -= fStepScale) + for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep) { - const double fUnitScale(fEndScale/fDeltaScale); basegfx::B2DHomMatrix aTransform; + const double fEndScale(getScaleB() - (fDeltaScale * fUnitScale)); if(isTranslateSet()) { const basegfx::B2DVector aTranslate( basegfx::interpolate( - getTranslateA(), getTranslateB(), + getTranslateA(), fUnitScale)); aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( @@ -920,7 +938,7 @@ namespace drawinglayer aNew.transform(aTransform); xRetval[a] = new PolyPolygonColorPrimitive2D( basegfx::B2DPolyPolygon(aNew), - basegfx::interpolate(getColorA(), getColorB(), fUnitScale)); + basegfx::interpolate(getColorB(), getColorA(), fUnitScale)); } } Copied: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx (from r1338722, incubator/ooo/trunk/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx) URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx?p2=incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx&p1=incubator/ooo/trunk/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx&r1=1338722&r2=1339213&rev=1339213&view=diff ============================================================================== --- incubator/ooo/trunk/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/objectinfoextractor2d.cxx Wed May 16 15:07:00 2012 @@ -38,7 +38,9 @@ namespace drawinglayer { namespace processor2d { - void ObjectInfoPrimitiveExtractor2D::processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) + void ObjectInfoPrimitiveExtractor2D::processBasePrimitive2D( + const primitive2d::BasePrimitive2D& rCandidate, + const primitive2d::Primitive2DReference& /*rUnoCandidate*/) { if(!mpFound) { Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/vclprocessor2d.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Wed May 16 15:07:00 2012 @@ -1408,27 +1408,30 @@ namespace drawinglayer // use color distance and discrete lengths to calculate step count const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA, aColorB, fDelta, fDiscreteUnit)); - // prepare loop and polygon - double fStart(0.0); - double fStep(fDelta / nSteps); + // switch off line painting + mpOutputDevice->SetLineColor(); + + // prepare polygon in needed width at start position (with discrete overlap) const basegfx::B2DPolygon aPolygon( basegfx::tools::createPolygonFromRect( basegfx::B2DRange( rCandidate.getOffsetA() - fDiscreteUnit, 0.0, - rCandidate.getOffsetA() + fStep + fDiscreteUnit, + rCandidate.getOffsetA() + (fDelta / nSteps) + fDiscreteUnit, 1.0))); - // switch off line painting - mpOutputDevice->SetLineColor(); + + // prepare loop ([0.0 .. 1.0[) + double fUnitScale(0.0); + const double fUnitStep(1.0 / nSteps); // loop and paint - for(sal_uInt32 a(0); a < nSteps; a++, fStart += fStep) + for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep) { basegfx::B2DPolygon aNew(aPolygon); - aNew.transform(maCurrentTransformation * basegfx::tools::createTranslateB2DHomMatrix(fStart, 0.0)); - mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fStart/fDelta))); + aNew.transform(maCurrentTransformation * basegfx::tools::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0)); + mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fUnitScale))); mpOutputDevice->DrawPolyPolygon(basegfx::B2DPolyPolygon(aNew)); } } @@ -1450,21 +1453,21 @@ namespace drawinglayer // switch off line painting mpOutputDevice->SetLineColor(); - // prepare loop (outside to inside) - double fEndScale(rCandidate.getScaleB()); - double fStepScale(fDeltaScale / nSteps); + // prepare loop ([0.0 .. 1.0[, full polygons, no polypolygons with holes) + double fUnitScale(0.0); + const double fUnitStep(1.0 / nSteps); - for(sal_uInt32 a(0); a < nSteps; a++, fEndScale -= fStepScale) + for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep) { - const double fUnitScale(fEndScale/fDeltaScale); basegfx::B2DHomMatrix aTransform; + const double fEndScale(rCandidate.getScaleB() - (fDeltaScale * fUnitScale)); if(rCandidate.isTranslateSet()) { const basegfx::B2DVector aTranslate( basegfx::interpolate( - rCandidate.getTranslateA(), rCandidate.getTranslateB(), + rCandidate.getTranslateA(), fUnitScale)); aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix( @@ -1483,7 +1486,7 @@ namespace drawinglayer basegfx::B2DPolygon aNew(basegfx::tools::createPolygonFromUnitCircle()); aNew.transform(maCurrentTransformation * aTransform); - mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fUnitScale))); + mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorB, aColorA, fUnitScale))); mpOutputDevice->DrawPolyPolygon(basegfx::B2DPolyPolygon(aNew)); } } Modified: incubator/ooo/branches/alg/aw080/main/editeng/inc/editeng/outliner.hxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/editeng/inc/editeng/outliner.hxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/editeng/inc/editeng/outliner.hxx (original) +++ incubator/ooo/branches/alg/aw080/main/editeng/inc/editeng/outliner.hxx Wed May 16 15:07:00 2012 @@ -256,7 +256,7 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); - void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); + void Paint(const Rectangle& rRect, OutputDevice* pTargetDevice = 0); void Paint(const basegfx::B2DRange& rRange, OutputDevice* pTargetDevice = 0) { Paint( Modified: incubator/ooo/branches/alg/aw080/main/extensions.lst URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/extensions.lst?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/extensions.lst (original) +++ incubator/ooo/branches/alg/aw080/main/extensions.lst Wed May 16 15:07:00 2012 @@ -55,10 +55,6 @@ [ language=en.* ] 68bfee769199749288c5e1aaf200a1ca http://sourceforge.net/projects/aoo-extensions/files/1232/7/dict-en-au-2008-12-15.oxt/download "dict-en-au-2008-12-15.oxt" -# English (South Africa, en_ZA) dictionary -[ language=en.* ] - c0c052e01b124a9ca5739facdb3ddbd5 http://sourceforge.net/projects/aoo-extensions/files/3089/0/dict-en_ZA-2009.10.22.oxt/download "dict-en_ZA-2009.10.22.oxt" - # English (New Zealand, en_NZ) dictionary [ language=en.* ] 87123666ecce441b075c0170fa58690c http://sourceforge.net/projects/aoo-extensions/files/1665/1/dict-en-nz-2008-12-03.oxt/download "dict-en-nz-2008-12-03.oxt" Modified: incubator/ooo/branches/alg/aw080/main/fetch_tarballs.sh URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/fetch_tarballs.sh?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/fetch_tarballs.sh (original) +++ incubator/ooo/branches/alg/aw080/main/fetch_tarballs.sh Wed May 16 15:07:00 2012 @@ -51,7 +51,6 @@ if [ -x /usr/bin/fetch ]; then fetch_bin=/usr/bin/fetch fetch_args="-Fpr" echo found FreeBSD fetch: $fetch_bin - break 2 else for wg in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do eval "$wg --version" > /dev/null 2>&1 @@ -189,7 +188,7 @@ echo "downloading tar balls to $TARFILE_ while read line ; do # Remove leading and trailing space and comments - line=`echo $line | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/[[:space:]]*#.*$//'` + line=`echo $line | sed 's/^\s*//;s/\s*$//;s/\s*#.*$//'` case $line in # Ignore empty lines. '') Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx Wed May 16 15:07:00 2012 @@ -1318,9 +1318,8 @@ void ApplyRectangularGradientAsBitmap( c } } - XOBitmap aXBmp( aBitmap, XBITMAP_STRETCH ); - rSet.Put( XFillBmpTileItem( sal_False ) ); - rSet.Put( XFillBitmapItem( String(), aXBmp ) ); + rSet.Put(XFillBmpTileItem(false)); + rSet.Put(XFillBitmapItem(String(), Graphic(aBitmap))); } } } @@ -1454,45 +1453,30 @@ void DffPropertyReader::ApplyFillAttribu bOK = SeekToContent( DFF_Prop_fillBlip, rIn ) && rManager.GetBLIPDirect( rIn, aGraf, NULL ); if ( bOK ) { - Bitmap aBmp( aGraf.GetBitmap() ); - if ( eMSO_FillType == mso_fillPattern ) { Color aCol1( COL_WHITE ), aCol2( COL_WHITE ); - if ( IsProperty( DFF_Prop_fillColor ) ) + + if ( IsProperty( DFF_Prop_fillColor ) ) aCol1 = rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_fillColor ), DFF_Prop_fillColor ); - if ( IsProperty( DFF_Prop_fillBackColor ) ) + + if ( IsProperty( DFF_Prop_fillBackColor ) ) aCol2 = rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_fillBackColor ), DFF_Prop_fillBackColor ); - XOBitmap aXOBitmap; - aXOBitmap.SetBitmap( aBmp ); - aXOBitmap.SetBitmapType( XBITMAP_IMPORT ); - - if( aBmp.GetSizePixel().Width() == 8 && aBmp.GetSizePixel().Height() == 8 && aBmp.GetColorCount() == 2) - { - aXOBitmap.Bitmap2Array(); - aXOBitmap.SetBitmapType( XBITMAP_8X8 ); - aXOBitmap.SetPixelSize( aBmp.GetSizePixel() ); - aXOBitmap.SetPixelColor( aCol1 ); - aXOBitmap.SetBackgroundColor( aCol2 ); - aXOBitmap.Array2Bitmap(); - } - rSet.Put( XFillBitmapItem( String(), aXOBitmap ) ); + rSet.Put(XFillBitmapItem(String(), aGraf)); } else if ( eMSO_FillType == mso_fillTexture ) { - XOBitmap aXBmp( aBmp, XBITMAP_STRETCH ); - rSet.Put( XFillBmpTileItem( sal_True ) ); - rSet.Put( XFillBitmapItem( String(), aXBmp ) ); - rSet.Put( XFillBmpSizeXItem( GetPropertyValue( DFF_Prop_fillWidth, 0 ) / 360 ) ); - rSet.Put( XFillBmpSizeYItem( GetPropertyValue( DFF_Prop_fillHeight, 0 ) / 360 ) ); - rSet.Put( XFillBmpSizeLogItem( sal_True ) ); + rSet.Put(XFillBmpTileItem(true)); + rSet.Put(XFillBitmapItem(String(), aGraf)); + rSet.Put(XFillBmpSizeXItem(GetPropertyValue(DFF_Prop_fillWidth, 0) / 360)); + rSet.Put(XFillBmpSizeYItem(GetPropertyValue(DFF_Prop_fillHeight, 0) / 360)); + rSet.Put(XFillBmpSizeLogItem(true)); } else { - XOBitmap aXBmp( aBmp, XBITMAP_STRETCH ); - rSet.Put( XFillBitmapItem( String(), aXBmp ) ); - rSet.Put( XFillBmpTileItem( sal_False ) ); + rSet.Put(XFillBitmapItem(String(), aGraf)); + rSet.Put(XFillBmpTileItem(false)); } } } Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx Wed May 16 15:07:00 2012 @@ -7637,10 +7637,9 @@ void ApplyCellAttributes( const SdrObjec { eFS = com::sun::star::drawing::FillStyle_BITMAP; - XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP )); - XOBitmap aLocalXOBitmap( aXFillBitmapItem.GetBitmapValue() ); + const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP )); rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); - aURL += rtl::OUString::createFromAscii( aLocalXOBitmap.GetGraphicObject().GetUniqueID().GetBuffer() ); + aURL += rtl::OUString::createFromAscii(aXFillBitmapItem.GetGraphicObject().GetUniqueID().GetBuffer()); static const rtl::OUString sFillBitmapURL( String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" ) ) ); xPropSet->setPropertyValue( sFillBitmapURL, Any( aURL ) ); Modified: incubator/ooo/branches/alg/aw080/main/filter/source/pdf/pdfexport.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/pdf/pdfexport.cxx?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/filter/source/pdf/pdfexport.cxx (original) +++ incubator/ooo/branches/alg/aw080/main/filter/source/pdf/pdfexport.cxx Wed May 16 15:07:00 2012 @@ -195,6 +195,8 @@ sal_Bool PDFExport::ExportSelection( vcl pPDFExtOutDevData->SetIsExportNotesPages( bExportNotesPages ); sal_Int32 nSel = aMultiSelection.FirstSelected(); + sal_Int32 nIncreasingPageNumber(0); + while ( nSel != sal_Int32(SFX_ENDOFSELECTION) ) { Sequence< PropertyValue > aRenderer( rRenderable->getRenderer( nSel - 1, rSelection, rRenderOptions ) ); @@ -206,7 +208,11 @@ sal_Bool PDFExport::ExportSelection( vcl aRenderer[ nProperty].Value >>= aPageSize; } - pPDFExtOutDevData->SetCurrentPageNumber( nSel - 1 ); + // #119348# The PageNumber at PDFExtOutDevDatahas to be the target page number, + // e.g. when exporting only page#2 from two pages, the old mechanism would + // have set it to '1', but a üpage '1' does not yet exist in the export. This + // will make PDFWriterImpl::createLink and PDFWriterImpl::setLinkURL fail (see there). + pPDFExtOutDevData->SetCurrentPageNumber(nIncreasingPageNumber++ /* nSel - 1 */); GDIMetaFile aMtf; const MapMode aMapMode( MAP_100TH_MM ); Modified: incubator/ooo/branches/alg/aw080/main/helpcontent2/settings.pmk URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/helpcontent2/settings.pmk?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/helpcontent2/settings.pmk (original) +++ incubator/ooo/branches/alg/aw080/main/helpcontent2/settings.pmk Wed May 16 15:07:00 2012 @@ -26,7 +26,7 @@ my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SO .IF "$(SYSTEM_LUCENE)" == "YES" my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) .ELSE -my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.9.4-dev.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.9.4-dev.jar .ENDIF aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) Modified: incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hpara.cpp URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hpara.cpp?rev=1339213&r1=1339212&r2=1339213&view=diff ============================================================================== --- incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hpara.cpp (original) +++ incubator/ooo/branches/alg/aw080/main/hwpfilter/source/hpara.cpp Wed May 16 15:07:00 2012 @@ -78,7 +78,7 @@ HWPPara::~HWPPara(void) if (hhstr) { // virtual destructor -/* C++?? null?? ???????? ????????. */ +/* C++ should also work on a null. */ for (ii = 0; ii < nch; ++ii) delete hhstr[ii]; @@ -103,12 +103,12 @@ int HWPPara::Read(HWPFile & hwpf, unsign hwpf.Read1b(&pstyno, 1); -/* Paragraph ???? ???? */ +/* Paragraph representative character */ cshape.Read(hwpf); if (nch > 0) hwpf.AddCharShape(&cshape); -/* Paragraph ???? ???? */ +/* Paragraph paragraph shape */ if (nch && !reuse_shape) { pshape.Read(hwpf);