binfilter/bf_so3/source/persist/svstor.cxx | 5 -
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx | 83 --------------------
binfilter/inc/bf_so3/svstor.hxx | 2
3 files changed, 90 deletions(-)
New commits:
commit bf3ac96236b16bd7eae74e91117f41ded8b09379
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 4 20:58:57 2012 +0100
This SyncSvStream stuff isn't used
Change-Id: I827e46dc2e38646c9b9869a2230cdcd299d7a3c9
diff --git a/binfilter/bf_so3/source/persist/svstor.cxx
b/binfilter/bf_so3/source/persist/svstor.cxx
index 51d7da8..71621aa 100644
--- a/binfilter/bf_so3/source/persist/svstor.cxx
+++ b/binfilter/bf_so3/source/persist/svstor.cxx
@@ -102,11 +102,6 @@ USHORT SvStorageStream::IsA() const
return ID_STORAGESTREAM;
}
-void SvStorageStream::SyncSvStream()
-{
- SotStorageStream::SyncSvStream();
-}
-
ULONG SvStorageStream::GetData( void* pData, ULONG nSize )
{
return SotStorageStream::GetData( pData, nSize );
diff --git a/binfilter/inc/bf_so3/svstor.hxx b/binfilter/inc/bf_so3/svstor.hxx
index 8f2cd7a..335fc5b 100644
--- a/binfilter/inc/bf_so3/svstor.hxx
+++ b/binfilter/inc/bf_so3/svstor.hxx
@@ -71,8 +71,6 @@ public:
SO2_DECL_STANDARD_CLASS_DLL(SvStorageStream,SOAPP)
virtual USHORT IsA() const;
- using SvStream::SyncSvStream;
- virtual void SyncSvStream();
virtual void SetSize( ULONG nNewSize );
virtual BOOL Commit();
commit b9f83fca37a3544b825de9d2f295090257d3477b
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jun 2 23:14:45 2012 +0100
ThreeByteToFourByte and friends are no longer in use
Change-Id: I9a2aaebfc5cc6b8b6327d61270043611283a6975
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
index 48946da..4a83edd 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
@@ -1454,89 +1454,6 @@ void SvXMLUnitConverter::convertVector3D( OUStringBuffer
&rBuffer,
rBuffer.append(sal_Unicode(')'));
}
-const
- sal_Char aBase64EncodeTable[] =
- { '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', '+', '/' };
-
-const
- sal_uInt8 aBase64DecodeTable[] =
- { 62,255,255,255, 63, // 43-47
-// + /
-
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255, 0,255,255, // 48-63
-// 0 1 2 3 4 5 6 7 8 9 =
-
- 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 64-79
-// A B C D E F G H I J K L M N O
-
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255, // 80-95
-// P Q R S T U V W X Y Z
-
- 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111
-// a b c d e f g h i j k l m n o
-
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 }; // 112-123
-// p q r s t u v w x y z
-
-
-
-void ThreeByteToFourByte (const sal_Int8* pBuffer, const sal_Int32 nStart,
const sal_Int32 nFullLen, ::rtl::OUStringBuffer& sBuffer)
-{
- sal_Int32 nLen(nFullLen - nStart);
- if (nLen > 3)
- nLen = 3;
- if (nLen == 0)
- {
- return;
- }
-
- sal_Int32 nBinaer;
- switch (nLen)
- {
- case 1:
- {
- nBinaer = ((sal_uInt8)pBuffer[nStart + 0]) << 16;
- }
- break;
- case 2:
- {
- nBinaer = (((sal_uInt8)pBuffer[nStart + 0]) << 16) +
- (((sal_uInt8)pBuffer[nStart + 1]) << 8);
- }
- break;
- default:
- {
- nBinaer = (((sal_uInt8)pBuffer[nStart + 0]) << 16) +
- (((sal_uInt8)pBuffer[nStart + 1]) << 8) +
- ((sal_uInt8)pBuffer[nStart + 2]);
- }
- break;
- }
-
- sal_Unicode buf[4] = { '=', '=', '=', '=' };
-
- sal_uInt8 nIndex ((nBinaer & 0xFC0000) >> 18);
- buf[0] = aBase64EncodeTable [nIndex];
-
- nIndex = (nBinaer & 0x3F000) >> 12;
- buf[1] = aBase64EncodeTable [nIndex];
- if (nLen > 1)
- {
- nIndex = (nBinaer & 0xFC0) >> 6;
- buf[2] = aBase64EncodeTable [nIndex];
- if (nLen > 2)
- {
- nIndex = (nBinaer & 0x3F);
- buf[3] = aBase64EncodeTable [nIndex];
- }
- }
- sBuffer.append(buf, SAL_N_ELEMENTS(buf));
-}
-
sal_Bool SvXMLUnitConverter::convertNumFormat(
sal_Int16& rType,
const OUString& rNumFmt,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
