diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-28 00:21:18 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-28 08:56:50 +0100 |
commit | 1132e59172f7beca5a39653cf9ee448f9f4577b1 (patch) | |
tree | 98085952a30fd8fd1fa6293c1446c8a0e454afa0 /svx | |
parent | 0a6813ad5d57d0df72562c797a8b0581bfd65a11 (diff) |
svx: remove newly unused XFillExchangeData
Change-Id: I0260504ba108421e82ad50f9680dda9a05710678
Reviewed-on: https://gerrit.libreoffice.org/62456
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/Library_svxcore.mk | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 1 | ||||
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 1 | ||||
-rw-r--r-- | svx/source/xoutdev/xexch.cxx | 136 |
4 files changed, 0 insertions, 139 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index b00bf5e038bd..1ca893e5eeab 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -410,7 +410,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/xoutdev/xattr \ svx/source/xoutdev/xattr2 \ svx/source/xoutdev/xattrbmp \ - svx/source/xoutdev/xexch \ svx/source/xoutdev/_xoutbmp \ svx/source/xoutdev/_xpoly \ svx/source/xoutdev/xpool \ diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index db929f86af57..3567d18856ae 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -21,7 +21,6 @@ #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <rtl/strbuf.hxx> -#include <svx/xexch.hxx> #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 6b86c381dfc4..43b4ca52ef60 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -37,7 +37,6 @@ #include <svx/xattr.hxx> #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include <svx/xexch.hxx> #include <helpids.h> #include <vcl/svapp.hxx> diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx deleted file mode 100644 index 00f9fefbf96c..000000000000 --- a/svx/source/xoutdev/xexch.cxx +++ /dev/null @@ -1,136 +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 <sal/config.h> - -#include <o3tl/make_unique.hxx> -#include <sot/formats.hxx> -#include <tools/stream.hxx> -#include <tools/vcompat.hxx> -#include <svx/xflasit.hxx> -#include <svx/xfillit0.hxx> -#include <svl/itempool.hxx> -#include <svl/whiter.hxx> -#include <svl/itemset.hxx> -#include <svx/xdef.hxx> -#include <svx/xexch.hxx> -#include <memory> -#include <utility> - -XFillExchangeData::XFillExchangeData( const XFillAttrSetItem& rXFillAttrSetItem ) : - pXFillAttrSetItem( static_cast<XFillAttrSetItem*>( rXFillAttrSetItem.Clone( rXFillAttrSetItem.GetItemSet().GetPool() ) ) ), - pPool( rXFillAttrSetItem.GetItemSet().GetPool() ) -{ -} - -XFillExchangeData::~XFillExchangeData() -{ -} - -/// binary export (currently w/o version control because it is not persistent) -SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rData ) -{ - if( rData.pXFillAttrSetItem ) - { - SfxWhichIter aIter( rData.pXFillAttrSetItem->GetItemSet() ); - sal_uInt16 nWhich = aIter.FirstWhich(); - const SfxPoolItem* pItem; - sal_uInt32 nItemCount = 0; - sal_uInt64 const nFirstPos = rOStm.Tell(); - - rOStm.WriteUInt32( nItemCount ); - - while( nWhich ) - { - if( SfxItemState::SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, false, &pItem ) ) - { - VersionCompat aCompat( rOStm, StreamMode::WRITE ); - const sal_uInt16 nItemVersion2 = pItem->GetVersion( static_cast<sal_uInt16>(rOStm.GetVersion()) ); - - rOStm.WriteUInt16( nWhich ).WriteUInt16( nItemVersion2 ); - pItem->Store( rOStm, nItemVersion2 ); - - nItemCount++; - } - - nWhich = aIter.NextWhich(); - } - - const sal_uIntPtr nLastPos = rOStm.Tell(); - rOStm.Seek( nFirstPos ); - rOStm.WriteUInt32( nItemCount ); - rOStm.Seek( nLastPos ); - } - - return rOStm; -} - -/// binary export (currently w/o version control because it is not persistent) -SvStream& ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rData ) -{ - DBG_ASSERT( rData.pPool, "XFillExchangeData has no pool" ); - - auto pSet = o3tl::make_unique<SfxItemSet>( *rData.pPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); - sal_uInt32 nItemCount = 0; - sal_uInt16 nWhich, nItemVersion; - - rIStm.ReadUInt32( nItemCount ); - - if( nItemCount > sal_uInt16( XATTR_FILL_LAST - XATTR_FILL_FIRST + 1 ) ) - nItemCount = ( XATTR_FILL_LAST - XATTR_FILL_FIRST + 1 ); - - for( sal_uInt32 i = 0; i < nItemCount; i++ ) - { - VersionCompat aCompat( rIStm, StreamMode::READ ); - - rIStm.ReadUInt16( nWhich ).ReadUInt16( nItemVersion ); - - if( nWhich ) - { - std::unique_ptr<SfxPoolItem> pNewItem(rData.pPool->GetDefaultItem( nWhich ).Create( rIStm, nItemVersion )); - - if( pNewItem ) - { - pSet->Put( *pNewItem ); - } - } - } - - rData.pXFillAttrSetItem.reset( new XFillAttrSetItem( std::move(pSet) ) ); - rData.pPool = rData.pXFillAttrSetItem->GetItemSet().GetPool(); - - return rIStm; -} - -XFillExchangeData& XFillExchangeData::operator=( const XFillExchangeData& rData ) -{ - if (this != &rData) - { - if( rData.pXFillAttrSetItem ) - pXFillAttrSetItem.reset( static_cast<XFillAttrSetItem*>( rData.pXFillAttrSetItem->Clone( pPool = rData.pXFillAttrSetItem->GetItemSet().GetPool() ) ) ); - else - { - pPool = nullptr; - pXFillAttrSetItem.reset(); - } - } - return *this; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |