Modified: openoffice/branches/alg/aw080/main/xmloff/source/text/XMLTextFrameContext.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmloff/source/text/XMLTextFrameContext.cxx?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmloff/source/text/XMLTextFrameContext.cxx (original) +++ openoffice/branches/alg/aw080/main/xmloff/source/text/XMLTextFrameContext.cxx Thu Nov 7 14:29:41 2013 @@ -297,7 +297,9 @@ XMLTextFrameContourContext_Impl::XMLText { basegfx::tools::importFromSvgD( aPolyPolygon, - sD); + sD, + true, + 0); } else { @@ -432,6 +434,7 @@ class XMLTextFrameContext_Impl : public sal_Bool bSyncHeight : 1; sal_Bool bCreateFailed : 1; sal_Bool bOwnBase64Stream : 1; + bool mbSetNameForFrame : 1; // #123261# remember if to set the NameForFrame void Create( sal_Bool bHRefOrBase64 ); @@ -440,16 +443,16 @@ public: sal_Bool CreateIfNotThere(); const OUString& GetHRef() const { return sHRef; } - XMLTextFrameContext_Impl( SvXMLImport& rImport, - sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rAttrList, - ::com::sun::star::text::TextContentAnchorType eAnchorType, - sal_uInt16 nType, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rFrameAttrList ); - virtual ~XMLTextFrameContext_Impl(); + XMLTextFrameContext_Impl( SvXMLImport& rImport, + sal_uInt16 nPrfx, + const ::rtl::OUString& rLName, + const ::com::sun::star::uno::Reference< + ::com::sun::star::xml::sax::XAttributeList > & rAttrList, + ::com::sun::star::text::TextContentAnchorType eAnchorType, + sal_uInt16 nType, + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & rFrameAttrList, + bool bSetNameForFrame); // #123261# control if to set the NameForFrame + virtual ~XMLTextFrameContext_Impl(); virtual void EndElement(); @@ -473,8 +476,38 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& GetPropSet() const { return xPropSet; } + + // #123261# helper to set the NameForFrame + void SetNameForFrameFromPropSet(); }; +void XMLTextFrameContext_Impl::SetNameForFrameFromPropSet() +{ + // set name + UniReference < XMLTextImportHelper > xTextImportHelper = GetImport().GetTextImport(); + Reference < XNamed > xNamed( xPropSet, UNO_QUERY ); + + if( xNamed.is() && xTextImportHelper.is() ) + { + OUString sOrigName( xNamed->getName() ); + if( !sOrigName.getLength() || + (sName.getLength() && sOrigName != sName) ) + { + OUString sOldName( sName ); + sal_Int32 i = 0; + while( xTextImportHelper->HasFrameByName( sName ) ) + { + sName = sOldName; + sName += OUString::valueOf( ++i ); + } + xNamed->setName( sName ); + if( sName != sOldName ) + xTextImportHelper->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_FRAME, + sOldName, sName ); + } + } +} + void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ ) { UniReference < XMLTextImportHelper > xTextImportHelper = @@ -584,27 +617,13 @@ void XMLTextFrameContext_Impl::Create( s Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - // set name - Reference < XNamed > xNamed( xPropSet, UNO_QUERY ); - if( xNamed.is() ) - { - OUString sOrigName( xNamed->getName() ); - if( !sOrigName.getLength() || - (sName.getLength() && sOrigName != sName) ) - { - OUString sOldName( sName ); - sal_Int32 i = 0; - while( xTextImportHelper->HasFrameByName( sName ) ) - { - sName = sOldName; - sName += OUString::valueOf( ++i ); - } - xNamed->setName( sName ); - if( sName != sOldName ) - xTextImportHelper->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_FRAME, - sOldName, sName ); - } - } + // #123261# set name, but only if wanted, e.g. for MultiImageSupport, it will be set after + // it is decided which image will be used. This is done e.g. to avoid double stuff and effects + // for the target to avoid double names + if(mbSetNameForFrame) + { + SetNameForFrameFromPropSet(); + } // frame style XMLPropStyleContext *pStyle = 0; @@ -808,42 +827,44 @@ sal_Bool XMLTextFrameContext_Impl::Creat } XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( - SvXMLImport& rImport, - sal_uInt16 nPrfx, const OUString& rLName, - const Reference< XAttributeList > & rAttrList, - TextContentAnchorType eATyp, - sal_uInt16 nNewType, - const Reference< XAttributeList > & rFrameAttrList ) -: SvXMLImportContext( rImport, nPrfx, rLName ) + SvXMLImport& rImport, + sal_uInt16 nPrfx, const OUString& rLName, + const Reference< XAttributeList > & rAttrList, + TextContentAnchorType eATyp, + sal_uInt16 nNewType, + const Reference< XAttributeList > & rFrameAttrList, + bool bSetNameForFrame) +: SvXMLImportContext( rImport, nPrfx, rLName ) , mbListContextPushed( false ) -, sWidth(RTL_CONSTASCII_USTRINGPARAM("Width")) -, sWidthType(RTL_CONSTASCII_USTRINGPARAM("WidthType")) -, sRelativeWidth(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth")) -, sHeight(RTL_CONSTASCII_USTRINGPARAM("Height")) -, sRelativeHeight(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight")) -, sSizeType(RTL_CONSTASCII_USTRINGPARAM("SizeType")) -, sIsSyncWidthToHeight(RTL_CONSTASCII_USTRINGPARAM("IsSyncWidthToHeight")) -, sIsSyncHeightToWidth(RTL_CONSTASCII_USTRINGPARAM("IsSyncHeightToWidth")) -, sHoriOrient(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")) -, sHoriOrientPosition(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")) -, sVertOrient(RTL_CONSTASCII_USTRINGPARAM("VertOrient")) -, sVertOrientPosition(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")) -, sChainNextName(RTL_CONSTASCII_USTRINGPARAM("ChainNextName")) -, sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")) -, sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")) -, sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")) -, sGraphicFilter(RTL_CONSTASCII_USTRINGPARAM("GraphicFilter")) +, sWidth(RTL_CONSTASCII_USTRINGPARAM("Width")) +, sWidthType(RTL_CONSTASCII_USTRINGPARAM("WidthType")) +, sRelativeWidth(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth")) +, sHeight(RTL_CONSTASCII_USTRINGPARAM("Height")) +, sRelativeHeight(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight")) +, sSizeType(RTL_CONSTASCII_USTRINGPARAM("SizeType")) +, sIsSyncWidthToHeight(RTL_CONSTASCII_USTRINGPARAM("IsSyncWidthToHeight")) +, sIsSyncHeightToWidth(RTL_CONSTASCII_USTRINGPARAM("IsSyncHeightToWidth")) +, sHoriOrient(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")) +, sHoriOrientPosition(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")) +, sVertOrient(RTL_CONSTASCII_USTRINGPARAM("VertOrient")) +, sVertOrientPosition(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")) +, sChainNextName(RTL_CONSTASCII_USTRINGPARAM("ChainNextName")) +, sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")) +, sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")) +, sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")) +, sGraphicFilter(RTL_CONSTASCII_USTRINGPARAM("GraphicFilter")) // --> OD 2009-07-22 #i73249# //, sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")) , sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")) , sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")) // <-- -, sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName")) -, sGraphicRotation(RTL_CONSTASCII_USTRINGPARAM("GraphicRotation")) -, sTextBoxServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) -, sGraphicServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GraphicObject")) -, nType( nNewType ) -, eAnchorType( eATyp ) +, sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName")) +, sGraphicRotation(RTL_CONSTASCII_USTRINGPARAM("GraphicRotation")) +, sTextBoxServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) +, sGraphicServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GraphicObject")) +, nType( nNewType ) +, eAnchorType( eATyp ) +, mbSetNameForFrame(bSetNameForFrame) { nX = 0; nY = 0; @@ -1442,13 +1463,25 @@ void XMLTextFrameContext::EndElement() { /// solve if multiple image child contexts were imported /// the winner is returned, if something has yet to be done with it - /*const SvXMLImportContext* pWinner =*/ solveMultipleImages(); + const SvXMLImportContext* pWinner = solveMultipleImages(); - SvXMLImportContext *pContext = &m_xImplContext; - XMLTextFrameContext_Impl *pImpl = dynamic_cast< XMLTextFrameContext_Impl* >( pContext ); - if( pImpl ) - { - pImpl->CreateIfNotThere(); + // #123261# see if the winner is a XMLTextFrameContext_Impl + const XMLTextFrameContext_Impl* pImplWinner = dynamic_cast< const XMLTextFrameContext_Impl* >(pWinner); + + if(pImplWinner) + { + // #123261# if yes, set name now, after the winner is identified (setting at each + // candidate may run into problems due to colliding with efforts in the target to + // avoid double names, so only set one name at one image and not at each) + const_cast< XMLTextFrameContext_Impl* >(pImplWinner)->SetNameForFrameFromPropSet(); + } + + SvXMLImportContext *pContext = &m_xImplContext; + XMLTextFrameContext_Impl *pImpl = dynamic_cast< XMLTextFrameContext_Impl* >(pContext); + + if( pImpl ) + { + pImpl->CreateIfNotThere(); // --> OD 2009-07-22 #i73249# // // alternative text @@ -1553,32 +1586,41 @@ SvXMLImportContext *XMLTextFrameContext: setSupportsMultipleContents(IsXMLToken(rLocalName, XML_IMAGE)); } - if( !pContext ) - { - - pContext = new XMLTextFrameContext_Impl( GetImport(), p_nPrefix, - rLocalName, xAttrList, - m_eDefaultAnchorType, - nFrameType, - m_xAttrList ); - } + if( !pContext ) + { + pContext = new XMLTextFrameContext_Impl( + GetImport(), + p_nPrefix, + rLocalName, + xAttrList, + m_eDefaultAnchorType, + nFrameType, + m_xAttrList, + !getSupportsMultipleContents()); + } - m_xImplContext = pContext; + m_xImplContext = pContext; if(getSupportsMultipleContents() && XML_TEXT_FRAME_GRAPHIC == nFrameType) { addContent(*m_xImplContext); } - } - } - } + } + } + } else if(getSupportsMultipleContents() && XML_NAMESPACE_DRAW == p_nPrefix && IsXMLToken(rLocalName, XML_IMAGE)) { // read another image pContext = new XMLTextFrameContext_Impl( - GetImport(), p_nPrefix, rLocalName, xAttrList, - m_eDefaultAnchorType, XML_TEXT_FRAME_GRAPHIC, m_xAttrList); - + GetImport(), + p_nPrefix, + rLocalName, + xAttrList, + m_eDefaultAnchorType, + XML_TEXT_FRAME_GRAPHIC, + m_xAttrList, + false); + m_xImplContext = pContext; addContent(*m_xImplContext); }
Modified: openoffice/branches/alg/aw080/main/xmloff/source/text/txtparae.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmloff/source/text/txtparae.cxx?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmloff/source/text/txtparae.cxx (original) +++ openoffice/branches/alg/aw080/main/xmloff/source/text/txtparae.cxx Thu Nov 7 14:29:41 2013 @@ -2899,11 +2899,11 @@ void XMLTextParagraphExport::exportConto if(bPixel) { - GetExport().GetMM100UnitConverter().convertMeasurePx(aStringBuffer, aPolyPolygonRange.getWidth()); + GetExport().GetMM100UnitConverter().convertMeasurePx(aStringBuffer, basegfx::fround(aPolyPolygonRange.getWidth())); } else { - GetExport().GetMM100UnitConverter().convertMeasure(aStringBuffer, aPolyPolygonRange.getWidth()); + GetExport().GetMM100UnitConverter().convertMeasure(aStringBuffer, basegfx::fround(aPolyPolygonRange.getWidth())); } GetExport().AddAttribute(XML_NAMESPACE_SVG, XML_WIDTH, aStringBuffer.makeStringAndClear()); @@ -2911,11 +2911,11 @@ void XMLTextParagraphExport::exportConto // svg: height if(bPixel) { - GetExport().GetMM100UnitConverter().convertMeasurePx(aStringBuffer, aPolyPolygonRange.getHeight()); + GetExport().GetMM100UnitConverter().convertMeasurePx(aStringBuffer, basegfx::fround(aPolyPolygonRange.getHeight())); } else { - GetExport().GetMM100UnitConverter().convertMeasure(aStringBuffer, aPolyPolygonRange.getHeight()); + GetExport().GetMM100UnitConverter().convertMeasure(aStringBuffer, basegfx::fround(aPolyPolygonRange.getHeight())); } GetExport().AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStringBuffer.makeStringAndClear()); @@ -2943,7 +2943,8 @@ void XMLTextParagraphExport::exportConto basegfx::tools::exportToSvgD( aPolyPolygon, true, // bUseRelativeCoordinates - false)); // bDetectQuadraticBeziers: not used in old, but maybe activated now + false, // bDetectQuadraticBeziers: not used in old, but maybe activated now + true)); // bHandleRelativeNextPointCompatible // write point array GetExport().AddAttribute( XML_NAMESPACE_SVG, XML_D, aPolygonString); Modified: openoffice/branches/alg/aw080/main/xmlsecurity/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmlsecurity/prj/build.lst?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmlsecurity/prj/build.lst (original) +++ openoffice/branches/alg/aw080/main/xmlsecurity/prj/build.lst Thu Nov 7 14:29:41 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/alg/aw080/main/xmlsecurity/source/xmlsec/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmlsecurity/source/xmlsec/makefile.mk?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmlsecurity/source/xmlsec/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/xmlsecurity/source/xmlsec/makefile.mk Thu Nov 7 14:29:41 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/alg/aw080/main/xmlsecurity/source/xmlsec/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmlsecurity/source/xmlsec/nss/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/xmlsecurity/source/xmlsec/nss/makefile.mk Thu Nov 7 14:29:41 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/alg/aw080/main/xmlsecurity/tools/demo/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmlsecurity/tools/demo/makefile.mk?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmlsecurity/tools/demo/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/xmlsecurity/tools/demo/makefile.mk Thu Nov 7 14:29:41 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/alg/aw080/main/xmlsecurity/tools/demo/mozprofile.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmlsecurity/tools/demo/mozprofile.cxx?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmlsecurity/tools/demo/mozprofile.cxx (original) +++ openoffice/branches/alg/aw080/main/xmlsecurity/tools/demo/mozprofile.cxx Thu Nov 7 14:29:41 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/alg/aw080/main/xmlsecurity/util/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/xmlsecurity/util/makefile.mk?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/xmlsecurity/util/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/xmlsecurity/util/makefile.mk Thu Nov 7 14:29:41 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 Propchange: openoffice/branches/alg/aw080/test/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test:r1504500-1539364 Propchange: openoffice/branches/alg/aw080/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1504500-1539364 Modified: openoffice/branches/alg/aw080/test/testcommon/source/org/openoffice/test/vcl/Tester.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testcommon/source/org/openoffice/test/vcl/Tester.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testcommon/source/org/openoffice/test/vcl/Tester.java (original) +++ openoffice/branches/alg/aw080/test/testcommon/source/org/openoffice/test/vcl/Tester.java Thu Nov 7 14:29:41 2013 @@ -102,13 +102,23 @@ public class Tester { robot.mousePress(InputEvent.BUTTON1_MASK); int x = fromX; int y = fromY; + // get the direction int dx = toX > fromX ? 1 : -1; int dy = toY > fromY ? 1 : -1; + // get the step sizes + final int stepTarget = 10; + int sx = (toX - fromX) / stepTarget; + int sy = (toY - fromY) / stepTarget; + if( sx == 0) sx = dx; + if( sy == 0) sy = dy; while (x != toX || y != toY) { - if (x != toX) - x = x + dx; - if (y != toY) - y = y + dy; + x += sx; + y += sy; + // limit drag pos to target pos + if( ((x - toX) * dx) > 0) + x = toX; + if( ((y - toY) * dy) > 0) + y = toY; robot.mouseMove(x, y); } robot.mouseRelease(InputEvent.BUTTON1_MASK); Modified: openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java Thu Nov 7 14:29:41 2013 @@ -526,7 +526,7 @@ public class ValidityDialogSetting { scInputBarInput.activate(); typeKeys("13"); typeKeys("<enter>"); - assertEquals("Apache OpenOffice Calc", activeMsgBox.getCaption()); + assertEquals("OpenOffice Calc", activeMsgBox.getCaption()); // assertEquals("Invalid value.",ActiveMsgBox.getMessage()); // Can not // verify in multi-language activeMsgBox.ok(); Modified: openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java Thu Nov 7 14:29:41 2013 @@ -60,11 +60,11 @@ public class ShapeTypes { @After public void tearDown() throws Exception { - sleep(3); //close navigator if (sdNavigatorDlg.exists()) { app.dispatch(".uno:Navigator"); } + AppTool.discard(); app.stop(); } @@ -78,6 +78,7 @@ public class ShapeTypes { impress.focus(); //before insert CallOut Shape sdNavigator.focus(); + sdNavigator.waitForEnabled( 2.0, 0.1); sdNavigatorShapeFilter.click(); typeKeys("<down><down>"); typeKeys("<enter>"); @@ -91,6 +92,7 @@ public class ShapeTypes { impress.focus(); impress.drag(100, 100, 200, 200); sdNavigatorDlg.focus(); + sdNavigator.waitForEnabled( 2.0, 0.1); sdNavigatorShapeFilter.click(); typeKeys("<down><down>"); typeKeys("<enter>"); @@ -99,9 +101,8 @@ public class ShapeTypes { typeKeys("<enter>"); allShapes=sdNavigator.getAllItemsText(); assertEquals(4, allShapes.length); - - } + /** * Insert a new Star shape * @throws Exception @@ -112,6 +113,7 @@ public class ShapeTypes { impress.focus(); //before insert CallOut Shape sdNavigator.focus(); + sdNavigator.waitForEnabled( 2.0, 0.1); sdNavigatorShapeFilter.click(); typeKeys("<down><down>"); typeKeys("<enter>"); @@ -125,6 +127,7 @@ public class ShapeTypes { impress.focus(); impress.drag(100, 100, 200, 200); sdNavigatorDlg.focus(); + sdNavigator.waitForEnabled( 2.0, 0.1); sdNavigatorShapeFilter.click(); typeKeys("<down><down>"); typeKeys("<enter>"); @@ -133,7 +136,6 @@ public class ShapeTypes { typeKeys("<enter>"); allShapes=sdNavigator.getAllItemsText(); assertEquals(4, allShapes.length); - } } Modified: openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java Thu Nov 7 14:29:41 2013 @@ -64,6 +64,7 @@ import static testlib.gui.UIMap.standard import static testlib.gui.UIMap.startCenterOpenButton; import java.util.HashMap; +import java.util.logging.Level; import org.junit.AfterClass; import org.junit.Before; @@ -496,5 +497,6 @@ public class BasicFuncOnCalc { HashMap<String, Object> perf = aoo.getPerfData(); xmlResult.addRow("Data",testname.getMethodName(), i, (end - start), perf.get("vsz"), perf.get("rss"), perf.get("handles")); + log.log( Level.INFO, "\t"+testname.getMethodName()+"["+i+"] took "+(end-start)+"ms"); } } Modified: openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sd/BasicFuncOnImpress.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sd/BasicFuncOnImpress.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sd/BasicFuncOnImpress.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sd/BasicFuncOnImpress.java Thu Nov 7 14:29:41 2013 @@ -34,6 +34,7 @@ import static testlib.gui.UIMap.*; import java.io.FileOutputStream; import java.io.PrintStream; import java.util.HashMap; +import java.util.logging.Level; import org.junit.After; import org.junit.AfterClass; @@ -374,5 +375,6 @@ public class BasicFuncOnImpress { HashMap<String, Object> perf = aoo.getPerfData(); xmlResult.addRow("Data",testname.getMethodName(), i, (end - start), perf.get("vsz"), perf.get("rss"), perf.get("handles")); + log.log( Level.INFO, "\t"+testname.getMethodName()+"["+i+"] took "+(end-start)+"ms"); } } Modified: openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/BasicFuncOnWriter.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/BasicFuncOnWriter.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/BasicFuncOnWriter.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/BasicFuncOnWriter.java Thu Nov 7 14:29:41 2013 @@ -34,6 +34,7 @@ import static testlib.gui.UIMap.*; import java.io.FileOutputStream; import java.io.PrintStream; import java.util.HashMap; +import java.util.logging.Level; import org.junit.After; import org.junit.AfterClass; @@ -517,6 +518,7 @@ public class BasicFuncOnWriter { HashMap<String, Object> perf = aoo.getPerfData(); xmlResult.addRow("Data",testname.getMethodName(), i, (end - start), perf.get("vsz"), perf.get("rss"), perf.get("handles")); + log.log( Level.INFO, "\t"+testname.getMethodName()+"["+i+"] took "+(end-start)+"ms"); } } Modified: openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/FileTypeAboutWriter.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/FileTypeAboutWriter.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/FileTypeAboutWriter.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/svt/gui/sw/FileTypeAboutWriter.java Thu Nov 7 14:29:41 2013 @@ -34,6 +34,7 @@ import static testlib.gui.UIMap.*; import java.io.FileOutputStream; import java.io.PrintStream; import java.util.HashMap; +import java.util.logging.Level; import org.junit.After; import org.junit.AfterClass; @@ -125,8 +126,9 @@ public class FileTypeAboutWriter { swInsertLineButtonOnToolbar.click(); writer.focus(); for(int j=0;j<10;j++){ - writer.drag(150+j, 150+j*10, 200+j, 200+j*10); - sleep(2); + // due to snap-to-grid the lines below will not all be parallel! + writer.drag( 150+j, 150+j*10, 200+j, 200+j*10); + sleep( 0.5); } typeKeys("<esc>"); sleep(2); @@ -184,6 +186,7 @@ public class FileTypeAboutWriter { HashMap<String, Object> perf = aoo.getPerfData(); xmlResult.addRow("Data",testname.getMethodName(), i, (end - start), perf.get("vsz"), perf.get("rss"), perf.get("handles")); + log.log( Level.INFO, "\t"+testname.getMethodName()+"["+i+"] took "+(end-start)+"ms"); } Modified: openoffice/branches/alg/aw080/test/testgui/source/testlib/gui/AppTool.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testgui/source/testlib/gui/AppTool.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testgui/source/testlib/gui/AppTool.java (original) +++ openoffice/branches/alg/aw080/test/testgui/source/testlib/gui/AppTool.java Thu Nov 7 14:29:41 2013 @@ -97,7 +97,13 @@ public class AppTool extends Tester { submitSaveDlg(getPath(path)); if (alienFormatDlg.exists(3)) alienFormatDlg.ok(); - app.waitSlot(5 * 60); // 10 minutes + if( activeMsgBox.exists(1)) { + String msg = activeMsgBox.getMessage(); + // #i123142# confirm overwriting of test files + if( msg.indexOf( "overwrite changes") >= 0) + activeMsgBox.yes(); + } + app.waitSlot(5 * 60); // 5 minutes } public static void close() { Modified: openoffice/branches/alg/aw080/test/testuno/source/fvt/mix/MixedTest.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testuno/source/fvt/mix/MixedTest.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testuno/source/fvt/mix/MixedTest.java (original) +++ openoffice/branches/alg/aw080/test/testuno/source/fvt/mix/MixedTest.java Thu Nov 7 14:29:41 2013 @@ -56,9 +56,7 @@ public class MixedTest { */ @Before public void setUp() throws Exception { - OpenOffice aoo = new OpenOffice(); - aoo.setAutomationPort(OpenOffice.DEFAULT_AUTOMATION_PORT); - aoo.setUnoUrl(OpenOffice.DEFAULT_UNO_URL); + OpenOffice aoo = OpenOffice.getDefault(); unoApp = new UnoApp(aoo); vclApp = new VclApp(aoo); writer = new VclWindow(vclApp, "SW_HID_EDIT_WIN"); @@ -85,11 +83,11 @@ public class MixedTest { writer.drag(10, 10, 300, 400); writer.menuItem("Format->Character...").select(); effectsPage.select(); - colorList.select("Light green"); + colorList.select("Green 3"); effectsPage.ok(); //Verify the result via UNO API XTextCursor xTextCursor = xText.createTextCursor(); XPropertySet xps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor); - Assert.assertEquals("Text Color", 0x0000FF00, xps.getPropertyValue("CharColor")); + Assert.assertEquals("Text Color", 0x00CC00, xps.getPropertyValue("CharColor")); } } Modified: openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java (original) +++ openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java Thu Nov 7 14:29:41 2013 @@ -186,9 +186,10 @@ public class ChartLegend { String chartName = "testChart"; String cellRangeName = "A1:D4"; Boolean result = true; - int delta = 4;//Save as .xls file, the legend position may change a little, set acceptable range. + int delta = 1; // tolerate legend position changes from integer rounding if (fileType.equalsIgnoreCase("xls")) { + delta = 4; // increase tolerance for legend position changes in the XLS roundtrip chartName = "Object 1"; } @@ -221,15 +222,8 @@ public class ChartLegend { assertTrue("Chart legend has not been enabled in ." + fileType + " file.", result); - if (fileType.equalsIgnoreCase("xls")) { - assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.X, resultPoint.X, delta); - assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.Y, resultPoint.Y, delta); - } - else { - assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.X, resultPoint.X); - assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.Y, resultPoint.Y); - } - + assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.X, resultPoint.X, delta); + assertEquals("Incorrect chart legend position Y got in ." + fileType + " file.", aPoint.Y, resultPoint.Y, delta); } -} \ No newline at end of file +} Modified: openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sd/graphic/GraphicPro_Border.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sd/graphic/GraphicPro_Border.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sd/graphic/GraphicPro_Border.java (original) +++ openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sd/graphic/GraphicPro_Border.java Thu Nov 7 14:29:41 2013 @@ -86,7 +86,7 @@ public class GraphicPro_Border { {LineStyle.SOLID,"Continuous", colorList[1], LineStyle.SOLID,"Continuous", colorList[1]}, {LineStyle.DASH,"Ultrafine Dashed", colorList[2], LineStyle.DASH,"Ultrafine Dashed", colorList[2]}, {LineStyle.DASH,"Fine Dashed", colorList[3], LineStyle.DASH,"Fine Dashed", colorList[3]}, - {LineStyle.DASH,"Ultrafine 2 dots 3 dashes", colorList[4], LineStyle.DASH,"Ultrafine 2 Dots 3 Dashes", colorList[4]}, + {LineStyle.DASH,"Ultrafine 2 Dots 3 Dashes", colorList[4], LineStyle.DASH,"Ultrafine 2 Dots 3 Dashes", colorList[4]}, {LineStyle.DASH,"Fine Dotted", colorList[5], LineStyle.DASH,"Fine Dotted", colorList[5]}, {LineStyle.DASH,"Line with Fine Dots", colorList[6], LineStyle.DASH,"Line with Fine Dots", colorList[6]}, {LineStyle.DASH,"Fine Dashed (var)", colorList[7], LineStyle.DASH,"Fine Dashed (var)", colorList[7]}, Modified: openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sw/DocumentTest.java URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sw/DocumentTest.java?rev=1539657&r1=1539656&r2=1539657&view=diff ============================================================================== --- openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sw/DocumentTest.java (original) +++ openoffice/branches/alg/aw080/test/testuno/source/fvt/uno/sw/DocumentTest.java Thu Nov 7 14:29:41 2013 @@ -81,8 +81,11 @@ public class DocumentTest { String title = xTitle.getTitle(); Assert.assertEquals("New Document title start with \"Untitled\"",true, title.startsWith("Untitled")); unoApp.closeDocument(component); - XModel xModel = unoApp.getDesktop().getCurrentFrame().getController().getModel(); - Assert.assertTrue("Document has been closed.",xModel==null); + XDesktop xDesktop = unoApp.getDesktop(); + XFrame xFrame = (xDesktop == null) ? null : xDesktop.getCurrentFrame(); + XController xCtrl = (xFrame == null) ? null : xFrame.getController(); + XModel xModel = (xCtrl == null) ? null : xCtrl.getModel(); + Assert.assertTrue("Document has been closed.",xModel==null); } /** * test new document from template
