Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm (original) +++ openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm Mon Nov 11 10:36:02 2013 @@ -76,7 +76,6 @@ sub check_system_path { # The following files have to be found in the environment variable PATH # All platforms: zip - # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging my $onefile; @@ -104,19 +103,6 @@ sub check_system_path if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild)) { @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe"); - - if ( $installer::globals::compiler eq "wntmsci8" ) - { - push(@needed_files_in_path, "msvcp70.dll"); - push(@needed_files_in_path, "msvcr70.dll"); - } - - if ( $installer::globals::compiler eq "wntmsci10" ) - { - push(@needed_files_in_path, "msvcp71.dll"); - push(@needed_files_in_path, "msvcr71.dll"); - } - } elsif ($installer::globals::iswin || $installer::globals::isos2) { @@ -335,7 +321,7 @@ sub filter_log_error ($$$$) # Remove all filenames that contain the word "Error". my $work_string = $message; - $work_string =~ s/Error\.(idt|mlf|ulf|html|hpp|ipp)//g; + $work_string =~ s/Error\.(idt|mlf|ulf|idl|html|hpp|ipp)//g; if ($work_string =~ /\bError\b/i) {
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm (original) +++ openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm Mon Nov 11 10:36:02 2013 @@ -2312,7 +2312,7 @@ sub log_rpm_info $infoline = "$rpmout\n"; $infoline =~ s/error/e_r_r_o_r/gi; # avoiding log problems - $installer::logger::Lang->printf($infoline); + $installer::logger::Lang->print($infoline); } } else Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm (original) +++ openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm Mon Nov 11 10:36:02 2013 @@ -144,11 +144,12 @@ sub printf ($$@) { my ($self, $format, @arguments) = @_; - my $message = sprintf($format, @arguments); - if ($message =~ /\%/) + if ($format =~ /\%\{/) { + printf(">%s<\n", $format); PrintStackTrace(); } + my $message = sprintf($format, @arguments); $self->print($message, 0); } @@ -659,6 +660,7 @@ sub PrintStackTrace () } } + sub Die ($) { my ($message) = @_; Modified: openoffice/branches/ia2/main/solenv/inc/extension_post.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/inc/extension_post.mk?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/solenv/inc/extension_post.mk (original) +++ openoffice/branches/ia2/main/solenv/inc/extension_post.mk Mon Nov 11 10:36:02 2013 @@ -92,39 +92,19 @@ $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR) .ENDIF .ELSE .IF "$(PACKMS)"!="" -.IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR) -.ELSE # "$(CCNUMVER)" <= "001399999999" -.IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR) -.ELSE # "$(CCNUMVER)" <= "001499999999" +.IF "$(CCNUMVER)" > "001499999999" $(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR) $(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR) $(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR) $(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR) -.ENDIF # "$(CCNUMVER)" <= "001499999999" -.ENDIF # "$(CCNUMVER)" <= "001399999999" +.ENDIF # "$(CCNUMVER)" > "001499999999" .ELSE # "$(PACKMS)"!="" -.IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR) -.ELSE # "$(CCNUMVER)" <= "001399999999" -.IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR) -.ELSE # "$(CCNUMVER)" <= "001499999999" +.IF "$(CCNUMVER)" > "001499999999" $(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR) $(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR) $(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR) $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR) -.ENDIF # "$(CCNUMVER)" <= "001499999999" -.ENDIF # "$(CCNUMVER)" <= "001399999999" +.ENDIF # "$(CCNUMVER)" > "001499999999" .ENDIF # "$(PACKMS)"!="" .ENDIF #"$(COM)"=="GCC" .ENDIF # "$(OS)$(CPU)"=="WNTI" Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx (original) +++ openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx Mon Nov 11 10:36:02 2013 @@ -266,10 +266,8 @@ namespace svgio const drawinglayer::primitive2d::Primitive2DReference xInverseMask( new drawinglayer::primitive2d::ModifiedColorPrimitive2D( aMaskTarget, - basegfx::BColorModifier( - basegfx::BColor(0.0, 0.0, 0.0), - 0.5, - basegfx::BCOLORMODIFYMODE_LUMINANCE_TO_ALPHA))); + basegfx::BColorModifierSharedPtr( + new basegfx::BColorModifier_luminance_to_alpha()))); aMaskTarget = drawinglayer::primitive2d::Primitive2DSequence(&xInverseMask, 1); } Modified: openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontact.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontact.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontact.cxx (original) +++ openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontact.cxx Mon Nov 11 10:36:02 2013 @@ -313,33 +313,40 @@ namespace sdr } } - drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const - { - // get the view-independent Primitive from the viewContact - drawinglayer::primitive2d::Primitive2DSequence xRetval(GetViewContact().getViewIndependentPrimitive2DSequence()); - - if(xRetval.hasElements()) - { - // handle GluePoint - if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible()) - { - const drawinglayer::primitive2d::Primitive2DSequence xGlue(GetViewContact().createGluePointPrimitive2DSequence()); + drawinglayer::primitive2d::Primitive2DSequence ViewObjectContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const + { + // get the view-independent Primitive from the viewContact + drawinglayer::primitive2d::Primitive2DSequence xRetval(GetViewContact().getViewIndependentPrimitive2DSequence()); + + if(xRetval.hasElements()) + { + // handle GluePoint + if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible()) + { + const drawinglayer::primitive2d::Primitive2DSequence xGlue(GetViewContact().createGluePointPrimitive2DSequence()); - if(xGlue.hasElements()) - { + if(xGlue.hasElements()) + { drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, xGlue); - } - } + } + } + + // handle ghosted + if(isPrimitiveGhosted(rDisplayInfo)) + { + const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); + const basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + aRGBWhite, + 0.5)); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::ModifiedColorPrimitive2D( + xRetval, + aBColorModifier)); - // handle ghosted - if(isPrimitiveGhosted(rDisplayInfo)) - { - const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); - const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE); - const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier)); xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); - } - } + } + } return xRetval; } Modified: openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3d.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3d.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3d.cxx (original) +++ openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3d.cxx Mon Nov 11 10:36:02 2013 @@ -50,23 +50,30 @@ namespace sdr { } - drawinglayer::primitive3d::Primitive3DSequence ViewObjectContactOfE3d::createPrimitive3DSequence(const DisplayInfo& rDisplayInfo) const - { - // get the view-independent Primitive from the viewContact - const ViewContactOfE3d& rViewContactOfE3d(dynamic_cast< const ViewContactOfE3d& >(GetViewContact())); - drawinglayer::primitive3d::Primitive3DSequence xRetval(rViewContactOfE3d.getViewIndependentPrimitive3DSequence()); + drawinglayer::primitive3d::Primitive3DSequence ViewObjectContactOfE3d::createPrimitive3DSequence(const DisplayInfo& rDisplayInfo) const + { + // get the view-independent Primitive from the viewContact + const ViewContactOfE3d& rViewContactOfE3d(dynamic_cast< const ViewContactOfE3d& >(GetViewContact())); + drawinglayer::primitive3d::Primitive3DSequence xRetval(rViewContactOfE3d.getViewIndependentPrimitive3DSequence()); + + // handle ghosted + if(isPrimitiveGhosted(rDisplayInfo)) + { + const ::basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); + const ::basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + aRGBWhite, + 0.5)); + const drawinglayer::primitive3d::Primitive3DReference xReference( + new drawinglayer::primitive3d::ModifiedColorPrimitive3D( + xRetval, + aBColorModifier)); - // handle ghosted - if(isPrimitiveGhosted(rDisplayInfo)) - { - const ::basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); - const ::basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, ::basegfx::BCOLORMODIFYMODE_INTERPOLATE); - const drawinglayer::primitive3d::Primitive3DReference xReference(new drawinglayer::primitive3d::ModifiedColorPrimitive3D(xRetval, aBColorModifier)); xRetval = drawinglayer::primitive3d::Primitive3DSequence(&xReference, 1); - } + } - return xRetval; - } + return xRetval; + } drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfE3d::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { Modified: openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx (original) +++ openoffice/branches/ia2/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx Mon Nov 11 10:36:02 2013 @@ -110,16 +110,22 @@ namespace sdr } } - // handle ghosted - if(isPrimitiveGhosted(rDisplayInfo)) - { - const ::basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); - const ::basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, ::basegfx::BCOLORMODIFYMODE_INTERPOLATE); - const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier)); + // handle ghosted + if(isPrimitiveGhosted(rDisplayInfo)) + { + const ::basegfx::BColor aRGBWhite(1.0, 1.0, 1.0); + const ::basegfx::BColorModifierSharedPtr aBColorModifier( + new basegfx::BColorModifier_interpolate( + aRGBWhite, + 0.5)); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::ModifiedColorPrimitive2D( + xRetval, + aBColorModifier)); xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); - } - } + } + } if(bIsActiveVC) { Modified: openoffice/branches/ia2/main/svx/source/unodraw/unoshape.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/unodraw/unoshape.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/svx/source/unodraw/unoshape.cxx (original) +++ openoffice/branches/ia2/main/svx/source/unodraw/unoshape.cxx Mon Nov 11 10:36:02 2013 @@ -92,6 +92,7 @@ #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <vector> @@ -2403,12 +2404,26 @@ bool SvxShape::setPropertyValueImpl( con } break; } - case OWN_ATTR_EDGE_POLYPOLYGONBEZIER: - { - drawing::PolyPolygonBezierCoords aPolyPoly; - if ( rValue >>= aPolyPoly ) - { - basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) ); + case OWN_ATTR_EDGE_POLYPOLYGONBEZIER: + { + basegfx::B2DPolyPolygon aNewPolyPolygon; + + // #123616# be a little bit more flexible regardin gthe data type used + if( rValue.getValueType() == ::getCppuType(( const drawing::PointSequenceSequence*)0)) + { + // get polygpon data from PointSequenceSequence + aNewPolyPolygon = basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon( + *(const drawing::PointSequenceSequence*)rValue.getValue()); + } + else if( rValue.getValueType() == ::getCppuType(( const drawing::PolyPolygonBezierCoords*)0)) + { + // get polygpon data from PolyPolygonBezierCoords + aNewPolyPolygon = basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( + *(const drawing::PolyPolygonBezierCoords*)rValue.getValue()); + } + + if(aNewPolyPolygon.count()) + { // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051 ForceMetricToItemPoolMetric( aNewPolyPolygon ); // <-- @@ -2419,9 +2434,9 @@ bool SvxShape::setPropertyValueImpl( con } pEdgeObj->SetEdgeTrackPath( aNewPolyPolygon ); return true; - } - } - } + } + } + } } break; } Modified: openoffice/branches/ia2/main/vcl/source/app/svapp.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/app/svapp.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/app/svapp.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/app/svapp.cxx Mon Nov 11 10:36:02 2013 @@ -2060,15 +2060,14 @@ sal_Bool Application::IsAccessibilityEna sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled ) { - sal_Bool bRet = sal_True; - rCancelled = sal_False; + sal_Bool bRet = true; // Disable Java bridge on UNIX #if defined UNX (void) bShowCancel; // unsued + (void) rCancelled; // unused #else - - // Checking TestBridgeRegistered() && HasAtHook() was introduced with IBM's IA2 CWS. + // Checking HasAtHook() was introduced with IBM's IA2 CWS. if( HasAtHook() ) { bRet = ImplInitAccessBridge( bShowCancel, rCancelled ); @@ -2085,9 +2084,9 @@ sal_Bool InitAccessBridge( sal_Bool bSho } else { - bRet = sal_False; + bRet = false; } -#endif +#endif // !UNX return bRet; } Modified: openoffice/branches/ia2/main/vcl/source/app/svdata.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/app/svdata.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/app/svdata.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/app/svdata.cxx Mon Nov 11 10:36:02 2013 @@ -478,7 +478,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo { //IAccessible2 Implementation 2009----- #ifdef WNT - pSVData->mxAccessBridge = xFactory->createInstance( + pSVData->mxAccessBridge = xFactory->createInstance( OUString::createFromAscii( "com.sun.star.accessibility.MSAAService" ) ); if( pSVData->mxAccessBridge.is() ) { Modified: openoffice/branches/ia2/main/vcl/source/gdi/bitmapex.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/gdi/bitmapex.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/source/gdi/bitmapex.cxx (original) +++ openoffice/branches/ia2/main/vcl/source/gdi/bitmapex.cxx Mon Nov 11 10:36:02 2013 @@ -1018,108 +1018,158 @@ BitmapEx BitmapEx::getTransformed( BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const { - Bitmap aChangedBitmap(GetBitmap()); - bool bDone(false); + Bitmap aChangedBitmap(GetBitmap()); + bool bDone(false); - for(sal_uInt32 a(rBColorModifierStack.count()); a && !bDone; ) - { - const basegfx::BColorModifier& rModifier = rBColorModifierStack.getBColorModifier(--a); - - switch(rModifier.getMode()) - { - case basegfx::BCOLORMODIFYMODE_REPLACE : - { - // complete replace - if(IsTransparent()) - { - // clear bitmap with dest color - if(aChangedBitmap.GetBitCount() <= 8) - { - // do NOT use erase; for e.g. 8bit Bitmaps, the nearest color to the given - // erase color is determined and used -> this may be different from what is - // wanted here. Better create a new bitmap with the needed color explicitely - BitmapReadAccess* pReadAccess = aChangedBitmap.AcquireReadAccess(); - OSL_ENSURE(pReadAccess, "Got no Bitmap ReadAccess ?!?"); + for(sal_uInt32 a(rBColorModifierStack.count()); a && !bDone; ) + { + const basegfx::BColorModifierSharedPtr& rModifier = rBColorModifierStack.getBColorModifier(--a); + const basegfx::BColorModifier_replace* pReplace = dynamic_cast< const basegfx::BColorModifier_replace* >(rModifier.get()); + + if(pReplace) + { + // complete replace + if(IsTransparent()) + { + // clear bitmap with dest color + if(aChangedBitmap.GetBitCount() <= 8) + { + // do NOT use erase; for e.g. 8bit Bitmaps, the nearest color to the given + // erase color is determined and used -> this may be different from what is + // wanted here. Better create a new bitmap with the needed color explicitely + BitmapReadAccess* pReadAccess = aChangedBitmap.AcquireReadAccess(); + OSL_ENSURE(pReadAccess, "Got no Bitmap ReadAccess ?!?"); + + if(pReadAccess) + { + BitmapPalette aNewPalette(pReadAccess->GetPalette()); + aNewPalette[0] = BitmapColor(Color(pReplace->getBColor())); + aChangedBitmap = Bitmap( + aChangedBitmap.GetSizePixel(), + aChangedBitmap.GetBitCount(), + &aNewPalette); + delete pReadAccess; + } + } + else + { + aChangedBitmap.Erase(Color(pReplace->getBColor())); + } + } + else + { + // erase bitmap, caller will know to paint direct + aChangedBitmap.SetEmpty(); + } + + bDone = true; + } + else + { + BitmapWriteAccess* pContent = aChangedBitmap.AcquireWriteAccess(); - if(pReadAccess) + if(pContent) + { + const double fConvertColor(1.0 / 255.0); + + if(pContent->HasPalette()) + { + const sal_uInt16 nCount(pContent->GetPaletteEntryCount()); + + for(sal_uInt16 a(0); a < nCount; a++) + { + const BitmapColor& rCol = pContent->GetPaletteColor(a); + const basegfx::BColor aBSource( + rCol.GetRed() * fConvertColor, + rCol.GetGreen() * fConvertColor, + rCol.GetBlue() * fConvertColor); + const basegfx::BColor aBDest(rModifier->getModifiedColor(aBSource)); + pContent->SetPaletteColor(a, BitmapColor(Color(aBDest))); + } + } + else if(BMP_FORMAT_24BIT_TC_BGR == pContent->GetScanlineFormat()) + { + for(sal_uInt32 y(0L); y < (sal_uInt32)pContent->Height(); y++) + { + Scanline pScan = pContent->GetScanline(y); + + for(sal_uInt32 x(0L); x < (sal_uInt32)pContent->Width(); x++) { - BitmapPalette aNewPalette(pReadAccess->GetPalette()); - aNewPalette[0] = BitmapColor(Color(rModifier.getBColor())); - aChangedBitmap = Bitmap( - aChangedBitmap.GetSizePixel(), - aChangedBitmap.GetBitCount(), - &aNewPalette); - delete pReadAccess; + const basegfx::BColor aBSource( + *(pScan + 2)* fConvertColor, + *(pScan + 1) * fConvertColor, + *pScan * fConvertColor); + const basegfx::BColor aBDest(rModifier->getModifiedColor(aBSource)); + *pScan++ = static_cast< sal_uInt8 >(aBDest.getBlue() * 255.0); + *pScan++ = static_cast< sal_uInt8 >(aBDest.getGreen() * 255.0); + *pScan++ = static_cast< sal_uInt8 >(aBDest.getRed() * 255.0); } - } - else - { - aChangedBitmap.Erase(Color(rModifier.getBColor())); } - } - else - { - // erase bitmap, caller will know to paint direct - aChangedBitmap.SetEmpty(); - } - - bDone = true; - break; - } - - default : // BCOLORMODIFYMODE_INTERPOLATE, BCOLORMODIFYMODE_GRAY, BCOLORMODIFYMODE_BLACKANDWHITE - { - BitmapWriteAccess* pContent = aChangedBitmap.AcquireWriteAccess(); - - if(pContent) - { - const double fConvertColor(1.0 / 255.0); - - for(sal_uInt32 y(0L); y < (sal_uInt32)pContent->Height(); y++) - { - for(sal_uInt32 x(0L); x < (sal_uInt32)pContent->Width(); x++) - { - const BitmapColor aBMCol(pContent->GetColor(y, x)); - const basegfx::BColor aBSource( - (double)aBMCol.GetRed() * fConvertColor, - (double)aBMCol.GetGreen() * fConvertColor, - (double)aBMCol.GetBlue() * fConvertColor); - const basegfx::BColor aBDest(rModifier.getModifiedColor(aBSource)); - - pContent->SetPixel(y, x, BitmapColor(Color(aBDest))); - } - } - - delete pContent; - } - - break; - } - } - } - - if(aChangedBitmap.IsEmpty()) - { - return BitmapEx(); - } - else - { - if(IsTransparent()) - { - if(IsAlpha()) - { - return BitmapEx(aChangedBitmap, GetAlpha()); - } - else - { - return BitmapEx(aChangedBitmap, GetMask()); - } - } - else - { - return BitmapEx(aChangedBitmap); - } - } + } + else if(BMP_FORMAT_24BIT_TC_RGB == pContent->GetScanlineFormat()) + { + for(sal_uInt32 y(0L); y < (sal_uInt32)pContent->Height(); y++) + { + Scanline pScan = pContent->GetScanline(y); + + for(sal_uInt32 x(0L); x < (sal_uInt32)pContent->Width(); x++) + { + const basegfx::BColor aBSource( + *pScan * fConvertColor, + *(pScan + 1) * fConvertColor, + *(pScan + 2) * fConvertColor); + const basegfx::BColor aBDest(rModifier->getModifiedColor(aBSource)); + *pScan++ = static_cast< sal_uInt8 >(aBDest.getRed() * 255.0); + *pScan++ = static_cast< sal_uInt8 >(aBDest.getGreen() * 255.0); + *pScan++ = static_cast< sal_uInt8 >(aBDest.getBlue() * 255.0); + } + } + } + else + { + for(sal_uInt32 y(0L); y < (sal_uInt32)pContent->Height(); y++) + { + for(sal_uInt32 x(0L); x < (sal_uInt32)pContent->Width(); x++) + { + const BitmapColor aBMCol(pContent->GetColor(y, x)); + const basegfx::BColor aBSource( + (double)aBMCol.GetRed() * fConvertColor, + (double)aBMCol.GetGreen() * fConvertColor, + (double)aBMCol.GetBlue() * fConvertColor); + const basegfx::BColor aBDest(rModifier->getModifiedColor(aBSource)); + + pContent->SetPixel(y, x, BitmapColor(Color(aBDest))); + } + } + } + + delete pContent; + } + } + } + + if(aChangedBitmap.IsEmpty()) + { + return BitmapEx(); + } + else + { + if(IsTransparent()) + { + if(IsAlpha()) + { + return BitmapEx(aChangedBitmap, GetAlpha()); + } + else + { + return BitmapEx(aChangedBitmap, GetMask()); + } + } + else + { + return BitmapEx(aChangedBitmap); + } + } } // ----------------------------------------------------------------------------- Modified: openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx (original) +++ openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx Mon Nov 11 10:36:02 2013 @@ -99,20 +99,6 @@ using ::std::max; #ifndef _WIN32_WCE #define WM_GETOBJECT 0x003D #endif -#define OBJID_WINDOW ((LONG)0x00000000) -#define OBJID_SYSMENU ((LONG)0xFFFFFFFF) -#define OBJID_TITLEBAR ((LONG)0xFFFFFFFE) -#define OBJID_MENU ((LONG)0xFFFFFFFD) -#define OBJID_CLIENT ((LONG)0xFFFFFFFC) -#define OBJID_VSCROLL ((LONG)0xFFFFFFFB) -#define OBJID_HSCROLL ((LONG)0xFFFFFFFA) -#define OBJID_SIZEGRIP ((LONG)0xFFFFFFF9) -#define OBJID_CARET ((LONG)0xFFFFFFF8) -#define OBJID_CURSOR ((LONG)0xFFFFFFF7) -#define OBJID_ALERT ((LONG)0xFFFFFFF6) -#define OBJID_SOUND ((LONG)0xFFFFFFF5) -#define OBJID_QUERYCLASSNAMEIDX ((LONG)0xFFFFFFF4) -#define OBJID_NATIVEOM ((LONG)0xFFFFFFF0) #include <win/g_msaasvc.h> #endif //-----IAccessibility2 Implementation 2009 Modified: openoffice/branches/ia2/main/xmloff/source/draw/shapeexport2.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmloff/source/draw/shapeexport2.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmloff/source/draw/shapeexport2.cxx (original) +++ openoffice/branches/ia2/main/xmloff/source/draw/shapeexport2.cxx Mon Nov 11 10:36:02 2013 @@ -986,8 +986,6 @@ void XMLShapeExport::ImpExportPolygonSha const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) { - sal_Bool bClosed(eShapeType == XmlShapeTypeDrawPolyPolygonShape - || eShapeType == XmlShapeTypeDrawClosedBezierShape); sal_Bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape || eShapeType == XmlShapeTypeDrawOpenBezierShape); Modified: openoffice/branches/ia2/main/xmlsecurity/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/prj/build.lst?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmlsecurity/prj/build.lst (original) +++ openoffice/branches/ia2/main/xmlsecurity/prj/build.lst Mon Nov 11 10:36:02 2013 @@ -1,4 +1,4 @@ -xs xmlsecurity : L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL +xs xmlsecurity : L10N:l10n xmloff unotools offapi unoil svx LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL xs xmlsecurity usr1 - all xs_mkout NULL xs xmlsecurity\inc nmake - all xs_inc NULL xs xmlsecurity\source\framework nmake - all xs_fw xs_inc NULL Modified: openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/makefile.mk?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/makefile.mk (original) +++ openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/makefile.mk Mon Nov 11 10:36:02 2013 @@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) .ENDIF -.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES" -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(ENABLE_NSS_MODULE)"!="YES" @all: - @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity.." -.ENDIF + @echo "No nss -> no libxmlsec -> no xmlsecurity.." .ENDIF .IF "$(CRYPTO_ENGINE)" == "mscrypto" Modified: openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/makefile.mk (original) +++ openoffice/branches/ia2/main/xmlsecurity/source/xmlsec/nss/makefile.mk Mon Nov 11 10:36:02 2013 @@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) .ENDIF -.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES" -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(ENABLE_NSS_MODULE)"!="YES" @all: - @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss" -.ENDIF + @echo "No nss -> no libxmlsec -> no xmlsecurity/nss" .ENDIF .IF "$(SYSTEM_MOZILLA)" != "YES" @@ -54,13 +52,6 @@ NSS_INC = $(MOZ_NSS_CFLAGS) NSPR_INC = $(MOZ_INC)$/nspr .ENDIF -.IF "$(GUI)"=="UNX" -.IF "$(COMNAME)"=="sunpro5" -CFLAGS += -features=tmplife -#This flag is needed to build mozilla 1.7 code -.ENDIF # "$(COMNAME)"=="sunpro5" -.ENDIF - .IF "$(GUI)" == "WNT" .IF "$(DBG_LEVEL)" == "0" INCPRE += \ @@ -118,11 +109,7 @@ SOLARINC += \ -I$(NSPR_INC) \ -I$(PRJ)$/source$/xmlsec -.IF "$(SYSTEM_MOZILLA)" == "YES" -SOLARINC += -DSYSTEM_MOZILLA $(NSS_INC) -.ELSE SOLARINC += -I$(NSS_INC) -.ENDIF SLOFILES = \ $(SLO)$/nssinitializer.obj \ Modified: openoffice/branches/ia2/main/xmlsecurity/tools/demo/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/tools/demo/makefile.mk?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmlsecurity/tools/demo/makefile.mk (original) +++ openoffice/branches/ia2/main/xmlsecurity/tools/demo/makefile.mk Mon Nov 11 10:36:02 2013 @@ -98,14 +98,6 @@ APP3STDLIBS+=$(SHARE_LIBS) APP3OBJS= $(SHARE_OBJS) $(OBJ)$/multisigdemo.obj # -# ---------- mozprofile ---------- -# -APP4TARGET=mozprofile -APP4DEPN=makefile.mk -APP4STDLIBS+=$(SHARE_LIBS) -APP4OBJS= $(SHARE_OBJS) $(OBJ)$/mozprofile.obj - -# # ---------- performance ---------- # APP5TARGET=performance @@ -137,8 +129,7 @@ REGISTERLIBS= \ dynamicloader.uno$(DLLPOST) \ namingservice.uno$(DLLPOST) \ bootstrap.uno$(DLLPOST) \ - sax.uno$(DLLPOST) \ - $(DLLPRE)mozab2$(DLLPOST) + sax.uno$(DLLPOST) $(BIN)$/demo.rdb: \ makefile.mk \ Modified: openoffice/branches/ia2/main/xmlsecurity/tools/demo/mozprofile.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/tools/demo/mozprofile.cxx?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmlsecurity/tools/demo/mozprofile.cxx (original) +++ openoffice/branches/ia2/main/xmlsecurity/tools/demo/mozprofile.cxx Mon Nov 11 10:36:02 2013 @@ -33,7 +33,6 @@ #include <xmlsecurity/biginteger.hxx> #include <xmlsecurity/xmlsignaturehelper.hxx> -#include <com/sun/star/mozilla/XMozillaBootstrap.hpp> using namespace ::com::sun::star; Modified: openoffice/branches/ia2/main/xmlsecurity/util/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/xmlsecurity/util/makefile.mk?rev=1540658&r1=1540657&r2=1540658&view=diff ============================================================================== --- openoffice/branches/ia2/main/xmlsecurity/util/makefile.mk (original) +++ openoffice/branches/ia2/main/xmlsecurity/util/makefile.mk Mon Nov 11 10:36:02 2013 @@ -35,9 +35,9 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/target.pmk -.IF "$(WITH_MOZILLA)" == "NO" +.IF "$(ENABLE_NSS_MODULE)" != "YES" @all: - @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity..." + @echo "No nss -> no libxmlsec -> no xmlsecurity..." .ENDIF # --- Files -------------------------------------------------------- @@ -71,8 +71,6 @@ SHL2NAME=xsec_xmlsec SHL2TARGET= $(SHL2NAME) -.IF "$(ENABLE_NSS_MODULE)"=="YES" || "$(SYSTEM_MOZILLA)" == "YES" - SHL2LIBS= \ $(SLB)$/xs_comm.lib @@ -84,8 +82,6 @@ SHL2LIBS += \ SHL2LIBS += \ $(SLB)$/xs_nss.lib -.ENDIF - SHL2STDLIBS += \ $(SALLIB) \ @@ -102,7 +98,7 @@ SHL2STDLIBS += \ SHL2STDLIBS +=-ldl .ENDIF -.IF "$(SYSTEM_MOZILLA)" == "YES" +.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES" .IF "$(NSPR_LIB)" != "" SHL2STDLIBS += $(NSPR_LIB) .ENDIF
