summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx8
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx3
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx21
6 files changed, 22 insertions, 20 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index dcdb99ada084..4f5a1a313760 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7147,7 +7147,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
if (pItem)
{
const XFillStyleItem* pFillStyle = static_cast<const XFillStyleItem*>(pItem);
- if(pFillStyle->GetValue() == XFILL_BITMAP)
+ if(pFillStyle->GetValue() == drawing::FillStyle_BITMAP)
{
bImageBackground = true;
}
@@ -7200,7 +7200,7 @@ void DocxAttributeOutput::FormatFillStyle( const XFillStyleItem& rFillStyle )
void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGradient )
{
- if (m_oFillStyle && *m_oFillStyle == XFILL_GRADIENT && !m_rExport.SdrExporter().getDMLTextFrameSyntax())
+ if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_GRADIENT && !m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
AddToAttrList( m_rExport.SdrExporter().getFlyFillAttrList(), XML_type, "gradient" );
@@ -7244,7 +7244,7 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad
AddToAttrList( m_rExport.SdrExporter().getFlyAttrList(), XML_fillcolor, sColor1.getStr() );
AddToAttrList( m_rExport.SdrExporter().getFlyFillAttrList(), XML_color2, sColor2.getStr() );
}
- else if (m_oFillStyle && *m_oFillStyle == XFILL_GRADIENT && m_rExport.SdrExporter().getDMLTextFrameSyntax())
+ else if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_GRADIENT && m_rExport.SdrExporter().getDMLTextFrameSyntax())
{
uno::Reference<beans::XPropertySet> xPropertySet = SwXFrames::GetObject(const_cast<SwFrmFmt&>(m_rExport.mpParentFrame->GetFrmFmt()), FLYCNTTYPE_FRM);
m_rDrawingML.SetFS(m_pSerializer);
@@ -7263,7 +7263,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
{
const XFillStyleItem* pFillStyle = static_cast<const XFillStyleItem*>(pItem);
FormatFillStyle(*pFillStyle);
- if (m_oFillStyle && *m_oFillStyle == XFILL_BITMAP)
+ if (m_oFillStyle && *m_oFillStyle == drawing::FillStyle_BITMAP)
{
const SdrObject* pSdrObj = m_rExport.mpParentFrame->GetFrmFmt().FindRealSdrObject();
if (pSdrObj)
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 99adbd97be33..d21560711023 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -40,6 +40,7 @@
#include <docxtablestyleexport.hxx>
#include <com/sun/star/table/BorderLine2.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
#include <boost/scoped_ptr.hpp>
@@ -868,7 +869,7 @@ private:
// Remember first cell (used for for default borders/margins) of each table
std::vector<ww8::WW8TableNodeInfoInner::Pointer_t> tableFirstCells;
- boost::optional<XFillStyle> m_oFillStyle;
+ boost::optional<css::drawing::FillStyle> m_oFillStyle;
/// If FormatBox() already handled fill style / gradient.
bool m_bIgnoreNextFill;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 482569d5c7af..6364b98c0f30 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2971,7 +2971,7 @@ void RtfAttributeOutput::FormatFillStyle(const XFillStyleItem& rFillStyle)
void RtfAttributeOutput::FormatFillGradient(const XFillGradientItem& rFillGradient)
{
- if (*m_oFillStyle == XFILL_GRADIENT)
+ if (*m_oFillStyle == drawing::FillStyle_GRADIENT)
{
m_aFlyProperties.push_back(std::make_pair<OString, OString>("fillType", OString::number(7))); // Shade using the fillAngle
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index d10cb92c28bd..f59a02922c28 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_RTFATTRIBUTEOUTPUT_HXX
#define INCLUDED_SW_SOURCE_FILTER_WW8_RTFATTRIBUTEOUTPUT_HXX
+#include <com/sun/star/drawing/FillStyle.hpp>
+
#include "attributeoutputbase.hxx"
#include "rtfexport.hxx"
#include "rtfstringbuffer.hxx"
@@ -592,7 +594,7 @@ private:
std::vector< std::pair<OString, OString> > m_aFlyProperties;
- boost::optional<XFillStyle> m_oFillStyle;
+ boost::optional<css::drawing::FillStyle> m_oFillStyle;
public:
RtfAttributeOutput(RtfExport& rExport);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 44c433cca14b..6de7aecfa8b0 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -853,9 +853,9 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
{
switch (pXFillStyleItem->GetValue())
{
- case XFILL_NONE:
+ case drawing::FillStyle_NONE:
break;
- case XFILL_SOLID:
+ case drawing::FillStyle_SOLID:
{
// Construct an SvxBrushItem, as expected by the exporters.
aSet.Put(getSvxBrushItemFromSourceSet(rFrmFmt.GetAttrSet(), RES_BACKGROUND));
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index d757538e6b7f..2af7e71f5831 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -254,10 +254,10 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill )
sal_uInt16 nPat = SVBT16ToShort(rFill.flpp);
if (nPat == 0) // transparent
- rSet.Put(XFillStyleItem(XFILL_NONE));
+ rSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
else
{
- rSet.Put(XFillStyleItem(XFILL_SOLID)); // necessary for textbox
+ rSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); // necessary for textbox
if (nPat <= 1 || ((sizeof(nPatA)/sizeof(nPatA[0])) <= nPat))
{
// Solid background or unknown
@@ -1749,11 +1749,12 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
eState = rOldSet.GetItemState(XATTR_FILLSTYLE, true, &pItem);
if (eState == SFX_ITEM_SET)
{
- const XFillStyle eFill = ((const XFillStyleItem*)pItem)->GetValue();
+ const drawing::FillStyle eFill = ((const XFillStyleItem*)pItem)->GetValue();
switch (eFill)
{
- case XFILL_NONE:
+ default:
+ case drawing::FillStyle_NONE:
// Writer graphics don't have it yet
if (eShapeType != mso_sptPictureFrame)
{
@@ -1761,8 +1762,8 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
bBrushItemOk = true;
}
break;
- case XFILL_SOLID:
- case XFILL_GRADIENT:
+ case drawing::FillStyle_SOLID:
+ case drawing::FillStyle_GRADIENT:
{
const Color aColor = static_cast< XFillColorItem const & >(
rOldSet.Get(XATTR_FILLCOLOR)).GetColorValue();
@@ -1774,11 +1775,9 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
bBrushItemOk = true;
}
break;
- // case XFILL_GRADIENT:
- // break;
- case XFILL_HATCH:
+ case drawing::FillStyle_HATCH:
break;
- case XFILL_BITMAP:
+ case drawing::FillStyle_BITMAP:
{
GraphicObject aGrfObj(static_cast< XFillBitmapItem const & >(rOldSet.Get(XATTR_FILLBITMAP)).GetGraphicObject());
const bool bTile(WW8ITEMVALUE(rOldSet, XATTR_FILLBMP_TILE, SfxBoolItem) ? true: false);
@@ -2725,7 +2724,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
pSdrTextObj = new SdrRectObj( OBJ_TEXT, pThisGroup->GetCurrentBoundRect());
SfxItemSet aSet(pDrawModel->GetItemPool());
- aSet.Put(XFillStyleItem(XFILL_NONE));
+ aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
aSet.Put(XLineStyleItem(XLINE_NONE));
aSet.Put(SdrTextFitToSizeTypeItem( SDRTEXTFIT_NONE ));
aSet.Put(SdrTextAutoGrowHeightItem(false));
generated by cgit (git 2.34.1) at 2024-06-20 21:13:54 +0000