diff options
40 files changed, 2 insertions, 1321 deletions
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index c0570e9186ce..788eed1d4b05 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -76,8 +76,6 @@ namespace connectivity virtual sal_Int32 SAL_CALL getMinorVersion( ) override; public: - const css::uno::Reference< css::lang::XMultiServiceFactory > - & getMSFactory() const { return m_xFactory; } css::uno::Reference< css::uno::XComponentContext > getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 2ed512817c12..692dd9f8a062 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -120,8 +120,6 @@ namespace connectivity OEvoabResultSet( OCommonStatement *pStmt, OEvoabConnection *pConnection ); void construct( const QueryData& _rData ); - OEvoabConnection * getConnection() { return m_pConnection; } - css::uno::Reference< css::uno::XInterface > operator *() { return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 71ca353acae6..3091ddaadb65 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -268,7 +268,6 @@ public: void SetMetric( sal_uInt16 n ) { nMetric = n; } bool IsOwnerOfPool() const { return bOwnerOfPool; } - void StoreUnicodeStrings( bool b ) { bStoreUnicodeStrings = b; } bool operator==( const EditTextObjectImpl& rCompare ) const; bool Equals( const EditTextObjectImpl& rCompare, bool bComparePool ) const; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 951e6b6be85b..af28642f87cf 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -29,70 +29,6 @@ #define BULITEM_VERSION ((sal_uInt16)2) -void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont ) -{ - sal_uInt16 nTemp; - - WriteColor( rStream, rFont.GetColor() ); - nTemp = (sal_uInt16)rFont.GetFamilyType(); rStream.WriteUInt16( nTemp ); - - nTemp = (sal_uInt16)GetSOStoreTextEncoding(rFont.GetCharSet()); - rStream.WriteUInt16( nTemp ); - - nTemp = (sal_uInt16)rFont.GetPitch(); rStream.WriteUInt16( nTemp ); - nTemp = (sal_uInt16)rFont.GetAlignment(); rStream.WriteUInt16( nTemp ); - nTemp = (sal_uInt16)rFont.GetWeight(); rStream.WriteUInt16( nTemp ); - nTemp = (sal_uInt16)rFont.GetUnderline(); rStream.WriteUInt16( nTemp ); - nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp ); - nTemp = (sal_uInt16)rFont.GetItalic(); rStream.WriteUInt16( nTemp ); - - // UNICODE: rStream << rFont.GetFamilyName(); - rStream.WriteUniOrByteString(rFont.GetFamilyName(), rStream.GetStreamCharSet()); - - rStream.WriteBool( rFont.IsOutline() ); - rStream.WriteBool( rFont.IsShadow() ); - rStream.WriteBool( rFont.IsTransparent() ); -} - - -vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) -{ - vcl::Font aFont; - Color aColor; - ReadColor( rStream, aColor ); aFont.SetColor( aColor ); - sal_uInt16 nTemp; - rStream.ReadUInt16( nTemp ); aFont.SetFamily((FontFamily)nTemp); - - rStream.ReadUInt16( nTemp ); - nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp); - aFont.SetCharSet((rtl_TextEncoding)nTemp); - - rStream.ReadUInt16( nTemp ); aFont.SetPitch((FontPitch)nTemp); - rStream.ReadUInt16( nTemp ); aFont.SetAlignment((FontAlign)nTemp); - rStream.ReadUInt16( nTemp ); aFont.SetWeight((FontWeight)nTemp); - rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontLineStyle)nTemp); - rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp); - rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp); - - // UNICODE: rStream >> aName; aFont.SetFamilyName( aName ); - OUString aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet()); - aFont.SetFamilyName( aName ); - - if( nVer == 1 ) - { - sal_Int32 nHeight(0), nWidth(0); - rStream.ReadInt32( nHeight ); rStream.ReadInt32( nWidth ); Size aSize( nWidth, nHeight ); - aFont.SetFontSize( aSize ); - } - - bool bTemp; - rStream.ReadCharAsBool( bTemp ); aFont.SetOutline( bTemp ); - rStream.ReadCharAsBool( bTemp ); aFont.SetShadow( bTemp ); - rStream.ReadCharAsBool( bTemp ); aFont.SetTransparent( bTemp ); - return aFont; -} - - SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) { SetDefaultFont_Impl(); diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index c2bdb37ccbd8..3ab2c2623df3 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -272,13 +272,6 @@ MetaAction* SvxFieldData::createEndComment() } -SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : - SfxPoolItem( nId ) - , mxField( pFld ) // belongs directly to the item -{ -} - - SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : SfxPoolItem( nId ) , mxField( rField.Clone() ) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 4dbd8d708f88..24c33bc36aa2 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -67,7 +67,6 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/fwdtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> @@ -419,11 +418,6 @@ bool SvxFontItem::GetPresentation } -void SvxFontItem::EnableStoreUnicodeNames( bool bEnable ) -{ - bEnableStoreUnicodeNames = bEnable; -} - void SvxFontItem::dumpAsXml(xmlTextWriterPtr pWriter) const { xmlTextWriterStartElement(pWriter, BAD_CAST("SvxFontItem")); @@ -1093,97 +1087,6 @@ void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -// class SvxFontWidthItem ----------------------------------------------- - -SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, const sal_uInt16 nId ) : - SfxPoolItem( nId ) -{ - nWidth = nSz; - nProp = nPrp; -} - - -SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const -{ - return new SvxFontWidthItem( *this ); -} - - -void SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv ) -{ - nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv ); -} - - -bool SvxFontWidthItem::HasMetrics() const -{ - return true; -} - - -bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const -{ - assert(SfxPoolItem::operator==(rItem)); - return GetWidth() == static_cast<const SvxFontWidthItem&>(rItem).GetWidth() && - GetProp() == static_cast<const SvxFontWidthItem&>(rItem).GetProp(); -} - -bool SvxFontWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const -{ -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); - nMemberId &= ~CONVERT_TWIPS; - switch(nMemberId) - { - case MID_FONTWIDTH: - rVal <<= (sal_Int16)(nWidth); - break; - case MID_FONTWIDTH_PROP: - rVal <<= (sal_Int16)(nProp); - break; - } - return true; -} - -bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) -{ -// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); - nMemberId &= ~CONVERT_TWIPS; - sal_Int16 nVal = sal_Int16(); - if(!(rVal >>= nVal)) - return false; - - switch(nMemberId) - { - case MID_FONTWIDTH: - nProp = nVal; - break; - case MID_FONTWIDTH_PROP: - nWidth = nVal; - break; - } - return true; -} - - -bool SvxFontWidthItem::GetPresentation -( - SfxItemPresentation /*ePres*/, - MapUnit eCoreUnit, - MapUnit /*ePresUnit*/, - OUString& rText, const IntlWrapper& rIntl -) const -{ - if ( 100 == nProp ) - { - rText = GetMetricText( (long)nWidth, - eCoreUnit, MapUnit::MapPoint, &rIntl ) + - " " + EditResId(GetMetricId(MapUnit::MapPoint)); - } - else - rText = OUString::number( nProp ) + "%"; - return true; -} - // class SvxTextLineItem ------------------------------------------------ SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId ) @@ -1742,14 +1645,6 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const Color& rCol, { } -SvxBackgroundColorItem::SvxBackgroundColorItem(SvStream& rStrm, const sal_uInt16 nId) - : SvxColorItem(nId) -{ - Color aColor; - aColor.Read(rStrm); - SetValue(aColor); -} - SvxBackgroundColorItem::SvxBackgroundColorItem( const SvxBackgroundColorItem& rCopy ) : SvxColorItem( rCopy ) { diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 4ce7e8cfb5c0..6913497186f8 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -23,7 +23,6 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/fwdtitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 92bb52d1de5a..9a524fbfaec9 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -64,9 +64,6 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto s_pFactoryFunctionPointers; public: - /// get the resource locale of the module - static const std::locale& getResLocale(); - /** register a component implementing a service with the given data. @param _rImplementationName the implementation name of the component diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 65af45a5c3e0..7203a92d20d6 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -285,12 +285,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag return xStorage; } -css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShare() -{ - SolarMutexGuard g; - return m_xWorkingStorageShare; -} - css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser() { SolarMutexGuard g; diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index da2d6b5b3736..115a3f8e7191 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -190,7 +190,6 @@ class PresetHandler @return css::embed::XStorage which the current working storage. */ - css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); css::uno::Reference< css::embed::XStorage > getWorkingStorageUser(); /** @short check if there is a parent storage well known for diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 9fb6b1091bcb..2b3109a4f6ed 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -89,9 +89,6 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - static void StoreFont( SvStream&, const vcl::Font& ); - static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer ); - void CopyValidProperties( const SvxBulletItem& rCopyFrom ); }; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index dc6979e5c04a..0e4c60702d0c 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -78,7 +78,6 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public SvxColorItem SvxBackgroundColorItem(const sal_uInt16 nId); SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId); - SvxBackgroundColorItem(SvStream& rStrm, const sal_uInt16 nId); SvxBackgroundColorItem(const SvxBackgroundColorItem& rCopy); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 728a1dddce61..ed1a7edf020e 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -66,11 +66,7 @@ public: */ class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem { -private: tools::SvRef<SvxFieldData> mxField; - - EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const sal_uInt16 nId ); - public: SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ); SvxFieldItem( const SvxFieldItem& rItem ); diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index 558239f34f09..ddb974acbea5 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -108,8 +108,6 @@ public: SvxFontItem& operator=(const SvxFontItem& rFont); - static void EnableStoreUnicodeNames(bool bEnable); - void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx deleted file mode 100644 index 801d353cc0e7..000000000000 --- a/include/editeng/fwdtitem.hxx +++ /dev/null @@ -1,84 +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_EDITENG_FWDTITEM_HXX -#define INCLUDED_EDITENG_FWDTITEM_HXX - -#include <svl/poolitem.hxx> - - -// class SvxFontWidthItem ----------------------------------------------- - - -/* [Description] - - This item describes the font width. -*/ - -class SvxFontWidthItem : public SfxPoolItem -{ - sal_uInt16 nWidth; // 0 = default - sal_uInt16 nProp; // default 100% -public: - SvxFontWidthItem( const sal_uInt16 nSz /*= 0*/, - const sal_uInt16 nPropWidth /*= 100*/, - const sal_uInt16 nId ); - - // "pure virtual Methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) 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; - - virtual bool GetPresentation( SfxItemPresentation ePres, - MapUnit eCoreMetric, - MapUnit ePresMetric, - OUString &rText, const IntlWrapper& ) const override; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual void ScaleMetrics( long nMult, long nDiv ) override; - virtual bool HasMetrics() const override; - - SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) - { - SetWidthValue( rItem.GetWidth() ); - SetProp( rItem.GetProp() ); - return *this; - } - - sal_uInt16 GetWidth() const { return nWidth; } - - void SetWidthValue( sal_uInt16 nNewWidth ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nWidth = nNewWidth; - } - - void SetProp( const sal_uInt16 nNewProp ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nProp = nNewProp; - } - - sal_uInt16 GetProp() const { return nProp; } -}; - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h index 611b52620096..d7d0a538ee4d 100644 --- a/include/editeng/memberids.h +++ b/include/editeng/memberids.h @@ -80,10 +80,6 @@ #define MID_ESC_HEIGHT 1 #define MID_AUTO_ESC 2 -//SvxFontWidthItem -#define MID_FONTWIDTH 0 -#define MID_FONTWIDTH_PROP 1 - //SvxFontHeightItem #define MID_FONTHEIGHT 1 #define MID_FONTHEIGHT_PROP 2 diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index 660314b63236..ab1e23a6c618 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -20,7 +20,6 @@ class EDITENG_DLLPUBLIC SvxRsidItem : public SfxUInt32Item { public: SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {} - SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index ecfe66269466..fa0f58a55c4e 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -31,7 +31,6 @@ public: void SetFont( const vcl::Font& rFont ); void SetText( const OUString& rText ) override; void InsertCharToDoc(); - Point GetClickPosition() const; void createContextMenu(); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 39a7997ac916..b75e9b10de5c 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -103,10 +103,6 @@ public: const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); - SfxPopupWindow( sal_uInt16 nId, - const css::uno::Reference< css::frame::XFrame >& rFrame, - vcl::Window* pParentWindow, - WinBits nBits ); virtual ~SfxPopupWindow() override; virtual void dispose() override; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 37f8d535756a..822884868a83 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -175,8 +175,6 @@ public: sal_uInt16 GetLastWhich() const; bool IsInRange( sal_uInt16 nWhich ) const; bool IsInVersionsRange( sal_uInt16 nWhich ) const; - bool IsInStoringRange( sal_uInt16 nWhich ) const; - void SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo ); void SetSecondaryPool( SfxItemPool *pPool ); SfxItemPool* GetSecondaryPool() const; SfxItemPool* GetMasterPool() const; @@ -205,14 +203,11 @@ public: static bool IsSlot(sal_uInt16 nId) { return nId && nId > SFX_WHICH_MAX; } - static const SfxItemPool* GetStoringPool(); - void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: const SfxItemPool& operator=(const SfxItemPool &) = delete; - static const SfxItemPool* pStoringPool_; //IDs below or equal are Which IDs, IDs above slot IDs static const sal_uInt16 SFX_WHICH_MAX = 4999; }; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 4edde4dcb503..f4a8bb5e9420 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -584,8 +584,6 @@ public: void SetMaxCacheSize( sal_uLong nNewCacheSize ); sal_uLong GetMaxCacheSize() const; - void SetMaxObjCacheSize( sal_uLong nNewMaxObjSize ); - void SetCacheTimeout( sal_uLong nTimeoutSeconds ); bool IsInCache( diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index e8d8d0f5ba86..d35e0f23731a 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -218,7 +218,7 @@ private: long nEndX; /* End in x direction */ long nStartY; /* Start in y direction */ long nEndY; /* Ende in y direction */ - bool bLimits; /* boundary limit control by the application */ + bool bLimits; /* boundary limit control by the application */ protected: virtual bool operator==( const SfxPoolItem& ) const override; @@ -241,8 +241,6 @@ public: long nStartY, long nEndY); SvxObjectItem(const SvxObjectItem& rCopy); - bool HasLimits() const { return bLimits;} - long GetStartX() const { return nStartX;} long GetEndX() const { return nEndX;} long GetStartY() const { return nStartY;} diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index 65f298f9c88e..8877a05dbd61 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -61,8 +61,6 @@ public: IntlWrapper(const LanguageTag& rLanguageTag); ~IntlWrapper(); - const LanguageTag& getLanguageTag() const { return maLanguageTag; } - const LocaleDataWrapper* getLocaleData() const { if ( !pLocaleData ) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index ee241d416a31..e2950bab64a1 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -512,200 +512,6 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap() return *pContentValidationMessageElemTokenMap; } -const SvXMLTokenMap& ScXMLImport::GetCondFormatsTokenMap() -{ - if( !pCondFormatsTokenMap ) - { - static const SvXMLTokenMapEntry aCondFormatsElemTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_CONDITIONAL_FORMAT, XML_TOK_CONDFORMATS_CONDFORMAT }, - XML_TOKEN_MAP_END - }; - - pCondFormatsTokenMap = new SvXMLTokenMap( aCondFormatsElemTokenMap ); - } - - return *pCondFormatsTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCondFormatTokenMap() -{ - if( !pCondFormatTokenMap ) - { - static const SvXMLTokenMapEntry aCondFormatElemTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE, XML_TOK_CONDFORMAT_COLORSCALE }, - { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, XML_TOK_CONDFORMAT_DATABAR }, - { XML_NAMESPACE_CALC_EXT, XML_CONDITION, XML_TOK_CONDFORMAT_CONDITION }, - { XML_NAMESPACE_CALC_EXT, XML_ICON_SET, XML_TOK_CONDFORMAT_ICONSET }, - { XML_NAMESPACE_CALC_EXT, XML_DATE_IS, XML_TOK_CONDFORMAT_DATE }, - XML_TOKEN_MAP_END - }; - - pCondFormatTokenMap = new SvXMLTokenMap( aCondFormatElemTokenMap ); - } - - return *pCondFormatTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCondFormatAttrMap() -{ - if( !pCondFormatAttrMap ) - { - static const SvXMLTokenMapEntry aCondFormatAttrTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_TARGET_RANGE_ADDRESS, XML_TOK_CONDFORMAT_TARGET_RANGE }, - XML_TOKEN_MAP_END - }; - - pCondFormatAttrMap = new SvXMLTokenMap( aCondFormatAttrTokenMap ); - } - - return *pCondFormatAttrMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCondDateAttrMap() -{ - if( !pCondDateAttrMap ) - { - static const SvXMLTokenMapEntry aCondDateAttrTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_DATE, XML_TOK_COND_DATE_VALUE }, - { XML_NAMESPACE_CALC_EXT, XML_STYLE, XML_TOK_COND_DATE_STYLE }, - XML_TOKEN_MAP_END - }; - - pCondDateAttrMap = new SvXMLTokenMap( aCondDateAttrTokenMap ); - } - - return *pCondDateAttrMap; -} - -const SvXMLTokenMap& ScXMLImport::GetConditionAttrMap() -{ - if( !pConditionAttrMap ) - { - static const SvXMLTokenMapEntry aConditionAttrTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_CONDITION_VALUE }, - { XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME, XML_TOK_CONDITION_APPLY_STYLE_NAME }, - { XML_NAMESPACE_CALC_EXT, XML_BASE_CELL_ADDRESS, XML_TOK_CONDITION_BASE_CELL_ADDRESS }, - XML_TOKEN_MAP_END - }; - - pConditionAttrMap = new SvXMLTokenMap( aConditionAttrTokenMap ); - } - - return *pConditionAttrMap; -} - -const SvXMLTokenMap& ScXMLImport::GetColorScaleTokenMap() -{ - if( !pColorScaleTokenMap ) - { - static const SvXMLTokenMapEntry aColorScaleElemTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY, XML_TOK_COLORSCALE_COLORSCALEENTRY }, - XML_TOKEN_MAP_END - }; - - pColorScaleTokenMap = new SvXMLTokenMap( aColorScaleElemTokenMap ); - } - - return *pColorScaleTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetColorScaleEntryAttrMap() -{ - if( !pColorScaleEntryAttrTokenMap ) - { - static const SvXMLTokenMapEntry aColorScaleAttrTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_TYPE, XML_TOK_COLORSCALEENTRY_TYPE }, - { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_COLORSCALEENTRY_VALUE }, - { XML_NAMESPACE_CALC_EXT, XML_COLOR, XML_TOK_COLORSCALEENTRY_COLOR }, - XML_TOKEN_MAP_END - }; - - pColorScaleEntryAttrTokenMap = new SvXMLTokenMap( aColorScaleAttrTokenMap ); - } - - return *pColorScaleEntryAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetFormattingTokenMap() -{ - if( !pDataBarTokenMap ) - { - static const SvXMLTokenMapEntry aDataBarElemTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY, XML_TOK_DATABAR_DATABARENTRY }, - { XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, XML_TOK_FORMATTING_ENTRY }, - XML_TOKEN_MAP_END - }; - - pDataBarTokenMap = new SvXMLTokenMap( aDataBarElemTokenMap ); - } - - return *pDataBarTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataBarAttrMap() -{ - if( !pDataBarAttrMap ) - { - static const SvXMLTokenMapEntry aDataBarAttrTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR, XML_TOK_DATABAR_POSITIVE_COLOR }, - { XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR, XML_TOK_DATABAR_NEGATIVE_COLOR }, - { XML_NAMESPACE_CALC_EXT, XML_GRADIENT, XML_TOK_DATABAR_GRADIENT }, - { XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, XML_TOK_DATABAR_AXISPOSITION }, - { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE, XML_TOK_DATABAR_SHOWVALUE }, - { XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, XML_TOK_DATABAR_AXISCOLOR }, - { XML_NAMESPACE_CALC_EXT, XML_MIN_LENGTH, XML_TOK_DATABAR_MINLENGTH }, - { XML_NAMESPACE_CALC_EXT, XML_MAX_LENGTH, XML_TOK_DATABAR_MAXLENGTH }, - XML_TOKEN_MAP_END - }; - - pDataBarAttrMap = new SvXMLTokenMap( aDataBarAttrTokenMap ); - } - - return *pDataBarAttrMap; -} - -const SvXMLTokenMap& ScXMLImport::GetIconSetAttrMap() -{ - if( !pIconSetAttrMap ) - { - static const SvXMLTokenMapEntry aIconSetAttrTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_ICON_SET_TYPE, XML_TOK_ICONSET_TYPE }, - { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE, XML_TOK_ICONSET_SHOWVALUE }, - XML_TOKEN_MAP_END - }; - - pIconSetAttrMap = new SvXMLTokenMap( aIconSetAttrTokenMap ); - } - - return *pIconSetAttrMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataBarEntryAttrMap() -{ - if( !pFormattingEntryAttrMap ) - { - static const SvXMLTokenMapEntry aDataBarAttrEntryTokenMap[] = - { - { XML_NAMESPACE_CALC_EXT, XML_TYPE, XML_TOK_DATABARENTRY_TYPE }, - { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_DATABARENTRY_VALUE }, - XML_TOKEN_MAP_END - }; - - pFormattingEntryAttrMap = new SvXMLTokenMap( aDataBarAttrEntryTokenMap ); - } - - return *pFormattingEntryAttrMap; -} const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() { @@ -838,633 +644,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() return *pTableAnnotationAttrTokenMap; } -const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap() -{ - if( !pDetectiveElemTokenMap ) - { - static const SvXMLTokenMapEntry aDetectiveElemTokenMap[]= - { - { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED }, - { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION }, - XML_TOKEN_MAP_END - }; - - pDetectiveElemTokenMap = new SvXMLTokenMap( aDetectiveElemTokenMap ); - } // if( !pDetectiveElemTokenMap ) - - return *pDetectiveElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap() -{ - if( !pDetectiveHighlightedAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]= - { - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION }, - { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR }, - { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID }, - XML_TOKEN_MAP_END - }; - - pDetectiveHighlightedAttrTokenMap = new SvXMLTokenMap( aDetectiveHighlightedAttrTokenMap ); - } // if( !pDetectiveHighlightedAttrTokenMap ) - - return *pDetectiveHighlightedAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap() -{ - if( !pDetectiveOperationAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]= - { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX }, - XML_TOKEN_MAP_END - }; - - pDetectiveOperationAttrTokenMap = new SvXMLTokenMap( aDetectiveOperationAttrTokenMap ); - } // if( !pDetectiveOperationAttrTokenMap ) - - return *pDetectiveOperationAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap() -{ - if( !pTableCellRangeSourceAttrTokenMap ) - { - static const SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF }, - { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME }, - { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS }, - { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN }, - { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW }, - { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY }, - XML_TOKEN_MAP_END - }; - - pTableCellRangeSourceAttrTokenMap = new SvXMLTokenMap( aTableCellRangeSourceAttrTokenMap ); - } // if( !pTableCellRangeSourceAttrTokenMap ) - - return *pTableCellRangeSourceAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap() -{ - if( !pDatabaseRangeSourceSQLAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF }, - { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESOURCE}, - { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT }, - { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT }, - XML_TOKEN_MAP_END - }; - - pDatabaseRangeSourceSQLAttrTokenMap = new SvXMLTokenMap( aDatabaseRangeSourceSQLAttrTokenMap ); - } // if( !pDatabaseRangeSourceSQLAttrTokenMap ) - - return *pDatabaseRangeSourceSQLAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap() -{ - if( !pDatabaseRangeSourceTableAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, - { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESOURCE }, - { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, - { XML_NAMESPACE_TABLE, XML_DATABASE_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, - XML_TOKEN_MAP_END - }; - - pDatabaseRangeSourceTableAttrTokenMap = new SvXMLTokenMap( aDatabaseRangeSourceTableAttrTokenMap ); - } // if( !pDatabaseRangeSourceTableAttrTokenMap ) - - return *pDatabaseRangeSourceTableAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap() -{ - if( !pDatabaseRangeSourceQueryAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF }, - { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESOURCE }, - { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME }, - XML_TOKEN_MAP_END - }; - - pDatabaseRangeSourceQueryAttrTokenMap = new SvXMLTokenMap( aDatabaseRangeSourceQueryAttrTokenMap ); - } // if( !pDatabaseRangeSourceQueryAttrTokenMap ) - - return *pDatabaseRangeSourceQueryAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap() -{ - if( !pFilterElemTokenMap ) - { - static const SvXMLTokenMapEntry aFilterTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND }, - { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR }, - { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION }, - XML_TOKEN_MAP_END - }; - - pFilterElemTokenMap = new SvXMLTokenMap( aFilterTokenMap ); - } // if( !pFilterElemTokenMap ) - - return *pFilterElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap() -{ - if( !pFilterAttrTokenMap ) - { - static const SvXMLTokenMapEntry aFilterAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES }, - XML_TOKEN_MAP_END - }; - - pFilterAttrTokenMap = new SvXMLTokenMap( aFilterAttrTokenMap ); - } // if( !pFilterAttrTokenMap ) - - return *pFilterAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetFilterConditionElemTokenMap() -{ - if( !pFilterConditionElemTokenMap ) - { - static const SvXMLTokenMapEntry aTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_FILTER_SET_ITEM, XML_TOK_CONDITION_FILTER_SET_ITEM }, - XML_TOKEN_MAP_END - }; - - pFilterConditionElemTokenMap = new SvXMLTokenMap( aTokenMap ); - } - - return *pFilterConditionElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap() -{ - if( !pFilterConditionAttrTokenMap ) - { - static const SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE }, - { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR }, - XML_TOKEN_MAP_END - }; - - pFilterConditionAttrTokenMap = new SvXMLTokenMap( aFilterConditionAttrTokenMap ); - } // if( !pFilterConditionAttrTokenMap ) - - return *pFilterConditionAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetFilterSetItemAttrTokenMap() -{ - if( !pFilterSetItemAttrTokenMap ) - { - static const SvXMLTokenMapEntry aTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_FILTER_SET_ITEM_ATTR_VALUE }, - XML_TOKEN_MAP_END - }; - - pFilterSetItemAttrTokenMap = new SvXMLTokenMap( aTokenMap ); - } - - return *pFilterSetItemAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap() -{ - if( !pSortElemTokenMap ) - { - static const SvXMLTokenMapEntry aSortTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY }, - XML_TOKEN_MAP_END - }; - - pSortElemTokenMap = new SvXMLTokenMap( aSortTokenMap ); - } // if( !pSortElemTokenMap ) - - return *pSortElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap() -{ - if( !pSortSortByAttrTokenMap ) - { - static const SvXMLTokenMapEntry aSortSortByAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER }, - XML_TOKEN_MAP_END - }; - - pSortSortByAttrTokenMap = new SvXMLTokenMap( aSortSortByAttrTokenMap ); - } // if( !pSortSortByAttrTokenMap ) - - return *pSortSortByAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap() -{ - if( !pDataPilotTablesElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE }, - XML_TOKEN_MAP_END - }; - - pDataPilotTablesElemTokenMap = new SvXMLTokenMap( aDataPilotTablesElemTokenMap ); - } // if( !pDataPilotTablesElemTokenMap ) - - return *pDataPilotTablesElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap() -{ - if( !pDataPilotTableAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA }, - { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL }, - { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS }, - { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS }, - { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON }, - { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN }, - { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT }, - XML_TOKEN_MAP_END - }; - - pDataPilotTableAttrTokenMap = new SvXMLTokenMap( aDataPilotTableAttrTokenMap ); - } // if( !pDataPilotTableAttrTokenMap ) - - return *pDataPilotTableAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap() -{ - if( !pDataPilotTableElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL }, - { XML_NAMESPACE_TABLE_EXT, XML_DATA_PILOT_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL_EXT }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY }, - { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE }, - { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD }, - XML_TOKEN_MAP_END - }; - - pDataPilotTableElemTokenMap = new SvXMLTokenMap( aDataPilotTableElemTokenMap ); - } // if( !pDataPilotTableElemTokenMap ) - - return *pDataPilotTableElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap() -{ - if( !pDataPilotTableSourceServiceAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME }, - { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME }, - { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME }, - { XML_NAMESPACE_TABLE, XML_PASSWORD, XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD }, - XML_TOKEN_MAP_END - }; - - pDataPilotTableSourceServiceAttrTokenMap = new SvXMLTokenMap( aDataPilotTableSourceServiceAttrTokenMap ); - } // if( !pDataPilotTableSourceServiceAttrTokenMap ) - - return *pDataPilotTableSourceServiceAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotGrandTotalAttrTokenMap() -{ - if (!pDataPilotGrandTotalAttrTokenMap) - { - static const SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY }, - { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME }, - { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME_EXT }, - XML_TOKEN_MAP_END - }; - - pDataPilotGrandTotalAttrTokenMap = new SvXMLTokenMap( aDataPilotGrandTotalAttrTokenMap ); - } - - return *pDataPilotGrandTotalAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap() -{ - if( !pDataPilotTableSourceCellRangeAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_CELL_RANGE_ATTR_NAME }, - XML_TOKEN_MAP_END - }; - - pDataPilotTableSourceCellRangeAttrTokenMap = new SvXMLTokenMap( aDataPilotTableSourceCellRangeAttrTokenMap ); - } // if( !pDataPilotTableSourceCellRangeAttrTokenMap ) - - return *pDataPilotTableSourceCellRangeAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap() -{ - if( !pDataPilotTableSourceCellRangeElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER}, - XML_TOKEN_MAP_END - }; - - pDataPilotTableSourceCellRangeElemTokenMap = new SvXMLTokenMap( aDataPilotTableSourceCellRangeElemTokenMap ); - } // if( !pDataPilotTableSourceCellRangeElemTokenMap ) - - return *pDataPilotTableSourceCellRangeElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap() -{ - if( !pDataPilotFieldAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME }, - { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME_EXT }, - { XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD }, - { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION }, - { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION }, - { XML_NAMESPACE_TABLE, XML_SELECTED_PAGE, XML_TOK_DATA_PILOT_FIELD_ATTR_SELECTED_PAGE }, - { XML_NAMESPACE_LO_EXT, XML_IGNORE_SELECTED_PAGE, XML_TOK_DATA_PILOT_FIELD_ATTR_IGNORE_SELECTED_PAGE }, - { XML_NAMESPACE_TABLE, XML_USED_HIERARCHY, XML_TOK_DATA_PILOT_FIELD_ATTR_USED_HIERARCHY }, - XML_TOKEN_MAP_END - }; - - pDataPilotFieldAttrTokenMap = new SvXMLTokenMap( aDataPilotFieldAttrTokenMap ); - } // if( !pDataPilotFieldAttrTokenMap ) - - return *pDataPilotFieldAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap() -{ - if( !pDataPilotFieldElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_GROUPS }, - XML_TOKEN_MAP_END - }; - - pDataPilotFieldElemTokenMap = new SvXMLTokenMap( aDataPilotFieldElemTokenMap ); - } // if( !pDataPilotFieldElemTokenMap ) - - return *pDataPilotFieldElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap() -{ - if( !pDataPilotLevelAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY }, - { XML_NAMESPACE_CALC_EXT, XML_REPEAT_ITEM_LABELS, XML_TOK_DATA_PILOT_LEVEL_ATTR_REPEAT_ITEM_LABELS }, - XML_TOKEN_MAP_END - }; - - pDataPilotLevelAttrTokenMap = new SvXMLTokenMap( aDataPilotLevelAttrTokenMap ); - } // if( !pDataPilotLevelAttrTokenMap ) - - return *pDataPilotLevelAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap() -{ - if( !pDataPilotLevelElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO }, - XML_TOKEN_MAP_END - }; - - pDataPilotLevelElemTokenMap = new SvXMLTokenMap( aDataPilotLevelElemTokenMap ); - } // if( !pDataPilotLevelElemTokenMap ) - - return *pDataPilotLevelElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap() -{ - if( !pDataPilotSubTotalsElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL }, - XML_TOKEN_MAP_END - }; - - pDataPilotSubTotalsElemTokenMap = new SvXMLTokenMap( aDataPilotSubTotalsElemTokenMap ); - } // if( !pDataPilotSubTotalsElemTokenMap ) - - return *pDataPilotSubTotalsElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap() -{ - if( !pDataPilotSubTotalAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME }, - { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME_EXT }, - XML_TOKEN_MAP_END - }; - - pDataPilotSubTotalAttrTokenMap = new SvXMLTokenMap( aDataPilotSubTotalAttrTokenMap ); - } // if( !pDataPilotSubTotalAttrTokenMap ) - - return *pDataPilotSubTotalAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap() -{ - if( !pDataPilotMembersElemTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, - XML_TOKEN_MAP_END - }; - - pDataPilotMembersElemTokenMap = new SvXMLTokenMap( aDataPilotMembersElemTokenMap ); - } // if( !pDataPilotMembersElemTokenMap ) - - return *pDataPilotMembersElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap() -{ - if( !pDataPilotMemberAttrTokenMap ) - { - static const SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME }, - { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME_EXT }, - { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY }, - { XML_NAMESPACE_TABLE, XML_SHOW_DETAILS, XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS }, - XML_TOKEN_MAP_END - }; - - pDataPilotMemberAttrTokenMap = new SvXMLTokenMap( aDataPilotMemberAttrTokenMap ); - } // if( !pDataPilotMemberAttrTokenMap ) - - return *pDataPilotMemberAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCellTextParaElemTokenMap() -{ - if (!pCellTextParaElemTokenMap) - { - static const SvXMLTokenMapEntry aMap[] = - { - { XML_NAMESPACE_TEXT, XML_S, XML_TOK_CELL_TEXT_S }, - { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_CELL_TEXT_SPAN }, - { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_CELL_TEXT_SHEET_NAME }, - { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_CELL_TEXT_DATE }, - { XML_NAMESPACE_TEXT, XML_TITLE, XML_TOK_CELL_TEXT_TITLE }, - { XML_NAMESPACE_TEXT, XML_A, XML_TOK_CELL_TEXT_URL }, - XML_TOKEN_MAP_END - }; - - pCellTextParaElemTokenMap = new SvXMLTokenMap(aMap); - } - return *pCellTextParaElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCellTextSpanElemTokenMap() -{ - if (!pCellTextSpanElemTokenMap) - { - static const SvXMLTokenMapEntry aMap[] = - { - { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_CELL_TEXT_SPAN_ELEM_SHEET_NAME }, - { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_CELL_TEXT_SPAN_ELEM_DATE }, - { XML_NAMESPACE_TEXT, XML_TITLE, XML_TOK_CELL_TEXT_SPAN_ELEM_TITLE }, - { XML_NAMESPACE_TEXT, XML_A, XML_TOK_CELL_TEXT_SPAN_ELEM_URL }, - { XML_NAMESPACE_TEXT, XML_S, XML_TOK_CELL_TEXT_SPAN_ELEM_S }, - XML_TOKEN_MAP_END - }; - - pCellTextSpanElemTokenMap = new SvXMLTokenMap(aMap); - } - return *pCellTextSpanElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCellTextSpanAttrTokenMap() -{ - if (!pCellTextSpanAttrTokenMap) - { - static const SvXMLTokenMapEntry aMap[] = - { - { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_CELL_TEXT_SPAN_ATTR_STYLE_NAME }, - XML_TOKEN_MAP_END - }; - - pCellTextSpanAttrTokenMap = new SvXMLTokenMap(aMap); - } - return *pCellTextSpanAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCellTextURLAttrTokenMap() -{ - if (!pCellTextURLAttrTokenMap) - { - static const SvXMLTokenMapEntry aMap[] = - { - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CELL_TEXT_URL_ATTR_UREF }, - { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_CELL_TEXT_URL_ATTR_TYPE }, - { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, XML_TOK_CELL_TEXT_URL_TARGET_FRAME }, - XML_TOKEN_MAP_END - }; - - pCellTextURLAttrTokenMap = new SvXMLTokenMap(aMap); - } - return *pCellTextURLAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetCellTextSAttrTokenMap() -{ - if (!pCellTextSAttrTokenMap) - { - static const SvXMLTokenMapEntry aMap[] = - { - { XML_NAMESPACE_TEXT, XML_C, XML_TOK_CELL_TEXT_S_ATTR_C }, - XML_TOKEN_MAP_END - }; - - pCellTextSAttrTokenMap = new SvXMLTokenMap(aMap); - } - return *pCellTextSAttrTokenMap; -} void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) { @@ -1555,7 +734,6 @@ ScXMLImport::ScXMLImport( pDataBarTokenMap( nullptr ), pDataBarAttrMap( nullptr ), pFormattingEntryAttrMap( nullptr ), - pIconSetAttrMap( nullptr ), pTableElemTokenMap( nullptr ), pTableRowsElemTokenMap( nullptr ), pTableAttrTokenMap( nullptr ), @@ -1582,7 +760,6 @@ ScXMLImport::ScXMLImport( pDataPilotTableAttrTokenMap( nullptr ), pDataPilotTableElemTokenMap( nullptr ), pDataPilotTableSourceServiceAttrTokenMap( nullptr ), - pDataPilotGrandTotalAttrTokenMap(nullptr), pDataPilotTableSourceCellRangeElemTokenMap( nullptr ), pDataPilotTableSourceCellRangeAttrTokenMap( nullptr ), pDataPilotFieldAttrTokenMap( nullptr ), diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index b098995a5e45..3bf41105662b 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -845,7 +845,6 @@ class ScXMLImport: public SvXMLImport SvXMLTokenMap *pDataBarTokenMap; SvXMLTokenMap *pDataBarAttrMap; SvXMLTokenMap *pFormattingEntryAttrMap; - SvXMLTokenMap *pIconSetAttrMap; SvXMLTokenMap *pTableElemTokenMap; SvXMLTokenMap *pTableRowsElemTokenMap; SvXMLTokenMap *pTableAttrTokenMap; @@ -872,7 +871,6 @@ class ScXMLImport: public SvXMLImport SvXMLTokenMap *pDataPilotTableAttrTokenMap; SvXMLTokenMap *pDataPilotTableElemTokenMap; SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap; - SvXMLTokenMap *pDataPilotGrandTotalAttrTokenMap; SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap; SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap; SvXMLTokenMap *pDataPilotFieldAttrTokenMap; @@ -981,17 +979,6 @@ public: const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetContentValidationElemTokenMap(); const SvXMLTokenMap& GetContentValidationMessageElemTokenMap(); - const SvXMLTokenMap& GetCondFormatsTokenMap(); - const SvXMLTokenMap& GetCondFormatTokenMap(); - const SvXMLTokenMap& GetCondFormatAttrMap(); - const SvXMLTokenMap& GetCondDateAttrMap(); - const SvXMLTokenMap& GetConditionAttrMap(); - const SvXMLTokenMap& GetColorScaleTokenMap(); - const SvXMLTokenMap& GetColorScaleEntryAttrMap(); - const SvXMLTokenMap& GetFormattingTokenMap(); - const SvXMLTokenMap& GetDataBarAttrMap(); - const SvXMLTokenMap& GetDataBarEntryAttrMap(); - const SvXMLTokenMap& GetIconSetAttrMap(); const SvXMLTokenMap& GetTableElemTokenMap(); const SvXMLTokenMap& GetTableRowsElemTokenMap(); const SvXMLTokenMap& GetTableRowElemTokenMap(); @@ -999,40 +986,6 @@ public: const SvXMLTokenMap& GetTableRowCellElemTokenMap(); const SvXMLTokenMap& GetTableRowCellAttrTokenMap(); const SvXMLTokenMap& GetTableAnnotationAttrTokenMap(); - const SvXMLTokenMap& GetDetectiveElemTokenMap(); - const SvXMLTokenMap& GetDetectiveHighlightedAttrTokenMap(); - const SvXMLTokenMap& GetDetectiveOperationAttrTokenMap(); - const SvXMLTokenMap& GetTableCellRangeSourceAttrTokenMap(); - const SvXMLTokenMap& GetDatabaseRangeSourceSQLAttrTokenMap(); - const SvXMLTokenMap& GetDatabaseRangeSourceTableAttrTokenMap(); - const SvXMLTokenMap& GetDatabaseRangeSourceQueryAttrTokenMap(); - const SvXMLTokenMap& GetFilterElemTokenMap(); - const SvXMLTokenMap& GetFilterAttrTokenMap(); - const SvXMLTokenMap& GetFilterConditionElemTokenMap(); - const SvXMLTokenMap& GetFilterConditionAttrTokenMap(); - const SvXMLTokenMap& GetFilterSetItemAttrTokenMap(); - const SvXMLTokenMap& GetSortElemTokenMap(); - const SvXMLTokenMap& GetSortSortByAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotTablesElemTokenMap(); - const SvXMLTokenMap& GetDataPilotTableAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotTableElemTokenMap(); - const SvXMLTokenMap& GetDataPilotTableSourceServiceAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotGrandTotalAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotTableSourceCellRangeElemTokenMap(); - const SvXMLTokenMap& GetDataPilotTableSourceCellRangeAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotFieldAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotFieldElemTokenMap(); - const SvXMLTokenMap& GetDataPilotLevelAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotLevelElemTokenMap(); - const SvXMLTokenMap& GetDataPilotSubTotalsElemTokenMap(); - const SvXMLTokenMap& GetDataPilotSubTotalAttrTokenMap(); - const SvXMLTokenMap& GetDataPilotMembersElemTokenMap(); - const SvXMLTokenMap& GetDataPilotMemberAttrTokenMap(); - const SvXMLTokenMap& GetCellTextParaElemTokenMap(); - const SvXMLTokenMap& GetCellTextSpanElemTokenMap(); - const SvXMLTokenMap& GetCellTextSpanAttrTokenMap(); - const SvXMLTokenMap& GetCellTextURLAttrTokenMap(); - const SvXMLTokenMap& GetCellTextSAttrTokenMap(); void SetPostProcessData( sc::ImportPostProcessData* p ); sc::ImportPostProcessData* GetPostProcessData() { return mpPostProcessData;} diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index b4e7ddeb0207..b99ede785a99 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -270,7 +270,6 @@ public: void UnlockInput(); bool IsInputLocked() const { return mnLockCount > 0UL; } - sal_uInt16 GetCurPageId() { return maTabControl->GetCurPageId(); } sal_uInt16 GetCurPagePos() { return maTabControl->GetCurPagePos(); } /** Show controls of the UI or hide them, depending on the given flag. diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index 184c841fbe09..8ee19a02ab6d 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -63,11 +63,6 @@ void SvxCharView::MouseButtonDown( const MouseEvent& rMEvt ) } } -Point SvxCharView::GetClickPosition() const -{ - return maPosition; -} - void SvxCharView::KeyInput( const KeyEvent& rKEvt ) { vcl::KeyCode aCode = rKEvt.GetKeyCode(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index cfcdedf59769..f7252f593320 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -738,22 +738,6 @@ SfxPopupWindow::SfxPopupWindow(sal_uInt16 nId, const OString& rID, const OUStrin SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, - const Reference< XFrame >& rFrame, - vcl::Window* pParentWindow, - WinBits nBits ) : - FloatingWindow( pParentWindow, nBits ) - , m_bFloating( false ) - , m_bCascading( false ) - , m_nId( nId ) - , m_xFrame( rFrame ) -{ - vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); - if ( pWindow ) - static_cast<SystemWindow *>(pWindow)->GetTaskPaneList()->AddWindow( this ); -} - -SfxPopupWindow::SfxPopupWindow( - sal_uInt16 nId, vcl::Window* pParentWindow, const OString& rID, const OUString& rUIXMLDescription, const Reference< XFrame >& rFrame ) : diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 036a353e9fe0..22be488f726f 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -111,7 +111,6 @@ struct SfxItemPool_Impl sal_uInt16 nLoadingVersion; sal_uInt16 nInitRefCount; // 1, during load, may be 2 sal_uInt16 nVerStart, nVerEnd; // WhichRange in versions - sal_uInt16 nStoringStart, nStoringEnd; // Range to be saved sal_uInt8 nMajorVer, nMinorVer; // The Pool itself MapUnit eDefMetric; bool bInSetItem; @@ -134,8 +133,6 @@ struct SfxItemPool_Impl , nInitRefCount(0) , nVerStart(0) , nVerEnd(0) - , nStoringStart(0) - , nStoringEnd(0) , nMajorVer(0) , nMinorVer(0) , eDefMetric(MapUnit::MapCM) diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index a914bd6d24c5..f39b2dc17853 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -184,8 +184,6 @@ SfxItemPool::SfxItemPool pImpl->nVerStart = pImpl->mnStart; pImpl->nVerEnd = pImpl->mnEnd; pImpl->bInSetItem = false; - pImpl->nStoringStart = nStartWhich; - pImpl->nStoringEnd = nEndWhich; pImpl->mbPersistentRefCounts = bLoadRefCounts; if ( pDefaults ) @@ -218,8 +216,6 @@ SfxItemPool::SfxItemPool pImpl->nVerStart = rPool.pImpl->nVerStart; pImpl->nVerEnd = rPool.pImpl->nVerEnd; pImpl->bInSetItem = false; - pImpl->nStoringStart = pImpl->mnStart; - pImpl->nStoringEnd = pImpl->mnEnd; pImpl->mbPersistentRefCounts = rPool.pImpl->mbPersistentRefCounts; // Take over static Defaults @@ -996,8 +992,6 @@ void SfxItemPool::SetFileFormatVersion( sal_uInt16 nFileFormatVersion ) pPool->pImpl->mnFileFormatVersion = nFileFormatVersion; } -const SfxItemPool* SfxItemPool::pStoringPool_ = nullptr; - void SfxItemPool::dumpAsXml(xmlTextWriterPtr pWriter) const { xmlTextWriterStartElement(pWriter, BAD_CAST("SfxItemPool")); diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 62f9ddbfe1d0..54b6d5e5bdf5 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -58,17 +58,6 @@ void SfxPoolItemArray_Impl::ReHash() } } -/** - * Returns the <SfxItemPool> that is being saved. - * This should only be used in very exceptional cases e.g. - * when guaranteeing file format compatibility: - * When overriding a <SfxPoolItem::Store()> getting additional data from the Pool - */ -const SfxItemPool* SfxItemPool::GetStoringPool() -{ - return pStoringPool_; -} - static sal_uInt16 convertSfxItemKindToUInt16(SfxItemKind eKind) { switch (eKind) @@ -179,7 +168,6 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const // Every Pool as a whole is a record SfxMiniRecordWriter aPoolRec( &rStream, SFX_ITEMPOOL_REC ); - pStoringPool_ = this; // Single header (content version and name) { @@ -306,7 +294,6 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const } // Write out additional Pools - pStoringPool_ = nullptr; aPoolRec.Close(); if ( !rStream.GetError() && pImpl->mpSecondary ) pImpl->mpSecondary->Store( rStream ); @@ -926,32 +913,6 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const } -bool SfxItemPool::IsInStoringRange( sal_uInt16 nWhich ) const -{ - return nWhich >= pImpl->nStoringStart && - nWhich <= pImpl->nStoringEnd; -} - -/** - * This method allows for restricting the WhichRange, which is saved - * by ItemSets of this Pool (and the Pool itself). - * The method must be called before SfxItemPool::Store() and the values - * must also be still set when the actual document (the ItemSets) is - * being saved. - * - * Resetting it is not necessary, if this range is set correctly before - * _every_ save, because its only accounted for when saving. - * - * We need to do this for the 3.1 format, because there's a bug in the - * Pool loading method. -*/ -void SfxItemPool::SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo ) -{ - pImpl->nStoringStart = nFrom; - pImpl->nStoringEnd = nTo; -} - - /** * This method allows for the creation of new and incompatible WhichId * Ranges or distributions. Pools that were saved with old versions @@ -1168,7 +1129,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, return false; const SfxItemPool *pPool = this; - while ( !pPool->IsInStoringRange(rItem.Which()) ) + while ( !pPool->IsInRange(rItem.Which()) ) if ( nullptr == ( pPool = pPool->pImpl->mpSecondary ) ) return false; diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index b2efd6003b95..b738bc36ec5e 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -63,11 +63,6 @@ sal_uLong GraphicManager::GetMaxCacheSize() const return mpCache->GetMaxDisplayCacheSize(); } -void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize ) -{ - mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize ); -} - void GraphicManager::SetCacheTimeout( sal_uLong nTimeoutSeconds ) { mpCache->SetCacheTimeout( nTimeoutSeconds ); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 85ad57b560fa..df4d0de6e148 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -374,9 +374,6 @@ public: /// Sign the paragraph at the cursor. void SignParagraph(SwPaM* pPaM); - /// Verify the paragraph at the cursor. - void VerifyParagraph(SwPaM* pPaM); - void Insert2(SwField const &, const bool bForceExpandHints); void UpdateFields( SwField & ); ///< One single field. diff --git a/sw/inc/rdfhelper.hxx b/sw/inc/rdfhelper.hxx index d7c03279cd7d..43abffd27ae2 100644 --- a/sw/inc/rdfhelper.hxx +++ b/sw/inc/rdfhelper.hxx @@ -28,9 +28,6 @@ public: /// Add an (rTextNode, key, value) statement in the graph of type rType -- or if it does not exist, create a graph at rPath first. static void addTextNodeStatement(const OUString& rType, const OUString& rPath, SwTextNode& rTextNode, const OUString& rKey, const OUString& rValue); - /// Remove an (rTextNode, key, value) statement in the graph of type rType. - static void removeTextNodeStatement(const OUString& rType, SwTextNode& rTextNode, const OUString& rKey, const OUString& rValue); - /// Update an (rTextNode, key, value) statement in the graph of type rType from old value to new. Creates the graph at rPath if doesn't exist. static void updateTextNodeStatement(const OUString& rType, const OUString& rPath, SwTextNode& rTextNode, const OUString& rKey, const OUString& rOldValue, const OUString& rNewValue); }; diff --git a/sw/source/core/doc/rdfhelper.cxx b/sw/source/core/doc/rdfhelper.cxx index d43660dd258e..25f7d00f1f43 100644 --- a/sw/source/core/doc/rdfhelper.cxx +++ b/sw/source/core/doc/rdfhelper.cxx @@ -73,23 +73,6 @@ void SwRDFHelper::addTextNodeStatement(const OUString& rType, const OUString& rP xGraph->addStatement(xSubject, xKey, xValue); } -void SwRDFHelper::removeTextNodeStatement(const OUString& rType, SwTextNode& rTextNode, const OUString& rKey, const OUString& rValue) -{ - uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext()); - uno::Reference<rdf::XURI> xType = rdf::URI::create(xComponentContext, rType); - uno::Reference<rdf::XDocumentMetadataAccess> xDocumentMetadataAccess(rTextNode.GetDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY); - uno::Sequence< uno::Reference<rdf::XURI> > aGraphNames = xDocumentMetadataAccess->getMetadataGraphsWithType(xType); - if (!aGraphNames.hasElements()) - return; - - uno::Reference<rdf::XURI> xGraphName = aGraphNames[0]; - uno::Reference<rdf::XNamedGraph> xGraph = xDocumentMetadataAccess->getRDFRepository()->getGraph(xGraphName); - uno::Reference<rdf::XResource> xSubject(SwXParagraph::CreateXParagraph(*rTextNode.GetDoc(), &rTextNode), uno::UNO_QUERY); - uno::Reference<rdf::XURI> xKey = rdf::URI::create(xComponentContext, rKey); - uno::Reference<rdf::XLiteral> xValue = rdf::Literal::create(xComponentContext, rValue); - xGraph->removeStatements(xSubject, xKey, xValue); -} - void SwRDFHelper::updateTextNodeStatement(const OUString& rType, const OUString& rPath, SwTextNode& rTextNode, const OUString& rKey, const OUString& rOldValue, const OUString& rNewValue) { uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext()); diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index d3b7e6dd0a83..9a9d484c1925 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -78,19 +78,6 @@ namespace sw sal_uInt8 rtl_TextEncodingToWinCharsetRTF(OUString const& rFontName, OUString const& rAltName, rtl_TextEncoding eTextEncoding); - /** Import a MSWord XE field. Suitable for .doc and .rtf - - @param rDoc - the document to insert into - - @param rPaM - the position in the document to insert into - - @param rXE - the arguments of the original word XE field - */ - void ImportXE(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rXE); - /** Convert from DTTM to Writer's DateTime */ diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 3bd08bc2fbb7..f0a5f57c4f5b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3594,11 +3594,6 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rStr, } } -void sw::ms::ImportXE(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rStr) -{ - lcl_ImportTox(rDoc, rPaM, rStr, true); -} - void SwWW8ImplReader::ImportTox( int nFieldId, const OUString& aStr ) { bool bIdx = (nFieldId != 9); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 28227bfb2bf0..f913ee6079fb 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -58,17 +58,6 @@ enum class SdrHitKind; class SwEditWin: public vcl::Window, public DropTargetHelper, public DragSourceHelper { -friend void ScrollMDI(SwViewShell* pVwSh, const SwRect&, - sal_uInt16 nRangeX, sal_uInt16 nRangeY); -friend bool IsScrollMDI(SwViewShell* pVwSh, const SwRect&); - -friend void SizeNotify(SwViewShell* pVwSh, const Size &); - -friend void PageNumNotify( SwViewShell* pVwSh, - sal_uInt16 nPhyNum, - sal_uInt16 nVirtNum, - const OUString& rPg ); - static QuickHelpData* m_pQuickHlpData; static long m_nDDStartPosX, m_nDDStartPosY; diff --git a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 1967370a3928..04bc35c5bbb0 100644 --- a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -80,7 +80,6 @@ public: * pNode - the libxml2 node wrapped by this object */ xmlNodePtr getNativeElement( ) const { return m_pElement;} - void setNativeElement(const xmlNodePtr pNode); }; /// @throws css::uno::RuntimeException diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 8db182de43fc..0cdea05f4523 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -93,18 +93,4 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedSe return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(); } - -void XMLElementWrapper_XmlSecImpl::setNativeElement(const xmlNodePtr pNode) -/****** XMLElementWrapper_XmlSecImpl/setNativeElement ************************* - * - * NAME - * setNativeElement -- Configures the libxml2 node wrapped by this object - * - * INPUTS - * pNode - the new libxml2 node to be wrapped by this object - ******************************************************************************/ -{ - m_pElement = pNode; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |