Skip to content

C
core
Kaydet (Commit) 97b889b8 authored tarafından Varun Dhall's avatar Varun Dhall Kaydeden (comit) Michael Stahl
Dosyalara gözat
Seçenekler

WIP: Removing unused SfxItemPool serialisation from svx 

Change-Id: I3222033fadd688959fd55e3f335540054fc418f4
Reviewed-on: https://gerrit.libreoffice.org/40612Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 88b0711a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 86 deletions
include/svx/AffineMatrixItem.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -35,14 +35,11 @@ private:
public:
AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix);
AffineMatrixItem(SvStream& rIn);
AffineMatrixItem(const AffineMatrixItem&);
virtual ~AffineMatrixItem() override;
virtual bool operator==(const SfxPoolItem&) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xbtmpit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -49,12 +49,9 @@ public:
XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject);
XFillBitmapItem( const GraphicObject& rGraphicObject );
XFillBitmapItem( const XFillBitmapItem& rItem );
XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer );
virtual bool operator==( const SfxPoolItem& rItem ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
......
include/svx/xcolit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -44,13 +44,10 @@ public:
XColorItem(sal_uInt16 nWhich, const Color& rTheColor);
XColorItem(sal_uInt16 nWhich, const OUString& rName, const Color& rTheColor);
XColorItem(sal_uInt16 nWhich, SvStream& rIn);
XColorItem(const XColorItem& rItem);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
const Color& GetColorValue() const;
void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); }
......
include/svx/xflclit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -37,10 +37,8 @@ public:
XFillColorItem() {}
XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XFillColorItem(const OUString& rName, const Color& rTheColor);
XFillColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xflgrit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -40,12 +40,9 @@ public:
XFillGradientItem(const OUString& rName, const XGradient& rTheGradient, sal_uInt16 nWhich = XATTR_FILLGRADIENT);
XFillGradientItem(const XGradient& rTheGradient);
XFillGradientItem(const XFillGradientItem& rItem);
XFillGradientItem(SvStream& rIn, sal_uInt16 nVer);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
......
include/svx/xflhtit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -39,12 +39,9 @@ public:
XFillHatchItem(const OUString& rName, const XHatch& rTheHatch);
XFillHatchItem(const XHatch& rTheHatch);
XFillHatchItem(const XFillHatchItem& rItem);
XFillHatchItem(SvStream& rIn);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xftshcit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -35,10 +35,8 @@ public:
static SfxPoolItem* CreateDefault();
XFormTextShadowColorItem() {}
XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
};
#endif
......
include/svx/xit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -46,13 +46,10 @@ public:
NameOrIndex() { nPalIndex = -1; }
NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
NameOrIndex(sal_uInt16 nWhich, const OUString& rName);
NameOrIndex(sal_uInt16 nWhich, SvStream& rIn);
NameOrIndex(const NameOrIndex& rNameOrIndex);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
OUString GetName() const { return GetValue(); }
void SetName(const OUString& rName) { SetValue(rName); }
......
include/svx/xlnclit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -33,10 +33,8 @@ public:
XLineColorItem() {}
XLineColorItem(sal_Int32 nIndex, const Color& rTheColor);
XLineColorItem(const OUString& rName, const Color& rTheColor);
XLineColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xlndsit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -40,12 +40,9 @@ public:
XLineDashItem(const OUString& rName, const XDash& rTheDash);
XLineDashItem(const XDash& rTheDash);
XLineDashItem(const XLineDashItem& rItem);
XLineDashItem(SvStream& rIn);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xlnedit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -39,12 +39,9 @@ public:
XLineEndItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(const XLineEndItem& rItem);
XLineEndItem(SvStream& rIn);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xlnstit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -39,12 +39,9 @@ public:
XLineStartItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(const XLineStartItem& rItem);
XLineStartItem(SvStream& rIn);
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
......
include/svx/xsflclit.hxx
Dosyayı görüntüle @ 97b889b8
......@@ -29,10 +29,8 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
{
public:
XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor);
SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
......
sd/source/ui/func/fupage.cxx
Dosyayı görüntüle @ 97b889b8
......@@ -320,7 +320,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
// MigrateItemSet makes sure the XFillBitmapItem will have a unique name
SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLBITMAP, XATTR_FILLBITMAP>{} );
aMigrateSet.Put(XFillBitmapItem(OUString("background"), aGraphic));
aMigrateSet.Put(XFillBitmapItem("background", aGraphic));
SdrModel::MigrateItemSet( &aMigrateSet, pTempSet.get(), mpDoc );
pTempSet->Put( XFillBmpStretchItem( true ));
......
svx/source/xoutdev/xattr.cxx
Dosyayı görüntüle @ 97b889b8
This diff is collapsed.
svx/source/xoutdev/xattr2.cxx
Dosyayı görüntüle @ 97b889b8
......@@ -202,17 +202,6 @@ AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix)
}
}
AffineMatrixItem::AffineMatrixItem(SvStream& rIn)
: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX)
{
rIn.ReadDouble( maMatrix.m00 );
rIn.ReadDouble( maMatrix.m01 );
rIn.ReadDouble( maMatrix.m02 );
rIn.ReadDouble( maMatrix.m10 );
rIn.ReadDouble( maMatrix.m11 );
rIn.ReadDouble( maMatrix.m12 );
}
AffineMatrixItem::AffineMatrixItem(const AffineMatrixItem& rRef)
: SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX)
{
......@@ -250,22 +239,6 @@ SfxPoolItem* AffineMatrixItem::Clone( SfxItemPool* /*pPool*/ ) const
return new AffineMatrixItem(*this);
}
SfxPoolItem* AffineMatrixItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ ) const
{
return new AffineMatrixItem(rIn);
}
SvStream& AffineMatrixItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ ) const
{
rStream.WriteDouble( maMatrix.m00 );
rStream.WriteDouble( maMatrix.m01 );
rStream.WriteDouble( maMatrix.m02 );
rStream.WriteDouble( maMatrix.m10 );
rStream.WriteDouble( maMatrix.m11 );
rStream.WriteDouble( maMatrix.m12 );
return rStream;
}
bool AffineMatrixItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= maMatrix;
......
svx/source/xoutdev/xattrbmp.cxx
Dosyayı görüntüle @ 97b889b8
......@@ -270,12 +270,6 @@ GraphicObject XFillBitmapItem::makeGraphicObject(SvStream& rIn, sal_uInt16 nVer)
return GraphicObject();
}
XFillBitmapItem::XFillBitmapItem(SvStream& rIn, sal_uInt16 nVer)
: NameOrIndex(XATTR_FILLBITMAP, rIn)
, maGraphicObject(makeGraphicObject(rIn, nVer))
{
}
XFillBitmapItem::XFillBitmapItem(const GraphicObject& rGraphicObject)
: NameOrIndex(XATTR_FILLBITMAP, -1)
, maGraphicObject(rGraphicObject)
......@@ -293,23 +287,6 @@ bool XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
&& maGraphicObject == static_cast<const XFillBitmapItem&>(rItem).maGraphicObject);
}
SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillBitmapItem( rIn, nVer );
}
SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store(rOut, nItemVersion);
if(!IsIndex())
{
WriteDIBBitmapEx(maGraphicObject.GetGraphic().GetBitmapEx(), rOut);
}
return rOut;
}
bool XFillBitmapItem::isPattern() const
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment