[Libreoffice-commits] .: 36 commits - basegfx/inc basegfx/prj basegfx/source basegfx/test svl/inc svl/source svtools/inc svtools/source tools/inc tools/source vcl/inc vcl/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Jul 13 23:22:31 PDT 2011
basegfx/inc/basegfx/matrix/b3dhommatrix.hxx | 13
basegfx/inc/basegfx/point/b3dhompoint.hxx | 408 ----------------------------
basegfx/prj/d.lst | 1
basegfx/source/matrix/b3dhommatrix.cxx | 54 ---
basegfx/source/point/b3dhompoint.cxx | 47 ---
basegfx/source/point/makefile.mk | 1
basegfx/test/basegfx3d.cxx | 28 -
svl/inc/svl/inettype.hxx | 7
svl/source/misc/inettype.cxx | 57 ---
svtools/inc/svtools/prnsetup.hxx | 1
svtools/inc/svtools/tabbar.hxx | 12
svtools/inc/svtools/taskbar.hxx | 21 -
svtools/inc/svtools/texteng.hxx | 5
svtools/inc/svtools/textview.hxx | 10
svtools/inc/svtools/transfer.hxx | 6
svtools/inc/svtools/txtattr.hxx | 4
svtools/source/control/tabbar.cxx | 167 -----------
svtools/source/control/taskbar.cxx | 64 ----
svtools/source/control/taskstat.cxx | 101 ------
svtools/source/dialogs/prnsetup.cxx | 5
svtools/source/edit/textdoc.cxx | 37 --
svtools/source/edit/textdoc.hxx | 4
svtools/source/edit/texteng.cxx | 58 ---
svtools/source/edit/textundo.cxx | 41 --
svtools/source/edit/textview.cxx | 36 --
svtools/source/edit/txtattr.cxx | 21 -
svtools/source/misc/transfer.cxx | 34 --
svtools/source/misc/transfer2.cxx | 9
tools/inc/tools/inetmime.hxx | 54 ---
tools/inc/tools/inetmsg.hxx | 9
tools/inc/tools/inetstrm.hxx | 3
tools/inc/tools/table.hxx | 2
tools/inc/tools/tempfile.hxx | 7
tools/source/fsys/tempfile.cxx | 22 -
tools/source/inet/inetmime.cxx | 256 -----------------
tools/source/inet/inetmsg.cxx | 215 --------------
tools/source/inet/inetstrm.cxx | 42 --
tools/source/memtools/table.cxx | 39 --
vcl/inc/vcl/print.hxx | 5
vcl/inc/vcl/syschild.hxx | 1
vcl/inc/vcl/syswin.hxx | 4
vcl/inc/vcl/tabctrl.hxx | 3
vcl/inc/vcl/taskpanelist.hxx | 1
vcl/inc/vcl/toolbox.hxx | 29 -
vcl/inc/vcl/wall.hxx | 3
vcl/source/control/tabctrl.cxx | 30 --
vcl/source/fontsubset/cff.cxx | 15 -
vcl/source/gdi/print.cxx | 56 ---
vcl/source/gdi/print2.cxx | 43 --
vcl/source/gdi/wall.cxx | 42 --
vcl/source/window/syschild.cxx | 10
vcl/source/window/syswin.cxx | 49 ---
vcl/source/window/taskpanelist.cxx | 35 --
vcl/source/window/toolbox.cxx | 138 ---------
vcl/source/window/toolbox2.cxx | 182 ------------
55 files changed, 5 insertions(+), 2542 deletions(-)
New commits:
commit bd64bd490ce6e3ffe36e1344d30689be69b5b4c4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 14 01:07:39 2011 +0200
callcatcher: actually remove the correct SetTempNameBaseDirectory
diff --git a/tools/inc/tools/tempfile.hxx b/tools/inc/tools/tempfile.hxx
index 3eec3e8..c4a0270 100644
--- a/tools/inc/tools/tempfile.hxx
+++ b/tools/inc/tools/tempfile.hxx
@@ -65,13 +65,6 @@ public:
// Only create a name for a temporary file that would be valid at that moment.
static String CreateTempName( const String* pParent=NULL );
-
- // The TempNameBase is a folder in the default ( system ) tempfile folder.
- // This subfolder will be used if a TempFile or TempName is created without a parent name.
- // The caller of the SetTempNameBase is responsible for deleting this folder and all temporary files in it.
- // The argument must be a simple name, not a complete URL.
- // The return value of both methods is the complete URL of the tempname base folder.
- static String SetTempNameBaseDirectory( const String &rBaseName );
};
#endif
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index bf558a8..068d363 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.cxx
@@ -267,26 +267,4 @@ String TempFile::GetName() const
return aTmp;
}
-String TempFile::SetTempNameBaseDirectory( const String &rBaseName )
-{
- String aName( rBaseName );
-
- ::rtl::OUString& rTempNameBase_Impl = TempNameBase_Impl::get();
-
- FileBase::RC err= Directory::create( aName );
- if ( err == FileBase::E_None || err == FileBase::E_EXIST )
- {
- rTempNameBase_Impl = aName;
- rTempNameBase_Impl += String( '/' );
-
- TempFile aBase( NULL, sal_True );
- if ( aBase.IsValid() )
- rTempNameBase_Impl = aBase.pImp->aName;
- }
-
- rtl::OUString aTmp;
- aTmp = rTempNameBase_Impl;
- return aTmp;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9d3f689a60587649b02695f16d140f56aea30b8d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 14 01:05:54 2011 +0200
Revert "callcatcher: remove unused TempFile::SetTempNameBaseDirectory from unotools"
This reverts commit 817875a7126b403ab029ca1fa06c9d3297bd24b2.
diff --git a/unotools/inc/unotools/tempfile.hxx b/unotools/inc/unotools/tempfile.hxx
index dfc7a9a..2580b63 100644
--- a/unotools/inc/unotools/tempfile.hxx
+++ b/unotools/inc/unotools/tempfile.hxx
@@ -143,6 +143,17 @@ public:
conversion functions of osl.
*/
static String CreateTempName( const String* pParent=NULL );
+
+ /**
+ The TempNameBaseDirectory is a subfolder in the folder that is passed as a "physical" file name in the
+ SetTempNameBaseDirectory method.
+ This subfolder will be used if a TempFile or TempName is created without a parent name or a parent name
+ that does not belong to the local file system.
+ The caller of the SetTempNameBase is responsible for deleting this folder and all temporary files in it.
+ The return value of both methods is the complete "physical" name of the tempname base folder.
+ It is not a URL because alle URLs must be "UCB compatible", so there may be no suitable URL at all.
+ */
+ static String SetTempNameBaseDirectory( const String &rBaseName );
};
}
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 79e7691..4274888 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -443,6 +443,47 @@ void TempFile::CloseStream()
}
}
+String TempFile::SetTempNameBaseDirectory( const String &rBaseName )
+{
+ if( !rBaseName.Len() )
+ return String();
+
+ rtl::OUString aUnqPath( rBaseName );
+
+ // remove trailing slash
+ if ( rBaseName.GetChar( rBaseName.Len() - 1 ) == sal_Unicode( '/' ) )
+ aUnqPath = rBaseName.Copy( 0, rBaseName.Len() - 1 );
+
+ // try to create the directory
+ sal_Bool bRet = sal_False;
+ osl::FileBase::RC err = osl::Directory::create( aUnqPath );
+ if ( err != FileBase::E_None && err != FileBase::E_EXIST )
+ // perhaps parent(s) don't exist
+ bRet = ensuredir( aUnqPath );
+ else
+ bRet = sal_True;
+
+ // failure to create base directory means returning an empty string
+ rtl::OUString aTmp;
+ if ( bRet )
+ {
+ // append own internal directory
+ bRet = sal_True;
+ ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get();
+ rTempNameBase_Impl = rBaseName;
+ rTempNameBase_Impl += String( '/' );
+
+ TempFile aBase( NULL, sal_True );
+ if ( aBase.IsValid() )
+ // use it in case of success
+ rTempNameBase_Impl = aBase.pImp->aName;
+
+ // return system path of used directory
+ FileBase::getSystemPathFromFileURL( rTempNameBase_Impl, aTmp );
+ }
+
+ return aTmp;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b422856ef4a0991f8170b6a6d2e791792d7366c2
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 23:00:29 2011 +0200
callcatcher: actually remove INetContentTypes::GetExtension
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 7dea8a2..b1386dd 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -944,25 +944,6 @@ UniString INetContentTypes::GetPresentation(INetContentType eTypeID,
//============================================================================
//static
-UniString INetContentTypes::GetExtension(UniString const & rTypeName)
-{
- MediaTypeEntry const * pEntry = seekEntry(rTypeName, aStaticTypeNameMap,
- CONTENT_TYPE_LAST + 1);
- if (pEntry)
- return UniString::CreateFromAscii(pEntry->m_pExtension);
-
- UniString aExtension = Registration::GetExtension(rTypeName);
- if (aExtension.Len() != 0)
- return aExtension;
- // special handling of text types, which come in uncounted variations:
- return rTypeName.EqualsIgnoreCaseAscii("text", 0,
- RTL_CONSTASCII_LENGTH("text")) ?
- UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("txt")) :
- UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("tmp"));
-}
-
-//============================================================================
-//static
INetContentType INetContentTypes::GetContentType4Extension(UniString const &
rExtension)
{
commit a54500157d0f6a1019ed03c39c311ca02c57f28f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:48:22 2011 +0200
callcatcher: cleanup INetMIME
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 2c4c425..a940712 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -377,8 +377,6 @@ public:
@return The Base 64 digit corresponding to nWeight (US-ASCII 'A'--
'Z', 'a'--'z', '0'--'9', '+' or '/').
*/
- static sal_uInt32 getBase64Digit(int nWeight);
-
static inline bool isHighSurrogate(sal_uInt32 nUTF16);
static inline bool isLowSurrogate(sal_uInt32 nUTF16);
@@ -394,28 +392,6 @@ public:
@param pEnd1 Points past the end of the first string, must be >=
pBegin1.
- @param pBegin2 Points to the start of the second string, must not be
- null.
-
- @param pEnd2 Points past the end of the second string, must be >=
- pBegin2.
-
- @return True if the two strings are equal, ignoring the case of US-
- ASCII alphabetic characters (US-ASCII 'A'--'Z' and 'a'--'z').
- */
- static bool equalIgnoreCase(const sal_Char * pBegin1,
- const sal_Char * pEnd1,
- const sal_Char * pBegin2,
- const sal_Char * pEnd2);
-
- /** Check two US-ASCII strings for equality, ignoring case.
-
- @param pBegin1 Points to the start of the first string, must not be
- null.
-
- @param pEnd1 Points past the end of the first string, must be >=
- pBegin1.
-
@param pString2 Points to the start of the null terminated second
string, must not be null.
@@ -472,9 +448,6 @@ public:
static bool startsWithLinearWhiteSpace(const sal_Char * pBegin,
const sal_Char * pEnd);
- static const sal_Char * skipLinearWhiteSpace(const sal_Char * pBegin,
- const sal_Char * pEnd);
-
static const sal_Unicode * skipLinearWhiteSpace(const sal_Unicode *
pBegin,
const sal_Unicode * pEnd);
@@ -503,12 +476,6 @@ public:
static const sal_Unicode * skipQuotedString(const sal_Unicode * pBegin,
const sal_Unicode * pEnd);
- static const sal_Char * scanAtom(const sal_Char * pBegin,
- const sal_Char * pEnd);
-
- static const sal_Unicode * scanAtom(const sal_Unicode * pBegin,
- const sal_Unicode * pEnd);
-
static bool scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd,
bool bLeadingZeroes, sal_uInt32 & rValue);
@@ -516,21 +483,6 @@ public:
const sal_Unicode * pEnd, bool bLeadingZeroes,
sal_uInt32 & rValue);
- static bool scanUnsignedHex(const sal_Char *& rBegin,
- const sal_Char * pEnd, bool bLeadingZeroes,
- sal_uInt32 & rValue);
-
- static bool scanUnsignedHex(const sal_Unicode *& rBegin,
- const sal_Unicode * pEnd, bool bLeadingZeroes,
- sal_uInt32 & rValue);
-
- static const sal_Char * scanQuotedBlock(const sal_Char * pBegin,
- const sal_Char * pEnd,
- sal_uInt32 nOpening,
- sal_uInt32 nClosing,
- sal_Size & rLength,
- bool & rModify);
-
static const sal_Unicode * scanQuotedBlock(const sal_Unicode * pBegin,
const sal_Unicode * pEnd,
sal_uInt32 nOpening,
@@ -559,9 +511,6 @@ public:
static rtl_TextEncoding getCharsetEncoding(const sal_Char * pBegin,
const sal_Char * pEnd);
- static rtl_TextEncoding getCharsetEncoding(const sal_Unicode * pBegin,
- const sal_Unicode * pEnd);
-
static inline bool isMIMECharsetEncoding(rtl_TextEncoding eEncoding);
static INetMIMECharsetList_Impl *
@@ -594,9 +543,6 @@ public:
static void writeUnsigned(INetMIMEOutputSink & rSink, sal_uInt32 nValue,
int nMinDigits = 1);
- static void writeDateTime(INetMIMEOutputSink & rSink,
- const DateTime & rUTC);
-
static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
const UniString & rBody,
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 855285a..2e201cc 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -517,40 +517,6 @@ sal_uInt32 INetMIME::getHexDigit(int nWeight)
//============================================================================
// static
-sal_uInt32 INetMIME::getBase64Digit(int nWeight)
-{
- DBG_ASSERT(nWeight >= 0 && nWeight < 64,
- "INetMIME::getBase64Digit(): Bad weight");
-
- static const sal_Char aDigits[64]
- = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' };
- return aDigits[nWeight];
-}
-
-//============================================================================
-// static
-bool INetMIME::equalIgnoreCase(const sal_Char * pBegin1,
- const sal_Char * pEnd1,
- const sal_Char * pBegin2,
- const sal_Char * pEnd2)
-{
- DBG_ASSERT(pBegin1 && pBegin1 <= pEnd1 && pBegin2 && pBegin2 <= pEnd2,
- "INetMIME::equalIgnoreCase(): Bad sequences");
-
- if (pEnd1 - pBegin1 != pEnd2 - pBegin2)
- return false;
- while (pBegin1 != pEnd1)
- if (toUpperCase(*pBegin1++) != toUpperCase(*pBegin2++))
- return false;
- return true;
-}
-
-//============================================================================
-// static
bool INetMIME::equalIgnoreCase(const sal_Char * pBegin1,
const sal_Char * pEnd1,
const sal_Char * pString2)
@@ -583,35 +549,6 @@ bool INetMIME::equalIgnoreCase(const sal_Unicode * pBegin1,
//============================================================================
// static
-const sal_Char * INetMIME::skipLinearWhiteSpace(const sal_Char * pBegin,
- const sal_Char * pEnd)
-{
- DBG_ASSERT(pBegin && pBegin <= pEnd,
- "INetMIME::skipLinearWhiteSpace(): Bad sequence");
-
- while (pBegin != pEnd)
- switch (*pBegin)
- {
- case '\t':
- case ' ':
- ++pBegin;
- break;
-
- case 0x0D: // CR
- if (startsWithLineFolding(pBegin, pEnd))
- pBegin += 3;
- else
- return pBegin;
- break;
-
- default:
- return pBegin;
- }
- return pBegin;
-}
-
-//============================================================================
-// static
const sal_Unicode * INetMIME::skipLinearWhiteSpace(const sal_Unicode * pBegin,
const sal_Unicode * pEnd)
{
@@ -842,26 +779,6 @@ const sal_Unicode * INetMIME::skipQuotedString(const sal_Unicode * pBegin,
//============================================================================
// static
-const sal_Char * INetMIME::scanAtom(const sal_Char * pBegin,
- const sal_Char * pEnd)
-{
- while (pBegin != pEnd && isAtomChar(*pBegin))
- ++pBegin;
- return pBegin;
-}
-
-//============================================================================
-// static
-const sal_Unicode * INetMIME::scanAtom(const sal_Unicode * pBegin,
- const sal_Unicode * pEnd)
-{
- while (pBegin != pEnd && isAtomChar(*pBegin))
- ++pBegin;
- return pBegin;
-}
-
-//============================================================================
-// static
bool INetMIME::scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd,
bool bLeadingZeroes, sal_uInt32 & rValue)
{
@@ -909,127 +826,6 @@ bool INetMIME::scanUnsigned(const sal_Unicode *& rBegin,
//============================================================================
// static
-bool INetMIME::scanUnsignedHex(const sal_Char *& rBegin,
- const sal_Char * pEnd, bool bLeadingZeroes,
- sal_uInt32 & rValue)
-{
- sal_uInt64 nTheValue = 0;
- const sal_Char * p = rBegin;
- for ( p = rBegin; p != pEnd; ++p)
- {
- int nWeight = getHexWeight(*p);
- if (nWeight < 0)
- break;
- nTheValue = nTheValue << 4 | nWeight;
- if (nTheValue > std::numeric_limits< sal_uInt32 >::max())
- return false;
- }
- if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1)))
- return false;
- rBegin = p;
- rValue = sal_uInt32(nTheValue);
- return true;
-}
-
-//============================================================================
-// static
-bool INetMIME::scanUnsignedHex(const sal_Unicode *& rBegin,
- const sal_Unicode * pEnd, bool bLeadingZeroes,
- sal_uInt32 & rValue)
-{
- sal_uInt64 nTheValue = 0;
- const sal_Unicode * p = rBegin;
- for ( ; p != pEnd; ++p)
- {
- int nWeight = getHexWeight(*p);
- if (nWeight < 0)
- break;
- nTheValue = nTheValue << 4 | nWeight;
- if (nTheValue > std::numeric_limits< sal_uInt32 >::max())
- return false;
- }
- if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1)))
- return false;
- rBegin = p;
- rValue = sal_uInt32(nTheValue);
- return true;
-}
-
-//============================================================================
-// static
-const sal_Char * INetMIME::scanQuotedBlock(const sal_Char * pBegin,
- const sal_Char * pEnd,
- sal_uInt32 nOpening,
- sal_uInt32 nClosing,
- sal_Size & rLength,
- bool & rModify)
-{
- DBG_ASSERT(pBegin && pBegin <= pEnd,
- "INetMIME::scanQuotedBlock(): Bad sequence");
-
- if (pBegin != pEnd && static_cast< unsigned char >(*pBegin) == nOpening)
- {
- ++rLength;
- ++pBegin;
- while (pBegin != pEnd)
- if (static_cast< unsigned char >(*pBegin) == nClosing)
- {
- ++rLength;
- return ++pBegin;
- }
- else
- {
- sal_uInt32 c = *pBegin++;
- switch (c)
- {
- case 0x0D: // CR
- if (pBegin != pEnd && *pBegin == 0x0A) // LF
- if (pEnd - pBegin >= 2 && isWhiteSpace(pBegin[1]))
- {
- ++rLength;
- rModify = true;
- pBegin += 2;
- }
- else
- {
- rLength += 3;
- rModify = true;
- ++pBegin;
- }
- else
- ++rLength;
- break;
-
- case '\\':
- ++rLength;
- if (pBegin != pEnd)
- {
- if (startsWithLineBreak(pBegin, pEnd)
- && (pEnd - pBegin < 3
- || !isWhiteSpace(pBegin[2])))
- {
- rLength += 3;
- rModify = true;
- pBegin += 2;
- }
- else
- ++pBegin;
- }
- break;
-
- default:
- ++rLength;
- if (!isUSASCII(c))
- rModify = true;
- break;
- }
- }
- }
- return pBegin;
-}
-
-//============================================================================
-// static
const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin,
const sal_Unicode * pEnd,
sal_uInt32 nOpening,
@@ -1767,14 +1563,6 @@ rtl_TextEncoding INetMIME::getCharsetEncoding(sal_Char const * pBegin,
//============================================================================
// static
-rtl_TextEncoding INetMIME::getCharsetEncoding(sal_Unicode const * pBegin,
- sal_Unicode const * pEnd)
-{
- return getCharsetEncoding_Impl(pBegin, pEnd);
-}
-
-//============================================================================
-// static
INetMIMECharsetList_Impl *
INetMIME::createPreferredCharsetList(rtl_TextEncoding eEncoding)
{
@@ -2187,50 +1975,6 @@ void INetMIME::writeUnsigned(INetMIMEOutputSink & rSink, sal_uInt32 nValue,
//============================================================================
// static
-void INetMIME::writeDateTime(INetMIMEOutputSink & rSink,
- const DateTime & rUTC)
-{
- static const sal_Char aDay[7][3]
- = { { 'M', 'o', 'n' },
- { 'T', 'u', 'e' },
- { 'W', 'e', 'd' },
- { 'T', 'h', 'u' },
- { 'F', 'r', 'i' },
- { 'S', 'a', 't' },
- { 'S', 'u', 'n' } };
- const sal_Char * pTheDay = aDay[rUTC.GetDayOfWeek()];
- rSink.write(pTheDay, pTheDay + 3);
- rSink << ", ";
- writeUnsigned(rSink, rUTC.GetDay());
- rSink << ' ';
- static const sal_Char aMonth[12][3]
- = { { 'J', 'a', 'n' },
- { 'F', 'e', 'b' },
- { 'M', 'a', 'r' },
- { 'A', 'p', 'r' },
- { 'M', 'a', 'y' },
- { 'J', 'u', 'n' },
- { 'J', 'u', 'l' },
- { 'A', 'u', 'g' },
- { 'S', 'e', 'p' },
- { 'O', 'c', 't' },
- { 'N', 'o', 'v' },
- { 'D', 'e', 'c' } };
- const sal_Char * pTheMonth = aMonth[rUTC.GetMonth() - 1];
- rSink.write(pTheMonth, pTheMonth + 3);
- rSink << ' ';
- writeUnsigned(rSink, rUTC.GetYear());
- rSink << ' ';
- writeUnsigned(rSink, rUTC.GetHour(), 2);
- rSink << ':';
- writeUnsigned(rSink, rUTC.GetMin(), 2);
- rSink << ':';
- writeUnsigned(rSink, rUTC.GetSec(), 2);
- rSink << " +0000";
-}
-
-//============================================================================
-// static
void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
const UniString & rBody,
commit 3006c0556c19253b8d27b49260578d1c47b506fd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:34:42 2011 +0200
callcatcher: remove INetMessage::SetHeaderField
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index 60e0a8f..cf96dc9 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -209,12 +209,6 @@ public:
}
}
- sal_uIntPtr SetHeaderField (
- const UniString& rName,
- const UniString& rValue,
- sal_uIntPtr nIndex = ((sal_uIntPtr)-1)
- );
-
virtual sal_uIntPtr SetHeaderField (
const INetMessageHeader &rField,
sal_uIntPtr nIndex = ((sal_uIntPtr)-1)
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 8a390b3..aa6a003 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -125,20 +125,6 @@ void INetMessage::SetHeaderField_Impl (
* SetHeaderField.
*/
sal_uIntPtr INetMessage::SetHeaderField (
- const UniString& rName, const UniString& rValue, sal_uIntPtr nIndex)
-{
- sal_uIntPtr nResult = nIndex;
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_TEXT,
- ByteString (rName, RTL_TEXTENCODING_ASCII_US), rValue,
- nResult);
- return nResult;
-}
-
-/*
- * SetHeaderField.
- */
-sal_uIntPtr INetMessage::SetHeaderField (
const INetMessageHeader &rHeader, sal_uIntPtr nIndex)
{
sal_uIntPtr nResult = nIndex;
commit cc6a9357e341f988be7220759d08c73e4098f3d2
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:32:17 2011 +0200
callcatcher: cleanup INetMIMEMessage
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index cfdd781..60e0a8f 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -500,7 +500,6 @@ public:
return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DISPOSITION]);
}
- void SetContentID (const UniString& rID);
UniString GetContentID (void) const
{
return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_ID]);
@@ -547,8 +546,6 @@ public:
INetMessageContainerType eType = INETMSG_MULTIPART_MIXED);
sal_Bool AttachChild (
INetMIMEMessage& rChildMsg, sal_Bool bOwner = sal_True);
- sal_Bool DetachChild (
- sal_uIntPtr nIndex, INetMIMEMessage& rChildMsg) const;
/** Stream operators.
*/
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 235d6fd..8a390b3 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -1035,14 +1035,6 @@ void INetMIMEMessage::SetContentDisposition (const String& rDisposition)
m_nIndex[INETMSG_MIME_CONTENT_DISPOSITION]);
}
-void INetMIMEMessage::SetContentID (const String& rID)
-{
- SetHeaderField_Impl (
- INetMIME::HEADER_FIELD_TEXT,
- MIMEHDR(INETMSG_MIME_CONTENT_ID), rID,
- m_nIndex[INETMSG_MIME_CONTENT_ID]);
-}
-
void INetMIMEMessage::SetContentType (const String& rType)
{
SetHeaderField_Impl (
@@ -1182,199 +1174,6 @@ sal_Bool INetMIMEMessage::AttachChild (
}
/*
- * DetachChild.
- */
-sal_Bool INetMIMEMessage::DetachChild (
- sal_uIntPtr nIndex, INetMIMEMessage& rChildMsg) const
-{
- if (IsContainer())
- {
- // Check document stream.
- if (GetDocumentLB() == NULL) return sal_False;
- SvStream *pDocStrm = new SvStream (GetDocumentLB());
-
- // Initialize message buffer.
- char pMsgBuffer[1024];
- char *pMsgRead, *pMsgWrite;
- pMsgRead = pMsgWrite = pMsgBuffer;
-
- // Initialize message parser stream.
- INetMIMEMessageStream *pMsgStrm = NULL;
-
- // Check for "multipart/uvw" or "message/xyz".
- if (IsMultipart())
- {
- // Multipart message body. Initialize multipart delimiters.
- ByteString aDelim ("--");
- aDelim += GetMultipartBoundary();
- ByteString aClose = aDelim;
- aClose += "--";
-
- // Initialize line buffer.
- SvMemoryStream aLineBuf;
-
- // Initialize control variables.
- INetMessageStreamState eState = INETMSG_EOL_SCR;
- int nCurIndex = -1;
-
- // Go!
- while (nCurIndex < (int)(nIndex + 1))
- {
- if ((pMsgRead - pMsgWrite) > 0)
- {
- // Bytes still in buffer.
- if (eState == INETMSG_EOL_FCR)
- {
- // Check for 2nd line break character.
- if ((*pMsgWrite == '\r') || (*pMsgWrite == '\n'))
- aLineBuf << *pMsgWrite++;
-
- // Check current index.
- if (nCurIndex == (int)nIndex)
- {
- // Found requested part.
- if (pMsgStrm == NULL)
- {
- // Create message parser stream.
- pMsgStrm = new INetMIMEMessageStream;
- pMsgStrm->SetTargetMessage (&rChildMsg);
- }
-
- // Put message down-stream.
- int status = pMsgStrm->Write (
- (const sal_Char *) aLineBuf.GetData(), aLineBuf.Tell());
- if (status != INETSTREAM_STATUS_OK)
- {
- // Cleanup.
- delete pDocStrm;
- delete pMsgStrm;
-
- // Finish.
- return (!(status == INETSTREAM_STATUS_OK));
- }
- }
-
- // Reset to <Begin-of-Line>.
- aLineBuf.Seek (STREAM_SEEK_TO_BEGIN);
- eState = INETMSG_EOL_SCR;
- }
- else if ((*pMsgWrite == '\r') || (*pMsgWrite == '\n'))
- {
- /*
- * Found any line break character.
- * Compare buffered line with part/close delimiter.
- * Increment current part index upon match.
- */
- sal_uInt16 nLen = (sal_uInt16)(aLineBuf.Tell() & 0xffff);
- if (nLen == aDelim.Len())
- {
- if (aDelim.CompareTo ((const sal_Char *) aLineBuf.GetData(), nLen)
- == COMPARE_EQUAL) nCurIndex++;
- }
- else if (nLen == aClose.Len())
- {
- if (aClose.CompareTo ((const sal_Char *) aLineBuf.GetData(), nLen)
- == COMPARE_EQUAL) nCurIndex++;
- }
- aLineBuf << *pMsgWrite++;
- eState = INETMSG_EOL_FCR;
- }
- else
- {
- // Insert into line buffer.
- aLineBuf << *pMsgWrite;
- }
- }
- else
- {
- // Buffer empty. Reset to <Begin-of-Buffer>.
- pMsgRead = pMsgWrite = pMsgBuffer;
-
- // Read document stream.
- sal_uIntPtr nRead = pDocStrm->Read (
- pMsgBuffer, sizeof (pMsgBuffer));
- if (nRead > 0)
- {
- // Set read pointer.
- pMsgRead += nRead;
- }
- else
- {
- // Premature end.
- if (pMsgStrm)
- {
- // Assume end of requested part.
- nCurIndex++;
- }
- else
- {
- // Requested part not found.
- delete pDocStrm;
- return sal_False;
- }
- }
- }
- } // while (nCurIndex < (nIndex + 1))
- }
- else
- {
- // Encapsulated message body. Create message parser stream.
- pMsgStrm = new INetMIMEMessageStream;
- pMsgStrm->SetTargetMessage (&rChildMsg);
-
- // Initialize control variables.
- INetMessageStreamState eState = INETMSG_EOL_BEGIN;
-
- // Go.
- while (eState == INETMSG_EOL_BEGIN)
- {
- if ((pMsgRead - pMsgWrite) > 0)
- {
- // Bytes still in buffer. Put message down-stream.
- int status = pMsgStrm->Write (
- pMsgBuffer, (pMsgRead - pMsgWrite));
- if (status != INETSTREAM_STATUS_OK)
- {
- // Cleanup.
- delete pDocStrm;
- delete pMsgStrm;
-
- // Finish.
- return (!(status == INETSTREAM_STATUS_ERROR));
- }
- pMsgWrite = pMsgBuffer + (pMsgRead - pMsgWrite);
- }
- else
- {
- // Buffer empty. Reset to <Begin-of-Buffer>.
- pMsgRead = pMsgWrite = pMsgBuffer;
-
- // Read document stream.
- sal_uIntPtr nRead = pDocStrm->Read (
- pMsgBuffer, sizeof (pMsgBuffer));
- if (nRead > 0)
- {
- // Set read pointer.
- pMsgRead += nRead;
- }
- else
- {
- // Mark we're done.
- eState = INETMSG_EOL_DONE;
- }
- }
- } // while (eState == INETMSG_EOL_BEGIN)
- }
-
- // Done.
- if (pDocStrm) delete pDocStrm;
- if (pMsgStrm) delete pMsgStrm;
- return sal_True;
- }
- return sal_False;
-}
-
-/*
* operator<<
*/
SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const
commit 255694a2e9f3fc5b6a7bbc156e91c5f9a3a7b00b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:20:57 2011 +0200
callcatcher: cleanup INetIStream
diff --git a/tools/inc/tools/inetstrm.hxx b/tools/inc/tools/inetstrm.hxx
index aa66255..4d82c8d 100644
--- a/tools/inc/tools/inetstrm.hxx
+++ b/tools/inc/tools/inetstrm.hxx
@@ -68,9 +68,6 @@ public:
virtual ~INetIStream (void);
int Read (sal_Char *pData, sal_uIntPtr nSize);
-
- static void Decode64 (SvStream& rIn, SvStream& rOut);
- static void Encode64 (SvStream& rIn, SvStream& rOut);
};
/*
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index ff90411..7a04ea2 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -173,48 +173,6 @@ int INetIStream::Read (sal_Char *pData, sal_uIntPtr nSize)
return GetData (pData, nSize);
}
-/*
- * Decode64.
- */
-void INetIStream::Decode64 (SvStream& rIn, SvStream& rOut)
-{
- INetMessage aMsg;
- aMsg.SetDocumentLB(new SvAsyncLockBytes(&rOut, sal_False));
-
- INetMessageDecode64Stream_Impl aStream (8192);
- aStream.SetTargetMessage (&aMsg);
-
- sal_Char* pBuf = new sal_Char[8192];
-
- int nRead = 0;
- while ((nRead = rIn.Read (pBuf, 8192)) > 0)
- aStream.Write( pBuf, nRead );
- aStream.Write ("\r\n", 2);
-
- delete[] pBuf;
-}
-
-/*
- * Encode64.
- */
-void INetIStream::Encode64 (SvStream& rIn, SvStream& rOut)
-{
- INetMessage aMsg;
- aMsg.SetDocumentLB (
- new SvLockBytes (&rIn, sal_False));
-
- INetMessageEncode64Stream_Impl aStream (8192);
- aStream.SetSourceMessage (&aMsg);
-
- sal_Char* pBuf = new sal_Char[8192];
-
- int nRead = 0;
- while ((nRead = aStream.Read (pBuf, 8192)) > 0)
- rOut.Write( pBuf, nRead );
-
- delete[] pBuf;
-}
-
/*=========================================================================
*
* INetOStream Implementation.
commit cecc8220272afed26d1d5cf60c7742c7e2f8cc88
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:18:19 2011 +0200
callcatcher: remove INetContentTypes::Foo
diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index 8fb25d4..9c2b81c 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -352,8 +352,6 @@ enum INetContentType
class SVL_DLLPUBLIC INetContentTypes
{
public:
- static void Uninitialize();
-
static INetContentType RegisterContentType(UniString const & rTypeName,
UniString const &
rPresentation,
@@ -369,8 +367,6 @@ public:
static UniString GetPresentation(INetContentType eTypeID,
const ::com::sun::star::lang::Locale& aLocale);
- static UniString GetExtension(UniString const & rTypeName);
-
static INetContentType GetContentType4Extension(UniString const &
rExtension);
@@ -379,9 +375,6 @@ public:
static bool GetExtensionFromURL(UniString const & rURL,
UniString & rExtension);
- static INetContentType MapStringToContentType(UniString const &
- rPresentation);
-
/** Parse the body of an RFC 2045 Content-Type header field.
@param rMediaType The body of the Content-Type header field. It must
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 444a3a7..7dea8a2 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -116,8 +116,6 @@ public:
static UniString GetPresentation(INetContentType eTypeID);
- static UniString GetExtension(const UniString & rTypeName);
-
static INetContentType GetContentType4Extension(UniString const &
rExtension);
@@ -768,24 +766,6 @@ UniString Registration::GetPresentation(INetContentType eTypeID)
//============================================================================
// static
-UniString Registration::GetExtension(UniString const & rTypeName)
-{
- if (!m_pRegistration)
- m_pRegistration = new Registration;
-
- UniString aTheTypeName = rTypeName;
- aTheTypeName.ToLowerAscii();
- sal_uInt16 nPos;
- return m_pRegistration->m_aTypeNameMap.Seek_Entry(&aTheTypeName, &nPos) ?
- static_cast< TypeNameMapEntry * >(m_pRegistration->
- m_aTypeNameMap.
- GetObject(nPos))->
- m_aExtension :
- UniString();
-}
-
-//============================================================================
-// static
INetContentType Registration::GetContentType4Extension(UniString const &
rExtension)
{
@@ -854,12 +834,6 @@ MediaTypeEntry const * seekEntry(UniString const & rTypeName,
//
//============================================================================
-//static
-void INetContentTypes::Uninitialize()
-{
- Registration::deinitialize();
-}
-
//============================================================================
//static
INetContentType INetContentTypes::RegisterContentType(UniString const &
@@ -1136,18 +1110,6 @@ bool INetContentTypes::GetExtensionFromURL(UniString const & rURL,
}
//============================================================================
-//static
-INetContentType INetContentTypes::MapStringToContentType(UniString const &
- rPresentation)
-{
- MediaTypeEntry const * pEntry = seekEntry(rPresentation,
- aStaticPresentationMap,
- sizeof aStaticPresentationMap
- / sizeof (MediaTypeEntry));
- return pEntry ? pEntry->m_eTypeID : CONTENT_TYPE_UNKNOWN;
-}
-
-//============================================================================
// static
bool INetContentTypes::parse(UniString const & rMediaType,
UniString & rType, UniString & rSubType,
commit 7d1f3b19bd11fae69438322b259e94ae0688f241
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:14:43 2011 +0200
callcatcher: remove PrinterSetupDialog::GetOptionsHdl
diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx
index 2e33932..435c021 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/svtools/inc/svtools/prnsetup.hxx
@@ -90,7 +90,6 @@ public:
virtual short Execute();
void SetOptionsHdl( const Link& rLink );
- const Link& GetOptionsHdl() const;
};
// --------------------------------------
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 098b17a..9a95f16 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -281,11 +281,6 @@ void PrinterSetupDialog::SetOptionsHdl( const Link& rLink )
maBtnOptions.Show( rLink.IsSet() );
}
-const Link& PrinterSetupDialog::GetOptionsHdl() const
-{
- return maBtnOptions.GetClickHdl();
-}
-
void PrinterSetupDialog::ImplSetInfo()
{
const QueueInfo* pInfo = Printer::GetQueueInfo(maLbName.GetSelectEntry(), true);
commit 7638ff014bc23d1625cb4eab6cf723663f7cb48a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:13:25 2011 +0200
callcatcher: remove Printer::Foo
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 055bfe7..a04fd3f 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -272,7 +272,6 @@ private:
static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError );
private:
- SAL_DLLPRIVATE void ImplEndPrint();
SAL_DLLPRIVATE sal_Bool EndJob();
SAL_DLLPRIVATE Printer( const Printer& rPrinter );
SAL_DLLPRIVATE Printer& operator =( const Printer& rPrinter );
@@ -281,7 +280,6 @@ public:
SAL_DLLPRIVATE void ImplEndPage();
public:
void DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient );
- void DrawGradientEx( OutputDevice* pOut, const PolyPolygon& rPolyPoly, const Gradient& rGradient );
protected:
@@ -290,7 +288,6 @@ protected:
public:
Printer();
- Printer( const Window* pWindow );
Printer( const JobSetup& rJobSetup );
Printer( const QueueInfo& rQueueInfo );
Printer( const XubString& rPrinterName );
@@ -329,7 +326,6 @@ public:
sal_Bool SetOrientation( Orientation eOrient );
Orientation GetOrientation() const;
- DuplexMode GetDuplexMode() const;
sal_Bool SetDuplexMode( DuplexMode );
// returns the angle that a landscape page will be turned counterclockwise
// wrt to portrait. The return value may be only valid for
@@ -363,7 +359,6 @@ public:
sal_Bool IsPrinting() const { return mbPrinting; }
- sal_Bool AbortJob();
const XubString& GetCurJobName() const { return maJobName; }
sal_uInt16 GetCurPage() const { return mnCurPage; }
sal_Bool IsJobActive() const { return mbJobActive; }
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index bb4412f..dcb55ef 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -667,14 +667,6 @@ Printer::Printer()
// -----------------------------------------------------------------------
-Printer::Printer( const Window* pWindow )
-{
- ImplInitData();
- ImplInitDisplay( pWindow );
-}
-
-// -----------------------------------------------------------------------
-
Printer::Printer( const JobSetup& rJobSetup ) :
maJobSetup( rJobSetup )
{
@@ -1336,13 +1328,6 @@ const PaperInfo& Printer::GetPaperInfo( int nPaper ) const
// -----------------------------------------------------------------------
-DuplexMode Printer::GetDuplexMode() const
-{
- return maJobSetup.ImplGetConstData()->meDuplexMode;
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool Printer::SetDuplexMode( DuplexMode eDuplex )
{
if ( mbInPrintPage )
@@ -1455,15 +1440,6 @@ sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError )
// -----------------------------------------------------------------------
-void Printer::ImplEndPrint()
-{
- mbPrinting = sal_False;
- mnCurPrintPage = 0;
- maJobName.Erase();
-}
-
-// -----------------------------------------------------------------------
-
IMPL_LINK( Printer, ImplDestroyPrinterAsync, void*, pSalPrinter )
{
SalPrinter* pPrinter = (SalPrinter*)pSalPrinter;
@@ -1510,38 +1486,6 @@ sal_Bool Printer::EndJob()
// -----------------------------------------------------------------------
-sal_Bool Printer::AbortJob()
-{
- // Wenn wir einen Queue-Printer haben, kann man diesen noch mit
- // AbortJob() abbrechen, solange dieser noch am Drucken ist
- if ( !IsJobActive() && !IsPrinting() )
- return sal_False;
-
- mbJobActive = sal_False;
- mbInPrintPage = sal_False;
- mpJobGraphics = NULL;
-
- if ( mpPrinter )
- {
- mbPrinting = sal_False;
- mnCurPage = 0;
- mnCurPrintPage = 0;
- maJobName.Erase();
-
- ImplReleaseGraphics();
- mbDevOutput = sal_False;
- mpPrinter->AbortJob();
- Application::PostUserEvent( LINK( this, Printer, ImplDestroyPrinterAsync ), mpPrinter );
- mpPrinter = NULL;
-
- return sal_True;
- }
-
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void Printer::ImplStartPage()
{
if ( !IsJobActive() )
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 40831e9..655cc63 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1579,47 +1579,4 @@ void Printer::DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const
pOut->DrawGradient( rRect, rGradient );
}
-// -----------------------------------------------------------------------------
-
-void Printer::DrawGradientEx( OutputDevice* pOut, const PolyPolygon& rPolyPoly, const Gradient& rGradient )
-{
- const PrinterOptions& rPrinterOptions = GetPrinterOptions();
-
- if( rPrinterOptions.IsReduceGradients() )
- {
- if( PRINTER_GRADIENT_STRIPES == rPrinterOptions.GetReducedGradientMode() )
- {
- if( !rGradient.GetSteps() || ( rGradient.GetSteps() > rPrinterOptions.GetReducedGradientStepCount() ) )
- {
- Gradient aNewGradient( rGradient );
-
- aNewGradient.SetSteps( rPrinterOptions.GetReducedGradientStepCount() );
- pOut->DrawGradient( rPolyPoly, aNewGradient );
- }
- else
- pOut->DrawGradient( rPolyPoly, rGradient );
- }
- else
- {
- const Color& rStartColor = rGradient.GetStartColor();
- const Color& rEndColor = rGradient.GetEndColor();
- const long nR = ( ( (long) rStartColor.GetRed() * rGradient.GetStartIntensity() ) / 100L +
- ( (long) rEndColor.GetRed() * rGradient.GetEndIntensity() ) / 100L ) >> 1;
- const long nG = ( ( (long) rStartColor.GetGreen() * rGradient.GetStartIntensity() ) / 100L +
- ( (long) rEndColor.GetGreen() * rGradient.GetEndIntensity() ) / 100L ) >> 1;
- const long nB = ( ( (long) rStartColor.GetBlue() * rGradient.GetStartIntensity() ) / 100L +
- ( (long) rEndColor.GetBlue() * rGradient.GetEndIntensity() ) / 100L ) >> 1;
- const Color aColor( (sal_uInt8) nR, (sal_uInt8) nG, (sal_uInt8) nB );
-
- pOut->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
- pOut->SetLineColor( aColor );
- pOut->SetFillColor( aColor );
- pOut->DrawPolyPolygon( rPolyPoly );
- pOut->Pop();
- }
- }
- else
- pOut->DrawGradient( rPolyPoly, rGradient );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9bf3a347ec8e123252cc16cbe46bdf5ab15ab5eb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 22:05:08 2011 +0200
callcatcher: remove Wallpaper::Foo
diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx
index 362b5b8..94e09a8 100644
--- a/vcl/inc/vcl/wall.hxx
+++ b/vcl/inc/vcl/wall.hxx
@@ -112,17 +112,14 @@ public:
WallpaperStyle GetStyle() const;
void SetBitmap( const BitmapEx& rBitmap );
- void SetBitmap();
BitmapEx GetBitmap() const;
sal_Bool IsBitmap() const;
void SetGradient( const Gradient& rGradient );
- void SetGradient();
Gradient GetGradient() const;
sal_Bool IsGradient() const;
void SetRect( const Rectangle& rRect );
- void SetRect();
Rectangle GetRect() const;
sal_Bool IsRect() const;
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 5732f80..06fcc37 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -366,20 +366,6 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap )
// -----------------------------------------------------------------------
-void Wallpaper::SetBitmap()
-{
- DBG_CHKTHIS( Wallpaper, NULL );
-
- if ( mpImplWallpaper->mpBitmap )
- {
- ImplMakeUnique();
- delete mpImplWallpaper->mpBitmap;
- mpImplWallpaper->mpBitmap = NULL;
- }
-}
-
-// -----------------------------------------------------------------------
-
BitmapEx Wallpaper::GetBitmap() const
{
DBG_CHKTHIS( Wallpaper, NULL );
@@ -422,20 +408,6 @@ void Wallpaper::SetGradient( const Gradient& rGradient )
// -----------------------------------------------------------------------
-void Wallpaper::SetGradient()
-{
- DBG_CHKTHIS( Wallpaper, NULL );
-
- if ( mpImplWallpaper->mpGradient )
- {
- ImplMakeUnique();
- delete mpImplWallpaper->mpGradient;
- mpImplWallpaper->mpGradient = NULL;
- }
-}
-
-// -----------------------------------------------------------------------
-
Gradient Wallpaper::GetGradient() const
{
DBG_CHKTHIS( Wallpaper, NULL );
@@ -504,20 +476,6 @@ void Wallpaper::SetRect( const Rectangle& rRect )
// -----------------------------------------------------------------------
-void Wallpaper::SetRect()
-{
- DBG_CHKTHIS( Wallpaper, NULL );
-
- if ( mpImplWallpaper->mpRect )
- {
- ImplMakeUnique( sal_False );
- delete mpImplWallpaper->mpRect;
- mpImplWallpaper->mpRect = NULL;
- }
-}
-
-// -----------------------------------------------------------------------
-
Rectangle Wallpaper::GetRect() const
{
DBG_CHKTHIS( Wallpaper, NULL );
commit e1309004099d1a1c0a9bc1ba6de9e5054629da3c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 21:46:17 2011 +0200
callcatcher: build fixes
- remove the correct SetUpdateMode()
- Clone() always returns NULL
- SetFont() doesn't do anything
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index 46e7e0b..59fb1ab 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -196,7 +196,6 @@ protected:
void FormatAndUpdate( TextView* pCurView = 0 );
sal_Bool IsFormatting() const { return mbIsFormatting; }
void UpdateViews( TextView* pCurView = 0 );
- void SetUpdateMode( sal_Bool bUp, TextView* pCurView, sal_Bool bForceUpdate );
void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 );
@@ -250,6 +249,7 @@ public:
void SetLeftMargin( sal_uInt16 n );
sal_uInt16 GetLeftMargin() const;
+ void SetUpdateMode( sal_Bool bUpdate );
sal_Bool GetUpdateMode() const { return mbUpdate; }
sal_uInt16 GetViewCount() const;
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index 83500ba..45be149 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -54,14 +54,14 @@ int SAL_CALL CompareStart( const void* pFirst, const void* pSecond )
// -------------------------------------------------------------------------
TextCharAttrib::TextCharAttrib( const TextAttrib& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd )
{
- mpAttr = rAttr.Clone();
+ mpAttr = NULL;
mnStart = nStart,
mnEnd = nEnd;
}
TextCharAttrib::TextCharAttrib( const TextCharAttrib& rTextCharAttrib )
{
- mpAttr = rTextCharAttrib.GetAttr().Clone();
+ mpAttr = NULL;
mnStart = rTextCharAttrib.mnStart;
mnEnd = rTextCharAttrib.mnEnd;
}
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 2cba373..26bc88c 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -339,6 +339,20 @@ sal_uInt16 TextEngine::GetTextLen( sal_uLong nPara ) const
return mpDoc->GetNodes().GetObject( nPara )->GetText().Len();
}
+void TextEngine::SetUpdateMode( sal_Bool bUpdate )
+{
+ if ( bUpdate != mbUpdate )
+ {
+ mbUpdate = bUpdate;
+ if ( mbUpdate )
+ {
+ FormatAndUpdate( GetActiveView() );
+ if ( GetActiveView() )
+ GetActiveView()->ShowCursor();
+ }
+ }
+}
+
sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
{
sal_Bool bDoesChange = sal_False;
@@ -1466,11 +1480,7 @@ void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, Outp
if ( ( ( pAttrib->GetStart() < nPos ) && ( pAttrib->GetEnd() >= nPos ) )
|| !pNode->GetText().Len() )
{
- if ( pAttrib->Which() != TEXTATTR_FONTCOLOR )
- {
- pAttrib->GetAttr().SetFont( rFont );
- }
- else
+ if ( pAttrib->Which() == TEXTATTR_FONTCOLOR )
{
if ( pOutDev )
pOutDev->SetTextColor( ((TextAttribFontColor&)pAttrib->GetAttr()).GetColor() );
@@ -1510,15 +1520,6 @@ void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, Outp
}
}
-void TextEngine::SetUpdateMode( sal_Bool bUp, TextView* pCurView, sal_Bool bForceUpdate )
-{
- sal_Bool bChanged = ( GetUpdateMode() != bUp );
-
- mbUpdate = bUp;
- if ( mbUpdate && ( bChanged || bForceUpdate ) )
- FormatAndUpdate( pCurView );
-}
-
void TextEngine::FormatAndUpdate( TextView* pCurView )
{
if ( mbDowning )
commit 16e8278c22180d40ab7f8b831a12db986ed5c1fc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 21:13:08 2011 +0200
callcatcher: bring ImplTBDragMgr members back and remove EndCustomizeMode
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ff4581c..7907b45 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -195,6 +195,8 @@ public:
DECL_LINK( SelectHdl, Accelerator* );
void StartCustomizeMode();
+ void EndCustomizeMode();
+ sal_Bool IsCustomizeMode() { return mbCustomizeMode; }
sal_Bool IsResizeMode() { return mbResizeMode; }
};
@@ -5481,14 +5483,6 @@ void ToolBox::EnableCustomize( sal_Bool bEnable )
// -----------------------------------------------------------------------
-void ToolBox::EndCustomizeMode()
-{
- ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
- pMgr->EndCustomizeMode();
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::GetFocus()
{
DockingWindow::GetFocus();
commit e33b65a42c2022988f2972e8f4d39dda22f86d34
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 14:27:16 2011 +0200
callcatcher: remove Type1Emitter::Type1Emitter
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 150acc7..6f0d77f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1868,7 +1868,6 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
class Type1Emitter
{
public:
- explicit Type1Emitter( const char* pOutFileName, bool bPfbSubset = true);
explicit Type1Emitter( FILE* pOutFile, bool bPfbSubset = true);
/*virtual*/ ~Type1Emitter( void);
void setSubsetName( const char* );
@@ -1895,20 +1894,6 @@ public:
// --------------------------------------------------------------------
-Type1Emitter::Type1Emitter( const char* pPfbFileName, bool bPfbSubset)
-: mpFileOut( NULL)
-, mbCloseOutfile( true)
-, mnEECryptR( 55665) // default eexec seed, TODO: mnEECryptSeed
-, mpPtr( maBuffer)
-, mbPfbSubset( bPfbSubset)
-, mnHexLineCol( 0)
-{
- mpFileOut = fopen( pPfbFileName, "wb");
- maSubsetName[0] = '\0';
-}
-
-// --------------------------------------------------------------------
-
Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
: mpFileOut( pOutFile)
, mbCloseOutfile( false)
commit ac97e9337237155a838ecd38cb09c5bad6b53c3c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 14:25:48 2011 +0200
callcatcher: remove TransferableHelper::Foo
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 4657eb5..c2e82ea 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -267,10 +267,7 @@ protected:
sal_Bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- sal_Bool SetFileList( const FileList& rFileList, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- sal_Bool SetInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf,
- const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
protected:
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index b4224f2..b69a264 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -975,22 +975,6 @@ sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg,
// -----------------------------------------------------------------------------
-sal_Bool TransferableHelper::SetFileList( const FileList& rFileList,
- const ::com::sun::star::datatransfer::DataFlavor& )
-{
- SvMemoryStream aMemStm( 4096, 4096 );
-
- aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
- aMemStm << rFileList;
-
- maAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ),
- aMemStm.Seek( STREAM_SEEK_TO_END ) );
-
- return( maAny.hasValue() );
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const DataFlavor& rFlavor )
{
SotStorageStreamRef xStm( new SotStorageStream( String() ) );
@@ -1022,15 +1006,6 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec
// -----------------------------------------------------------------------------
-sal_Bool TransferableHelper::SetInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf,
- const ::com::sun::star::datatransfer::DataFlavor& )
-{
- maAny <<= rIf;
- return( maAny.hasValue() );
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& )
{
OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" );
commit ff7712d8520431686347593f8cf2999e0844d30d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 14:24:29 2011 +0200
callcatcher: remove TransferableDataHelper::GetInterface
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index c1bf885..4657eb5 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -398,7 +398,6 @@ public:
sal_Bool GetInputStream( SotFormatStringId nFormat, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream );
sal_Bool GetInputStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream );
- sal_Bool GetInterface( SotFormatStringId nFormat, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf );
sal_Bool GetInterface( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf );
public:
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 4cd42d0..b4224f2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2214,15 +2214,6 @@ sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Refe
// -----------------------------------------------------------------------------
-
-sal_Bool TransferableDataHelper::GetInterface( SotFormatStringId nFormat, Reference< XInterface >& rIf )
-{
- DataFlavor aFlavor;
- return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetInterface( aFlavor, rIf ) );
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool TransferableDataHelper::GetInterface( const DataFlavor& rFlavor, Reference< XInterface >& rIf )
{
const Any aAny( GetAny( rFlavor ) );
commit e18c974be0d593e5d0d1518d71cef3993ede9f98
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 14:21:43 2011 +0200
callcatcher: remove TransferDataContainer::ClearData
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 3f4e2ff..c1bf885 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -565,8 +565,6 @@ public:
TransferDataContainer();
~TransferDataContainer();
- void ClearData();
-
void CopyINetBookmark( const INetBookmark& rBkmk );
void CopyINetImage( const INetImage& rINtImg );
void CopyImageMap( const ImageMap& rImgMap );
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 43c98b4..192fd70 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -475,15 +475,6 @@ sal_Bool TransferDataContainer::GetData( const
// -----------------------------------------------------------------------------
-void TransferDataContainer::ClearData()
-{
- delete pImpl;
- pImpl = new TransferDataContainer_Impl;
- ClearFormats();
-}
-
-// -----------------------------------------------------------------------------
-
void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk )
{
if( !pImpl->pBookmk )
commit ca4fb0c702728b7a490d51df42c1c10f7d497f83
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 14:20:14 2011 +0200
callcatcher: ToolBox cleanup
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index 915ef18..b68792a 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -274,7 +274,6 @@ private:
SAL_DLLPRIVATE sal_Bool ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle = sal_False );
SAL_DLLPRIVATE sal_uInt16 ImplGetItemLine( ImplToolItem* pCurrentItem );
SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( sal_uInt16 nLine );
- SAL_DLLPRIVATE ImplToolItem* ImplGetLastValidItem( sal_uInt16 nLine );
SAL_DLLPRIVATE sal_Bool ImplOpenItem( KeyCode aKeyCode );
SAL_DLLPRIVATE sal_Bool ImplActivateItem( KeyCode aKeyCode );
SAL_DLLPRIVATE void ImplShowFocus();
@@ -332,9 +331,6 @@ public:
static SAL_DLLPRIVATE void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack, sal_Bool bColTransform,
sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False,
long nSize = 6 );
- static SAL_DLLPRIVATE void SetToolArrowClipregion( ToolBox* pBox, long nX, long nY,
- sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False,
- long nSize = 6 );
static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight );
static SAL_DLLPRIVATE sal_uInt16 ImplCountLineBreaks( const ToolBox *pThis );
SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; }
@@ -401,12 +397,9 @@ public:
sal_uInt16 nPixSize = 0 );
void InsertBreak( sal_uInt16 nPos = TOOLBOX_APPEND );
void RemoveItem( sal_uInt16 nPos );
- void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos = TOOLBOX_APPEND );
void CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
sal_uInt16 nNewPos = TOOLBOX_APPEND );
- void CopyItems( const ToolBox& rToolBox );
void Clear();
- void RecalcItems();
const ImageList& GetImageList() const { return maImageList; }
void SetImageList( const ImageList& rImageList );
@@ -429,7 +422,6 @@ public:
// Used to enable/disable scrolling one page at a time for toolbar
void SetPageScroll( sal_Bool b );
- sal_Bool GetPageScroll();
void SetNextToolBox( const XubString& rStr );
const XubString& GetNextToolBox() const { return maNextToolBoxStr; }
@@ -442,14 +434,12 @@ public:
sal_uInt16 GetItemId( const Point& rPos ) const;
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
Rectangle GetItemPosRect( sal_uInt16 nPos ) const;
- Rectangle GetItemDropDownRect( sal_uInt16 nItemId ) const;
Rectangle GetItemPosDropDownRect( sal_uInt16 nPos ) const;
// retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown)
Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const;
Rectangle GetScrollRect() const;
- Rectangle GetMenubuttonRect() const;
sal_uInt16 GetCurItemId() const { return mnCurItemId; }
sal_uInt16 GetDownItemId() const { return mnDownItemId; }
sal_uInt16 GetClicks() const { return mnMouseClicks; }
@@ -464,11 +454,7 @@ public:
void SetItemImage( sal_uInt16 nItemId, const Image& rImage );
Image GetItemImage( sal_uInt16 nItemId ) const;
void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 );
- long GetItemImageAngle( sal_uInt16 nItemId ) const;
void SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror );
- sal_Bool GetItemImageMirrorMode( sal_uInt16 ) const;
- void SetItemHighImage( sal_uInt16 nItemId, const Image& rImage );
- Image GetItemHighImage( sal_uInt16 nItemId ) const;
void SetItemText( sal_uInt16 nItemId, const XubString& rText );
const XubString& GetItemText( sal_uInt16 nItemId ) const;
void SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow );
@@ -479,7 +465,6 @@ public:
void EndSelection();
void SetItemDown( sal_uInt16 nItemId, sal_Bool bDown, sal_Bool bRelease = sal_True );
- sal_Bool IsItemDown( sal_uInt16 nItemId ) const;
void SetItemState( sal_uInt16 nItemId, TriState eState );
TriState GetItemState( sal_uInt16 nItemId ) const;
@@ -552,14 +537,8 @@ public:
void EnableCustomize( sal_Bool bEnable = sal_True );
sal_Bool IsCustomize() { return mbCustomize; }
- void StartCustomize( const Rectangle& rRect, void* pData = NULL );
- void SetCustomizeMode( sal_Bool );
sal_Bool IsInCustomizeMode() const { return mbCustomizeMode; }
- static void StartCustomizeMode();
- static void EndCustomizeMode();
- static sal_Bool IsCustomizeMode();
-
void SetHelpText( const XubString& rText )
{ DockingWindow::SetHelpText( rText ); }
const XubString& GetHelpText() const
@@ -600,7 +579,6 @@ public:
PopupMenu* GetMenu() const;
void UpdateCustomMenu();
void SetMenuButtonHdl( const Link& rLink );
- const Link& GetMenuButtonHdl() const;
// open custommenu
void ExecuteCustomMenu();
@@ -625,13 +603,6 @@ public:
// -1 is returned if no character is at that point
// if an index is found the corresponding item id is filled in (else 0)
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const;
- // returns the number of portions in the result of GetDisplayText()
- long GetTextCount() const;
- // returns the interval [start,end] of text portion nText
- // returns [-1,-1] for an invalid text number
- Pair GetTextStartEnd( long nText ) const;
- // returns the item id for text portion nText or 0 if nText is invalid
- sal_uInt16 GetDisplayItemId( long nText ) const;
const Size& GetDefaultImageSize() const;
void ChangeHighlight( sal_uInt16 nPos );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index f7b4cb5..ff4581c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -195,8 +195,6 @@ public:
DECL_LINK( SelectHdl, Accelerator* );
void StartCustomizeMode();
- void EndCustomizeMode();
- sal_Bool IsCustomizeMode() { return mbCustomizeMode; }
sal_Bool IsResizeMode() { return mbResizeMode; }
};
@@ -3178,60 +3176,6 @@ void ToolBox::ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlac
}
}
-void ToolBox::SetToolArrowClipregion( ToolBox* pBox, long nX, long nY,
- sal_Bool bLeft, sal_Bool bTop, long nSize )
-{
- WindowAlign eAlign = pBox->meAlign;
- long nHalfSize;
- if ( bLeft )
- eAlign = WINDOWALIGN_RIGHT;
- else if ( bTop )
- eAlign = WINDOWALIGN_BOTTOM;
-
- nHalfSize = nSize/2;
-
- Point p[6];
-
- switch ( eAlign )
- {
- case WINDOWALIGN_LEFT:
- p[0].X() = nX-1; p[0].Y() = nY-1;
- p[1].X() = nX-1; p[1].Y() = nY+nSize+1;
- p[2].X() = nX+1; p[2].Y() = nY+nSize+1;
- p[3].X() = nX+nHalfSize+1; p[3].Y() = nY+nHalfSize+1;
- p[4].X() = nX+nHalfSize+1; p[4].Y() = nY+nHalfSize-1;
- p[5].X() = nX+1; p[5].Y() = nY-1;
- break;
- case WINDOWALIGN_TOP:
- p[0].X() = nX-1; p[0].Y() = nY-1;
- p[1].X() = nX-1; p[1].Y() = nY+1;
- p[2].X() = nX+nHalfSize-1; p[2].Y() = nY+nHalfSize+1;
- p[3].X() = nX+nHalfSize+1; p[3].Y() = nY+nHalfSize+1;
- p[4].X() = nX+nSize+1; p[4].Y() = nY+1;
- p[5].X() = nX+nSize+1; p[5].Y() = nY-1;
- break;
- case WINDOWALIGN_RIGHT:
- p[0].X() = nX+nHalfSize-1; p[0].Y() = nY-1;
- p[1].X() = nX-1; p[1].Y() = nY+nHalfSize-1;
- p[2].X() = nX-1; p[2].Y() = nY+nHalfSize+1;
- p[3].X() = nX+nHalfSize-1; p[3].Y() = nY+nSize+1;
- p[4].X() = nX+nHalfSize+1; p[4].Y() = nY+nSize+1;
- p[5].X() = nX+nHalfSize+1; p[5].Y() = nY-1;
- break;
- case WINDOWALIGN_BOTTOM:
- p[0].X() = nX-1; p[0].Y() = nY+nHalfSize-1;
- p[1].X() = nX-1; p[1].Y() = nY+nHalfSize+1;
- p[2].X() = nX+nSize+1; p[2].Y() = nY+nHalfSize+1;
- p[3].X() = nX+nSize+1; p[3].Y() = nY+nHalfSize-1;
- p[4].X() = nX+nHalfSize+1; p[4].Y() = nY-1;
- p[5].X() = nX+nHalfSize-1; p[5].Y() = nY-1;
- break;
- }
- Polygon aPoly(6,p);
- Region aRgn( aPoly );
- pBox->SetClipRegion( aRgn );
-}
-
// -----------------------------------------------------------------------
void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight )
@@ -3868,14 +3812,6 @@ void ToolBox::ImplStartCustomizeMode()
}
}
-void ToolBox::SetCustomizeMode( sal_Bool bSet )
-{
- if ( bSet )
- ImplStartCustomizeMode();
- else
- ImplEndCustomizeMode();
-}
-
// -----------------------------------------------------------------------
void ToolBox::ImplEndCustomizeMode()
@@ -5545,33 +5481,6 @@ void ToolBox::EnableCustomize( sal_Bool bEnable )
// -----------------------------------------------------------------------
-void ToolBox::StartCustomize( const Rectangle& rRect, void* pData )
-{
- DBG_ASSERT( mbCustomize,
- "ToolBox::StartCustomize(): ToolBox must be customized" );
-
- ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
- Point aMousePos = GetPointerPosPixel();
- Point aPos = ScreenToOutputPixel( rRect.TopLeft() );
- Rectangle aRect( aPos.X(), aPos.Y(),
- aPos.X()+rRect.GetWidth()+SMALLBUTTON_HSIZE,
- aPos.Y()+rRect.GetHeight()+SMALLBUTTON_VSIZE );
- aMousePos = ScreenToOutputPixel( aPos );
- Pointer aPtr;
- SetPointer( aPtr );
- pMgr->StartDragging( this, aMousePos, aRect, 0, sal_False, pData );
-}
-
-// -----------------------------------------------------------------------
-
-void ToolBox::StartCustomizeMode()
-{
- ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
- pMgr->StartCustomizeMode();
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::EndCustomizeMode()
{
ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
@@ -5580,14 +5489,6 @@ void ToolBox::EndCustomizeMode()
// -----------------------------------------------------------------------
-sal_Bool ToolBox::IsCustomizeMode()
-{
- ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
- return pMgr->IsCustomizeMode();
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::GetFocus()
{
DockingWindow::GetFocus();
@@ -5985,39 +5886,6 @@ ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine )
return (it == mpData->m_aItems.end()) ? NULL : &(*it);
}
-// returns the last displayable item in the given line
-ImplToolItem* ToolBox::ImplGetLastValidItem( sal_uInt16 nLine )
-{
- if( !nLine || nLine > mnCurLines )
- return NULL;
-
- nLine--;
- ImplToolItem *pFound = NULL;
- std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
- while( it != mpData->m_aItems.end() )
- {
- // find correct line
- if ( it->mbBreak )
- nLine--;
- if( !nLine )
- {
- // find last useful item
- while( it != mpData->m_aItems.end() && ((it->meType == TOOLBOXITEM_BUTTON) &&
- /*it->mbEnabled &&*/ it->mbVisible && !ImplIsFixedControl( &(*it) )) )
- {
- pFound = &(*it);
- ++it;
- if( it == mpData->m_aItems.end() || it->mbBreak )
- return pFound; // end of line: return last useful item
- }
- return pFound;
- }
- ++it;
- }
-
- return pFound;
-}
-
// -----------------------------------------------------------------------
sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList )
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c06056b..55a22ed 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -828,41 +828,6 @@ void ToolBox::RemoveItem( sal_uInt16 nPos )
// -----------------------------------------------------------------------
-void ToolBox::MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos )
-{
- sal_uInt16 nPos = GetItemPos( nItemId );
-
- if ( nPos == nNewPos )
- return;
-
- if ( nPos < nNewPos )
- nNewPos--;
-
- // Existiert Item
- if ( nPos != TOOLBOX_ITEM_NOTFOUND )
- {
- // ToolBox-Item in der Liste verschieben
- ImplToolItem aItem = mpData->m_aItems[nPos];
- mpData->m_aItems.erase( mpData->m_aItems.begin()+nPos );
- mpData->m_aItems.insert( (nNewPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nNewPos : mpData->m_aItems.end(), aItem );
- mpData->ImplClearLayoutData();
-
- // ToolBox neu ausgeben
- ImplInvalidate( sal_False );
-
- // Notify
- if( nPos < nNewPos ) // only send one event, all indices above this item are invalid anyway
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMREMOVED, reinterpret_cast< void* >( nPos ) );
- else
- {
- sal_uInt16 nNewPos2 = sal::static_int_cast<sal_uInt16>(( nNewPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nNewPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos2 ) );
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
sal_uInt16 nNewPos )
{
@@ -893,29 +858,6 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
// -----------------------------------------------------------------------
-void ToolBox::CopyItems( const ToolBox& rToolBox )
-{
- mpData->ImplClearLayoutData();
- mpData->m_aItems = rToolBox.mpData->m_aItems;
- // Absichern gegen das Loeschen im Select-Handler
- mnCurItemId = 0;
- mnHighItemId = 0;
-
- for( std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
- it != mpData->m_aItems.end(); ++it )
- {
- it->mpWindow = NULL;
- it->mbShowWindow = sal_False;
- }
-
- ImplInvalidate( sal_True, sal_True );
-
- // Notify
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED );
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::Clear()
{
mpData->m_aItems.clear();
@@ -1043,11 +985,6 @@ void ToolBox::SetPageScroll( sal_Bool b )
mpData->mbPageScroll = b;
}
-sal_Bool ToolBox::GetPageScroll()
-{
- return mpData->mbPageScroll;
-}
-
// -----------------------------------------------------------------------
void ToolBox::SetNextToolBox( const XubString& rStr )
@@ -1225,16 +1162,6 @@ Rectangle ToolBox::GetItemPosRect( sal_uInt16 nPos ) const
}
// -----------------------------------------------------------------------
-Rectangle ToolBox::GetItemDropDownRect( sal_uInt16 nItemId ) const
-{
- if ( mbCalc || mbFormat )
- ((ToolBox*)this)->ImplFormat();
-
- sal_uInt16 nPos = GetItemPos( nItemId );
- return GetItemPosDropDownRect( nPos );
-}
-
-// -----------------------------------------------------------------------
Rectangle ToolBox::GetItemPosDropDownRect( sal_uInt16 nPos ) const
{
@@ -1249,11 +1176,6 @@ Rectangle ToolBox::GetItemPosDropDownRect( sal_uInt16 nPos ) const
// -----------------------------------------------------------------------
-Rectangle ToolBox::GetMenubuttonRect() const
-{
- return mpData->maMenubuttonItem.maRect;
-}
-
sal_Bool ToolBox::ImplHasExternalMenubutton()
{
// check if the borderwindow (i.e. the decoration) provides the menu button
@@ -1459,55 +1381,6 @@ Image ToolBox::GetItemImage( sal_uInt16 nItemId ) const
// -----------------------------------------------------------------------
-long ToolBox::GetItemImageAngle( sal_uInt16 nItemId ) const
-{
- ImplToolItem* pItem = ImplGetItem( nItemId );
-
- if ( pItem )
- return pItem->mnImageAngle;
- else
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool ToolBox::GetItemImageMirrorMode( sal_uInt16 nItemId ) const
-{
- ImplToolItem* pItem = ImplGetItem( nItemId );
-
- if ( pItem )
- return pItem->mbMirrorMode;
- else
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-void ToolBox::SetItemHighImage( sal_uInt16 nItemId, const Image& rImage )
-{
- ImplToolItem* pItem = ImplGetItem( nItemId );
- if ( pItem )
- {
- DBG_ASSERT( (pItem->maImage.GetSizePixel() == rImage.GetSizePixel()) ||
- ((!rImage) == sal_True), "ToolBox::SetItemHighImage() - ImageSize != HighImageSize" );
- pItem->maHighImage = rImage;
- }
-}
-
-// -----------------------------------------------------------------------
-
-Image ToolBox::GetItemHighImage( sal_uInt16 nItemId ) const
-{
- ImplToolItem* pItem = ImplGetItem( nItemId );
-
- if ( pItem )
- return pItem->maHighImage;
- else
- return Image();
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::SetItemText( sal_uInt16 nItemId, const XubString& rText )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1668,18 +1541,6 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, sal_Bool bDown, sal_Bool bRelease
// -----------------------------------------------------------------------
-sal_Bool ToolBox::IsItemDown( sal_uInt16 nItemId ) const
-{
- sal_uInt16 nPos = GetItemPos( nItemId );
-
- if ( nPos != TOOLBOX_ITEM_NOTFOUND )
- return (nPos == mnCurPos);
- else
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1969,13 +1830,6 @@ void ToolBox::SetOutStyle( sal_uInt16 nNewStyle )
// -----------------------------------------------------------------------
-void ToolBox::RecalcItems()
-{
- ImplInvalidate( sal_True );
-}
-
-// -----------------------------------------------------------------------
-
// disable key input if all items are disabled
void ToolBox::ImplUpdateInputEnable()
@@ -2066,37 +1920,6 @@ long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
// -----------------------------------------------------------------------
-long ToolBox::GetTextCount() const
-{
- if( ! mpData->m_pLayoutData )
- ImplFillLayoutData();
- return mpData->m_pLayoutData ? mpData->m_pLayoutData->GetLineCount() : 0;
-}
-
-// -----------------------------------------------------------------------
-
-Pair ToolBox::GetTextStartEnd( long nText ) const
-{
- if( ! mpData->m_pLayoutData )
- ImplFillLayoutData();
- return mpData->m_pLayoutData ? mpData->m_pLayoutData->GetLineStartEnd( nText ) : Pair( -1, -1 );
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 ToolBox::GetDisplayItemId( long nText ) const
-{
- sal_uInt16 nItemId = 0;
- if( ! mpData->m_pLayoutData )
- ImplFillLayoutData();
- if( mpData->m_pLayoutData && nText >= 0 && (sal_uLong)nText < mpData->m_pLayoutData->m_aLineItemIds.size() )
- nItemId = mpData->m_pLayoutData->m_aLineItemIds[nText];
- return nItemId;
-}
-
-
-// -----------------------------------------------------------------------
-
void ToolBox::SetDropdownClickHdl( const Link& rLink )
{
mpData->maDropdownClickHdl = rLink;
@@ -2154,11 +1977,6 @@ void ToolBox::SetMenuButtonHdl( const Link& rLink )
mpData->maMenuButtonHdl = rLink;
}
-const Link& ToolBox::GetMenuButtonHdl() const
-{
- return mpData->maMenuButtonHdl;
-}
-
// -----------------------------------------------------------------------
sal_Bool ToolBox::ImplHasClippedItems()
commit 2e3a1036aaceb06e7c17206223dd35863b434b2e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 14:01:10 2011 +0200
callcatcher: remove TextView::Foo
diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx
index da3017e..6bc6ff5 100644
--- a/svtools/inc/svtools/textview.hxx
+++ b/svtools/inc/svtools/textview.hxx
@@ -156,7 +156,6 @@ public:
void Redo();
sal_Bool Read( SvStream& rInput );
- sal_Bool Write( SvStream& rOutput );
void SetStartDocPos( const Point& rPos );
const Point& GetStartDocPos() const;
@@ -168,7 +167,6 @@ public:
sal_Bool IsInsertMode() const;
void SetAutoIndentMode( sal_Bool bAutoIndent );
- sal_Bool IsAutoIndentMode() const;
void SetReadOnly( sal_Bool bReadOnly );
sal_Bool IsReadOnly() const;
@@ -180,10 +178,6 @@ public:
sal_Bool IsSelectionAtPoint( const Point& rPointPixel );
void SetPaintSelection( sal_Bool bPaint);
- sal_Bool IsPaintSelection() const;
-
- void SetHighlightSelection( sal_Bool bSelectByHighlight );
- sal_Bool IsHighlightSelection() const;
void EraseVirtualDevice();
@@ -204,10 +198,6 @@ public:
TextPaM CursorStartOfDoc();
TextPaM CursorEndOfDoc();
- // Old, remove!
- TextPaM CursorLeft( const TextPaM& rPaM, sal_Bool bWordMode = sal_False );
- TextPaM CursorRight( const TextPaM& rPaM, sal_Bool bWordMode = sal_False );
-
/**
Drag and Drop, deleting and selection regards all text that has an attribute
TEXTATTR_PROTECTED set as one entitity. Drag and dropped text is automatically
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 3adcff4..776a6d3 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -1427,22 +1427,6 @@ void TextView::InsertText( const XubString& rStr, sal_Bool bSelect )
}
*/
-// OLD
-TextPaM TextView::CursorLeft( const TextPaM& rPaM, sal_Bool bWordMode )
-{
- return bWordMode ? CursorWordLeft( rPaM ) : CursorLeft( rPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
-
- // Remove (sal_uInt16) typecasts in this file when removing this method!
-}
-
-// OLD
-TextPaM TextView::CursorRight( const TextPaM& rPaM, sal_Bool bWordMode )
-{
- return bWordMode ? CursorWordRight( rPaM ) : CursorRight( rPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
-
- // Remove (sal_uInt16) typecasts in this file when removing this method!
-}
-
TextPaM TextView::CursorLeft( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode )
{
TextPaM aPaM( rPaM );
@@ -2006,15 +1990,6 @@ void TextView::SetPaintSelection( sal_Bool bPaint )
}
}
-void TextView::SetHighlightSelection( sal_Bool bSelectByHighlight )
-{
- if ( bSelectByHighlight != mpImpl->mbHighlightSelection )
- {
- // Falls umschalten zwischendurch moeglich...
- mpImpl->mbHighlightSelection = bSelectByHighlight;
- }
-}
-
sal_Bool TextView::Read( SvStream& rInput )
{
sal_Bool bDone = mpImpl->mpTextEngine->Read( rInput, &mpImpl->maSelection );
@@ -2022,11 +1997,6 @@ sal_Bool TextView::Read( SvStream& rInput )
return bDone;
}
-sal_Bool TextView::Write( SvStream& rOutput )
-{
- return mpImpl->mpTextEngine->Read( rOutput, &mpImpl->maSelection );
-}
-
bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const
{
bool bTruncated = false;
@@ -2439,18 +2409,12 @@ const Point& TextView::GetStartDocPos() const
{ return mpImpl->maStartDocPos; }
void TextView::SetAutoIndentMode( sal_Bool bAutoIndent )
{ mpImpl->mbAutoIndent = bAutoIndent; }
-sal_Bool TextView::IsAutoIndentMode() const
-{ return mpImpl->mbAutoIndent; }
sal_Bool TextView::IsReadOnly() const
{ return mpImpl->mbReadOnly; }
void TextView::SetAutoScroll( sal_Bool bAutoScroll )
{ mpImpl->mbAutoScroll = bAutoScroll; }
sal_Bool TextView::IsAutoScroll() const
{ return mpImpl->mbAutoScroll; }
-sal_Bool TextView::IsPaintSelection() const
-{ return mpImpl->mbPaintSelection; }
-sal_Bool TextView::IsHighlightSelection() const
-{ return mpImpl->mbHighlightSelection; }
sal_Bool TextView::HasSelection() const
{ return mpImpl->maSelection.HasRange(); }
sal_Bool TextView::IsInsertMode() const
commit 91e60e298c1a420f849d66b053a937361d940728
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 13:56:26 2011 +0200
callcatcher: remove TextUndoSetAttribs
diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx
index 5cbc7f0..7c6e9c8 100644
--- a/svtools/source/edit/textundo.cxx
+++ b/svtools/source/edit/textundo.cxx
@@ -43,7 +43,6 @@ TYPEINIT1( TextUndoConnectParas, TextUndo );
TYPEINIT1( TextUndoSplitPara, TextUndo );
TYPEINIT1( TextUndoInsertChars, TextUndo );
TYPEINIT1( TextUndoRemoveChars, TextUndo );
-TYPEINIT1( TextUndoSetAttribs, TextUndo );
TextUndoManager::TextUndoManager( TextEngine* p )
@@ -296,44 +295,4 @@ void TextUndoRemoveChars::Redo()
SetSelection( aPaM );
}
-
-TextUndoSetAttribs::TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rSel )
- : TextUndo( pTextEngine ), maSelection( rSel )
-{
- maSelection.Justify();
-// aNewAttribs.Set( rNewItems );
-// mbSetIsRemove = sal_False;
-// mnRemoveWhich = 0;
-// mnSpecial = 0;
-}
-
-TextUndoSetAttribs::~TextUndoSetAttribs()
-{
- // ...............
-}
-
-void TextUndoSetAttribs::Undo()
-{
- for ( sal_uLong nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ )
- {
-// ContentAttribsInfo* pInf = aPrevAttribs[ (sal_uInt16)(nPara-aESel.nStartPara) ];
-// GetTextEngine()->RemoveCharAttribs( nPara );
-// TextNode* pNode = GetTextEngine()->GetTextDoc().GetObject( nPara );
-// for ( sal_uInt16 nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
-// {
-// GetTextEngine()->GetTextDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() );
-// }
- }
- SetSelection( maSelection );
-}
-
-void TextUndoSetAttribs::Redo()
-{
-// if ( !bSetIsRemove )
-// GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial );
-// else
-// GetTextEngine()->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich );
- SetSelection( maSelection );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3f9cc9aa58ccca9ddaeaf00e8819bf6f754e270f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 13:47:15 2011 +0200
callcatcher: remove TextEngine::Foo
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index 683ffed..46e7e0b 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -245,13 +245,11 @@ public:
void SetFont( const Font& rFont );
const Font& GetFont() const { return maFont; }
- void SetDefTab( sal_uInt16 nDefTab );
sal_uInt16 GetDefTab() const;
void SetLeftMargin( sal_uInt16 n );
sal_uInt16 GetLeftMargin() const;
- void SetUpdateMode( sal_Bool bUpdate );
sal_Bool GetUpdateMode() const { return mbUpdate; }
sal_uInt16 GetViewCount() const;
@@ -325,7 +323,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > GetBreakIterator();
static sal_Bool DoesKeyChangeText( const KeyEvent& rKeyEvent );
- static sal_Bool DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
static sal_Bool IsSimpleCharInput( const KeyEvent& rKeyEvent );
};
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 5a1e131..2cba373 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -253,12 +253,6 @@ void TextEngine::SetFont( const Font& rFont )
}
}
-void TextEngine::SetDefTab( sal_uInt16 nDefTab )
-{
- mnDefTab = nDefTab;
- // evtl neu setzen?
-}
-
void TextEngine::SetMaxTextLen( sal_uLong nLen )
{
mnMaxTextLen = nLen;
@@ -345,43 +339,6 @@ sal_uInt16 TextEngine::GetTextLen( sal_uLong nPara ) const
return mpDoc->GetNodes().GetObject( nPara )->GetText().Len();
}
-void TextEngine::SetUpdateMode( sal_Bool bUpdate )
-{
- if ( bUpdate != mbUpdate )
- {
- mbUpdate = bUpdate;
- if ( mbUpdate )
- {
- FormatAndUpdate( GetActiveView() );
- if ( GetActiveView() )
- GetActiveView()->ShowCursor();
- }
- }
-}
-
-sal_Bool TextEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
-{
- sal_Bool bDoesMove = sal_False;
-
- switch ( rKeyEvent.GetKeyCode().GetCode() )
- {
- case KEY_UP:
- case KEY_DOWN:
- case KEY_LEFT:
- case KEY_RIGHT:
- case KEY_HOME:
- case KEY_END:
- case KEY_PAGEUP:
- case KEY_PAGEDOWN:
- {
- if ( !rKeyEvent.GetKeyCode().IsMod2() )
- bDoesMove = sal_True;
- }
- break;
- }
- return bDoesMove;
-}
-
sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
{
sal_Bool bDoesChange = sal_False;
commit 60a59323a1b3e7a2eb761675cf9bbe8646290bc1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 13:45:29 2011 +0200
callcatcher: remove TextCharAttribList::DbgCheckAttribs
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index b93c0aa..83500ba 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -216,23 +216,6 @@ void TextCharAttribList::DeleteEmptyAttribs()
mbHasEmptyAttribs = sal_False;
}
-#ifdef DBG_UTIL
-sal_Bool TextCharAttribList::DbgCheckAttribs()
-{
- sal_Bool bOK = sal_True;
- for ( sal_uInt16 nAttr = 0; nAttr < Count(); nAttr++ )
- {
- TextCharAttrib* pAttr = GetObject( nAttr );
- if ( pAttr->GetStart() > pAttr->GetEnd() )
- {
- bOK = sal_False;
- OSL_FAIL( "Attr verdreht" );
- }
- }
- return bOK;
-}
-#endif
-
// -------------------------------------------------------------------------
// (+) class TextNode
// -------------------------------------------------------------------------
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index 9cc61de..27d9c86 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -69,10 +69,6 @@ public:
TextCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos );
sal_Bool HasAttrib( sal_uInt16 nWhich ) const;
sal_Bool HasBoundingAttrib( sal_uInt16 nBound );
-
-#ifdef DBG_UTIL
- sal_Bool DbgCheckAttribs();
-#endif
};
commit 8005b47e9a359aa0cb5aba240da4d383fc82d420
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 13:37:20 2011 +0200
Remove EDITDEBUG
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index da7f616..b93c0aa 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -307,10 +307,6 @@ void TextNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew )
if ( bResort )
maCharAttribs.ResortAttribs();
-
-#ifdef EDITDEBUG
- DBG_ASSERT( CheckOrderedList( (TextCharAttribs*)&maCharAttribs ), "Expand: Start-Liste verdreht" );
-#endif
}
void TextNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted )
@@ -374,10 +370,6 @@ void TextNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted )
if ( bResort )
maCharAttribs.ResortAttribs();
-
-#ifdef EDITDEBUG
- DBG_ASSERT( CheckOrderedList( (TextCharAttribs)&maCharAttribs ), "Collaps: Start-Liste verdreht" );
-#endif
}
void TextNode::InsertText( sal_uInt16 nPos, const String& rText )
@@ -460,10 +452,6 @@ void TextNode::Append( const TextNode& rNode )
maText += rNode.GetText();
-#ifdef EDITDEBUG
- DBG_ASSERT( maCharAttribs.DbgCheckAttribs(), "Attribute VOR AppendAttribs kaputt" );
-#endif
-
const sal_uInt16 nAttribs = rNode.GetCharAttribs().Count();
for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ )
{
@@ -499,10 +487,6 @@ void TextNode::Append( const TextNode& rNode )
maCharAttribs.InsertAttrib( pNewAttrib );
}
}
-
-#ifdef EDITDEBUG
- DBG_ASSERT( maCharAttribs.DbgCheckAttribs(), "Attribute NACH AppendAttribs kaputt" );
-#endif
}
// -------------------------------------------------------------------------
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 5c18d14..5a1e131 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -1953,9 +1953,6 @@ void TextEngine::CreateTextPortions( sal_uLong nPara, sal_uInt16 nStartPos )
}
DBG_ASSERT( pTEParaPortion->GetTextPortions().Count(), "Keine Portions?!" );
-#ifdef EDITDEBUG
- DBG_ASSERT( pTEParaPortion->DbgCheckTextPortions(), "Portions kaputt?" );
-#endif
}
void TextEngine::RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short nNewChars )
@@ -2048,10 +2045,6 @@ void TextEngine::RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short
}
DBG_ASSERT( pTEParaPortion->GetTextPortions().Count(), "RecalcTextPortions: Keine mehr da!" );
}
-
-#ifdef EDITDEBUG
- DBG_ASSERT( pTEParaPortion->DbgCheckTextPortions(), "Portions kaputt?" );
-#endif
}
void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange, TextSelection const* pSelection )
@@ -2242,13 +2235,6 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
pOutDev->Erase( aTabArea );
}
}
-#ifdef EDITDEBUG
- Rectangle aTabArea( aTmpPos, Point( aTmpPos.X()+nTxtWidth, aTmpPos.Y()+mnCharHeight-1 ) );
- Color aOldColor = pOutDev->GetFillColor();
- pOutDev->SetFillColor( (y%2) ? COL_RED : COL_GREEN );
- pOutDev->DrawRect( aTabArea );
- pOutDev->SetFillColor( aOldColor );
-#endif
}
break;
default: OSL_FAIL( "ImpPaint: Unknown Portion-Type !" );
commit 82ea128f190dbe8d707cb140a5a2bb2b48bef58d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 13 13:30:48 2011 +0200
callcatcher: remove unused TextAttrib stuff
diff --git a/svtools/inc/svtools/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx
index 73095b1..ead53b4 100644
--- a/svtools/inc/svtools/txtattr.hxx
+++ b/svtools/inc/svtools/txtattr.hxx
@@ -61,8 +61,6 @@ public:
sal_uInt16 Which() const { return mnWhich; }
- virtual void SetFont( Font& rFont ) const = 0;
- virtual TextAttrib* Clone() const = 0;
virtual int operator==( const TextAttrib& rAttr ) const = 0;
int operator!=( const TextAttrib& rAttr ) const
{ return !(*this == rAttr ); }
@@ -114,8 +112,6 @@ private:
Color maColor;
public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list