[Libreoffice-commits] .: 3 commits - binfilter/bf_goodies binfilter/bf_sc binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 11 03:11:28 PDT 2011
binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 2
binfilter/bf_so3/source/inplace/outplace.cxx | 31 -
binfilter/bf_so3/source/misc/factory.cxx | 85 -----
binfilter/bf_so3/source/persist/persist.cxx | 26 -
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 40 --
binfilter/bf_svtools/source/misc/svt_imap.cxx | 70 ----
binfilter/bf_svtools/source/misc/tl_tstring.cxx | 41 ++
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 42 --
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 47 --
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 10
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 177 -----------
binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx | 93 -----
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 99 ------
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 34 --
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 14
binfilter/inc/bf_goodies/graphicobject.hxx | 2
binfilter/inc/bf_so3/factory.hxx | 2
binfilter/inc/bf_so3/outplace.hxx | 1
binfilter/inc/bf_so3/persist.hxx | 1
binfilter/inc/bf_svtools/imap.hxx | 7
binfilter/inc/bf_svtools/itempool.hxx | 4
binfilter/inc/bf_sw/authfld.hxx | 3
binfilter/inc/bf_sw/fmtfsize.hxx | 3
binfilter/inc/bf_sw/fmtornt.hxx | 2
binfilter/inc/bf_tools/string.hxx | 1
26 files changed, 44 insertions(+), 795 deletions(-)
New commits:
commit bca9bad67b5323992ee2b82888c257b590d8895c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 09:20:43 2011 +0100
callcatcher: unused methods
diff --git a/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx b/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
index cefad03..adcd27e 100644
--- a/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
+++ b/binfilter/bf_goodies/source/base2d/goodies_graphicobject.cxx
@@ -67,8 +67,6 @@ namespace binfilter {
void BfGraphicObject::ReleaseFromCache() { GraphicObject::ReleaseFromCache(); }
String BfGraphicObject::GetLink() const { return GraphicObject::GetLink(); }
void BfGraphicObject::SetLink( const String& rLink ) { GraphicObject::SetLink( rLink ); }
- BOOL BfGraphicObject::SwapOut() { return GraphicObject::SwapOut(); }
- BOOL BfGraphicObject::SwapOut( SvStream* pOStm ) { return GraphicObject::SwapOut( pOStm ); }
BOOL BfGraphicObject::SwapIn() { return GraphicObject::SwapIn(); }
BOOL BfGraphicObject::SwapIn( SvStream* pIStm ) { return GraphicObject::SwapIn( pIStm ); }
}//end of namespace binfilter
diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 130bf4e..285d3a0 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -1321,37 +1321,6 @@ void SvOutPlaceObject::HandsOff()
SvInPlaceObject::HandsOff();
}
-BOOL SvOutPlaceObject::MakeWorkStorageWrap_Impl( SvStorage * pStor )
-{
- BOOL bResult = FALSE;
-
- pImpl->xWorkingStg = new SvStorage( FALSE, String(), STREAM_STD_READWRITE, STORAGE_DELETEONRELEASE );
-
- SetupStorage( pImpl->xWorkingStg );
- SotStorageStreamRef xOleObjStm = pImpl->xWorkingStg->OpenSotStream(
- String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ole-Object" ) ),
- STREAM_STD_READWRITE );
-
- if( !xOleObjStm->GetError() )
- {
- SotStorageRef xOleObjStor = new SotStorage( *xOleObjStm );
- if( !xOleObjStor->GetError() )
- {
- xOleObjStm->SetBufferSize( 0xff00 );
-
- pStor->CopyTo( xOleObjStor );
- xOleObjStor->Commit();
- xOleObjStor.Clear();
-
- xOleObjStm->Commit();
-
- bResult = ( xOleObjStm->GetError() == ERRCODE_NONE );
- }
- }
-
- return bResult;
-}
-
com::sun::star::uno::Reference < ::com::sun::star::lang::XComponent > SvOutPlaceObject::GetUnoComponent() const
{
#ifdef WNT
diff --git a/binfilter/bf_so3/source/misc/factory.cxx b/binfilter/bf_so3/source/misc/factory.cxx
index 07a46ea..a9ea62d 100644
--- a/binfilter/bf_so3/source/misc/factory.cxx
+++ b/binfilter/bf_so3/source/misc/factory.cxx
@@ -652,91 +652,6 @@ SvGlobalName SvFactory::GetAutoConvertTo
}
//=========================================================================
-SvGlobalName SvFactory::GetSvClass
-(
- INT32 nFileFormat,
- const SvGlobalName & rClass
-)
-/* [Beschreibung]
-
- Die So2 Klasse die dieses Objekt in der nFileFormat Version serven soll.
-
- [R"uckgabewert]
-
- SvGlobalName Die KlassenId, die statt der "ubergebenen benutzt
- werden soll.
-
- [Querverweise]
-
- <SvFactory::SetAutoConvertTo>,
-*/
-{
- SvGlobalName aRet = rClass;
-
- USHORT nCount;
- ConvertTo_Impl (*pTable)[SO3_OFFICE_VERSIONS] = SetupConvertTable_Impl( &nCount );
- for( USHORT i = 0; i < nCount; i++ )
- {
- for( USHORT n = 0; n < SO3_OFFICE_VERSIONS; n++ )
- {
- if( pTable[i][n].aName == aRet )
- {
- if( nFileFormat <= SOFFICE_FILEFORMAT_31 )
- return pTable[i][0].aSvName;
- else if( nFileFormat <= SOFFICE_FILEFORMAT_40 )
- return pTable[i][1].aSvName;
- else if( nFileFormat <= SOFFICE_FILEFORMAT_50 )
- return pTable[i][2].aSvName;
- else if( nFileFormat <= SOFFICE_FILEFORMAT_60 )
- return pTable[i][3].aSvName;
- else
- return aRet;
- /*
- for( USHORT m = 0; m < SO3_OFFICE_VERSIONS; m++ )
- {
- if( pTable[i][m].aFormat == nFileFormat )
- return pTable[i][m].aSvName;
- }
- return aRet;
- */
- }
- }
- }
- return aRet;
-}
-
-//=========================================================================
-BOOL SvFactory::IsIntern31
-(
- const SvGlobalName & rClass
-)
-/* [Beschreibung]
-
- Ist es in der 31 Version ein internes Objekt.
-
- [R"uckgabewert]
-
- BOOL TRUE, es ist 31 intern.
-
- [Querverweise]
-*/
-{
- SvGlobalName aRet = rClass;
-
- USHORT nCount;
- ConvertTo_Impl (*pTable)[SO3_OFFICE_VERSIONS] = SetupConvertTable_Impl( &nCount );
- for( USHORT i = 0; i < nCount; i++ )
- {
- for( USHORT n = 0; n < SO3_OFFICE_VERSIONS; n++ )
- {
- if( pTable[i][n].aName == aRet )
- // Wenn es ein InPlace-Objekt ist, muss es extern sein
- return *SvInPlaceObject::ClassFactory() != pTable[i][0].aSvName;
- }
- }
- return FALSE;
-}
-//=========================================================================
BOOL SvFactory::IsIntern
(
const SvGlobalName & rClass,
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index f473e99..c96cf18 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1245,32 +1245,6 @@ void SvPersist::LoadContent( SvStream & rStm, BOOL bOwner_ )
// nichts tun bei Fremd-Format
}
-BOOL SvPersist::DoSaveContent( SvStorage * pStor, BOOL bOwner_ )
-{
- // MAC MPW mag's sonst nicht ...
- String aPersistStream( bOwner_ ? String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( PERSIST_STREAM ) )
- : String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) );
- SvStorageStreamRef aContStm = pStor->OpenStream( aPersistStream );
- if( aContStm.Is() )
- {
- // Version am Stream setzen
- aContStm->SetVersion( pStor->GetVersion() );
- aContStm->SetBufferSize( 8192 );
-#if defined( SOLARIS ) && defined( C40 )
- // patch to work around Sparc-Compiler bug with virtual multiple inheritance
- SvEmbeddedObjectRef xSvEmbeddedObjectRef = this;
- if( xSvEmbeddedObjectRef.Is() )
- xSvEmbeddedObjectRef->SaveContent( *aContStm, bOwner_ );
- else
-#else
- SaveContent( *aContStm, bOwner_ );
-#endif
- aContStm->SetBufferSize( 0 );
- return aContStm->GetError() == SVSTREAM_OK;
- }
- return FALSE;
-}
-
void SvPersist::SaveContent( SvStream & rStm, BOOL bOwner_ )
{
if( bOwner_ )
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 2b9f258..0d453dc 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -46,46 +46,6 @@ namespace binfilter
DBG_NAME(SfxItemPool)
-//========================================================================
-
-void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool )
-
-/* [Beschreibung]
-
- Diese Methode setzt den <SfxItemPool>, der gerade gespeichert wird.
- Sie sollte nur in Notf"allen verwendet werden, um z.B. File-Format-
- Kompatibilit"at zu gew"ahrleisten o."o. - z.B. in der "uberladung eines
- <SfxPoolItem::Store()> zus"atzliche Daten aus dem dazuge"horigen
- Pool mit <SfxItemPool::GetStoringPool()> zu besorgen.
-
- Sie wird von <SfxItemPool::Store()> bedient, kann jedoch f"ur nicht
- poolable Items auch direkt gerufen werden. Bitte m"oglichst nicht
- f"ur jedes Item einzeln, da 2 Calls!
-*/
-
-{
- ImpSvtData::GetSvtData().pStoringPool = pStoringPool;
-}
-
-//-------------------------------------------------------------------------
-
-const SfxItemPool* SfxItemPool::GetStoringPool()
-
-/* [Beschreibung]
-
- Diese Methode liefert den <SfxItemPool>, der gerade gespeichert wird.
- Sie sollte nur in Notf"allen verwendet werden, um z.B. File-Format-
- Kompatibilit"at zu gew"ahrleisten o."o. - z.B. in der "uberladung eines
- <SfxPoolItem::Store()> zus"atzliche Daten aus dem dazuge"horigen
- Pool zu besorgen.
-*/
-
-{
- return ImpSvtData::GetSvtData().pStoringPool;
-}
-
-//-------------------------------------------------------------------------
-
void SfxItemPool::LoadCompleted()
/* [Beschreibung]
diff --git a/binfilter/bf_svtools/source/misc/svt_imap.cxx b/binfilter/bf_svtools/source/misc/svt_imap.cxx
index e57986a..cba1681 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap.cxx
@@ -886,18 +886,6 @@ BOOL ImageMap::operator!=( const ImageMap& rImageMap )
/******************************************************************************
|*
-|* Freigabe des internen Speichers
-|*
-\******************************************************************************/
-
-UINT16 ImageMap::GetVersion() const
-{
- return IMAGE_MAP_VERSION;
-}
-
-
-/******************************************************************************
-|*
|* Einfuegen eines neuen Objekts
|*
\******************************************************************************/
@@ -957,26 +945,6 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
}
}
-
-/******************************************************************************
-|*
-|* Objekte nacheinander wegschreiben
-|*
-\******************************************************************************/
-
-void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
-{
- IMapObject* pObj;
- USHORT nCount = (USHORT) maList.Count();
-
- for ( USHORT i = 0; i < nCount; i++ )
- {
- pObj = (IMapObject*) maList.GetObject( i );
- pObj->Write( rOStm, rBaseURL );
- }
-}
-
-
/******************************************************************************
|*
|* Objekte nacheinander lesen
diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
index d8c934b..f97a982 100644
--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
@@ -435,27 +435,6 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
return bRet;
}
-Size SwFmtFrmSize::GetSizeConvertedToSw31(
- const SvxLRSpaceItem *pLRSpace,
- const SvxULSpaceItem *pULSpace ) const
-{
- // Sw4.0: Groesse enthaelt keine Raender
- // Sw3.x: Groesse enthaelt Raender
- // ==> Raender addieren
- Size aNewSize = GetSize();
- if( pLRSpace )
- {
- aNewSize.Width() += pLRSpace->GetLeft();
- aNewSize.Width() += pLRSpace->GetRight();
- }
- if( pULSpace )
- {
- aNewSize.Height() += pULSpace->GetUpper();
- aNewSize.Height() += pULSpace->GetLower();
- }
- return aNewSize;
-}
-
Size SwFmtFrmSize::GetSizeConvertedFromSw31(
const SvxLRSpaceItem *pLRSpace,
const SvxULSpaceItem *pULSpace ) const
@@ -1167,19 +1146,6 @@ SfxPoolItem* SwFmtVertOrient::Clone( SfxItemPool* ) const
}
-SwTwips SwFmtVertOrient::GetPosConvertedToSw31(
- const SvxULSpaceItem *pULSpace ) const
-{
- SwTwips nNewPos = GetPos();
-
- if( VERT_NONE==GetVertOrient() && pULSpace )
- {
- nNewPos -= pULSpace->GetUpper();
- }
-
- return nNewPos;
-}
-
SwTwips SwFmtVertOrient::GetPosConvertedFromSw31(
const SvxULSpaceItem *pULSpace ) const
{
@@ -1309,19 +1275,6 @@ SfxPoolItem* SwFmtHoriOrient::Clone( SfxItemPool* ) const
}
-SwTwips SwFmtHoriOrient::GetPosConvertedToSw31(
- const SvxLRSpaceItem *pLRSpace ) const
-{
- SwTwips nNewPos = GetPos();
-
- if( HORI_NONE==GetHoriOrient() && pLRSpace )
- {
- nNewPos -= pLRSpace->GetLeft();
- }
-
- return nNewPos;
-}
-
SwTwips SwFmtHoriOrient::GetPosConvertedFromSw31(
const SvxLRSpaceItem *pLRSpace ) const
{
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 79895a6..67b9288 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -259,7 +259,6 @@ class Sw3StringPool
long nExpFFVersion; // Export: FF-Version (SOFFICE_FILEFORMAT_??)
BOOL bFixed;
- void Setup( SwDoc& rDoc, const SwFmt& rFmt, USHORT=0 );
void RemoveExtension( SwFmt& );
public:
@@ -269,7 +268,6 @@ public:
void RemoveExtensions( SwDoc& );
static void RemoveExtension( String& );
USHORT Add( const String&, USHORT nPoolId /*= 0*/, BOOL bDontSearch=FALSE );
- USHORT Find( const String&, USHORT nPoolId );
const String& Find( USHORT );
USHORT FindPoolId( USHORT );
@@ -513,10 +511,6 @@ public:
void CheckIoError( SvStream*); // korrekten E/A-Fehlercode setzen
static String ConvertStringNoDbDelim( const ByteString& rStr,
rtl_TextEncoding eSource );
- static ByteString ConvertStringNoDelim( const String& rStr,
- sal_Unicode cSrcDelim,
- sal_Char cDelim,
- rtl_TextEncoding eSource );
static String ConvertStringNoDelim( const ByteString& rStr,
sal_Char cSrcDelim,
sal_Unicode cDelim,
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 1c4660d..e9311a9 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1334,34 +1334,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ rName.Erase( nOff );
/*N*/ }
-// Eintragen der Strings eines Formats
-// Falls nId angegeben ist, wird diese Zahl mit einem Hash an den Namen
-// angefuegt, um eine Eindeutigkeit zu gewaehrleisten.
-
-/*N*/ void Sw3StringPool::Setup( SwDoc& rDoc, const SwFmt& rFmt, sal_uInt16 nId )
-/*N*/ {
-/*N*/ // Das Written-Flag wird gleich mit geknackt!
-/*N*/ // Das ist wichtig, da Formate (theoretisch) in verschiedenen
-/*N*/ // Streams landen koennen.
-/*N*/ OSL_ENSURE( !rFmt.IsWritten(), "Written-Flag am Format ist gesetzt" );
-/*N*/
-/*N*/ String aName( rFmt.GetName() );
-/*N*/ if( nId )
-/*N*/ {
-/*N*/ OSL_ENSURE( nId==Count()+1, "id ungleich String-Pool-Pos" );
-/*N*/ aName += EXT_SEPARATOR, aName += String::CreateFromInt32(nId);
-/*N*/ // Kein SetName() wg. Assert
-/*N*/ (String&)((SwFmt&)rFmt).GetName() = aName;
-/*N*/ }
-/*N*/ Add( aName, rFmt.GetPoolFmtId(), nId!=0 );
-/*N*/ if( rFmt.GetPoolHlpFileId() != UCHAR_MAX )
-/*N*/ {
-/*?*/ String* pId = rDoc.GetDocPattern( rFmt.GetPoolHlpFileId() );
-/*?*/ if( pId )
-/*?*/ Add( *pId, 0 );
-/*N*/ }
-/*N*/ }
-
/*N*/ sal_uInt16 Sw3StringPool::Add( const String& r, sal_uInt16 n, sal_Bool bDontSearch )
/*N*/ {
/*N*/ sal_uInt16 i = bDontSearch ? aPool.Count() : 0;
@@ -1389,51 +1361,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ }
-
-/*N*/ sal_uInt16 Sw3StringPool::Find( const String& r, sal_uInt16 nPoolId )
-/*N*/ {
-/*N*/ OSL_ENSURE( nExpFFVersion, "String-Pool: FF-Version nicht gesetzt" );
-/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 && nPoolId && nPoolId<IDX_SPEC_VALUE )
-/*N*/ nPoolId = ConvertToOldPoolId( nPoolId, nExpFFVersion );
-/*N*/
-/*N*/ xub_StrLen nOff = r.Search( EXT_SEPARATOR );
-/*N*/ if( nOff != STRING_NOTFOUND )
-/*N*/ {
-/*N*/ xub_StrLen nPos = (xub_StrLen)r.Copy(nOff+1).ToInt32() - 1;
-/*N*/ if( nPos<aPool.Count() )
-/*N*/ {
-/*N*/ const Sw3String* p3Str = aPool.GetObject( nPos );
-/*N*/ if( nPoolId == p3Str->GetPoolId() && r==*p3Str )
-/*N*/ return nPos;
-/*N*/ }
-/*N*/ OSL_ENSURE( !this, "String-Pool-Position ungueltig" );
-/*N*/ }
-/*N*/
-/*N*/ xub_StrLen nLen = r.Len();
-/*N*/ for( sal_uInt16 i = 0; i < aPool.Count(); i++ )
-/*N*/ {
-/*N*/ const Sw3String* p3Str = aPool.GetObject( i );
-/*N*/ if( nPoolId == p3Str->GetPoolId() && nLen==p3Str->Len() )
-/*N*/ {
-/*N*/ xub_StrLen n = nLen;
-/*N*/ sal_Bool bFound = sal_True;
-/*N*/ while( bFound && n )
-/*N*/ {
-/*N*/ n--;
-/*N*/ if( r.GetChar(n) != p3Str->GetChar(n) )
-/*N*/ {
-/*N*/ bFound = sal_False;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( bFound )
-/*N*/ return i;
-/*N*/ }
-/*N*/ }
-/*N*/ return IDX_NO_VALUE;
-/*N*/ }
-
/*N*/ const String& Sw3StringPool::Find( sal_uInt16 i )
/*N*/ {
/*N*/ if( i < IDX_SPEC_VALUE )
@@ -1574,32 +1501,6 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ return ConvertStringNoDelim( rStr, '\xff', DB_DELIM, eSource );
/*N*/ }
-/*N*/ ByteString Sw3IoImp::ConvertStringNoDelim( const String& rStr,
-/*N*/ sal_Unicode cSrcDelim,
-/*N*/ sal_Char cDelim,
-/*N*/ rtl_TextEncoding eSource )
-/*N*/ {
-/*N*/ ByteString sDest;
-/*N*/ xub_StrLen nStart = 0;
-/*N*/ xub_StrLen nPos = 0;
-/*N*/ do
-/*N*/ {
-/*N*/ nPos = rStr.Search( cSrcDelim, nStart );
-/*N*/ if( STRING_NOTFOUND == nPos )
-/*N*/ nPos = rStr.Len();
-/*N*/
-/*N*/ if( nStart > 0 )
-/*N*/ sDest += cDelim;
-/*N*/
-/*N*/ if( nPos > nStart )
-/*N*/ sDest += ByteString( rStr.Copy( nStart, nPos-nStart ), eSource );
-/*N*/ nStart = nPos+1;
-/*N*/ }
-/*N*/ while( nPos < rStr.Len() );
-/*N*/
-/*N*/ return sDest;
-/*N*/ }
-
/*N*/ String Sw3IoImp::ConvertStringNoDelim( const ByteString& rStr,
/*N*/ sal_Char cSrcDelim,
/*N*/ sal_Unicode cDelim,
diff --git a/binfilter/inc/bf_goodies/graphicobject.hxx b/binfilter/inc/bf_goodies/graphicobject.hxx
index e53f2c5..54f449d 100644
--- a/binfilter/inc/bf_goodies/graphicobject.hxx
+++ b/binfilter/inc/bf_goodies/graphicobject.hxx
@@ -86,8 +86,6 @@ namespace binfilter {
void ReleaseFromCache();
String GetLink() const;
void SetLink( const String& rLink );
- BOOL SwapOut();
- BOOL SwapOut( SvStream* pOStm );
BOOL SwapIn();
BOOL SwapIn( SvStream* pIStm );
};
diff --git a/binfilter/inc/bf_so3/factory.hxx b/binfilter/inc/bf_so3/factory.hxx
index 2bfe735..dcfb62f 100644
--- a/binfilter/inc/bf_so3/factory.hxx
+++ b/binfilter/inc/bf_so3/factory.hxx
@@ -89,8 +89,6 @@ public:
BOOL IsRegistered() const { return nRegisterId != 0; }
static SvGlobalName GetAutoConvertTo( const SvGlobalName & rClass );
- static SvGlobalName GetSvClass( INT32 nFileFormat, const SvGlobalName & rClass );
- static BOOL IsIntern31( const SvGlobalName & rClass );
static BOOL IsIntern( const SvGlobalName & rClass,
long *pFileFormat );
static SvGlobalName GetServerName( long nStorageFormat );
diff --git a/binfilter/inc/bf_so3/outplace.hxx b/binfilter/inc/bf_so3/outplace.hxx
index 68a5ad5..e90fbb8 100644
--- a/binfilter/inc/bf_so3/outplace.hxx
+++ b/binfilter/inc/bf_so3/outplace.hxx
@@ -58,7 +58,6 @@ private:
SO3_DLLPRIVATE void DataChanged_Impl( BOOL bOnlyEmbedSource );
SO3_DLLPRIVATE void LoadSO_Cont();
- SO3_DLLPRIVATE BOOL MakeWorkStorageWrap_Impl( SvStorage * pStor );
protected:
SO3_DLLPRIVATE virtual void FillClass( SvGlobalName * pClassName,
diff --git a/binfilter/inc/bf_so3/persist.hxx b/binfilter/inc/bf_so3/persist.hxx
index f1483d5..142c579 100644
--- a/binfilter/inc/bf_so3/persist.hxx
+++ b/binfilter/inc/bf_so3/persist.hxx
@@ -165,7 +165,6 @@ protected:
SO3_DLLPRIVATE BOOL DoLoadContent( SvStorage *, BOOL bOwner );
virtual void LoadContent( SvStream & rStm, BOOL bOwner );
- SO3_DLLPRIVATE BOOL DoSaveContent( SvStorage *, BOOL bOwner );
virtual void SaveContent( SvStream & rStm, BOOL bOwner );
SO3_DLLPRIVATE BOOL HasStorage() const { return aStorage.Is(); }
diff --git a/binfilter/inc/bf_svtools/imap.hxx b/binfilter/inc/bf_svtools/imap.hxx
index 2b14194..6624b93 100644
--- a/binfilter/inc/bf_svtools/imap.hxx
+++ b/binfilter/inc/bf_svtools/imap.hxx
@@ -59,8 +59,7 @@ class ImageMap
protected:
- // Binaer laden/speichern
- void ImpWriteImageMap( SvStream& rOStm, const String& ) const ;
+ // Binaer laden
void ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& );
public:
@@ -99,9 +98,6 @@ public:
// Loescht alle internen Objekte
void ClearImageMap();
- // liefert die aktuelle Versionsnummer
- UINT16 GetVersion() const;
-
// liefert / setzt den Namen der ImageMap
const String& GetName() const { return aName; }
void SetName( const String& rName ) { aName = rName; }
diff --git a/binfilter/inc/bf_svtools/itempool.hxx b/binfilter/inc/bf_svtools/itempool.hxx
index e8d934b..675e888 100644
--- a/binfilter/inc/bf_svtools/itempool.hxx
+++ b/binfilter/inc/bf_svtools/itempool.hxx
@@ -247,10 +247,6 @@ public:
return nId && nId <= SFX_WHICH_MAX; }
static int IsSlot(USHORT nId) {
return nId && nId > SFX_WHICH_MAX; }
-
- static const SfxItemPool* GetStoringPool();
- static void SetStoringPool( const SfxItemPool * );
-
private:
const SfxItemPool& operator=(const SfxItemPool &); // n.i.!!
};
diff --git a/binfilter/inc/bf_sw/fmtfsize.hxx b/binfilter/inc/bf_sw/fmtfsize.hxx
index 6d075ad..89258a0 100644
--- a/binfilter/inc/bf_sw/fmtfsize.hxx
+++ b/binfilter/inc/bf_sw/fmtfsize.hxx
@@ -98,9 +98,6 @@ public:
void SetHeightPercent( BYTE n ) { nHeightPercent = n; }
void SetWidthPercent ( BYTE n ) { nWidthPercent = n; }
- // Umrechnung der Groesse zwischen SW31/SW40
- Size GetSizeConvertedToSw31( const SvxLRSpaceItem *pLRSpace,
- const SvxULSpaceItem *pULSpace ) const;
Size GetSizeConvertedFromSw31( const SvxLRSpaceItem *pLRSpace,
const SvxULSpaceItem *pULSpace ) const;
};
diff --git a/binfilter/inc/bf_sw/fmtornt.hxx b/binfilter/inc/bf_sw/fmtornt.hxx
index e89aad7..44e3f9f 100644
--- a/binfilter/inc/bf_sw/fmtornt.hxx
+++ b/binfilter/inc/bf_sw/fmtornt.hxx
@@ -69,7 +69,6 @@ public:
SwTwips GetPos() const { return nYPos; }
void SetPos( SwTwips nNew ) { nYPos = nNew; }
- SwTwips GetPosConvertedToSw31( const SvxULSpaceItem *pULSpace ) const;
SwTwips GetPosConvertedFromSw31( const SvxULSpaceItem *pULSpace ) const;
};
@@ -108,7 +107,6 @@ public:
SwTwips GetPos() const { return nXPos; }
void SetPos( SwTwips nNew ) { nXPos = nNew; }
- SwTwips GetPosConvertedToSw31( const SvxLRSpaceItem *pLRSpace ) const;
SwTwips GetPosConvertedFromSw31( const SvxLRSpaceItem *pLRSpace ) const;
BOOL IsPosToggle() const { return bPosToggle; }
commit 71725e54cc9448d416e730f15656adc8672854c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 10 21:32:10 2011 +0100
callcatcher: unused code
diff --git a/binfilter/bf_svtools/source/misc/svt_imap.cxx b/binfilter/bf_svtools/source/misc/svt_imap.cxx
index f2225df..e57986a 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap.cxx
@@ -1025,44 +1025,6 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rB
}
}
-
-/******************************************************************************
-|*
-|* Binaer speichern
-|*
-\******************************************************************************/
-
-void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
-{
- IMapCompat* pCompat;
- String aImageName( GetName() );
- String aDummy;
- USHORT nOldFormat = rOStm.GetNumberFormatInt();
- UINT16 nCount = (UINT16) GetIMapObjectCount();
- const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding();
-
- rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-
- // MagicCode schreiben
- rOStm << IMAPMAGIC;
- rOStm << GetVersion();
- rOStm.WriteByteString( ByteString( aImageName, eEncoding ) );
- rOStm.WriteByteString( ByteString( aDummy, eEncoding ) );
- rOStm << nCount;
- rOStm.WriteByteString( ByteString( aImageName, eEncoding ) );
-
- pCompat = new IMapCompat( rOStm, STREAM_WRITE );
-
- // hier kann in neueren Versionen eingefuegt werden
-
- delete pCompat;
-
- ImpWriteImageMap( rOStm, rBaseURL );
-
- rOStm.SetNumberFormatInt( nOldFormat );
-}
-
-
/******************************************************************************
|*
|* Binaer laden
diff --git a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
index f9b149c..5b636e9 100644
--- a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
@@ -96,40 +96,6 @@ BOOL SwAuthEntry::operator==(const SwAuthEntry& rComp)
return TRUE;
}
// --------------------------------------------------------
-BOOL SwAuthEntry::GetFirstAuthorField(USHORT& nPos, String& rToFill)const
-{
- BOOL bRet = FALSE;
- for(USHORT i = 0; i < AUTH_FIELD_END; i++)
- if(aAuthFields[i].Len())
- {
- rToFill = aAuthFields[i];
- nPos = i;
- bRet = TRUE;
- break;
- }
- return bRet;
-}
-// --------------------------------------------------------
-BOOL SwAuthEntry::GetNextAuthorField(USHORT& nPos, String& rToFill)const
-{
- BOOL bRet = FALSE;
- if(AUTH_FIELD_END > ++nPos)
- {
- for(USHORT i = nPos; i < AUTH_FIELD_END; i++)
- if(aAuthFields[i].Len())
- {
- rToFill = aAuthFields[i];
- nPos = i;
- bRet = TRUE;
- break;
- }
- }
- return bRet;
-}
-
-// --------------------------------------------------------
-
-
SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
: SwFieldType( RES_AUTHORITY )
, m_pDoc(pDoc)
@@ -311,14 +277,6 @@ USHORT SwAuthorityFieldType::GetEntryCount() const
return m_pDataArr->Count();
}
-const SwAuthEntry* SwAuthorityFieldType::GetEntryByPosition(USHORT nPos) const
-{
- if(nPos < m_pDataArr->Count())
- return m_pDataArr->GetObject(nPos);
- OSL_FAIL("wrong index");
- return 0;
-}
-
USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
{
//find the field in a sorted array of handles,
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 05d3dd8..79895a6 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -526,7 +526,6 @@ public:
inline SvStream& OutString( SvStream& rStrm, const String& rStr );
void AddTblLineBoxFmt( SwFrmFmt *pFmt );
- USHORT GetTblLineBoxFmtStrPoolId40( SwFrmFmt *pFmt );
SwFrmFmt *GetTblLineBoxFmt( USHORT nIdx );
// Ist eingelene Datei neuer oder gleich nMinVers und aelter
@@ -598,7 +597,6 @@ public:
const SwTxtNode *pTxtNd=0 );// I: Attribut
void OutAttr( const SfxPoolItem&, xub_StrLen nBgn, xub_StrLen nEnd );
void InAttrSet( SwAttrSet& rSet ); // I: AttrSet
- void OutAttrSet( const SfxItemSet&, BOOL bSFmt=FALSE ); // O: AttrSet
SwFmt* InFormat( BYTE cKind, SwFmt* ); // I: Format
void InFlyFrames(); // I: globale FlyFrames
@@ -751,7 +749,6 @@ void lcl_sw3io__ConvertNumTabStop( SwTxtNode& rTxtNd, long nOffset,
BOOL bDeep );
void lcl_sw3io__ConvertNumTabStop( SvxTabStopItem& rTStop, long nOffset );
-void lcl_sw3io__ConvertMarkToOutline( String& rURL );
} //namespace binfilter
#endif
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 5fa79c7..9b5fc32 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -334,21 +334,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ rName = rIo.aStringPool.Find( nStrId );
/*N*/ }
-/*N*/ USHORT lcl_sw3io_GetSetExpFieldPoolId( const String& rName )
-/*N*/ {
-/*N*/ if( rName == String( SW_RES(STR_POOLCOLL_LABEL_ABB) ) )
-/*N*/ return RES_POOLCOLL_LABEL_ABB;
-/*N*/ else if( rName == String( SW_RES(STR_POOLCOLL_LABEL_TABLE) ) )
-/*N*/ return RES_POOLCOLL_LABEL_TABLE;
-/*N*/ else if( rName == String( SW_RES(STR_POOLCOLL_LABEL_FRAME) ) )
-/*N*/ return RES_POOLCOLL_LABEL_FRAME;
-/*N*/ else if( rName == String( SW_RES(STR_POOLCOLL_LABEL_DRAWING) ) )
-/*N*/ return RES_POOLCOLL_LABEL_DRAWING;
-/*N*/ else
-/*N*/ return USHRT_MAX;
-/*N*/ }
-
-
//////////////////////////////////////////////////////////////////////////////
// Ausgabe der Feldtypen
@@ -383,20 +368,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ return (SwDBFieldType*) rIo.pDoc->InsertFldType( aType );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDBFieldType( Sw3IoImp& rIo, SwDBFieldType* pType )
-/*N*/ {
-/*N*/ *rIo.pStrm << (UINT16) rIo.aStringPool.Find( pType->GetColumnName(), USHRT_MAX );
-/*N*/
-/*N*/ if( !rIo.IsSw31Export() )
-/*N*/ {
-/*N*/ SwDBData aData = pType->GetDBData();
-/*N*/ String sDBName(aData.sDataSource);
-/*N*/ sDBName += DB_DELIM;
-/*N*/ sDBName += (String)aData.sCommand;
-/*N*/ *rIo.pStrm << (UINT16) rIo.aStringPool.Find( sDBName, IDX_NOCONV_FF );
-/*N*/ }
-/*N*/ }
-
/*N*/ SwUserFieldType* lcl_sw3io_InUserFieldType40( Sw3IoImp& rIo )
/*N*/ {
/*N*/ String aName, aContent, aValue;
@@ -468,24 +439,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ return p;
/*N*/ }
-/*N*/ void lcl_sw3io_OutUserFieldType40( Sw3IoImp& rIo, SwUserFieldType* pType )
-/*N*/ {
-/*N*/ String aValue(String::CreateFromDouble(pType->GetValue()));
-/*N*/ *rIo.pStrm << (UINT16) rIo.aStringPool.Find( pType->GetName(), USHRT_MAX );
-/*N*/ rIo.OutString( *rIo.pStrm, pType->GetContent() );
-/*N*/ rIo.OutString( *rIo.pStrm, aValue );
-/*N*/ *rIo.pStrm << (UINT16) pType->GetType();
-/*N*/ }
-
-/*N*/ void lcl_sw3io_OutUserFieldType( Sw3IoImp& rIo, SwUserFieldType* pType )
-/*N*/ {
-/*N*/ *rIo.pStrm << (UINT16) rIo.aStringPool.Find( pType->GetName(), USHRT_MAX );
-/*N*/ rIo.OutString( *rIo.pStrm, pType->GetContent() );
-/*N*/ *rIo.pStrm << (double)pType->GetValue()
-/*N*/ << (UINT16) pType->GetType();
-/*N*/ }
-
-
/*N*/ SwDDEFieldType* lcl_sw3io_InDDEFieldType( Sw3IoImp& rIo )
/*N*/ {
/*N*/ UINT16 nType;
@@ -534,15 +487,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ return (SwDDEFieldType*) rIo.pDoc->InsertFldType( aType );
/*N*/ }
-/*N*/ void lcl_sw3io_OutDDEFieldType( Sw3IoImp& rIo, SwDDEFieldType* pType )
-/*N*/ {
-/*N*/ *rIo.pStrm << (USHORT) pType->GetType()
-/*N*/ << (UINT16) rIo.aStringPool.Find( pType->GetName(), USHRT_MAX );
-/*N*/ ByteString s8 = rIo.ConvertStringNoDelim( pType->GetCmd(),
-/*N*/ ::binfilter::cTokenSeperator, '\xff', rIo.eSrcSet );
-/*N*/ rIo.pStrm->WriteByteString( s8 );
-/*N*/ }
-
/*N*/ SwSetExpFieldType* lcl_sw3io_InSetExpFieldType( Sw3IoImp& rIo )
/*N*/ {
/*N*/ UINT16 nType;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index 1bc479f..9cea15e 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -304,99 +304,6 @@ sal_Bool lcl_sw3io_insFtn( const SwTxtNode *pTxtNd )
/*N*/ CloseRec( SWG_ATTRSET );
/*N*/ }
-/*N*/ void Sw3IoImp::OutAttrSet( const SfxItemSet& rSet, BOOL bSectionFmt )
-/*N*/ {
-/*N*/ if( rSet.Count() )
-/*N*/ {
-/*N*/ // Beim 3.1 Export den aktuellen Attrset merken
-/*N*/ const SfxItemSet *pOldExportItemSet = NULL;
-/*N*/ if( pExportInfo )
-/*N*/ {
-/*N*/ pOldExportItemSet = pExportInfo->pItemSet;
-/*N*/ pExportInfo->pItemSet = &rSet;
-/*N*/ }
-/*N*/
-/*N*/ OpenRec( SWG_ATTRSET );
-/*N*/ SfxItemIter aIter( rSet );
-/*N*/ const SfxPoolItem* pAttr = aIter.GetCurItem();
-/*N*/ const SfxItemPool *pTmp = SfxItemPool::GetStoringPool();
-/*N*/ SfxItemPool::SetStoringPool( &pDoc->GetAttrPool() );
-/*N*/ for( USHORT i = 0; i < rSet.Count() && Good(); i++ )
-/*N*/ {
-/*N*/ // Header- und Footer- Attribute werden u.U. nicht rausgeschrieben,
-/*N*/ // wenn sie im Leftformat einer Seitenvorlage mit HdrShared
-/*N*/ // oder FtrShared vorliegen. Dann wird nur das Attribut im
-/*N*/ // MAsterformat gespeichert (siehe auch SW3PAGE.CXX, OutPageDesc())
-/*N*/ USHORT nWhich = pAttr->Which();
-/*N*/ BOOL bNoHdr = RES_HEADER == nWhich &&
-/*N*/ ( nGblFlags & SW3F_NOHDRFMT ) != 0;
-/*N*/ BOOL bNoFtr = RES_FOOTER == nWhich &&
-/*N*/ ( nGblFlags & SW3F_NOFTRFMT ) != 0;
-/*N*/ BOOL bNoCntnt = bSectionFmt && RES_CNTNT == nWhich;
-/*N*/ if( !( bNoHdr || bNoFtr || bNoCntnt) )
-/*N*/ OutAttr( *pAttr, STRING_LEN, STRING_LEN );
-/*N*/ pAttr = aIter.NextItem();
-/*N*/ }
-/*N*/ if( IsSw31Export() && pExportInfo && pExportInfo->bFlyFrmFmt )
-/*N*/ {
-/*N*/ // Wenn ein FlyFrm-Format exportiert wird, muss beruecksichtigt
-/*N*/ // werden, dass die Raender jetzt nicht mehr Bestandteil der
-/*N*/ // Rahmengroesse sind. Weil die Vorlagen nicht angepasst werden,
-/*N*/ // wird ggf. hart attributiert
-/*N*/ const SvxLRSpaceItem& rLRSpace =
-/*N*/ (const SvxLRSpaceItem&)rSet.Get( RES_LR_SPACE );
-/*N*/ const SvxULSpaceItem& rULSpace =
-/*N*/ (const SvxULSpaceItem&)rSet.Get( RES_UL_SPACE );
-/*N*/
-/*N*/ if( SFX_ITEM_SET != rSet.GetItemState( RES_FRM_SIZE, FALSE ) )
-/*N*/ {
-/*N*/ const SwFmtFrmSize& rFrmSize =
-/*N*/ (const SwFmtFrmSize&)rSet.Get( RES_FRM_SIZE );
-/*N*/ Size aConvSize(
-/*N*/ rFrmSize.GetSizeConvertedToSw31( &rLRSpace, &rULSpace ) );
-/*N*/
-/*N*/ if( rFrmSize.GetSize() != aConvSize )
-/*N*/ {
-/*?*/ SwFmtFrmSize aFrmSize( rFrmSize );
-/*?*/ aFrmSize.SetSize( aConvSize );
-/*?*/ OutAttr( aFrmSize, STRING_LEN, STRING_LEN );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( SFX_ITEM_SET != rSet.GetItemState( RES_HORI_ORIENT, FALSE ) )
-/*N*/ {
-/*?*/ const SwFmtHoriOrient rHori =
-/*?*/ (const SwFmtHoriOrient&)rSet.Get( RES_HORI_ORIENT );
-/*?*/
-/*?*/ if( rHori.GetRelationOrient() > PRTAREA ||
-/*?*/ rHori.GetPos() != rHori.GetPosConvertedToSw31( &rLRSpace ) )
-/*?*/ OutAttr( rHori, STRING_LEN, STRING_LEN );
-/*N*/ }
-/*N*/
-/*N*/ if( SFX_ITEM_SET != rSet.GetItemState( RES_VERT_ORIENT, FALSE ) )
-/*N*/ {
-/*?*/ const SwFmtVertOrient rVert =
-/*?*/ (const SwFmtVertOrient&)rSet.Get( RES_VERT_ORIENT );
-/*?*/
-/*?*/ SwTwips nConvPos = rVert.GetPosConvertedToSw31( &rULSpace );
-/*?*/ if( rVert.GetPos() != nConvPos )
-/*?*/ {
-/*?*/ SwFmtVertOrient aVert( rVert );
-/*?*/ aVert.SetPos( nConvPos );
-/*?*/ OutAttr( aVert, STRING_LEN, STRING_LEN );
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ SfxItemPool::SetStoringPool( pTmp );
-/*N*/ CloseRec( SWG_ATTRSET );
-/*N*/
-/*N*/ // Beim 3.1 Export den alten Attrset zuruecksetzen
-/*N*/ if( pExportInfo )
-/*N*/ pExportInfo->pItemSet = pOldExportItemSet;
-/*N*/ }
-/*N*/ }
-
// Ein Format einlesen
// Hier wird das Format auch erzeugt, falls es nicht uebergeben wurde.
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 93547c3..efddee2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -1494,20 +1494,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ return pInfo;
/*N*/ }
-
-/*N*/ void lcl_sw3io__ConvertNumTabStop( const SwCntntNode& rCNd, long nOffset,
-/*N*/ SfxItemSet& rItemSet )
-/*N*/ {
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ if( SFX_ITEM_SET == rCNd.GetSwAttrSet().GetItemState(
-/*N*/ RES_PARATR_TABSTOP, TRUE, &pItem ))
-/*N*/ {
-/*N*/ SvxTabStopItem aTStop( *(SvxTabStopItem*)pItem );
-/*N*/ lcl_sw3io__ConvertNumTabStop( aTStop, nOffset );
-/*N*/ rItemSet.Put( aTStop );
-/*N*/ }
-/*N*/ }
-
// nOffset ist ungleich Null, wenn innerhalb eines Nodes eingefuegt werden
// soll. Dann ist nOffset die Start-Position des Textes.
@@ -2083,26 +2069,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ return pIMap; // muss ggf. vom Aufrufer geloescht werden!
/*N*/ }
-/*N*/ void lcl_sw3io__ConvertMarkToOutline( String& rURL )
-/*N*/ {
-/*N*/ if( rURL.Len() && '#' == rURL.GetChar( 0 ) )
-/*N*/ {
-/*N*/ String sCmp, sMark( INetURLObject::decode( rURL, INET_HEX_ESCAPE,
-/*N*/ INetURLObject::DECODE_WITH_CHARSET,
-/*N*/ RTL_TEXTENCODING_UTF8 ));
-/*N*/ xub_StrLen nPos = sMark.SearchBackward( cMarkSeperator );
-/*N*/ if( STRING_NOTFOUND != nPos &&
-/*N*/ ( sCmp = sMark.Copy( nPos + 1 ) ).EraseAllChars().Len() &&
-/*N*/ COMPARE_EQUAL == sCmp.CompareToAscii( pMarkToOutline ) )
-/*N*/ {
-/*N*/ rURL = '#';
-/*N*/ rURL += String(INetURLObject::createFragment( sMark.Copy( 1, nPos-1 ) ));
-/*N*/ rURL += cMarkSeperator;
-/*N*/ rURL.AppendAscii( pMarkToOutline );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
PolyPolygon *Sw3IoImp::InContour()
{
PolyPolygon *pContour = 0;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
index 508340e..c7895ec 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
@@ -116,20 +116,6 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
/*N*/ pTblLineBoxFmts->Insert( pFmt, pTblLineBoxFmts->Count() );
/*N*/ }
-/*N*/ USHORT Sw3IoImp::GetTblLineBoxFmtStrPoolId40( SwFrmFmt *pFmt )
-/*N*/ {
-/*N*/ OSL_ENSURE( pExportInfo, "Wo ist die Export-Info?" );
-/*N*/ USHORT nPos = pExportInfo->pTblLineBoxFmts40
-/*N*/ ? pExportInfo->pTblLineBoxFmts40->GetPos( pFmt )
-/*N*/ : USHRT_MAX;
-/*N*/ OSL_ENSURE( USHRT_MAX != nPos, "Tabellen-Line/-Box-Format nicht gefunden" );
-/*N*/ if( USHRT_MAX == nPos )
-/*N*/ Error();
-/*N*/
-/*N*/ return aStringPool.Find( *((*pExportInfo->pTblLineBoxFmtNames40)[nPos]),
-/*N*/ pFmt->GetPoolFmtId() );
-/*N*/ }
-/*N*/
/*N*/ SwFrmFmt *Sw3IoImp::GetTblLineBoxFmt( USHORT nIdx )
/*N*/ {
/*N*/ OSL_ENSURE( pTblLineBoxFmts && nIdx < pTblLineBoxFmts->Count(),
diff --git a/binfilter/inc/bf_svtools/imap.hxx b/binfilter/inc/bf_svtools/imap.hxx
index 7a626a2..2b14194 100644
--- a/binfilter/inc/bf_svtools/imap.hxx
+++ b/binfilter/inc/bf_svtools/imap.hxx
@@ -110,7 +110,6 @@ public:
void Scale( const Fraction& rFractX, const Fraction& rFracY );
// Im-/Export
- void Write ( SvStream& rOStm, const String& rBaseURL ) const;
void Read( SvStream& rIStm, const String& rBaseURL );
};
diff --git a/binfilter/inc/bf_sw/authfld.hxx b/binfilter/inc/bf_sw/authfld.hxx
index 25fd849..5fdb163 100644
--- a/binfilter/inc/bf_sw/authfld.hxx
+++ b/binfilter/inc/bf_sw/authfld.hxx
@@ -51,8 +51,6 @@ public:
SwAuthEntry( const SwAuthEntry& rCopy );
BOOL operator==(const SwAuthEntry& rComp);
- BOOL GetFirstAuthorField(USHORT& nPos, String& rToFill)const;
- BOOL GetNextAuthorField(USHORT& nPos, String& rToFill)const;
inline const String& GetAuthorField(ToxAuthorityField ePos)const;
inline void SetAuthorField(ToxAuthorityField ePos,
const String& rField);
@@ -121,7 +119,6 @@ public:
long GetHandle(USHORT nPos);
USHORT GetEntryCount() const;
- const SwAuthEntry* GetEntryByPosition(USHORT nPos) const;
USHORT GetSequencePos(long nHandle);
commit bf7b99a8f3e01ffdc8110498f809de7c4e69e094
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 10 14:31:28 2011 +0100
move ByteString::ConvertFromUnicode 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 0851400..6b2374a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1799,7 +1799,7 @@ void ScInterpreter::ScCode()
{
//2do: make it full range unicode?
const String& rStr = GetString();
- PushInt( (sal_uChar) ByteString::ConvertFromUnicode( rStr.GetChar(0), gsl_getSystemTextEncoding() ) );
+ PushInt( (sal_uChar) ByteString_ConvertFromUnicode( rStr.GetChar(0), gsl_getSystemTextEncoding() ) );
}
diff --git a/binfilter/bf_svtools/source/misc/tl_tstring.cxx b/binfilter/bf_svtools/source/misc/tl_tstring.cxx
index a6367d8..5896461 100644
--- a/binfilter/bf_svtools/source/misc/tl_tstring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tstring.cxx
@@ -76,12 +76,53 @@ namespace binfilter
}
}
+ sal_Size ConvertFromUnicode( sal_Unicode c, char* pBuf, sal_Size nBufLen, rtl_TextEncoding eTextEncoding )
+ {
+ // TextEncoding Dontknow wird nicht konvertiert
+ if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW )
+ return '\0';
+
+ rtl_UnicodeToTextConverter hConverter;
+ sal_uInt32 nInfo;
+ sal_Size nSrcChars;
+ sal_Size nDestBytes;
+ sal_Unicode cUni = c;
+ sal_uInt32 nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
+ RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE |
+ RTL_UNICODETOTEXT_FLAGS_FLUSH;
+
+ nFlags |= RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
+ RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT;
+ nFlags |= RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE;
+ if ( nBufLen > 1 )
+ nFlags |= RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR;
+
+ hConverter = rtl_createUnicodeToTextConverter( eTextEncoding );
+ nDestBytes = rtl_convertUnicodeToText( hConverter, 0,
+ &cUni, 1,
+ (sal_Char*)pBuf, nBufLen,
+ nFlags,
+ &nInfo, &nSrcChars );
+ rtl_destroyUnicodeToTextConverter( hConverter );
+ return nDestBytes;
+ }
+
sal_Unicode ByteString_ConvertToUnicode( char c, rtl_TextEncoding eTextEncoding )
{
sal_Size nLen = 1;
return ConvertToUnicode( &c, &nLen, eTextEncoding );
}
+ char ByteString_ConvertFromUnicode(sal_Unicode c, rtl_TextEncoding eTextEncoding)
+ {
+ sal_Size nLen;
+ char aBuf[30];
+ nLen = ConvertFromUnicode(c, aBuf, sizeof( aBuf ), eTextEncoding);
+ if ( nLen == 1 )
+ return aBuf[0];
+ else
+ return 0;
+ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 707eb04..05d3dd8 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -592,7 +592,6 @@ public:
// SW3FIELD.CXX
SwField* InField(); // I: Feld
SwFieldType* InFieldType(); // I: ein Feldtyp
- BOOL OutFieldType(const SwFieldType&);// O: ein Feldtyp
// SW3FMTS.CXX
SfxPoolItem* InAttr( xub_StrLen&, xub_StrLen&,
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index fff98b9..5fa79c7 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -586,23 +586,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ return pFldType;
/*N*/ }
-/*N*/ void lcl_sw3io_OutSetExpFieldType( Sw3IoImp& rIo, SwSetExpFieldType* pType )
-/*N*/ {
-/*N*/ const String& rNm = pType->GetSetRefName();
-/*N*/
-/*N*/ *rIo.pStrm << (UINT16) pType->GetType()
-/*N*/ << (UINT16) rIo.aStringPool.Find( rNm,
-/*N*/ lcl_sw3io_GetSetExpFieldPoolId( rNm ) );
-/*N*/
-/*N*/ if( !rIo.IsSw31Or40Export() && GSE_SEQ & pType->GetType() )
-/*N*/ {
-/*N*/ sal_Char cDelim = ByteString::ConvertFromUnicode( pType->GetDelimiter(),
-/*N*/ rIo.eSrcSet );
-/*N*/ *rIo.pStrm << (BYTE)cDelim
-/*N*/ << (BYTE)pType->GetOutlineLvl();
-/*N*/ }
-/*N*/ }
-
SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
{
SwAuthorityFieldType* pFldType = (SwAuthorityFieldType*) rIo.pDoc->
@@ -670,50 +653,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return pFldType;
}
-/*N*/ void lcl_sw3io_OutAuthorityFieldType( Sw3IoImp& rIo,
-/*N*/ SwAuthorityFieldType *pType )
-/*N*/ {
-/*?*/ BYTE cFlags = 0x06;
-/*?*/ if( pType->IsSequence() )
-/*?*/ cFlags |= 0x10;
-/*?*/ if( pType->IsSortByDocument() )
-/*?*/ cFlags|= 0x20;
-/*?*/
-/*?*/ USHORT nCount = pType->GetEntryCount();
-/*?*/ *rIo.pStrm << cFlags
-/*?*/ << (UINT16)nCount
-/*?*/ << (BYTE)ByteString::ConvertFromUnicode( pType->GetPrefix(),
-/*?*/ rIo.eSrcSet )
-/*?*/ << (BYTE)ByteString::ConvertFromUnicode( pType->GetSuffix(),
-/*?*/ rIo.eSrcSet )
-/*?*/ << (UINT16)pType->GetSortKeyCount();
-/*?*/
-/*?*/ USHORT i;
-/*?*/ for( i=0; i<nCount; i++ )
-/*?*/ {
-/*?*/ const SwAuthEntry *pEntry = pType->GetEntryByPosition( i );
-/*?*/ rIo.OpenRec( SWG_AUTHORITY_ENTRY_LCL );
-/*?*/
-/*?*/ USHORT nPos = 0;
-/*?*/ String sEntry;
-/*?*/ BOOL bHasEntry = pEntry->GetFirstAuthorField( nPos, sEntry );
-/*?*/ while( bHasEntry )
-/*?*/ {
-/*?*/ *rIo.pStrm << (UINT16)nPos;
-/*?*/ rIo.OutString(*rIo.pStrm, sEntry );
-/*?*/ bHasEntry = pEntry->GetNextAuthorField( nPos, sEntry );
-/*?*/ }
-/*?*/
-/*?*/ rIo.CloseRec( SWG_AUTHORITY_ENTRY_LCL );
-/*?*/ }
-/*?*/ for( i=0; i < pType->GetSortKeyCount(); i++ )
-/*?*/ {
-/*?*/ const SwTOXSortKey* pKey = pType->GetSortKey(i);
-/*?*/ *rIo.pStrm << (BYTE)(pKey->bSortAscending ? 0X01 : 0x00)
-/*?*/ << (UINT16)pKey->eField;
-/*?*/ }
-/*N*/ }
-
/*N*/ SwField* lcl_sw3io_InDBField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -1961,66 +1900,6 @@ static Sw3InFieldFn aInFieldFnTbl[] =
/*N*/ return p;
/*N*/ }
-// Schreiben eines Feldtyps
-
-
-
-/*N*/ BOOL Sw3IoImp::OutFieldType( const SwFieldType& rType )
-/*N*/ {
-/*N*/ USHORT nFld = rType.Which();
-/*N*/
-/*N*/ if( IsSw31Or40Export() && RES_AUTHORITY == nFld )
-/*N*/ {
-/*N*/ SwSetExpFieldType aType( pDoc,
-/*N*/ String::CreateFromAscii(sSW3IO_AuthorityField),
-/*N*/ GSE_STRING );
-/*N*/ return OutFieldType( aType );
-/*N*/ }
-/*N*/ /* #108791# */
-/*N*/ else if (RES_DROPDOWN == nFld)
-/*N*/ {
-/*N*/ SwSetExpFieldType aType( pDoc,
-/*N*/ String::CreateFromAscii(sSW3IO_DropDownField),
-/*N*/ GSE_STRING );
-/*N*/ return OutFieldType( aType );
-/*N*/ }
-/*N*/
-/*N*/ OpenRec( SWG_FIELDTYPE );
-/*N*/
-/*N*/ *pStrm << (BYTE) ( nFld - RES_FIELDS_BEGIN );
-/*N*/
-/*N*/ switch( nFld )
-/*N*/ {
-/*N*/ case RES_DBFLD:
-/*N*/ lcl_sw3io_OutDBFieldType( *this, (SwDBFieldType*) &rType );
-/*N*/ break;
-/*N*/ case RES_USERFLD:
-/*N*/ if( IsSw31Or40Export() )
-/*N*/ lcl_sw3io_OutUserFieldType40( *this, (SwUserFieldType*) &rType );
-/*N*/ else
-/*N*/ lcl_sw3io_OutUserFieldType( *this, (SwUserFieldType*) &rType );
-/*N*/ break;
-/*N*/ case RES_DDEFLD:
-/*N*/ lcl_sw3io_OutDDEFieldType( *this, (SwDDEFieldType*) &rType );
-/*N*/ nFileFlags |= SWGF_HAS_DDELNK;
-/*N*/ break;
-/*N*/ case RES_SETEXPFLD:
-/*N*/ lcl_sw3io_OutSetExpFieldType( *this, (SwSetExpFieldType*) &rType );
-/*N*/ break;
-/*N*/ case RES_AUTHORITY:
-/*N*/ lcl_sw3io_OutAuthorityFieldType( *this,
-/*N*/ (SwAuthorityFieldType *)&rType );
-/*N*/ break;
-/*N*/ default:
-/*N*/ OSL_ENSURE( !this, "Unbekannter Feldtyp" );
-/*N*/ CloseRec( SWG_FIELDTYPE );
-/*N*/ Error();
-/*N*/ return FALSE;
-/*N*/ }
-/*N*/ CloseRec( SWG_FIELDTYPE );
-/*N*/ return TRUE;
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
index f7e98fb..5e969bb 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -35,6 +35,7 @@ namespace binfilter
{
ByteString ByteString_CreateFromInt32(sal_Int32 n, sal_Int16 nRadix = 10);
sal_Unicode ByteString_ConvertToUnicode(sal_Char c, rtl_TextEncoding eTextEncoding);
+ sal_Char ByteString_ConvertFromUnicode(sal_Unicode c, rtl_TextEncoding eTextEncoding);
}
#endif // _BF_STRING_HXX
More information about the Libreoffice-commits
mailing list