[Libreoffice-commits] .: 4 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Aug 8 05:05:23 PDT 2011
binfilter/bf_basic/source/sbx/sbxvalue.cxx | 14 -
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 3
binfilter/bf_sc/source/core/tool/sc_token.cxx | 9 -
binfilter/bf_starmath/source/starmath_utility.cxx | 3
binfilter/bf_svtools/source/items1/svt_stylepool.cxx | 6
binfilter/bf_svtools/source/misc/tl_tstring.cxx | 41 ++++
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 3
binfilter/bf_svx/source/editeng/svx_editobj.cxx | 3
binfilter/bf_svx/source/editeng/svx_svxacorr.cxx | 10 -
binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx | 14 -
binfilter/bf_svx/source/engine3d/svx_plight3d.cxx | 13 -
binfilter/bf_svx/source/items/svx_bulitem.cxx | 3
binfilter/bf_svx/source/items/svx_numitem.cxx | 3
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 25 --
binfilter/bf_sw/source/core/layout/layhelp.hxx | 58 ------
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 165 -------------------
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 3
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 7
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 3
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 5
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 3
binfilter/bf_sw/source/core/swg/sw_rdnds.cxx | 3
binfilter/bf_sw/source/core/swg/sw_rdnum.cxx | 3
binfilter/bf_sw/source/core/text/sw_txthyph.cxx | 4
binfilter/bf_sw/source/filter/inc/fltbase.hxx | 3
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 5
binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx | 7
binfilter/inc/bf_basic/sbxvar.hxx | 1
binfilter/inc/bf_svx/dlight3d.hxx | 4
binfilter/inc/bf_svx/plight3d.hxx | 3
binfilter/inc/bf_sw/doc.hxx | 1
binfilter/inc/bf_tools/string.hxx | 1
32 files changed, 90 insertions(+), 339 deletions(-)
New commits:
commit f5b8d6f88cf2b21c7b527bacef317ea94d3607e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:43:09 2011 +0100
callcatcher: remove various unused methods
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index 03208cd..7982762 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -650,20 +650,6 @@ const XubString& SbxValue::GetString() const
}
}
-const XubString& SbxValue::GetCoreString() const
-{
- SbxValues aRes;
- aRes.eType = SbxCoreSTRING;
- if( Get( aRes ) )
- // Geht in Ordnung, da Ptr eine Kopie ist
- return *aRes.pString;
- else
- {
- ((SbxValue*) this)->aPic.Erase();
- return aPic;
- }
-}
-
BOOL SbxValue::GetBool() const
{
SbxValues aRes;
diff --git a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
index 2fd8902..32a03bb 100644
--- a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
@@ -40,20 +40,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* E3dDistantLight-Konstruktor
-|*
-\************************************************************************/
-
-/*N*/ E3dDistantLight::E3dDistantLight(const Vector3D& rPos, const Vector3D& rDir,
-/*N*/ const Color& rColor, double fLightIntensity) :
-/*N*/ E3dLight(rPos, rColor, fLightIntensity)
-/*N*/ {
-/*N*/ SetDirection(rDir);
-/*N*/ CreateLightObj();
-/*N*/ }
-
-/*************************************************************************
-|*
|* E3dDistantLight-Destruktor
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx
index a30e12c..0b8cec4 100644
--- a/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx
@@ -37,19 +37,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* E3dPointLight-Konstruktor
-|*
-\************************************************************************/
-
-/*N*/ E3dPointLight::E3dPointLight(const Vector3D& rPos, const Color& rColor,
-/*N*/ double fLightIntensity) :
-/*N*/ E3dLight(rPos, rColor, fLightIntensity)
-/*N*/ {
-/*N*/ CreateLightObj();
-/*N*/ }
-
-/*************************************************************************
-|*
|* E3dPointLight-Destruktor
|*
\************************************************************************/
diff --git a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
index 6cbcbf4..4a6e471 100644
--- a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
@@ -39,10 +39,6 @@
#include <guess.hxx> //
namespace binfilter {
-#ifdef DBG_UTIL
-extern const sal_Char *GetLangName( const MSHORT nLang );
-#endif
-
using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/binfilter/inc/bf_basic/sbxvar.hxx b/binfilter/inc/bf_basic/sbxvar.hxx
index 3546965..73f3598 100644
--- a/binfilter/inc/bf_basic/sbxvar.hxx
+++ b/binfilter/inc/bf_basic/sbxvar.hxx
@@ -315,7 +315,6 @@ public:
double GetDate() const;
BOOL GetBool() const;
const String& GetString() const;
- const String& GetCoreString() const;
#ifdef WNT
SbxDecimal* GetDecimal() const;
#endif
diff --git a/binfilter/inc/bf_svx/dlight3d.hxx b/binfilter/inc/bf_svx/dlight3d.hxx
index 44f8b6e..17f99ab 100644
--- a/binfilter/inc/bf_svx/dlight3d.hxx
+++ b/binfilter/inc/bf_svx/dlight3d.hxx
@@ -52,10 +52,6 @@ class E3dDistantLight : public E3dLight
public:
TYPEINFO();
- E3dDistantLight(const Vector3D& rPos,
- const Vector3D& rDirection,
- const Color& rColor,
- double fLightIntensity = 1.0);
E3dDistantLight() :
aDirection(Vector3D(0, 1, 0))
diff --git a/binfilter/inc/bf_svx/plight3d.hxx b/binfilter/inc/bf_svx/plight3d.hxx
index df9c0f7..a3dffe3 100644
--- a/binfilter/inc/bf_svx/plight3d.hxx
+++ b/binfilter/inc/bf_svx/plight3d.hxx
@@ -48,9 +48,6 @@ class E3dPointLight : public E3dLight
public:
TYPEINFO();
- E3dPointLight(const Vector3D& rPos,
- const Color& rColor,
- double fLightIntensity = 1.0);
E3dPointLight()
{
commit 5380e26297f34a5e3d58d90fc67ab2b6191d5135
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:38:51 2011 +0100
callcatcher: remove various unused methods
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index ef187f5..fc68e35 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1138,31 +1138,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ GetNewDBMgr()->SetInitDBFields( b );
/*N*/ }
-/*N*/ void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName)
-/*N*/ {
-/*N*/ if( !rDBName.Len() )
-/*N*/ return;
-/*N*/
-/*N*/ #ifdef UNX
-/*N*/ for( USHORT i = 0; i < rDBNameList.Count(); ++i )
-/*N*/ if( rDBName == rDBNameList.GetObject(i)->GetToken(0) )
-/*N*/ return;
-/*N*/ #else
-/*N*/ const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
-/*N*/ for( USHORT i = 0; i < rDBNameList.Count(); ++i )
-/*N*/ if( rSCmp.isEqual( rDBName, rDBNameList.GetObject(i)->GetToken(0) ) )
-/*N*/ return;
-/*N*/ #endif
-/*N*/
-/*N*/ SwDBData aData;
-/*N*/ aData.sDataSource = rDBName.GetToken(0, DB_DELIM);
-/*N*/ aData.sCommand = rDBName.GetToken(1, DB_DELIM);
-/*N*/ aData.nCommandType = -1;
-/*N*/ GetNewDBMgr()->CreateDSData(aData);
-/*N*/ String* pNew = new String( rDBName );
-/*N*/ rDBNameList.Insert( pNew, rDBNameList.Count() );
-/*N*/ }
-
/*N*/ BOOL SwDoc::SetFieldsDirty( BOOL b, const SwNode* pChk, ULONG nLen )
/*N*/ {
/*N*/ // teste ggfs. mal, ob die angegbenen Nodes ueberhaupt Felder beinhalten.
diff --git a/binfilter/bf_sw/source/core/layout/layhelp.hxx b/binfilter/bf_sw/source/core/layout/layhelp.hxx
index bf3a3eb..890fdce 100644
--- a/binfilter/bf_sw/source/core/layout/layhelp.hxx
+++ b/binfilter/bf_sw/source/core/layout/layhelp.hxx
@@ -75,7 +75,6 @@ class SwLayCacheImpl : public SvULongs
SvUShorts aType;
SwPageFlyCache aFlyCache;
sal_Bool bUseFlyCache;
- void Insert( USHORT nType, ULONG nIndex, xub_StrLen nOffset );
public:
SwLayCacheImpl() : SvULongs( 20, 10 ), aOffset( 20, 10 ), aType( 20, 10 ) {}
@@ -156,12 +155,6 @@ public:
static BOOL CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly );
};
-/*************************************************************************
- * class SwLayCacheIoImpl
- * contains the data structures that are required to read and write a
- * layout cache.
- *************************************************************************/
-
#define SW_LAYCACHE_IO_REC_PAGES 'p'
#define SW_LAYCACHE_IO_REC_PARA 'P'
#define SW_LAYCACHE_IO_REC_TABLE 'T'
@@ -170,57 +163,6 @@ public:
#define SW_LAYCACHE_IO_VERSION_MAJOR 1
#define SW_LAYCACHE_IO_VERSION_MINOR 1
-class SwLayCacheIoImpl
-{
- SvBytes aRecTypes;
- SvULongs aRecSizes;
-
- SvStream *pStream;
-
- ULONG nFlagRecEnd;
-
- USHORT nMajorVersion;
- USHORT nMinorVersion;
-
- BOOL bWriteMode : 1;
- BOOL bError : 1;
-
-public:
- SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd );
-
- // Get input or output stream
- SvStream& GetStream() const { return *pStream; }
-
- // Open a record of type "nType"
- BOOL OpenRec( BYTE nType );
-
- // Close a record of type "nType". This skips any unread data that
- // remains in the record.
- BOOL CloseRec( BYTE nType );
-
- // Return the number of bytes contained in the current record that
- // haven't been read by now.
- UINT32 BytesLeft();
-
- // Return the current record's type
- BYTE Peek();
-
- // Skip the current record
-
- // Open a flag record for reading. The uppermost four bits are flags,
- // while the lowermost are the flag record's size. Flag records cannot
- // be nested.
- BYTE OpenFlagRec();
-
- // Close a flag record. Any bytes left are skipped.
- void CloseFlagRec();
-
- BOOL HasError() const { return bError; }
-
- USHORT GetMajorVersion() const { return nMajorVersion; }
- USHORT GetMinorVersion() const { return nMinorVersion; }
-};
-
// Stored information about text frames:
class SwFlyCache : public SwRect // position and size
{
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index bb4b8ca..f5358e9 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -63,15 +63,6 @@ namespace binfilter {
/*N*/ SV_IMPL_PTRARR( SwPageFlyCache, SwFlyCachePtr )
-//-----------------------------------------------------------------------------
-
-/*N*/ void SwLayCacheImpl::Insert( USHORT nType, ULONG nIndex, xub_StrLen nOffset )
-/*N*/ {
-/*N*/ aType.Insert( nType, aType.Count() );
-/*N*/ SvULongs::Insert( nIndex, SvULongs::Count() );
-/*N*/ aOffset.Insert( nOffset, aOffset.Count() );
-/*N*/ }
-
/*N*/ void SwLayoutCache::ClearImpl()
/*N*/ {
/*N*/ if( !IsLocked() )
@@ -675,162 +666,6 @@ namespace binfilter {
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-
-/*N*/ SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, BOOL bWrtMd ) :
-/*N*/ pStream( &rStrm ),
-/*N*/ nMajorVersion(SW_LAYCACHE_IO_VERSION_MAJOR),
-/*N*/ nMinorVersion(SW_LAYCACHE_IO_VERSION_MINOR),
-/*N*/ bWriteMode( bWrtMd ),
-/*N*/ bError( FALSE )
-/*N*/ {
-/*N*/ if( bWriteMode )
-/*N*/ *pStream << nMajorVersion
-/*N*/ << nMinorVersion;
-/*N*/
-/*N*/ else
-/*N*/ *pStream >> nMajorVersion
-/*N*/ >> nMinorVersion;
-/*N*/ }
-
-/*N*/ BOOL SwLayCacheIoImpl::OpenRec( BYTE cType )
-/*N*/ {
-/*N*/ BOOL bRes = TRUE;
-/*N*/ UINT16 nLvl = aRecTypes.Count();
-/*N*/ OSL_ENSURE( nLvl == aRecSizes.Count(), "OpenRec: Level" );
-/*N*/ UINT32 nPos = pStream->Tell();
-/*N*/ if( bWriteMode )
-/*N*/ {
-/*N*/ aRecTypes.Insert( cType, nLvl );
-/*N*/ aRecSizes.Insert( nPos, nLvl );
-/*N*/ *pStream << (UINT32) 0;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ UINT32 nVal;
-/*N*/ *pStream >> nVal;
-/*N*/ BYTE cRecTyp = (BYTE)nVal;
-/*N*/ aRecTypes.Insert( cRecTyp, nLvl );
-/*N*/ sal_uInt32 nSize = nVal >> 8;
-/*N*/ aRecSizes.Insert( nPos + nSize, nLvl );
-/*N*/ if( !nVal || cRecTyp != cType ||
-/*N*/ pStream->GetErrorCode() != SVSTREAM_OK || pStream->IsEof() )
-/*N*/ {
-/*?*/ OSL_ENSURE( nVal, "OpenRec: Record-Header is 0" );
-/*?*/ OSL_ENSURE( cRecTyp == cType,
-/*?*/ "OpenRec: Wrong Record Type" );
-/*?*/ aRecTypes[nLvl] = 0;
-/*?*/ aRecSizes[nLvl] = pStream->Tell();
-/*?*/ bRes = sal_False;
-/*?*/ bError = TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/ return bRes;
-/*N*/ }
-
-// Close record
-
-/*N*/ BOOL SwLayCacheIoImpl::CloseRec( BYTE cType )
-/*N*/ {
-/*N*/ BOOL bRes = TRUE;
-/*N*/ UINT16 nLvl = aRecTypes.Count();
-/*N*/ OSL_ENSURE( nLvl == aRecSizes.Count(), "CloseRec: wrong Level" );
-/*N*/ OSL_ENSURE( nLvl, "CloseRec: no levels" );
-/*N*/ if( nLvl )
-/*N*/ {
-/*N*/ nLvl--;
-/*N*/ OSL_ENSURE( cType == aRecTypes[nLvl],
-/*N*/ "CloseRec: Wrong Block-Header" );
-/*N*/ UINT32 nPos = pStream->Tell();
-/*N*/ if( bWriteMode )
-/*N*/ {
-/*N*/ UINT32 nBgn = aRecSizes[nLvl];
-/*N*/ pStream->Seek( nBgn );
-/*N*/ UINT32 nSize = nPos - nBgn;
-/*N*/ UINT32 nVal = ( nSize << 8 ) | aRecTypes[nLvl];
-/*N*/ *pStream << nVal;
-/*N*/ pStream->Seek( nPos );
-/*N*/ if( pStream->GetError() != SVSTREAM_OK )
-/*?*/ bRes = FALSE;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ UINT32 n = aRecSizes[nLvl];
-/*N*/ OSL_ENSURE( n >= nPos, "CloseRec: to much data read" );
-/*N*/ if( n != nPos )
-/*N*/ {
-/*?*/ pStream->Seek( n );
-/*?*/ if( n < nPos )
-/*?*/ bRes = FALSE;
-/*N*/ }
-/*N*/ if( pStream->GetErrorCode() != SVSTREAM_OK )
-/*?*/ bRes = FALSE;
-/*N*/ }
-/*N*/
-/*N*/ aRecTypes.Remove( nLvl, 1 );
-/*N*/ aRecSizes.Remove( nLvl, 1 );
-/*N*/ }
-/*N*/
-/*N*/ if( !bRes )
-/*?*/ bError = TRUE;
-/*N*/
-/*N*/ return bRes;
-/*N*/ }
-
-/*N*/ UINT32 SwLayCacheIoImpl::BytesLeft()
-/*N*/ {
-/*N*/ UINT16 nLvl = aRecSizes.Count();
-/*N*/ UINT32 n = 0;
-/*N*/ if( !bError && nLvl )
-/*N*/ {
-/*N*/ UINT32 nEndPos = aRecSizes[ nLvl-1 ];
-/*N*/ UINT32 nPos = pStream->Tell();
-/*N*/ if( nEndPos > nPos )
-/*N*/ n = nEndPos - nPos;
-/*N*/ }
-/*N*/
-/*N*/ return n;
-/*N*/ }
-
-/*N*/ BYTE SwLayCacheIoImpl::Peek()
-/*N*/ {
-/*N*/ BYTE c = 0;
-/*N*/ if( !bError )
-/*N*/ {
-/*N*/ UINT32 nPos = pStream->Tell();
-/*N*/ *pStream >> c;
-/*N*/ pStream->Seek( nPos );
-/*N*/ if( pStream->GetErrorCode() != SVSTREAM_OK )
-/*N*/ {
-/*?*/ c = 0;
-/*?*/ bError = TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/ return c;
-/*N*/ }
-
-
-/*N*/ BYTE SwLayCacheIoImpl::OpenFlagRec()
-/*N*/ {
-/*N*/ OSL_ENSURE( !bWriteMode, "OpenFlagRec illegal in write mode" );
-/*N*/ BYTE cFlags;
-/*N*/ *pStream >> cFlags;
-/*N*/ nFlagRecEnd = pStream->Tell() + ( cFlags & 0x0F );
-/*N*/ return (cFlags >> 4);
-/*N*/ }
-
-/*N*/ void SwLayCacheIoImpl::CloseFlagRec()
-/*N*/ {
-/*N*/ if( bWriteMode )
-/*N*/ {
-/*N*/ OSL_ENSURE( pStream->Tell() == nFlagRecEnd, "Wrong amount of data written" );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ OSL_ENSURE( pStream->Tell() <= nFlagRecEnd, "To many data read" );
-/*N*/ if( pStream->Tell() != nFlagRecEnd )
-/*?*/ pStream->Seek( nFlagRecEnd );
-/*N*/ }
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index e6d29d0..67ac3d0 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -454,7 +454,6 @@ class SwDoc
void _MakeFldList( int eMode );
// Datenbankfelder:
void UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc );
- void AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName );
void InitDrawModel();
void ReleaseDrawModel();
commit 33136dc77c0196fe61b4da2e99cd4fbcfaa5809a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:35:28 2011 +0100
move ByteString::ConvertToUnicode into binfilter
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 2f0c30d..0851400 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -58,6 +58,7 @@
#include "docoptio.hxx"
#include "globstr.hrc"
#include "attrib.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -1811,7 +1812,7 @@ void ScInterpreter::ScChar()
else
{
String aStr( '0' );
- aStr.SetChar( 0, ByteString::ConvertToUnicode( (sal_Char) fVal, gsl_getSystemTextEncoding() ) );
+ aStr.SetChar( 0, ByteString_ConvertToUnicode( (sal_Char) fVal, gsl_getSystemTextEncoding() ) );
PushString( aStr );
}
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx
index c9f2618..466f478 100644
--- a/binfilter/bf_sc/source/core/tool/sc_token.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx
@@ -39,6 +39,7 @@
#include "compiler.hxx"
#include "rechead.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
/*N*/ struct ImpTokenIterator
@@ -1370,7 +1371,7 @@ USHORT lcl_ScRawTokenOffset()
/*?*/ rStream.Read( c, nOp );
/*?*/ CharSet eSrc = rStream.GetStreamCharSet();
/*?*/ for ( BYTE j=0; j<nOp; j++ )
-/*?*/ cStr[j] = ByteString::ConvertToUnicode( c[j], eSrc );
+/*?*/ cStr[j] = ByteString_ConvertToUnicode( c[j], eSrc );
/*?*/ cStr[ nOp ] = 0;
/*?*/ break;
/*N*/ }
@@ -1436,7 +1437,7 @@ USHORT lcl_ScRawTokenOffset()
/*?*/ rStream.Read( c, nOp );
/*?*/ CharSet eSrc = rStream.GetStreamCharSet();
/*?*/ for ( BYTE j=1; j<nOp; j++ )
-/*?*/ cStr[j] = ByteString::ConvertToUnicode( c[j-1], eSrc );
+/*?*/ cStr[j] = ByteString_ConvertToUnicode( c[j-1], eSrc );
/*?*/ cStr[ 0 ] = 0; //! parameter count is what?!?
/*?*/ cStr[ nOp ] = 0;
/*?*/ break;
@@ -1483,7 +1484,7 @@ USHORT lcl_ScRawTokenOffset()
/*N*/ //! parameter count is in cByte (cStr[0] little endian)
/*N*/ CharSet eSrc = rStream.GetStreamCharSet();
/*N*/ for ( BYTE j=1; j<n+1; j++ )
-/*N*/ cStr[j] = ByteString::ConvertToUnicode( c[j], eSrc );
+/*N*/ cStr[j] = ByteString_ConvertToUnicode( c[j], eSrc );
/*N*/ cStr[ n+1 ] = 0;
/*N*/ break;
/*N*/ }
@@ -1495,7 +1496,7 @@ USHORT lcl_ScRawTokenOffset()
/*N*/ cStr[ n ] = 0;
/*N*/ CharSet eSrc = rStream.GetStreamCharSet();
/*N*/ for ( BYTE j=0; j<n; j++ )
-/*N*/ cStr[j] = ByteString::ConvertToUnicode( c[j], eSrc );
+/*N*/ cStr[j] = ByteString_ConvertToUnicode( c[j], eSrc );
/*N*/ cStr[ n ] = 0;
/*N*/ break;
/*N*/ }
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx
index 546e233..e47f3d9 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -33,6 +33,7 @@
#include <tools/stream.hxx>
#include "starmath.hrc"
#include "utility.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -219,7 +220,7 @@ int GetTextEncodingTabIndex( const String &rTxt, xub_StrLen nPos )
/*?*/ {
/*?*/ DBG_ASSERT( 0 <= nCharVal && nCharVal <= 256,
/*?*/ "character value out of range" );
-/*?*/ sRepl = ByteString::ConvertToUnicode( nCharVal, nEnc );
+/*?*/ sRepl = ByteString_ConvertToUnicode( nCharVal, nEnc );
/*?*/ }
/*?*/ DBG_ASSERT( sRepl.Len() || !nCharVal, "conversion failed" );
/*?*/ nReplLen = nPostStart + nPostLen - nPreStart;
diff --git a/binfilter/bf_svtools/source/misc/tl_tstring.cxx b/binfilter/bf_svtools/source/misc/tl_tstring.cxx
index 8829373..a6367d8 100644
--- a/binfilter/bf_svtools/source/misc/tl_tstring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tstring.cxx
@@ -41,6 +41,47 @@ namespace binfilter
aBuf,
static_cast< xub_StrLen >(rtl_str_valueOfInt32( aBuf, n, nRadix )) );
}
+
+ sal_Unicode ConvertToUnicode( const char* pChar, sal_Size* pLen, rtl_TextEncoding eTextEncoding )
+ {
+ // TextEncoding Dontknow wird nicht konvertiert
+ if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW )
+ return 0;
+
+ rtl_TextToUnicodeConverter hConverter;
+ sal_uInt32 nInfo;
+ sal_Size nSrcBytes;
+ sal_Size nDestChars;
+ sal_Unicode nConvChar;
+ hConverter = rtl_createTextToUnicodeConverter( eTextEncoding );
+ nDestChars = rtl_convertTextToUnicode( hConverter, 0,
+ (const sal_Char*)pChar, *pLen,
+ &nConvChar, 1,
+ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
+ RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
+ RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT |
+ RTL_TEXTTOUNICODE_FLAGS_FLUSH,
+ &nInfo, &nSrcBytes );
+ rtl_destroyTextToUnicodeConverter( hConverter );
+
+ if ( nDestChars == 1 )
+ {
+ *pLen = nSrcBytes;
+ return nConvChar;
+ }
+ else
+ {
+ *pLen = 0;
+ return 0;
+ }
+ }
+
+ sal_Unicode ByteString_ConvertToUnicode( char c, rtl_TextEncoding eTextEncoding )
+ {
+ sal_Size nLen = 1;
+ return ConvertToUnicode( &c, &nLen, eTextEncoding );
+ }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index 267bfe7..6704c84 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -55,6 +55,7 @@
#include "numhead.hxx"
#include "nfsymbol.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter
{
@@ -1458,7 +1459,7 @@ void SvNumberformat::LoadString( SvStream& rStream, String& rStr )
if ( *p == cStream )
*pUni = cTarget;
else
- *pUni = ByteString::ConvertToUnicode( *p, eStream );
+ *pUni = ByteString_ConvertToUnicode( *p, eStream );
p++;
pUni++;
}
diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
index 47a2058..56031de 100644
--- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx
@@ -52,6 +52,7 @@
#include <bf_svtools/intitem.hxx>
#include <tools/tenccvt.hxx>
+#include <bf_tools/string.hxx>
namespace binfilter {
DBG_NAME( EE_EditTextObject )
@@ -684,7 +685,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
{
if ( pItem->Which() == EE_FEATURE_NOTCONV )
{
- pC->GetText().SetChar( nStart, ByteString::ConvertToUnicode( aByteString.GetChar( nStart ), ((SvxCharSetColorItem*)pItem)->GetCharSet() ) );
+ pC->GetText().SetChar( nStart, ByteString_ConvertToUnicode( aByteString.GetChar( nStart ), ((SvxCharSetColorItem*)pItem)->GetCharSet() ) );
}
else
{
diff --git a/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx b/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx
index 87a77c3..a6dd548 100644
--- a/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx
@@ -163,11 +163,11 @@ void DecryptBlockName_Imp( String& rName );
/*N*/ {
/*N*/ nFlags = SvxAutoCorrect::GetDefaultFlags();
/*N*/
-/*N*/ c1Div2 = ByteString::ConvertToUnicode( '\xBD', RTL_TEXTENCODING_MS_1252 );
-/*N*/ c1Div4 = ByteString::ConvertToUnicode( '\xBC', RTL_TEXTENCODING_MS_1252 );
-/*N*/ c3Div4 = ByteString::ConvertToUnicode( '\xBE', RTL_TEXTENCODING_MS_1252 );
-/*N*/ cEmDash = ByteString::ConvertToUnicode( '\x97', RTL_TEXTENCODING_MS_1252 );
-/*N*/ cEnDash = ByteString::ConvertToUnicode( '\x96', RTL_TEXTENCODING_MS_1252 );
+/*N*/ c1Div2 = ByteString_ConvertToUnicode( '\xBD', RTL_TEXTENCODING_MS_1252 );
+/*N*/ c1Div4 = ByteString_ConvertToUnicode( '\xBC', RTL_TEXTENCODING_MS_1252 );
+/*N*/ c3Div4 = ByteString_ConvertToUnicode( '\xBE', RTL_TEXTENCODING_MS_1252 );
+/*N*/ cEmDash = ByteString_ConvertToUnicode( '\x97', RTL_TEXTENCODING_MS_1252 );
+/*N*/ cEnDash = ByteString_ConvertToUnicode( '\x96', RTL_TEXTENCODING_MS_1252 );
/*N*/ }
/*N*/ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index 67c8459..a5f8683 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -38,6 +38,7 @@
// #90477#
#include <tools/tenccvt.hxx>
+#include <bf_tools/string.hxx>
namespace binfilter {
#define BULITEM_VERSION ((USHORT)2)
@@ -148,7 +149,7 @@ namespace binfilter {
/*N*/
/*N*/ char cTmpSymbol;
/*N*/ rStrm >> cTmpSymbol;
-/*N*/ cSymbol = ByteString::ConvertToUnicode( cTmpSymbol, aFont.GetCharSet() );
+/*N*/ cSymbol = ByteString_ConvertToUnicode( cTmpSymbol, aFont.GetCharSet() );
/*N*/
/*N*/ rStrm >> nScale;
/*N*/
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index 4d5e5fd..c271397 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -49,6 +49,7 @@
#include "unonrule.hxx"
#include <legacysmgr/legacy_binfilters_smgr.hxx>
+#include <bf_tools/string.hxx>
namespace binfilter {
#define MM100_TO_TWIP(MM100) ((MM100*72L+63L)/127L)
@@ -253,7 +254,7 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ SetShowSymbol((BOOL)nUSHORT);
/*N*/
/*N*/ if( nVersion < NUMITEM_VERSION_03 )
-/*N*/ cBullet = ByteString::ConvertToUnicode( cBullet,
+/*N*/ cBullet = ByteString_ConvertToUnicode( cBullet,
/*N*/ (pBulletFont&&pBulletFont->GetCharSet()) ? pBulletFont->GetCharSet()
/*N*/ : RTL_TEXTENCODING_SYMBOL );
/*N*/ if(pBulletFont)
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
index 1feb8f1..e008a44 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
@@ -60,6 +60,7 @@
#include <fmtftntx.hxx>
#include <fmtclbl.hxx>
#include <SwStyleNameMapper.hxx>
+#include <bf_tools/string.hxx>
namespace binfilter {
////////////////////////////// Frame-Attribute ////////////////////////////
@@ -527,7 +528,7 @@ SfxPoolItem* SwGammaGrf::Create(SvStream & rStrm, USHORT ) const
/*N*/ sal_Char cChr = ' ';
/*N*/ if( nV )
/*N*/ rStrm >> cChr;
-/*N*/ sal_Unicode c = ByteString::ConvertToUnicode( cChr, rStrm.GetStreamCharSet() );
+/*N*/ sal_Unicode c = ByteString_ConvertToUnicode( cChr, rStrm.GetStreamCharSet() );
/*N*/ return new SwFmtHardBlank( c, FALSE );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index d0eb2ac..fff98b9 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -67,6 +67,7 @@
#include "poolfmt.hxx" // fuer InSetExpField
#include "poolfmt.hrc" // fuer InSetExpField
#include "bf_so3/staticbaseurl.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MINGW32__) && !defined(OS2)
@@ -577,7 +578,7 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ if( !rIo.bInsert ||
/*N*/ nFldTypeCount != rIo.pDoc->GetFldTypes()->Count() )
/*N*/ {
-/*N*/ pFldType->SetDelimiter( ByteString::ConvertToUnicode( cDelim,
+/*N*/ pFldType->SetDelimiter( ByteString_ConvertToUnicode( cDelim,
/*N*/ rIo.eSrcSet));
/*N*/ pFldType->SetOutlineLvl( nLevel );
/*N*/ }
@@ -617,9 +618,9 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
rIo.CloseFlagRec();
if( 0 == pFldType->GetEntryCount() || (rIo.bNormal && !rIo.bInsert) )
{
- pFldType->SetPreSuffix( ByteString::ConvertToUnicode( cPrefix,
+ pFldType->SetPreSuffix( ByteString_ConvertToUnicode( cPrefix,
rIo.eSrcSet ),
- ByteString::ConvertToUnicode( cSuffix,
+ ByteString_ConvertToUnicode( cSuffix,
rIo.eSrcSet ) );
pFldType->SetSequence( (cFlags & 0x10) != 0 );
pFldType->SetSortByDocument( (cFlags & 0x20) != 0);
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index b52878b..15788a4 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -79,6 +79,7 @@
#include <SwStyleNameMapper.hxx>
#include <legacysmgr/legacy_binfilters_smgr.hxx>
#include "bf_so3/staticbaseurl.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -985,7 +986,7 @@ extern void lcl_sw3io_FillSetExpFieldName( Sw3IoImp& rIo, sal_uInt16 nStrId,
/*N*/ sal_uInt8 cFillChar;
/*N*/ *pStrm >> cFillChar;
/*N*/ aToken.cTabFillChar =
-/*N*/ ByteString::ConvertToUnicode( cFillChar,
+/*N*/ ByteString_ConvertToUnicode( cFillChar,
/*N*/ eSrcSet );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 9e6995a..6c0e518 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -88,6 +88,7 @@
#include <swerror.h>
#include <SwStyleNameMapper.hxx>
#include "bf_so3/staticbaseurl.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
#define URL_DECODE \
@@ -457,7 +458,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ else if( bMathToSymbol )
rText += ConvStarMathCharToStarSymbol( c );
/*N*/ else
-/*N*/ rText += ByteString::ConvertToUnicode( c,
+/*N*/ rText += ByteString_ConvertToUnicode( c,
/*N*/ RTL_TEXTENCODING_SYMBOL );
/*N*/ }
/*N*/ }
@@ -498,7 +499,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ // if the assumption is wrong is to not convert a soft
/*N*/ // hyphen.
/*N*/ if( eEnc == eSrcSet ||
-/*N*/ CHAR_SOFTHYPHEN == ByteString::ConvertToUnicode( c, eEnc ) )
+/*N*/ CHAR_SOFTHYPHEN == ByteString_ConvertToUnicode( c, eEnc ) )
/*N*/ {
/*N*/ if( nCopy < nPos )
/*N*/ rText += String( rText8.Copy(nCopy,nPos-nCopy), eEnc );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index 71706f2..cb4184a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -60,6 +60,7 @@
#include "ftninfo.hxx"
#include "pagedesc.hxx"
#include <SwStyleNameMapper.hxx>
+#include <bf_tools/string.hxx>
namespace binfilter {
////////////////////////////////////////////////////////////////////////////
@@ -141,7 +142,7 @@ namespace binfilter {
/*N*/ else if( bMathToSymbol )
rFmt.SetBulletChar( ConvStarMathCharToStarSymbol( cBullet8 ) );
/*N*/ else
-/*N*/ rFmt.SetBulletChar( ByteString::ConvertToUnicode( cBullet8, eCharSet ) );
+/*N*/ rFmt.SetBulletChar( ByteString_ConvertToUnicode( cBullet8, eCharSet ) );
/*N*/ rFmt.SetIncludeUpperLevels( nUpperLevel );
/*N*/ rFmt.SetStart( nStart );
/*N*/ rFmt.SetNumAdjust( SvxAdjust( eNumAdjust ));
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx b/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx
index 337e242..4b50950 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx
@@ -61,6 +61,7 @@
#include <swgpar.hxx>
#include <swerror.h>
#include "bf_so3/staticbaseurl.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -320,7 +321,7 @@ namespace binfilter {
if( ch && (symfrom != (xub_StrLen)-1 &&
pos >= symfrom && pos < symto) )
{
- sal_Unicode cNew = ByteString::ConvertToUnicode( ch, eEnc );
+ sal_Unicode cNew = ByteString_ConvertToUnicode( ch, eEnc );
if( cNew )
rNdText.SetChar( pos, cNew );
}
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx b/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx
index a8fb4e4..6cb65c5 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx
@@ -47,6 +47,7 @@
#include "ndtxt.hxx"
#include "numrule.hxx"
#include "poolfmt.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -115,7 +116,7 @@ void SwSwgReader::InNumFmt( SwNumFmt& rFmt )
}
if( RTL_TEXTENCODING_DONTKNOW == eCharSet )
eCharSet = RTL_TEXTENCODING_SYMBOL;
- sal_Unicode cBull = ByteString::ConvertToUnicode( cBullet, eCharSet );
+ sal_Unicode cBull = ByteString_ConvertToUnicode( cBullet, eCharSet );
if( !cBull )
cBull = cBulletChar;
rFmt.SetNumberingType( eType );
diff --git a/binfilter/bf_sw/source/filter/inc/fltbase.hxx b/binfilter/bf_sw/source/filter/inc/fltbase.hxx
index 2500d4a..d233562 100644
--- a/binfilter/bf_sw/source/filter/inc/fltbase.hxx
+++ b/binfilter/bf_sw/source/filter/inc/fltbase.hxx
@@ -29,6 +29,7 @@
#define __FLTBASE_HXX__
#include <tools/stream.hxx>
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -77,7 +78,7 @@ inline void SwFilterBase::ReadUnicode( sal_Unicode &rU )
{
sal_Char cC;
*pIn >> cC;
- rU = ByteString::ConvertToUnicode(cC, eQuellChar);
+ rU = ByteString_ConvertToUnicode(cC, eQuellChar);
nBytesLeft--;
}
}
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index e1281ad..882dc12 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -94,6 +94,7 @@
#include <SwStyleNameMapper.hxx>
#include "bf_so3/staticbaseurl.hxx"
#include "linetype.hxx"
+#include <bf_tools/string.hxx>
namespace binfilter {
@@ -3576,7 +3577,7 @@ size_t Sw6Layout::PutRest(String &rStr,sal_Char *pCtrl)
}
break;
case ParaGraf: // Achtung: mit IBM_PC geht
- rStr+=ByteString::ConvertToUnicode( '\xA7', RTL_TEXTENCODING_MS_1252 );// nix: Zchn>=128 dann Conv
+ rStr+=ByteString_ConvertToUnicode( '\xA7', RTL_TEXTENCODING_MS_1252 );// nix: Zchn>=128 dann Conv
break;
case TabZch: // Tab erst spaeter einfg.
case InhKenn: // Dies Steuerzeichen werden
@@ -4177,7 +4178,7 @@ void Sw6Layout::InsertTab(USHORT nTab,TABU &rTab,SvxTabStopItem &rTabs,SwTwips n
sal_Unicode eFill=cDfltFillChar;
if ((BYTE)rTab.TabZch>' ')
{
- eFill= ByteString::ConvertToUnicode( rTab.TabZch, RTL_TEXTENCODING_IBM_850 );
+ eFill= ByteString_ConvertToUnicode( rTab.TabZch, RTL_TEXTENCODING_IBM_850 );
}
SvxTabAdjust eAdjust=SVX_TAB_ADJUST_LEFT;
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
index 1fe5e85..278b76e 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
@@ -102,6 +102,7 @@
#include <swerror.h>
#include <mdiexp.hxx> // ...SetPercent()
#include <statstr.hrc> // ResId fuer Statusleiste
+#include <bf_tools/string.hxx>
namespace binfilter {
#define HOR_SICHER 100 // Horizontale Bereiche werden mindestens so
@@ -1341,7 +1342,7 @@ void SwW4WParser::Read_UpperCharSet() // (UCS)
while( !nError && W4WR_RED != ( cRet = GetHexByte( c )) )
if( cRet == W4WR_TXTERM )
{
- sal_Unicode cC = ByteString::ConvertToUnicode( c,
+ sal_Unicode cC = ByteString_ConvertToUnicode( c,
RTL_TEXTENCODING_IBM_437 );
FlushChar( cC ); // z.B. Umlaute
@@ -1416,7 +1417,7 @@ void SwW4WParser::Read_ExtendCharSet() // (XCS)
}
}
- sal_Unicode cC = ByteString::ConvertToUnicode( c, eCodeSet );
+ sal_Unicode cC = ByteString_ConvertToUnicode( c, eCodeSet );
FlushChar( cC );
// folgt ein UCS-Record oder ein HEX-Record hinter einem XCS-Rec.,
@@ -1437,7 +1438,7 @@ void SwW4WParser::Read_Hex() // (HEX)
if( !nError && GetHexByte( c ) &&
0x15 == c ) // Juristenparagraph
{
- sal_Unicode cC = ByteString::ConvertToUnicode( '\xa7',
+ sal_Unicode cC = ByteString_ConvertToUnicode( '\xa7',
RTL_TEXTENCODING_MS_1252 );
if( bReadTxtIntoString )
*pReadTxtString += cC;
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
index c24aedc..f7e98fb 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -34,6 +34,7 @@
namespace binfilter
{
ByteString ByteString_CreateFromInt32(sal_Int32 n, sal_Int16 nRadix = 10);
+ sal_Unicode ByteString_ConvertToUnicode(sal_Char c, rtl_TextEncoding eTextEncoding);
}
#endif // _BF_STRING_HXX
commit 3185a019adfbe5da1392dcd5c9d8ceda8cfabec5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:30:59 2011 +0100
WaE: warnings in debug mode
diff --git a/binfilter/bf_svtools/source/items1/svt_stylepool.cxx b/binfilter/bf_svtools/source/items1/svt_stylepool.cxx
index d06cb05..09bf093 100644
--- a/binfilter/bf_svtools/source/items1/svt_stylepool.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_stylepool.cxx
@@ -229,18 +229,12 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
#ifdef DEBUG
{
sal_Int32 nCheck = -1;
- sal_Int32 nNo = -1;
IStylePoolIteratorAccess* pIter = createIterator();
StylePool::SfxItemSet_Pointer_t pTemp;
do
{
++nCheck;
pTemp = pIter->getNext();
- if( pCurNode->hasItemSet() && pTemp.get() == pCurNode->getItemSet().get() )
- {
- ::rtl::OUString aStr = pIter->getName();
- nNo = nCheck;
- }
} while( pTemp.get() );
DBG_ASSERT( nCount == nCheck, "Wrong counting");
delete pIter;
More information about the Libreoffice-commits
mailing list