[Libreoffice-commits] core.git: cui/source include/svl sfx2/source svl/Library_svl.mk svl/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Sat Aug 19 11:51:49 UTC 2017
cui/source/options/optgdlg.cxx | 1
include/svl/szitem.hxx | 56 --------------
sfx2/source/appl/appcfg.cxx | 1
svl/Library_svl.mk | 1
svl/source/items/szitem.cxx | 160 -----------------------------------------
5 files changed, 219 deletions(-)
New commits:
commit 933d2b41e7766699f5e2f2c4bdd5fa3ded79a47f
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Fri Aug 18 04:54:51 2017 +0200
drop unused SfxSizeItem
unused since commit 48bf5e855ae02fd1bea87938978f29ee6147285c
Date: Thu Nov 16 14:30:58 2000 +0000
Remove tests for INET_PROT_FILE
Change-Id: I2dc134f529675204caad78c7e50417adb55e8e4f
Reviewed-on: https://gerrit.libreoffice.org/41320
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 5d6829912867..cded70d2be90 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -24,7 +24,6 @@
#include <svl/flagitem.hxx>
#include <sfx2/dispatch.hxx>
#include <unotools/lingucfg.hxx>
-#include <svl/szitem.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/configsettings.hxx>
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
deleted file mode 100644
index c381495db210..000000000000
--- a/include/svl/szitem.hxx
+++ /dev/null
@@ -1,56 +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_SZITEM_HXX
-#define INCLUDED_SVL_SZITEM_HXX
-
-#include <tools/gen.hxx>
-
-#include <svl/poolitem.hxx>
-
-class SvStream;
-
-class SfxSizeItem : public SfxPoolItem
-{
-private:
- Size aVal;
-
-public:
- SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
- SfxSizeItem( const SfxSizeItem& );
-
- virtual bool GetPresentation( SfxItemPresentation ePres,
- MapUnit eCoreMetric,
- MapUnit ePresMetric,
- OUString &rText,
- const IntlWrapper& ) const override;
-
- 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 SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const override;
- virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 9b847e6f9a80..7153cf17b4d1 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -33,7 +33,6 @@
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
-#include <svl/szitem.hxx>
#include <svl/undo.hxx>
#include <sfx2/sfxsids.hrc>
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index f06a4338e02c..e4be06e1157e 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -152,7 +152,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/items/stritem \
svl/source/items/style \
svl/source/items/stylepool \
- svl/source/items/szitem \
svl/source/items/visitem \
svl/source/items/whiter \
svl/source/misc/PasswordHelper \
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
deleted file mode 100644
index ca7bac49880d..000000000000
--- a/svl/source/items/szitem.cxx
+++ /dev/null
@@ -1,160 +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 <svl/szitem.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/awt/Size.hpp>
-#include <osl/diagnose.h>
-#include <tools/stream.hxx>
-
-#include <svl/poolitem.hxx>
-#include <svl/memberid.h>
-
-
-SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) :
- SfxPoolItem( nW ),
- aVal( rVal )
-{
-}
-
-
-SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) :
- SfxPoolItem( rItem ),
- aVal( rItem.aVal )
-{
-}
-
-
-bool SfxSizeItem::GetPresentation
-(
- SfxItemPresentation /*ePresentation*/,
- MapUnit /*eCoreMetric*/,
- MapUnit /*ePresentationMetric*/,
- OUString& rText,
- const IntlWrapper&
-) const
-{
- rText = OUString::number(aVal.Width()) + ", " + OUString::number(aVal.Height()) + ", ";
- return true;
-}
-
-
-bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const
-{
- assert(SfxPoolItem::operator==(rItem));
- return static_cast<const SfxSizeItem&>(rItem).aVal == aVal;
-}
-
-
-SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const
-{
- return new SfxSizeItem( *this );
-}
-
-
-SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const
-{
- Size aStr;
- ReadPair( rStream, aStr );
- return new SfxSizeItem(Which(), aStr);
-}
-
-
-SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const
-{
- WritePair( rStream, aVal );
- return rStream;
-}
-
-
-bool SfxSizeItem::QueryValue( css::uno::Any& rVal,
- sal_uInt8 nMemberId ) const
-{
- bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
- nMemberId &= ~CONVERT_TWIPS;
-
- Size aTmp(aVal);
- if( bConvert )
- {
- aTmp.Height() = ( aTmp.Height() * 127 + 36) / 72;
- aTmp.Width() = ( aTmp.Width() * 127 + 36) / 72;
- }
-
- switch ( nMemberId )
- {
- case 0:
- {
- rVal <<= css::awt::Size( aTmp.getWidth(), aTmp.getHeight() );
- break;
- }
- case MID_WIDTH:
- rVal <<= aTmp.getWidth(); break;
- case MID_HEIGHT:
- rVal <<= aTmp.getHeight(); break;
- default: OSL_FAIL("Wrong MemberId!"); return false;
- }
-
- return true;
-}
-
-
-bool SfxSizeItem::PutValue( const css::uno::Any& rVal,
- sal_uInt8 nMemberId )
-{
- bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
- nMemberId &= ~CONVERT_TWIPS;
-
- bool bRet = false;
- css::awt::Size aValue;
- if ( !nMemberId )
- bRet = ( rVal >>= aValue );
- else
- {
- sal_Int32 nVal = 0;
- bRet = ( rVal >>= nVal );
- if ( nMemberId == MID_WIDTH )
- {
- aValue.Width = nVal;
- aValue.Height = aVal.Height();
- }
- else
- {
- aValue.Height = nVal;
- aValue.Width = aVal.Width();
- }
- }
-
- if ( bRet )
- {
- Size aTmp( aValue.Width, aValue.Height );
- if( bConvert )
- {
- aTmp.Height() = ( aTmp.Height() * 72 + 63) / 127;
- aTmp.Width() = ( aTmp.Width() * 72 + 63) / 127;
- }
-
- aVal = aTmp;
- }
-
- return bRet;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list