cui/source/tabpages/chardlg.cxx | 1
include/svl/sfontitm.hxx | 208 ----------------------------------------
svl/Library_svl.mk | 1
svl/source/items/sfontitm.cxx | 130 -------------------------
4 files changed, 340 deletions(-)
New commits:
commit bf54e43bdf33e26066afdbd459b1c41829b7473e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 3 14:13:37 2013 +0100
there are no SfxFontItem used anywhere
Change-Id: I7af08b7790a631d5d385a546a472e2868d79cb46
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index fff3610..ce57a4d 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -21,7 +21,6 @@
#include <vcl/svapp.hxx>
#include <unotools/pathoptions.hxx>
#include <svtools/ctrltool.hxx>
-#include <svl/sfontitm.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/include/svl/sfontitm.hxx b/include/svl/sfontitm.hxx
deleted file mode 100644
index 068eb93..0000000
--- a/include/svl/sfontitm.hxx
+++ /dev/null
@@ -1,208 +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 _SFONTITM_HXX
-#define _SFONTITM_HXX
-
-#include <tools/color.hxx>
-#include <tools/gen.hxx>
-#include <tools/string.hxx>
-#include <i18nlangtag/lang.h>
-#include <svl/poolitem.hxx>
-
-//============================================================================
-class SfxFontItem: public SfxPoolItem
-{
- XubString m_aName;
- XubString m_aStyleName;
- Size m_aSize;
- Color m_aColor;
- Color m_aFillColor;
- rtl_TextEncoding m_nCharSet;
- LanguageType m_nLanguage;
- sal_Int16 m_nFamily;
- sal_Int16 m_nPitch;
- sal_Int16 m_nWeight;
- sal_Int16 m_nWidthType;
- sal_Int16 m_nItalic;
- sal_Int16 m_nUnderline;
- sal_Int16 m_nStrikeout;
- sal_Int16 m_nOrientation;
- unsigned m_bWordLine: 1;
- unsigned m_bOutline: 1;
- unsigned m_bShadow: 1;
- unsigned m_bKerning: 1;
- unsigned m_bHasFont: 1;
- unsigned m_bHasColor: 1;
- unsigned m_bHasFillColor: 1;
-
-public:
- TYPEINFO();
-
- inline SfxFontItem(sal_uInt16 nWhich);
-
- virtual int operator ==(const SfxPoolItem & rItem) const;
-
- virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const;
- virtual SvStream & Store(SvStream & rStream, sal_uInt16) const;
-
- virtual SfxPoolItem * Clone(SfxItemPool * = 0) const
- { return new SfxFontItem(*this); }
-
- sal_Bool hasFont() const { return m_bHasFont; }
- sal_Bool hasColor() const { return m_bHasColor; }
- sal_Bool hasFillColor() const { return m_bHasFillColor; }
-
- const XubString & getName() const { return m_aName; }
- const XubString & getStyleName() const { return m_aStyleName; }
-
- const Size & getSize() const { return m_aSize; }
- const Color & getColor() const { return m_aColor; }
- const Color & getFillColor() const { return m_aFillColor; }
-
- rtl_TextEncoding getCharSet() const { return m_nCharSet; }
-
- LanguageType getLanguage() const { return m_nLanguage; }
-
- sal_Int16 getFamily() const { return m_nFamily; }
- sal_Int16 getPitch() const { return m_nPitch; }
- sal_Int16 getWeight() const { return m_nWeight; }
- sal_Int16 getWidthType() const { return m_nWidthType; }
- sal_Int16 getItalic() const { return m_nItalic; }
- sal_Int16 getUnderline() const { return m_nUnderline; }
- sal_Int16 getStrikeout() const { return m_nStrikeout; }
- sal_Int16 getOrientation() const { return m_nOrientation; }
- sal_Bool getWordLine() const { return m_bWordLine; }
- sal_Bool getOutline() const { return m_bOutline; }
- sal_Bool getShadow() const { return m_bShadow; }
- sal_Bool getKerning() const { return m_bKerning; }
-
- inline void setFont(sal_Int16 nTheFamily, const XubString & rTheName,
- const XubString & rTheStyleName, sal_Int16 nThePitch,
- rtl_TextEncoding nTheCharSet);
- inline void setWeight(sal_Int16 nTheWeight);
- inline void setItalic(sal_Int16 nTheItalic);
- inline void setHeight(sal_Int32 nHeight);
- inline void setColor(const Color & rTheColor);
- inline void setFillColor(const Color & rTheFillColor);
- inline void setUnderline(sal_Int16 nTheUnderline);
- inline void setStrikeout(sal_Int16 nTheStrikeout);
- inline void setOutline(sal_Bool bTheOutline);
- inline void setShadow(sal_Bool bTheShadow);
- inline void setLanguage(LanguageType nTheLanguage);
-};
-
-inline SfxFontItem::SfxFontItem(sal_uInt16 which):
- SfxPoolItem(which),
- m_nCharSet(RTL_TEXTENCODING_DONTKNOW),
- m_nLanguage(LANGUAGE_DONTKNOW),
- m_nFamily(0), // FAMILY_DONTKNOW
- m_nPitch(0), // PITCH_DONTKNOW
- m_nWeight(0), // WEIGHT_DONTKNOW
- m_nWidthType(0), // WIDTH_DONTKNOW
- m_nItalic(3), // ITALIC_DONTKNOW
- m_nUnderline(4), // UNDERLINE_DONTKNOW
- m_nStrikeout(3), // STRIKEOUT_DONTKNOW
- m_nOrientation(0),
- m_bWordLine(sal_False),
- m_bOutline(sal_False),
- m_bShadow(sal_False),
- m_bKerning(sal_False),
- m_bHasFont(sal_False),
- m_bHasColor(sal_False),
- m_bHasFillColor(sal_False)
-{}
-
-inline void SfxFontItem::setFont(sal_Int16 nTheFamily,
- const XubString & rTheName,
- const XubString & rTheStyleName,
- sal_Int16 nThePitch,
- rtl_TextEncoding nTheCharSet)
-{
- m_nFamily = nTheFamily;
- m_aName = rTheName;
- m_aStyleName = rTheStyleName;
- m_nPitch = nThePitch;
- m_nCharSet = nTheCharSet;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setWeight(sal_Int16 nTheWeight)
-{
- m_nWeight = nTheWeight;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setItalic(sal_Int16 nTheItalic)
-{
- m_nItalic = nTheItalic;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setHeight(sal_Int32 nHeight)
-{
- m_aSize.setHeight(nHeight);
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setColor(const Color & rTheColor)
-{
- m_aColor = rTheColor;
- m_bHasColor = sal_True;
-}
-
-inline void SfxFontItem::setFillColor(const Color & rTheFillColor)
-{
- m_aFillColor = rTheFillColor;
- m_bHasFillColor = sal_True;
-}
-
-inline void SfxFontItem::setUnderline(sal_Int16 nTheUnderline)
-{
- m_nUnderline = nTheUnderline;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setStrikeout(sal_Int16 nTheStrikeout)
-{
- m_nStrikeout = nTheStrikeout;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setOutline(sal_Bool bTheOutline)
-{
- m_bOutline = bTheOutline;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setShadow(sal_Bool bTheShadow)
-{
- m_bShadow = bTheShadow;
- m_bHasFont = sal_True;
-}
-
-inline void SfxFontItem::setLanguage(LanguageType nTheLanguage)
-{
- m_nLanguage = nTheLanguage;
- m_bHasFont = sal_True;
-}
-
-#endif // _SFONTITM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 5109f39..499b105 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/items/ptitem \
svl/source/items/rectitem \
svl/source/items/rngitem \
- svl/source/items/sfontitm \
svl/source/items/sitem \
svl/source/items/slstitm \
svl/source/items/srchitem \
diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx
deleted file mode 100644
index dcceed7..0000000
--- a/svl/source/items/sfontitm.cxx
+++ /dev/null
@@ -1,130 +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 <tools/stream.hxx>
-#include <tools/vcompat.hxx>
-#include <svl/sfontitm.hxx>
-
-//============================================================================
-//
-// class SfxFontItem
-//
-//============================================================================
-
-TYPEINIT1(SfxFontItem, SfxPoolItem);
-
-//============================================================================
-// virtual
-int SfxFontItem::operator ==(const SfxPoolItem & rItem) const
-{
- const SfxFontItem * pFontItem = PTR_CAST(SfxFontItem, &rItem);
- return pFontItem && m_bHasFont == pFontItem->m_bHasFont
- && m_bHasColor == pFontItem->m_bHasColor
- && m_bHasFillColor == pFontItem->m_bHasFillColor
- && (!m_bHasColor || m_aColor == pFontItem->m_aColor)
- && (!m_bHasFillColor || m_aFillColor == pFontItem->m_aFillColor)
- && (!m_bHasFont || (m_bKerning == pFontItem->m_bKerning
- && m_bShadow == pFontItem->m_bShadow
- && m_bOutline == pFontItem->m_bOutline
- && m_bWordLine == pFontItem->m_bWordLine
- && m_nOrientation == pFontItem->m_nOrientation
- && m_nStrikeout == pFontItem->m_nStrikeout
- && m_nUnderline == pFontItem->m_nUnderline
- && m_nItalic == pFontItem->m_nItalic
- && m_nWidthType == pFontItem->m_nWidthType
- && m_nWeight == pFontItem->m_nWeight
- && m_nPitch == pFontItem->m_nPitch
- && m_nFamily == pFontItem->m_nFamily
- && m_nLanguage == pFontItem->m_nLanguage
- && m_nCharSet == pFontItem->m_nCharSet
- && m_aFillColor == pFontItem->m_aFillColor
- && m_aColor == pFontItem->m_aColor
- && m_aSize == pFontItem->m_aSize
- && m_aStyleName == pFontItem->m_aStyleName
- && m_aName == pFontItem->m_aName));
-}
-
-//============================================================================
-// virtual
-SfxPoolItem * SfxFontItem::Create(SvStream & rStream, sal_uInt16) const
-{
- VersionCompat aItemCompat(rStream, STREAM_READ);
- SfxFontItem * pItem = new SfxFontItem(Which());
- {
- VersionCompat aFontCompat(rStream, STREAM_READ);
- pItem->m_aName = readByteString(rStream);
- pItem->m_aStyleName = readByteString(rStream);
- rStream >> pItem->m_aSize;
- sal_Int16 nCharSet = 0;
- rStream >> nCharSet;
- pItem->m_nCharSet = rtl_TextEncoding(nCharSet);
- rStream >> pItem->m_nFamily >> pItem->m_nPitch >> pItem->m_nWeight
- >> pItem->m_nUnderline >> pItem->m_nStrikeout
- >> pItem->m_nItalic;
- sal_Int16 nLanguage = 0;
- rStream >> nLanguage;
- pItem->m_nLanguage = LanguageType(nLanguage);
- rStream >> pItem->m_nWidthType >> pItem->m_nOrientation;
- sal_Int8 nWordLine = 0;
- rStream >> nWordLine;
- pItem->m_bWordLine = nWordLine != 0;
- sal_Int8 nOutline = 0;
- rStream >> nOutline;
- pItem->m_bOutline = nOutline != 0;
- sal_Int8 nShadow = 0;
- rStream >> nShadow;
- pItem->m_bShadow = nShadow != 0;
- sal_Int8 nKerning = 0;
- rStream >> nKerning;
- pItem->m_bKerning = nKerning != 0;
- }
- pItem->m_aColor.Read(rStream, sal_True);
- pItem->m_aFillColor.Read(rStream, sal_True);
- sal_Int16 nFlags = 0;
- rStream >> nFlags;
- pItem->m_bHasFont = (nFlags & 4) != 0;
- pItem->m_bHasColor = (nFlags & 1) != 0;
- pItem->m_bHasFillColor = (nFlags & 2) != 0;
- return pItem;
-}
-
-//============================================================================
-// virtual
-SvStream & SfxFontItem::Store(SvStream & rStream, sal_uInt16) const
-{
- VersionCompat aItemCompat(rStream, STREAM_WRITE, 1);
- {
- VersionCompat aFontCompat(rStream, STREAM_WRITE, 1);
- writeByteString(rStream, m_aName);
- writeByteString(rStream, m_aStyleName);
- rStream << m_aSize << sal_Int16(m_nCharSet)
- << m_nFamily << m_nPitch << m_nWeight << m_nUnderline
- << m_nStrikeout << m_nItalic << sal_Int16(m_nLanguage)
- << m_nWidthType << m_nOrientation << sal_Int8(m_bWordLine)
- << sal_Int8(m_bOutline) << sal_Int8(m_bShadow)
- << sal_Int8(m_bKerning);
- }
- (const_cast< Color & >(m_aColor)).Write(rStream, sal_True);
- (const_cast< Color & >(m_aFillColor)).Write(rStream, sal_True);
- rStream << sal_Int16(m_bHasFont << 2 | m_bHasColor
- | m_bHasFillColor << 1);
- return rStream;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
