[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/qa sd/source svx/source sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Jul 18 15:31:12 PDT 2014
cui/source/tabpages/backgrnd.cxx | 27 ++--
cui/source/tabpages/tparea.cxx | 112 +++++++++---------
cui/source/tabpages/tpbitmap.cxx | 10 -
cui/source/tabpages/tpcolor.cxx | 5
cui/source/tabpages/tpgradnt.cxx | 8 -
cui/source/tabpages/tphatch.cxx | 8 -
cui/source/tabpages/tpshadow.cxx | 27 ++--
filter/source/msfilter/msdffimp.cxx | 22 +--
filter/source/msfilter/svdfppt.cxx | 29 ++--
include/svx/fillctrl.hxx | 5
include/svx/xenum.hxx | 2
include/svx/xfillit0.hxx | 5
sc/source/core/data/postit.cxx | 4
sc/source/core/tool/detfunc.cxx | 7 -
sc/source/filter/excel/xeescher.cxx | 3
sc/source/filter/excel/xiescher.cxx | 7 -
sc/source/filter/excel/xlchart.cxx | 7 -
sc/source/ui/drawfunc/fuconcustomshape.cxx | 4
sc/source/ui/view/drawview.cxx | 2
sd/qa/unit/import-tests.cxx | 2
sd/source/core/drawdoc4.cxx | 30 ++--
sd/source/core/sdpage.cxx | 4
sd/source/core/stlpool.cxx | 11 -
sd/source/filter/cgm/sdcgmfilter.cxx | 3
sd/source/filter/ppt/pptin.cxx | 4
sd/source/ui/animations/motionpathtag.cxx | 3
sd/source/ui/dlg/morphdlg.cxx | 8 -
sd/source/ui/func/fuconarc.cxx | 4
sd/source/ui/func/fuconstr.cxx | 12 +
sd/source/ui/func/fucopy.cxx | 10 -
sd/source/ui/func/fuexpand.cxx | 4
sd/source/ui/func/fumorph.cxx | 14 +-
sd/source/ui/func/fupage.cxx | 22 +--
sd/source/ui/func/fusel.cxx | 2
sd/source/ui/func/fusumry.cxx | 4
sd/source/ui/sidebar/DocumentHelper.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 14 +-
sd/source/ui/view/drviews9.cxx | 28 ++--
sd/source/ui/view/drviewsi.cxx | 6
sd/source/ui/view/sdview.cxx | 8 -
sd/source/ui/view/sdview3.cxx | 8 -
sd/source/ui/view/sdview4.cxx | 2
svx/source/customshapes/EnhancedCustomShape2d.cxx | 21 +--
svx/source/customshapes/EnhancedCustomShape3d.cxx | 30 ++--
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2
svx/source/dialog/contwnd.cxx | 4
svx/source/dialog/dlgctl3d.cxx | 14 +-
svx/source/dialog/hdft.cxx | 14 +-
svx/source/dialog/imapwnd.cxx | 3
svx/source/engine3d/float3d.cxx | 6
svx/source/engine3d/obj3d.cxx | 4
svx/source/engine3d/view3d.cxx | 20 +--
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx | 10 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 17 +-
svx/source/sdr/properties/properties.cxx | 8 -
svx/source/sdr/properties/textproperties.cxx | 4
svx/source/sidebar/area/AreaPropertyPanel.cxx | 61 ++++-----
svx/source/svdraw/sdrmasterpagedescriptor.cxx | 3
svx/source/svdraw/svdcrtv.cxx | 10 -
svx/source/svdraw/svdedtv.cxx | 6
svx/source/svdraw/svdedtv2.cxx | 7 -
svx/source/svdraw/svdetc.cxx | 10 -
svx/source/svdraw/svdfmtf.cxx | 38 +++---
svx/source/svdraw/svdibrow.cxx | 16 +-
svx/source/svdraw/svdmrkv.cxx | 5
svx/source/svdraw/svdoashp.cxx | 10 -
svx/source/svdraw/svdoattr.cxx | 4
svx/source/svdraw/svdobj.cxx | 16 +-
svx/source/svdraw/svdocirc.cxx | 6
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdoole2.cxx | 4
svx/source/svdraw/svdorect.cxx | 5
svx/source/svdraw/svdotext.cxx | 4
svx/source/svdraw/svdotextdecomposition.cxx | 7 -
svx/source/svdraw/svdotxtr.cxx | 5
svx/source/svdraw/svdpage.cxx | 4
svx/source/svdraw/svdxcgv.cxx | 6
svx/source/table/svdotable.cxx | 5
svx/source/tbxctrls/colrctrl.cxx | 7 -
svx/source/tbxctrls/fillctrl.cxx | 94 +++++++--------
svx/source/tbxctrls/itemwin.cxx | 5
svx/source/unodraw/unobrushitemhelper.cxx | 27 ++--
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/xattr.cxx | 12 -
sw/source/core/doc/docnew.cxx | 6
sw/source/core/docnode/nodedump.cxx | 13 +-
sw/source/core/frmedt/fecopy.cxx | 4
sw/source/core/layout/paintfrm.cxx | 14 +-
sw/source/core/unocore/swunohelper.cxx | 6
sw/source/core/unocore/unoframe.cxx | 4
sw/source/filter/html/htmldrawreader.cxx | 4
sw/source/filter/html/htmldrawwriter.cxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 8 -
sw/source/filter/ww8/docxattributeoutput.hxx | 3
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/rtfattributeoutput.hxx | 4
sw/source/filter/ww8/ww8atr.cxx | 4
sw/source/filter/ww8/ww8graf.cxx | 21 +--
sw/source/uibase/app/docstyle.cxx | 12 -
sw/source/uibase/ribbar/concustomshape.cxx | 4
sw/source/uibase/shells/drawsh.cxx | 2
101 files changed, 619 insertions(+), 535 deletions(-)
New commits:
commit 1e6ff8f7f8b5322bed7a1b4483f2f483b00212ba
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jul 18 18:07:36 2014 +0200
XFillStyle -> css::drawing::FillStyle
Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index fba6353..a478dfc 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <com/sun/star/drawing/FillStyle.hpp>
#include <unotools/pathoptions.hxx>
#include <vcl/builder.hxx>
#include <vcl/msgbox.hxx>
@@ -130,16 +131,16 @@ static void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency)
}
/// Returns the fill style of the currently selected entry.
-static XFillStyle lcl_getFillStyle(ListBox* pLbSelect)
+static drawing::FillStyle lcl_getFillStyle(ListBox* pLbSelect)
{
- return (XFillStyle)(sal_uLong)pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos());
+ return (drawing::FillStyle)(sal_uLong)pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos());
}
// Selects the entry matching the specified fill style.
-static void lcl_setFillStyle(ListBox* pLbSelect, XFillStyle eStyle)
+static void lcl_setFillStyle(ListBox* pLbSelect, drawing::FillStyle eStyle)
{
for (int i = 0; i < pLbSelect->GetEntryCount(); ++i)
- if ((XFillStyle)(sal_uLong)pLbSelect->GetEntryData(i) == eStyle)
+ if ((drawing::FillStyle)(sal_uLong)pLbSelect->GetEntryData(i) == eStyle)
{
pLbSelect->SelectEntryPos(i);
return;
@@ -555,7 +556,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
{
m_pSelectTxt->Hide();
m_pLbSelect->Hide();
- lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
+ lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_SOLID);
ShowColorUI_Impl();
const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_BRUSH );
@@ -681,7 +682,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
}
else
{
- lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
+ lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_SOLID);
ShowColorUI_Impl();
const SfxPoolItem* pOld = GetOldItem( rSet, SID_VIEW_FLD_PIC );
@@ -773,7 +774,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld;
SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos();
- const bool bIsBrush = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) );
+ const bool bIsBrush = ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) );
// transparency has to be set if enabled, the color not already set to "No fill" and
if( bColTransparency &&
@@ -981,7 +982,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s
SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich );
SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos();
- const bool bIsBrush = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) );
+ const bool bIsBrush = ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) );
bool bModified = false;
if ( ( (GPOS_NONE == eOldPos) && bIsBrush )
@@ -1329,7 +1330,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl)
IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
{
- if ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) )
+ if ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) )
{
ShowColorUI_Impl();
m_pParaLBox->Enable(); // drawing background can't be a bitmap
@@ -1571,7 +1572,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
xItemHolder.reset(new SvxBrushItem(nWhich));
pActItem = xItemHolder.get();
}
- if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
+ if(drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
{
*pActItem = SvxBrushItem( aBgdColor, nWhich );
}
@@ -1651,7 +1652,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
return 0;
}
pParaBck_Impl->nActPos = nSelPos;
- if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
+ if(drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
{
sal_uInt16 nWhich = pActItem->Which();
*pActItem = SvxBrushItem( aBgdColor, nWhich );
@@ -1714,7 +1715,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
if ( GPOS_NONE == ePos || !m_pLbSelect->IsVisible() )
{
- lcl_setFillStyle(m_pLbSelect, XFILL_SOLID);
+ lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_SOLID);
ShowColorUI_Impl();
Color aTrColor( COL_TRANSPARENT );
aBgdColor = rColor;
@@ -1751,7 +1752,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
const OUString aStrLink = rBgdAttr.GetGraphicLink();
const OUString aStrFilter = rBgdAttr.GetGraphicFilter();
- lcl_setFillStyle(m_pLbSelect, XFILL_BITMAP);
+ lcl_setFillStyle(m_pLbSelect, drawing::FillStyle_BITMAP);
ShowBitmapUI_Impl();
if ( !aStrLink.isEmpty() )
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1fdcbe5..cc89a49 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -45,6 +45,8 @@
#include "sfx2/opengrf.hxx"
#include <vcl/msgbox.hxx>
+using namespace com::sun::star;
+
// static ----------------------------------------------------------------
static const sal_uInt16 pAreaRanges[] =
@@ -517,7 +519,7 @@ bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet )
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
- bBitmap = ( ( ( XFillStyleItem& )rSet.Get(XATTR_FILLSTYLE) ).GetValue() == XFILL_BITMAP );
+ bBitmap = ( ( ( XFillStyleItem& )rSet.Get(XATTR_FILLSTYLE) ).GetValue() == drawing::FillStyle_BITMAP );
// show the right preview window
if ( bBitmap )
@@ -715,7 +717,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
ePoolUnit = pPool->GetMetric( XATTR_FILLBMP_SIZEX );
// setting the output device
- rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
rXFSet.Put( XFillColorItem( OUString(), COL_BLACK ) );
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
@@ -900,30 +902,30 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
}
// evaluate if any other Tabpage set another filltype
- if( m_pTypeLB->GetSelectEntryPos() > XFILL_NONE)
+ if( m_pTypeLB->GetSelectEntryPos() > drawing::FillStyle_NONE)
{
switch( nPageType )
{
case PT_GRADIENT:
- m_pTypeLB->SelectEntryPos( XFILL_GRADIENT );
+ m_pTypeLB->SelectEntryPos( drawing::FillStyle_GRADIENT );
m_pLbGradient->SelectEntryPos( _nPos );
ClickGradientHdl_Impl();
break;
case PT_HATCH:
- m_pTypeLB->SelectEntryPos( XFILL_HATCH );
+ m_pTypeLB->SelectEntryPos( drawing::FillStyle_HATCH );
m_pLbHatching->SelectEntryPos( _nPos );
ClickHatchingHdl_Impl();
break;
case PT_BITMAP:
- m_pTypeLB->SelectEntryPos( XFILL_BITMAP );
+ m_pTypeLB->SelectEntryPos( drawing::FillStyle_BITMAP );
m_pLbBitmap->SelectEntryPos( _nPos );
ClickBitmapHdl_Impl();
break;
case PT_COLOR:
- m_pTypeLB->SelectEntryPos( XFILL_SOLID );
+ m_pTypeLB->SelectEntryPos( drawing::FillStyle_SOLID );
m_pLbColor->SelectEntryPos( _nPos );
m_pLbHatchBckgrdColor->SelectEntryPos( _nPos );
ClickColorHdl_Impl();
@@ -942,10 +944,10 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
if( nDlgType == 0 ) // area dialog
{
sal_Int32 nPosOrig = nPos;
- XFillStyle eStyle = (XFillStyle) m_pTypeLB->GetSelectEntryPos();
+ drawing::FillStyle eStyle = (drawing::FillStyle) m_pTypeLB->GetSelectEntryPos();
switch( eStyle )
{
- case XFILL_GRADIENT:
+ case drawing::FillStyle_GRADIENT:
{
nPageType = PT_GRADIENT;
nPos = m_pLbGradient->GetSelectEntryPos();
@@ -953,7 +955,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
*pnGradientListState |= CT_MODIFIED;
}
break;
- case XFILL_HATCH:
+ case drawing::FillStyle_HATCH:
{
nPageType = PT_HATCH;
nPos = m_pLbHatching->GetSelectEntryPos();
@@ -961,7 +963,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
*pnHatchingListState |= CT_MODIFIED;
}
break;
- case XFILL_BITMAP:
+ case drawing::FillStyle_BITMAP:
{
nPageType = PT_BITMAP;
nPos = m_pLbBitmap->GetSelectEntryPos();
@@ -969,7 +971,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
*pnBitmapListState |= CT_MODIFIED;
}
break;
- case XFILL_SOLID:
+ case drawing::FillStyle_SOLID:
{
nPageType = PT_COLOR;
nPos = m_pLbColor->GetSelectEntryPos();
@@ -997,15 +999,16 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
if( nDlgType != 0 || *pbAreaTP )
{
const SfxPoolItem* pOld = NULL;
- XFillStyle eStyle = (XFillStyle) m_pTypeLB->GetSelectEntryPos();
- XFillStyle eSavedStyle = (XFillStyle) m_pTypeLB->GetSavedValue();
+ drawing::FillStyle eStyle = (drawing::FillStyle) m_pTypeLB->GetSelectEntryPos();
+ drawing::FillStyle eSavedStyle = (drawing::FillStyle) m_pTypeLB->GetSavedValue();
switch( eStyle )
{
- case XFILL_NONE:
+ default:
+ case drawing::FillStyle_NONE:
{
if( eSavedStyle != eStyle )
{
- XFillStyleItem aStyleItem( XFILL_NONE );
+ XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
@@ -1015,7 +1018,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
break;
- case XFILL_SOLID:
+ case drawing::FillStyle_SOLID:
{
_nPos = m_pLbColor->GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -1035,7 +1038,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true ) ) )
{
- XFillStyleItem aStyleItem( XFILL_SOLID );
+ XFillStyleItem aStyleItem( drawing::FillStyle_SOLID );
pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
@@ -1045,7 +1048,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
break;
- case XFILL_GRADIENT:
+ case drawing::FillStyle_GRADIENT:
{
_nPos = m_pLbGradient->GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -1066,7 +1069,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true ) ) )
{
- XFillStyleItem aStyleItem( XFILL_GRADIENT );
+ XFillStyleItem aStyleItem( drawing::FillStyle_GRADIENT );
pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
@@ -1076,7 +1079,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
break;
- case XFILL_HATCH:
+ case drawing::FillStyle_HATCH:
{
_nPos = m_pLbHatching->GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND &&
@@ -1112,7 +1115,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true ) ) )
{
- XFillStyleItem aStyleItem( XFILL_HATCH );
+ XFillStyleItem aStyleItem( drawing::FillStyle_HATCH );
pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
@@ -1122,13 +1125,13 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
}
}
break;
- case XFILL_BITMAP:
+ case drawing::FillStyle_BITMAP:
{
//UUUU
if(mbDirectGraphicSet && GRAPHIC_NONE != maDirectGraphic.GetType())
{
const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic);
- rAttrs->Put(XFillStyleItem(XFILL_BITMAP));
+ rAttrs->Put(XFillStyleItem(drawing::FillStyle_BITMAP));
rAttrs->Put(aXBmpItem);
bModified = true;
}
@@ -1153,7 +1156,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true ) ) )
{
- XFillStyleItem aStyleItem( XFILL_BITMAP );
+ XFillStyleItem aStyleItem( drawing::FillStyle_BITMAP );
pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
@@ -1442,10 +1445,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
bool isMissingHatching(false);
bool isMissingGradient(false);
bool isMissingBitmap(false);
- XFillStyle eXFS;
+ drawing::FillStyle eXFS;
if( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE )
{
- eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs->
+ eXFS = (drawing::FillStyle) ( ( ( const XFillStyleItem& ) rAttrs->
Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() );
m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_Int32 >( eXFS ) );
@@ -1504,24 +1507,24 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
switch( eXFS )
{
- case XFILL_NONE:
+ case drawing::FillStyle_NONE:
ClickInvisibleHdl_Impl();
break;
- case XFILL_SOLID:
+ case drawing::FillStyle_SOLID:
ClickColorHdl_Impl();
break;
- case XFILL_GRADIENT:
+ case drawing::FillStyle_GRADIENT:
ClickGradientHdl_Impl();
break;
- case XFILL_HATCH:
+ case drawing::FillStyle_HATCH:
ClickHatchingHdl_Impl();
ToggleHatchBckgrdColorHdl_Impl( this );
break;
- case XFILL_BITMAP:
+ case drawing::FillStyle_BITMAP:
{
ClickBitmapHdl_Impl();
}
@@ -1730,7 +1733,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
m_pMtrFldYOffset->SetText( "" );
// not earlier so that tile and stretch are considered
- if( m_pTypeLB->GetSelectEntryPos() == XFILL_BITMAP )
+ if( m_pTypeLB->GetSelectEntryPos() == drawing::FillStyle_BITMAP )
ClickBitmapHdl_Impl();
m_pTypeLB->SaveValue();
@@ -1772,13 +1775,14 @@ const sal_uInt16* SvxAreaTabPage::GetRanges()
IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl)
{
- switch( (XFillStyle)m_pTypeLB->GetSelectEntryPos() )
+ switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() )
{
- case XFILL_NONE: ClickInvisibleHdl_Impl(); break;
- case XFILL_SOLID: ClickColorHdl_Impl(); break;
- case XFILL_GRADIENT: ClickGradientHdl_Impl(); break;
- case XFILL_HATCH: ClickHatchingHdl_Impl(); break;
- case XFILL_BITMAP: ClickBitmapHdl_Impl(); break;
+ default:
+ case drawing::FillStyle_NONE: ClickInvisibleHdl_Impl(); break;
+ case drawing::FillStyle_SOLID: ClickColorHdl_Impl(); break;
+ case drawing::FillStyle_GRADIENT: ClickGradientHdl_Impl(); break;
+ case drawing::FillStyle_HATCH: ClickHatchingHdl_Impl(); break;
+ case drawing::FillStyle_BITMAP: ClickBitmapHdl_Impl(); break;
}
return 0;
@@ -1798,7 +1802,7 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl()
// Controls for Hatch-Background
m_pFlHatchBckgrd->Hide();
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
@@ -1839,18 +1843,18 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
m_pLbHatchBckgrdColor->SelectEntryPos( _nPos );
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
- rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
rXFSet.Put( XFillColorItem( OUString(), m_pLbColor->GetSelectEntryColor() ) );
}
// NEW
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
{
- rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() );
rXFSet.Put( XFillColorItem( OUString(), aColor ) );
}
else
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlXRectPreview->Invalidate();
@@ -1897,16 +1901,16 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
// fill ItemSet and pass it on to aCtlXRectPreview
XGradientEntry* pEntry = pGradientList->GetGradient( _nPos );
- rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
rXFSet.Put( XFillGradientItem( OUString(), pEntry->GetGradient() ) );
}
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true, &pPoolItem ) )
{
- rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
rXFSet.Put( XFillGradientItem( OUString(), ( ( const XFillGradientItem* ) pPoolItem )->GetGradientValue() ) );
}
else
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlXRectPreview->Invalidate();
@@ -1953,16 +1957,16 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl)
// fill ItemSet and pass it on to aCtlXRectPreview
XHatchEntry* pEntry = pHatchingList->GetHatch( _nPos );
- rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_HATCH ) );
rXFSet.Put( XFillHatchItem( OUString(), pEntry->GetHatch() ) );
}
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true, &pPoolItem ) )
{
- rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_HATCH ) );
rXFSet.Put( XFillHatchItem( OUString(), ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() ) );
}
else
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlXRectPreview->Invalidate();
@@ -1987,7 +1991,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl)
rXFSet.Put( XFillColorItem( OUString(), aColor ) );
}
else
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlXRectPreview->Invalidate();
@@ -2083,16 +2087,16 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
// fill ItemSet and pass it on to aCtlXRectPreview
const XBitmapEntry* pEntry = pBitmapList->GetBitmap(_nPos);
- rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
+ rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
rXFSet.Put(XFillBitmapItem(OUString(), pEntry->GetGraphicObject()));
}
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true, &pPoolItem ) )
{
- rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
+ rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
rXFSet.Put(XFillBitmapItem(OUString(), ((const XFillBitmapItem*)pPoolItem)->GetGraphicObject()));
}
else
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlBitmapPreview->Invalidate();
@@ -2151,7 +2155,7 @@ IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl )
// use loaded graphic
const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic);
- rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
+ rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
rXFSet.Put(aXBmpItem);
// trigger state flag for directly loaded graphic
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 953993c..2cfc700 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -48,6 +48,8 @@
#include "sfx2/opengrf.hxx"
#include "paragrph.hrc"
+using namespace com::sun::star;
+
SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs) :
SvxTabPage ( pParent,
@@ -65,7 +67,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs
bBmpChanged ( false ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
- aXFStyleItem ( XFILL_BITMAP ),
+ aXFStyleItem ( drawing::FillStyle_BITMAP ),
aXBitmapItem ( OUString(), Graphic() ),
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
@@ -231,7 +233,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs )
{
if(PT_BITMAP == *pPageType)
{
- _rOutAttrs->Put(XFillStyleItem(XFILL_BITMAP));
+ _rOutAttrs->Put(XFillStyleItem(drawing::FillStyle_BITMAP));
sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
@@ -312,9 +314,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
if(SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLSTYLE), true, &pPoolItem))
{
- const XFillStyle eXFS((XFillStyle)((const XFillStyleItem*)pPoolItem)->GetValue());
+ const drawing::FillStyle eXFS((drawing::FillStyle)((const XFillStyleItem*)pPoolItem)->GetValue());
- if((XFILL_BITMAP == eXFS) && (SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLBITMAP), true, &pPoolItem)))
+ if((drawing::FillStyle_BITMAP == eXFS) && (SFX_ITEM_SET == rOutAttrs.GetItemState(GetWhich(XATTR_FILLBITMAP), true, &pPoolItem)))
{
pGraphicObject = new GraphicObject(((const XFillBitmapItem*)pPoolItem)->GetGraphicObject());
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 5c2ecd7..2e016df 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -47,6 +47,7 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+using namespace com::sun::star;
XPropertyListRef SvxColorTabPage::GetList()
{
@@ -312,7 +313,7 @@ SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
, nDlgType( 0 )
, pPos( NULL )
, pbAreaTP( NULL )
- , aXFStyleItem( XFILL_SOLID )
+ , aXFStyleItem( drawing::FillStyle_SOLID )
, aXFillColorItem( OUString(), Color( COL_BLACK ) )
, aXFillAttr( (XOutdevItemPool*) rInAttrs.GetPool() )
, rXFSet( aXFillAttr.GetItemSet() )
@@ -576,7 +577,7 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
aColor.SetColor (aCurrentColor.GetColor());
}
rSet->Put( XFillColorItem( aString, aColor ) );
- rSet->Put( XFillStyleItem( XFILL_SOLID ) );
+ rSet->Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
}
return true;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 96c48ff..1fd7706 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -42,6 +42,8 @@
#include <svx/dialogs.hrc>
#include "paragrph.hrc"
+using namespace com::sun::star;
+
SvxGradientTabPage::SvxGradientTabPage
(
Window* pParent,
@@ -59,7 +61,7 @@ SvxGradientTabPage::SvxGradientTabPage
pbAreaTP ( 0 ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
- aXFStyleItem ( XFILL_GRADIENT ),
+ aXFStyleItem ( drawing::FillStyle_GRADIENT ),
aXGradientItem ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
@@ -335,7 +337,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
(sal_uInt16) m_pMtrColorTo->GetValue() );
}
DBG_ASSERT( pXGradient, "XGradient konnte nicht erzeugt werden" );
- rSet->Put( XFillStyleItem( XFILL_GRADIENT ) );
+ rSet->Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
rSet->Put( XFillGradientItem( aString, *pXGradient ) );
delete pXGradient;
@@ -780,7 +782,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
const SfxPoolItem* pPoolItem = NULL;
if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
{
- if( ( XFILL_GRADIENT == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
+ if( ( drawing::FillStyle_GRADIENT == (drawing::FillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true, &pPoolItem ) ) )
{
pGradient = new XGradient( ( ( const XFillGradientItem* ) pPoolItem )->GetGradientValue() );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 0cdff35..f2d591e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -44,6 +44,8 @@
#include "paragrph.hrc"
#include <svx/dialogs.hrc>
+using namespace com::sun::star;
+
SvxHatchTabPage::SvxHatchTabPage
(
Window* pParent,
@@ -62,7 +64,7 @@ SvxHatchTabPage::SvxHatchTabPage
pbAreaTP ( 0 ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
- aXFStyleItem ( XFILL_HATCH ),
+ aXFStyleItem ( drawing::FillStyle_HATCH ),
aXHatchItem ( OUString(), XHatch() ),
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
@@ -303,7 +305,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
static_cast<long>(m_pMtrAngle->GetValue() * 10) );
}
DBG_ASSERT( pXHatch, "XHatch konnte nicht erzeugt werden" );
- rSet->Put( XFillStyleItem( XFILL_HATCH ) );
+ rSet->Put( XFillStyleItem( drawing::FillStyle_HATCH ) );
rSet->Put( XFillHatchItem( aString, *pXHatch ) );
delete pXHatch;
@@ -393,7 +395,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
const SfxPoolItem* pPoolItem = NULL;
if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
{
- if( ( XFILL_HATCH == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
+ if( ( drawing::FillStyle_HATCH == (drawing::FillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true, &pPoolItem ) ) )
{
pHatch = new XHatch( ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() );
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index b623734..d1dfe22 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -35,6 +35,8 @@
#include <svx/xlineit0.hxx>
#include <sfx2/request.hxx>
+using namespace com::sun::star;
+
static const sal_uInt16 pShadowRanges[] =
{
SDRATTR_SHADOWCOLOR,
@@ -90,16 +92,14 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
ePoolUnit = pPool->GetMetric( SDRATTR_SHADOWXDIST );
// setting the output device
- XFillStyle eXFS = XFILL_SOLID;
+ drawing::FillStyle eXFS = drawing::FillStyle_SOLID;
if( rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE )
{
- eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rOutAttrs.
+ eXFS = (drawing::FillStyle) ( ( ( const XFillStyleItem& ) rOutAttrs.
Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() );
switch( eXFS )
{
- //case XFILL_NONE: --> NOTHING
-
- case XFILL_SOLID:
+ case drawing::FillStyle_SOLID:
if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLCOLOR ) )
{
XFillColorItem aColorItem( ( const XFillColorItem& )
@@ -108,7 +108,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
break;
- case XFILL_GRADIENT:
+ case drawing::FillStyle_GRADIENT:
if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLGRADIENT ) )
{
XFillGradientItem aGradientItem( ( ( const XFillGradientItem& )
@@ -117,7 +117,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
break;
- case XFILL_HATCH:
+ case drawing::FillStyle_HATCH:
if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLHATCH ) )
{
XFillHatchItem aHatchItem( ( ( const XFillHatchItem& )
@@ -126,7 +126,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
break;
- case XFILL_BITMAP:
+ case drawing::FillStyle_BITMAP:
{
if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLBITMAP ) )
{
@@ -136,7 +136,8 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
}
break;
- case XFILL_NONE : break;
+ case drawing::FillStyle_NONE : break;
+ default: break;
}
}
else
@@ -144,13 +145,13 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
rXFSet.Put( XFillColorItem( OUString(), COL_LIGHTRED ) );
}
- if(XFILL_NONE == eXFS)
+ if(drawing::FillStyle_NONE == eXFS)
{
// #i96350#
// fallback to solid fillmode when no fill mode is provided to have
// a reasonable shadow preview. The used color will be a set one or
// the default (currently blue8)
- eXFS = XFILL_SOLID;
+ eXFS = drawing::FillStyle_SOLID;
}
rXFSet.Put( XFillStyleItem( eXFS ) );
@@ -493,9 +494,9 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
{
if( m_pTsbShowShadow->GetState() == TRISTATE_TRUE )
- rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
else
- rXFSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
sal_Int32 nPos = m_pLbShadowColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index fa8672f..0956d12 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1248,16 +1248,16 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
if ( nFillFlags & 0x10 )
{
MSO_FillType eMSO_FillType = (MSO_FillType)GetPropertyValue( DFF_Prop_fillType, mso_fillSolid );
- XFillStyle eXFill = XFILL_NONE;
+ drawing::FillStyle eXFill = drawing::FillStyle_NONE;
switch( eMSO_FillType )
{
case mso_fillSolid : // Fill with a solid color
- eXFill = XFILL_SOLID;
+ eXFill = drawing::FillStyle_SOLID;
break;
case mso_fillPattern : // Fill with a pattern (bitmap)
case mso_fillTexture : // A texture (pattern with its own color map)
case mso_fillPicture : // Center a picture in the shape
- eXFill = XFILL_BITMAP;
+ eXFill = drawing::FillStyle_BITMAP;
break;
case mso_fillShadeCenter : // Shade from bounding rectangle to end point
{
@@ -1265,16 +1265,16 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
//But the gradient look well comparing with imported as gradient. And rotate with shape
//also works better. So here just keep it.
if ( rObjData.aBoundRect.IsEmpty() )// size of object needed to be able
- eXFill = XFILL_GRADIENT; // to create a bitmap substitution
+ eXFill = drawing::FillStyle_GRADIENT; // to create a bitmap substitution
else
- eXFill = XFILL_BITMAP;
+ eXFill = drawing::FillStyle_BITMAP;
}
break;
case mso_fillShade : // Shade from start to end points
case mso_fillShadeShape : // Shade from shape outline to end point
case mso_fillShadeScale : // Similar to mso_fillShade, but the fillAngle
case mso_fillShadeTitle : // special type - shade to title --- for PP
- eXFill = XFILL_GRADIENT;
+ eXFill = drawing::FillStyle_GRADIENT;
break;
// case mso_fillBackground : // Use the background fill color/pattern
default: break;
@@ -1286,7 +1286,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
if (IsProperty(DFF_Prop_fillOpacity))
{
dTrans = GetPropertyValue(DFF_Prop_fillOpacity) / 65536.0;
- if ( eXFill != XFILL_GRADIENT )
+ if ( eXFill != drawing::FillStyle_GRADIENT )
{
dTrans = dTrans * 100;
rSet.Put(XFillTransparenceItem(
@@ -1297,15 +1297,15 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
if ( IsProperty(DFF_Prop_fillBackOpacity) )
dBackTrans = GetPropertyValue(DFF_Prop_fillBackOpacity) / 65536.0;
- if ( ( eMSO_FillType == mso_fillShadeCenter ) && ( eXFill == XFILL_BITMAP ) )
+ if ( ( eMSO_FillType == mso_fillShadeCenter ) && ( eXFill == drawing::FillStyle_BITMAP ) )
{
ApplyRectangularGradientAsBitmap( rManager, rIn, rSet, aShadeColors, rObjData, mnFix16Angle );
}
- else if ( eXFill == XFILL_GRADIENT )
+ else if ( eXFill == drawing::FillStyle_GRADIENT )
{
ImportGradientColor ( rSet, eMSO_FillType, dTrans , dBackTrans );
}
- else if ( eXFill == XFILL_BITMAP )
+ else if ( eXFill == drawing::FillStyle_BITMAP )
{
if( IsProperty( DFF_Prop_fillBlip ) )
{
@@ -1370,7 +1370,7 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
}
}
else
- rSet.Put( XFillStyleItem( XFILL_NONE ) );
+ rSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
}
void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 3fba7da..1426da8 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1045,7 +1045,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( pRet )
{
pTObj->SetMergedItem( XLineStyleItem( XLINE_NONE ) );
- pTObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+ pTObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
}
if ( bVerticalText )
{
@@ -2972,7 +2972,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
if ( !pSet )
{
pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
- pSet->Put( XFillStyleItem( XFILL_NONE ) );
+ pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
}
pSet->Put( XLineStyleItem( XLINE_NONE ) );
Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
@@ -5578,10 +5578,10 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s
pItemSet->GetItemState( XATTR_FILLSTYLE, false, &pFillStyleItem );
if ( pFillStyleItem )
{
- XFillStyle eFillStyle = ((XFillStyleItem*)pFillStyleItem)->GetValue();
+ drawing::FillStyle eFillStyle = ((XFillStyleItem*)pFillStyleItem)->GetValue();
switch( eFillStyle )
{
- case XFILL_SOLID :
+ case drawing::FillStyle_SOLID :
{
const SfxPoolItem* pFillColorItem = NULL;
pItemSet->GetItemState( XATTR_FILLCOLOR, false, &pFillColorItem );
@@ -5589,7 +5589,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s
aDefColor = ((XColorItem*)pFillColorItem)->GetColorValue();
}
break;
- case XFILL_GRADIENT :
+ case drawing::FillStyle_GRADIENT :
{
const SfxPoolItem* pGradientItem = NULL;
pItemSet->GetItemState( XATTR_FILLGRADIENT, false, &pGradientItem );
@@ -5597,8 +5597,8 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s
aDefColor = ((XFillGradientItem*)pGradientItem)->GetGradientValue().GetStartColor();
}
break;
- case XFILL_HATCH :
- case XFILL_BITMAP :
+ case drawing::FillStyle_HATCH :
+ case drawing::FillStyle_BITMAP :
aDefColor = Color( COL_WHITE );
break;
default: break;
@@ -7267,11 +7267,11 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
xPropSet->setPropertyValue( sWritingMode , Any( ::com::sun::star::text::WritingMode_TB_RL ) );
}
SfxItemSet aSet( pObj->GetMergedItemSet() );
- XFillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue());
+ drawing::FillStyle eFillStyle(((XFillStyleItem&)pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue());
::com::sun::star::drawing::FillStyle eFS( com::sun::star::drawing::FillStyle_NONE );
switch( eFillStyle )
{
- case XFILL_SOLID :
+ case drawing::FillStyle_SOLID :
{
static const OUString sFillColor( "FillColor" );
eFS = com::sun::star::drawing::FillStyle_SOLID;
@@ -7280,7 +7280,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
xPropSet->setPropertyValue( sFillColor, Any( nFillColor ) );
}
break;
- case XFILL_GRADIENT :
+ case drawing::FillStyle_GRADIENT :
{
eFS = com::sun::star::drawing::FillStyle_GRADIENT;
XGradient aXGradient(((const XFillGradientItem&)pObj->GetMergedItem(XATTR_FILLGRADIENT)).GetGradientValue());
@@ -7301,10 +7301,10 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
xPropSet->setPropertyValue( sFillGradient, Any( aGradient ) );
}
break;
- case XFILL_HATCH :
+ case drawing::FillStyle_HATCH :
eFS = com::sun::star::drawing::FillStyle_HATCH;
break;
- case XFILL_BITMAP :
+ case drawing::FillStyle_BITMAP :
{
eFS = com::sun::star::drawing::FillStyle_BITMAP;
@@ -7326,14 +7326,15 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_NO_REPEAT ) );
}
break;
- case XFILL_NONE :
+ default:
+ case drawing::FillStyle_NONE :
eFS = com::sun::star::drawing::FillStyle_NONE;
break;
}
static const OUString sFillStyle( "FillStyle" );
xPropSet->setPropertyValue( sFillStyle, Any( eFS ) );
- if ( eFillStyle != XFILL_NONE )
+ if ( eFillStyle != drawing::FillStyle_NONE )
{
sal_Int16 nFillTransparence( ( (const XFillTransparenceItem&)pObj->GetMergedItem( XATTR_FILLTRANSPARENCE ) ).GetValue() );
static const OUString sFillTransparence( "FillTransparence" );
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 8825770..215ce4d 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -23,6 +23,7 @@
#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
+#include <com/sun/star/drawing/FillStyle.hpp>
class XFillStyleItem;
class XFillColorItem;
@@ -53,7 +54,7 @@ private:
SvxFillTypeBox* mpFillTypeLB;
SvxFillAttrBox* mpFillAttrLB;
- XFillStyle meLastXFS;
+ css::drawing::FillStyle meLastXFS;
/// bitfield
bool mbUpdate:1;
@@ -93,7 +94,7 @@ private:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
- void InitializeFillStyleAccordingToGivenFillType(XFillStyle eFillStyle);
+ void InitializeFillStyleAccordingToGivenFillType(css::drawing::FillStyle eFillStyle);
void updateLastFillTypeControlSelectEntryPos();
void updateLastFillAttrControlSelectEntryPos();
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index c405c4b..2f76110 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -23,8 +23,6 @@
enum XLineStyle { XLINE_NONE, XLINE_SOLID, XLINE_DASH };
enum XDashStyle { XDASH_RECT, XDASH_ROUND, XDASH_RECTRELATIVE,
XDASH_ROUNDRELATIVE };
-enum XFillStyle { XFILL_NONE, XFILL_SOLID, XFILL_GRADIENT, XFILL_HATCH,
- XFILL_BITMAP };
enum XGradientStyle { XGRAD_LINEAR, XGRAD_AXIAL, XGRAD_RADIAL,
XGRAD_ELLIPTICAL, XGRAD_SQUARE, XGRAD_RECT };
enum XHatchStyle { XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE };
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 51edf4e..1c28fc1 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -25,6 +25,7 @@
#include <svx/xdef.hxx>
#include <svx/xenum.hxx>
#include <svx/svxdllapi.h>
+#include <com/sun/star/drawing/FillStyle.hpp>
// class XFillStyleItem
@@ -34,7 +35,7 @@ class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem
{
public:
TYPEINFO_OVERRIDE();
- XFillStyleItem(XFillStyle = XFILL_SOLID);
+ XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID);
XFillStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE;
@@ -48,7 +49,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
- XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); }
+ css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); }
};
#endif
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 49f04cd..b89c22b 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -48,6 +48,8 @@
#include <utility>
+using namespace com::sun::star;
+
namespace {
const long SC_NOTECAPTION_WIDTH = 2900; /// Default width of note caption textbox.
@@ -113,7 +115,7 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
aItemSet.Put( XLineStartItem( OUString(), ::basegfx::B2DPolyPolygon( aTriangle ) ) );
aItemSet.Put( XLineStartWidthItem( 200 ) );
aItemSet.Put( XLineStartCenterItem( false ) );
- aItemSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ aItemSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
aItemSet.Put( XFillColorItem( OUString(), ScDetectiveFunc::GetCommentColor() ) );
aItemSet.Put( SdrCaptionEscDirItem( SDRCAPT_ESCBESTFIT ) );
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 39e4bbd..a4ac8cb 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -73,6 +73,7 @@
#include <boost/scoped_array.hpp>
using ::std::vector;
+using namespace com::sun::star;
// line ends are now created with an empty name.
// The checkForUniqueItem method then finds a unique name for the item's value.
@@ -141,7 +142,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
nMaxLevel = 0;
aBoxSet.Put( XLineColorItem( EMPTY_OUSTRING, Color( ScDetectiveFunc::GetArrowColor() ) ) );
- aBoxSet.Put( XFillStyleItem( XFILL_NONE ) );
+ aBoxSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
// Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln,
// um von den konfigurierten Linienenden unabhaengig zu sein
@@ -186,7 +187,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
aFromTabSet.Put( XLineEndCenterItem( false ) );
aCircleSet.Put( XLineColorItem( OUString(), Color( ScDetectiveFunc::GetErrorColor() ) ) );
- aCircleSet.Put( XFillStyleItem( XFILL_NONE ) );
+ aCircleSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
sal_uInt16 nWidth = 55; // 54 = 1 Pixel
aCircleSet.Put( XLineWidthItem( nWidth ) );
}
@@ -205,7 +206,7 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
aCaptionSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
aCaptionSet.Put( XLineStartWidthItem( 200 ) );
aCaptionSet.Put( XLineStartCenterItem( false ) );
- aCaptionSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ aCaptionSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
Color aYellow( ScDetectiveFunc::GetCommentColor() );
aCaptionSet.Put( XFillColorItem( OUString(), aYellow ) );
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 3b6a2f8..1223057 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -80,6 +80,7 @@
#include <oox/export/utils.hxx>
#include <boost/shared_ptr.hpp>
+using namespace com::sun::star;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -1234,7 +1235,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
// AutoFill style would change if Postit.cxx object creation values are changed
OUString aCol(((XFillColorItem &)GETITEM(aItemSet, XFillColorItem , XATTR_FILLCOLOR)).GetValue());
- mbAutoFill = aCol.isEmpty() && (GETITEMVALUE(aItemSet, XFillStyleItem, XATTR_FILLSTYLE, sal_uLong) == XFILL_SOLID);
+ mbAutoFill = aCol.isEmpty() && (GETITEMVALUE(aItemSet, XFillStyleItem, XATTR_FILLSTYLE, sal_uLong) == drawing::FillStyle_SOLID);
mbAutoLine = true;
mbRowHidden = (rRoot.GetDoc().RowHidden(maScPos.Row(),maScPos.Tab()));
mbColHidden = (rRoot.GetDoc().ColHidden(maScPos.Col(),maScPos.Tab()));
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 86f14a1..e9366ff 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -110,6 +110,7 @@
#include <boost/shared_ptr.hpp>
#include <sfx2/docfile.hxx>
+using namespace com::sun::star;
using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Any;
using ::com::sun::star::beans::XPropertySet;
@@ -702,7 +703,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
}
else if( rFillData.mnPattern == EXC_PATT_NONE )
{
- rSdrObj.SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+ rSdrObj.SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
}
else
{
@@ -710,7 +711,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
Color aBackColor = GetPalette().GetColor( rFillData.mnBackColorIdx );
if( (rFillData.mnPattern == EXC_PATT_SOLID) || (aPattColor == aBackColor) )
{
- rSdrObj.SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
+ rSdrObj.SetMergedItem( XFillStyleItem( drawing::FillStyle_SOLID ) );
rSdrObj.SetMergedItem( XFillColorItem( EMPTY_OUSTRING, aPattColor ) );
}
else
@@ -757,7 +758,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
aXOBitmap.Array2Bitmap();
aBitmap = aXOBitmap.GetBitmap();
- rSdrObj.SetMergedItem(XFillStyleItem(XFILL_BITMAP));
+ rSdrObj.SetMergedItem(XFillStyleItem(drawing::FillStyle_BITMAP));
rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_OUSTRING, Graphic(aBitmap)));
}
}
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index de9b157..52307ac 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -50,6 +50,7 @@
#include "xlroot.hxx"
#include "xlstyle.hxx"
+using namespace com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
@@ -1021,7 +1022,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
{
switch( pStyleItem->GetValue() )
{
- case XFILL_SOLID:
+ case drawing::FillStyle_SOLID:
// #i84812# Excel 2007 writes Escher properties for solid fill
if( const XFillColorItem* pColorItem = static_cast< const XFillColorItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLCOLOR, false ) ) )
{
@@ -1035,7 +1036,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
rAreaHlp.WriteToPropertySet( rPropSet );
}
break;
- case XFILL_GRADIENT:
+ case drawing::FillStyle_GRADIENT:
if( const XFillGradientItem* pGradItem = static_cast< const XFillGradientItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLGRADIENT, false ) ) )
{
Any aGradientAny;
@@ -1053,7 +1054,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
}
}
break;
- case XFILL_BITMAP:
+ case drawing::FillStyle_BITMAP:
if( const XFillBitmapItem* pBmpItem = static_cast< const XFillBitmapItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLBITMAP, false ) ) )
{
Any aBitmapAny;
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 9acf314..ce2e452 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -35,6 +35,8 @@
#include <math.h>
+using namespace com::sun::star;
+
FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq )
: FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq )
{
@@ -88,7 +90,7 @@ bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
if ( ((SdrObjCustomShape*)pObj)->UseNoFillStyle() )
bForceNoFillStyle = true;
if ( bForceNoFillStyle )
- pObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+ pObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
pObj->SetGridOffset( aGridOff );
}
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 7f4ef96..2dc1018 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -975,7 +975,7 @@ SdrObject* ScDrawView::ApplyGraphicToObject(
SfxItemSet aSet(GetModel()->GetItemPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
- aSet.Put(XFillStyleItem(XFILL_BITMAP));
+ aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
aSet.Put(XFillBitmapItem(OUString(), rGraphic));
rHitObject.SetMergedItemSetAndBroadcast(aSet);
return &rHitObject;
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 51b5fcc..d1ae4e8 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -423,7 +423,7 @@ void SdFiltersTest::testFdo77027()
// check that the fill style/color was actually imported
const XFillStyleItem& rStyleItem = dynamic_cast<const XFillStyleItem&>(
pObj->GetMergedItem(XATTR_FILLSTYLE));
- CPPUNIT_ASSERT_EQUAL(XFILL_SOLID, rStyleItem.GetValue());
+ CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rStyleItem.GetValue());
const XFillColorItem& rColorItem = dynamic_cast<const XFillColorItem&>(
pObj->GetMergedItem(XATTR_FILLCOLOR));
CPPUNIT_ASSERT_EQUAL(Color(0xff6600), rColorItem.GetColorValue());
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 59c7832..11a20a1 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -163,7 +163,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_BLOCK));
// Fill attributes (Extended OutputDevice)
- rISet.Put(XFillStyleItem(XFILL_SOLID));
+ rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
rISet.Put(XFillColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_FILLING)));
rISet.Put( XFillGradientItem( aNullGrad) );
@@ -295,7 +295,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
pISet = &pSheet->GetItemSet();
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
// Object no fill no line
@@ -306,7 +306,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
pISet = &pSheet->GetItemSet();
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(XLineStyleItem(XLINE_NONE));
// Text
@@ -318,7 +318,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
// Text body
aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY);
@@ -328,7 +328,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT)); // 16 pt
@@ -340,7 +340,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(SvxAdjustItem(SVX_ADJUST_BLOCK, EE_PARA_JUST ));
@@ -352,7 +352,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
aLRSpaceItem.SetTxtFirstLineOfst(600); // Indentation of first line: 6mm; right: 0
@@ -367,7 +367,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT )); // 44 pt
@@ -379,7 +379,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_SOLID));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
pISet->Put(SdrShadowItem(true));
@@ -429,7 +429,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(SvxFontHeightItem(846, 100, EE_CHAR_FONTHEIGHT )); // 24 pt
@@ -444,7 +444,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT ));
@@ -461,7 +461,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = &pSheet->GetItemSet();
pISet->Put(XLineStyleItem(XLINE_NONE));
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(SvxPostureItem(ITALIC_NORMAL, EE_CHAR_ITALIC ));
pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT));
@@ -478,7 +478,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
pISet = &pSheet->GetItemSet();
- pISet->Put(XFillStyleItem(XFILL_NONE));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT )); // 12 pt
@@ -500,7 +500,7 @@ static Any implMakeSolidCellStyle( SdStyleSheetPool* pSSPool, const OUString& rN
SfxStyleSheetBase* pSheet = &(pSSPool->Make(rName, SD_STYLE_FAMILY_CELL, SFXSTYLEBIT_AUTO));
pSheet->SetParent(rParent);
SfxItemSet* pISet = &pSheet->GetItemSet();
- pISet->Put(XFillStyleItem(XFILL_SOLID));
+ pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
pISet->Put(XFillColorItem(OUString(), rColor));
return Any( Reference< XStyle >( static_cast< XWeak* >( pSheet ), UNO_QUERY ) );
@@ -557,7 +557,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
aNullGrad.SetEndIntens( 100 );
XHatch aNullHatch(aNullCol);
- rISet.Put(XFillStyleItem(XFILL_SOLID));
+ rISet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
rISet.Put(XFillColorItem(OUString(), RGB_Color(0x00ccccff)));
Font aLatinFont, aCJKFont, aCTLFont;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bfe91d3..a33bdcc 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -232,9 +232,9 @@ void SdPage::EnsureMasterPageDefaultBackground()
}
else
{
- // no style found, assert and set at least XFILL_NONE
+ // no style found, assert and set at least drawing::FillStyle_NONE
OSL_FAIL("No Style for MasterPageBackground fill found (!)");
- getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+ getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
}
}
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 77e2e02..bee0b1e 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -66,6 +66,7 @@
#include <svl/itemset.hxx>
#include "app.hrc"
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::style;
@@ -252,7 +253,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
rSet.Put( SvxBackgroundColorItem( Color (COL_AUTO), EE_CHAR_BKGCOLOR ) );
rSet.Put( XLineStyleItem(XLINE_NONE) );
- rSet.Put( XFillStyleItem(XFILL_NONE) );
+ rSet.Put( XFillStyleItem(drawing::FillStyle_NONE) );
rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
rSet.Put( SdrTextAutoGrowHeightItem(false) );
// #i16874# enable kerning by default but only for new documents
@@ -346,7 +347,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
pSheet->SetParent( OUString() );
SfxItemSet& rTitleSet = pSheet->GetItemSet();
rTitleSet.Put(XLineStyleItem(XLINE_NONE));
- rTitleSet.Put(XFillStyleItem(XFILL_NONE));
+ rTitleSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
rTitleSet.Put(aSvxFontItem);
rTitleSet.Put(aSvxFontItemCJK);
rTitleSet.Put(aSvxFontItemCTL);
@@ -392,7 +393,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
pSheet->SetParent( OUString() );
SfxItemSet& rSubtitleSet = pSheet->GetItemSet();
rSubtitleSet.Put(XLineStyleItem(XLINE_NONE));
- rSubtitleSet.Put(XFillStyleItem(XFILL_NONE));
+ rSubtitleSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
rSubtitleSet.Put(aSvxFontItem);
rSubtitleSet.Put(aSvxFontItemCJK);
rSubtitleSet.Put(aSvxFontItemCTL);
@@ -441,7 +442,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
pSheet->SetParent( OUString() );
SfxItemSet& rNotesSet = pSheet->GetItemSet();
rNotesSet.Put(XLineStyleItem(XLINE_NONE));
- rNotesSet.Put(XFillStyleItem(XFILL_NONE));
+ rNotesSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
rNotesSet.Put(aSvxFontItem);
rNotesSet.Put(aSvxFontItemCJK);
rNotesSet.Put(aSvxFontItemCTL);
@@ -508,7 +509,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
pSheet->SetParent( OUString() );
SfxItemSet& rBackgroundSet = pSheet->GetItemSet();
rBackgroundSet.Put(XLineStyleItem(XLINE_NONE));
- rBackgroundSet.Put(XFillStyleItem(XFILL_NONE));
+ rBackgroundSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
// #i16874# enable kerning by default but only for new documents
rBackgroundSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
}
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 1e41590..eeb0107 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -35,6 +35,7 @@
#define CGM_BIG_ENDIAN 0x00020000
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::frame;
@@ -98,7 +99,7 @@ bool SdCGMFilter::Import()
// set PageFill to given color
const Color aColor((sal_uInt8)(nRetValue >> 16), (sal_uInt8)(nRetValue >> 8), (sal_uInt8)(nRetValue >> 16));
pSdPage->getSdrPageProperties().PutItem(XFillColorItem(OUString(), aColor));
- pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID));
+ pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_SOLID));
}
}
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 82303cf..e5e6377 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2564,10 +2564,10 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
{
const SfxItemSet& rObjItemSet = pObj->GetMergedItemSet();
- XFillStyle eFillStyle = ((XFillStyleItem&)(rObjItemSet.Get(XATTR_FILLSTYLE))).GetValue();
+ drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rObjItemSet.Get(XATTR_FILLSTYLE))).GetValue();
XLineStyle eLineStyle = ((XLineStyleItem&)(rObjItemSet.Get(XATTR_LINESTYLE))).GetValue();
- if ( ( eFillStyle == XFILL_NONE ) && ( eLineStyle == XLINE_NONE ) )
+ if ( ( eFillStyle == drawing::FillStyle_NONE ) && ( eLineStyle == XLINE_NONE ) )
bDontAnimateInvisibleShape = true;
}
}
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 29ecd77..19b3f5a 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -57,6 +57,7 @@
#include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
using ::sdr::PolyPolygonEditor;
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
@@ -360,7 +361,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) );
mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) );
mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) );
- mpPathObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
+ mpPathObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
::basegfx::B2DPolygon aStartArrow;
aStartArrow.append(::basegfx::B2DPoint(20.0, 0.0));
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index efe7709..f8895e2 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -30,6 +30,8 @@
#include <svl/itemset.hxx>
#include <svl/itempool.hxx>
+using namespace com::sun::star;
+
namespace sd {
MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 )
@@ -51,11 +53,11 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject*
const XLineStyle eLineStyle1 = ( (const XLineStyleItem&) aSet1.Get( XATTR_LINESTYLE ) ).GetValue();
const XLineStyle eLineStyle2 = ( (const XLineStyleItem&) aSet2.Get( XATTR_LINESTYLE ) ).GetValue();
- const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
- const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
+ const drawing::FillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
+ const drawing::FillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
if ( ( ( eLineStyle1 == XLINE_NONE ) || ( eLineStyle2 == XLINE_NONE ) ) &&
- ( ( eFillStyle1 != XFILL_SOLID ) || ( eFillStyle2 != XFILL_SOLID ) ) )
+ ( ( eFillStyle1 != drawing::FillStyle_SOLID ) || ( eFillStyle2 != drawing::FillStyle_SOLID ) ) )
{
m_pCbxAttributes->Disable();
}
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index b044b45..461eee3 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -41,6 +41,8 @@
#include <svx/sxciaitm.hxx>
+using namespace com::sun::star;
+
namespace sd {
TYPEINIT1( FuConstructArc, FuConstruct );
@@ -251,7 +253,7 @@ SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Recta
SID_DRAW_ELLIPSECUT_NOFILL == nID ||
SID_DRAW_CIRCLECUT_NOFILL == nID)
{
- aAttr.Put(XFillStyleItem(XFILL_NONE));
+ aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
}
pObj->SetMergedItemSet(aAttr);
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index b77aad8..8a16803 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -40,6 +40,8 @@
#include "stlpool.hxx"
#include <svx/globl3d.hxx>
+using namespace com::sun::star;
+
namespace sd {
TYPEINIT1( FuConstruct, FuDraw );
@@ -348,13 +350,13 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
const XFillStyleItem& rFillStyle = (const XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE);
if ( bForceFillStyle )
{
- if (rFillStyle.GetValue() == XFILL_NONE)
- rAttr.Put(XFillStyleItem(XFILL_SOLID));
+ if (rFillStyle.GetValue() == drawing::FillStyle_NONE)
+ rAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID));
}
else if ( bForceNoFillStyle )
{
- if (rFillStyle.GetValue() != XFILL_NONE)
- rAttr.Put(XFillStyleItem(XFILL_NONE));
+ if (rFillStyle.GetValue() != drawing::FillStyle_NONE)
+ rAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
}
}
}
@@ -380,7 +382,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
else
{
SfxItemSet aAttr(*mpView->GetDefaultAttr().Clone());
- rAttr.Put(XFillStyleItem(XFILL_NONE));
+ rAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
pObj->SetMergedItemSet(aAttr);
}
}
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 800ce2f..a93d7de 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -40,6 +40,8 @@
#include "sdabstdlg.hxx"
#include <boost/scoped_ptr.hpp>
+using namespace com::sun::star;
+
namespace sd {
TYPEINIT1( FuCopy, FuPoor );
@@ -84,9 +86,9 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, true, &pPoolItem ) )
{
- XFillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue();
+ drawing::FillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue();
- if( eStyle == XFILL_SOLID &&
+ if( eStyle == drawing::FillStyle_SOLID &&
SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, true, &pPoolItem ) )
{
const XFillColorItem* pItem = ( const XFillColorItem* ) pPoolItem;
@@ -209,7 +211,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( ( 1 == i ) && bColor )
{
SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L );
- aNewSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ aNewSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
aNewSet.Put( XFillColorItem( OUString(), aStartColor ) );
mpView->SetAttributes( aNewSet );
}
@@ -271,7 +273,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
sal_uInt8 nBlue = aStartColor.GetBlue() + (sal_uInt8) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber );
Color aNewColor( nRed, nGreen, nBlue );
SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L );
- aNewSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ aNewSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
aNewSet.Put( XFillColorItem( OUString(), aNewColor ) );
mpView->SetAttributes( aNewSet );
}
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 1c05808..83cc837 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -43,6 +43,8 @@
#include <sfx2/dispatch.hxx>
#include <editeng/eeitem.hxx>
+using namespace com::sun::star;
+
namespace sd {
TYPEINIT1( FuExpandPage, FuPoor );
@@ -238,7 +240,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
// remove hard attributes (Flag to sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
aAttr.Put(XLineStyleItem(XLINE_NONE));
- aAttr.Put(XFillStyleItem(XFILL_NONE));
+ aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
pOutlineObj->SetMergedItemSet(aAttr);
}
}
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 799ceb7..5aa763a 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -45,6 +45,8 @@
#include <basegfx/color/bcolor.hxx>
#include <boost/scoped_ptr.hpp>
+using namespace com::sun::star;
+
namespace sd {
#define ITEMVALUE( ItemSet, Id, Cast ) ( ( (const Cast&) (ItemSet).Get( (Id) ) ).GetValue() )
@@ -354,8 +356,8 @@ void FuMorph::ImpInsertPolygons(
const XLineStyle eLineStyle1 = ITEMVALUE( aSet1, XATTR_LINESTYLE, XLineStyleItem );
const XLineStyle eLineStyle2 = ITEMVALUE( aSet2, XATTR_LINESTYLE, XLineStyleItem );
- const XFillStyle eFillStyle1 = ITEMVALUE( aSet1, XATTR_FILLSTYLE, XFillStyleItem );
- const XFillStyle eFillStyle2 = ITEMVALUE( aSet2, XATTR_FILLSTYLE, XFillStyleItem );
+ const drawing::FillStyle eFillStyle1 = ITEMVALUE( aSet1, XATTR_FILLSTYLE, XFillStyleItem );
+ const drawing::FillStyle eFillStyle2 = ITEMVALUE( aSet2, XATTR_FILLSTYLE, XFillStyleItem );
if ( bAttributeFade )
{
@@ -374,7 +376,7 @@ void FuMorph::ImpInsertPolygons(
else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) )
bIgnoreLine = true;
- if ( ( eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_SOLID ) )
+ if ( ( eFillStyle1 == drawing::FillStyle_SOLID ) && ( eFillStyle2 == drawing::FillStyle_SOLID ) )
{
bFillColor = true;
aStartFillCol = static_cast< XFillColorItem const & >(
@@ -382,7 +384,7 @@ void FuMorph::ImpInsertPolygons(
aEndFillCol = static_cast< XFillColorItem const & >(
aSet2.Get(XATTR_FILLCOLOR)).GetColorValue();
}
- else if ( ( eFillStyle1 == XFILL_NONE ) && ( eFillStyle2 == XFILL_NONE ) )
+ else if ( ( eFillStyle1 == drawing::FillStyle_NONE ) && ( eFillStyle2 == drawing::FillStyle_NONE ) )
bIgnoreFill = true;
}
@@ -397,7 +399,7 @@ void FuMorph::ImpInsertPolygons(
double fFactor = fStep;
aSet.Put( XLineStyleItem( XLINE_SOLID ) );
- aSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
for ( size_t i = 0; i < nCount; i++, fFactor += fStep )
{
@@ -420,7 +422,7 @@ void FuMorph::ImpInsertPolygons(
aSet.Put( XFillColorItem( aEmptyStr, Color(aFillColor)));
}
else if ( bIgnoreFill )
- aSet.Put( XFillStyleItem( XFILL_NONE ) );
+ aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) );
// line width
if ( bLineWidth )
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 3337c8e..bd11ce8 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -69,6 +69,8 @@
#include <boost/scoped_ptr.hpp>
+using namespace com::sun::star;
+
namespace sd {
class Window;
@@ -255,7 +257,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
// Only this page, get attributes for background fill
const SfxItemSet& rBackgroundAttributes = mpPage->getSdrPageProperties().GetItemSet();
- if(XFILL_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+ if(drawing::FillStyle_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue())
{
// page attributes are used, take them
aMergedAttr.Put(rBackgroundAttributes);
@@ -263,7 +265,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
else
{
if(pStyleSheet
- && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
+ && drawing::FillStyle_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
{
// if the page has no fill style, use the settings from the
// background stylesheet (if used)
@@ -272,7 +274,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
else
{
// no fill style from page, start with no fill style
- aMergedAttr.Put(XFillStyleItem(XFILL_NONE));
+ aMergedAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
}
}
}
@@ -292,7 +294,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
{
pTempSet.reset( new SfxItemSet( mpDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0) );
- pTempSet->Put( XFillStyleItem( XFILL_BITMAP ) );
+ pTempSet->Put( XFillStyleItem( drawing::FillStyle_BITMAP ) );
// MigrateItemSet makes sure the XFillBitmapItem will have a unique name
SfxItemSet aMigrateSet( mpDoc->GetPool(), XATTR_FILLBITMAP, XATTR_FILLBITMAP );
@@ -335,9 +337,9 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
}
// if the background for this page was set to invisible, the background-object has to be deleted, too.
- if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ||
+ if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == drawing::FillStyle_NONE ) ||
( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) &&
- ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) )
+ ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == drawing::FillStyle_NONE ) ) )
mbPageBckgrdDeleted = true;
bool bSetToAllPages = false;
@@ -370,7 +372,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
rPageProperties.ClearItem( XATTR_FILLBITMAP );
rPageProperties.ClearItem( XATTR_FILLGRADIENT );
rPageProperties.ClearItem( XATTR_FILLHATCH );
- rPageProperties.PutItem(XFillStyleItem(XFILL_NONE));
+ rPageProperties.PutItem(XFillStyleItem(drawing::FillStyle_NONE));
}
}
}
@@ -418,7 +420,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
SdPage *pPage = mpDoc->GetSdPage(i, ePageKind);
const SfxItemSet& rFillAttributes = pPage->getSdrPageProperties().GetItemSet();
- if(XFILL_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+ if(drawing::FillStyle_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
{
SdBackgroundObjUndoAction *pBackgroundObjUndoAction = new SdBackgroundObjUndoAction(*mpDoc, *pPage, rFillAttributes);
pUndoGroup->AddAction(pBackgroundObjUndoAction);
@@ -427,7 +429,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
rPageProperties.ClearItem( XATTR_FILLBITMAP );
rPageProperties.ClearItem( XATTR_FILLGRADIENT );
rPageProperties.ClearItem( XATTR_FILLHATCH );
- rPageProperties.PutItem(XFillStyleItem(XFILL_NONE));
+ rPageProperties.PutItem(XFillStyleItem(drawing::FillStyle_NONE));
pPage->ActionChanged();
}
@@ -445,7 +447,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
{
pTempSet->ClearItem( nWhich );
}
- pTempSet->Put(XFillStyleItem(XFILL_NONE));
+ pTempSet->Put(XFillStyleItem(drawing::FillStyle_NONE));
}
const SfxPoolItem *pItem;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index cc00317..6347f518 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1198,7 +1198,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
aSet.Put(pObj->GetMergedItemSet());
const XFillStyleItem& rFillStyle = (const XFillStyleItem&) aSet.Get(XATTR_FILLSTYLE);
- bFilled = rFillStyle.GetValue() != XFILL_NONE;
+ bFilled = rFillStyle.GetValue() != drawing::FillStyle_NONE;
}
const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers();
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 4789946..da0a333 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -38,6 +38,8 @@
#include "optsitem.hxx"
#include "DrawViewShell.hxx"
+using namespace com::sun::star;
+
namespace sd {
TYPEINIT1( FuSummaryPage, FuPoor );
@@ -209,7 +211,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
// remove hard attributes (Flag to sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
aAttr.Put(XLineStyleItem(XLINE_NONE));
- aAttr.Put(XFillStyleItem(XFILL_NONE));
+ aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
pTextObj->SetMergedItemSet(aAttr);
if( bBegUndo )
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 0b59b83..3b0cc09 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -418,7 +418,7 @@ void DocumentHelper::AssignMasterPageToPage (
new SdBackgroundObjUndoAction(
*pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()),
true);
- pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+ pPage->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
pDocument->SetMasterPage (
(pPage->GetPageNum()-1)/2,
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index c018489..0744855 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2476,8 +2476,8 @@ void SdDrawPage::setBackground( const Any& rValue )
if( !xSet.is() )
{
- // the easy case, no background set. Set XFILL_NONE to represent this
- GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+ // the easy case, no background set. Set drawing::FillStyle_NONE to represent this
+ GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
return;
}
@@ -2517,8 +2517,8 @@ void SdDrawPage::setBackground( const Any& rValue )
if( aSet.Count() == 0 )
{
- // no background fill, represent by setting XFILL_NONE
- GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+ // no background fill, represent by setting drawing::FillStyle_NONE
+ GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
}
else
{
@@ -2556,9 +2556,9 @@ void SdDrawPage::getBackground( Any& rValue ) throw()
{
const SfxItemSet& rFillAttributes = GetPage()->getSdrPageProperties().GetItemSet();
- if(XFILL_NONE == ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+ if(drawing::FillStyle_NONE == ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
{
- // no fill set (switched off by XFILL_NONE), clear rValue to represent this
+ // no fill set (switched off by drawing::FillStyle_NONE), clear rValue to represent this
rValue.clear();
}
else
@@ -2976,7 +2976,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
// should NOT happen and is an error
const SfxItemSet& rFallbackItemSet(SvxFmDrawPage::mpPage->getSdrPageProperties().GetItemSet());
- if(XFILL_NONE == ((const XFillStyleItem&)rFallbackItemSet.Get(XATTR_FILLSTYLE)).GetValue())
+ if(drawing::FillStyle_NONE == ((const XFillStyleItem&)rFallbackItemSet.Get(XATTR_FILLSTYLE)).GetValue())
{
rValue <<= Reference< beans::XPropertySet >(
new SdUnoPageBackground(GetModel()->GetDoc(), &rFallbackItemSet));
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 76075ee..1191268 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -59,6 +59,8 @@
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <boost/scoped_ptr.hpp>
+using namespace com::sun::star;
+
namespace sd {
void DrawViewShell::ExecGallery(SfxRequest& rReq)
@@ -215,10 +217,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs->Count () == 1)
{
SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, false);
- if (CHECK_RANGE (XFILL_NONE, (sal_Int32)pFillStyle->GetValue (), XFILL_BITMAP))
+ if (CHECK_RANGE (drawing::FillStyle_NONE, (sal_Int32)pFillStyle->GetValue (), drawing::FillStyle_BITMAP))
{
pAttr->ClearItem (XATTR_FILLSTYLE);
- pAttr->Put (XFillStyleItem ((XFillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem ((drawing::FillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
rBindings.Invalidate (SID_ATTR_FILL_STYLE);
}
#ifndef DISABLE_SCRIPTING
@@ -283,7 +285,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
(sal_uInt8) pGreen->GetValue (),
(sal_uInt8) pBlue->GetValue ())),
XATTR_FILLCOLOR);
- pAttr->Put (XFillStyleItem (XFILL_SOLID), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_SOLID), XATTR_FILLSTYLE);
rBindings.Invalidate (SID_ATTR_FILL_COLOR);
rBindings.Invalidate (SID_ATTR_FILL_STYLE);
break;
@@ -345,7 +347,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) aGradient.SetStartColor (aColor);
else aGradient.SetEndColor (aColor);
- pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
break;
}
@@ -363,7 +365,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
GetDoc()->GetGradientList ()->Insert (new XGradientEntry (aGradient, pName->GetValue ()));
- pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
}
@@ -405,7 +407,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
aHatch.SetColor (aColor);
- pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
break;
}
@@ -417,7 +419,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
GetDoc()->GetHatchList ()->Insert (new XHatchEntry (aHatch, pName->GetValue ()));
- pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
}
@@ -525,7 +527,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
aGradient.SetStartIntens ((short) pStart->GetValue ());
aGradient.SetEndIntens ((short) pEnd->GetValue ());
- pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
break;
}
@@ -540,7 +542,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
(short) pStart->GetValue (), (short) pEnd->GetValue ());
pGradientList->Insert (new XGradientEntry (aGradient, pName->GetValue ()));
- pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
}
@@ -589,7 +591,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
aHatch.SetDistance (pDistance->GetValue ());
aHatch.SetAngle (pAngle->GetValue () * 10);
- pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
break;
}
@@ -602,7 +604,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
pAngle->GetValue () * 10);
pHatchList->Insert (new XHatchEntry (aHatch, pName->GetValue ()));
- pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
}
@@ -638,7 +640,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
{
pAttr->ClearItem (XATTR_FILLGRADIENT);
pAttr->ClearItem (XATTR_FILLSTYLE);
- pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_GRADIENT), XATTR_FILLSTYLE);
pAttr->Put (XFillGradientItem (pName->GetValue (), pEntry->GetGradient ()), XATTR_FILLGRADIENT);
rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
@@ -673,7 +675,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
{
pAttr->ClearItem (XATTR_FILLHATCH);
pAttr->ClearItem (XATTR_FILLSTYLE);
- pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
+ pAttr->Put (XFillStyleItem (drawing::FillStyle_HATCH), XATTR_FILLSTYLE);
pAttr->Put (XFillHatchItem (pName->GetValue (), pEntry->GetHatch ()), XATTR_FILLHATCH);
rBindings.Invalidate (SID_ATTR_FILL_HATCH);
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index c87934a..73ce8d7 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -144,9 +144,9 @@ void DrawViewShell::AssignFrom3DWindow()
// Determine if a FILL attribute is set.
// If not, hard set a fill attribute
- XFillStyle eFillStyle = ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem );
- if(eFillStyle == XFILL_NONE)
- aSet.Put(XFillStyleItem (XFILL_SOLID));
+ drawing::FillStyle eFillStyle = ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem );
+ if(eFillStyle == drawing::FillStyle_NONE)
+ aSet.Put(XFillStyleItem (drawing::FillStyle_SOLID));
// remove some 3DSCENE attributes since these were
// created by convert to 3D and may not be changed
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3828c82..ebd7b0f 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -990,11 +990,11 @@ bool View::IsMorphingAllowed() const
aSet1.Put(pObj1->GetMergedItemSet());
aSet2.Put(pObj2->GetMergedItemSet());
- const XFillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
- const XFillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
+ const drawing::FillStyle eFillStyle1 = ( (const XFillStyleItem&) aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
+ const drawing::FillStyle eFillStyle2 = ( (const XFillStyleItem&) aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
- if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) &&
- ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) )
+ if( ( eFillStyle1 == drawing::FillStyle_NONE || eFillStyle1 == drawing::FillStyle_SOLID ) &&
+ ( eFillStyle2 == drawing::FillStyle_NONE || eFillStyle2 == drawing::FillStyle_SOLID ) )
bRet = true;
}
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 47f962c..163970e 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list