Modified: openoffice/branches/alg/aw080/main/sw/source/core/inc/dflyobj.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/core/inc/dflyobj.hxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/core/inc/dflyobj.hxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/core/inc/dflyobj.hxx Fri Sep 13 12:52:57 2013 @@ -149,7 +149,7 @@ public: virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const; - virtual void GetPlusHdl(SdrHdlList& rHdlList, SdrObject& rSdrObject, const SdrHdl& rHdl, sal_uInt32 nPlNum) const; + virtual void GetPlusHdl(SdrHdlList& rHdlList, const SdrObject& rSdrObject, const SdrHdl& rHdl, sal_uInt32 nPlNum) const; virtual void AddToHdlList(SdrHdlList& rHdlList) const; virtual bool hasSpecialDrag() const; virtual bool beginSpecialDrag(SdrDragStat& rDrag) const;
Modified: openoffice/branches/alg/aw080/main/sw/source/filter/ww8/attributeoutputbase.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/filter/ww8/attributeoutputbase.hxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/filter/ww8/attributeoutputbase.hxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/filter/ww8/attributeoutputbase.hxx Fri Sep 13 12:52:57 2013 @@ -320,9 +320,9 @@ public: sal_Int16 nIndentAt, sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, - const String &rNumberingString , - const SvxBrushItem* pBrush = 0) = 0;//For i120928,to export graphic of bullet - + const String &rNumberingString, + const SvxBrushItem* pBrush = 0) = 0;//For i120928,to export graphic of bullet + protected: void GetNumberPara( String& rStr, const SwField& rFld ); Modified: openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.cxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.cxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.cxx Fri Sep 13 12:52:57 2013 @@ -2086,7 +2086,8 @@ void DocxAttributeOutput::NumberingLevel sal_Int16 nIndentAt, sal_Int16 nFirstLineIndex, sal_Int16 /*nListTabPos*/, - const String &rNumberingString ) + const String &rNumberingString, + const SvxBrushItem* /*pBrush*/); //For i120928,to export graphic of bullet { m_pSerializer->startElementNS( XML_w, XML_lvl, FSNS( XML_w, XML_ilvl ), OString::valueOf( sal_Int32( nLevel ) ).getStr(), Modified: openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.hxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.hxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/filter/ww8/docxattributeoutput.hxx Fri Sep 13 12:52:57 2013 @@ -259,7 +259,8 @@ public: sal_Int16 nIndentAt, sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, - const String &rNumberingString ); + const String &rNumberingString, + const SvxBrushItem* pBrush = 0) = 0;//For i120928,to export graphic of bullet void WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode ); Modified: openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.cxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.cxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.cxx Fri Sep 13 12:52:57 2013 @@ -168,7 +168,9 @@ inline sal_Int32 impl_GetPointComponent( return nRet; } -void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) +void RtfSdrExport::Commit( + EscherPropertyContainer& rProps, + const basegfx::B2DRange& rObjectRange) { OSL_TRACE("%s", OSL_THIS_FUNC); @@ -176,9 +178,9 @@ void RtfSdrExport::Commit( EscherPropert return; if ( m_nShapeType == ESCHER_ShpInst_Line ) - AddLineDimensions( rRect ); + AddLineDimensions(rObjectRange); else - AddRectangleDimensions( *m_pShapeStyle, rRect ); + AddRectangleDimensions(*m_pShapeStyle, rObjectRange); // properties const EscherProperties &rOpts = rProps.GetOpts(); @@ -393,7 +395,7 @@ void RtfSdrExport::Commit( EscherPropert } } -void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle ) +void RtfSdrExport::AddLineDimensions(const basegfx::B2DRange& rObjectRange) { OSL_TRACE("%s", OSL_THIS_FUNC); @@ -415,23 +417,23 @@ void RtfSdrExport::AddLineDimensions( co } // the actual dimensions - m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPLEFT).append(rRectangle.Left()); - m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPTOP).append(rRectangle.Top()); - m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPRIGHT).append(rRectangle.Right()); - m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(rRectangle.Bottom()); + m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPLEFT).append(basegfx::fround(rObjectRange.getMinX())); + m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPTOP).append(basegfx::fround(rObjectRange.getMinY())); + m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPRIGHT).append(basegfx::fround(rObjectRange.getMaxX())); + m_pShapeStyle->append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(basegfx::fround(rObjectRange.getMaxY())); } -void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ) +void RtfSdrExport::AddRectangleDimensions(rtl::OStringBuffer& rBuffer, const basegfx::B2DRange& rObjectRange) { OSL_TRACE("%s", OSL_THIS_FUNC); // We get the position relative to (the current?) character m_aShapeProps.insert(std::pair<OString,OString>(OString("posrelh"), OString::valueOf(sal_Int32(3)))); - rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPLEFT).append(rRectangle.Left()); - rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPTOP).append(rRectangle.Top()); - rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPRIGHT).append(rRectangle.Right()); - rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(rRectangle.Bottom()); + rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPLEFT).append(basegfx::fround(rObjectRange.getMinX())); + rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPTOP).append(basegfx::fround(rObjectRange.getMinY())); + rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPRIGHT).append(basegfx::fround(rObjectRange.getMaxX())); + rBuffer.append(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM).append(basegfx::fround(rObjectRange.getMaxY())); } void RtfSdrExport::AddShapeAttribute( sal_Int32 /*nAttribute*/, const rtl::OString& /*rValue*/ ) Modified: openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.hxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.hxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/filter/ww8/rtfsdrexport.hxx Fri Sep 13 12:52:57 2013 @@ -64,6 +64,10 @@ public: /// Call this when you need to export the object as Sdr in RTF. sal_uInt32 AddSdrObject( const SdrObject& rObj ); + virtual void Commit( + EscherPropertyContainer& rProps, + const basegfx::B2DRange& rObjectRange); + protected: /// Add an attribute to the generated shape element. /// @@ -83,8 +87,6 @@ protected: using EscherEx::EndShape; virtual void EndShape( sal_Int32 nShapeElement ); - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); - private: virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ); @@ -98,10 +100,10 @@ private: private: /// Add starting and ending point of a line to the m_pShapeAttrList. - void AddLineDimensions( const Rectangle& rRectangle ); + void AddLineDimensions(const basegfx::B2DRange& rObjectRange); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ); + void AddRectangleDimensions(rtl::OStringBuffer& rBuffer, const basegfx::B2DRange& rObjectRange); void WriteOutliner(const OutlinerParaObject& rParaObj); }; Modified: openoffice/branches/alg/aw080/main/sw/source/filter/ww8/wrtw8num.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/filter/ww8/wrtw8num.cxx?rev=1522906&r1=1522905&r2=1522906&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sw/source/filter/ww8/wrtw8num.cxx (original) +++ openoffice/branches/alg/aw080/main/sw/source/filter/ww8/wrtw8num.cxx Fri Sep 13 12:52:57 2013 @@ -215,8 +215,7 @@ void WW8AttributeOutput::NumberingLevel( sal_Int16 nFirstLineIndex, sal_Int16 nListTabPos, const String &rNumberingString, - const SvxBrushItem* pBrush //For i120928,to transfer graphic of bullet - ) + const SvxBrushItem* pBrush) //For i120928,to transfer graphic of bullet { // Start value SwWW8Writer::WriteLong( *m_rWW8Export.pTableStrm, nStart ); @@ -521,7 +520,7 @@ void MSWordExportBase::AbstractNumbering nIndentAt, nFirstLineIndex, nListTabPos, sNumStr, rFmt.GetNumberingType()==SVX_NUM_BITMAP ? rFmt.GetBrush():0);//Start for i120928,export graphic bullet,2012.9.25 - + delete pPseudoFont; } AttrOutput().EndAbstractNumbering();
