diff options
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 1 | ||||
| -rw-r--r-- | include/svl/ctypeitm.hxx | 67 | ||||
| -rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 1 | ||||
| -rw-r--r-- | svl/Library_svl.mk | 1 | ||||
| -rw-r--r-- | svl/source/items/ctypeitm.cxx | 189 |
5 files changed, 0 insertions, 259 deletions
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index b06677614784..f71356d22485 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -26,7 +26,6 @@ #include <vcl/msgbox.hxx> #include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> -#include "svl/ctypeitm.hxx" #include "svl/eitem.hxx" #include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx deleted file mode 100644 index 3fae7a61f215..000000000000 --- a/include/svl/ctypeitm.hxx +++ /dev/null @@ -1,67 +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_SVL_CTYPEITM_HXX -#define INCLUDED_SVL_CTYPEITM_HXX - -#include <svl/inettype.hxx> -#include <svl/custritm.hxx> - - -class CntContentTypeItem : public CntUnencodedStringItem -{ -private: - INetContentType _eType; - OUString _aPresentation; - -public: - - CntContentTypeItem( sal_uInt16 nWhich, const OUString& rType ); - CntContentTypeItem( const CntContentTypeItem& rOrig ); - - virtual SfxPoolItem* Create( SvStream& rStream, - sal_uInt16 nItemVersion ) const override; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const override; - - virtual bool operator==( const SfxPoolItem& rOrig ) const override; - - virtual sal_uInt16 GetVersion(sal_uInt16) const override; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - - void SetValue( const OUString& rNewVal ); - - virtual bool GetPresentation( SfxItemPresentation ePres, - MapUnit eCoreMetric, - MapUnit ePresMetric, - OUString & rText, - const IntlWrapper& rIntlWrapper ) 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; - - INetContentType GetEnumValue() const; - - void SetValue( const INetContentType eType ); -}; - -#endif /* ! INCLUDED_SVL_CTYPEITM_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 94eaa99b3e27..a93f1da1be73 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -60,7 +60,6 @@ #include <rtl/instance.hxx> -#include <svl/ctypeitm.hxx> #include <svtools/sfxecode.hxx> #include <unotools/syslocale.hxx> diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 2e623a3b02ad..f06a4338e02c 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -125,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/items/aeitem \ svl/source/items/cenumitm \ svl/source/items/cintitem \ - svl/source/items/ctypeitm \ svl/source/items/custritm \ svl/source/items/flagitem \ svl/source/items/globalnameitem \ diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx deleted file mode 100644 index f0002e138f41..000000000000 --- a/svl/source/items/ctypeitm.cxx +++ /dev/null @@ -1,189 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <com/sun/star/uno/Any.hxx> - -#include <osl/diagnose.h> -#include <unotools/intlwrapper.hxx> -#include <tools/stream.hxx> -#include <svl/ctypeitm.hxx> -#include <stringio.hxx> - -// The following defines are copied from chaos/source/items/cstritem.cxx: -#define CNTSTRINGITEM_STREAM_MAGIC ( (sal_uInt32)0xfefefefe ) -#define CNTSTRINGITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) - - -// class CntContentTypeItem Implementation. - - -#define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 ) - -CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const OUString& rType ) -: CntUnencodedStringItem( which, rType ), - _eType( CONTENT_TYPE_NOT_INIT ) -{ -} - -CntContentTypeItem::CntContentTypeItem( const CntContentTypeItem& rOrig ) -: CntUnencodedStringItem( rOrig ), - _eType( rOrig._eType ), - _aPresentation( rOrig._aPresentation ) -{ -} - -// virtual -sal_uInt16 CntContentTypeItem::GetVersion(sal_uInt16) const -{ - return 1; // because it uses SfxPoolItem::read/writeUnicodeString() -} - -// virtual -SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream, - sal_uInt16 nItemVersion ) const -{ - // CntContentTypeItem used to be derived from CntStringItem, so take that - // into account: - OUString aValue = readUnicodeString(rStream, nItemVersion >= 1); - sal_uInt32 nMagic = 0; - rStream.ReadUInt32( nMagic ); - if (nMagic == CNTSTRINGITEM_STREAM_MAGIC) - { - bool bEncrypted = false; - rStream.ReadCharAsBool( bEncrypted ); - DBG_ASSERT(!bEncrypted, - "CntContentTypeItem::Create() reads encrypted data"); - } - else - rStream.SeekRel(CNTSTRINGITEM_STREAM_SEEKREL); - - return new CntContentTypeItem(Which(), aValue); -} - -// virtual -SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const -{ - // CntContentTypeItem used to be derived from CntStringItem, so take that - // into account: - writeUnicodeString(rStream, GetValue()); - rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteBool( false ); - return rStream; -} - -// virtual -bool CntContentTypeItem::operator==( const SfxPoolItem& rOrig ) const -{ - const CntContentTypeItem& rOther = static_cast<const CntContentTypeItem&>(rOrig); - - if ( ( _eType != CONTENT_TYPE_NOT_INIT ) && - ( rOther._eType != CONTENT_TYPE_NOT_INIT ) ) - return _eType == rOther._eType; - else - return CntUnencodedStringItem::operator==( rOther ); -} - -// virtual -SfxPoolItem* CntContentTypeItem::Clone( SfxItemPool* /* pPool */ ) const -{ - return new CntContentTypeItem( *this ); -} - -void CntContentTypeItem::SetValue( const OUString& rNewVal ) -{ - // De-initialize enum type and presentation. - _eType = CONTENT_TYPE_NOT_INIT; - _aPresentation.clear(); - - CntUnencodedStringItem::SetValue( rNewVal ); -} - -bool CntContentTypeItem::GetPresentation( - SfxItemPresentation ePres, - MapUnit eCoreMetric, - MapUnit ePresMetric, - OUString & rText, - const IntlWrapper & rIntlWrapper) const -{ - if (_aPresentation.isEmpty()) - { - (const_cast< CntContentTypeItem * >(this))->_aPresentation = - INetContentTypes::GetPresentation(GetEnumValue()); - } - if (!_aPresentation.isEmpty()) - { - rText = _aPresentation; - return true; - } - else - return CntUnencodedStringItem::GetPresentation(ePres, eCoreMetric, - ePresMetric, rText, - rIntlWrapper); -} - -INetContentType CntContentTypeItem::GetEnumValue() const -{ - if ( _eType == CONTENT_TYPE_NOT_INIT ) - { - // Not yet initialized... Get enum value for string content type. - - CntContentTypeItem* pVarThis = (const_cast< CntContentTypeItem* >(this)); - - pVarThis->_eType = INetContentTypes::GetContentType( GetValue() ); - } - - return _eType; -} - -void CntContentTypeItem::SetValue( const INetContentType eType ) -{ - SetValue( INetContentTypes::GetContentType( eType ) ); - - // Note: SetValue( const String& ....) resets _eType. Set new enum value - // after(!) calling it. - _eType = eType; -} - -// virtual -bool CntContentTypeItem::QueryValue( css::uno::Any& rVal, sal_uInt8) const -{ - rVal <<= GetValue(); - return true; -} - -// virtual -bool CntContentTypeItem::PutValue( const css::uno::Any& rVal, sal_uInt8) -{ - OUString aValue; - if ( rVal >>= aValue ) - { - // SetValue with an empty string resets the item; so call that - // function when PutValue is called with an empty string - if (aValue.isEmpty()) - SetValue(aValue); - else - SetValue( - INetContentTypes::RegisterContentType(aValue, OUString())); - return true; - } - - OSL_FAIL( "CntContentTypeItem::PutValue - Wrong type!" ); - return false; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |