diff options
| -rw-r--r-- | basctl/inc/pch/precompiled_basctl.hxx | 1 | ||||
| -rw-r--r-- | chart2/inc/pch/precompiled_chartcontroller.hxx | 1 | ||||
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 1 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 1 | ||||
| -rw-r--r-- | include/editeng/unoprnms.hxx | 2 | ||||
| -rw-r--r-- | include/svx/sdasaitm.hxx | 61 | ||||
| -rw-r--r-- | include/svx/strings.hrc | 1 | ||||
| -rw-r--r-- | include/svx/svdattr.hxx | 1 | ||||
| -rw-r--r-- | include/svx/svddef.hxx | 9 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 3 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 1 | ||||
| -rw-r--r-- | sd/inc/pch/precompiled_sdui.hxx | 1 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 1 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdattr.cxx | 113 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 7 | ||||
| -rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 1 |
18 files changed, 4 insertions, 203 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index bdaaa6058bc6..1f88ac075e57 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -445,7 +445,6 @@ #include <svx/itextprovider.hxx> #include <svx/pageitem.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index df610d888408..2e381e5fa754 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -397,7 +397,6 @@ #include <svx/pageitem.hxx> #include <svx/rectenum.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 26dc928a4f77..570a0dabc67f 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -367,7 +367,6 @@ #include <svx/ofaitem.hxx> #include <svx/pageitem.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 5360f750da48..294758de86ce 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -120,7 +120,6 @@ #include <vcl/svapp.hxx> #include <svx/svx3ditems.hxx> #include <svx/svdoashp.hxx> -#include <svx/sdasaitm.hxx> #include "svx/EnhancedCustomShapeTypeNames.hxx" #include "svx/EnhancedCustomShapeGeometry.hxx" #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index ddd2a04593a8..c059c942f751 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -334,8 +334,6 @@ #define UNO_NAME_GRAPHIC_COLOR_MODE "GraphicColorMode" #define UNO_NAME_GRAPHIC_GRAPHICCROP "GraphicCrop" -#define UNO_NAME_CUSTOMSHAPE_ADJUSTMENT "CustomShapeAdjustment" - #endif diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx deleted file mode 100644 index c5da0b47a348..000000000000 --- a/include/svx/sdasaitm.hxx +++ /dev/null @@ -1,61 +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_SVX_SDASAITM_HXX -#define INCLUDED_SVX_SDASAITM_HXX - -#include <vector> - -#include <svl/poolitem.hxx> - -class SdrCustomShapeAdjustmentValue -{ - sal_uInt32 nValue; - - friend class SdrCustomShapeAdjustmentItem; -}; - -class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem -{ - std::vector<SdrCustomShapeAdjustmentValue> aAdjustmentValueList; - - public: - - SdrCustomShapeAdjustmentItem(); - virtual ~SdrCustomShapeAdjustmentItem() override; - - virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool GetPresentation(SfxItemPresentation ePresentation, - MapUnit eCoreMetric, MapUnit ePresentationMetric, - OUString &rText, const IntlWrapper&) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) 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; - - sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); }; - const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; - void SetValue( sal_uInt32 nIndex, - const SdrCustomShapeAdjustmentValue& rVal ); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 5b412117adb2..feb1cca33ccd 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -404,7 +404,6 @@ #define SIP_SA_TEXT_ANIDELAY NC_("SIP_SA_TEXT_ANIDELAY", "Speed of ticker") #define SIP_SA_TEXT_ANIAMOUNT NC_("SIP_SA_TEXT_ANIAMOUNT", "Ticker step size") #define SIP_SA_TEXT_CONTOURFRAME NC_("SIP_SA_TEXT_CONTOURFRAME", "Outline text flow") -#define SIP_SA_CUSTOMSHAPE_ADJUSTMENT NC_("SIP_SA_CUSTOMSHAPE_ADJUSTMENT", "Shape Adjustment") #define SIP_SA_XMLATTRIBUTES NC_("SIP_SA_XMLATTRIBUTES", "User-defined attributes") #define SIP_SA_TEXT_USEFIXEDCELLHEIGHT NC_("SIP_SA_TEXT_USEFIXEDCELLHEIGHT", "Use font-independent line spacing") #define SIP_SA_WORDWRAP NC_("SIP_SA_WORDWRAP", "Word wrap text in shape") diff --git a/include/svx/svdattr.hxx b/include/svx/svdattr.hxx index 5bc2767bb53b..85ab6711f9f8 100644 --- a/include/svx/svdattr.hxx +++ b/include/svx/svdattr.hxx @@ -50,7 +50,6 @@ #include <svx/sdggaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sdgmoitm.hxx> -#include <svx/sdasaitm.hxx> #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index deca8bcf2310..30d50d2254f9 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -107,11 +107,10 @@ #define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 sal_uInt16, def=0 - Pool V2/V4 */ #define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 sal_uInt16, def=0 - Pool V2/V4 */ #define SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21) /* 1118 */ /* 1118 */ /* 1101 */ /* Pool V2 */ -#define SDRATTR_CUSTOMSHAPE_ADJUSTMENT (SDRATTR_MISC_FIRST +22) /* 1119 */ /* 1119 */ /* 1102 */ /* Pool V2 */ -#define SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +23) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ -#define SDRATTR_TEXT_USEFIXEDCELLHEIGHT (SDRATTR_MISC_FIRST +24) /* 1121 */ /* 1121 */ /* 1104 */ /* Pool V2 */ -#define SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +25) /* 1122 */ /* 1122 */ /* 1105 */ /* Pool V2 */ -#define SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST +26) /* 1123 */ /* 1123 */ /* 1106 */ /* Pool V2 */ +#define SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +22) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ +#define SDRATTR_TEXT_USEFIXEDCELLHEIGHT (SDRATTR_MISC_FIRST +23) /* 1121 */ /* 1121 */ /* 1104 */ /* Pool V2 */ +#define SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +24) /* 1122 */ /* 1122 */ /* 1105 */ /* Pool V2 */ +#define SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST +25) /* 1123 */ /* 1123 */ /* 1106 */ /* Pool V2 */ #define SDRATTR_MISC_LAST (SDRATTR_TEXT_CHAINNEXTNAME) /* 1125 */ /* 1125 */ /* 1108 */ /* Pool V1: 1056 */ #define SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1) /* 1127 */ /* Pool V4 */ diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index cf0bf7a4c662..74fb7b18184c 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -526,9 +526,6 @@ #define SPECIAL_3DBACKSCALE_PROPERTIES \ { OUString(UNO_NAME_3D_BACKSCALE) ,SDRATTR_3DOBJ_BACKSCALE , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \ -#define CUSTOMSHAPE_PROPERTIES \ - { OUString(UNO_NAME_CUSTOMSHAPE_ADJUSTMENT),SDRATTR_CUSTOMSHAPE_ADJUSTMENT, cppu::UnoType<css::uno::Sequence<sal_Int32>>::get(), 0, 0}, \ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 07c3c3d6819d..5515f2981e0c 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -421,7 +421,6 @@ #include <svx/itextprovider.hxx> #include <svx/pageitem.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 40f1de0244d4..3056ad8b7206 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -469,7 +469,6 @@ #include <svx/grfcrop.hxx> #include <svx/itextprovider.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 0e51c502110c..61774a8605f8 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -400,7 +400,6 @@ #include <svx/pageitem.hxx> #include <svx/rectenum.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 630a2a4cf39d..cf33390dea26 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -28,7 +28,6 @@ #include <svx/svdocapt.hxx> #include <svx/svdpage.hxx> #include <svx/xflclit.hxx> -#include <svx/sdasaitm.hxx> #include <svx/svdmodel.hxx> #include <rtl/crc.h> #include <rtl/math.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 18b4965e87f4..f83cdc4fb66d 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -25,7 +25,6 @@ #include <vcl/metric.hxx> #include <svx/svdpage.hxx> #include <svx/sdasitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdtfsitm.hxx> #include <vcl/virdev.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index cc94cf7efc3e..e4fb92b3e0ee 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -161,7 +161,6 @@ SdrItemPool::SdrItemPool( rPoolDefaults[SDRATTR_TEXT_ANIDELAY -SDRATTR_START]=new SdrTextAniDelayItem; rPoolDefaults[SDRATTR_TEXT_ANIAMOUNT -SDRATTR_START]=new SdrTextAniAmountItem; rPoolDefaults[SDRATTR_TEXT_CONTOURFRAME -SDRATTR_START]=new SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME, false); - rPoolDefaults[SDRATTR_CUSTOMSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrCustomShapeAdjustmentItem; rPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES ); rPoolDefaults[SDRATTR_TEXT_CHAINNEXTNAME -SDRATTR_START]=new SfxStringItem(SDRATTR_TEXT_CHAINNEXTNAME, ""); rPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem; @@ -479,7 +478,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) case SDRATTR_TEXT_ANIDELAY : pResId = SIP_SA_TEXT_ANIDELAY;break; case SDRATTR_TEXT_ANIAMOUNT : pResId = SIP_SA_TEXT_ANIAMOUNT;break; case SDRATTR_TEXT_CONTOURFRAME : pResId = SIP_SA_TEXT_CONTOURFRAME;break; - case SDRATTR_CUSTOMSHAPE_ADJUSTMENT : pResId = SIP_SA_CUSTOMSHAPE_ADJUSTMENT;break; case SDRATTR_XMLATTRIBUTES : pResId = SIP_SA_XMLATTRIBUTES;break; case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: pResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break; case SDRATTR_TEXT_WORDWRAP : pResId = SIP_SA_WORDWRAP;break; @@ -1301,117 +1299,6 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe return true; } - -SdrCustomShapeAdjustmentItem::SdrCustomShapeAdjustmentItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_ADJUSTMENT ) -{ -} - -SdrCustomShapeAdjustmentItem::~SdrCustomShapeAdjustmentItem() -{ -} - -bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const -{ - bool bRet = SfxPoolItem::operator==( rCmp ); - if ( bRet ) - { - bRet = GetCount() == static_cast<const SdrCustomShapeAdjustmentItem&>(rCmp).GetCount(); - - if (bRet) - { - for (sal_uInt32 i = 0; i < GetCount(); ++i) - if (aAdjustmentValueList[i].nValue != static_cast<const SdrCustomShapeAdjustmentItem&>(rCmp).aAdjustmentValueList[i].nValue) - return false; - } - } - return bRet; -} - -bool SdrCustomShapeAdjustmentItem::GetPresentation( - SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, - MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const -{ - sal_uInt32 i, nCount = GetCount(); - rText += OUString::number( nCount ); - for ( i = 0; i < nCount; i++ ) - { - rText = rText + " " + OUString::number( GetValue( i ).nValue ); - } - if ( ePresentation == SfxItemPresentation::Complete ) - { - OUString aStr; - - SdrItemPool::TakeItemName( Which(), aStr ); - rText = aStr + " " + rText; - } - return true; -} - -SfxPoolItem* SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const -{ - SdrCustomShapeAdjustmentItem* pItem = new SdrCustomShapeAdjustmentItem; - pItem->aAdjustmentValueList = aAdjustmentValueList; - return pItem; -} - -const SdrCustomShapeAdjustmentValue& SdrCustomShapeAdjustmentItem::GetValue( sal_uInt32 nIndex ) const -{ -#ifdef DBG_UTIL - if ( aAdjustmentValueList.size() <= nIndex ) - OSL_FAIL( "SdrCustomShapeAdjustemntItem::GetValue - nIndex out of range (SJ)" ); -#endif - return aAdjustmentValueList[nIndex]; -} - -void SdrCustomShapeAdjustmentItem::SetValue( sal_uInt32 nIndex, const SdrCustomShapeAdjustmentValue& rVal ) -{ - for (sal_uInt32 i = aAdjustmentValueList.size(); i <= nIndex; i++ ) - aAdjustmentValueList.push_back(SdrCustomShapeAdjustmentValue()); - - aAdjustmentValueList[nIndex] = rVal; -} - -sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const -{ - return 1; -} - -bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const -{ - sal_uInt32 i, nCount = GetCount(); - uno::Sequence< sal_Int32 > aSequence( nCount ); - if ( nCount ) - { - sal_Int32* pPtr = aSequence.getArray(); - for ( i = 0; i < nCount; i++ ) - *pPtr++ = GetValue( i ).nValue; - } - rVal <<= aSequence; - return true; -} - -bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) -{ - uno::Sequence< sal_Int32 > aSequence; - if( !( rVal >>= aSequence ) ) - return false; - - aAdjustmentValueList.clear(); - - sal_uInt32 i, nCount = aSequence.getLength(); - if ( nCount ) - { - SdrCustomShapeAdjustmentValue val; - const sal_Int32* pPtr2 = aSequence.getConstArray(); - for ( i = 0; i < nCount; i++ ) - { - val.nValue = *pPtr2++; - aAdjustmentValueList.push_back(val); - } - } - return true; -} - // EdgeKind SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 92d9f1b7ff4c..48caa04e1683 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -64,7 +64,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -88,7 +87,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -161,7 +159,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -187,7 +184,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -213,7 +209,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -419,7 +414,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() SPECIAL_3DBACKSCALE_PROPERTIES SPECIAL_3DPOLYGONOBJECT_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -694,7 +688,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { 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}, - CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES LINE_PROPERTIES_START_END diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 6a3ccf2b6a78..82cea6937639 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -537,7 +537,6 @@ #include <svx/itextprovider.hxx> #include <svx/msdffdef.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdasitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdgcoitm.hxx> |