diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-07-18 17:04:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-18 22:14:07 +0200 |
commit | eff84b958c54985e0b81c44b2cd81722abeb9320 (patch) | |
tree | 808b82fe39a989bd3a8fe29b42ad51d39e243d50 | |
parent | 816a9ddeaace21781b3e9ad2b0c3510eaafd9970 (diff) |
remove unused CntWallpaperItem
Change-Id: I47cf9fc37bb64a80a21ed805bff2bb3ac3eb6da5
Reviewed-on: https://gerrit.libreoffice.org/40148
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | compilerplugins/clang/constantparam.constructors.results | 4 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 1 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 65 | ||||
-rw-r--r-- | include/editeng/brushitem.hxx | 4 | ||||
-rw-r--r-- | include/svl/cntwall.hxx | 67 | ||||
-rw-r--r-- | svl/Library_svl.mk | 1 | ||||
-rw-r--r-- | svl/source/items/cntwall.cxx | 149 |
7 files changed, 0 insertions, 291 deletions
diff --git a/compilerplugins/clang/constantparam.constructors.results b/compilerplugins/clang/constantparam.constructors.results index 9c14dc4a8ecf..3d6f42ae3b60 100644 --- a/compilerplugins/clang/constantparam.constructors.results +++ b/compilerplugins/clang/constantparam.constructors.results @@ -342,10 +342,6 @@ include/svl/aeitem.hxx:54 void SfxAllEnumItem::SfxAllEnumItem(unsigned short,class SvStream &) unsigned short nWhich Which() -include/svl/cntwall.hxx:39 - void CntWallpaperItem::CntWallpaperItem(unsigned short,class SvStream &,unsigned short) - unsigned short nWhich - Which() include/svl/ctypeitm.hxx:34 void CntContentTypeItem::CntContentTypeItem(unsigned short,const class rtl::OUString &) unsigned short nWhich diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 9673b8e02017..ec1775251187 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -28,7 +28,6 @@ #include <sfx2/dialoghelper.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> -#include <svl/cntwall.hxx> #include <svx/dialogs.hrc> #include <cuires.hrc> diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index a18747e067d6..d14afbbcbe1b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -53,7 +53,6 @@ #include <tools/urlobj.hxx> #include <comphelper/types.hxx> #include <svl/memberid.hrc> -#include <svl/cntwall.hxx> #include <svtools/borderhelper.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -3947,70 +3946,6 @@ void SvxBrushItem::SetGraphicFilter( const OUString& rNew ) maStrFilter = rNew; } -SvxGraphicPosition SvxBrushItem::WallpaperStyle2GraphicPos( WallpaperStyle eStyle ) -{ - SvxGraphicPosition eResult; - // This switch is not the fastest, but the safest - switch( eStyle ) - { - case WallpaperStyle::NONE: eResult = GPOS_NONE; break; - case WallpaperStyle::Tile: eResult = GPOS_TILED; break; - case WallpaperStyle::Center: eResult = GPOS_MM; break; - case WallpaperStyle::Scale: eResult = GPOS_AREA; break; - case WallpaperStyle::TopLeft: eResult = GPOS_LT; break; - case WallpaperStyle::Top: eResult = GPOS_MT; break; - case WallpaperStyle::TopRight: eResult = GPOS_RT; break; - case WallpaperStyle::Left: eResult = GPOS_LM; break; - case WallpaperStyle::Right: eResult = GPOS_RM; break; - case WallpaperStyle::BottomLeft: eResult = GPOS_LB; break; - case WallpaperStyle::Bottom: eResult = GPOS_MB; break; - case WallpaperStyle::BottomRight: eResult = GPOS_RB; break; - default: eResult = GPOS_NONE; - } - return eResult; -}; - -WallpaperStyle SvxBrushItem::GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ) -{ - WallpaperStyle eResult; - switch( ePos ) - { - case GPOS_NONE: eResult = WallpaperStyle::NONE; break; - case GPOS_TILED: eResult = WallpaperStyle::Tile; break; - case GPOS_MM: eResult = WallpaperStyle::Center; break; - case GPOS_AREA: eResult = WallpaperStyle::Scale; break; - case GPOS_LT: eResult = WallpaperStyle::TopLeft; break; - case GPOS_MT: eResult = WallpaperStyle::Top; break; - case GPOS_RT: eResult = WallpaperStyle::TopRight; break; - case GPOS_LM: eResult = WallpaperStyle::Left; break; - case GPOS_RM: eResult = WallpaperStyle::Right; break; - case GPOS_LB: eResult = WallpaperStyle::BottomLeft; break; - case GPOS_MB: eResult = WallpaperStyle::Bottom; break; - case GPOS_RB: eResult = WallpaperStyle::BottomRight; break; - default: eResult = WallpaperStyle::NONE; - } - return eResult; -} - -SvxBrushItem::SvxBrushItem(const CntWallpaperItem& rItem, sal_uInt16 _nWhich) - : SfxPoolItem(_nWhich) - , nShadingValue(ShadingPattern::CLEAR) - , nGraphicTransparency(0) - , bLoadAgain(true) -{ - aColor = rItem.GetColor(); - - if (!rItem.GetBitmapURL().isEmpty()) - { - maStrLink = rItem.GetBitmapURL(); - SetGraphicPos( WallpaperStyle2GraphicPos((WallpaperStyle)rItem.GetStyle() ) ); - } - else - { - SetGraphicPos( GPOS_NONE ); - } -} - void SvxBrushItem::ApplyGraphicTransparency_Impl() { DBG_ASSERT(xGraphicObject, "no GraphicObject available" ); diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 350b4d6cd977..d1b66da8890d 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -30,7 +30,6 @@ class Graphic; class GraphicObject; -class CntWallpaperItem; #define BRUSH_GRAPHIC_VERSION ((sal_uInt16)0x0001) @@ -75,7 +74,6 @@ public: SvxGraphicPosition ePos, sal_uInt16 nWhich ); SvxBrushItem( const SvxBrushItem& ); SvxBrushItem( SvxBrushItem&& ); - SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich ); virtual ~SvxBrushItem() override; @@ -120,8 +118,6 @@ public: SvxBrushItem& operator=(const SvxBrushItem& rItem); SvxBrushItem& operator=(SvxBrushItem&& rItem); - static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle ); - static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ); static sal_Int8 TransparencyToPercent(sal_Int32 nTrans); void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx deleted file mode 100644 index cd6800f66c40..000000000000 --- a/include/svl/cntwall.hxx +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SVL_CNTWALL_HXX -#define INCLUDED_SVL_CNTWALL_HXX - -#include <svl/svldllapi.h> - -#include <tools/color.hxx> -#include <svl/poolitem.hxx> - -class SvStream; - -class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem -{ -private: - OUString _aURL; - Color _nColor; - sal_uInt16 _nStyle; - -public: - - CntWallpaperItem( sal_uInt16 nWhich ); - CntWallpaperItem( sal_uInt16 nWhich, SvStream& rStream, sal_uInt16 nVersion ); - CntWallpaperItem( const CntWallpaperItem& rCpy ); - virtual ~CntWallpaperItem() override; - - virtual sal_uInt16 GetVersion(sal_uInt16) const override; - - virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const override; - virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; - - void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; } - void SetColor( Color nColor ) { _nColor = nColor; } - void SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; } - - const OUString& GetBitmapURL() const { return _aURL; } - const Color& GetColor() const { return _nColor; } - sal_uInt16 GetStyle() const { return _nStyle; } -}; - - -#endif // INCLUDED_SVL_CNTWALL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 97fa4df3add9..411def14df13 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -126,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/items/aeitem \ svl/source/items/cenumitm \ svl/source/items/cintitem \ - svl/source/items/cntwall \ svl/source/items/ctypeitm \ svl/source/items/custritm \ svl/source/items/flagitem \ diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx deleted file mode 100644 index fc0371ccfd3c..000000000000 --- a/svl/source/items/cntwall.cxx +++ /dev/null @@ -1,149 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include <osl/diagnose.h> -#include <tools/stream.hxx> -#include <tools/vcompat.hxx> - -#include <svl/cntwall.hxx> -#include <stringio.hxx> - -#define CNTWALLPAPERITEM_STREAM_MAGIC ( (sal_uInt32)0xfefefefe ) -#define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) - - -CntWallpaperItem::CntWallpaperItem( sal_uInt16 which ) - : SfxPoolItem( which ), _nColor( COL_TRANSPARENT ), _nStyle( 0 ) -{ -} - - -CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uInt16 nVersion ) - : SfxPoolItem( which ), _nColor( COL_TRANSPARENT ), _nStyle( 0 ) -{ - sal_uInt32 nMagic = 0; - rStream.ReadUInt32( nMagic ); - if ( nMagic == CNTWALLPAPERITEM_STREAM_MAGIC ) - { - // Okay, data were stored by CntWallpaperItem. - - _aURL = readUnicodeString(rStream, nVersion >= 1); - // !!! Color stream operators do not work - they discard any - // transparency info !!! - _nColor.Read( rStream ); - rStream.ReadUInt16( _nStyle ); - } - else - { - rStream.SeekRel( CNTWALLPAPERITEM_STREAM_SEEKREL ); - - // Data were stored by SfxWallpaperItem ( SO < 6.0 ). The only - // thing we can do here is to get the URL and to position the stream. - - { - // "Read" Wallpaper member - The version compat object positions - // the stream after the wallpaper data in its dtor. We must use - // this trick here as no VCL must be used here ( No Wallpaper - // object allowed ). - VersionCompat aCompat( rStream, StreamMode::READ ); - } - - // Read SfxWallpaperItem's string member _aURL. - _aURL = readUnicodeString(rStream, false); - - // "Read" SfxWallpaperItem's string member _aFilter. - read_uInt16_lenPrefixed_uInt8s_ToOString(rStream); - } -} - - -CntWallpaperItem::CntWallpaperItem( const CntWallpaperItem& rItem ) : - SfxPoolItem( rItem ), - _aURL( rItem._aURL ), - _nColor( rItem._nColor ), - _nStyle( rItem._nStyle ) -{ -} - - -CntWallpaperItem::~CntWallpaperItem() -{ -} - - -bool CntWallpaperItem::operator==( const SfxPoolItem& rItem ) const -{ - assert(SfxPoolItem::operator==(rItem)); - - const CntWallpaperItem& rWallItem = static_cast<const CntWallpaperItem&>(rItem); - - return ( rWallItem._nStyle == _nStyle ) && - ( rWallItem._nColor == _nColor ) && - ( rWallItem._aURL == _aURL ); -} - -// virtual -sal_uInt16 CntWallpaperItem::GetVersion(sal_uInt16) const -{ - return 1; // because it uses SfxPoolItem::read/writeUnicodeString() -} - - -SfxPoolItem* CntWallpaperItem::Create( SvStream& rStream, sal_uInt16 nVersion) const -{ - return new CntWallpaperItem( Which(), rStream, nVersion ); -} - - -SvStream& CntWallpaperItem::Store( SvStream& rStream, sal_uInt16 ) const -{ - rStream.WriteUInt32( CNTWALLPAPERITEM_STREAM_MAGIC ); - writeUnicodeString(rStream, _aURL); - // !!! Color stream operators do not work - they discard any - // transparency info !!! - // ??? Why the hell Color::Write(...) isn't const ??? - (const_cast< CntWallpaperItem* >(this))->_nColor.Write( rStream ); - rStream.WriteUInt16( _nStyle ); - - return rStream; -} - - -SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const -{ - return new CntWallpaperItem( *this ); -} - -// virtual -bool CntWallpaperItem::QueryValue( css::uno::Any&, sal_uInt8) const -{ - OSL_FAIL("Not implemented!"); - return false; -} - -// virtual -bool CntWallpaperItem::PutValue( const css::uno::Any&, sal_uInt8) -{ - OSL_FAIL("Not implemented!"); - return false; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |