[Libreoffice-commits] core.git: include/svx svx/source sw/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Thu Aug 17 19:20:33 UTC 2017
include/svx/sdasitm.hxx | 9 ---------
include/svx/svddef.hxx | 3 +--
svx/source/items/customshapeitem.cxx | 4 ----
svx/source/svdraw/svdattr.cxx | 8 --------
svx/source/unodraw/unoprov.cxx | 1 -
sw/source/uibase/uiview/formatclipboard.cxx | 1 -
6 files changed, 1 insertion(+), 25 deletions(-)
New commits:
commit fc443f3b50e33a1adab03bbf7fb9f9351eb07868
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Thu Aug 17 09:59:33 2017 +0200
drop unused SdrCustomShapeReplacementURLItem
no user found at least since 2004
last traceable commit 50a73f5963c4d0ca34629f36cc04e8b45f61bd62
Date: Fri Apr 2 13:07:39 2004 +0000
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED
Change-Id: Iaaf80e93ed60611f5e03688f4d95ab0a7d024e79
Reviewed-on: https://gerrit.libreoffice.org/41262
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 8ad95dd9ed71..8bf5eab3e8b9 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -22,7 +22,6 @@
#include <svx/svddef.hxx>
#include <svx/sdooitm.hxx>
-#include <svl/stritem.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Any.hxx>
@@ -77,14 +76,6 @@ private:
void ClearPropertyValue( const OUString& rPropertyName );
};
-class SVX_DLLPUBLIC SdrCustomShapeReplacementURLItem : public SfxStringItem
-{
- public:
- SdrCustomShapeReplacementURLItem();
- virtual ~SdrCustomShapeReplacementURLItem() override;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
-};
-
inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) {
return SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto );
}
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 30d50d2254f9..eed623e04149 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -287,8 +287,7 @@
#define SDRATTR_CUSTOMSHAPE_ENGINE (SDRATTR_CUSTOMSHAPE_FIRST + 0) /* 1334 V4+++*/
#define SDRATTR_CUSTOMSHAPE_DATA (SDRATTR_CUSTOMSHAPE_FIRST + 1) /* 1335 V4+++*/
#define SDRATTR_CUSTOMSHAPE_GEOMETRY (SDRATTR_CUSTOMSHAPE_FIRST + 2) /* 1336 V4+++*/
-#define SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL (SDRATTR_CUSTOMSHAPE_FIRST + 3) /* 1337 V4+++*/
-#define SDRATTR_CUSTOMSHAPE_LAST (SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL) /* 1357 V4+++*/
+#define SDRATTR_CUSTOMSHAPE_LAST (SDRATTR_CUSTOMSHAPE_GEOMETRY) /* 1357 V4+++*/
#define SDRATTR_TABLE_FIRST (SDRATTR_CUSTOMSHAPE_LAST+1)
#define SDRATTR_TABLE_BORDER (SDRATTR_TABLE_FIRST+0)
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 507a7694bab7..ffd6c514c64f 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -304,8 +304,4 @@ bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe
}
}
-SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem()
-: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, "" )
-{}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index e4fb92b3e0ee..d38a8e6bf5be 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -305,7 +305,6 @@ SdrItemPool::SdrItemPool(
rPoolDefaults[ SDRATTR_CUSTOMSHAPE_ENGINE - SDRATTR_START ] = new SfxStringItem(SDRATTR_CUSTOMSHAPE_ENGINE, "");
rPoolDefaults[ SDRATTR_CUSTOMSHAPE_DATA - SDRATTR_START ] = new SfxStringItem(SDRATTR_CUSTOMSHAPE_DATA, "");
rPoolDefaults[ SDRATTR_CUSTOMSHAPE_GEOMETRY - SDRATTR_START ] = new SdrCustomShapeGeometryItem;
- rPoolDefaults[ SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL - SDRATTR_START ] = new SdrCustomShapeReplacementURLItem;
SvxBoxItem* pboxItem = new SvxBoxItem( SDRATTR_TABLE_BORDER );
pboxItem->SetAllDistances( 100 );
@@ -1933,13 +1932,6 @@ SfxPoolItem* SdrMeasureTextUpsideDownItem::Clone(SfxItemPool* ) const
{
return new SdrMeasureTextUpsideDownItem(*this);
}
-SdrCustomShapeReplacementURLItem::~SdrCustomShapeReplacementURLItem()
-{
-}
-SfxPoolItem* SdrCustomShapeReplacementURLItem::Clone( SfxItemPool*) const
-{
- return new SdrCustomShapeReplacementURLItem(*this);
-}
SfxPoolItem* SdrLayerIdItem::Clone(SfxItemPool* /*pPool*/) const
{
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 48caa04e1683..c03ede3c1ad3 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -687,7 +687,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
{ OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY,
cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0 },
- { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, cppu::UnoType<OUString>::get(), 0, 0},
FILL_PROPERTIES
LINE_PROPERTIES
LINE_PROPERTIES_START_END
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index d4af4906b67a..2c877774561e 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -373,7 +373,6 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_ENGINE);
pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_DATA);
pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_GEOMETRY);
- pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL);
}
}
}
More information about the Libreoffice-commits
mailing list