Skip to content

C
core
Kaydet (Commit) 1132e591 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

svx: remove newly unused XFillExchangeData 

Change-Id: I0260504ba108421e82ad50f9680dda9a05710678
Reviewed-on: https://gerrit.libreoffice.org/62456
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 0a6813ad
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 201 deletions
include/svx/xexch.hxx deleted 100644 → 0
Dosyayı görüntüle @ 0a6813ad
/* -*- 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_SVX_XEXCH_HXX
#define INCLUDED_SVX_XEXCH_HXX
#include <svx/svxdllapi.h>
#include <memory>
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Clipboard format for XOutDev filling attributes
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
class XFillAttrSetItem;
class SfxItemPool;
class SvStream;
class SVX_DLLPUBLIC XFillExchangeData final
{
private:
std::unique_ptr<XFillAttrSetItem> pXFillAttrSetItem;
SfxItemPool* pPool;
public:
XFillExchangeData(const XFillAttrSetItem& rXFillAttrSetItem);
~XFillExchangeData();
XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData );
SVX_DLLPUBLIC friend SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
SVX_DLLPUBLIC friend SvStream& ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
XFillAttrSetItem* GetXFillAttrSetItem() { return pXFillAttrSetItem.get(); }
};
#endif // INCLUDED_SVX_XEXCH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/view/sdview2.cxx
Dosyayı görüntüle @ 1132e591
......@@ -27,7 +27,6 @@
#include <svx/svdoole2.hxx>
#include <svx/svdograf.hxx>
#include <vcl/graph.hxx>
#include <svx/xexch.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <sfx2/docfile.hxx>
......
sd/source/ui/view/sdview3.cxx
Dosyayı görüntüle @ 1132e591
......@@ -26,7 +26,6 @@
#include <unotools/pathoptions.hxx>
#include <editeng/editdata.hxx>
#include <svl/urlbmk.hxx>
#include <svx/xexch.hxx>
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/svdpagv.hxx>
......
solenv/clang-format/blacklist
Dosyayı görüntüle @ 1132e591
......@@ -7524,7 +7524,6 @@ include/svx/xcolit.hxx
include/svx/xdash.hxx
include/svx/xdef.hxx
include/svx/xenum.hxx
include/svx/xexch.hxx
include/svx/xfillit.hxx
include/svx/xfillit0.hxx
include/svx/xflasit.hxx
......@@ -14795,7 +14794,6 @@ svx/source/xoutdev/_xpoly.cxx
svx/source/xoutdev/xattr.cxx
svx/source/xoutdev/xattr2.cxx
svx/source/xoutdev/xattrbmp.cxx
svx/source/xoutdev/xexch.cxx
svx/source/xoutdev/xpool.cxx
svx/source/xoutdev/xtabbtmp.cxx
svx/source/xoutdev/xtabcolr.cxx
......
svx/Library_svxcore.mk
Dosyayı görüntüle @ 1132e591
......@@ -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 \
......
svx/source/svdraw/svdxcgv.cxx
Dosyayı görüntüle @ 1132e591
......@@ -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>
......
svx/source/tbxctrls/colrctrl.cxx
Dosyayı görüntüle @ 1132e591
......@@ -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>
......
svx/source/xoutdev/xexch.cxx deleted 100644 → 0
Dosyayı görüntüle @ 0a6813ad
/* -*- 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: */
sw/source/core/frmedt/fecopy.cxx
Dosyayı görüntüle @ 1132e591
......@@ -26,7 +26,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/viewsh.hxx>
#include <svx/xexch.hxx>
#include <svx/xflasit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
......
sw/source/uibase/dochdl/swdtflvr.cxx
Dosyayı görüntüle @ 1132e591
......@@ -50,7 +50,6 @@
#include <vcl/graph.hxx>
#include <svl/urihelper.hxx>
#include <svx/svdmodel.hxx>
#include <svx/xexch.hxx>
#include <svx/xmlexchg.hxx>
#include <svx/dbaexchange.hxx>
#include <svx/clipfmtitem.hxx>
......
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