[Libreoffice-commits] .: 14 commits - svl/source svtools/inc svtools/source tools/inc tools/source vcl/inc vcl/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jul 11 15:59:43 PDT 2011
svl/source/misc/inethist.cxx | 20 ----
svtools/inc/svtools/imapobj.hxx | 3
svtools/source/misc/imap.cxx | 24 -----
tools/inc/tools/inetmsg.hxx | 17 ---
tools/inc/tools/urlobj.hxx | 75 ---------------
tools/source/fsys/urlobj.cxx | 139 ----------------------------
tools/source/inet/inetmsg.cxx | 192 ----------------------------------------
vcl/inc/vcl/image.hxx | 3
vcl/source/gdi/image.cxx | 39 --------
9 files changed, 1 insertion(+), 511 deletions(-)
New commits:
commit c886511dd5aa6dd59b5987ad169108b74653e497
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 16:47:00 2011 +0200
callcatcher: remove unused Image::Invert
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index bf10425..34788e4 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -88,8 +88,6 @@ public:
Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const;
- void Invert();
-
sal_Bool operator!() const { return( !mpImplData ? true : false ); }
Image& operator=( const Image& rImage );
sal_Bool operator==( const Image& rImage ) const;
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index eb0e420..9cf23b2 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -276,15 +276,6 @@ uno::Reference< graphic::XGraphic > Image::GetXGraphic() const
// -----------------------------------------------------------------------
-void Image::Invert()
-{
- BitmapEx aInvertedBmp( GetBitmapEx() );
- aInvertedBmp.Invert();
- *this = aInvertedBmp;
-}
-
-// -----------------------------------------------------------------------
-
Image& Image::operator=( const Image& rImage )
{
DBG_CHKTHIS( Image, NULL );
commit 9e1f4d0b0b411bb3416c50c71997e93591b7f171
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 16:46:32 2011 +0200
callcatcher: remove unused Image::GetColorTransformArrays
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index 9db1e26..bf10425 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -87,7 +87,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const;
Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const;
- static void GetColorTransformArrays( ImageColorTransform eColorTransform, Color*& rpSrcColor, Color*& rpDstColor, sal_uLong& rColorCount );
void Invert();
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index e999681..eb0e420 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -285,36 +285,6 @@ void Image::Invert()
// -----------------------------------------------------------------------
-void Image::GetColorTransformArrays( ImageColorTransform eColorTransform,
- Color*& rpSrcColor, Color*& rpDstColor, sal_uLong& rColorCount )
-{
- if( IMAGECOLORTRANSFORM_HIGHCONTRAST == eColorTransform )
- {
- rpSrcColor = new Color[ 4 ];
- rpDstColor = new Color[ 4 ];
- rColorCount = 4;
-
- rpSrcColor[ 0 ] = Color( COL_BLACK );
- rpDstColor[ 0 ] = Color( COL_WHITE );
-
- rpSrcColor[ 1 ] = Color( COL_WHITE );
- rpDstColor[ 1 ] = Color( COL_BLACK );
-
- rpSrcColor[ 2 ] = Color( COL_BLUE );
- rpDstColor[ 2 ] = Color( COL_WHITE );
-
- rpSrcColor[ 3 ] = Color( COL_LIGHTBLUE );
- rpDstColor[ 3 ] = Color( COL_WHITE );
- }
- else
- {
- rpSrcColor = rpDstColor = NULL;
- rColorCount = 0;
- }
-}
-
-// -----------------------------------------------------------------------
-
Image& Image::operator=( const Image& rImage )
{
DBG_CHKTHIS( Image, NULL );
commit 7bb8de26ccdb6c2b8a2fea0c5f176216a0fa2c65
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:52:32 2011 +0200
callcatcher: remove unused INetURLObject::makePortCanonic
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 10297d8..466a8f3 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -620,8 +620,6 @@ public:
bool SetPort(sal_uInt32 nThePort);
- void makePortCanonic();
-
//========================================================================
// Path:
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index de36359..99f0fa3 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -4350,33 +4350,6 @@ bool INetURLObject::SetPort(sal_uInt32 nThePort)
}
//============================================================================
-void INetURLObject::makePortCanonic()
-{
- if (m_aPort.isPresent())
- {
- sal_Unicode const * p = m_aAbsURIRef.getStr() + m_aPort.getBegin();
- sal_Unicode const * pEnd = p + m_aPort.getLength();
- sal_uInt32 nThePort;
- if (INetMIME::scanUnsigned(p, pEnd, true, nThePort) && p == pEnd)
- {
- sal_Int32 nDelta;
- if (nThePort != 0 && nThePort == getSchemeInfo().m_nDefaultPort)
- {
- lcl_Erase(m_aAbsURIRef, m_aPort.getBegin() - 1,
- m_aPort.getLength() + 1);
- nDelta = m_aPort.clear() - 1;
- }
- else
- nDelta = m_aPort.set(m_aAbsURIRef,
- rtl::OUString::valueOf(sal_Int64(nThePort)));
- m_aPath += nDelta;
- m_aQuery += nDelta;
- m_aFragment += nDelta;
- }
- }
-}
-
-//============================================================================
sal_Int32 INetURLObject::getSegmentCount(bool bIgnoreFinalSlash) const
{
if (!checkHierarchical())
commit 7bfe7bb1ba3a54c9f2be77d70039251a9bfdf53c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:52:02 2011 +0200
callcatcher: remove unused INetURLObject::makeAuthCanonic
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index b45bb7c..10297d8 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -573,8 +573,6 @@ public:
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setUser(rTheUser, false, eMechanism, eCharset); }
- void makeAuthCanonic();
-
inline bool SetPass(ByteString const & rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index a012650..de36359 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -4294,22 +4294,6 @@ bool INetURLObject::hasPassword() const
}
//============================================================================
-void INetURLObject::makeAuthCanonic()
-{
- if (m_eScheme == INET_PROT_IMAP && m_aAuth.getLength() == 1
- && m_aAbsURIRef.charAt(m_aAuth.getBegin()) == '*')
- {
- lcl_Erase(m_aAbsURIRef, m_aAuth.getBegin()
- - RTL_CONSTASCII_LENGTH(";AUTH="),
- RTL_CONSTASCII_LENGTH(";AUTH=*"));
- sal_Int32 nDelta = m_aAuth.clear() - RTL_CONSTASCII_LENGTH(";AUTH=");
- m_aPath += nDelta;
- m_aQuery += nDelta;
- m_aFragment += nDelta;
- }
-}
-
-//============================================================================
rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
commit 1123be5276542c91c8af3c5a27abc260ddc5067f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:49:07 2011 +0200
callcatcher: remove unused INetURLObject::getIMAPUID
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index d9c7851..b45bb7c 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -1434,10 +1434,6 @@ private:
TOOLS_DLLPRIVATE bool hasDosVolume(FSysStyle eStyle) const;
- // IMAP URLs:
-
- TOOLS_DLLPRIVATE sal_uInt32 getIMAPUID() const;
-
// Coding:
static inline rtl::OUString extend(ByteString const & rOctets)
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 5f7f478..a012650 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3695,33 +3695,6 @@ bool INetURLObject::hasDosVolume(FSysStyle eStyle) const
}
//============================================================================
-sal_uInt32 INetURLObject::getIMAPUID() const
-{
- if (m_eScheme == INET_PROT_IMAP
- && m_aPath.getLength() >= RTL_CONSTASCII_LENGTH("/;uid=") + 1)
- {
- sal_Unicode const * pBegin = m_aAbsURIRef.getStr()
- + m_aPath.getBegin()
- + RTL_CONSTASCII_LENGTH("/;uid=");
- sal_Unicode const * pEnd = pBegin + m_aPath.getLength();
- sal_Unicode const * p = pEnd;
- while (p > pBegin && INetMIME::isDigit(p[-1]))
- --p;
- if (p < pEnd && *--p != '0'
- && rtl::OUString(m_aAbsURIRef).copy(
- p - RTL_CONSTASCII_LENGTH("/;uid=") - m_aAbsURIRef.getStr(),
- RTL_CONSTASCII_LENGTH("/;uid=")).equalsIgnoreAsciiCaseAscii("/;uid=")
- )
- {
- sal_uInt32 nUID;
- if (INetMIME::scanUnsigned(p, pEnd, false, nUID))
- return nUID;
- }
- }
- return 0;
-}
-
-//============================================================================
// static
rtl::OUString INetURLObject::encodeText(sal_Unicode const * pBegin,
sal_Unicode const * pEnd, bool bOctets,
commit b77723197ded564d5af13abcc1d722e89776add5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:48:31 2011 +0200
callcatcher: remove unused INetURLObject::getFTPType
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 9bdd136..d9c7851 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -1430,12 +1430,6 @@ private:
rtl::OUString const & rTheMark, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
- // FTP URLs:
-
- enum FTPType { FTP_TYPE_NONE, FTP_TYPE_A, FTP_TYPE_I, FTP_TYPE_D };
-
- TOOLS_DLLPRIVATE FTPType getFTPType() const;
-
// FILE URLs:
TOOLS_DLLPRIVATE bool hasDosVolume(FSysStyle eStyle) const;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index fb7ca57..5f7f478 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3683,31 +3683,6 @@ bool INetURLObject::setFragment(rtl::OUString const & rTheFragment,
}
//============================================================================
-INetURLObject::FTPType INetURLObject::getFTPType() const
-{
- if (m_eScheme == INET_PROT_FTP
- && m_aPath.getLength() >= RTL_CONSTASCII_LENGTH(";type=") + 1
- && rtl::OUString(m_aAbsURIRef).copy(
- m_aPath.getEnd() - (RTL_CONSTASCII_LENGTH(";type=") + 1),
- RTL_CONSTASCII_LENGTH(";type=")).equalsIgnoreAsciiCaseAscii(";type="))
- switch (m_aAbsURIRef.charAt(m_aPath.getEnd()))
- {
- case 'A':
- case 'a':
- return FTP_TYPE_A;
-
- case 'D':
- case 'd':
- return FTP_TYPE_D;
-
- case 'I':
- case 'i':
- return FTP_TYPE_I;
- }
- return FTP_TYPE_NONE;
-}
-
-//============================================================================
bool INetURLObject::hasDosVolume(FSysStyle eStyle) const
{
sal_Unicode const * p = m_aAbsURIRef.getStr() + m_aPath.getBegin();
commit ccd3ab991cafe02f607e13b79bf7bff6e44a7f5f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:47:22 2011 +0200
callcatcher: remove unused INetURLObject::encodeHostPort
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 47b6245..9bdd136 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -624,49 +624,6 @@ public:
void makePortCanonic();
- /** Encode the <hostport> part of a URL.
-
- @ATT Obsolete, because at the moment the <hostport> part of a URL may
- not contain any escape sequences anyway, and because this method does
- not inform the caller whether the given <hostport> part is legal.
-
- @param rTheHostPort The <hostport> part of a URL (for its
- interpretation, see the general discussion for set-methods).
-
- @param eMechanism See the general discussion for set-methods.
-
- @param eCharset See the general discussion for set-methods.
-
- @return The <hostport> part, encoded according to the given mechanism
- and charset ('forbidden' characters replaced by escape sequences).
- */
- static inline rtl::OUString encodeHostPort(ByteString const & rTheHostPort,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset
- = RTL_TEXTENCODING_UTF8);
-
- /** Encode the <hostport> part of a URL.
-
- @ATT Obsolete, because at the moment the <hostport> part of a URL may
- not contain any escape sequences anyway, and because this method does
- not inform the caller whether the given <hostport> part is legal.
-
- @param rTheHostPort The <hostport> part of a URL (for its
- interpretation, see the general discussion for set-methods).
-
- @param eMechanism See the general discussion for set-methods.
-
- @param eCharset See the general discussion for set-methods.
-
- @return The <hostport> part, encoded according to the given mechanism
- and charset ('forbidden' characters replaced by escape sequences).
- */
- static inline rtl::OUString encodeHostPort(rtl::OUString const & rTheHostPort,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset
- = RTL_TEXTENCODING_UTF8)
- { return encodeHostPort(rTheHostPort, false, eMechanism, eCharset); }
-
//========================================================================
// Path:
@@ -1423,10 +1380,6 @@ private:
EncodeMechanism eMechanism, rtl_TextEncoding eCharset,
bool bNetBiosName, rtl::OUStringBuffer* pCanonic);
- static rtl::OUString encodeHostPort(
- rtl::OUString const & rTheHostPort, bool bOctets,
- EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
-
bool setHost(
rtl::OUString const & rTheHost, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
@@ -1817,15 +1770,6 @@ inline bool INetURLObject::SetUserAndPass(rtl::OUString const & rTheUser,
setPassword(rThePassword, false, eMechanism, eCharset));
}
-// static
-inline rtl::OUString INetURLObject::encodeHostPort(ByteString const &
- rTheHostPort,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return encodeHostPort(extend(rTheHostPort), true, eMechanism, eCharset);
-}
-
inline bool INetURLObject::insertName(rtl::OUString const & rTheName,
bool bAppendFinalSlash,
sal_Int32 nIndex,
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index a437a74..fb7ca57 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2909,29 +2909,6 @@ bool INetURLObject::parseHostOrNetBiosName(
}
//============================================================================
-// static
-rtl::OUString INetURLObject::encodeHostPort(rtl::OUString const & rTheHostPort,
- bool bOctets,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- sal_Int32 nPort = rTheHostPort.getLength();
- if (nPort != 0)
- {
- sal_Int32 i = nPort - 1;
- while (i != 0 && INetMIME::isDigit(rTheHostPort.getStr()[i]))
- --i;
- if (rTheHostPort.getStr()[i] == ':')
- nPort = i;
- }
- rtl::OUString aResult(encodeText(rTheHostPort.copy(0, nPort), bOctets,
- PART_HOST_EXTRA, '%', eMechanism, eCharset,
- true));
- aResult += rTheHostPort.copy(nPort);
- return aResult;
-}
-
-//============================================================================
bool INetURLObject::setHost(rtl::OUString const & rTheHost, bool bOctets,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
commit 5f0c859fe6df8de5077e44bd7f26e27678d0c2c3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:45:20 2011 +0200
callcatcher: remove unused INetURLObject::HasMsgId
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index ea817d6..47b6245 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -1058,8 +1058,6 @@ public:
//========================================================================
// POP3 and URLs:
- bool HasMsgId() const;
-
rtl::OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
const;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index c589617..a437a74 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -5137,19 +5137,6 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle,
}
//============================================================================
-bool INetURLObject::HasMsgId() const
-{
- if (m_eScheme != INET_PROT_POP3)
- return false;
- sal_Unicode const * p = m_aAbsURIRef.getStr() + m_aPath.getBegin();
- sal_Unicode const * pEnd = p + m_aPath.getLength();
- for (; p < pEnd; ++p)
- if (*p == '<')
- return true;
- return false;
-}
-
-//============================================================================
rtl::OUString INetURLObject::GetMsgId(DecodeMechanism eMechanism,
rtl_TextEncoding eCharset) const
{
commit fb68a7aa1fc55f5256afca60fbdfc1aa02ca6b44
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:44:31 2011 +0200
callcatcher: remove unused INetURLObject::CutName
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 259dcd5..ea817d6 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -1279,9 +1279,6 @@ public:
= RTL_TEXTENCODING_UTF8) const
{ return GetLastName(eMechanism, eCharset); }
- rtl::OUString CutName(DecodeMechanism eMechanism = DECODE_TO_IURI,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
void SetExtension(rtl::OUString const & rTheExtension,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index f2ad8e3..c589617 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -5593,14 +5593,6 @@ void INetURLObject::SetName(rtl::OUString const & rTheName,
}
//============================================================================
-rtl::OUString INetURLObject::CutName(DecodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- rtl::OUString aTheName(getName(LAST_SEGMENT, true, eMechanism, eCharset));
- return removeSegment(LAST_SEGMENT, true) ? aTheName : rtl::OUString();
-}
-
-//============================================================================
void INetURLObject::SetExtension(rtl::OUString const & rTheExtension,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
commit 7453cab958803502a26a58cdf13b2f556f6bd8bb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:42:48 2011 +0200
callcatcher: remove unused INetURLHistory_Impl::heapsort
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 8be49fe..0bdc98a 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -157,7 +157,6 @@ class INetURLHistory_Impl
void initialize (void);
void downheap (hash_entry a[], sal_uInt16 n, sal_uInt16 k);
- void heapsort (hash_entry a[], sal_uInt16 n);
/** capacity.
*/
@@ -275,25 +274,6 @@ void INetURLHistory_Impl::downheap (hash_entry a[], sal_uInt16 n, sal_uInt16 k)
}
/*
- * heapsort.
- */
-void INetURLHistory_Impl::heapsort (hash_entry a[], sal_uInt16 n)
-{
- hash_entry h;
-
- for (sal_uInt16 k = (n - 1) / 2 + 1; k > 0; k--)
- downheap (a, n, k - 1);
-
- while (n > 0)
- {
- h = a[0 ];
- a[0 ] = a[n - 1];
- a[n - 1] = h;
- downheap (a, --n, 0);
- }
-}
-
-/*
* find.
*/
sal_uInt16 INetURLHistory_Impl::find (sal_uInt32 nHash) const
commit 2acb74801b811b80efc07d8043c9b7b26ccaa332
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:40:26 2011 +0200
callcatcher: remove unused INetRFC822Message::GenerateDateField
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index d988ad9..cfdd781 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -282,8 +282,6 @@ public:
INetRFC822Message& operator= (const INetRFC822Message& rMsg);
- static sal_Bool GenerateDateField (
- const DateTime& rDateTime, UniString& rDateField);
static sal_Bool ParseDateField (
const UniString& rDateField, DateTime& rDateTime);
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index f7d83d9..235d6fd 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -296,13 +296,8 @@ INetRFC822Message::~INetRFC822Message (void)
}
/*
- * <Generate|Parse>DateField and local helper functions.
- *
- * GenerateDateField.
- * Generates a String from Date and Time objects in format:
- * Wkd, 00 Mon 0000 00:00:00 [GMT] (rfc822, rfc1123)
+ * ParseDateField and local helper functions.
*
- * ParseDateField.
* Parses a String in (implied) GMT format into class Date and Time objects.
* Four formats are accepted:
*
@@ -321,68 +316,6 @@ static const sal_Char *months[12] =
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
-static const sal_Char *wkdays[7] =
-{
- "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
-};
-
-/*
- * GenerateDateField.
- */
-sal_Bool INetRFC822Message::GenerateDateField (
- const DateTime& rDateTime, UniString& rDateFieldW)
-{
- // Check arguments.
- if (!rDateTime.IsValid() ||
- (rDateTime.GetSec() > 59) ||
- (rDateTime.GetMin() > 59) ||
- (rDateTime.GetHour() > 23) ) return sal_False;
-
- // Prepare output string.
- rtl::OStringBuffer aDateField;
-
- // Insert Date.
- aDateField.append(wkdays[(sal_uInt16)(rDateTime.GetDayOfWeek())]);
- aDateField.append(RTL_CONSTASCII_STRINGPARAM(", "));
-
- sal_uInt16 nNum = rDateTime.GetDay();
- if (nNum < 10)
- aDateField.append('0');
- aDateField.append(static_cast<sal_Int32>(nNum));
- aDateField.append(' ');
-
- aDateField.append(months[(sal_uInt16)(rDateTime.GetMonth() - 1)]);
- aDateField.append(' ');
-
- aDateField.append(static_cast<sal_Int32>(rDateTime.GetYear()));
- aDateField.append(' ');
-
- // Insert Time.
- nNum = rDateTime.GetHour();
- if (nNum < 10)
- aDateField.append('0');
- aDateField.append(static_cast<sal_Int32>(nNum));
- aDateField.append(':');
-
- nNum = rDateTime.GetMin();
- if (nNum < 10)
- aDateField.append('0');
- aDateField.append(static_cast<sal_Int32>(nNum));
- aDateField.append(':');
-
- nNum = rDateTime.GetSec();
- if (nNum < 10)
- aDateField.append('0');
- aDateField.append(static_cast<sal_Int32>(nNum));
- aDateField.append(RTL_CONSTASCII_STRINGPARAM(" GMT"));
-
- // Done.
- rDateFieldW = rtl::OStringToOUString(aDateField.makeStringAndClear(),
- RTL_TEXTENCODING_ASCII_US);
-
- return sal_True;
-}
-
/*
* ParseDateField and local helper functions.
*/
commit ba61ee8331ef5b90c04a426152f5288330da57b4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:37:59 2011 +0200
callcatcher: remove unused INetRFC822Message::Set*
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index 45b9241..d988ad9 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -295,7 +295,6 @@ public:
/** Header fields.
*/
- void SetBCC (const UniString& rBCC);
UniString GetBCC (void) const
{
return GetHeaderValue_Impl (
@@ -303,7 +302,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetCC (const UniString& rCC);
UniString GetCC (void) const
{
return GetHeaderValue_Impl (
@@ -311,7 +309,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetComments (const UniString& rComments);
UniString GetComments (void) const
{
return GetHeaderValue_Impl (
@@ -319,7 +316,6 @@ public:
INetMIME::HEADER_FIELD_TEXT);
}
- void SetDate (const UniString& rDate);
UniString GetDate (void) const
{
return GetHeaderValue_Impl (
@@ -327,7 +323,6 @@ public:
INetMIME::HEADER_FIELD_STRUCTURED);
}
- void SetFrom (const UniString& rFrom);
UniString GetFrom (void) const
{
return GetHeaderValue_Impl (
@@ -335,7 +330,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetInReplyTo (const UniString& rInReplyTo);
UniString GetInReplyTo (void) const
{
return GetHeaderValue_Impl (
@@ -343,7 +337,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS); // ??? MESSAGE_ID ???
}
- void SetKeywords (const UniString& rKeywords);
UniString GetKeywords (void) const
{
return GetHeaderValue_Impl (
@@ -351,7 +344,6 @@ public:
INetMIME::HEADER_FIELD_PHRASE);
}
- void SetMessageID (const UniString& rMessageID);
UniString GetMessageID (void) const
{
return GetHeaderValue_Impl (
@@ -359,7 +351,6 @@ public:
INetMIME::HEADER_FIELD_MESSAGE_ID);
}
- void SetReferences (const UniString& rReferences);
UniString GetReferences (void) const
{
return GetHeaderValue_Impl (
@@ -367,7 +358,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetReplyTo (const UniString& rReplyTo);
UniString GetReplyTo (void) const
{
return GetHeaderValue_Impl (
@@ -375,7 +365,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetReturnPath (const UniString& rReturnPath);
UniString GetReturnPath (void) const
{
return GetHeaderValue_Impl (
@@ -383,7 +372,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetReturnReceiptTo (const UniString& rReturnReceiptTo);
UniString GetReturnReceiptTo (void) const
{
return GetHeaderValue_Impl (
@@ -391,7 +379,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetSender (const UniString& rSender);
UniString GetSender (void) const
{
return GetHeaderValue_Impl (
@@ -399,7 +386,6 @@ public:
INetMIME::HEADER_FIELD_ADDRESS);
}
- void SetSubject (const UniString& rSubject);
UniString GetSubject (void) const
{
return GetHeaderValue_Impl (
@@ -407,7 +393,6 @@ public:
INetMIME::HEADER_FIELD_TEXT);
}
- void SetTo (const UniString& rTo);
UniString GetTo (void) const
{
return GetHeaderValue_Impl (
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 72767a8..f7d83d9 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -754,129 +754,6 @@ sal_uIntPtr INetRFC822Message::SetHeaderField (
}
/*
- * Specific Set-Methods.
- */
-void INetRFC822Message::SetBCC (const UniString& rBCC)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_BCC), rBCC,
- m_nIndex[INETMSG_RFC822_BCC]);
-}
-
-void INetRFC822Message::SetCC (const UniString& rCC)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_CC), rCC,
- m_nIndex[INETMSG_RFC822_CC]);
-}
-
-void INetRFC822Message::SetComments (const UniString& rComments)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_TEXT,
- HDR(INETMSG_RFC822_COMMENTS), rComments,
- m_nIndex[INETMSG_RFC822_COMMENTS]);
-}
-
-void INetRFC822Message::SetDate (const UniString& rDate)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_STRUCTURED,
- HDR(INETMSG_RFC822_DATE), rDate,
- m_nIndex[INETMSG_RFC822_DATE]);
-}
-
-void INetRFC822Message::SetFrom (const UniString& rFrom)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_FROM), rFrom,
- m_nIndex[INETMSG_RFC822_FROM]);
-}
-
-void INetRFC822Message::SetInReplyTo (const UniString& rInReplyTo)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS, // ??? MESSAGE_ID ???
- HDR(INETMSG_RFC822_IN_REPLY_TO), rInReplyTo,
- m_nIndex[INETMSG_RFC822_IN_REPLY_TO]);
-}
-
-void INetRFC822Message::SetKeywords (const UniString& rKeywords)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_PHRASE,
- HDR(INETMSG_RFC822_KEYWORDS), rKeywords,
- m_nIndex[INETMSG_RFC822_KEYWORDS]);
-}
-
-void INetRFC822Message::SetMessageID (const UniString& rMessageID)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_MESSAGE_ID,
- HDR(INETMSG_RFC822_MESSAGE_ID), rMessageID,
- m_nIndex[INETMSG_RFC822_MESSAGE_ID]);
-}
-
-void INetRFC822Message::SetReferences (const UniString& rReferences)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_MESSAGE_ID,
- HDR(INETMSG_RFC822_REFERENCES), rReferences,
- m_nIndex[INETMSG_RFC822_REFERENCES]);
-}
-
-void INetRFC822Message::SetReplyTo (const UniString& rReplyTo)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_REPLY_TO), rReplyTo,
- m_nIndex[INETMSG_RFC822_REPLY_TO]);
-}
-
-void INetRFC822Message::SetReturnPath (const UniString& rReturnPath)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_RETURN_PATH), rReturnPath,
- m_nIndex[INETMSG_RFC822_RETURN_PATH]);
-}
-
-void INetRFC822Message::SetReturnReceiptTo (const UniString& rValue)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_RETURN_RECEIPT_TO), rValue,
- m_nIndex[INETMSG_RFC822_RETURN_RECEIPT_TO]);
-}
-
-void INetRFC822Message::SetSender (const UniString& rSender)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_SENDER), rSender,
- m_nIndex[INETMSG_RFC822_SENDER]);
-}
-
-void INetRFC822Message::SetSubject (const UniString& rSubject)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_TEXT,
- HDR(INETMSG_RFC822_SUBJECT), rSubject,
- m_nIndex[INETMSG_RFC822_SUBJECT]);
-}
-
-void INetRFC822Message::SetTo (const UniString& rTo)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_ADDRESS,
- HDR(INETMSG_RFC822_TO), rTo,
- m_nIndex[INETMSG_RFC822_TO]);
-}
-
-/*
* operator<<
*/
SvStream& INetRFC822Message::operator<< (SvStream& rStrm) const
commit 1eb4bb079903a885d3a06d3273a4e72abbd8d2df
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:20:21 2011 +0200
callcatcher: remove unused IMapObject::GetPixelPoint
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index 80e6dac..00a44fa 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.hxx
@@ -130,8 +130,6 @@ public:
sal_Bool IsActive() const { return bActive; }
void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; }
- static Point GetPixelPoint( const Point& rLogPoint );
-
sal_Bool IsEqual( const IMapObject& rEqObj );
// IMap-Events
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 9df2ff2..634c447 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -165,18 +165,6 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
/******************************************************************************
|*
-|* Konvertierung der logischen Koordianten in Pixel
-|*
-\******************************************************************************/
-
-Point IMapObject::GetPixelPoint( const Point& rLogPoint )
-{
- return Application::GetDefaultDevice()->LogicToPixel( rLogPoint, MapMode( MAP_100TH_MM ) );
-}
-
-
-/******************************************************************************
-|*
|*
|*
\******************************************************************************/
commit c3db54ac8b19e69227f3876d0e7726f61abdd3b5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jul 11 15:19:37 2011 +0200
callcatcher: remove unused IMapObject::GetLogPoint
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index 025ac80..80e6dac 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.hxx
@@ -131,7 +131,6 @@ public:
void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; }
static Point GetPixelPoint( const Point& rLogPoint );
- static Point GetLogPoint( const Point& rPixelPoint );
sal_Bool IsEqual( const IMapObject& rEqObj );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 1117085..9df2ff2 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -177,18 +177,6 @@ Point IMapObject::GetPixelPoint( const Point& rLogPoint )
/******************************************************************************
|*
-|* Konvertierung der logischen Koordianten in Pixel
-|*
-\******************************************************************************/
-
-Point IMapObject::GetLogPoint( const Point& rPixelPoint )
-{
- return Application::GetDefaultDevice()->PixelToLogic( rPixelPoint, MapMode( MAP_100TH_MM ) );
-}
-
-
-/******************************************************************************
-|*
|*
|*
\******************************************************************************/
More information about the Libreoffice-commits
mailing list