[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source svx/inc svx/source xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 4 01:37:47 PDT 2011
editeng/inc/editeng/lcolitem.hxx | 1 -
editeng/inc/editeng/numitem.hxx | 1 -
editeng/source/items/numitem.cxx | 35 -----------------------------------
editeng/source/items/textitem.cxx | 7 -------
editeng/source/misc/svxacorr.cxx | 4 ++--
svx/inc/svx/chrtitem.hxx | 1 -
svx/inc/svx/e3ditem.hxx | 1 -
svx/source/items/chrtitem.cxx | 8 --------
svx/source/items/e3ditem.cxx | 12 ------------
xmloff/inc/xmloff/xmlimp.hxx | 2 --
xmloff/source/core/xmlimp.cxx | 10 ----------
11 files changed, 2 insertions(+), 80 deletions(-)
New commits:
commit 9bfb43a942afd567cbb82edeba60c4cacc85c646
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 09:34:01 2011 +0100
callcatcher: remove unused methods
diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 0108f35..d5508cf 100644
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -45,7 +45,6 @@ public:
SvxLineColorItem( const sal_uInt16 nId );
SvxLineColorItem( const Color& aColor, const sal_uInt16 nId );
- SvxLineColorItem( SvStream& rStrm, const sal_uInt16 nId );
SvxLineColorItem( const SvxLineColorItem& rCopy );
~SvxLineColorItem();
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 6ffa3c8..a779bf9 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -267,7 +267,6 @@ public:
eDefaultNumberFormatPositionAndSpaceMode
= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SvxNumRule(const SvxNumRule& rCopy);
- SvxNumRule(SvStream &rStream);
virtual ~SvxNumRule();
int operator==( const SvxNumRule& ) const;
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index f04b8ea..1a3ae47 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -744,41 +744,6 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
}
}
-SvxNumRule::SvxNumRule(SvStream &rStream)
-{
- ++nRefCount;
- LanguageType eLang = Application::GetSettings().GetLanguage();
- aLocale = SvxCreateLocale(eLang);
- sal_uInt16 nVersion;
- sal_uInt16 nTemp;
- rStream >> nVersion;
- rStream >> nLevelCount;
- rStream >> nTemp;
- nFeatureFlags = nTemp;
- rStream >> nTemp;
- bContinuousNumbering = (sal_Bool)nTemp;
- rStream >> nTemp;
- eNumberingType = (SvxNumRuleType)nTemp;
- memset( aFmts, 0, sizeof( aFmts ));
-
- for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
- {
- sal_uInt16 nSet;
- rStream >> nSet;
- if(nSet)
- aFmts[i] = new SvxNumberFormat(rStream);
- else
- aFmts[i] = 0;
- aFmtsSet[i] = aFmts[i] ? sal_True : sal_False;
- }
- if(NUMITEM_VERSION_02 <= nVersion)
- {
- sal_uInt16 nShort;
- rStream >> nShort;
- nFeatureFlags = nShort;
- }
-}
-
SvStream& SvxNumRule::Store(SvStream &rStream)
{
rStream<<(sal_uInt16)NUMITEM_VERSION_03;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 463aa93..2f0da8e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2779,13 +2779,6 @@ SvxLineColorItem::SvxLineColorItem( const Color& rCol, const sal_uInt16 nId ) :
// -----------------------------------------------------------------------
-SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
- SvxColorItem( rStrm, nId )
-{
-}
-
-// -----------------------------------------------------------------------
-
SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) :
SvxColorItem( rCopy )
{
diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index edbc1fa..60009d1 100644
--- a/svx/inc/svx/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
@@ -319,7 +319,6 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
public:
TYPEINFO();
SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
- SvxDoubleItem(SvStream& rIn, sal_uInt16 nId );
SvxDoubleItem(const SvxDoubleItem& rItem);
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 42926dd..5558534 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -46,7 +46,6 @@ public:
TYPEINFO();
SvxB3DVectorItem();
SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
- SvxB3DVectorItem( sal_uInt16 nWhich, SvStream & );
SvxB3DVectorItem( const SvxB3DVectorItem& );
~SvxB3DVectorItem();
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index e6bba7d..514cee5 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -264,14 +264,6 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
// -----------------------------------------------------------------------
-SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) :
- SfxPoolItem(nId)
-{
- rIn >> fVal;
-}
-
-// -----------------------------------------------------------------------
-
SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) :
SfxPoolItem(rItem),
fVal(rItem.fVal)
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 80acfbe..466b07f 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -68,18 +68,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector
// -----------------------------------------------------------------------
-SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, SvStream& rStream ) :
- SfxPoolItem( _nWhich )
-{
- DBG_CTOR(SvxB3DVectorItem, 0);
- double fValue;
- rStream >> fValue; aVal.setX(fValue);
- rStream >> fValue; aVal.setY(fValue);
- rStream >> fValue; aVal.setZ(fValue);
-}
-
-// -----------------------------------------------------------------------
-
SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
commit 9f985ac3db2c191fa521f833e011a9eda3ae708c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 3 23:25:27 2011 +0100
elide runtime conversion of constant to unicode
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5108c03..675bd0f 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -353,8 +353,8 @@ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile,
{
nFlags = SvxAutoCorrect::GetDefaultFlags();
- cEmDash = ByteString::ConvertToUnicode( '\x97', RTL_TEXTENCODING_MS_1252 );
- cEnDash = ByteString::ConvertToUnicode( '\x96', RTL_TEXTENCODING_MS_1252 );
+ cEmDash = 0x2014;
+ cEnDash = 0x2013;
}
SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
commit 96c45e2deb9c0328531b087ba41b56fdde82d225
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 3 22:25:49 2011 +0100
callcatcher: remove unused methods
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index eb9a5f6..9e87e08 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -344,11 +344,9 @@ public:
XMLFontStylesContext *GetFontDecls();
SvXMLStylesContext *GetStyles();
SvXMLStylesContext *GetAutoStyles();
- SvXMLStylesContext *GetMasterStyles();
const XMLFontStylesContext *GetFontDecls() const;
const SvXMLStylesContext *GetStyles() const;
const SvXMLStylesContext *GetAutoStyles() const;
- const SvXMLStylesContext *GetMasterStyles() const;
sal_uInt16 getImportFlags() const { return mnImportFlags; }
sal_Bool IsFormsSupported() const { return mbIsFormsSupported; }
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index e728270..7f5d08d 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1570,11 +1570,6 @@ SvXMLStylesContext *SvXMLImport::GetAutoStyles()
return (SvXMLStylesContext *)&mxAutoStyles;
}
-SvXMLStylesContext *SvXMLImport::GetMasterStyles()
-{
- return (SvXMLStylesContext *)&mxMasterStyles;
-}
-
const XMLFontStylesContext *SvXMLImport::GetFontDecls() const
{
return (const XMLFontStylesContext *)&mxFontDecls;
@@ -1590,11 +1585,6 @@ const SvXMLStylesContext *SvXMLImport::GetAutoStyles() const
return (const SvXMLStylesContext *)&mxAutoStyles;
}
-const SvXMLStylesContext *SvXMLImport::GetMasterStyles() const
-{
- return (const SvXMLStylesContext *)&mxMasterStyles;
-}
-
OUString SvXMLImport::GetAbsoluteReference(const OUString& rValue) const
{
if( rValue.getLength() == 0 || rValue[0] == '#' )
More information about the Libreoffice-commits
mailing list